From 582fb7dac799f9faafb224e6a73175e6a7a5cd2e Mon Sep 17 00:00:00 2001 From: Francesco Dainese Date: Fri, 19 Apr 2024 21:18:07 +0200 Subject: [PATCH 1/2] fix(CrossChainReceiverTest): non reserved addrs --- tests/CrossChainReceiver.t.sol | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/CrossChainReceiver.t.sol b/tests/CrossChainReceiver.t.sol index 63897d75..684e2058 100644 --- a/tests/CrossChainReceiver.t.sol +++ b/tests/CrossChainReceiver.t.sol @@ -12,13 +12,13 @@ import {BaseTest} from './BaseTest.sol'; import {Transaction, Envelope} from '../src/contracts/libs/EncodingUtils.sol'; contract CrossChainReceiverTest is BaseTest { - address public constant GUARDIAN = address(12); - address public constant OWNER = address(123); - address public constant BRIDGE_ADAPTER = address(1234); - address public constant BRIDGE_ADAPTER_2 = address(1234567); + address public constant GUARDIAN = address(65535 + 12); + address public constant OWNER = address(65535 + 123); + address public constant BRIDGE_ADAPTER = address(65535 + 1234); + address public constant BRIDGE_ADAPTER_2 = address(65535 + 1234567); - address public constant GOVERNANCE_CORE = address(12345); - address public constant VOTING_MACHINE = address(123456); + address public constant GOVERNANCE_CORE = address(65535 + 12345); + address public constant VOTING_MACHINE = address(65535 + 123456); uint256 public constant DEFAULT_ORIGIN_CHAIN_ID = 1; ICrossChainReceiver public crossChainReceiver; From 30354a2ec4be233b0a535ce5dd8d1537b78fe328 Mon Sep 17 00:00:00 2001 From: Francesco Dainese Date: Fri, 19 Apr 2024 22:45:54 +0200 Subject: [PATCH 2/2] fix(test:zk): 65536 offset --- tests/CrossChainReceiver.t.sol | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/CrossChainReceiver.t.sol b/tests/CrossChainReceiver.t.sol index 684e2058..003113dc 100644 --- a/tests/CrossChainReceiver.t.sol +++ b/tests/CrossChainReceiver.t.sol @@ -12,13 +12,13 @@ import {BaseTest} from './BaseTest.sol'; import {Transaction, Envelope} from '../src/contracts/libs/EncodingUtils.sol'; contract CrossChainReceiverTest is BaseTest { - address public constant GUARDIAN = address(65535 + 12); - address public constant OWNER = address(65535 + 123); - address public constant BRIDGE_ADAPTER = address(65535 + 1234); - address public constant BRIDGE_ADAPTER_2 = address(65535 + 1234567); + address public constant GUARDIAN = address(65536 + 12); + address public constant OWNER = address(65536 + 123); + address public constant BRIDGE_ADAPTER = address(65536 + 1234); + address public constant BRIDGE_ADAPTER_2 = address(65536 + 1234567); - address public constant GOVERNANCE_CORE = address(65535 + 12345); - address public constant VOTING_MACHINE = address(65535 + 123456); + address public constant GOVERNANCE_CORE = address(65536 + 12345); + address public constant VOTING_MACHINE = address(65536 + 123456); uint256 public constant DEFAULT_ORIGIN_CHAIN_ID = 1; ICrossChainReceiver public crossChainReceiver;