Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate erc721 erc20 template contracts #1082

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1352a1c
added handlers for all methods in erc721 template contract
bogdanfazakas Oct 20, 2021
7723208
style mint method
bogdanfazakas Oct 21, 2021
793e54d
Merge branch 'v4main' into feature/integrate-erc721-erc20-template-co…
bogdanfazakas Oct 21, 2021
8973bb9
added more erc20 contract methods in datatoken class
bogdanfazakas Oct 21, 2021
5e31a7e
added tests for NFTDatatoken class and some tweaks
bogdanfazakas Oct 25, 2021
11c5c22
added unit tests for Datatoken class
bogdanfazakas Oct 25, 2021
555cd67
added unit tests for Datatoken class
bogdanfazakas Oct 25, 2021
eee0d4b
split all methods in Datatokne class and add separate ones for estGas
bogdanfazakas Oct 25, 2021
39f7de6
Merge branch 'v4main' into feature/integrate-erc721-erc20-template-co…
bogdanfazakas Oct 25, 2021
0ed974c
split estGas for the methods in ERC20 Datatoken
bogdanfazakas Oct 26, 2021
4fde8b2
split estGas for the methods in NFTFactory class
bogdanfazakas Oct 26, 2021
21081cc
split estGas for the methods in Router class
bogdanfazakas Oct 26, 2021
46a2027
added some missing methods like createFixedRate, createDispenser, set…
bogdanfazakas Oct 27, 2021
92e94c5
added erc20 enterprise methods
bogdanfazakas Nov 1, 2021
63daa16
wip tests erc20 enterprise
bogdanfazakas Nov 1, 2021
0a0c818
fixed datatoken tests
bogdanfazakas Nov 2, 2021
c91b2e4
fixed nftdatatoken tests
bogdanfazakas Nov 2, 2021
919e182
Merge branch 'v4main' into feature/integrate-erc721-erc20-template-co…
bogdanfazakas Nov 3, 2021
b5e90fa
added tests and code cleanup
bogdanfazakas Nov 4, 2021
16985d5
Merge branch 'v4main' into feature/integrate-erc721-erc20-template-co…
bogdanfazakas Nov 4, 2021
540acdc
fixed dispenser datatoken test
bogdanfazakas Nov 5, 2021
14f5fc0
added interfaces for fixedRate and Dispenser
bogdanfazakas Nov 5, 2021
19289b7
fixed router test
bogdanfazakas Nov 5, 2021
193c3be
refactor nftfactory interfaces
bogdanfazakas Nov 8, 2021
7e766a5
fixed some tests
bogdanfazakas Nov 8, 2021
6606c6d
fixed pool unit tests after refactor
bogdanfazakas Nov 8, 2021
9a8be41
added interfaces fixedrate and erc tokens and array creation helpers
bogdanfazakas Nov 9, 2021
fc6074e
added new files
bogdanfazakas Nov 9, 2021
c103339
added Dispenser interface
bogdanfazakas Nov 9, 2021
e5c7186
deleted old pool files
bogdanfazakas Nov 9, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59,580 changes: 40,912 additions & 18,668 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
"changelog": "auto-changelog -p",
"prepublishOnly": "npm run build",
"test:pool": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/balancer/Pool.test.ts'",
"test:dt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/Datatoken.test.ts'",
"test:nftDt": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/NFTDatatoken.test.ts'",
"test:router": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/pools/Router.test.ts'",
"test:unit": "mocha --config=test/unit/.mocharc.json --node-env=test --exit 'test/unit/**/*.test.ts'",
"test:unit:cover": "nyc --report-dir coverage/unit npm run test:unit",
Expand All @@ -47,14 +49,15 @@
},
"dependencies": {
"@ethereum-navigator/navigator": "^0.5.3",
"@oceanprotocol/contracts": "https://github.com/oceanprotocol/contracts#v4main",
"@oceanprotocol/contracts": "github:oceanprotocol/contracts#v4main",
"cross-fetch": "^3.1.4",
"crypto-js": "^4.0.0",
"decimal.js": "^10.2.1",
"fs": "0.0.1-security",
"lzma": "^2.3.2",
"node-abort-controller": "^2.0.0",
"save-file": "^2.3.1",
"underscore": "^1.13.1",
"uuid": "^8.3.2",
"web3": ">=1.3.5",
"web3-core": "^1.5.3",
Expand Down
108 changes: 0 additions & 108 deletions src/data/address.json

This file was deleted.

Loading