Skip to content

feat: self relay #230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 21, 2023
Merged

feat: self relay #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
388a828
DRAFT: self relay
mrice32 Feb 7, 2023
a2a31fd
Merge branch 'master' into self_relay
mrice32 Feb 21, 2023
c8c827e
Merge branch 'master' into self_relay
mrice32 Feb 21, 2023
f739129
add test
mrice32 Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions contracts/SpokePool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,12 @@ abstract contract SpokePool is
// fill any relay up to 100 tokens, and partial fill with 100 tokens for larger relays).
relayFills[relayHash] += fillAmountPreFees;

// If relayer and receiver are the same address, there is no need to do any transfer, as it would result in no
// net movement of funds.
// Note: this is important because it means that relayers can intentionally self-relay in a capital efficient
// way (no need to have funds on the destination).
if (msg.sender == relayData.recipient) return fillAmountPreFees;

// If relay token is wrappedNativeToken then unwrap and send native token.
if (relayData.destinationToken == address(wrappedNativeToken)) {
// Note: useContractFunds is True if we want to send funds to the recipient directly out of this contract,
Expand Down
21 changes: 21 additions & 0 deletions test/SpokePool.Relay.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,27 @@ describe("SpokePool Relayer Logic", async function () {
// Fill amount should be set.
expect(await spokePool.relayFills(relayHash)).to.equal(consts.amountToRelayPreFees);
});
it("Self-relay transfers no tokens", async function () {
const largeRelayAmount = consts.amountToSeedWallets.mul(100);
const { relayHash, relayData } = getRelayHash(
depositor.address,
relayer.address,
consts.firstDepositId,
consts.originChainId,
consts.destinationChainId,
weth.address,
largeRelayAmount
);

// This should work, despite the amount being quite large.
await spokePool.connect(relayer).fillRelay(...getFillRelayParams(relayData, largeRelayAmount));

// Balance should be the same as before.
expect(await weth.balanceOf(relayer.address)).to.equal(consts.amountToSeedWallets);

// Fill amount should be set.
expect(await spokePool.relayFills(relayHash)).to.equal(largeRelayAmount);
});
it("General failure cases", async function () {
// Fees set too high.
await expect(
Expand Down