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

1024 Commits

Author SHA1 Message Date
Miquel A. Cabot
b66fffc635
add optional decimals parameter at joinswapExternAmountIn() and exitswapPoolAmountIn() (#1461) 2022-05-09 17:41:11 +03: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
mihaisc
2d744c3dd2
change param order
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-05-03 13:17:48 +03:00
mihaisc
c7dfe50b92
Merge branch 'v4main' into issue-1425-use-proper-config-in-constructors 2022-05-03 13:01:01 +03:00
Alex Coseru
77fe186949
bump to contracts alpha 31 (#1448)
* bump to contracts alpha 31
2022-04-29 16:25:42 +03:00
Miquel A. Cabot
5289996937 rewrite estimateGas for reuseOrder() 2022-04-28 17:37:08 +02:00
Miquel A. Cabot
0fb3b8ac40 Merge branch 'v4main' into issue-1391-generic-estimategas-function 2022-04-28 17:21:07 +02:00
Miquel A. Cabot
9ac87e9173 Merge branch 'v4main' into add-transfer-function-to-tokenutils 2022-04-28 17:20:13 +02:00
Jamie Hewitt
8c9e46a8dd Adding estimate gas method and fixing tests 2022-04-21 15:14:32 +02:00
Jamie Hewitt
a81cdddc30 Updating tests 2022-04-21 12:48:28 +02:00
Jamie Hewitt
c6ddaa094a Updating return values 2022-04-21 12:40:27 +02:00
Miquel A. Cabot
b259b16d45 use getConfig(network) function to get proper configuration 2022-04-20 16:33:06 +02:00
mihaisc
548f31ced3
fix (#1426)
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-04-20 16:49:27 +03:00
Bogdan Fazakas
f96ccb0c56
Add reuseOrder method (#1421)
* added reuseOrder method

* wip add test to reuseOrder

* update test

* check also ProviderFee event
2022-04-20 16:42:07 +03:00
Jamie Hewitt
44db9db5a4 Writting tests for setPublishingMarketFee 2022-04-20 14:42:51 +02:00
Jamie Hewitt
edcb01090d Adding getPublishingMarketFee function 2022-04-20 13:29:12 +02:00
Jamie Hewitt
518dc6715e Updating parameters for setPublishingMarketFee function 2022-04-20 12:59:27 +02:00
Jamie Hewitt
c169007f12 Creating initial setPublishingMarketFee function 2022-04-19 18:41:32 +02:00
Bogdan Fazakas
ec601a66d2
Fix get compute results (#1386)
* wip special chars

* clean ups

* update sha256 import from cryptojs lib

* update compute result and use alpha-26 contracts

* re-build with package-lock v1 and with dist

* ignore build files from dist

* delete build files

* removed console logs and updated ComputeResultType typing

* update compute integration test

* added more tests

* added some logs

* update file download method

* use fetch data

* remove download part

* delete console logs

* review fixes

* more fixes

Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
2022-04-14 23:58:25 +01:00
Alex Coseru
29c5c8b60e
fix mm signature (#1420)
* fix mm signature
2022-04-14 18:19:56 +03:00
Soon Huat
628c2fc1fc
setPaymentCollector apply same checking as contract (#1396)
* setPaymentCollector apply same checking as contract

* unit test for setPaymentCollector for owner and erc20 deployer

* setPaymentCollector amend redundent truth check on boolean value

Co-authored-by: Soon Huat <soon_huat.phan@daimler.com>
2022-04-14 15:43:01 +01:00
Alex Coseru
e964b2a4a4
refactor signatures (#1395)
* refactor signatures
2022-04-14 16:52:12 +03:00
Miquel A. Cabot
a1e9a42687 fix error with GASLIMIT_DEFAULT 2022-04-12 10:05:22 +02:00
Miquel A. Cabot
98bbf83a7a Merge branch 'v4main' into issue-1391-generic-estimategas-function 2022-04-12 09:51:48 +02:00
Miquel A. Cabot
610d451581 Merge branch 'v4main' into add-transfer-function-to-tokenutils 2022-04-12 09:47:15 +02:00
Miquel A. Cabot
21a7b739f4
Merge pull request #1414 from oceanprotocol/issue-1413-refactor-zero-address-constant
Issue-#1413: Refactor ZERO_ADDRESS constant
2022-04-12 09:41:10 +02:00
Miquel A. Cabot
ec10f43ac7 Use ZERO_ADDRESS constant in src folder files 2022-04-11 13:19:26 +02:00
Miquel A. Cabot
56740e892a export Router and Sidestaking classes 2022-04-11 12:25:21 +02:00
Miquel A. Cabot
1874804d99 revert fix error in number of parameters in deployERC721Contract() 2022-04-06 14:31:48 +02:00
Miquel A. Cabot
ea74e4fc38 use ZERO_ADDRESS constant 2022-04-06 14:25:34 +02:00
Miquel A. Cabot
b3e3cdce7f remove GASLIMIT_DEFAULT constant from lib classes 2022-04-06 14:18:36 +02:00
Miquel A. Cabot
4cee7bb08c use estimateGas() function in NFT 2022-04-06 14:17:03 +02:00
Miquel A. Cabot
f9aa47c4d2 use estimateGas() function in Datatoken 2022-04-06 13:44:52 +02:00
Miquel A. Cabot
8d9964448a fix error in number of parameters in deployERC721Contract() 2022-04-06 13:44:36 +02:00
Miquel A. Cabot
e2a4c32a65 use estimateGas() function in FixedRateExchange 2022-04-05 23:37:54 +02:00
Miquel A. Cabot
47e47863b3 use estimateGas() function in Pool 2022-04-05 18:08:21 +02:00
Miquel A. Cabot
09d7683986 use estimateGas() function in Dispenser 2022-04-05 17:41:00 +02:00
Miquel A. Cabot
2c0f3ae108 use estimateGas() function in SideStaking 2022-04-05 17:29:55 +02:00
Miquel A. Cabot
652ec73892 solve lint errors 2022-04-05 17:21:41 +02:00
Miquel A. Cabot
1380661c97 use estimateGas() function in TokenUtils 2022-04-05 16:26:40 +02:00
Miquel A. Cabot
c936c47260 use estimateGas() function in Router 2022-04-05 16:21:43 +02:00
Miquel A. Cabot
00fc5d21e9 use estimateGas() function in NFTFactory 2022-04-05 15:29:00 +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
Miquel A. Cabot
605812ee7f estimate gas without using the function signature 2022-04-05 10:24:27 +02:00
Alex Coseru
005c2d9760
Feature/bump contracts to alpha 28 (#1392)
* bump contracts to alpha 28
2022-04-04 14:56:41 +03:00
Miquel A. Cabot
2fe89b476a update comments 2022-04-04 10:22:03 +02:00
Miquel A. Cabot
f34573be44 create a generic estimateGas() function 2022-04-04 09:37:30 +02:00
Miquel A. Cabot
0735a4b4e3 update comments related to amount units 2022-04-01 16:31:37 +02:00
Miquel A. Cabot
02fa3b8912 remove unused parameters 2022-04-01 16:27:41 +02:00