Skip to content

Commit 9fd11ec

Browse files
authored
chore: Edit reinitialize method of MessageQueue (#804)
1 parent a3fc3bd commit 9fd11ec

File tree

8 files changed

+9
-75
lines changed

8 files changed

+9
-75
lines changed

api/ethereum/BridgingPayment.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

api/ethereum/ERC20Manager.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

api/ethereum/IBridgingPayment.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

api/ethereum/IERC20Manager.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

api/ethereum/IMessageQueue.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

api/ethereum/MessageQueue.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

api/ethereum/WrappedEther.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

ethereum/src/MessageQueue.sol

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -103,74 +103,8 @@ contract MessageQueue is
103103
/**
104104
* @custom:oz-upgrades-validate-as-initializer
105105
*/
106-
function reinitialize() public onlyRole(DEFAULT_ADMIN_ROLE) reinitializer(3) {
107-
// Incident was resolved, funds were not affected, decentralization was not violated
108-
// https://x.com/VaraNetwork/status/1994047125861056671
109-
110-
// MessageQueue contract was updated to https://etherscan.io/address/0x9D5D2BCf93feD81e48CCb645112F008aD6098eE7#code
111-
// Verifier contract was updated to https://etherscan.io/address/0xFACE08781c083588eF0569Ec1B497AAB67B2a18F#code
112-
//
113-
// See source code of MessageQueue.sol, reinitialize method:
114-
// - `_verifier = IVerifier(0xFACE08781c083588eF0569Ec1B497AAB67B2a18F)` - new verifier address
115-
// - `_maxBlockNumber = 28_359_000` - new max block number
116-
//
117-
// https://vara.subsquare.io/fellowship/referenda/62 - signed block data to change verifier, approved by fellowship
118-
// https://etherscan.io/tx/0xfbf36c984c9c0f65b16e58917111cba6858409364dde25a8a3df711c5e844993 - submit merkle root with MessageQueue upgrade
119-
// https://etherscan.io/tx/0xfae7c0aec41c8d419ec1cd18fe99e60dd30e253efaf8d9e8d3b771146322f080#eventlog - process message with MessageQueue upgrade
120-
//
121-
// See event `Upgraded(0x9D5D2BCf93feD81e48CCb645112F008aD6098eE7)` in logs of transaction above
122-
uint256 blockNumber = 28_125_135;
123-
bytes32 merkleRoot = _blockNumbers[blockNumber];
124-
125-
delete _blockNumbers[blockNumber];
126-
delete _merkleRootTimestamps[merkleRoot];
127-
128-
delete _processedMessages[type(uint256).max];
129-
130-
// https://vara.subscan.io/event/28135906-40
131-
//
132-
// block #28135906
133-
// block hash 0xe0164e5fd486fd41c1d4285a93548d923c792057d645980a65120d55162b3332
134-
// https://vara.subscan.io/block/28135906
135-
//
136-
// https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Farchive-rpc.vara.network#/chainstate
137-
// https://i.imgur.com/VcFpkno.png
138-
//
139-
// gearEthBridge.queue: Vec<H256>
140-
// [
141-
// 0x35a87dc240b786879dbe9705045c3140abea49cc0b1a14dbca768bcb26f08f88 - https://vara.subscan.io/event/28135906-30 - 126_000 VARA transfer
142-
// ]
143-
blockNumber = 28_135_906;
144-
merkleRoot = 0x35a87dc240b786879dbe9705045c3140abea49cc0b1a14dbca768bcb26f08f88;
145-
146-
_blockNumbers[blockNumber] = merkleRoot;
147-
_merkleRootTimestamps[merkleRoot] = block.timestamp;
148-
149-
emit MerkleRoot(blockNumber, merkleRoot);
150-
151-
// https://vara.subscan.io/event/28142846-40
152-
//
153-
// block #28142846
154-
// block hash 0xaf5e4ff07c3fc58526051d765abd91569c394cf28ef540cb010d17b3650608d4
155-
// https://vara.subscan.io/block/28142846
156-
//
157-
// https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Farchive-rpc.vara.network#/chainstate
158-
// https://i.imgur.com/Qlqk3bx.png
159-
//
160-
// gearEthBridge.queue: Vec<H256>
161-
// [
162-
// 0xb73ff7404e14b4e13d5e6038bac20b9c5e5d6d269879841b61a881da6d0a35f3 - https://vara.subscan.io/event/28141439-31 - 300_200 VARA transfer
163-
// 0xc2bb624fb7b5f2e5fe29927ebd1b3837548aa1ecb3379242bd7c2f0666f39668 - https://vara.subscan.io/event/28142204-30 - 1 VARA transfer
164-
// 0x3ba6a14f187cd7ac3956ed4f302b559938c9ecdd44066b95fbfabe3b43942689 - https://vara.subscan.io/event/28142735-30 - 1_000 VARA transfer
165-
// 0x2d6efc7a1d195950d5e0606da04837b4c9954a163c7fff5188d312f78b776d7e - https://vara.subscan.io/event/28142846-30 - 5 VARA transfer
166-
// ]
167-
blockNumber = 28_142_846;
168-
merkleRoot = 0x969589f86884f4399a51b940a58d728b04e12fc30f21c1fddce8ca0eb82f9734;
169-
170-
_blockNumbers[blockNumber] = merkleRoot;
171-
_merkleRootTimestamps[merkleRoot] = block.timestamp;
172-
173-
emit MerkleRoot(blockNumber, merkleRoot);
106+
function reinitialize() public onlyRole(DEFAULT_ADMIN_ROLE) reinitializer(5) {
107+
_verifier = IVerifier(0xb7142E82cEeAd0df5D0b3507240A503E99E1881e);
174108
}
175109

176110
/**

0 commit comments

Comments
 (0)