more

taikoxyz · Nov 7, 2024 · 929709f · 929709f
1 parent 1f623a8
commit 929709f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/packages/protocol/contracts/shared/common/DefaultResolver.sol b/packages/protocol/contracts/shared/common/DefaultResolver.sol
@@ -22,7 +22,7 @@ contract DefaultResolver is EssentialContract, ResolverBase {
         uint256 indexed chainId, bytes32 indexed name, address newAddress, address oldAddress
     );
 
-    error AM_ADDRESS_ALREADY_SET(); // TODO: rename
+    error AM_ADDRESS_ALREADY_SET(bytes32 name); // TODO: rename
     error RESOLVED_ADDRESS_ZERO(); // TODO: rename
 
     /// @notice Initializes the contract.
@@ -45,7 +45,7 @@ contract DefaultResolver is EssentialContract, ResolverBase {
         onlyOwner
     {
         address oldAddress = __addresses[_chainId][_name];
-        require(_newAddress != oldAddress, AM_ADDRESS_ALREADY_SET());
+        require(_newAddress != oldAddress, AM_ADDRESS_ALREADY_SET(_name));
         __addresses[_chainId][_name] = _newAddress;
         emit AddressSet(_chainId, _name, _newAddress, oldAddress);
     }

diff --git a/packages/protocol/test/shared/bridge/Bridge.t.sol b/packages/protocol/test/shared/bridge/Bridge.t.sol
@@ -52,27 +52,38 @@ contract BridgeTest is TaikoTest {
         vm.startPrank(Alice);
         vm.deal(Alice, 100 ether);
 
+        uint64 l1ChainId = uint64(block.chainid);
+
+        // Deploy on local chain
         resolver = deployDefaultResolver();
 
-        address bridgeImpl = address(new Bridge());
-        bridge = deployBridge(resolver, bridgeImpl);
-        destChainBridge = deployBridge(resolver, bridgeImpl);
+        bridge = deployBridge(resolver, address(new Bridge()));
+         signalService = deploySignalService(resolver, address(new SignalService()));
+       untrustedSenderContract = new UntrustedSendMessageRelayer();
+        vm.deal(address(untrustedSenderContract), 10 ether);
+
 
-        uint64 l1ChainId = uint64(block.chainid);
-        // vm.chainId(l1ChainId);
 
+        // Deploy on destination chain
+        vm.chainId(destChainId);
         signalServiceNoProofCheck = deploySignalService(resolver, address(new SignalServiceNoProofCheck()));
-        signalService = deploySignalService(resolver, address(new SignalService()));
-
+         destChainBridge = deployBridge(resolver, address(new Bridge()));
+         vm.deal(address(destChainBridge), 100 ether);
+        vm.chainId(l1ChainId);
 
-        vm.deal(address(destChainBridge), 100 ether);
 
-        untrustedSenderContract = new UntrustedSendMessageRelayer();
-        vm.deal(address(untrustedSenderContract), 10 ether);
-        resolver.setAddress(destChainId, "signal_service", address(signalServiceNoProofCheck));
-        resolver.setAddress(destChainId, "bridge", address(destChainBridge));
+    // Register contracts from destination chain
+        // resolver.setAddress(destChainId, "signal_service", address(signalServiceNoProofCheck));
+    //  resolver.setAddress(destChainId, "bridge", address(destChainBridge));
         resolver.setAddress(destChainId, "taiko", address(uint160(123)));
         resolver.setAddress(destChainId, "bridge_watchdog", address(uint160(123)));
+
+
+
+
+
+
+
         vm.stopPrank();
     }