diff --git a/ethereum/contracts/coreRelayer/CoreRelayer.sol b/ethereum/contracts/coreRelayer/CoreRelayer.sol index aa4bc66..5272180 100644 --- a/ethereum/contracts/coreRelayer/CoreRelayer.sol +++ b/ethereum/contracts/coreRelayer/CoreRelayer.sol @@ -449,13 +449,13 @@ contract CoreRelayer is CoreRelayerGovernance { if (forwardingRequest.isValid) { (, success) = emitForward(weiToRefund, forwardingRequest); if (success) { - emit Delivery( - fromWormholeFormat(internalInstruction.targetAddress), - sourceChain, - sourceSequence, - deliveryVaaHash, - uint8(DeliveryStatus.FORWARD_REQUEST_SUCCESS) - ); + emit Delivery({ + recipientContract: fromWormholeFormat(internalInstruction.targetAddress), + sourceChain: sourceChain, + sequence: sourceSequence, + deliveryVaaHash: deliveryVaaHash, + status: uint8(DeliveryStatus.FORWARD_REQUEST_SUCCESS) + }); } else { (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 weiToRefund = 0; } - emit Delivery( - fromWormholeFormat(internalInstruction.targetAddress), - sourceChain, - sourceSequence, - deliveryVaaHash, - uint8(DeliveryStatus.FORWARD_REQUEST_FAILURE) - ); + emit Delivery({ + recipientContract: fromWormholeFormat(internalInstruction.targetAddress), + sourceChain: sourceChain, + sequence: sourceSequence, + deliveryVaaHash: deliveryVaaHash, + status: uint8(DeliveryStatus.FORWARD_REQUEST_FAILURE) + }); } } else { (bool sent,) = fromWormholeFormat(internalInstruction.refundAddress).call{value: weiToRefund}(""); @@ -480,21 +480,21 @@ contract CoreRelayer is CoreRelayerGovernance { } if (success) { - emit Delivery( - fromWormholeFormat(internalInstruction.targetAddress), - sourceChain, - sourceSequence, - deliveryVaaHash, - uint8(DeliveryStatus.SUCCESS) - ); + emit Delivery({ + recipientContract: fromWormholeFormat(internalInstruction.targetAddress), + sourceChain: sourceChain, + sequence: sourceSequence, + deliveryVaaHash: deliveryVaaHash, + status: uint8(DeliveryStatus.SUCCESS) + }); } else { - emit Delivery( - fromWormholeFormat(internalInstruction.targetAddress), - sourceChain, - sourceSequence, - deliveryVaaHash, - uint8(DeliveryStatus.RECEIVER_FAILURE) - ); + emit Delivery({ + recipientContract: fromWormholeFormat(internalInstruction.targetAddress), + sourceChain: sourceChain, + sequence: sourceSequence, + deliveryVaaHash: deliveryVaaHash, + status: uint8(DeliveryStatus.RECEIVER_FAILURE) + }); } } @@ -591,13 +591,13 @@ contract CoreRelayer is CoreRelayerGovernance { ); if (!valid) { - emit Delivery( - fromWormholeFormat(instruction.targetAddress), - redeliveryVM.emitterChainId, - redeliveryVM.sequence, - redeliveryVM.hash, - uint8(DeliveryStatus.INVALID_REDELIVERY) - ); + emit Delivery({ + recipientContract: fromWormholeFormat(instruction.targetAddress), + sourceChain: redeliveryVM.emitterChainId, + sequence: redeliveryVM.sequence, + deliveryVaaHash: redeliveryVM.hash, + status: uint8(DeliveryStatus.INVALID_REDELIVERY) + }); targetParams.relayerRefundAddress.send(msg.value); return; } diff --git a/ethereum/forge-test/CoreRelayer.t.sol b/ethereum/forge-test/CoreRelayer.t.sol index 142b290..2aba12d 100644 --- a/ethereum/forge-test/CoreRelayer.t.sol +++ b/ethereum/forge-test/CoreRelayer.t.sol @@ -985,13 +985,13 @@ contract TestCoreRelayer is Test { bytes32 redeliveryVmHash = relayerWormhole.parseVM(stack.redeliveryVM).hash; vm.expectEmit(true, true, true, true, address(setup.target.coreRelayer)); - emit Delivery( - address(setup.target.integration), - setup.sourceChainId, - 1, - redeliveryVmHash, - uint8(DeliveryStatus.INVALID_REDELIVERY) - ); + emit Delivery({ + recipientContract: address(setup.target.integration), + sourceChain: setup.sourceChainId, + sequence: 1, + deliveryVaaHash: redeliveryVmHash, + status: uint8(DeliveryStatus.INVALID_REDELIVERY) + }); setup.target.coreRelayerFull.redeliverSingle{value: stack.budget}(stack.package); uint16 differentChainId = 2; @@ -1000,13 +1000,13 @@ contract TestCoreRelayer is Test { } vm.deal(setup.target.relayer, type(uint256).max); vm.expectEmit(true, true, true, true, address(map[differentChainId].coreRelayer)); - emit Delivery( - address(setup.target.integration), - setup.sourceChainId, - 1, - redeliveryVmHash, - uint8(DeliveryStatus.INVALID_REDELIVERY) - ); + emit Delivery({ + recipientContract: address(setup.target.integration), + sourceChain: setup.sourceChainId, + sequence: 1, + deliveryVaaHash: redeliveryVmHash, + status: uint8(DeliveryStatus.INVALID_REDELIVERY) + }); vm.prank(setup.target.relayer); 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.expectEmit(true, true, true, true, address(map[differentChainId].coreRelayer)); - emit Delivery( - address(setup.target.integration), - setup.sourceChainId, - 3, - redeliveryVmHash, - uint8(DeliveryStatus.INVALID_REDELIVERY) - ); + emit Delivery({ + recipientContract: address(setup.target.integration), + sourceChain: setup.sourceChainId, + sequence: 3, + deliveryVaaHash: redeliveryVmHash, + status: uint8(DeliveryStatus.INVALID_REDELIVERY) + }); vm.prank(setup.target.relayer); map[differentChainId].coreRelayerFull.redeliverSingle{ value: stack.payment + map[differentChainId].wormhole.messageFee()