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

Puts enum type in the `Delivery` event.

This commit is contained in:
Sebastián Claudio Nale 2023-02-17 12:09:40 -03:00 committed by scnale
parent f7174f2084
commit 0b10f9e2a5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ethereum/contracts/coreRelayer/CoreRelayer.sol
View File

@ -25,7 +25,7 @@ contract CoreRelayer is CoreRelayerGovernance {
uint16 indexed sourceChain, uint16 indexed sourceChain,
uint64 indexed sequence, uint64 indexed sequence,
bytes32 deliveryVaaHash, bytes32 deliveryVaaHash,
uint8 status DeliveryStatus status
); );
error InsufficientFunds(string reason); error InsufficientFunds(string reason);
@ -454,7 +454,7 @@ contract CoreRelayer is CoreRelayerGovernance {
sourceChain: sourceChain, sourceChain: sourceChain,
sequence: sourceSequence, sequence: sourceSequence,
deliveryVaaHash: deliveryVaaHash, deliveryVaaHash: deliveryVaaHash,
status: uint8(DeliveryStatus.FORWARD_REQUEST_SUCCESS) status: DeliveryStatus.FORWARD_REQUEST_SUCCESS
}); });
} else { } else {
(bool sent,) = fromWormholeFormat(internalInstruction.refundAddress).call{value: weiToRefund}(""); (bool sent,) = fromWormholeFormat(internalInstruction.refundAddress).call{value: weiToRefund}("");
@ -468,7 +468,7 @@ contract CoreRelayer is CoreRelayerGovernance {
sourceChain: sourceChain, sourceChain: sourceChain,
sequence: sourceSequence, sequence: sourceSequence,
deliveryVaaHash: deliveryVaaHash, deliveryVaaHash: deliveryVaaHash,
status: uint8(DeliveryStatus.FORWARD_REQUEST_FAILURE) status: DeliveryStatus.FORWARD_REQUEST_FAILURE
}); });
} }
} else { } else {
@ -485,7 +485,7 @@ contract CoreRelayer is CoreRelayerGovernance {
sourceChain: sourceChain, sourceChain: sourceChain,
sequence: sourceSequence, sequence: sourceSequence,
deliveryVaaHash: deliveryVaaHash, deliveryVaaHash: deliveryVaaHash,
status: uint8(DeliveryStatus.SUCCESS) status: DeliveryStatus.SUCCESS
}); });
} else { } else {
emit Delivery({ emit Delivery({
@ -493,7 +493,7 @@ contract CoreRelayer is CoreRelayerGovernance {
sourceChain: sourceChain, sourceChain: sourceChain,
sequence: sourceSequence, sequence: sourceSequence,
deliveryVaaHash: deliveryVaaHash, deliveryVaaHash: deliveryVaaHash,
status: uint8(DeliveryStatus.RECEIVER_FAILURE) status: DeliveryStatus.RECEIVER_FAILURE
}); });
} }
} }
@ -596,7 +596,7 @@ contract CoreRelayer is CoreRelayerGovernance {
sourceChain: redeliveryVM.emitterChainId, sourceChain: redeliveryVM.emitterChainId,
sequence: redeliveryVM.sequence, sequence: redeliveryVM.sequence,
deliveryVaaHash: redeliveryVM.hash, deliveryVaaHash: redeliveryVM.hash,
status: uint8(DeliveryStatus.INVALID_REDELIVERY) status: DeliveryStatus.INVALID_REDELIVERY
}); });
targetParams.relayerRefundAddress.send(msg.value); targetParams.relayerRefundAddress.send(msg.value);
return; return;

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

@ -828,7 +828,7 @@ contract TestCoreRelayer is Test {
uint16 indexed sourceChain, uint16 indexed sourceChain,
uint64 indexed sequence, uint64 indexed sequence,
bytes32 deliveryVaaHash, bytes32 deliveryVaaHash,
uint8 status DeliveryStatus status
); );
enum DeliveryStatus { enum DeliveryStatus {
@ -990,7 +990,7 @@ contract TestCoreRelayer is Test {
sourceChain: setup.sourceChainId, sourceChain: setup.sourceChainId,
sequence: 1, sequence: 1,
deliveryVaaHash: redeliveryVmHash, deliveryVaaHash: redeliveryVmHash,
status: uint8(DeliveryStatus.INVALID_REDELIVERY) status: DeliveryStatus.INVALID_REDELIVERY
}); });
setup.target.coreRelayerFull.redeliverSingle{value: stack.budget}(stack.package); setup.target.coreRelayerFull.redeliverSingle{value: stack.budget}(stack.package);
@ -1005,7 +1005,7 @@ contract TestCoreRelayer is Test {
sourceChain: setup.sourceChainId, sourceChain: setup.sourceChainId,
sequence: 1, sequence: 1,
deliveryVaaHash: redeliveryVmHash, deliveryVaaHash: redeliveryVmHash,
status: uint8(DeliveryStatus.INVALID_REDELIVERY) status: DeliveryStatus.INVALID_REDELIVERY
}); });
vm.prank(setup.target.relayer); vm.prank(setup.target.relayer);
map[differentChainId].coreRelayerFull.redeliverSingle{value: stack.budget}(stack.package); map[differentChainId].coreRelayerFull.redeliverSingle{value: stack.budget}(stack.package);
@ -1054,7 +1054,7 @@ contract TestCoreRelayer is Test {
sourceChain: setup.sourceChainId, sourceChain: setup.sourceChainId,
sequence: 3, sequence: 3,
deliveryVaaHash: redeliveryVmHash, deliveryVaaHash: redeliveryVmHash,
status: uint8(DeliveryStatus.INVALID_REDELIVERY) status: DeliveryStatus.INVALID_REDELIVERY
}); });
vm.prank(setup.target.relayer); vm.prank(setup.target.relayer);
map[differentChainId].coreRelayerFull.redeliverSingle{ map[differentChainId].coreRelayerFull.redeliverSingle{