From 099756fe6860568f87cad9dabe6e7273aed8bc55 Mon Sep 17 00:00:00 2001 From: Kevin Peters Date: Fri, 9 Sep 2022 15:04:08 +0000 Subject: [PATCH] ethereum: Use chainId() getter in initialize --- ethereum/contracts/Implementation.sol | 2 +- ethereum/contracts/bridge/BridgeGovernance.sol | 4 ++-- ethereum/contracts/bridge/BridgeImplementation.sol | 2 +- ethereum/contracts/bridge/BridgeStructs.sol | 2 +- ethereum/contracts/nft/NFTBridgeGovernance.sol | 4 ++-- ethereum/contracts/nft/NFTBridgeImplementation.sol | 2 +- ethereum/contracts/nft/NFTBridgeStructs.sol | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ethereum/contracts/Implementation.sol b/ethereum/contracts/Implementation.sol index 68706afd5..915f6c108 100644 --- a/ethereum/contracts/Implementation.sol +++ b/ethereum/contracts/Implementation.sol @@ -33,7 +33,7 @@ contract Implementation is Governance { function initialize() initializer public virtual { // this function needs to be exposed for an upgrade to pass uint256 evmChainId; - uint16 chain = _state.provider.chainId; + uint16 chain = chainId(); // Wormhole chain ids explicitly enumerated if (chain == 2) { evmChainId = 1; // ethereum diff --git a/ethereum/contracts/bridge/BridgeGovernance.sol b/ethereum/contracts/bridge/BridgeGovernance.sol index 1d53f413d..73db909fc 100644 --- a/ethereum/contracts/bridge/BridgeGovernance.sol +++ b/ethereum/contracts/bridge/BridgeGovernance.sol @@ -163,7 +163,7 @@ contract BridgeGovernance is BridgeGetters, BridgeSetters, ERC1967Upgrade { require(encoded.length == index, "wrong length"); } - /// @dev Parse a recoverChainId (action 5) with minimal validation + /// @dev Parse a recoverChainId (action 3) with minimal validation function parseRecoverChainId(bytes memory encodedRecoverChainId) public pure returns (BridgeStructs.RecoverChainId memory rci) { uint index = 0; @@ -173,7 +173,7 @@ contract BridgeGovernance is BridgeGetters, BridgeSetters, ERC1967Upgrade { rci.action = encodedRecoverChainId.toUint8(index); index += 1; - require(rci.action == 5, "wrong action"); + require(rci.action == 3, "wrong action"); rci.evmChainId = encodedRecoverChainId.toUint256(index); index += 32; diff --git a/ethereum/contracts/bridge/BridgeImplementation.sol b/ethereum/contracts/bridge/BridgeImplementation.sol index b199009c5..cb39f469a 100644 --- a/ethereum/contracts/bridge/BridgeImplementation.sol +++ b/ethereum/contracts/bridge/BridgeImplementation.sol @@ -18,7 +18,7 @@ contract BridgeImplementation is Bridge { function initialize() initializer public virtual { // this function needs to be exposed for an upgrade to pass uint256 evmChainId; - uint16 chain = _state.provider.chainId; + uint16 chain = chainId(); // Wormhole chain ids explicitly enumerated if (chain == 2) { evmChainId = 1; // ethereum diff --git a/ethereum/contracts/bridge/BridgeStructs.sol b/ethereum/contracts/bridge/BridgeStructs.sol index b5f5ff3cb..5a47f811f 100644 --- a/ethereum/contracts/bridge/BridgeStructs.sol +++ b/ethereum/contracts/bridge/BridgeStructs.sol @@ -100,7 +100,7 @@ contract BridgeStructs { // Governance Header // module: "TokenBridge" left-padded bytes32 module; - // governance action: 5 + // governance action: 3 uint8 action; // EIP-155 Chain ID diff --git a/ethereum/contracts/nft/NFTBridgeGovernance.sol b/ethereum/contracts/nft/NFTBridgeGovernance.sol index 4fca5bca1..3cc4f9545 100644 --- a/ethereum/contracts/nft/NFTBridgeGovernance.sol +++ b/ethereum/contracts/nft/NFTBridgeGovernance.sol @@ -160,7 +160,7 @@ contract NFTBridgeGovernance is NFTBridgeGetters, NFTBridgeSetters, ERC1967Upgra require(encoded.length == index, "invalid UpgradeContract: wrong length"); } - /// @dev Parse a recoverChainId (action 5) with minimal validation + /// @dev Parse a recoverChainId (action 3) with minimal validation function parseRecoverChainId(bytes memory encodedRecoverChainId) public pure returns (NFTBridgeStructs.RecoverChainId memory rci) { uint index = 0; @@ -170,7 +170,7 @@ contract NFTBridgeGovernance is NFTBridgeGetters, NFTBridgeSetters, ERC1967Upgra rci.action = encodedRecoverChainId.toUint8(index); index += 1; - require(rci.action == 5, "invalid RecoverChainId: wrong action"); + require(rci.action == 3, "invalid RecoverChainId: wrong action"); rci.evmChainId = encodedRecoverChainId.toUint256(index); index += 32; diff --git a/ethereum/contracts/nft/NFTBridgeImplementation.sol b/ethereum/contracts/nft/NFTBridgeImplementation.sol index f9f3a04ec..c979e09b2 100644 --- a/ethereum/contracts/nft/NFTBridgeImplementation.sol +++ b/ethereum/contracts/nft/NFTBridgeImplementation.sol @@ -18,7 +18,7 @@ contract NFTBridgeImplementation is NFTBridge { function initialize() initializer public virtual { // this function needs to be exposed for an upgrade to pass uint256 evmChainId; - uint16 chain = _state.provider.chainId; + uint16 chain = chainId(); // Wormhole chain ids explicitly enumerated if (chain == 2) { evmChainId = 1; // ethereum diff --git a/ethereum/contracts/nft/NFTBridgeStructs.sol b/ethereum/contracts/nft/NFTBridgeStructs.sol index 57db64e1a..39959a25c 100644 --- a/ethereum/contracts/nft/NFTBridgeStructs.sol +++ b/ethereum/contracts/nft/NFTBridgeStructs.sol @@ -56,7 +56,7 @@ contract NFTBridgeStructs { // Governance Header // module: "NFTBridge" left-padded bytes32 module; - // governance action: 5 + // governance action: 3 uint8 action; // EIP-155 Chain ID