1
0
mirror of https://github.com/oceanprotocol/ocean.js.git synced 2024-11-26 20:39:05 +01:00

25 Commits

Author SHA1 Message Date
Bogdan Fazakas
7500f51f46 merge v4refactoring and fixed conflicts 2022-08-17 12:37:03 +03:00
Bogdan Fazakas
30aba62ef7
Remove amm pools (#1568)
* WIP remove pools

* added logs

* update checksums and logs

* Updating CodeExamples.md

* remove console logs

* remove unused params, simplify test folder structure

* contracts folder simplification, remove ss contract methods

* path fix

* remove more "staking" code

* put back `removeApprovedToken()`

* remove redundant and unused test commands

* test fix, auto-fix & auto-format

* consistent specific imports

* readme updates

* remove addDispenserContract method

* remove tokens subfolder from contracts

* update js docs and put back addDispenserContract

* use new digest for algorthms

* update nft getData to fix failing unit test

* replace pools with fre in  buyDatatokenBatch

* use proper exchange ids

* increase allowance

* fix buyBatch test and deploy issues from testcontracthandler

Co-authored-by: GitHub Actions Bot <>
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-08-16 11:54:28 +01:00
Bogdan Fazakas
452bf22855 merge main and fixed conflicts 2022-08-11 16:13:31 +03:00
Bogdan Fazakas
470eff51ad update transfer and approve methods 2022-08-10 17:31:54 +03:00
Miquel A. Cabot
869ef38fc3
review provider URL (#1554) 2022-07-06 13:23:17 +03:00
Alex Coseru
be06f05365
update to new schema & compute fixes (#1510)
* update to new schema

* fix codeExamples

* fix computeflows
2022-06-15 19:03:56 +03:00
Miquel A. Cabot
83b8d1dce3 general renaming in FixedRateExchange 2022-06-14 10:52:51 +02:00
Miquel A. Cabot
ba8ea90a20 rename createNftErc20WithDispenser to createNftWithDatatokenWithDispenser 2022-06-10 11:32:58 +02:00
Miquel A. Cabot
77fcfe94f5 rename createNftErc20WithFixedRate to createNftWithDatatokenWithFixedRate 2022-06-10 11:30:22 +02:00
Miquel A. Cabot
4d56ca2e9e rename createNftErc20WithPool to createNftWithDatatokenWithPool 2022-06-10 11:28:55 +02:00
Miquel A. Cabot
29c581fde2 rename from erc20 to nft in comments 2022-06-10 11:19:08 +02:00
Miquel A. Cabot
71390cf862 rename erc20Params to datatokenParams 2022-06-10 10:56:40 +02:00
Miquel A. Cabot
6287005473 rename Erc20CreateParams to DatatokenCreateParams 2022-06-10 10:54:51 +02:00
Miquel A. Cabot
2c8832e22c inherit FixedRateExchange from SmartContract 2022-06-06 17:43:39 +02:00
Miquel A. Cabot
d12b669f65 fix Dispenser tests 2022-06-06 17:37:17 +02:00
Miquel A. Cabot
ba34fa7627 use the new transfer() function 2022-05-26 12:43:31 +02:00
Jamie Hewitt
b2ac1576ce Adding editing instructions 2022-05-18 14:08:02 +03:00
Miquel A. Cabot
f9a8c0a784 fix lint problems 2022-05-09 11:29:45 +02:00
Miquel A. Cabot
55fec840c3 get addresses from config file instead of deploying it 2022-05-09 11:19:34 +02:00
Miquel A. Cabot
1749b0d989 update call to Dispenser constructor 2022-05-09 09:01:05 +02:00
Jamie Hewitt
4968d2d63d Updating comments and numbering 2022-05-06 16:04:30 +03:00
Jamie Hewitt
d39c091999 Updating comments 2022-05-05 17:35:06 +03:00
Jamie Hewitt
75e0afa4d9 Adding additional comments in the code 2022-05-05 16:47:38 +03:00
Jamie Hewitt
0e4df185b1 Addign links 2022-05-05 16:27:57 +03:00
Jamie Hewitt
dd74300477 Merging changes from issue-1354-readme-integration-tests 2022-05-05 16:14:03 +03:00