-
Notifications
You must be signed in to change notification settings - Fork 28
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
Refactor/hardhat #381
Open
wanseob
wants to merge
158
commits into
zkopru-network:main
Choose a base branch
from
wanseob:refactor/hardhat
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Refactor/hardhat #381
Changes from 38 commits
Commits
Show all changes
158 commits
Select commit
Hold shift + click to select a range
1c9f6ef
fix: docker build error
wanseob f94de13
fix: use parent block's utxo root for the inclusion reference logic
wanseob 640c29a
refactor(babyjubjub): use ethersjs & bignumber instead of BN
wanseob c12dbcc
refactor(transaction): use refactored babyjubjub
wanseob 0de1830
refactor(account): use refactored transaction pacakge and ethersjs
wanseob d626ec5
fix(babyjubjub): typo strictFpom => strictFrom
wanseob c1394f9
refactor(tree): use updated babyjubjub package
wanseob d357489
refactor(contracts): use ethersjs and hardhat insead of truffle
wanseob 3bcf049
refactor(zk-wizard): use ethersjs instead of web3
wanseob 1aa88b0
fix(babyjubjub): constructor
wanseob b3c0abd
refactor(account): use ethersjs instead of web3
wanseob 607cdc1
refactor(tree): use updated babyjubjub package
wanseob 39089f8
refactor(core): use ethersjs instead of web3
wanseob 6a5519e
refactor(coordinator): use a updated core package
wanseob 1e16bb9
chore: lint
wanseob 9e47aa5
refactor(cli): use updated core pacakge
wanseob d9d22bf
refactor(client): use updated core pacakge
wanseob 0a9fbe6
fix(transaction): public key computation bug
wanseob 803cc5a
refactor(database): use ethersjs
wanseob c64a08c
refactor(dataset): use ethersjs
wanseob a9af6b1
fix(utils): task runner
wanseob d072702
refactor(integration-test): update integration test with the refactor…
wanseob 5d57d51
chore: update config files
wanseob e38e913
feat: use 'effectiveGasPrce' term intead 'gasPrice' for fee calculataion
sifnoc 2a13c64
feat: coordinator generate type 2 tx
sifnoc ee8ee5e
Merge remote-tracking 'zkopru-network' branch 'upstream/sync-fix' int…
sifnoc 11186d3
Merge remote-tracking 'sifnoc' branch 'fix/auction-bidding' into 'fix…
sifnoc 96987d4
fix: rollback, getting massDeposits
sifnoc 6672881
fix: limit massDeposits for including propose tx
sifnoc 15540ef
fix: lint
sifnoc 7471240
fix: connect auctionContract to signer
sifnoc 5e3ec21
feat: added new coordinator as bid competitor
sifnoc 124d638
feat: create auction test cases
sifnoc 06a23d5
fix: maxBid configuration figures to wei
sifnoc 3318f07
fix: test number and indent
sifnoc fb94aad
fix: does not support todo method in test
sifnoc 86a8dd7
refactor: split test cases
sifnoc 8d7dc5c
fix: account connect to provider
sifnoc 938cf50
feat: add index to deposit table
sifnoc 57832ae
refactor: replace web3 with ethers and update package.json
KimiWu123 28c29f8
fix: incorrect usage of ethers components
KimiWu123 ccea63b
fix: add zero padding when calc. the hash of merged deposits
KimiWu123 201872c
refactor: replace web3-eth-abi with ethers
KimiWu123 7c7b222
chore: refine error messages and test desc. with web3
KimiWu123 5ddcdb7
fix: rename encryptedKeystore back to keystore for compatibility
KimiWu123 b06eb15
fix(core): remove toHexString when creating proofId
KimiWu123 bcfc5fc
chore(cli): update provider info under coordinator and wallet config …
KimiWu123 199e4a4
fix: incorrect using of BigNumber
KimiWu123 7ff74ba
fix(account): incorrect usage of encrypting keystore files with ether…
KimiWu123 990b300
chore(coordinator): remove sleep bcs not using docker anymore
KimiWu123 30c4f72
chore: remove trail space in coordinator.dev.json
KimiWu123 a3d72cf
fix(cli): select ERC20 to deposit but operate ERC721 balance
KimiWu123 9380bb3
chore: remove web3-utils
KimiWu123 7ffcf20
chore: add jest-mock dep. and hardhat config
KimiWu123 bf3605a
fix(cli): should ask password if creating a new wallet
KimiWu123 3417f7c
test(cli): add test cases for cli/wallet/configurator
KimiWu123 62af162
test(cli): refactor mock objects
KimiWu123 52024bb
fix(cli): set default provider if no input provider when calling HDwa…
KimiWu123 fd0a5a9
fix(zk-wizard): add zero check in depositEther
KimiWu123 8f430fe
test(cli): add test cases for cli/wallet/prompts(draft)
KimiWu123 b8a7eaa
fix(zk-wizard): fix where clause when status is undefined
KimiWu123 7ebdcec
fix(cli): using string as input for parseEther
KimiWu123 d0b858f
test(cli): finish eth transfer
KimiWu123 f77be47
test(cli): finish cli/wallet test cases
KimiWu123 ebfdfca
test(cli): test cases for cli/coordinator/config-prompts done
KimiWu123 0a8afd5
test(cli): completed test cases for cli/coordinator/example-config
KimiWu123 f746e30
fix(cli/test): force covert config type
KimiWu123 12ab6bc
test(cli): test cases for cli/coordinator/prompts were done
KimiWu123 35e42ec
test(cli): completed the test of loading a light node under wallet/co…
KimiWu123 1853e61
chore(cli): enhance some error handling
KimiWu123 11ab0e6
test(cli): remove reigisterVK and completeSetup, both were done in de…
KimiWu123 71b4aa2
fix(coordinator): add missed await in registerVk
KimiWu123 6fa2c9d
chore(cli): make cli test serially
KimiWu123 84f8413
test(cli): add cases for deposit ERC20 and ERC721
KimiWu123 90c795f
CI(cli): add cli testing in CI
KimiWu123 899697e
refactor(cli): move START_CODE and EXIT_CODE to another file for testing
KimiWu123 3df687b
test(cli): run tests on hardhat node
KimiWu123 4cbdf9d
test(cli): fix Jest error: an unexpected token
KimiWu123 8969780
test(cli): decrease testing time for some cases and make testing para…
KimiWu123 1f00f59
Merge pull request #4 from KimiWu123/test/add-CICD-for-CLI
KimiWu123 eb66c6d
ci: recover circleci/config.yml
KimiWu123 940d34d
fix: workaround for undefined error in cli test
KimiWu123 aee9502
fix(cli): apply web3-provider-ws to prevent from connection lost
KimiWu123 396fccb
fix: add 0x prefixe check
KimiWu123 594163f
fix: decimal() is not a function of IERC20(standard ERC20)
KimiWu123 e5260f6
chore(cli): move config files and cleanup
KimiWu123 935c71b
feat: added database name for supporting multiple network
sifnoc 80c0c42
fix: coordinator mark invalid block which following uncle
sifnoc 802825d
fix: database schema only for fix deposit
sifnoc 425dcca
fix: refine database schema for deposit
KimiWu123 3a5f266
feat: added more reliable provider
sifnoc b604e56
chore: add and remove comments
sifnoc 668ca8d
fix: add depositTx and depositErc20Tx back and some minor refine
KimiWu123 1ba6b6e
feat: add contract deploy:local
KimiWu123 2c99a4a
fix: using note as Deposit primaryKey in DB
KimiWu123 833af3b
fix: remove BLOCK_CONFIRMATION gap when checking events, deposit/depo…
KimiWu123 9c7f029
fix: not to check inflow and outflow equavilent if outflow is empty
KimiWu123 508ad4f
fix: url update event handler scope error
sifnoc 1332a1c
fix: variable name following contract
sifnoc 12da771
fix(transaction): incorrect outflow when building a tx. Happened when…
KimiWu123 e6a9a74
Revert "fix: remove BLOCK_CONFIRMATION gap when checking events, depo…
KimiWu123 5c734b0
config(cli): comment out auto-mining
KimiWu123 1ca5b76
chore: rename network to testnet in contract deploy:local command
KimiWu123 218d870
feat(cli): add a L2 account which is the same as the one generated by…
KimiWu123 ad7747d
feat: store l2 private key instead of l1 private key in ZkAccount
KimiWu123 ab7a905
fix: generate id from uuid to hash
sifnoc 9fb7221
refactor: replace web3 with ethers and update package.json
KimiWu123 85a4ecd
fix: incorrect usage of ethers components
KimiWu123 614cc4f
fix: add zero padding when calc. the hash of merged deposits
KimiWu123 cddcc63
refactor: replace web3-eth-abi with ethers
KimiWu123 792b151
chore: refine error messages and test desc. with web3
KimiWu123 a27b2f7
fix: rename encryptedKeystore back to keystore for compatibility
KimiWu123 df10357
fix(core): remove toHexString when creating proofId
KimiWu123 3c4ff4a
Merge branch 'refactor/hardhat' into fix/working-cli
sifnoc 45d33d4
Merge pull request #11 from KimiWu123/fix/working-cli
sifnoc bfb53ee
feat: added database name for supporting multiple network
sifnoc 2aeab87
fix: coordinator mark invalid block which following uncle
sifnoc 92c350d
fix: database schema only for fix deposit
sifnoc 82abdab
fix: refine database schema for deposit
KimiWu123 e507ecf
fix: add depositTx and depositErc20Tx back and some minor refine
KimiWu123 cd8bc01
feat: add contract deploy:local
KimiWu123 3ff1f36
fix: using note as Deposit primaryKey in DB
KimiWu123 81c16a8
fix: remove BLOCK_CONFIRMATION gap when checking events, deposit/depo…
KimiWu123 f7a86be
fix: not to check inflow and outflow equavilent if outflow is empty
KimiWu123 d1cf6ef
fix(transaction): incorrect outflow when building a tx. Happened when…
KimiWu123 4283992
Revert "fix: remove BLOCK_CONFIRMATION gap when checking events, depo…
KimiWu123 a714d85
config(cli): comment out auto-mining
KimiWu123 fed7330
chore: rename network to testnet in contract deploy:local command
KimiWu123 5d4e9ee
Merge pull request #16 from KimiWu123/feat/add-metamask-aligned-L2Acc…
sifnoc 40515df
test(tx): add test description for tx-builder first
KimiWu123 0705bc4
test(tx): impl. test cases for txBuilder.build()
KimiWu123 acc9d3a
refactor(tx): refactor txBuilder.build()
KimiWu123 22954f7
fix(tx): add inflow limit, it's 4 now
KimiWu123 6ba7d6f
test(tx): fix test cases for nft
KimiWu123 cb0242c
fix(tx): fix the calculation of eth changes to support sending all ETH
KimiWu123 e1e40da
fix(tx): set the arg, ethChanges, as optional
KimiWu123 3efabce
chore: remove *.bak files on contract package
sifnoc 5a23b95
chore: remove unnecessary log
sifnoc 1abe7e4
Merge pull request #13 from sifnoc/fix/updateUrl-handler
sifnoc fa280fe
Merge branch 'refactor/hardhat' into feat/sturdy_provider
sifnoc d3a6161
Merge pull request #12 from sifnoc/feat/sturdy_provider
sifnoc 1d0a019
feat: added method name as argument for logging
sifnoc a933dc9
fix: hardhat config and set automine for testnet in local
sifnoc bba266e
fix: using defualt port
sifnoc 2c141d9
chore: add some doc for local dev
sifnoc 4541d14
fix: restore 'yarn.lock' file from latest merged branch
sifnoc ed64038
Merge branch 'refactor/hardhat' into fix/overwritten-deposit-note
sifnoc d0b75dd
Merge pull request #9 from sifnoc/fix/overwritten-deposit-note
sifnoc 092c6ca
Fix `test-cli` and chores (#18)
sifnoc 5aaf5e3
fix: type in wsporivder
sifnoc 5af4367
Merge branch 'main' into refactor/hardhat
sifnoc bd7199d
add depositERC721Tx method
tkmct 30210a1
modify generateSwapTx method
tkmct feffdd0
fix: fix transaction builder flow for NFT swap
saleel 01baa3a
fix: revert Merge 5af436
sifnoc 9445d33
fix: input type in depositERC721Tx
sifnoc 516a852
Merge branch 'main' into refactor/hardhat
sifnoc 8360a88
fix: remove duplicate method
sifnoc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,7 @@ RUN apk add --no-cache --virtual .gyp \ | |
make \ | ||
g++ \ | ||
chromium \ | ||
&& npm install -g truffle ganache-cli --unsafe-perm=true --allow-root \ | ||
&& yarn global add hardhat ganache-cli \ | ||
&& yarn \ | ||
&& yarn install \ | ||
&& npx lerna run build --scope=@zkopru/cli \ | ||
|
@@ -22,7 +22,7 @@ RUN apk add --no-cache --virtual .gyp \ | |
WORKDIR /proj/zkopru/packages/cli | ||
|
||
RUN ganache-cli --db=/proj/data -i 20200406 -p 5000 --gasLimit 12000000 --deterministic --host 0.0.0.0 & \ | ||
sleep 5 && cd /proj/zkopru/packages/contracts && truffle migrate --network testnet | ||
sleep 5 && cd /proj/zkopru/packages/contracts && hardhat run --network testnet | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. need |
||
|
||
COPY ./packages/circuits/keys /proj/zkopru/packages/cli/keys | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is not works for me with this command on root
docker-compose -f compose/docker-compose.yml build contracts