Skip to content

Commit

Permalink
fix rebase conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
WenweiX committed Aug 18, 2023
1 parent 85e21be commit ed2e538
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions contracts/Dispatcher.sol
Original file line number Diff line number Diff line change
Expand Up @@ -657,15 +657,8 @@ contract Dispatcher is IbcDispatcher, Ownable {
// verify `receiver` is the original packet sender
require(portIdAddressMatch(address(receiver), packet.src.portId), 'Receiver is not the original packet sender');
// prove ack packet is on Polymer chain
require(
verifier.verifyMembership(
latestConsensusState,
proof,
'ack/packet/path',
'expected ack receipt hash on Polymer chain'
),
'Fail to prove ack'
);
verifyMembership(proof, 'ack/packet/path', 'expected ack receipt hash on Polymer chain', 'Fail to prove ack');

// verify packet has been committed and not yet ack'ed or timed out
bool hasCommitment = sendPacketCommitment[address(receiver)][packet.src.channelId][packet.sequence];
require(hasCommitment, 'Packet commitment not found');
Expand Down

0 comments on commit ed2e538

Please sign in to comment.