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

Adds named parameters to `Delivery` events.

This commit is contained in:
Sebastián Claudio Nale 2023-02-17 11:50:07 -03:00 committed by scnale
parent eced885877
commit f7174f2084
2 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -449,13 +449,13 @@ contract CoreRelayer is CoreRelayerGovernance {
if (forwardingRequest.isValid) { if (forwardingRequest.isValid) {
(, success) = emitForward(weiToRefund, forwardingRequest); (, success) = emitForward(weiToRefund, forwardingRequest);
if (success) { if (success) {
emit Delivery( emit Delivery({
fromWormholeFormat(internalInstruction.targetAddress), recipientContract: fromWormholeFormat(internalInstruction.targetAddress),
sourceChain, sourceChain: sourceChain,
sourceSequence, sequence: sourceSequence,
deliveryVaaHash, deliveryVaaHash: deliveryVaaHash,
uint8(DeliveryStatus.FORWARD_REQUEST_SUCCESS) status: uint8(DeliveryStatus.FORWARD_REQUEST_SUCCESS)
); });
} else { } else {
(bool sent,) = fromWormholeFormat(internalInstruction.refundAddress).call{value: weiToRefund}(""); (bool sent,) = fromWormholeFormat(internalInstruction.refundAddress).call{value: weiToRefund}("");
@ -463,13 +463,13 @@ contract CoreRelayer is CoreRelayerGovernance {
// if refunding fails, pay out full refund to relayer // if refunding fails, pay out full refund to relayer
weiToRefund = 0; weiToRefund = 0;
} }
emit Delivery( emit Delivery({
fromWormholeFormat(internalInstruction.targetAddress), recipientContract: fromWormholeFormat(internalInstruction.targetAddress),
sourceChain, sourceChain: sourceChain,
sourceSequence, sequence: sourceSequence,
deliveryVaaHash, deliveryVaaHash: deliveryVaaHash,
uint8(DeliveryStatus.FORWARD_REQUEST_FAILURE) status: uint8(DeliveryStatus.FORWARD_REQUEST_FAILURE)
); });
} }
} else { } else {
(bool sent,) = fromWormholeFormat(internalInstruction.refundAddress).call{value: weiToRefund}(""); (bool sent,) = fromWormholeFormat(internalInstruction.refundAddress).call{value: weiToRefund}("");
@ -480,21 +480,21 @@ contract CoreRelayer is CoreRelayerGovernance {
} }
if (success) { if (success) {
emit Delivery( emit Delivery({
fromWormholeFormat(internalInstruction.targetAddress), recipientContract: fromWormholeFormat(internalInstruction.targetAddress),
sourceChain, sourceChain: sourceChain,
sourceSequence, sequence: sourceSequence,
deliveryVaaHash, deliveryVaaHash: deliveryVaaHash,
uint8(DeliveryStatus.SUCCESS) status: uint8(DeliveryStatus.SUCCESS)
); });
} else { } else {
emit Delivery( emit Delivery({
fromWormholeFormat(internalInstruction.targetAddress), recipientContract: fromWormholeFormat(internalInstruction.targetAddress),
sourceChain, sourceChain: sourceChain,
sourceSequence, sequence: sourceSequence,
deliveryVaaHash, deliveryVaaHash: deliveryVaaHash,
uint8(DeliveryStatus.RECEIVER_FAILURE) status: uint8(DeliveryStatus.RECEIVER_FAILURE)
); });
} }
} }
@ -591,13 +591,13 @@ contract CoreRelayer is CoreRelayerGovernance {
); );
if (!valid) { if (!valid) {
emit Delivery( emit Delivery({
fromWormholeFormat(instruction.targetAddress), recipientContract: fromWormholeFormat(instruction.targetAddress),
redeliveryVM.emitterChainId, sourceChain: redeliveryVM.emitterChainId,
redeliveryVM.sequence, sequence: redeliveryVM.sequence,
redeliveryVM.hash, deliveryVaaHash: redeliveryVM.hash,
uint8(DeliveryStatus.INVALID_REDELIVERY) status: uint8(DeliveryStatus.INVALID_REDELIVERY)
); });
targetParams.relayerRefundAddress.send(msg.value); targetParams.relayerRefundAddress.send(msg.value);
return; return;
} }

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

@ -985,13 +985,13 @@ contract TestCoreRelayer is Test {
bytes32 redeliveryVmHash = relayerWormhole.parseVM(stack.redeliveryVM).hash; bytes32 redeliveryVmHash = relayerWormhole.parseVM(stack.redeliveryVM).hash;
vm.expectEmit(true, true, true, true, address(setup.target.coreRelayer)); vm.expectEmit(true, true, true, true, address(setup.target.coreRelayer));
emit Delivery( emit Delivery({
address(setup.target.integration), recipientContract: address(setup.target.integration),
setup.sourceChainId, sourceChain: setup.sourceChainId,
1, sequence: 1,
redeliveryVmHash, deliveryVaaHash: redeliveryVmHash,
uint8(DeliveryStatus.INVALID_REDELIVERY) status: uint8(DeliveryStatus.INVALID_REDELIVERY)
); });
setup.target.coreRelayerFull.redeliverSingle{value: stack.budget}(stack.package); setup.target.coreRelayerFull.redeliverSingle{value: stack.budget}(stack.package);
uint16 differentChainId = 2; uint16 differentChainId = 2;
@ -1000,13 +1000,13 @@ contract TestCoreRelayer is Test {
} }
vm.deal(setup.target.relayer, type(uint256).max); vm.deal(setup.target.relayer, type(uint256).max);
vm.expectEmit(true, true, true, true, address(map[differentChainId].coreRelayer)); vm.expectEmit(true, true, true, true, address(map[differentChainId].coreRelayer));
emit Delivery( emit Delivery({
address(setup.target.integration), recipientContract: address(setup.target.integration),
setup.sourceChainId, sourceChain: setup.sourceChainId,
1, sequence: 1,
redeliveryVmHash, deliveryVaaHash: redeliveryVmHash,
uint8(DeliveryStatus.INVALID_REDELIVERY) status: uint8(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);
@ -1049,13 +1049,13 @@ contract TestCoreRelayer is Test {
vm.deal(setup.target.relayer, type(uint256).max); vm.deal(setup.target.relayer, type(uint256).max);
vm.expectEmit(true, true, true, true, address(map[differentChainId].coreRelayer)); vm.expectEmit(true, true, true, true, address(map[differentChainId].coreRelayer));
emit Delivery( emit Delivery({
address(setup.target.integration), recipientContract: address(setup.target.integration),
setup.sourceChainId, sourceChain: setup.sourceChainId,
3, sequence: 3,
redeliveryVmHash, deliveryVaaHash: redeliveryVmHash,
uint8(DeliveryStatus.INVALID_REDELIVERY) status: uint8(DeliveryStatus.INVALID_REDELIVERY)
); });
vm.prank(setup.target.relayer); vm.prank(setup.target.relayer);
map[differentChainId].coreRelayerFull.redeliverSingle{ map[differentChainId].coreRelayerFull.redeliverSingle{
value: stack.payment + map[differentChainId].wormhole.messageFee() value: stack.payment + map[differentChainId].wormhole.messageFee()