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

123 Commits

Author SHA1 Message Date
4df84b8b14
split up network list into main & test networks 2021-06-09 19:41:12 +02:00
ef218a9d9e
chainId switching mechanism 2021-06-09 11:45:36 +02:00
21792e9d4f
move OceanProvider to asset route 2021-06-04 15:13:47 +02:00
3332249928
refactor and tinkering 2021-06-04 15:06:24 +02:00
10b29c6e37
unify network names, more icons 2021-06-04 15:00:33 +02:00
fc6f611ac0
Merge pull request #617 from oceanprotocol/feature/package-updates
Bump all non-gatsby dependencies / npm v7
2021-06-04 14:34:09 +02:00
claudiaHash
f73191ef1a
Remove price.isConsumable from elastic query (#639)
* price.isConsumable removed from query
* subgraph query updated

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-06-04 13:23:18 +02:00
b516e95879
prettier formatting updates 2021-06-04 11:43:47 +02:00
claudiaHash
88663d812a
Highest liquidity list based on subgraph (#512)
* fetch pools from graph, fetch ddos for pools

* WIP on displaying highest liquidity assets

* loader added

* check ddo state for each asset

* data ordered  by valueLocked, logger added

* filter ddos for purgatory

* verify  ddo isConsumable price attribute

* moved query into subgraph.ts

* send did list, fix assets display

* fixes on assets display

* assets sorted by dids

* get assets on correct order

* get assets in correct order

* loading assets fixes

* correct order and loading, network overloaded

* fixes on loading

* fixed on network change, added loading

* fixed on network change when no wallet connected, improved loading

Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-06-02 12:14:54 +03:00
Bogdan Fazakas
7cc6b9b95b Merge branch 'main' into fix/issue583-start-second-job 2021-05-17 17:24:07 +03:00
Bogdan Fazakas
e620ee2a47 Merge branch 'main' into fix/issue583-start-second-job 2021-05-17 17:13:13 +03:00
Jamie Hewitt
d887675f82
Add datatoken to wallet for metamask users (#574)
* upgrading to ocean.js 0.14.6

* saving initial changes

* creating seperate component for adding tokens

* showing datatoken name

* adding button for metamask users

* using substring as datatoken symbol

* removing duplicated code

* removing empty div element

* removing unneccessary div element

* no longer sending the whole DDO

* refactoring add token functions

* updating function name

* no longer sending the whole ddo to the addDataToken component

* removing DDO import

* small refactor, get web3 provider info in useWeb3

* general AddToken component

* cleanup

* cleanup, remove symbol shortening

* copy, layout tweaks

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-05-17 16:12:22 +02:00
Norbi
65194696d3
Handle asset price in teaser (#596)
* used price from subgraph for asset teasers

* moved loading component inside AssetList

* replaced any with proper types inside subgraph utils

* fixed loading component displayed when empty assets or prices list

* show loading component when refetching data on sort and filter

* get each asset price before displaying the component, loading changes

* refactoring functions for getting asset prices

Co-authored-by: Norbi <katunanorbert@gmai.com>
2021-05-17 17:08:15 +03:00
Bogdan Fazakas
065419f739 Merge branch 'main' into fix/issue497-fetch-price-subgraph 2021-05-13 13:47:04 +03:00
Bogdan Fazakas
3dba118546 remove unnecessary console log 2021-05-11 16:15:35 +03:00
Bogdan Fazakas
5adf03c5f1 added fetchPolicy no-cache on graph requests from subgraph.ts util 2021-05-11 16:09:16 +03:00
Bogdan Fazakas
ff1d987b5d Merge branch 'main' into fix/issue497-fetch-price-subgraph, fixed merge conflicts 2021-05-10 16:27:32 +03:00
Bogdan Fazakas
fadffb5d87 added no cache fetch policy on appolo request and removed debug logs 2021-05-10 15:35:49 +03:00
Bogdan Fazakas
e73d140012 trigger check previous order after starting a compute job 2021-05-07 16:00:40 +03:00
Jamie Hewitt
0a739cbe93
Support for Moonbase Alpha (#552)
* upgrading to ocean.js 0.14.6

* proper ocean.js update

* make all explorer links work

* handle new moonbeamalpha config

* add moonbase alpha to chain user preferences

* more ocean.js v0.14 updates

* switch to grid

* upgrading ocean.js to 0.14.7

* lock to @oceanprotocol/contracts v0.5.16

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-29 14:48:57 +02:00
7f5a8e11cc
dataset → file
* closes #567
2021-04-28 20:20:56 +02:00
Bogdan Fazakas
369b075aa9
fixed compute algorithm pool price value (#553) 2021-04-23 15:44:31 +02:00
Bogdan Fazakas
1d02f53a06 fixed no price set usecase 2021-04-23 12:07:59 +03:00
Bogdan Fazakas
0cef2cccd5 update price value for pool assets using consumePrice and added isConsumable logic 2021-04-22 14:03:58 +03:00
Bogdan Fazakas
7b653c46ba fetch asset price withoud relying on ddo.price 2021-04-20 09:44:18 +03:00
4a83732255
Merge branch 'main' into feature/compute 2021-04-15 13:50:07 +02:00
a8aebf2fac
set isConsumable to true by default (#523)
* set isConsumable to true by default

* kick out dtUtils, cleanup

* cleanup

* tweak AssetTeaser price check
2021-04-15 13:47:32 +02:00
79497adbab
package fix 2021-04-15 11:24:00 +02:00
fff5699c67
Merge branch 'main' into feature/compute 2021-04-14 15:31:36 +02:00
Bogdan Fazakas
1696fb2c44 use priceList interface instead of any for return type 2021-04-14 14:41:17 +03:00
Jamie Hewitt
7c09ceca06
Issue 366/dataset publish ux (#461)
* changing the info text for dataset input

* Updating error message for invalid dataset input

* chaning button styling to make it look more like a button

* fixing package-lock.json issue

* removing changes from package-lock.json

* adding onBlur event to validate the data input

* Removing autoclose on error message

* adding success message when the dataset is valid
2021-04-14 13:24:07 +03:00
Bogdan Fazakas
56554028b8 merged compute into subgraph-util-methods 2021-04-13 19:21:05 +03:00
Bogdan Fazakas
1c2d81049d refactor getAssetPrices method, not using ddo.price.type anymore 2021-04-13 19:15:09 +03:00
faa6a8329a
Merge branch 'main' into feature/compute 2021-04-13 15:14:59 +02:00
Jamie Hewitt
7672d78aee
Refactoring Market for new Ocean.js build (#481)
* removing imports from utils folder

* lib bump

* update status args

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2021-04-13 15:13:55 +02:00
Norbi
b8247c7ef4
The Graph sync status (#466)
* WIP

* query update

* quick fix

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

* get blocks number when no provider, added threshold

* format code

* naming fix

* show graph out of sync message inside announcement banner

* added loader

* moved sync component

* refactor all the things

* new atoms/AnnouncementBanner : banner component reduced to presentation only, where its content is always passed as props

* revised molecules/NetworkBanner: the former AnnouncementBanner now holds all the specific network detection logic, in the end also returns the atoms/AnnouncementBanner

* new hook hooks/useGraphSyncStatus: move all the graph fetching logic in there so we can use its status in multiple places in the app without all this props passing. This also decouples the SyncStatus component in footer from its logic

* in App.tsx, add the graph sync warning banner in another atoms/AnnouncementBanner, getting its values from the hook

* data flow refactor

* .env.example tweak

* race condition fighting

* subgraph loading

* polygon fallback fix

* no interval fetching

* turn around logic for adding infura ID

* removed graphNotSynched

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
Co-authored-by: Norbi <katunanorbert@gmai.com>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-13 10:57:59 +02:00
Bogdan Fazakas
a27bc6718a update get prev order method & small typo 2021-04-12 17:09:41 +03:00
Bogdan Fazakas
0740917731 typo fixes 2021-04-12 13:52:09 +03:00
Bogdan Fazakas
c533d1ee0c get compute previous orders from subgraph util 2021-04-11 02:13:43 +03:00
Bogdan Fazakas
2cce93d502 fetch asset list prices from the graph 2021-04-09 12:55:18 +03:00
claudiaHash
36084fbc1f
output datatoken symbol for each asset in asset selection (#477)
Co-authored-by: claudia.holhos <claudia.holhos@hpm.ro>
2021-04-06 09:49:16 +02:00
432961b278
Merge branch 'main' into feature/compute 2021-04-01 17:29:29 +02:00
Bogdan Fazakas
18f2c99e78
Start compute job (#439)
* Wip start compute job

* Wip select algorithm design

* Asset selection form component, for start compute job (#442)

* prototype AssetSelection

* assetselection styling

* typing "fix"

* put back file info icon

* AssetSelection styling in context

* update start job method, fixed algo select, and fixed option typing

* compute logic update

* add has previous orders for algo asset

* fixed search algorithm assets in start compute form

* fixed lint errors

* updated previous order for algo logic and compute flow

* update use price hook and added buy DT for algo

* display only alg of type exchange and sort by value

* display only trusted algo for asset if field is set

* added logic for allow all published algorithms or no algorithms allowed

* asset selection style & spacing tweaks

* refactor get algorithms for compute and edit compute

* fixed form options and more refactoring

* new ButtonBuy component

* shared component between consume/compute
* dealing with various states: loading, previous orders, help text output

* effect dependencies

* move error output into toast

* formik data flow refactor

* ditch custom field change handler
* fix initialValues
* typed form data & validation
* fixes multiple form validation issues along the way

* isInitialValid → validateOnMount

* metadata display tweaks

* error feedback tweaks

* oler assets checks, confeti on succes job, market fee on order, removed algo compute logic

* more startJob logging

* feedback & messaging changes

* metadata display

* return all algos, fixed & dynamic priced ones

* fix DOM nesting

* messaging updates

* copy tweaks

* check algorithm previous history for both acces and compute sercive types

* handle start compute error

* extra checks on start compute response

* styling tweaks, fix toast UI errors

* AssetSelection: empty screen, tweak min/max height

* fix FRE issues on start compute

* check is ordarable before start compute job

* logging tweaks

* disable eslint no-unused-vars rule for some Apollo code blocks

* fix metadata editing for compute assets

* consider dataset timeout for compute too

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-04-01 17:21:08 +02:00
Norbi
96296008c9
Add custom network (#450)
* add custom network

* created announcement banner

* add custom network from banner

* show ADD CUSTOM NETWORK on MetaMask provider

* show add ocean to wallet action

* removed warningPolygon from alert

* removed customNetwork component

* remove Add custom network on asset details page

* Details use function from web3 to add token

* changed available on Polygon link, refactoring

* show Switch to Polygon when no wallet connected

* banner content for no provider and Polygon network

* change message when not provider and eth network

* changed warning and added announcement in site.json

* moved network logic inside Announcement, moved Announcement component

* added switch to ETH button, refactoring

* removed add mOcean action button

* moved location verification to App.tsx

* styling & copy updates

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-03-30 15:37:30 +02:00
6d14181d17
Merge branch 'main' into feature/compute 2021-03-26 12:24:09 +01:00
Norbi
977a38e118
Edit compute dataset (#417)
* WIP

* created form for editing compute privacy

* used editComputePrivacy method

* select and update trusted algorithm

* display and select multiple trusted algorithms

* fixed update when trusted algorithm list not changed

* code refactoring

* moved separator inside condition

* moved functions and interface from EditComputeDataset component

* moved algorithmOptions to parent component

* used AssetSelection to display algorithms

* use AssetSelection to select trusted algorithms

* getAlgorithmsOptions function review

* review fixes

* removed unused imports

* merge fixes

* AssetSelection style & usability tweaks

* use custom radio & checkbox styles
* add simple search for name & DID
* spacing adjustments

* copy updates, remove raw algo input, hardcode allowRawAlgorithm

* copy

* AssetSelection usability tweaks

* make rows clickable
* tweak layout, style and markup

* use formik set function to update values

* sorted algorithm list, added checked field

* sort assetSelection list on user select

* fix getAlgorithmsForAssetSelection breaking on empty responses

* form debug output

* another empty publisherTrustedAlgorithms fix

* created separate algorithms state for the form, sort list on edit

* refactor

* use Formik functionality wherever possible
* unify transforming form data to final data

* fix form debug transformation

* fix form submit, fix defaultChecked

* refactor

* use Formik functionality wherever possible
* unify transforming form data to final data

* fix form debug transformation

* fix form submit, fix defaultChecked

* disable assetSelection when allowAllAlgorithms is true

* added loader to AssetSelection

* changed allowAllAlgorithms to allowAllPublishedAlgorithms

* fixed lint error

* updated transformComputeFormToServiceComputePrivacy

* lint fix

* modify publish defaults

Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2021-03-25 08:34:07 +01:00
Norbi
ed9eb61c1c
Add custom token from the wallet (#437)
* WIP

* added button that allows to push custom token to metamask

* added image url

* use provider from ocean, add mOCEAN symbol to Matic

* use token symbol based on networkId

* removed customToken.json, used Logger to display message

* log error

* fixed log

* review fixes

* used oceanTokenSymbol from config

* getOceanConfig fix
2021-03-22 12:48:28 +01:00
df587bb5b5
Merge branch 'main' into feature/compute 2021-03-17 12:58:13 +01:00
bdccb0966f
Web3/Ocean splitup + full Polygon/Matic support (#433) 2021-03-17 11:44:26 +01:00
Bogdan Fazakas
d1c4cdb29f
Merge branch 'main' into feature/compute 2021-03-05 13:51:26 +02:00