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

forge fmt

This commit is contained in:
derpy-duck 2023-01-17 22:47:29 +00:00 committed by Joe Howarth
parent 04999b89eb
commit 9e3453709f
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,24 +23,19 @@ contract CoreRelayer is CoreRelayerGovernance {
{
DeliveryRequest[] memory requests = new DeliveryRequest[](1);
requests[0] = request;
DeliveryRequestsContainer memory container = DeliveryRequestsContainer({
payloadId: 1,
relayProviderAddress: address(provider),
requests: requests
});
DeliveryRequestsContainer memory container =
DeliveryRequestsContainer({payloadId: 1, relayProviderAddress: address(provider), requests: requests});
return requestMultidelivery(container, nonce);
}
function requestForward(DeliveryRequest memory request, uint16 rolloverChain, uint32 nonce, IRelayProvider provider)
public payable
public
payable
{
DeliveryRequest[] memory requests = new DeliveryRequest[](1);
requests[0] = request;
DeliveryRequestsContainer memory container = DeliveryRequestsContainer({
payloadId: 1,
relayProviderAddress: address(provider),
requests: requests
});
DeliveryRequestsContainer memory container =
DeliveryRequestsContainer({payloadId: 1, relayProviderAddress: address(provider), requests: requests});
return requestMultiforward(container, rolloverChain, nonce);
}
@ -152,13 +147,15 @@ contract CoreRelayer is CoreRelayerGovernance {
verifyForwardingRequest(deliveryRequests, rolloverChain, nonce);
bytes memory encodedDeliveryRequestsContainer = encodeDeliveryRequestsContainer(deliveryRequests);
setForwardingRequest(ForwardingRequest({
deliveryRequestsContainer: encodedDeliveryRequestsContainer,
rolloverChain: rolloverChain,
nonce: nonce,
msgValue: msg.value,
isValid: true
}));
setForwardingRequest(
ForwardingRequest({
deliveryRequestsContainer: encodedDeliveryRequestsContainer,
rolloverChain: rolloverChain,
nonce: nonce,
msgValue: msg.value,
isValid: true
})
);
}
function emitForward(uint256 refundAmount) internal returns (uint64, bool) {

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

@ -1033,12 +1033,11 @@ contract TestCoreRelayer is Test {
for (uint8 k = 0; k < container.instructions.length; k++) {
uint256 budget =
container.instructions[k].maximumRefundTarget + container.instructions[k].applicationBudgetTarget;
ICoreRelayer.TargetDeliveryParametersSingle memory package =
ICoreRelayer.TargetDeliveryParametersSingle({
encodedVMs: deliveryInstructions,
deliveryIndex: counter,
multisendIndex: k
});
ICoreRelayer.TargetDeliveryParametersSingle memory package = ICoreRelayer.TargetDeliveryParametersSingle({
encodedVMs: deliveryInstructions,
deliveryIndex: counter,
multisendIndex: k
});
uint16 targetChain = container.instructions[k].targetChain;
uint256 wormholeFee = map[targetChain].wormhole.messageFee();
vm.prank(map[targetChain].relayer);