e731b79e96
- In exit table, `instant_withdrawn`, `delayed_withdraw_request`, and
`delayed_withdrawn` were referencing batch_num. But these actions happen
outside a batch, so they should reference a block_num.
- Process delayed withdrawns:
- In Synchronizer, first match a Rollup delayed withdrawn request, with the
WDelayer deposit (via TxHash), and store the owner and token associated
with the delayed withdrawn.
- In HistoryDB: store the owner and token of a delayed withdrawal request
in the exit_tree, and set delayed_withdrawn when the withdraw is done in
the WDelayer.
- Update dependency of sqlx to master
- Last release of sqlx is from 2018 October, and it doesn't support
`NamedQuery` with a slice of structs, which is used in this commit.
Test Ethclient - Contracts
Contracts
The first step is to clone the github repository where the contracts are located:
git clone https://github.com/hermeznetwork/contracts.git
While the prepared deployment is not found to master, branch in repository must be changed:
git checkout feature/ethclient-test-deployment-ganache (tested with commit f62c768bd4817921872666b3644403a119e28248)
Now, install the dependencies:
cd contracts/
yarn install
Go to where the deployment scripts for the test are found:
cd scripts/ethclient-deployment/
Now, in a terminal start a local blockchain with ganache:
../../node_modules/.bin/ganache-cli -d -m "explain tackle mirror kit van hammer degree position ginger unfair soup bonus" -p 8545 -l 12500000 -a 20 -e 10000 --allowUnlimitedContractSize --chainId 31337
Once ganache is ready, in another terminal run the deployment in the local ganache network:
npx buidler run --network ganache test-deployment.js
An output file necessary for the next step is obtained: deploy-output.
The files that appear in
hermez-node/eth/contractsmust be generated from the same contract that we deploy in this step
Ethclient Test
Different environment variables are necessary to run this test. They must be taken from the output file of the previous step.
They can be provided by file called .env:
GENESIS_BLOCK=97
AUCTION="0x5E0816F0f8bC560cB2B9e9C87187BeCac8c2021F"
AUCTION_TEST="0x56D4563E85477AC8Aa6a3b980b831DDb18a826ec"
TOKENHEZ="0x2b7dEe2CF60484325716A1c6A193519c8c3b19F3"
HERMEZ="0x6F4e99522F4eB37e0B73D0C0373147893EF12fD5"
WDELAYER="0x5D94e3e7aeC542aB0F9129B9a7BAdeb5B3Ca0f77"
WDELAYER_TEST="0xdc05EFc3029024068FCc86f05323411f14D69280"
An example is found in
hermez-node/eth/.env.example
And then run test from hermez-node/eth/:
INTEGRATION=1 go test
Or they can be provided as a parameter in the command that runs the test:
INTEGRATION=1 GENESIS_BLOCK=97 AUCTION="0x5E0816F0f8bC560cB2B9e9C87187BeCac8c2021F" AUCTION_TEST="0x56D4563E85477AC8Aa6a3b980b831DDb18a826ec" TOKENHEZ="0x2b7dEe2CF60484325716A1c6A193519c8c3b19F3" HERMEZ="0x6F4e99522F4eB37e0B73D0C0373147893EF12fD5" WDELAYER="0x5D94e3e7aeC542aB0F9129B9a7BAdeb5B3Ca0f77" WDELAYER_TEST="0xdc05EFc3029024068FCc86f05323411f14D69280" go test