certusone
/
trustless-generic-relayer
mirror of https://github.com/certusone/trustless-generic-relayer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests pass

This commit is contained in:
derpy-duck 2023-03-02 23:22:48 +00:00
parent 3631a6c3ea
commit 53d18f8bf2
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ethereum/contracts/coreRelayer/CoreRelayerDelivery.sol
View File

@ -348,7 +348,9 @@ contract CoreRelayerDelivery is CoreRelayerGovernance {
}
// Check that the permissioned address allowed to execute this redelivery instruction is the permissioned address allowed to execute the old instruction
isValid = (providerAddress == fromWormholeFormat(originalInstruction.executionParameters.providerDeliveryAddress))
isValid = (
providerAddress == fromWormholeFormat(originalInstruction.executionParameters.providerDeliveryAddress)
)
// Check that the original instruction's target chain = this chain
&& whChainId == originalInstruction.targetChain
// Check that the new redelivery instruction's 'receiver value' amount >= the original instruction's 'receiver value' amount

28
ethereum/forge-test/CoreRelayer.t.sol
View File

@ -948,16 +948,7 @@ contract TestCoreRelayer is Test {
fakeVM, stack.originalDelivery.encodedVMs, payable(setup.target.relayer)
);
vm.prank(setup.target.relayer);
vm.expectRevert(abi.encodeWithSignature("UnexpectedRelayer()"));
setup.target.coreRelayerFull.redeliverSingle{value: stack.budget}(stack.package);
stack.package = IDelivery.TargetRedeliveryByTxHashParamsSingle(
stack.redeliveryVM, stack.originalDelivery.encodedVMs, payable(msg.sender)
);
vm.deal(address(this), stack.budget);
bytes32 redeliveryVmHash = relayerWormhole.parseVM(stack.redeliveryVM).hash;
vm.expectEmit(true, true, true, true, address(setup.target.coreRelayer));
emit Delivery({
recipientContract: address(setup.target.integration),
@ -968,20 +959,23 @@ contract TestCoreRelayer is Test {
});
setup.target.coreRelayerFull.redeliverSingle{value: stack.budget}(stack.package);
stack.package = IDelivery.TargetRedeliveryByTxHashParamsSingle(
stack.redeliveryVM, stack.originalDelivery.encodedVMs, payable(msg.sender)
);
vm.deal(address(this), stack.budget);
bytes32 redeliveryVmHash = relayerWormhole.parseVM(stack.redeliveryVM).hash;
vm.expectRevert(abi.encodeWithSignature("UnexpectedRelayer()"));
setup.target.coreRelayerFull.redeliverSingle{value: stack.budget}(stack.package);
uint16 differentChainId = 2;
if (setup.targetChainId == 2) {
differentChainId = 3;
}
vm.deal(setup.target.relayer, stack.budget);
vm.expectEmit(true, true, true, true, address(map[differentChainId].coreRelayer));
emit Delivery({
recipientContract: address(setup.target.integration),
sourceChain: setup.sourceChainId,
sequence: 0,
deliveryVaaHash: stack.deliveryVaaHash,
status: DeliveryStatus.INVALID_REDELIVERY
});
vm.prank(setup.target.relayer);
vm.expectRevert(abi.encodeWithSignature("TargetChainIsNotThisChain(uint16)", setup.targetChainId));
map[differentChainId].coreRelayerFull.redeliverSingle{value: stack.budget}(stack.package);
stack.redeliveryRequest = IWormholeRelayer.ResendByTx({