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

247 Commits

Author SHA1 Message Date
daf15a698f
remove onChange handlers on edit (#1555)
* remove onChange handler on edit compute

* move empty DID list condition
2022-06-29 13:54:03 +01:00
Bogdan Fazakas
d500c65d5d
fix fre order and bump ocean lib (#1553) 2022-06-28 14:09:30 +01:00
02beb0f8c3
Edit screen fixes (#1546)
* edit refactors

* fix logic around `publisherTrustedAlgorithms`

* typing fix

* copy & typos

* conditionally add compute tab to edit screen

* more logic fixes

* fix various app crashes because of Debug component
* semi-deal with publisherTrustedAlgorithmPublishers

* more fixes, bound submit button to touched state
2022-06-27 10:15:45 +01:00
Enzo Vezzaro
db1e1f8fae Merge branch 'feature/v4-c2d' into fix/issue-1069-c2d-unsupported-networks 2022-06-24 07:17:16 -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
mihaisc
aa37155a16
Correctly display trusted algorithms in compute asset (#1541)
* fix allowed algo

* fix trusted algo filter
2022-06-23 16:06:09 +01:00
ec34dc8f53
fix algo list fetching
* closes #1537
* addresses #1538
2022-06-23 14:52:39 +01:00
Bogdan Fazakas
98beb1c3af don t use initial tx values as valid order use subgraph value 2022-06-23 16:48:05 +03:00
edd80eed77
empty array for publisherTrustedAlgorithms & publisherTrustedAlgorithmPublishers by default
* ref #1538
* ref #1539
2022-06-23 14:30:28 +01:00
30b654975a
provider fee statement tweak 2022-06-23 11:38:48 +01:00
8edd3a4f60
refactor handleComputeOrder for less complexity and more useful error reporting 2022-06-23 11:05:16 +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
Bogdan Fazakas
3e4b79fc42
Update src/@utils/ddo.ts
remove metadata from service type

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-06-22 15:13:33 +03:00
c8ab4b18c5
shorten getAccessDetailsFromTokenPrice() a bit 2022-06-22 12:05:35 +01:00
b09dc6b953
more typos 2022-06-22 11:46:42 +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
Bogdan Fazakas
256744317f fix provider fee approve for free assets 2022-06-22 06:58:29 +03:00
Enzo Vezzaro
56583c5e7a Merge branch 'feature/v4-c2d' into fix/issue-1069-c2d-unsupported-networks 2022-06-21 08:32:20 -04: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
a8ca31f02e merge main into v4-c2d and fixed conflicts 2022-06-17 07:18:43 +03:00
Bogdan Fazakas
888aeeb541 used approveWei for approving provider fees 2022-06-17 07:14:41 +03:00
mihaisc
33edc3f5f4
Update file (#1518)
* update version and file

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

* update label and description

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

* remove dot

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

* remove helper props so we don't add them on chain

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

* bump ocean.js to v1.1.2

* build fix

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-06-16 11:10:08 +01:00
Bogdan Fazakas
cc2e179d29 replace FIleMetadata to fix build 2022-06-16 08:32:48 +03:00
Bogdan Fazakas
fe06c2eb2c merge main into v4-c2d 2022-06-16 08:25:35 +03:00
mihaisc
a47fb09b91
update publish form with DDO v4.1.0 structure (#1519)
* update publish form

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

* typing quick fix

* fix build

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

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-06-15 17:35:41 +03:00
Bogdan Fazakas
9eb47f6602 update price output tooltip and total price logic 2022-06-15 16:43:37 +03:00
Bogdan Fazakas
88fbab5602 removed some logs and added few comments 2022-06-15 07:11:19 +03:00
Bogdan Fazakas
4d09240923 remove cast on providerFeeAmount 2022-06-15 06:56:23 +03:00
Bogdan Fazakas
a740e07b0d send providerFeeAmount as string 2022-06-15 06:54:06 +03:00
Bogdan Fazakas
0d3464848d merge main into v4-c2d fix conflicts 2022-06-08 17:08:50 +03:00
Luca Milanese
e412dc10d6
add v3 assets redirect (#1446)
* feat: add v3 assets redirect

* feat: add fallback return value to checkV3Asset

* fix: rename env variables for v3 related uris
2022-06-06 12:25:09 +02:00
Bogdan Fazakas
2c288f2591 fix provider fee display 2022-06-05 01:49:04 +03:00
Bogdan Fazakas
3232460f38 remove toast from provider helper 2022-06-01 17:40:51 +03:00
Bogdan Fazakas
c25ab289fd removed console logs and added one new check 2022-06-01 17:25:51 +03:00
Bogdan Fazakas
2e9898907d use compute env max duration value in seconds 2022-06-01 09:51:51 +03:00
Bogdan Fazakas
4f14ffc265 removed logs and added some explanations 2022-05-26 17:58:17 +03:00
Bogdan Fazakas
aec4568412 remove logs 2022-05-26 08:38:38 +03:00
Bogdan Fazakas
565e7bfa31 compute jobs refetch and reuse order 2022-05-26 08:37:31 +03:00
Bogdan Fazakas
ea6a350796 merge v4 into v4-c2d 2022-05-20 08:20:49 +03:00
Bogdan Fazakas
f0b22ee8e4
fix forever timeout for assets (#1445) 2022-05-19 17:48:13 +01:00
Bogdan Fazakas
06e6290613 merge v4 2022-05-18 17:21:07 +03:00
mihaisc
4b6baa9cd5
Update contracts and math (#1436)
* update contracts and math

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

* change fee name

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

* bump to ocean.js v1.0.0-next.44

* rename consumeFee to orderFee

* prevent variable naming clash

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: Bogdan Fazakas <bogdan.fazakas@gmail.com>
2022-05-18 14:38:08 +01:00
Bogdan Fazakas
6d7852672d update compute status feedback messages 2022-05-17 11:45:37 +03:00
Bogdan Fazakas
feb1f41d5c fix conditions and cleanups 2022-05-16 07:57:48 +03:00
Bogdan Fazakas
24aa157f92 fix lint 2022-05-13 10:53:38 +03:00
Bogdan Fazakas
be21be9559 order fixes 2022-05-13 10:27:41 +03:00
Bogdan Fazakas
936985a0f8 merge v4 2022-05-12 14:42:28 +03:00
Bogdan Fazakas
15af847a9c wip compute initialize 2022-05-12 14:39:14 +03:00
5f3ee32ca2
Test setup tweaks (#1415)
* unused package cleanup

* make storybook use webpack 5

* see https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#webpack-5

* bump react, cleanup

* button story tweaks

* add Alert stories

* bump Jest to v28.1.0

* try original storyshots initialization

* split up build & test CI jobs

* stop testing Node.js v14

* set jest coverage flag

* downgrade paambaati/codeclimate-action again

* move  jest config files, remove coverageReporter override

* collect coverage from `src/` only

* another paambaati/codeclimate-action bump test

* create additional button markup test

* downgrade paambaati/codeclimate-action again

* more downgrade

* render default button without optional style prop

* ignore some folders for Jest

* full coverage for Alert

* more package updates

* add eslint-plugin-testing-library & eslint-plugin-jest-dom

* bump ESLint packages, follow new rules

* start storybook in quiet mode

* update docs

* test storybook build as part of CI

* more testing docs clarification

* add jest:watch command

* add body background colors switch in toolbar

* TypeScript voodoo

* test codeclimate-action@v2.7.3 for default coverageCommand

* downgrade codeclimate-action and running in debug mode

* make coverage artifacts OS agnostic

* subgraph typings as artifact for coverage job

* disable coverage sending job for now

Co-authored-by: Enzo Vezzaro <enzo-vezzaro@live.it>
2022-05-12 11:35:07 +01:00
mihaisc
aa54795c2b
add decimals to pool calls (#1393)
* add decimals to pool calls

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

* fix lock

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

* fix ssh

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

* update ocean

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

* update ocean

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

* remove screen fixes

* update lib, contracts

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

* fix package-lock

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

* fix

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

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-05-10 14:19:41 +03:00