require strong type checking of Escrow in Dispatcher contract

open-ibc · Aug 18, 2023 · 11ed2d2 · 11ed2d2
1 parent 45dabd9
commit 11ed2d2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/contracts/Dispatcher.sol b/contracts/Dispatcher.sol
@@ -119,10 +119,10 @@ contract Dispatcher is IbcDispatcher, Ownable {
     //
     // methods
     //
-    constructor(ZKMintVerifier _verifier, address payable _escrow, string memory initPortPrefix) {
+    constructor(ZKMintVerifier _verifier, Escrow _escrow, string memory initPortPrefix) {
         verifier = _verifier;
-        escrow = Escrow(_escrow);
-        require(_escrow != address(0), 'Escrow cannot be zero address');
+        // require(_escrow != address(0), 'Escrow cannot be zero address');
+        escrow = _escrow;
 
         // initialize portPrefix
         portPrefix = initPortPrefix;

diff --git a/test/Dispatcher.t.sol b/test/Dispatcher.t.sol
@@ -106,7 +106,7 @@ contract Base is Test {
         );
     Height ZERO_HEIGHT = Height(0, 0);
     uint64 maxTimeout = UINT64_MAX;
-    address payable escrow = payable(new Escrow());
+    Escrow escrow = new Escrow();
 
     // Proofs from Polymer chain, to verify packet or channel state on Polymer
     Proof emptyProof;
@@ -491,7 +491,7 @@ contract DispatcherSendPacketTest is ChannelOpenTestBase {
     function test_success() public {
         bytes memory packet = abi.encodePacked(payload);
         for (uint64 index = 0; index < 3; index++) {
-            uint256 balance = escrow.balance;
+            uint256 balance = address(escrow).balance;
             vm.expectEmit(true, true, true, true);
             uint64 packetSeq = index + 1;
             emit SendPacket(address(mars), channelId, packet, packetSeq, timeoutTimestamp, fee);
@@ -502,7 +502,7 @@ contract DispatcherSendPacketTest is ChannelOpenTestBase {
                 timeoutTimestamp,
                 fee
             );
-            assertEq(escrow.balance - balance, Ibc.calcEscrowFee(fee));
+            assertEq(address(escrow).balance - balance, Ibc.calcEscrowFee(fee));
 
             // query escrowed fee per packet
             PacketFee memory packetFee = dispatcher.getTotalPacketFees(address(mars), channelId, packetSeq);

diff --git a/test/fee.t.sol b/test/fee.t.sol
@@ -95,7 +95,7 @@ contract FeeTest is PacketSenderTest {
         assertEq(address(forwardRelayerPayee).balance, fee.recvFee + balanceForwardRelayer1);
         assertEq(address(reverseRelayerPayee).balance, fee.ackFee + balanceReverseRelayer1);
         assertEq(refundPayee.balance, Ibc.ackRefundAmount(fee) + balanceRefund1);
-        assertEq(escrow.balance, 0);
+        assertEq(address(escrow).balance, 0);
 
         // cannot claim ack fee twice
         vm.expectRevert();
@@ -118,7 +118,7 @@ contract FeeTest is PacketSenderTest {
         // no forward relayer is invovled in timeout case
         assertEq(address(forwardRelayerPayee).balance, 0);
         assertEq(refundPayee.balance, Ibc.timeoutRefundAmount(fee) + balanceRefund1);
-        assertEq(escrow.balance, 0);
+        assertEq(address(escrow).balance, 0);
 
         // cannot claim timeout fee twice
         vm.expectRevert();