Miquel A. Cabot
6c297f1989
Merge pull request #1398 from oceanprotocol/issue-1349-rewrite-pool-test
...
Issue-#1349 Rewrite Pool test
2022-05-30 11:17:37 +02:00
Miquel A. Cabot
b3102c78c1
add decimals() function
2022-05-27 10:55:12 +02:00
Jamie Hewitt
01e646c10f
Fixing bug in deactivateMint gas estimation
2022-05-20 14:07:50 +03:00
Jamie Hewitt
8b9d4f1180
Pull from origin v4main
2022-05-20 13:49:25 +03:00
Jamie Hewitt
729a60f9a9
Fixing codeclimate issue
2022-05-18 17:07:53 +03:00
Jamie Hewitt
4b9f6c9c00
Checking if the caller is Publishing Market Fee Address before calling the smart contract
2022-05-18 17:01:05 +03:00
Jamie Hewitt
cd8f892d38
Using new generic gas estimate function
2022-05-18 16:28:32 +03:00
Jamie Hewitt
9070b61111
Merge branch 'v4main' of github.com:oceanprotocol/ocean.js into issue-1335-setPublishingMarketFee-function
2022-05-18 16:06:41 +03:00
Jamie Hewitt
5979f97e6b
Moving PublishingMarketFee to @types/erc20.ts
2022-05-18 15:33:21 +03:00
mihaisc
471e3e503d
update max out ( #1475 )
...
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-05-17 22:34:09 +03:00
Alex Coseru
bf060948a8
bump contracts to alpha.33 ( #1472 )
...
* bump contracts
* remove getOPCCollector
2022-05-17 12:04:51 +03:00
Miquel A. Cabot
cab4d5b1a7
restore estApprove() function and add estTransfer() function
2022-05-16 15:48:40 +02:00
Miquel A. Cabot
0a0d96aa01
Merge branch 'v4main' into add-transfer-function-to-tokenutils
2022-05-16 15:23:39 +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
f1f5792114
Merge branch 'v4main' into add-transfer-function-to-tokenutils
2022-05-12 17:49:16 +02:00
Miquel A. Cabot
fa6c27292c
Merge branch 'v4main' into issue-1391-generic-estimategas-function
2022-05-12 17:28:30 +02:00
Jamie Hewitt
c9b297a858
Removing console.logs
2022-05-12 18:10:02 +03:00
Jamie Hewitt
1de19f8e2b
Fixing deactivateMint estimate gas cost
2022-05-12 17:39:08 +03:00
Jamie Hewitt
b9e89bb335
Fixing estSetAllowedSwapper
2022-05-12 17:34:45 +03:00
Jamie Hewitt
caf83190b6
Fixing fixedRateContract undefined
2022-05-12 14:51:52 +03:00
Alex Coseru
6d9f9fed92
simple compute flow ( #1458 )
...
* refactor compute flow
2022-05-10 08:52:24 +03:00
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
