1
0
mirror of https://github.com/oceanprotocol/market.git synced 2024-12-02 05:57:29 +01:00

57 Commits

Author SHA1 Message Date
EnzoVezzaro
1649e075e2 Merge branch 'main' into fix/issue-1069-c2d-unsupported-networks 2022-11-14 11:47:44 -04:00
Jamie Hewitt
4ff84b0871
Handle provider error & showing Retry button (#1770)
* adding error handling for button onCLick

* Updating butoon to show retry & updating toast message

* Logging provider error

* Removing unused imports

* Using early return when provider fees are present to prevent unneccessary nesting

* Adding retry logic for compute

* Removing duplicate teast message

* Adding tests for rendering Buy button

* Additional tests for BuyButton

* Refactoring BuyButton tests for download

* Fix failing tests

* Refactoring compute tests

* Refactoring tests

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-11-11 12:54:21 +03:00
EnzoVezzaro
606a32065c Merge branch 'main' into fix/issue-1069-c2d-unsupported-networks 2022-11-08 05:15:39 -04:00
56f5e77c49
Tests for @shared components (#1737)
* asset teaser test, story, useUserPreferences Jest mock

* fixtures & mocks

* more tests

* cleanup

* more tests

* more tests

* more tests

* more tests

* typing fix

* package updates

* reorg

* more tests

* more tests

* more tests

* more tests

* reorg, more tests

* reorg fixes

* more tests

* rebase fix

* subgraph query typing fix

* restore some storybook stories

* more tests

* more tests

* package lock fix

* graphql override
2022-11-04 15:52:40 +02:00
EnzoVezzaro
49960f38e0 cleanup after merge 2022-11-04 07:16:06 -04:00
EnzoVezzaro
983d460614 Merge branch 'main' into fix/issue-1069-c2d-unsupported-networks 2022-11-04 06:49:33 -04:00
Bogdan Fazakas
c780411b74
C2D fixes (#1715) 2022-11-02 15:24:20 +00:00
EnzoVezzaro
589963e368 fix connection and networks calculations 2022-10-26 08:25:52 -04:00
EnzoVezzaro
8c88d512bf adding check on priceDataset 2022-10-20 08:17:52 -04:00
EnzoVezzaro
2fb9fb2c63 fix total sum order on compute 2022-10-19 10:00:23 -04:00
EnzoVezzaro
5819c25015 Revert "remove previous orders from price calculation in compute"
This reverts commit 504840a2d3b89695031ad2bbf9aa1542a514a5f9.
2022-10-19 09:06:34 -04:00
EnzoVezzaro
504840a2d3 remove previous orders from price calculation in compute 2022-10-19 08:48:36 -04:00
EnzoVezzaro
3ad213c444 Merge branch 'main' into fix/issue-1069-c2d-unsupported-networks 2022-10-07 06:56:47 -04:00
Luca Milanese
52ad877b13
Dynamic token list support for publishing (#1516)
* feat: add approved tokens list query to subgraph

* feat: add base token selector

* feat: add placeholder tooltip message for base token

* feat: use user selected base token for publish

* fix: publish constants

* feat: update base token query to include digits and symbol

* feat: display correct token name and symbol in publish pricing tab

* fix: publish preview token name

* fix: query type

* feat: add balance fetch for all approved tokens

* fix: balance check for dynamic price with alternative base tokens

* feat: update balance to show baseToken instead of ocean

* fix: default baseToken in publish form

* feat: update text content for pricing publish step

* chore: update ocean.js

* add decimals to token

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix dt decimals

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* update ocean.js

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix: show correct basetoken symbol under button buy

* refactor: move baseToken selector to input label [WIP]

* refactor: preserve baseToken value value when switching tabs

* remove basetoken tooltip from content json

* fix: price props

* refactor: remove BaseToken component

* fix: baseToken name on first load

* fix: baseToken display name in dynamic price

* fix: conversion tooltip text

* fix: error box overlapping in Coin component

* feat: add token logo component

* feat: add basetoken logo to asset actions pool

* fix: token images size

* fix: add default appproved token list when disconnected or chainId not supported

* fix: datatoken logo on asset details meta

* refactor: balance fetch + move approved base tokens list in web3 provider

* feat: update all datatokens to display ocean logo in violet

* fix: show correct logos on polygon

* fix wallet, remove dynamic

* fix build

* fix: reset baseToken on chainId change during publish

* fix: price tabs selection indicator

* feat: set the ocean token as default in pricing

* add baseToken

* fix price

* remove firstPrice

* cleanup, more affordance for token dropdown

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-08-03 13:48:57 +01:00
EnzoVezzaro
eb29c4ce3b
Remove AMM Pools (#1614) 2022-08-02 10:53:22 +01:00
Enzo Vezzaro
7023247894 allow calculations on unsupported network & user not connected 2022-06-24 09:06:13 -04:00
Bogdan Fazakas
5387b9a3dd
Restore compute functionality (#1069)
* add balance check and check is consumable

* add isOrderable and other helpers

* finish start compute job

* removed unused methods

* add more comments

* add pool logic for order

* move asset selection to compute helper

* small fix

* fixed get algo list

* refactor start compute job and more fixes

* update order params

* use compute env and compute consumer address

* fix prices

* fix algorithms selection list on allowAllPublisher case

* fix edit compute settings

* update compute resources valid until logic

* fixes and cleanups

* wip compute jobs

* fix compute timeout value

* fixed compute jobs logic

* fix algo selection list name

* fixed compute jobs from profile loading

* update start compute flow messages

* update set algo access details

* update compute message logic

* added logs

* update package lock

* remove logs

* fix edit compute checksums for files and container

* Fix compute dataset algorithm list (#1194)

* fix query

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* remove comment

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* Fix previous order tx (#1197)

* rename nft update query

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix previous order

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix build

* handle order price, NaN and default 0

* optional value for all fee, prevent breaking when no value

* fix aquarius call and added logs

* update provider compute status call

* remove percentage fee from price sum, depends smart contract calculation (#1249)

Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>

* fix display of compute datasets with free price

* removed to lowerCase on eth address

* fix compute jobs section and your jobs

* bumo ocean lib to 1.0.0-next.32

* c2d show price with fee, exclude provider fee

* wip get results

* include loading when calculating data + algo price, tooltip show order price

* update get compute url and use oceanjs helper for download

* update computeStatus signature to fix build and CI

* added logs

* refactor setting price and fees for assets

* update compute details and compute results UI and style

* update flex value

* update download buttons style

* update download buttons text

* bump ocean lib version and lint fixes

* get provier uri for compute results based on job input did

* use zero adress for price and fees order

* some fixes

* Add reuse order in start compute flow  (#1352)

* wip add reuse order logic

* add reuse order in start job

* added missing check if no jobs found

* update lib

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix lint

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* fix fixed rate

* fix build

* fix your compute jobs section when asset network not selected

* disable edit compute settings for algorithms

* fix compute jobs infinite loading when no jobs found

* fix compute form

* show token symbol for free assets also on compute price output

* removed swp file

* some decimal fixes

* partial fix for asset with pool fees, algo not working yet

* more decimal fixes

* fix algo with pool price and fees fetching

* fix selecting algorithms when on different network

* fix compute jobs table auto refresh and details  modal closing

* wip compute initialize

* order fixes

* fix lint

* fix conditions and cleanups

* fix compute status text display

* init prices and fees after starting a compute job

* start/order button tweaks

* kick in loader earlier

* update compute status feedback messages

* fixed initial price

* compute jobs refetch and reuse order

* remove logs

* removed logs and added some explanations

* use compute env max duration value in seconds

* error handling on intializeCompute and order

* removed console logs and added one new check

* use optional on initialized provider check

* remove toast from provider helper

* fix compute env issue on start order

* disable job selection during actions execution

* temporary fix publish algo with custom docker image

* fix provider fee display

* remove unnecessary condition

* fix alignment based button on action type (#1491)

* fix alignment based on action type

* moving to CSS modules

* send providerFeeAmount as string

* remove cast on providerFeeAmount

* removed some logs and added few comments

* update price output tooltip and total price logic

* set providerFee amount only when avaialable

* bump oceanlib to 1.1.2

* replace FIleMetadata to fix build

* used approveWei for approving provider fees

* fix free algo price selection and display

* fix provider fee load at first algo selection

* update compute help text

* fix provider fee approve for free assets

* cleanup

* remove commented out code
* remove unused state
* removed unused imports
* typos in comments, variables, props

* more typos

* shorten getAccessDetailsFromTokenPrice() a bit

* state & hooks access reordering

* Update src/@utils/ddo.ts

remove metadata from service type

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>

* effect dependency fixes

* state renaming

* effect dependency fixes

* compute jobs profile visual fixes

* effect dependency fixes

* more comments removal

* add accountId as a dependency in effect

* move isOwner to asset provider

* refactor handleComputeOrder for less complexity and more useful error reporting

* more proper error throwing

* provider fee statement tweak

* more obvious edit action

* empty array for `publisherTrustedAlgorithms` & `publisherTrustedAlgorithmPublishers` by default

* ref #1538
* ref #1539

* don t use initial tx values as valid order use subgraph value

* fix algo list fetching

* closes #1537
* addresses #1538

* fix disable compute button if algo is consumable

* move isOwner check to single effect

* Correctly display trusted algorithms in compute asset (#1541)

* fix allowed algo

* fix trusted algo filter

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
Co-authored-by: Soon Huat <soonhuat.phan@hotmail.com>
Co-authored-by: Enzo Vezzaro <enzo-vezzaro@live.it>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2022-06-23 16:53:05 +01:00
Enzo Vezzaro
515eb19cbf Merge branch 'feature/v4-c2d' into fix/issue-1069-c2d-unsupported-networks 2022-06-22 09:39:21 -04:00
40f9170eb4
effect dependency fixes 2022-06-22 13:40:22 +01:00
db23ed6ada
cleanup
* remove commented out code
* remove unused state
* removed unused imports
* typos in comments, variables, props
2022-06-22 11:32:59 +01:00
Enzo Vezzaro
56583c5e7a Merge branch 'feature/v4-c2d' into fix/issue-1069-c2d-unsupported-networks 2022-06-21 08:32:20 -04:00
Bogdan Fazakas
455a68a29c update compute help text 2022-06-20 06:54:26 +03:00
Enzo Vezzaro
da934f789f adding dummyweb3 and zero_address to calculate price on unsupported network / not connected user 2022-06-17 08:51:16 -04:00
Bogdan Fazakas
9eb47f6602 update price output tooltip and total price logic 2022-06-15 16:43:37 +03:00
Enzo Vezzaro
f242cebefa fix unsupported network crash and allow price calculations to those networks 2022-06-14 12:30:35 -04:00
Bogdan Fazakas
0d3464848d merge main into v4-c2d fix conflicts 2022-06-08 17:08:50 +03:00
mihaisc
6dfeead4fd
Release (#1492)
* update contracts

* add version selector

* show banner on all pages

* show banner on all pages

* Announcement/warning messages cleanup

* new main announcement message
* contextual compute-to-data warnings in publish form & asset action

* copy update

* change hardcoded URLs

* change localStorage key

* to prevent user preferences clashes when switching between v3 & v4

* footer stats note changes

* move copy into content file
* mention external markets

* footer stats note copy changes

* modified pool widget footer

* take out pool reserve display
* style & spacing updates for fees

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-06-08 11:46:46 +03:00
Enzo Vezzaro
a1fdc28136 block users from selection when on unsupported asset 2022-06-06 10:46:20 -04:00
Enzo Vezzaro
48a3962be1 remove unnecessary condition 2022-06-06 10:36:59 -04:00
Enzo Vezzaro
37f7faf7e2 disable job selection during actions execution 2022-06-02 11:41:06 -04:00
Bogdan Fazakas
589d174abf fixed initial price 2022-05-23 17:28:40 +03:00
Bogdan Fazakas
692fb509f6 fix compute jobs table auto refresh and details modal closing 2022-05-05 17:06:11 +03:00
Bogdan Fazakas
31a7703822 more decimal fixes 2022-05-03 11:14:00 +03:00
Bogdan Fazakas
5030b346e1 partial fix for asset with pool fees, algo not working yet 2022-05-02 18:46:32 +03:00
Bogdan Fazakas
f3fabdd3d9 some decimal fixes 2022-05-02 17:36:51 +03:00
Bogdan Fazakas
e8fc728523 fix compute form 2022-05-02 11:15:50 +03:00
Soon Huat
31167856fc include loading when calculating data + algo price, tooltip show order price 2022-03-31 23:55:22 +08:00
Soon Huat
795ba0c01b c2d show price with fee, exclude provider fee 2022-03-30 22:44:10 +08:00
Bogdan Fazakas
cb6b71c4ce update set algo access details 2022-03-14 16:27:20 +02:00
Bogdan Fazakas
109b9dcbb9 refactor start compute job and more fixes 2022-03-01 01:43:57 +02:00
Bogdan Fazakas
d4570aa1cb merged v4 into c2d 2022-02-23 15:58:20 +02:00
mihaisc
8d1782a800
Restore order (#1068)
* minor refactors

* minor refactors

* fixes

* buy dt

* consumePrice + estimation

* various fixes

* cleanup

* fix build

* fix ssh issue

* feedback

* build fix

* ssh fix

* remove console.log

* suggested fixes

* other fixes

* switch to decimal

* more fixes

* more fixes

* fix

* some fee refactors

* more fee refactoring

* lib update, fre rename

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* minor refactors

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* build fixes

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

* update + more refactoring

* calc price

* fix build

* restore accountId in effect

* fix order

* fix build and update lib

* fix order index

* fix comments

* pool fix

* remove console.log

* fix order fixed rate exchange

* fixed free order and messaging

* add comment

* minor type fix

* more type fixes
2022-02-14 08:27:36 -08:00
Bogdan Fazakas
aee75a2fc6 merge v4 branch into restore c2d 2022-02-03 23:21:02 +02:00
Bogdan Fazakas
2e39ef93e4 merge v4 branch into c2d restore and fix merge conflicts 2022-02-03 23:18:45 +02:00
8074a6143c
Refactor Asset context provider (#1055)
* refactor Asset context provider

* use useIsMounted hook

* typings and effect tweaks

* use chainId

* effect tweak
2022-02-03 14:31:43 +00:00
mihaisc
57be62a6b1
Refactor pricing and various components that are involved (#1046)
* update

* merge pr #1012

* fix header

* fix

* abort controller

* up next.8

* build fix

* update lock

* fix

* another fix

* ssh fix

* another ssh fix

* remove optional

* order mock

* small cleanup

* fix package

* price updates

* finish getPrice

* fix consume

* fix consume

* getConsumeDetails  comments

* restore functionality after consumeDetails

* fix some compute typings

* more price fetching updates

* 'minor' refactors and fixed build

* package-lock fix

* minor comments

* minor naming changes

* fix

* fix pool badge

* remove console.log
2022-02-03 03:29:39 -08:00
Bogdan Fazakas
afd1c2d9db add balance check and check is consumable 2022-01-19 09:12:59 +02:00
f6097bf158
remove OceanProvider (#988) 2022-01-13 13:15:15 +00:00
64a25f3f3e
use Asset from ocean.js, adapt to new structure 2022-01-11 19:45:14 +00:00
b5b0297ae4
refactor for new ocean.js, make the build work 2022-01-11 19:05:07 +00:00