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

1866 Commits

Author SHA1 Message Date
Soon Huat
9da987ea9d optional value for all fee, prevent breaking when no value 2022-03-21 15:35:06 +08:00
Soon Huat
4ad5f12398 handle order price, NaN and default 0 2022-03-21 11:58:19 +08:00
Norbi
d1d24ef4d5
disable price calculation for free price (#1198)
* disable price calculation for free price

* make file icon visible on component mount

* check if accessDetails are present
2022-03-18 13:22:26 +00:00
Bogdan Fazakas
a1abc9cff0 fix build 2022-03-17 11:59:21 +02:00
Bogdan Fazakas
08b90b3635 merge branch v4 into v4-c2d fixed conflicts 2022-03-17 11:29:02 +02:00
mihaisc
a0abe7e17c
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>
2022-03-16 22:29:27 +02:00
Moritz Kirstein
9d1b7794a3
Feat: Display NFT in asset details (#1125)
* feat: add decodeTokenUri helper

* refactor: restructure of MetaMain component

* feat: add nft tooltip

* feat: add opensea link for nfts

* style: adjust nft image size in tooltip

* feat: add nft data to publish preview

* fix: readd owner to nft metadata

* refactor: conditional display of nft tooltip

* style: fix link styles in nft tooltip

* feat: add placeholder graphic as fallback if nft data does not contain one

* fix: display openSea link only on supported networks

* fix: rename ddo props to asset in metamain related components

* feat: add original publisher to asset details

* chore: remove unused imports

* fix: remove unused prop

* feat: convert publisher address to checksum address

* chore: remove console.error when decoding tokenURI

* Revert "chore: remove console.error when decoding tokenURI"

This reverts commit f387175970.

* feat: shorten nft address in tooltip preview

* fix: use Web3.utils instead of the actual web3 instance to convert wei in ether

Co-authored-by: Luca Milanese <luca.milanese90@gmail.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-03-16 19:01:51 +00:00
Norbi
8b331c0a63
Fix/issue 1151 pool chart fill color (#1193)
* added colours for dark and light mode and refetch on appearance change

* keep same border colour
2022-03-16 15:35:31 +00:00
mihaisc
8aa6b3997a
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>
2022-03-16 17:12:09 +02:00
EnzoVezzaro
8d852323ad
fix txCount on 'Create tokens & pricing' in publish (#1187)
* fix txCount on 'Create tokens & pricing' in publish

* fix description on submit step in publish
2022-03-16 14:37:28 +00:00
Luca Milanese
bea8635a53
Feat: add final did to tokenURI in NFT metadata (#1167)
* feat: set NFT metadata and tokenURI in a single transaction

* feat: move token uri encoding in second publish transaction

* feat: add final asset did in tokenURI

* fix: edit metadata and computeDataset submit functions

* feat: extract decodeTokenURI function

* fix: revert to previous metadata edit flow

* fix: revert to generateNftCreateData

* feat: add final asset link in tokenURI description
2022-03-16 13:19:08 +00:00
ecad0ebb50
package updates (#1191)
Notable updates:

* ocean.js v1.0.0-next.28
* @walletconnect/web3-provider v1.7.5
* @portis/web3 v4.0.7
* urql v2.2.0
* web3 v1.7.1
* npm audit fix
2022-03-16 12:56:09 +00:00
Norbi
822cec3753
Keep algorithm private checkbox fixes (#1174)
* fix set access inside publish form

* added initial value for service access to fix continue button disabled

* removed compute environment options field

* removed compute options from form.json

* update access and algorithmPrivacy fields based on asset type

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-03-16 12:52:05 +00:00
EnzoVezzaro
f2ecf1666b
added freeAgreement to pricing validation (#1188) 2022-03-16 12:17:02 +00:00
Bogdan Fazakas
2ef29d905e fix edit compute checksums for files and container 2022-03-16 12:20:50 +02:00
Bogdan Fazakas
74f211d45d remove logs 2022-03-15 16:54:36 +02:00
Bogdan Fazakas
6d0c49bec5 update package lock 2022-03-15 11:09:20 +02:00
Bogdan Fazakas
bad0b12d50 added logs 2022-03-14 23:58:21 +02:00
Bogdan Fazakas
7ee2bdab98 merge v4 into v4-c2d 2022-03-14 16:47:34 +02:00
Bogdan Fazakas
21dad4fda2 update compute message logic 2022-03-14 16:38:31 +02:00
Bogdan Fazakas
cb6b71c4ce update set algo access details 2022-03-14 16:27:20 +02:00
mihaisc
4dad9b6f9a
update ocean.js (#1181)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-03-14 16:19:56 +02:00
Bogdan Fazakas
62f5803e49 update start compute flow messages 2022-03-12 14:44:12 +02:00
3ea832d270
update compute service options (#1180)
* bump ocean.js to v1.0.0-next.26

* update compute service options
2022-03-11 11:26:04 +00:00
EnzoVezzaro
fc6e00669c
Feature/issue 1175 catch user rejection buy (#1177)
* fix approval rejection on buyDtFromPool

* fix approval rejection on order
2022-03-11 11:25:51 +00:00
Bogdan Fazakas
4eb41bba2c merge v4 into v4-c2d and fixed conflicts 2022-03-10 02:10:43 +02:00
Bogdan Fazakas
e6b7acb1d9 fixed compute jobs from profile loading 2022-03-10 01:14:27 +02:00
Bogdan Fazakas
38bf327b89 fix algo selection list name 2022-03-10 01:12:09 +02:00
Bogdan Fazakas
a8b31131c4 fixed compute jobs logic 2022-03-10 01:10:57 +02:00
EnzoVezzaro
1eacf9d93e
stop execution on publish if user rejects approval tokens (#1173) 2022-03-09 16:06:55 +00:00
cfd31905dd
Fix profile image (#1172)
* tinker

* use !important
2022-03-09 14:12:48 +00:00
ccb50b56e5
Preview action fixes (#1171)
* disable pool/trade tab in preview again

* hide collection button on preview

* cleanup

* render fix
2022-03-09 14:12:37 +00:00
a988b4d81f
bump ocean.js to v1.0.0-next.25 (#1169) 2022-03-09 14:12:26 +00:00
claudiaHash
4331c24c0d
Restore Pool Shares section (#1139)
* get poolShares dt addresses

* style fixes

* class names fix

* remove useless changes

* fix

* try/catch blocks, loading fix

* show pool shares fix

* delete logs, fix build

* more try/catch blocks

* check subgraph url, add try/catch block

* fixes

* pool fields fix

* minor code fixes

* fix subgraph fetch

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

* remove unused function, fixes

* use LoggerInstance, remove useless setter

* error messages fix, get rid of dt column

* small tweaks and tests

* fixes

* fixes

* modified flow for pool shares

* loading UX fixes

* unified calculations for pool liquidity

* stop the refetch madness

* profile provider already sets interval fetching for pool shares
* pool shares will change when chainIds, accountId is changed so no need to listen for changes again

* calculation tweaks

* pool stats tweak

* fix pool transactions

* fix data display in pool shares section

* minor fix, delete comment

* subgraph typings generation fix

* pool stats display tweaks

* price sizing fix

* rabbit hole fixes

* more price UI fixes

* cleanup

* wording consistency

* render all frontpage sections by default, load in assets after

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-03-09 12:58:54 +00:00
Bogdan Fazakas
8aaae669f7 fix compute timeout value 2022-03-08 01:23:54 +02:00
Bogdan Fazakas
95a65e784d wip compute jobs 2022-03-08 01:13:36 +02:00
Bogdan Fazakas
f1f1c17535 fixes and cleanups 2022-03-08 00:09:53 +02:00
Bogdan Fazakas
809429b728 update compute resources valid until logic 2022-03-04 01:07:00 +02:00
Bogdan Fazakas
fcc1e440fd fix edit compute settings 2022-03-03 21:09:37 +02:00
Bogdan Fazakas
2c05e1f945 merge v4 into v4-c2d 2022-03-03 17:45:47 +02:00
Bogdan Fazakas
fac744e94a fix algorithms selection list on allowAllPublisher case 2022-03-03 17:42:29 +02:00
mihaisc
af60018500
fix max add/remove liquidity (#1141)
* fix max add/remove liquidity

* fix graph liquidity

* small comment

* change liquidity graph to tvl, fix swap

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

* change label

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

* remove todo

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

* fix max remove liquidity
2022-03-03 12:23:23 +00:00
claudiaHash
8a5bddbf6e
Restore trade tab (#1047)
* get swap fee, max values

* use baseToken instead of ocean

* build fixes

* set form trade tx - WIP

* use pool info

* logs deleted

* merge fixes

* use local ocean.js, get spot price

* handle value changes, logs deleted

* fixes after v4 merge

* valid user liquidity displayed

* get correct token amount

* more fixes

* form trade fixes

* positive input values fix

* use proper swap functions

* use appConfig's marketFeeAddress

* remove redundant setters

* use consumeMarketPoolSwapFee

* use poolInfo, remove log

* code fixes

* some more fixes

* fees fix

* use poolInfo data

* various fixes

* fixes and cleanup

* fix build

* partial decimal fix

* add swap fee

* fix sub updates

* remove console

* fix package

* fix package-lock

* remove ssh

* fix blockies and package

* fix comments

* remove unused var

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2022-03-03 10:49:04 +00:00
Bogdan Fazakas
6a449eadcb fix prices 2022-03-02 16:42:50 +02:00
Bogdan Fazakas
b50c46e1f4 use compute env and compute consumer address 2022-03-01 12:11:20 +02:00
Bogdan Fazakas
5790ffd122 update order params 2022-03-01 11:59:26 +02:00
Bogdan Fazakas
109b9dcbb9 refactor start compute job and more fixes 2022-03-01 01:43:57 +02:00
Bogdan Fazakas
27665c277d fixed get algo list 2022-02-28 14:56:13 +02:00
Bogdan Fazakas
0085174e8d merge v4 into v4-c2d 2022-02-25 14:26:39 +02:00
Bogdan Fazakas
404f4edca1 small fix 2022-02-25 14:15:25 +02:00