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

282 Commits

Author SHA1 Message Date
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
EnzoVezzaro
1fcc3b1356
sanitize urls as code scanning suggestions (#1412)
* sanitize url on DebugEditMetadata as code scanning suggestion

* sanitize urls
2022-05-10 10:11:53 +01:00
Bogdan Fazakas
e23e4b6b97 merge feature/v4 into feature/v4-c2d fix conflicts 2022-05-02 09:25:18 +03:00
mihaisc
2107eab979
Fix order and price (#1375)
* fix loading

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

* add order fee

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

* fix opc

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

* remove cache from urql

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

* update urlq dep

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

* update urlq dep

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

* fix lock

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

* fix states

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-04-29 21:14:14 +02:00
Bogdan Fazakas
3ef91048b3 fix compute jobs infinite loading when no jobs found 2022-04-29 13:17:06 +03:00
Bogdan Fazakas
ad9ecd034c fix conflicts 2022-04-28 14:59:30 +03:00
EnzoVezzaro
6ef2082724
restore order for assets with fixed pricing (#1360)
* restore button if there's not pool data

* restore order for fixed pricing and download button after purchase

* minor fixes

- avoid errors when providerFee is null
- fix disabled download/buy button when user is on different network as asset's

* added improvements
2022-04-28 13:35:00 +02:00
Bogdan Fazakas
787588f20b fix fixed rate 2022-04-28 10:59:54 +03:00
Bogdan Fazakas
6bb4466d4a merge feature/v4 into feature/v4-c2dr 2022-04-28 10:11:19 +03:00
mihaisc
d1e21b7f03
Various fixes in the pool component (#1327)
* remove legacy check to prevent rug pull

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

* various fixes

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

* remove old prop

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

* remove old prop

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

* add expected output to remove

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

* remove console.logs

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

* fix max calculations

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

* refactors

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

* temp fixes for build

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

* fixes

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

* local calc for pice and liquidity

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

* remove var

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

* fix

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

* fix

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

* fix profile liquidity

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

* global context, opc fee

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

* comment

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

* various fixes

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

* refactor global context

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

* remove nesting from market context

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

* fix build

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

* fix undefined appConfig

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

* direct import of appConfig & siteContent

* this never changes on run time, so we should never have to wait for it and have it in js bundle at all times
* in utility methods, import directly
* for components, import directly in MarketMetadata context  and pass through

* remove screen CSS fixes

* put back auto-fetching indicator, move manual refresh action behind debug

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-04-22 02:38:35 +02:00
Bogdan Fazakas
ef744c1a2c
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>
2022-04-21 17:30:12 +03:00
Bogdan Fazakas
a0558efaab some fixes 2022-04-20 12:32:04 +03:00
Bogdan Fazakas
0b1d9cc436 merge v4 into v4-c2d 2022-04-15 12:04:49 +03:00
Bogdan Fazakas
ffd1c3ebe1 bump ocean lib version and lint fixes 2022-04-15 09:25:55 +03:00
ced16eecc9
Ocean Asset NFT → Ocean Data NFT (#1328) 2022-04-06 16:38:43 +03:00
Bogdan Fazakas
1b744760ce Merge branch 'feature/v4-c2d' into 'fix/compute-jobs' 2022-04-04 22:35:37 +03:00