From e21d7014436fef790f62ed0e9bde01fae73bb936 Mon Sep 17 00:00:00 2001 From: Kevin Peters Date: Fri, 9 Sep 2022 14:47:00 +0000 Subject: [PATCH] ethereum: Changed invalid fork error message --- ethereum/contracts/Governance.sol | 2 +- ethereum/contracts/bridge/Bridge.sol | 2 +- ethereum/contracts/bridge/BridgeGovernance.sol | 2 +- ethereum/contracts/nft/NFTBridge.sol | 2 +- ethereum/contracts/nft/NFTBridgeGovernance.sol | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ethereum/contracts/Governance.sol b/ethereum/contracts/Governance.sol index 686f0a864..cc01fb473 100644 --- a/ethereum/contracts/Governance.sol +++ b/ethereum/contracts/Governance.sol @@ -25,7 +25,7 @@ abstract contract Governance is GovernanceStructs, Messages, Setters, ERC1967Upg * @dev Upgrades a contract via Governance VAA/VM */ function submitContractUpgrade(bytes memory _vm) public { - require(!isFork(), "bad fork"); + require(!isFork(), "invalid fork"); Structs.VM memory vm = parseVM(_vm); diff --git a/ethereum/contracts/bridge/Bridge.sol b/ethereum/contracts/bridge/Bridge.sol index 8ca45f3d5..ff42847ea 100644 --- a/ethereum/contracts/bridge/Bridge.sol +++ b/ethereum/contracts/bridge/Bridge.sol @@ -577,7 +577,7 @@ contract Bridge is BridgeGovernance, ReentrancyGuard { } function verifyBridgeVM(IWormhole.VM memory vm) internal view returns (bool){ - require(!isFork(), "bad fork"); + require(!isFork(), "invalid fork"); if (bridgeContracts(vm.emitterChainId) == vm.emitterAddress) { return true; } diff --git a/ethereum/contracts/bridge/BridgeGovernance.sol b/ethereum/contracts/bridge/BridgeGovernance.sol index 83d2c9c8c..1d53f413d 100644 --- a/ethereum/contracts/bridge/BridgeGovernance.sol +++ b/ethereum/contracts/bridge/BridgeGovernance.sol @@ -41,7 +41,7 @@ contract BridgeGovernance is BridgeGetters, BridgeSetters, ERC1967Upgrade { // Execute a UpgradeContract governance message function upgrade(bytes memory encodedVM) public { - require(!isFork(), "bad fork"); + require(!isFork(), "invalid fork"); (IWormhole.VM memory vm, bool valid, string memory reason) = verifyGovernanceVM(encodedVM); require(valid, reason); diff --git a/ethereum/contracts/nft/NFTBridge.sol b/ethereum/contracts/nft/NFTBridge.sol index ce5be282c..98742bff0 100644 --- a/ethereum/contracts/nft/NFTBridge.sol +++ b/ethereum/contracts/nft/NFTBridge.sol @@ -193,7 +193,7 @@ contract NFTBridge is NFTBridgeGovernance { } function verifyBridgeVM(IWormhole.VM memory vm) internal view returns (bool){ - require(!isFork(), "bad fork"); + require(!isFork(), "invalid fork"); if (bridgeContracts(vm.emitterChainId) == vm.emitterAddress) { return true; } diff --git a/ethereum/contracts/nft/NFTBridgeGovernance.sol b/ethereum/contracts/nft/NFTBridgeGovernance.sol index 9d3618676..4fca5bca1 100644 --- a/ethereum/contracts/nft/NFTBridgeGovernance.sol +++ b/ethereum/contracts/nft/NFTBridgeGovernance.sol @@ -39,7 +39,7 @@ contract NFTBridgeGovernance is NFTBridgeGetters, NFTBridgeSetters, ERC1967Upgra // Execute a UpgradeContract governance message function upgrade(bytes memory encodedVM) public { - require(!isFork(), "bad fork"); + require(!isFork(), "invalid fork"); (IWormhole.VM memory vm, bool valid, string memory reason) = verifyGovernanceVM(encodedVM); require(valid, reason);