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

51 Commits

Author SHA1 Message Date
Bogdan Fazakas
04deabccd3 set min gas fee 30 gwei on priority fees for polygon and mumbai as well 2023-05-30 14:35:24 +02:00
Alex Coseru
9bf71ba4f0
Features/ethers (#1696)
* add ethers

* global updates

* ve updates

* ve tests

* contract updates

* first test passing

* downgrade to ethers 5.7.2

* add log

* add tx wait

* full NftFactory.test

* add wait

* add Router tests

* fix dispenser

* Nft test

* add dispenser tests

* add fre tests part 1

* WIP datatoken unit tests

* add DFRewards test

* increase gas estimate

* increase gas estimate

* Work datatoken unit tests

* datatoken test more tests

* finished datatoken tests

* fix nft get data

* fix nft transfer tests

* Provider int tests

* Updating CodeExamples.md

* update provider & fix publish flow int test

* wip publish edit consume integration test

* more work on  publish edit consume integration test

* fix edit  publish edit consume integration test

* add 3 int tests

* Updating ComputeExamples.md

* fix signature and download

* fix compute flow integration test

* udapte handleComputeOrder helper

* update datatoken instance

* update datatoken global variable

* mint ocean tokens to consumer as well and added logs

* update compute exammples

* Updating ComputeExamples.md

* wip code examples readme

* update code examples readme

* Updating CodeExamples.md

* run all tests

* update dep in readme

* update readme

* code examples update metadata flags

* update dt instance in code examples md

* set metadata updates

* Updating CodeExamples.md

* update code examples readme structure

* Updating CodeExamples.md

* update readmes table links

* Updating CodeExamples.md

* Updating ComputeExamples.md

* clean-up

* Updating CodeExamples.md

* added missing unit tests for usdc fixed rate exchange tests

* more cleanup and jsdoc updates

* more  jsdoc updates

* donw with jsdoc updates

* handle provider errors

* add missing error handling file

* adds most of the provider errors

* update get compute env return type

* Release 3.0.0-next.0

* adding Typedoc to ethers branch

* update provider signature message

* fix lint

* Release 3.0.0-next.1

* fix lint

* adding Typedoc to ethers branch

* Updating CI to build and commit the documentation

* Updating documentation

* Updating script permissions

* fix todos add missing logic to send tx

* npm package cleanups

* Release 3.0.0-next.2

* update log messages for errors

* Release 3.0.0-next.3

* fix gasFee issue on sendTx

* Release 3.0.0-next.4

* add consume params typings (#1731)

* fix gas fee estimate

* remove comments

* add some delays before resolving datasets

* adds delay to Publish flow tests

* Release 3.0.0-next.5

---------

Co-authored-by: Bogdan Fazakas <bogdan.fazakas@gmail.com>
Co-authored-by: GitHub Actions Bot <>
Co-authored-by: Jamie Hewitt <jamie.hewitt15@gmail.com>
Co-authored-by: Jamie Hewitt <jamie@oceanprotocol.com>
2023-05-29 11:20:38 +03:00
Bogdan Fazakas
8de514f15b
Min 30gwei polygon main and mumbai fees (#1671)
* wip tx underpriced

* cleanups

* small fixes

* added comments
2022-12-22 09:35:46 +02:00
Bogdan Fazakas
315942db41 add error check for logs message 2022-08-19 16:34:59 +03:00
Bogdan Fazakas
36733da271 more review fixes restric return types for estimate and sendtx methods 2022-08-18 13:38:51 +03:00
Bogdan Fazakas
16a1f0b094 review fixes 2022-08-18 10:50:50 +03:00
Bogdan Fazakas
a5e5d69241
Update log based on suggestion src/utils/ContractUtils.ts
Co-authored-by: Matthias Kretschmann <m@kretschmann.io>
2022-08-18 09:36:38 +03:00
Bogdan Fazakas
89b83221de cleanups and warnings 2022-08-17 15:14:54 +03:00
Bogdan Fazakas
5de542898c use latest instead of pending for fee history 2022-08-17 13:42:45 +03:00
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
Phan Soon Huat
6e200a5205 add gas fee multiplier to max priority fee 2022-08-14 23:20:37 +08:00
Bogdan Fazakas
f6c03fce27 added missing changes 2022-08-11 18:03:50 +03:00
Bogdan Fazakas
452bf22855 merge main and fixed conflicts 2022-08-11 16:13:31 +03:00
Bogdan Fazakas
41881ac6eb fix getFairGasPrice 2022-08-10 16:19:04 +03:00
Bogdan Fazakas
8b1842e1e9 use try catch in sendTx 2022-08-10 15:52:43 +03:00
Bogdan Fazakas
7941829ad6 update fee calculations 2022-08-10 15:37:49 +03:00
Bogdan Fazakas
60a3f5af20 add suport for eip 1559 2022-08-10 15:25:43 +03:00
mihaisc
34c9a39157
fix conversion (#1538)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-06-29 16:46:12 +03:00
mihaisc
237e948107
Proper conversion to wei of base token when ordering (#1527)
* proper conversion to wei

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

* fix conversion in pool

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

* fix test

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

* fix lint

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-06-24 17:22:18 +03:00
Miquel A. Cabot
8a4ca6c178 fix lint issues 2022-06-21 12:21:13 +02:00
Miquel A. Cabot
d387076a08 Remove try...catch from ContractUtils 2022-06-21 11:42:55 +02:00
Miquel A. Cabot
74b623cacc set calculateEstimatedGas return value to any 2022-06-12 11:13:26 +02:00
Miquel A. Cabot
2cbb3c3ba8 rename estimateGas() to calculateEstimatedGas() 2022-06-11 23:38:22 +02:00
Miquel A. Cabot
d435d3c2be change return type for estimateGas() 2022-06-10 22:52:07 +02:00
Miquel A. Cabot
f8d6610c64 remove unused imports 2022-06-09 13:08:44 +02:00
Miquel A. Cabot
252ff6a0f4 move functions from ContractUtils to Datatoken 2022-06-09 13:04:14 +02:00
Miquel A. Cabot
ad560ce4ef move functions from ContractUtils to NFTFactory 2022-06-09 13:02:26 +02:00
Miquel A. Cabot
2636352a72 refactor utils/ imports 2022-06-03 14:12:00 +02:00
Miquel A. Cabot
f7a1183c90 remove default exports 2022-06-03 14:01:54 +02:00
Miquel A. Cabot
e4b1942e70 change Config file to src/config 2022-06-02 19:07:52 +02:00
Miquel A. Cabot
b3102c78c1 add decimals() function 2022-05-27 10:55:12 +02:00
Miquel A. Cabot
6f74add54b revert console.log estimateGas() result 2022-05-12 21:33:16 +02:00
Miquel A. Cabot
079a583041 console.log estimateGas() result 2022-05-12 19:02:44 +02:00
Miquel A. Cabot
fa6c27292c Merge branch 'v4main' into issue-1391-generic-estimategas-function 2022-05-12 17:28:30 +02:00
Miquel A. Cabot
f8a42d9559
Issue-#1409: Excessive contract calls (#1424)
* add decimals parameter to unitsToAmount() and amountToUnits()

* unify use of amountToUnits() and unitsToAmount()

* use tokenDecimals in TokenUtils

* add tokenDecimals to functions in SideStaking

* add parameters to doc comments

* calculate amountToUnits and unitsToAmount using  decimals in FixedRateExchange

* remove unused amountToUnits() function from SideStaking

* use decimals in unitsToAmount() function in Pool

* add tokenInDecimals and tokenOutDecimals to TokenInOutMarket interface

* use decimals in amountToUnits() function in Pool

* fix errors related to pool decimals

Co-authored-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-05-03 19:06:39 +03:00
Miquel A. Cabot
ec10f43ac7 Use ZERO_ADDRESS constant in src folder files 2022-04-11 13:19:26 +02:00
Miquel A. Cabot
ea74e4fc38 use ZERO_ADDRESS constant 2022-04-06 14:25:34 +02:00
Miquel A. Cabot
2af104497a change return type 2022-04-05 15:28:35 +02:00
Miquel A. Cabot
23101a185f add generic estimateGas() function 2022-04-05 14:53:04 +02:00
Soon Huat
4c5da01d66
change address[1] to paymentCollector based on smart contract (#1375)
Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
2022-03-29 15:40:30 +01:00
Norbi
a0e43235dd
Replace toWei/fromWei when base token conversion (#1318)
* replaced toWei inside FRE

* added amountToUnits for maxPrice inside pool

* replaced fromWei

* add web3 param to getPoolCreationParams

* added await before amountToUnits inside swapExactAmount

* swapExactAmount update

* add await to unitsToAmount inside setRate

* convert newRate to string

* replaced unitToAmounts with amountToUnits inside setRate

* replace unitToAmounts with amountToUnits

* added await

* replaced String() with toSting()

* replaced String() in Provider

* transform newRate into wei inside estimateSetRate

* replace toWei inside getFreCreationParams

* added web3 param to getFreCreationParams

* add amountToUnits inside getFreOrderParams

* added logs

* removed unitsToAmount from fixed rate

* removed amountToUnits inside marketFee

* removed logs
2022-03-16 12:44:53 +02:00
mihaisc
de4dde37b3
fix fixed order params (#1287) 2022-02-14 07:15:21 -08:00
mihaisc
3845335251
Remove redundant get in calcBaseInGivenOutDT (#1283)
* fix

* fix unitsToAmount

* fix
2022-02-14 03:34:46 -08:00
mihaisc
6f12e28ada
fix redundancy (#1278)
* fix redundancy

* convert to wei fixed price

* fix test
2022-02-11 04:45:15 -08:00
mihaisc
3c315eb49d
fixes (#1273)
* fixes

* fix test

* fix swap

* fix test

* fix test

* more fixes

* fixes

* change swapMarketFee from wei to decimal

* fix
2022-02-10 07:38:48 -08:00
Bogdan Fazakas
14862f6a3a
Moved interfaces under types and some small fixes (#1253)
* moved interfaces and some fixes

* throw proper error messages on try catch blocks in pool class
2022-02-07 08:06:58 -08:00
mihaisc
56a3aad20d
heleper+ remove old ibs (#1238)
* heleper+ remove old ibs

* fix tests

* fix gaslimt

* fix approve

* fix

* remove console.log

* upate package-lock
2022-01-25 08:32:55 -08:00
Bogdan Fazakas
ed2fe3a40e Merge branch 'v4main' into feature/own-gas-contract-options 2022-01-20 09:20:32 +02:00
Bogdan Fazakas
34074a74a6 applied suggestions on ContractUtils helper 2022-01-20 09:13:39 +02:00