Bogdan Fazakas
89b83221de
cleanups and warnings
2022-08-17 15:14:54 +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
Bogdan Fazakas
163735335f
remove duplication
2022-08-12 09:17:35 +03: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
ec4b21fab5
adapt tests for datatoken.setData()
2022-07-11 23:43:57 +02:00
Miquel A. Cabot
215ddf43df
test setData()
2022-07-11 23:36:20 +02: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
282cd4e865
Issue-#1485: Remove imports of ABIs in the tests and use utility tranfer(), mint(), balance() functions ( #1486 )
...
* remove imports of ABIs in NftFactory test
* fix error with data token amount
* remove imports of ABIs in FixedRateExchange test
* remove imports of ABIs in SideStaking test
* remove imports of ABIs in SideStaking test
* remove imports of ABIs in Router test
2022-06-15 18:38:32 +01:00
Miquel A. Cabot
74a3386619
general renaming in Datatoken
2022-06-14 11:23:47 +02:00
Miquel A. Cabot
6d605199df
general renaming in Router
2022-06-14 11:15:45 +02:00
Miquel A. Cabot
efc4b8b521
general renaming in SideStaking
2022-06-14 11:12:06 +02:00
Miquel A. Cabot
eb41dfc7ef
general renaming in Pool
2022-06-14 11:00:08 +02:00
Miquel A. Cabot
83b8d1dce3
general renaming in FixedRateExchange
2022-06-14 10:52:51 +02:00
Miquel A. Cabot
d6cbe479e1
fix lint problem
2022-06-13 12:52:31 +02:00
Miquel A. Cabot
2835304221
change ercParams to dtParams
2022-06-13 12:47:18 +02:00
Miquel A. Cabot
429cce838e
revert rename deployERC20 to deployDatatoken
2022-06-10 13:24:45 +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
2adb54c4eb
rename createNftWithErc20 to createNftWithDatatoken
2022-06-10 11:26:53 +02:00
Miquel A. Cabot
f59afbdc46
rename erc20TemplateAddress to datatokenTemplateAddress
2022-06-10 11:24:18 +02:00
Miquel A. Cabot
29c581fde2
rename from erc20 to nft in comments
2022-06-10 11:19:08 +02:00
Miquel A. Cabot
3b3cd6e2e7
rename erc20 to datatoken in Router test
2022-06-10 11:13:52 +02:00
Miquel A. Cabot
a1bb98bbfb
rename erc20 to datatoken in Pool test
2022-06-10 11:12:37 +02:00
Miquel A. Cabot
36986aa928
rename erc20 to datatoken in SideStaking test
2022-06-10 11:09:16 +02:00
Miquel A. Cabot
ad73cf855c
rename deployERC20 to deployDatatoken
2022-06-10 11:02:01 +02:00
Miquel A. Cabot
6287005473
rename Erc20CreateParams to DatatokenCreateParams
2022-06-10 10:54:51 +02:00
Miquel A. Cabot
29222ca85b
rename from erc20 to datatoken in Datatoken test
2022-06-10 10:53:38 +02:00
Miquel A. Cabot
df7cfdf231
rename from erc20 to datatoken in NFT test
2022-06-10 10:51:49 +02:00
Miquel A. Cabot
eedb1b4232
rename ERC20Deployer to DatatokenDeployer
2022-06-10 10:50:48 +02:00
Miquel A. Cabot
01859a52f8
rename createERC20 to createDatatoken
2022-06-10 10:45:56 +02:00
Miquel A. Cabot
6db0cd0627
rename removeERC20Deployer to removeDatatokenDeployer
2022-06-10 10:41:12 +02:00
Miquel A. Cabot
87b8090ce4
rename addErc20Deployer to addDatatokenDeployer
2022-06-10 10:40:08 +02:00
Miquel A. Cabot
f374230638
rename isERC20Deployer to isDatatokenDeployer
2022-06-10 10:38:33 +02:00
Miquel A. Cabot
e0a9c24ef5
change ERC721 to NFT in nftfactory test
2022-06-10 10:15:16 +02:00
Miquel A. Cabot
eaf9414adf
change erc721TemplateAddress to nftTemplateAddress
2022-06-10 10:12:14 +02:00
Miquel A. Cabot
04629cd403
change ERC721 to NFT in datatoken test
2022-06-10 10:08:17 +02:00
Miquel A. Cabot
b371069d0f
change erc721FactoryAddress to nftFactoryAddress
2022-06-10 10:06:50 +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
d23c1d1b05
remove unused oceanAddress parameter
2022-06-06 10:04:39 +02:00
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
28e46a31f7
remove unused imports
2022-05-30 11:09:19 +02:00
Miquel A. Cabot
4e92381007
fix error in decimals
2022-05-27 17:16:45 +02:00
Miquel A. Cabot
2b3b5c871d
use decimals() in Pool
2022-05-27 11:05:09 +02:00
Miquel A. Cabot
a7c0cff63c
fix decimals issue
2022-05-26 19:04:24 +02:00
Miquel A. Cabot
708ddd3a02
Merge pull request #1393 from oceanprotocol/issue-1351-rewrite-fixedrateexchange-test
...
Issue-#1351: Rewrite FixedRateExchange test
2022-05-26 18:58:26 +02:00
Miquel A. Cabot
b44f1f802a
use balance() and transfer() functions
2022-05-26 13:28:53 +02:00
