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
Bogdan Fazakas
6e2e9875f1 Merge branch 'v4' into feature/v4-c2d 2022-04-04 22:26:13 +03:00
fc2681231b
fix transferable NFTs (#1309)
- send along `transferable` param when creating NFT
- new optional `transferable` param in our `generateNftCreateData()` helper, default to `true`. So we don't need to bother adding this to the publish tx fee component
- capture new key in form data, `metadata.transferable`, set to `true` by default. This prepares this to be added as a UI option later on
2022-04-04 20:13:39 +01:00
mihaisc
3dd21bd20d
update publish params for new contracts (#1308)
* fix params

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

* fix params

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-04-04 18:16:04 +03:00
EnzoVezzaro
b574daee30
fix wrong TVL on pool tab (#1281)
* remove multiplier from totalLiquidityInOcean

* Revert "remove multiplier from totalLiquidityInOcean"

This reverts commit e6b5cc15d640e87569c8f87662f54fe318de8ba4.

* restore totalLiquidityInOcean calculation

* getting user / owner liquidity from calcSingleOutGivenPoolIn + some clean up

* removed web3 hook in favor of dummyWeb3 connection

* remove calc on user liquidity (YVL)
2022-04-04 14:29:31 +01:00
Bogdan Fazakas
84afa42903 update computeStatus signature to fix build and CI 2022-04-04 15:56:36 +03:00
Bogdan Fazakas
2dc12a2542 Merge branch 'feature/v4-c2d' into 'fix/compute-jobs' 2022-04-04 15:22:18 +03:00
Bogdan Fazakas
0c87abe24d Merge branch 'v4' into feature/v4-c2d 2022-04-04 15:19:31 +03:00
claudiaHash
65f0c5c675
Price length and decimals number validation (#1225)
* price length and decimals number validation

* undefined parameter fix

* fixes

* use  the decimals constant in regex

* validation added for moire fields

* cleanup

* swap fee decimals fixes

* constant fix

* use max 6 decimals for swap fee

* remove unused code

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-04-01 11:38:32 +03:00
Bogdan Fazakas
f36f3bcc14 wip get results 2022-03-31 11:49:42 +03:00
Bogdan Fazakas
72c7cc9f00 merge v4-c2d into compute-jobs 2022-03-30 14:58:20 +03:00
Bogdan Fazakas
d244b9b394 merge v4 into v4-c2d 2022-03-30 14:40:53 +03:00
Bogdan Fazakas
9171db8b6e fix compute jobs section and your jobs 2022-03-30 09:12:14 +03:00
6e2e46d8ea
Disable pool fetching interval (#1265)
* disable pool fetching interval

* change requestPolicy

* trigger refetch on back button click for add/remove

* fix memory leak error

* refetch on refocus

* add manual refresh button
2022-03-29 14:32:45 +01:00
Bogdan Fazakas
70f181a595 removed to lowerCase on eth address 2022-03-28 18:36:52 +03:00
Bogdan Fazakas
c05fa7c7b2 Merge branch 'v4' into feature/v4-c2d and fix conflicts 2022-03-28 16:20:58 +03:00
Bogdan Fazakas
d42b0b6a2d merge branch v4-c2d into fix/compute-jobs 2022-03-28 10:23:58 +03:00
Soon Huat
ba672e99ac
remove percentage fee from price sum, depends smart contract calculation (#1249)
Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
2022-03-24 16:56:09 +02:00
Luca Milanese
300b5b9ef3
fix: assign viewBox property to svg waves (#1247) 2022-03-24 12:11:41 +00:00
claudiaHash
5f174bca88
Remove collect tokens button (#1235)
Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-03-23 13:30:03 +00:00
Bogdan Fazakas
4195e8df81 update provider compute status call 2022-03-22 08:16:54 +02:00
Bogdan Fazakas
51b882f256 fix aquarius call and added logs 2022-03-21 11:10:09 +02:00
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
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 f387175970f763b4921af10d938d47920af08b4f.

* 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
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
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
Bogdan Fazakas
2ef29d905e fix edit compute checksums for files and container 2022-03-16 12:20:50 +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
62f5803e49 update start compute flow messages 2022-03-12 14:44:12 +02: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
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
95a65e784d wip compute jobs 2022-03-08 01:13:36 +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
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
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