This repository has been archived by the owner on May 9, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 165
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix Proposals cannot be cancelled (5.6 – major) (#156)
* proposals can now be cancelled, added in proposal cancelled event * fix build issues * update bridge constuctors in all tests * fix existing bridge test * added stests for cancellation * fix cli * await in async * helpers * spelling errors * remove silent * update test, doesn't pass locally but no issue connecting to ganache * wait did this work: * typo * works now, fixed provider * added additional tests for relayer and admin cancel functions * added admin cli command to cancel proposal * internal function to cancel proposal * use adminOrRelayer modifier * fix indentation and comment
- Loading branch information
1 parent
3da7646
commit 5fbc2be
Showing
33 changed files
with
287 additions
and
53 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| /** | ||
| * Copyright 2020 ChainSafe Systems | ||
| * SPDX-License-Identifier: LGPL-3.0-only | ||
| */ | ||
|
|
||
| const TruffleAssert = require('truffle-assertions'); | ||
| const Ethers = require('ethers'); | ||
|
|
||
| const Helpers = require('../helpers'); | ||
|
|
||
| const BridgeContract = artifacts.require("Bridge"); | ||
| const ERC20MintableContract = artifacts.require("ERC20PresetMinterPauser"); | ||
| const ERC20HandlerContract = artifacts.require("ERC20Handler"); | ||
|
|
||
| contract('Bridge - [voteProposal with relayerThreshold == 3]', async (accounts) => { | ||
| const originChainID = 1; | ||
| const destinationChainID = 2; | ||
| const relayer1Address = accounts[0]; | ||
| const relayer2Address = accounts[1]; | ||
| const relayer3Address = accounts[2]; | ||
| const relayer4Address = accounts[3] | ||
| const depositerAddress = accounts[4]; | ||
| const destinationChainRecipientAddress = accounts[4]; | ||
| const depositAmount = 10; | ||
| const expectedDepositNonce = 1; | ||
| const relayerThreshold = 3; | ||
|
|
||
| let BridgeInstance; | ||
| let DestinationERC20MintableInstance; | ||
| let DestinationERC20HandlerInstance; | ||
| let depositData = ''; | ||
| let depositDataHash = ''; | ||
| let resourceID = ''; | ||
| let initialResourceIDs; | ||
| let initialContractAddresses; | ||
| let burnableContractAddresses; | ||
|
|
||
| let vote, executeProposal; | ||
|
|
||
| beforeEach(async () => { | ||
| await Promise.all([ | ||
| BridgeContract.new(destinationChainID, [ | ||
| relayer1Address, | ||
| relayer2Address, | ||
| relayer3Address, | ||
| relayer4Address], | ||
| relayerThreshold, | ||
| 0, | ||
| 10,).then(instance => BridgeInstance = instance), | ||
| ERC20MintableContract.new("token", "TOK").then(instance => DestinationERC20MintableInstance = instance) | ||
| ]); | ||
|
|
||
| resourceID = Helpers.createResourceID(DestinationERC20MintableInstance.address, originChainID); | ||
| initialResourceIDs = [resourceID]; | ||
| initialContractAddresses = [DestinationERC20MintableInstance.address]; | ||
| burnableContractAddresses = [DestinationERC20MintableInstance.address]; | ||
|
|
||
| DestinationERC20HandlerInstance = await ERC20HandlerContract.new(BridgeInstance.address, initialResourceIDs, initialContractAddresses, burnableContractAddresses); | ||
|
|
||
| depositData = Helpers.createERCDepositData(resourceID, depositAmount, 32, destinationChainRecipientAddress); | ||
| depositDataHash = Ethers.utils.keccak256(DestinationERC20HandlerInstance.address + depositData.substr(2)); | ||
|
|
||
| await Promise.all([ | ||
| DestinationERC20MintableInstance.grantRole(await DestinationERC20MintableInstance.MINTER_ROLE(), DestinationERC20HandlerInstance.address), | ||
| BridgeInstance.adminSetHandlerAddress(DestinationERC20HandlerInstance.address, resourceID) | ||
| ]); | ||
|
|
||
| vote = (relayer) => BridgeInstance.voteProposal(originChainID, expectedDepositNonce, resourceID, depositDataHash, {from: relayer}); | ||
| executeProposal = (relayer) => BridgeInstance.executeProposal(originChainID, expectedDepositNonce, depositData, {from: relayer}); | ||
| }); | ||
|
|
||
| it ('[sanity] bridge configured with threshold, relayers, and expiry', async () => { | ||
| assert.equal(await BridgeInstance._chainID(), destinationChainID) | ||
|
|
||
| assert.equal(await BridgeInstance._relayerThreshold(), relayerThreshold) | ||
|
|
||
| assert.equal((await BridgeInstance._totalRelayers()).toString(), '4') | ||
|
|
||
| assert.equal(await BridgeInstance._expiry(), 10) | ||
| }) | ||
|
|
||
| it('[sanity] depositProposal should be created with expected values', async () => { | ||
| await TruffleAssert.passes(vote(relayer1Address)); | ||
|
|
||
| const expectedDepositProposal = { | ||
| _dataHash: depositDataHash, | ||
| _yesVotes: [relayer1Address], | ||
| _noVotes: [], | ||
| _status: '1' // Active | ||
| }; | ||
|
|
||
| const depositProposal = await BridgeInstance.getProposal( | ||
| originChainID, expectedDepositNonce); | ||
|
|
||
| assert.deepInclude(Object.assign({}, depositProposal), expectedDepositProposal); | ||
| }); | ||
|
|
||
|
|
||
| it("voting on depositProposal after threshold results in cancelled proposal", async () => { | ||
|
|
||
|
|
||
| await TruffleAssert.passes(vote(relayer1Address)); | ||
|
|
||
| for (i=0; i<10; i++) { | ||
| await Helpers.advanceBlock(); | ||
| } | ||
|
|
||
| await TruffleAssert.passes(vote(relayer2Address)); | ||
|
|
||
| const expectedDepositProposal = { | ||
| _dataHash: depositDataHash, | ||
| _yesVotes: [relayer1Address], | ||
| _noVotes: [], | ||
| _status: '4' // Cancelled | ||
| }; | ||
|
|
||
| const depositProposal = await BridgeInstance.getProposal(originChainID, expectedDepositNonce); | ||
| assert.deepInclude(Object.assign({}, depositProposal), expectedDepositProposal); | ||
| await TruffleAssert.reverts(vote(relayer3Address), "proposal has already been passed, transferred, or cancelled.") | ||
|
|
||
| }); | ||
|
|
||
|
|
||
| it("relayer can cancel proposal after threshold blocks have passed", async () => { | ||
| await TruffleAssert.passes(vote(relayer2Address)); | ||
|
|
||
| for (i=0; i<10; i++) { | ||
| await Helpers.advanceBlock(); | ||
| } | ||
|
|
||
| const expectedDepositProposal = { | ||
| _dataHash: depositDataHash, | ||
| _yesVotes: [relayer2Address], | ||
| _noVotes: [], | ||
| _status: '4' // Cancelled | ||
| }; | ||
|
|
||
| await TruffleAssert.passes(BridgeInstance.cancelProposal(originChainID, expectedDepositNonce)) | ||
| const depositProposal = await BridgeInstance.getProposal(originChainID, expectedDepositNonce); | ||
| assert.deepInclude(Object.assign({}, depositProposal), expectedDepositProposal); | ||
| await TruffleAssert.reverts(vote(relayer4Address), "proposal has already been passed, transferred, or cancelled.") | ||
|
|
||
| }); | ||
|
|
||
| it("admin can cancel proposal after threshold blocks have passed", async () => { | ||
| await TruffleAssert.passes(vote(relayer3Address)); | ||
|
|
||
| for (i=0; i<10; i++) { | ||
| await Helpers.advanceBlock(); | ||
| } | ||
|
|
||
| const expectedDepositProposal = { | ||
| _dataHash: depositDataHash, | ||
| _yesVotes: [relayer3Address], | ||
| _noVotes: [], | ||
| _status: '4' // Cancelled | ||
| }; | ||
|
|
||
| await TruffleAssert.passes(BridgeInstance.cancelProposal(originChainID, expectedDepositNonce)) | ||
| const depositProposal = await BridgeInstance.getProposal(originChainID, expectedDepositNonce); | ||
| assert.deepInclude(Object.assign({}, depositProposal), expectedDepositProposal); | ||
| await TruffleAssert.reverts(vote(relayer2Address), "proposal has already been passed, transferred, or cancelled.") | ||
|
|
||
| }); | ||
|
|
||
|
|
||
| }); |
Oops, something went wrong.