Skip to content

Commit 4634380

Browse files
committed
review changes
1 parent 33a9cef commit 4634380

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

src/proposals/proposalTypes/HybridProposal.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {IMultichainProposal} from "@proposals/proposalTypes/IMultichainProposal.
1717

1818
import {MultichainGovernor, IMultichainGovernor} from "@protocol/governance/multichain/MultichainGovernor.sol";
1919
import {ITemporalGovernor} from "@protocol/governance/TemporalGovernor.sol";
20-
import {Implementation} from "@protocol/wormhole/mocks/Implementation.sol";
20+
import {Implementation} from "@test/mock/wormhole/Implementation.sol";
2121

2222
/// @notice this is a proposal type to be used for proposals that
2323
/// require actions to be taken on both moonbeam and base.
@@ -237,11 +237,11 @@ abstract contract HybridProposal is
237237
getTargetsPayloadsValues(
238238
block.chainid == baseChainId || block.chainid == moonBeamChainId
239239
? addresses.getAddress(
240-
"WORMHOLE_CORE_MAINNET",
240+
"WORMHOLE_CORE_MOONBEAM",
241241
moonBeamChainId
242242
)
243243
: addresses.getAddress(
244-
"WORMHOLE_CORE_TESTNET",
244+
"WORMHOLE_CORE_MOONBASE",
245245
moonBaseChainId
246246
),
247247
temporalGovernor

test/integration/CrossChainPublishMessage.t.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ contract CrossChainPublishMessageTest is Test, ChainIds, CreateCode {
103103
vm.makePersistent(address(addresses));
104104

105105
wormhole = IWormhole(
106-
addresses.getAddress("WORMHOLE_CORE_MAINNET", moonBeamChainId)
106+
addresses.getAddress("WORMHOLE_CORE_MOONBEAM", moonBeamChainId)
107107
);
108108
well = ERC20Votes(addresses.getAddress("WELL", moonBeamChainId));
109109

@@ -141,7 +141,7 @@ contract CrossChainPublishMessageTest is Test, ChainIds, CreateCode {
141141
).getMultichainGovernorCalldata(
142142
addresses.getAddress("TEMPORAL_GOVERNOR"), /// call temporal gov on base
143143
addresses.getAddress( /// call wormhole on moonbeam
144-
"WORMHOLE_CORE_MAINNET",
144+
"WORMHOLE_CORE_MOONBEAM",
145145
sendingChainIdToReceivingChainId[block.chainid]
146146
)
147147
);
@@ -151,7 +151,7 @@ contract CrossChainPublishMessageTest is Test, ChainIds, CreateCode {
151151

152152
/// on moonbeam network so this should return proper addresses
153153
address wormholeCore = addresses.getAddress(
154-
"WORMHOLE_CORE_MAINNET",
154+
"WORMHOLE_CORE_MOONBEAM",
155155
moonBeamChainId
156156
);
157157
address temporalGov = addresses.getAddress(

test/integration/MultichainProposal.t.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ contract MultichainProposalTest is
146146
addresses.getAddress("VOTE_COLLECTION_PROXY", baseChainId)
147147
);
148148
wormhole = IWormhole(
149-
addresses.getAddress("WORMHOLE_CORE_MAINNET", moonBeamChainId)
149+
addresses.getAddress("WORMHOLE_CORE_MOONBEAM", moonBeamChainId)
150150
);
151151

152152
well = ERC20Votes(addresses.getAddress("WELL", moonBeamChainId));
@@ -2035,7 +2035,7 @@ contract MultichainProposalTest is
20352035
address[] memory targets = new address[](19);
20362036
bytes[] memory calldatas = new bytes[](19);
20372037

2038-
targets[0] = addresses.getAddress("WORMHOLE_CORE_MAINNET");
2038+
targets[0] = addresses.getAddress("WORMHOLE_CORE_MOONBEAM");
20392039
calldatas[0] = proposalC.approvedCalldata(0);
20402040

20412041
targets[1] = addresses.getAddress("WORMHOLE_BRIDGE_ADAPTER_PROXY");
@@ -2100,7 +2100,7 @@ contract MultichainProposalTest is
21002100
baseChainId
21012101
);
21022102
address wormholeCore = addresses.getAddress(
2103-
"WORMHOLE_CORE_MAINNET"
2103+
"WORMHOLE_CORE_MOONBEAM"
21042104
);
21052105
uint64 nextSequence = IWormhole(wormholeCore).nextSequence(
21062106
address(governor)
File renamed without changes.
File renamed without changes.
File renamed without changes.

utils/Addresses.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
{
9393
"addr": "0x79A1027a6A159502049F10906D333EC57E95F083",
9494
"chainId": 84532,
95-
"name": "WORMHOLE_CORE",
95+
"name": "WORMHOLE_CORE_SEPOLIA_BASE",
9696
"isContract": true
9797
},
9898
{
@@ -140,7 +140,7 @@
140140
{
141141
"addr": "0xa5B7D85a8f27dd7907dc8FdC21FA5657D5E2F901",
142142
"chainId": 1287,
143-
"name": "WORMHOLE_CORE_TESTNET",
143+
"name": "WORMHOLE_CORE_MOONBASE",
144144
"isContract": true
145145
},
146146
{
@@ -152,7 +152,7 @@
152152
{
153153
"addr": "0xC8e2b0cD52Cf01b0Ce87d389Daa3d414d4cE29f3",
154154
"chainId": 1284,
155-
"name": "WORMHOLE_CORE_MAINNET",
155+
"name": "WORMHOLE_CORE_MOONBEAM",
156156
"isContract": true
157157
},
158158
{
@@ -200,7 +200,7 @@
200200
{
201201
"addr": "0xbebdb6C8ddC678FfA9f8748f85C815C556Dd8ac6",
202202
"chainId": 8453,
203-
"name": "WORMHOLE_CORE",
203+
"name": "WORMHOLE_CORE_BASE",
204204
"isContract": true
205205
},
206206
{

0 commit comments

Comments
 (0)