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
Miquel A. Cabot
fa6c27292c
Merge branch 'v4main' into issue-1391-generic-estimategas-function
2022-05-12 17:28:30 +02:00
mihaisc
2d744c3dd2
change param order
...
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-05-03 13:17:48 +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
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
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
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
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
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
b3e3cdce7f
remove GASLIMIT_DEFAULT constant from lib classes
2022-04-06 14:18:36 +02:00
Miquel A. Cabot
f9aa47c4d2
use estimateGas() function in Datatoken
2022-04-06 13:44:52 +02:00
Alex Coseru
91a4431938
update to contracts alpha.19 ( #1286 )
2022-02-14 18:36:15 +02: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
fc711ece5c
remove ammount ( #1241 )
...
Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>
2022-01-28 02:12:57 -08:00
mihaisc
be7adcb6f8
fix order, update contracts ( #1240 )
...
* fix order, update contracts
* remove console.log
* remove force contracts install
2022-01-26 10:27:58 -08:00
Bogdan Fazakas
5cb548ca59
replaced local artifacts with the published ones ( #1232 )
2022-01-20 04:39:58 -08:00
Bogdan Fazakas
ed2fe3a40e
Merge branch 'v4main' into feature/own-gas-contract-options
2022-01-20 09:20:32 +02:00
Bogdan Fazakas
2c72b0623c
updated docs
2022-01-20 00:50:43 +02:00
Bogdan Fazakas
8c9e21f309
fix start order and multi order
2022-01-19 18:56:59 +02:00
Bogdan Fazakas
6c9746a8ad
fix opfee and DataToken naming
2022-01-19 17:26:22 +02:00
Bogdan Fazakas
ac52ad9f66
updated also token order struct
2022-01-19 14:33:21 +02:00
Bogdan Fazakas
69432720f0
put back baseToken instead of basetoken
2022-01-19 09:48:23 +02:00
Bogdan Fazakas
471875f85c
update codebase renamed dataToken baseToken etc
2022-01-17 15:05:05 +02:00
Bogdan Fazakas
4d60a16f6e
added default contract options and gas in config
2022-01-12 22:56:36 +02:00
bdfa60a91b
move artifacts folder under /src
2022-01-11 17:52:28 +00:00
Bogdan Fazakas
810213c20c
Revert "moved artifacts under src so to build starts"
...
This reverts commit 41fb836a4980f5a447dd9411037bd8f4618b7d24.
2022-01-11 10:35:28 +02:00
Bogdan Fazakas
41fb836a49
moved artifacts under src so to build starts
2022-01-11 09:47:41 +02:00
Bogdan Fazakas
a019491ed2
add used artifacts update imports and removed not used dependancies
2022-01-10 18:36:48 +02:00
Alex Coseru
f23e65f61b
publish tests ( #1184 )
...
* publish tests
* update to latest contracts
* fix unit tests
2022-01-03 17:34:28 +02:00
Bogdan Fazakas
303d7607c7
fixed typo and tests and update initialize method
2021-12-22 17:18:43 +02:00
Bogdan Fazakas
722113f176
update startorder fees and tests
2021-12-22 11:05:57 +02:00
Bogdan Fazakas
8c90f8dec9
merge v4 main and fix conflicts also fixed lint
2021-12-21 16:57:59 +02:00
lacoop6tu
39ded52003
add NFT owner check in Datatoken
2021-12-17 06:22:46 -05:00
lacoop6tu
e64e0b61b1
add ERC20Deployer checks and tests in Datatoken Class
2021-12-17 06:12:33 -05:00
lacoop6tu
7e935da179
rm unused Nft class in Datatoken
2021-12-14 12:49:36 -05:00
