Commit Graph

244 Commits

Author SHA1 Message Date
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
Matthias Kretschmann 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
Bogdan Fazakas 6e2e9875f1 Merge branch 'v4' into feature/v4-c2d 2022-04-04 22:26:13 +03:00
Matthias Kretschmann 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 e6b5cc15d6.

* 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
Matthias Kretschmann 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 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
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
claudiaHash b63c644962
Collect tokens by publisher (#1120)
* get tokens balance wip

* use ButtonBuy component

* collect and sum base tokens

* delete logs, get tx

* center button

* feedback and loader added

* query by exchangeId

* fixes

* correct token symbol, set balance to 0 after collect

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-02-25 02:36:32 -08:00
Bogdan Fazakas 73f3080daf
Restore edit functionality (#1107)
* add content on edit pages

* display edit for user only

* add form actions

* add restore part of edit metadata logic

* adjust edit metadata

* wip edit compute settings

* added console logs

* wip edit compute

* updated edit compute flow

* updated style

* fix pricing various fixes

* fix edit acctions

* add debug on edit compute tab

* add debug on edit metadata  tab

* more fixes

* lint fixes

* add pricing to edit metada

* restore timout edit

* protect edit route

* small fixes

* fixes and add edit feetback, loading, error, succes on submit

* timeout init values fix

* added setNftMetadata helper

* moved transfor asset to assetSelection from aquarius class

* fixed links, removed dispenser hacks

* fixed sample

Co-authored-by: mihaisc <mihai@oceanprotocol.com>
2022-02-25 02:33:07 -08:00
Norbi ed9b1ce2d2
Update fee display inside publish form (#1128)
* use fixed and pool swap fees from app config inside publish form price

* get opc fees from subgraph

* fixed undefined opcFees

* fixed get opc fees query

* removed logs, unused imports and added types

* remove unused import

* fetch opc fees from wallet network

* use fallback chainId and add chainId to dependencies array

* get app config from site metadata

* fixed getOpcFees typo

* changed community fee field value
2022-02-24 07:21:45 -08:00
Bogdan Fazakas d4570aa1cb merged v4 into c2d 2022-02-23 15:58:20 +02:00
mihaisc 6541068364
fix exchange id (#1137)
* fix exchange id

* fix

* fix dispenser
2022-02-22 08:10:26 -08:00
claudiaHash db7ae82f4a
Restore profile header and downloads tab (#1129)
* show results

* sales number displayed correctly

* get downloads

* use totalSales parameter

* fixes

* sum sales fix

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-02-21 17:15:33 +02:00
Matthias Kretschmann 3a424bc44c
bookmark fixes (#1127) 2022-02-18 11:46:34 +00:00
Matthias Kretschmann 5a4a30e0b0
fix search title (#1122) 2022-02-17 21:38:40 +00:00
Luca Milanese 1b9987ce89
fix: set default svg output to fill color (#1115) 2022-02-17 15:59:39 +00:00
mihaisc 60c5520548
update to ocean.js.next.20 (#1099)
* update and fix fees

* update lib

* update aquarius endpoint

* update lib and fix changes

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-02-16 18:42:35 +00:00
mihaisc 8d1782a800
Restore order (#1068)
* minor refactors

* minor refactors

* fixes

* buy dt

* consumePrice + estimation

* various fixes

* cleanup

* fix build

* fix ssh issue

* feedback

* build fix

* ssh fix

* remove console.log

* suggested fixes

* other fixes

* switch to decimal

* more fixes

* more fixes

* fix

* some fee refactors

* more fee refactoring

* lib update, fre rename

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

* minor refactors

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

* build fixes

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

* update + more refactoring

* calc price

* fix build

* restore accountId in effect

* fix order

* fix build and update lib

* fix order index

* fix comments

* pool fix

* remove console.log

* fix order fixed rate exchange

* fixed free order and messaging

* add comment

* minor type fix

* more type fixes
2022-02-14 08:27:36 -08:00
Moritz Kirstein d688b81a80
Feature: SVG Generator (#1032)
* use smaller SVG for publishing test, siwtch to Buffer encoding/decoding

* shorter NFT name & symbol

* fix: fix small test svg

* feat: first draft random wave svg generation

* refactor: utilize join to remove unecessary ',' separator

* feature: add gas cost estimation for nft artwork

* refacotr: allow fillColor as array and adjust opacity

* refactor: adjust random wave generation

* refactor: change nft help text

* refactor: trying tooltip for nft image info

* feat: add custom algorithm to generate svg waves

* fix: use text colors for nft form field svgs

* refactor: code cleanup nft utils

* refactor: improve readability

* refactor: improve comment

* refactor: (re)move comments, cleanup

* refactor: remove console log

* refactor: adjust default svg wave values & remove logging

* refactor: tweak default SvgWave prop values

* fix: svg preview with disconnected wallet

* feat: show artwork gas fee estimation in user preferred currency

* refactor: extract gas fee estimation logic to new component

* cleanup: remove oceanWaves, remove d3

* icon visual weight tweak

Co-authored-by: Luca Milanese <luca.milanese90@gmail.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-02-14 12:16:29 +00:00
claudiaHash aec34dc712
Restore highest liquidity tab (#1077)
* get highest liquidity pools WIP

* logs deleted

* order fix

* query fix

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-02-10 16:41:07 +02:00
Bogdan Fazakas cd2a4da8c5 move asset selection to compute helper 2022-02-10 16:33:16 +02:00
EnzoVezzaro b79385bbcf
fixed bookmarks not showing on homepage (#1072) 2022-02-09 13:14:32 +00:00
Bogdan Fazakas b4a60b833c Merge branch 'v4' into feature/v4-c2d 2022-02-08 09:03:07 +02:00
Matthias Kretschmann b8c2b01b54
Pool stats updates and pool context provider (#1057)
* remove datatokens from liquidity stats, multiply base token

* naming: Pool Creator Statistics → Owner Liquidity

* remove all the noise

* more pool stats data

* simplify user liquidity data structure, remove datatoken calculations

* chart tweaks, new calculation for liquidity

* tweaks

* todo

* frontpage error fixes

* account switch fixes

* comment out fees

* pool context provider

* double pool share

* move subgraph-related methods into context provider

* typing fix
2022-02-07 14:58:47 +00:00
Matthias Kretschmann 24fd4de584
fix file info (#1061) 2022-02-04 15:58:11 +00:00
Bogdan Fazakas aee75a2fc6 merge v4 branch into restore c2d 2022-02-03 23:21:02 +02:00
Bogdan Fazakas 2e39ef93e4 merge v4 branch into c2d restore and fix merge conflicts 2022-02-03 23:18:45 +02:00
Matthias Kretschmann 64255f2b37
Remove asset purgatory workaround (#1056)
* revert asset purgatory workaround

* reverts #1016

* asset loading fix
2022-02-03 15:26:49 +00:00
Matthias Kretschmann 8074a6143c
Refactor Asset context provider (#1055)
* refactor Asset context provider

* use useIsMounted hook

* typings and effect tweaks

* use chainId

* effect tweak
2022-02-03 14:31:43 +00:00
mihaisc 57be62a6b1
Refactor pricing and various components that are involved (#1046)
* update

* merge pr #1012

* fix header

* fix

* abort controller

* up next.8

* build fix

* update lock

* fix

* another fix

* ssh fix

* another ssh fix

* remove optional

* order mock

* small cleanup

* fix package

* price updates

* finish getPrice

* fix consume

* fix consume

* getConsumeDetails  comments

* restore functionality after consumeDetails

* fix some compute typings

* more price fetching updates

* 'minor' refactors and fixed build

* package-lock fix

* minor comments

* minor naming changes

* fix

* fix pool badge

* remove console.log
2022-02-03 03:29:39 -08:00
Bogdan Fazakas ff1f953ffe merge v4 branch into c2d restore 2022-01-31 16:52:54 +02:00
Matthias Kretschmann 9ebb57d2af
subgraph pool address type workaround 2022-01-31 12:42:23 +00:00
Matthias Kretschmann 1e54a9d573
merge all the pool data subgraph queries into one 2022-01-31 12:42:23 +00:00
Matthias Kretschmann 8293e9ad5f
subgraph update fixes 2022-01-31 12:41:58 +00:00
Bogdan Fazakas d6823184ca merge v4 branch into c2d restore 2022-01-27 10:56:10 +02:00
Bogdan Fazakas 0077ac728e add isOrderable and other helpers 2022-01-27 10:52:53 +02:00
mihaisc 487bcad8b4
Update ocean.js (#1013)
* update

* merge pr #1012

* fix header

* fix

* abort controller

* up next.8

* build fix

* update lock

* fix

* another fix

* ssh fix

* another ssh fix

* remove optional
2022-01-26 10:17:41 +00:00
Bogdan Fazakas 5f9bc14095 Merge branch 'v4' into feature/v4-c2d 2022-01-25 11:03:35 +02:00
Matthias Kretschmann f55d8d9a91
Pool tab refactor (#1009)
* refactor and simplify

* fix user pool transaction section

* split up fetching and data manipulation

* restore refetch after add/remove, rename all the things

* more naming and logging

* new state structure unifying multiple data structures

* another response failsafe

* naming
2022-01-21 14:09:15 +00:00
claudiaHash 42323cb8c4
Use asset's ddo.purgatory (#1006)
* set purgatory state

* merge v4 changes, use ddo.purgatory

* delete commented code, fix verification

* unused files and function deleted, small fix

* comment removed

* use purgatory.state for filtering assets

* remove unnecessary check

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-01-19 16:30:04 +00:00
Bogdan Fazakas afd1c2d9db add balance check and check is consumable 2022-01-19 09:12:59 +02:00
Matthias Kretschmann 1726fe1d0d
isolate apollo stuff into npm script, more generic folder name output 2022-01-13 23:50:47 +00:00
Matthias Kretschmann de87e16906
remove graphql-codegen stuff
* keep existing apollo-based generation as it just works
* can be put back from this commit when doing #722
2022-01-13 22:27:00 +00:00
Matthias Kretschmann 68ad4cc160
migrate most components using GraphQL queries 2022-01-13 22:03:36 +00:00
Matthias Kretschmann d78676fa3b
migrate data in subgraph.ts 2022-01-13 21:41:19 +00:00
Matthias Kretschmann 829333e1e1
migrate all subgraph.ts queries, making typings generation work 2022-01-13 21:24:06 +00:00
claudiaHash 8838ae533e
Adapt aquarius queries (#986)
* get aquariusv4 assets

* subgraph url fix

* make asset details work as much as possible

* sort and size fix, comments deleted

* get published assets

* search wip

* page change  fix

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-01-13 18:17:09 +00:00
Matthias Kretschmann 2e794f51a8
use generateDtName from ocean.js (#992) 2022-01-13 17:51:33 +00:00
Matthias Kretschmann f6097bf158
remove OceanProvider (#988) 2022-01-13 13:15:15 +00:00
Matthias Kretschmann 329ac9bbc3
shorten NFT symbol
* ref #944
2022-01-13 12:07:55 +00:00
Matthias Kretschmann 25920b7763
more logging within createTokensAndPricing 2022-01-12 19:05:15 +00:00
Matthias Kretschmann e5ee3e10c7 working feedback state switching 2022-01-12 18:02:56 +00:00
claudiaHash 44114345bb
Integrate provider fileinfo (#965)
* provider functions added

* working validation

* fixes, comments deleted

* lint fix, comment deleted

* fixes over the provider functions integration

* remove unused provider.ts exports

* provider checkFileUrl() integration

* provider encrypt method changes

* use fetch method

* axios request reused

* dependency removed

* getFileInfo fixes

* remove unused const

* function call fix

* use providerUrl form value

Co-authored-by: ClaudiaHolhos <claudia@oceanprotocol.com>
2022-01-12 17:02:47 +00:00
Matthias Kretschmann a084c038c5
merge fixes 2022-01-11 19:58:39 +00:00
Matthias Kretschmann 38ce25225f
Merge branch 'v4' into feature/publish 2022-01-11 19:49:11 +00:00
Matthias Kretschmann 64a25f3f3e
use Asset from ocean.js, adapt to new structure 2022-01-11 19:45:14 +00:00
Matthias Kretschmann d9b52e6da5
Merge branch 'v4' into feature/publish 2022-01-11 19:06:16 +00:00
Matthias Kretschmann b5b0297ae4
refactor for new ocean.js, make the build work 2022-01-11 19:05:07 +00:00
Matthias Kretschmann fee5973f81
naming: NftOptions → NftMetadata 2022-01-11 15:40:40 +00:00
Matthias Kretschmann c3301fb437
NFT metadata updates
* switch to `image_data` instead of `image` key
* add `external_url` & `background_color`
* make following OpenSea standard more clear
* ref #944
2022-01-11 14:52:01 +00:00
Matthias Kretschmann a235255cc0
Merge branch 'v4' into feature/publish 2022-01-11 13:23:40 +00:00
mihaisc 8e60738071 fix publish with pool 2022-01-10 17:49:46 +02:00
ClaudiaHolhos e716f96d67 removed unused import 2022-01-10 13:06:07 +02:00
ClaudiaHolhos 5050621e28 isValidUrl called directly, extra function removed 2022-01-10 12:13:53 +02:00
mihaisc c7d6616874 fixes & hacks 2021-12-21 22:26:08 +02:00
mihaisc b86ac219f3 interm 2021-12-20 16:38:54 +02:00
ClaudiaHolhos 62ced13eaf remove fetchMehod() 2021-12-15 13:10:11 +02:00
ClaudiaHolhos e028dd9674 working check 2021-12-14 14:59:16 +02:00
ClaudiaHolhos 6813462cb0 use new provider 2021-12-13 17:23:29 +02:00
mihaisc 4caf72d0c9
Fix/old lib dep (#959)
* fixes

* change aqua url

* update future v4 url
2021-12-10 03:33:47 -08:00
mihaisc b0adbf8071
add account teaser, various refactors (#957)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-12-10 01:50:00 -08:00
Matthias Kretschmann 155d65eb58
reorg 2021-11-24 13:31:23 +00:00
Matthias Kretschmann c484a5b40c
new publish preview (#947)
* refactor preview

* make preview render

* more preview elements, proper debug output

* make more elements work

* cleanup and fixes

* make asset actions preview work, kinda

* more fixes

* reorg

* make preview price display work

* fix timeout

* layout tweaks

* fixes

* another fix

* make file info preview work

* empty render fix
2021-11-23 12:53:09 +00:00
Matthias Kretschmann 713de2eb94
data structure change 2021-11-19 13:49:29 +00:00
Matthias Kretschmann d3810168aa
first go at randomly-generated ocean waves 2021-11-16 21:06:02 +00:00
Matthias Kretschmann 08c42e8fa6
prepare NFT image creation 2021-11-15 20:47:59 +00:00
Matthias Kretschmann abfe920150
prepare NFT creation 2021-11-15 19:33:42 +00:00
Matthias Kretschmann 82951548ef
reorg Form components one level up 2021-11-15 18:29:20 +00:00
Matthias Kretschmann 94147026c0
prepare datatoken & NFT display 2021-11-15 15:04:26 +00:00
Matthias Kretschmann a396615ed4
move over datatokens utils from ocean.js 2021-11-15 15:01:39 +00:00
Matthias Kretschmann 704b52a3c4
more publish flow preparation
* consolidate scattered methods into publish utils
* new encrypt method
* remove DDO File typings
2021-11-11 13:40:38 +00:00
Matthias Kretschmann 4e985ba633
ddo updates 2021-11-11 09:22:22 +00:00
Matthias Kretschmann 3d4b30c00f
new DDO (#941)
* type out new DDO

* remove all DDO ocean.js imports

* move over as much as possible to new DDO structure

* DDO/Asset split-up

* use Asset typing instead of DDO almost everywhere

* more typings

* more DDO refactor

* ddo typings updates

* more DDO updates

* updates

* ddo updates
2021-11-11 07:51:13 +00:00
Matthias Kretschmann 66adc097b6
declarative metadata & services form setup, prepare transformPublishFormToDdo method 2021-10-28 10:38:40 +01:00
Matthias Kretschmann 1cf69c2423
fix next.js env vars 2021-10-27 18:07:11 +01:00
Matthias Kretschmann 3729c63581
migrate to Next.js (#935)
* migrate to Next.js

* migrate scripts

* generate markdown pages

* make all the markdown work

* fix profile, fix image loading

* git+ssh → git+https, again

* bump packages

* maybe windows build fix

* add public to gitignore

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

* Next.js v12! Webpack 5! No build hacks anymore

* json import fixes

* fixes

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-10-27 11:30:32 +01:00
Matthias Kretschmann 032b3e1496
quick refactor of AssetList data flow 2021-10-27 11:30:32 +01:00
Matthias Kretschmann b6cfe6de34
more refactor 2021-10-27 11:30:28 +01:00
Matthias Kretschmann 51785d54dd
more reorganization 2021-10-27 11:29:03 +01:00