ethereum: Changed invalid fork error message
This commit is contained in:
parent
b7535a8e5b
commit
e21d701443
|
@ -25,7 +25,7 @@ abstract contract Governance is GovernanceStructs, Messages, Setters, ERC1967Upg
|
||||||
* @dev Upgrades a contract via Governance VAA/VM
|
* @dev Upgrades a contract via Governance VAA/VM
|
||||||
*/
|
*/
|
||||||
function submitContractUpgrade(bytes memory _vm) public {
|
function submitContractUpgrade(bytes memory _vm) public {
|
||||||
require(!isFork(), "bad fork");
|
require(!isFork(), "invalid fork");
|
||||||
|
|
||||||
Structs.VM memory vm = parseVM(_vm);
|
Structs.VM memory vm = parseVM(_vm);
|
||||||
|
|
||||||
|
|
|
@ -577,7 +577,7 @@ contract Bridge is BridgeGovernance, ReentrancyGuard {
|
||||||
}
|
}
|
||||||
|
|
||||||
function verifyBridgeVM(IWormhole.VM memory vm) internal view returns (bool){
|
function verifyBridgeVM(IWormhole.VM memory vm) internal view returns (bool){
|
||||||
require(!isFork(), "bad fork");
|
require(!isFork(), "invalid fork");
|
||||||
if (bridgeContracts(vm.emitterChainId) == vm.emitterAddress) {
|
if (bridgeContracts(vm.emitterChainId) == vm.emitterAddress) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,7 +41,7 @@ contract BridgeGovernance is BridgeGetters, BridgeSetters, ERC1967Upgrade {
|
||||||
|
|
||||||
// Execute a UpgradeContract governance message
|
// Execute a UpgradeContract governance message
|
||||||
function upgrade(bytes memory encodedVM) public {
|
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);
|
(IWormhole.VM memory vm, bool valid, string memory reason) = verifyGovernanceVM(encodedVM);
|
||||||
require(valid, reason);
|
require(valid, reason);
|
||||||
|
|
|
@ -193,7 +193,7 @@ contract NFTBridge is NFTBridgeGovernance {
|
||||||
}
|
}
|
||||||
|
|
||||||
function verifyBridgeVM(IWormhole.VM memory vm) internal view returns (bool){
|
function verifyBridgeVM(IWormhole.VM memory vm) internal view returns (bool){
|
||||||
require(!isFork(), "bad fork");
|
require(!isFork(), "invalid fork");
|
||||||
if (bridgeContracts(vm.emitterChainId) == vm.emitterAddress) {
|
if (bridgeContracts(vm.emitterChainId) == vm.emitterAddress) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -39,7 +39,7 @@ contract NFTBridgeGovernance is NFTBridgeGetters, NFTBridgeSetters, ERC1967Upgra
|
||||||
|
|
||||||
// Execute a UpgradeContract governance message
|
// Execute a UpgradeContract governance message
|
||||||
function upgrade(bytes memory encodedVM) public {
|
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);
|
(IWormhole.VM memory vm, bool valid, string memory reason) = verifyGovernanceVM(encodedVM);
|
||||||
require(valid, reason);
|
require(valid, reason);
|
||||||
|
|
Loading…
Reference in New Issue