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

2120 Commits

Author SHA1 Message Date
Enzo Vezzaro
7023247894 allow calculations on unsupported network & user not connected 2022-06-24 09:06:13 -04: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
2b025ea38c
move isOwner check to single effect 2022-06-23 15:40:59 +01:00
Bogdan Fazakas
8656a6c51b Merge branch 'feature/v4-c2d' of https://github.com/oceanprotocol/market into feature/v4-c2d 2022-06-23 17:20:58 +03:00
Bogdan Fazakas
e9ff4f7717 fix disable compute button if algo is consumable 2022-06-23 17:18:54 +03: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
cf254aa7c6
more obvious edit action 2022-06-23 12:51:46 +01:00
30b654975a
provider fee statement tweak 2022-06-23 11:38:48 +01:00
7f104c9858
more proper error throwing 2022-06-23 11:38:03 +01:00
8edd3a4f60
refactor handleComputeOrder for less complexity and more useful error reporting 2022-06-23 11:05:16 +01:00
Bogdan Fazakas
e1168a451d move isOwner to asset provider 2022-06-23 08:04:39 +03:00
Bogdan Fazakas
a030cdecdb add accountId as a dependency in effect 2022-06-23 07:16:20 +03:00
498f7604da
more comments removal 2022-06-22 15:16:28 +01:00
c0c709e7f5
effect dependency fixes 2022-06-22 15:12:38 +01:00
18b487dd75
compute jobs profile visual fixes 2022-06-22 14:51:07 +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
923569e61a
effect dependency fixes 2022-06-22 14:02:32 +01:00
e3b751ea8b
state renaming 2022-06-22 13:40:35 +01:00
40f9170eb4
effect dependency fixes 2022-06-22 13:40:22 +01: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
36bc097c0b
state & hooks access reordering 2022-06-22 12:46:27 +01: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
b37c85908d merge main into v4-c2d 2022-06-22 06:59:40 +03:00
Bogdan Fazakas
256744317f fix provider fee approve for free assets 2022-06-22 06:58:29 +03:00
d884a9529d
remove Portis (#1529)
* remove Portis

* cleanup
2022-06-21 14:18:40 +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
Jamie Hewitt
f20a6a5a48
Opening blog post link in new tab (#1526)
* Opening link in new tab

* Adding styling to link

* Updating button font size
2022-06-20 17:46:13 +03: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
e222b730af fix provider fee load at first algo selection 2022-06-17 12:14:25 +03:00
Bogdan Fazakas
a54a5dc0c6 fix free algo price selection and display 2022-06-17 10:16:01 +03: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
Bogdan Fazakas
d5a657b1e2 bump oceanlib to 1.1.2 2022-06-16 07:35:05 +03:00
Bogdan Fazakas
7a6df34be4 set providerFee amount only when avaialable 2022-06-16 07:12:56 +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
d523c7f0f3
Retry failed transactions during publish (#1511)
* allow multiple runs of handleSubmit

* collect what we need in local state for reuse after method has run
* run each step conditionally

* split up handleSubmit

* switch submit button text

* empty values.feedback fix

* error copy

* tiny logic fix for consistency

* code comments

* submit button fixes

* add loader during submission
* add new white loader style
* button style override fixes
2022-06-15 12:35:37 +01: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