Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3d5c5e0e6b |
@@ -1260,17 +1260,27 @@ runs (Transaction Decoding below gives what the router holds). The router
|
|||||||
unwraps only the WETH it holds, so WETH that step paid to the user, or to anyone
|
unwraps only the WETH it holds, so WETH that step paid to the user, or to anyone
|
||||||
else, stays WETH: a swap that pays the router WETH, then a swap that pays the
|
else, stays WETH: a swap that pays the router WETH, then a swap that pays the
|
||||||
user WETH, then an unwrap, shows WETH with the second swap's minimum. The
|
user WETH, then an unwrap, shows WETH with the second swap's minimum. The
|
||||||
minimum reads in ETH when that step paid all its WETH to the router. When it
|
minimum reads in ETH only when that step paid all its WETH to the router and
|
||||||
paid only part of it to the router, as a V4 step does that `TAKE`s some of its
|
every step between it and the `UNWRAP_WETH` is one the decoder read of these: a
|
||||||
WETH to the user and the rest to the router, or paid the router WETH beside a
|
`PERMIT2_PERMIT`, a `BALANCE_CHECK_ERC20`, or a `SWEEP`, `TRANSFER`,
|
||||||
payout the decoder cannot read, the swap shows ETH with no minimum: the decoder
|
`PAY_PORTION` or `PAY_PORTION_FULL_PRECISION` of a token other than WETH, but
|
||||||
does not count how much of that step's minimum reaches the router, nor read the
|
not of ETH to a WETH contract, which pays the router WETH. None of these can
|
||||||
`UNWRAP_WETH`'s own minimum. A later step that sets the output side sets it
|
take WETH out of the router or pay anyone WETH; the decoder treats every other
|
||||||
anew. Otherwise `Token Out` and `Min. received` keep the output side's own token
|
step as one that may. Otherwise the swap shows ETH with no minimum, as it does
|
||||||
and figure, whether the swap was paid in ETH or in a token: a V2 exact-out swap
|
after a V4 step that `TAKE`s some of its WETH to the user and the rest to the
|
||||||
that buys USDC and then unwraps the WETH it did not spend shows USDC. The token
|
router, or that pays the router WETH beside a payout the decoder cannot read,
|
||||||
permission warning on the signature screen has its own amount wording, including
|
and with a WETH interface fee paid by `PAY_PORTION` before the `UNWRAP_WETH`:
|
||||||
`Unknown`; the SignApproval section below describes it.
|
the decoder does not count how much of that step's minimum reaches the
|
||||||
|
`UNWRAP_WETH`, nor read the `UNWRAP_WETH`'s own minimum. When that `UNWRAP_WETH`
|
||||||
|
pays the router, or its recipient cannot be read, the router may hold the ETH,
|
||||||
|
and a later step may pay it out as WETH, as a `WRAP_ETH` of it to the user does:
|
||||||
|
after any later step but those listed, the swap shows WETH with no minimum. A
|
||||||
|
later step that sets the output side sets it anew. Otherwise `Token Out` and
|
||||||
|
`Min. received` keep the output side's own token and figure, whether the swap
|
||||||
|
was paid in ETH or in a token: a V2 exact-out swap that buys USDC and then
|
||||||
|
unwraps the WETH it did not spend shows USDC. The token permission warning on
|
||||||
|
the signature screen has its own amount wording, including `Unknown`; the
|
||||||
|
SignApproval section below describes it.
|
||||||
|
|
||||||
The swap's `Deadline` line is the router's deadline as a UTC date and time, e.g.
|
The swap's `Deadline` line is the router's deadline as a UTC date and time, e.g.
|
||||||
`2026-02-27 08:25:51`. A JavaScript date reaches only to 275760-09-13 00:00:00
|
`2026-02-27 08:25:51`. A JavaScript date reaches only to 275760-09-13 00:00:00
|
||||||
|
|||||||
+86
-15
@@ -1221,8 +1221,21 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
let hasUnwrapWeth = false;
|
let hasUnwrapWeth = false;
|
||||||
// Set when an UNWRAP_WETH pays out, as ETH, the output side's WETH,
|
// Set when an UNWRAP_WETH pays out, as ETH, the output side's WETH,
|
||||||
// which the router holds; cleared whenever the output side is set
|
// which the router holds; cleared whenever the output side is set
|
||||||
// again.
|
// again, or a later step may pay that ETH out as WETH (see after the
|
||||||
|
// loop). `unwrapIntoRouterStep` is the index of that UNWRAP_WETH when
|
||||||
|
// it may have paid the ETH to the router, which then holds it: its
|
||||||
|
// recipient is the router or cannot be read. Otherwise it is null.
|
||||||
let outputUnwrapped = false;
|
let outputUnwrapped = false;
|
||||||
|
let unwrapIntoRouterStep = null;
|
||||||
|
// The index of the step that set the output side.
|
||||||
|
let outputStep = -1;
|
||||||
|
// The index of the last step this decoder treats as one that may take
|
||||||
|
// WETH out of the router or pay anyone WETH: any step but one it read
|
||||||
|
// that is a PERMIT2_PERMIT, a BALANCE_CHECK_ERC20, or a SWEEP,
|
||||||
|
// TRANSFER, PAY_PORTION or PAY_PORTION_FULL_PRECISION of a token
|
||||||
|
// other than WETH, and not of ETH to a WETH contract, which pays the
|
||||||
|
// router WETH (see keepsRouterWeth in the loop). None of those can.
|
||||||
|
let lastWethStep = -1;
|
||||||
// Where the step that set the output side paid its output: the
|
// Where the step that set the output side paid its output: the
|
||||||
// recipient of a swap step, as written, or of each TAKE, TAKE_ALL and
|
// recipient of a swap step, as written, or of each TAKE, TAKE_ALL and
|
||||||
// TAKE_PORTION of it in a V4 step, a TAKE_ALL as paid to the sender,
|
// TAKE_PORTION of it in a V4 step, a TAKE_ALL as paid to the sender,
|
||||||
@@ -1265,13 +1278,14 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
if (!present(token) && !present(amount)) return;
|
if (!present(token) && !present(amount)) return;
|
||||||
setInput(token, amount);
|
setInput(token, amount);
|
||||||
};
|
};
|
||||||
const setOutput = (token, amount, recipients) => {
|
const setOutput = (step, token, amount, recipients) => {
|
||||||
if (!present(token) && !present(amount)) return;
|
if (!present(token) && !present(amount)) return;
|
||||||
outputToken = present(token) ? token : null;
|
outputToken = present(token) ? token : null;
|
||||||
minOutput = present(amount) ? amount : null;
|
minOutput = present(amount) ? amount : null;
|
||||||
outputEstablished = true;
|
outputEstablished = true;
|
||||||
outputUnwrapped = false;
|
outputUnwrapped = false;
|
||||||
outputRecipients = recipients;
|
outputRecipients = recipients;
|
||||||
|
outputStep = step;
|
||||||
};
|
};
|
||||||
|
|
||||||
// What the steps take from the sender beyond the amount of the step
|
// What the steps take from the sender beyond the amount of the step
|
||||||
@@ -1421,6 +1435,9 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
? COMMAND_NAMES[command]
|
? COMMAND_NAMES[command]
|
||||||
: "Command 0x" + cmdId.toString(16).padStart(2, "0"),
|
: "Command 0x" + cmdId.toString(16).padStart(2, "0"),
|
||||||
);
|
);
|
||||||
|
// Set by a branch below that reads a step that cannot take WETH
|
||||||
|
// out of the router or pay anyone WETH (see lastWethStep).
|
||||||
|
let keepsRouterWeth = false;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (command === "EXECUTE_SUB_PLAN") {
|
if (command === "EXECUTE_SUB_PLAN") {
|
||||||
@@ -1452,6 +1469,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
allowedToFail,
|
allowedToFail,
|
||||||
beforeEveryTake: !tookBefore,
|
beforeEveryTake: !tookBefore,
|
||||||
};
|
};
|
||||||
|
keepsRouterWeth = true;
|
||||||
} else {
|
} else {
|
||||||
stepsUnread.push(i);
|
stepsUnread.push(i);
|
||||||
}
|
}
|
||||||
@@ -1507,6 +1525,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
// what the user receives: it sets no side, and the
|
// what the user receives: it sets no side, and the
|
||||||
// step says so.
|
// step says so.
|
||||||
commandNames[i] += " (of another address)";
|
commandNames[i] += " (of another address)";
|
||||||
|
keepsRouterWeth = true;
|
||||||
} else {
|
} else {
|
||||||
// The router passes this check whenever the owner
|
// The router passes this check whenever the owner
|
||||||
// holds at least minBalance, so a zero one guarantees
|
// holds at least minBalance, so a zero one guarantees
|
||||||
@@ -1517,8 +1536,9 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
// does. It pays nobody.
|
// does. It pays nobody.
|
||||||
const minBalance = allowedToFail ? 0n : b.minBalance;
|
const minBalance = allowedToFail ? 0n : b.minBalance;
|
||||||
if (!(minBalance === 0n && present(minOutput))) {
|
if (!(minBalance === 0n && present(minOutput))) {
|
||||||
setOutput(b.token, minBalance, []);
|
setOutput(i, b.token, minBalance, []);
|
||||||
}
|
}
|
||||||
|
keepsRouterWeth = true;
|
||||||
}
|
}
|
||||||
} else if (command === "V3_SWAP_EXACT_IN") {
|
} else if (command === "V3_SWAP_EXACT_IN") {
|
||||||
const s = decodeV3SwapExactIn(inputs[i]);
|
const s = decodeV3SwapExactIn(inputs[i]);
|
||||||
@@ -1531,7 +1551,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
// Always update output: in multi-step swaps (V3 → V4),
|
// Always update output: in multi-step swaps (V3 → V4),
|
||||||
// the last swap step determines the final output token
|
// the last swap step determines the final output token
|
||||||
// and minimum received amount.
|
// and minimum received amount.
|
||||||
setOutput(s.tokenOut, s.amountOutMin, [s.recipient]);
|
setOutput(i, s.tokenOut, s.amountOutMin, [s.recipient]);
|
||||||
if (!s.payerIsUser) {
|
if (!s.payerIsUser) {
|
||||||
spendFromRouter(s.tokenIn, s.amountIn);
|
spendFromRouter(s.tokenIn, s.amountIn);
|
||||||
}
|
}
|
||||||
@@ -1551,7 +1571,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
} else if (s.payerIsUser) {
|
} else if (s.payerIsUser) {
|
||||||
addUserPaid(s.tokenIn, s.amountIn);
|
addUserPaid(s.tokenIn, s.amountIn);
|
||||||
}
|
}
|
||||||
setOutput(s.tokenOut, s.amountOutMin, [s.recipient]);
|
setOutput(i, s.tokenOut, s.amountOutMin, [s.recipient]);
|
||||||
if (!s.payerIsUser) {
|
if (!s.payerIsUser) {
|
||||||
spendFromRouter(s.tokenIn, s.amountIn);
|
spendFromRouter(s.tokenIn, s.amountIn);
|
||||||
}
|
}
|
||||||
@@ -1582,7 +1602,7 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
} else if (s.payerIsUser) {
|
} else if (s.payerIsUser) {
|
||||||
addUserPaid(s.tokenIn, s.amountInMax);
|
addUserPaid(s.tokenIn, s.amountInMax);
|
||||||
}
|
}
|
||||||
setOutput(s.tokenOut, s.amountOut, [s.recipient]);
|
setOutput(i, s.tokenOut, s.amountOut, [s.recipient]);
|
||||||
if (!isHop(i, s.tokenOut, s.recipient)) {
|
if (!isHop(i, s.tokenOut, s.recipient)) {
|
||||||
addPayee(s.recipient, s.tokenOut);
|
addPayee(s.recipient, s.tokenOut);
|
||||||
}
|
}
|
||||||
@@ -1604,6 +1624,15 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
if (!isRouter(s.recipient)) {
|
if (!isRouter(s.recipient)) {
|
||||||
heldByRouter.delete(s.token.toLowerCase());
|
heldByRouter.delete(s.token.toLowerCase());
|
||||||
}
|
}
|
||||||
|
// ETH paid to a WETH contract pays the router WETH.
|
||||||
|
keepsRouterWeth = !(
|
||||||
|
WETH_ADDRESSES.includes(s.token.toLowerCase()) ||
|
||||||
|
(s.token ===
|
||||||
|
"0x0000000000000000000000000000000000000000" &&
|
||||||
|
WETH_ADDRESSES.includes(
|
||||||
|
s.recipient.toLowerCase(),
|
||||||
|
))
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
payeeUnread = true;
|
payeeUnread = true;
|
||||||
stepsUnread.push(i);
|
stepsUnread.push(i);
|
||||||
@@ -1641,6 +1670,15 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
) {
|
) {
|
||||||
heldByRouter.delete(t.token.toLowerCase());
|
heldByRouter.delete(t.token.toLowerCase());
|
||||||
}
|
}
|
||||||
|
// ETH paid to a WETH contract pays the router WETH.
|
||||||
|
keepsRouterWeth = !(
|
||||||
|
WETH_ADDRESSES.includes(t.token.toLowerCase()) ||
|
||||||
|
(t.token ===
|
||||||
|
"0x0000000000000000000000000000000000000000" &&
|
||||||
|
WETH_ADDRESSES.includes(
|
||||||
|
t.recipient.toLowerCase(),
|
||||||
|
))
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
payeeUnread = true;
|
payeeUnread = true;
|
||||||
stepsUnread.push(i);
|
stepsUnread.push(i);
|
||||||
@@ -1766,13 +1804,19 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
outputEstablished = true;
|
outputEstablished = true;
|
||||||
outputUnwrapped = false;
|
outputUnwrapped = false;
|
||||||
outputRecipients = takeRecipients;
|
outputRecipients = takeRecipients;
|
||||||
|
outputStep = i;
|
||||||
} else if (v4) {
|
} else if (v4) {
|
||||||
// A step with no swap action sets only the sides its
|
// A step with no swap action sets only the sides its
|
||||||
// SETTLE, SETTLE_ALL, TAKE or TAKE_ALL names:
|
// SETTLE, SETTLE_ALL, TAKE or TAKE_ALL names:
|
||||||
// setInputOnce() and setOutput() leave alone a side
|
// setInputOnce() and setOutput() leave alone a side
|
||||||
// whose two halves are both unstated.
|
// whose two halves are both unstated.
|
||||||
setInputOnce(v4.tokenIn, amountIn);
|
setInputOnce(v4.tokenIn, amountIn);
|
||||||
setOutput(v4.tokenOut, v4.amountOutMin, takeRecipients);
|
setOutput(
|
||||||
|
i,
|
||||||
|
v4.tokenOut,
|
||||||
|
v4.amountOutMin,
|
||||||
|
takeRecipients,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
// Every V4 step, with a swap action or without, takes
|
// Every V4 step, with a swap action or without, takes
|
||||||
// from the sender what the user pays it (an amount an
|
// from the sender what the user pays it (an amount an
|
||||||
@@ -1799,12 +1843,17 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
// among it when the step that set the output side paid it
|
// among it when the step that set the output side paid it
|
||||||
// to the router and the router still holds WETH. WETH
|
// to the router and the router still holds WETH. WETH
|
||||||
// that step paid to the user, or to anyone else, stays
|
// that step paid to the user, or to anyone else, stays
|
||||||
// WETH, so when that step also paid some of its output
|
// WETH. When that step also paid some of its output
|
||||||
// elsewhere, or made a payout this decoder did not read,
|
// elsewhere or made a payout this decoder did not read,
|
||||||
// only part of it may be unwrapped. This decoder does not
|
// or this decoder treats a step between the two as one
|
||||||
// count how much of that step's minimum then reaches the
|
// that may take WETH out of the router or pay anyone WETH
|
||||||
// router, nor read the UNWRAP_WETH's own minimum, so the
|
// (see lastWethStep), the WETH unwrapped may be only part
|
||||||
// output side keeps no figure.
|
// of the output side's, or none of it.
|
||||||
|
// This decoder does not count how much of that step's
|
||||||
|
// minimum then reaches the UNWRAP_WETH, nor read the
|
||||||
|
// UNWRAP_WETH's own minimum, so the output side keeps no
|
||||||
|
// figure.
|
||||||
|
const u = decodeUnwrapWeth(inputs[i]);
|
||||||
const toRouter = (r) => present(r) && isRouter(r);
|
const toRouter = (r) => present(r) && isRouter(r);
|
||||||
if (
|
if (
|
||||||
present(outputToken) &&
|
present(outputToken) &&
|
||||||
@@ -1813,11 +1862,15 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
outputRecipients.some(toRouter)
|
outputRecipients.some(toRouter)
|
||||||
) {
|
) {
|
||||||
outputUnwrapped = true;
|
outputUnwrapped = true;
|
||||||
if (!outputRecipients.every(toRouter)) {
|
unwrapIntoRouterStep =
|
||||||
|
u === null || isRouter(u.recipient) ? i : null;
|
||||||
|
if (
|
||||||
|
!outputRecipients.every(toRouter) ||
|
||||||
|
lastWethStep > outputStep
|
||||||
|
) {
|
||||||
minOutput = null;
|
minOutput = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const u = decodeUnwrapWeth(inputs[i]);
|
|
||||||
if (u) {
|
if (u) {
|
||||||
addPayee(u.recipient);
|
addPayee(u.recipient);
|
||||||
// It pays out all the router's WETH, as ETH. Into the
|
// It pays out all the router's WETH, as ETH. Into the
|
||||||
@@ -1854,6 +1907,24 @@ function decode(data, toAddress, chainId, sources, fromAddress) {
|
|||||||
if (allowedToFail) {
|
if (allowedToFail) {
|
||||||
commandNames[i] += " (allowed to fail)";
|
commandNames[i] += " (allowed to fail)";
|
||||||
}
|
}
|
||||||
|
if (!keepsRouterWeth) {
|
||||||
|
lastWethStep = i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// After an UNWRAP_WETH that may have paid the output side's WETH to
|
||||||
|
// the router as ETH, a later step may pay that ETH out as WETH, as a
|
||||||
|
// WRAP_ETH of it to the user does. This decoder treats every later
|
||||||
|
// step but those lastWethStep names as one that may, and does not
|
||||||
|
// count how much of that ETH each pays out: after one, the output
|
||||||
|
// side reads as WETH with no figure.
|
||||||
|
if (
|
||||||
|
outputUnwrapped &&
|
||||||
|
unwrapIntoRouterStep !== null &&
|
||||||
|
lastWethStep > unwrapIntoRouterStep
|
||||||
|
) {
|
||||||
|
outputUnwrapped = false;
|
||||||
|
minOutput = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The Amount line, and the lines for what the steps take beyond it.
|
// The Amount line, and the lines for what the steps take beyond it.
|
||||||
|
|||||||
+216
-10
@@ -11,7 +11,8 @@
|
|||||||
// what each PERMIT2_TRANSFER_FROM moves
|
// what each PERMIT2_TRANSFER_FROM moves
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/611), and when an
|
// (https://git.eeqj.de/sneak/AutistMask/issues/611), and when an
|
||||||
// UNWRAP_WETH makes the output ETH
|
// UNWRAP_WETH makes the output ETH
|
||||||
// (https://git.eeqj.de/sneak/AutistMask/issues/607).
|
// (https://git.eeqj.de/sneak/AutistMask/issues/607 and
|
||||||
|
// https://git.eeqj.de/sneak/AutistMask/issues/642).
|
||||||
//
|
//
|
||||||
// Every swap command, SWEEP, WRAP_ETH, UNWRAP_WETH, TRANSFER, PAY_PORTION,
|
// Every swap command, SWEEP, WRAP_ETH, UNWRAP_WETH, TRANSFER, PAY_PORTION,
|
||||||
// PAY_PORTION_FULL_PRECISION, PERMIT2_TRANSFER_FROM, ACROSS_V4_DEPOSIT_V3 and
|
// PAY_PORTION_FULL_PRECISION, PERMIT2_TRANSFER_FROM, ACROSS_V4_DEPOSIT_V3 and
|
||||||
@@ -745,6 +746,220 @@ describe("an UNWRAP_WETH makes the output ETH only when the router holds it", ()
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// https://git.eeqj.de/sneak/AutistMask/issues/642: a step between the swap and
|
||||||
|
// the UNWRAP_WETH may take WETH out of the router or pay it WETH, and a step
|
||||||
|
// after an UNWRAP_WETH into the router may pay its ETH out as WETH, yet each
|
||||||
|
// route read as ETH with the swap's minimum. A step the decoder read that is a
|
||||||
|
// PERMIT2_PERMIT, a BALANCE_CHECK_ERC20, or a SWEEP, TRANSFER, PAY_PORTION or
|
||||||
|
// PAY_PORTION_FULL_PRECISION of a token other than WETH, and not of ETH to a
|
||||||
|
// WETH contract, cannot take WETH out of the router or pay anyone WETH; the
|
||||||
|
// decoder treats every other step as one that may.
|
||||||
|
describe("what reaches the UNWRAP_WETH of the swap's WETH", () => {
|
||||||
|
const NO_MINIMUM_TO_USER = PAID_TO_USER.filter(
|
||||||
|
(l) => l !== "Min. received",
|
||||||
|
);
|
||||||
|
const NO_MINIMUM_ELSEWHERE = PAID_ELSEWHERE.filter(
|
||||||
|
(l) => l !== "Min. paid out",
|
||||||
|
);
|
||||||
|
|
||||||
|
test.each([
|
||||||
|
{
|
||||||
|
kind: "a TRANSFER of 0.0025 WETH",
|
||||||
|
step: transfer(0x05, WETH, OTHER, ONE_WETH / 400n),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "a PAY_PORTION of 25 bips",
|
||||||
|
step: transfer(0x06, WETH, OTHER, 25n),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "a PAY_PORTION_FULL_PRECISION of 1e15",
|
||||||
|
step: transfer(0x07, WETH, OTHER, 10n ** 15n),
|
||||||
|
},
|
||||||
|
])(
|
||||||
|
"$kind to another address between them reads as ETH with no minimum",
|
||||||
|
({ step }) => {
|
||||||
|
const result = decode(
|
||||||
|
execute(swapToWeth(ADDRESS_THIS), step, unwrapWeth(MSG_SENDER)),
|
||||||
|
USER,
|
||||||
|
ROUTER_V2_1_2,
|
||||||
|
);
|
||||||
|
expect(result.name).toBe("Swap USDT → ETH");
|
||||||
|
expect(labels(result)).toEqual(NO_MINIMUM_ELSEWHERE);
|
||||||
|
expect(paidTo(result)).toEqual([OTHER]);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
test.each([
|
||||||
|
{
|
||||||
|
kind: "a SWEEP whose recipient cannot be read",
|
||||||
|
step: withDirtyWord(sweep(WETH, OTHER), 1),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "a V4 SETTLE of 0.5 WETH from the router",
|
||||||
|
step: v4Swap([
|
||||||
|
0x0b,
|
||||||
|
coder.encode(
|
||||||
|
["address", "uint256", "bool"],
|
||||||
|
[WETH, ONE_WETH / 2n, false],
|
||||||
|
),
|
||||||
|
]),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "a bridge deposit of 0.5 WETH",
|
||||||
|
step: acrossDeposit(USER, USER, WETH, ONE_WETH / 2n),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "a PERMIT2_TRANSFER_FROM of 0.5 WETH into the router",
|
||||||
|
step: permit2TransferFrom(WETH, ADDRESS_THIS, ONE_WETH / 2n),
|
||||||
|
},
|
||||||
|
])("$kind between them reads as ETH with no minimum", ({ step }) => {
|
||||||
|
const result = decode(
|
||||||
|
execute(swapToWeth(ADDRESS_THIS), step, unwrapWeth(MSG_SENDER)),
|
||||||
|
);
|
||||||
|
expect(result.name).toBe("Swap USDT → ETH");
|
||||||
|
expect(detail(result, "Min. received")).toBeUndefined();
|
||||||
|
expect(detail(result, "Min. paid out")).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
test.each([
|
||||||
|
{
|
||||||
|
kind: "a PERMIT2_PERMIT between them",
|
||||||
|
steps: [permit2Permit(USDT, USDT_2000), unwrapWeth(MSG_SENDER)],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "a BALANCE_CHECK_ERC20 of another address between them",
|
||||||
|
steps: [balanceCheck(USDC, 1n, OTHER), unwrapWeth(MSG_SENDER)],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "a BALANCE_CHECK_ERC20 of the sender with a zero minimum between them",
|
||||||
|
steps: [balanceCheck(USDC, 0n), unwrapWeth(MSG_SENDER)],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "a SWEEP of USDC between them",
|
||||||
|
steps: [sweep(USDC, MSG_SENDER), unwrapWeth(MSG_SENDER)],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "an UNWRAP_WETH into the router, then a SWEEP of its ETH,",
|
||||||
|
steps: [unwrapWeth(ADDRESS_THIS), sweep(ZERO, MSG_SENDER)],
|
||||||
|
},
|
||||||
|
])("$kind reads as ETH with the swap's minimum", ({ steps }) => {
|
||||||
|
const result = decode(execute(swapToWeth(ADDRESS_THIS), ...steps));
|
||||||
|
expect(result.name).toBe("Swap USDT → ETH");
|
||||||
|
expect(detail(result, "Min. received").value).toBe("1.0000 ETH");
|
||||||
|
});
|
||||||
|
|
||||||
|
// The SWEEP pays the user the swap's WETH, so the UNWRAP_WETH unwraps the
|
||||||
|
// WRAP_ETH's.
|
||||||
|
test("a SWEEP of the swap's WETH to the user, then a WRAP_ETH into the router, reads as ETH with no minimum", () => {
|
||||||
|
const result = decode(
|
||||||
|
execute(
|
||||||
|
swapToWeth(ADDRESS_THIS),
|
||||||
|
sweep(WETH, MSG_SENDER),
|
||||||
|
wrapEth(ADDRESS_THIS, ONE_WETH),
|
||||||
|
unwrapWeth(MSG_SENDER),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
expect(result.name).toBe("Swap USDT → ETH");
|
||||||
|
expect(labels(result)).toEqual(NO_MINIMUM_TO_USER);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("an UNWRAP_WETH into the router, then a WRAP_ETH of all its ETH to the user, reads as WETH with no minimum", () => {
|
||||||
|
const result = decode(
|
||||||
|
execute(
|
||||||
|
swapToWeth(ADDRESS_THIS),
|
||||||
|
unwrapWeth(ADDRESS_THIS),
|
||||||
|
wrapEth(MSG_SENDER, CONTRACT_BALANCE),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
expect(result.name).toBe("Swap USDT → WETH");
|
||||||
|
expect(labels(result)).toEqual(NO_MINIMUM_TO_USER);
|
||||||
|
});
|
||||||
|
|
||||||
|
// The router reads the recipient from the last 20 bytes of its word,
|
||||||
|
// here address(2), the router itself.
|
||||||
|
test("an UNWRAP_WETH whose recipient cannot be read, then a WRAP_ETH of all the router's ETH to the user, reads as WETH with no minimum", () => {
|
||||||
|
const result = decode(
|
||||||
|
execute(
|
||||||
|
swapToWeth(ADDRESS_THIS),
|
||||||
|
withDirtyWord(unwrapWeth(ADDRESS_THIS), 0),
|
||||||
|
wrapEth(MSG_SENDER, CONTRACT_BALANCE),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
expect(result.name).toBe("Swap USDT → WETH");
|
||||||
|
expect(detail(result, "Min. received")).toBeUndefined();
|
||||||
|
expect(detail(result, "Min. paid out")).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
// A SWEEP of WETH pays out WETH, and ETH paid to a WETH contract pays the
|
||||||
|
// router WETH for it. The decoder treats each as a step that may pay out
|
||||||
|
// as WETH the swap's output, which the router holds as ETH.
|
||||||
|
test.each([
|
||||||
|
{
|
||||||
|
kind: "a SWEEP of WETH to the user",
|
||||||
|
step: sweep(WETH, MSG_SENDER),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "a SWEEP of its ETH to the WETH contract",
|
||||||
|
step: sweep(ZERO, WETH),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "a TRANSFER of 0.5 ETH to the WETH contract",
|
||||||
|
step: transfer(0x05, ZERO, WETH, ONE_WETH / 2n),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: "a PAY_PORTION of all its ETH to the WETH contract",
|
||||||
|
step: transfer(0x06, ZERO, WETH, 10000n),
|
||||||
|
},
|
||||||
|
])(
|
||||||
|
"an UNWRAP_WETH into the router, then $kind, reads as WETH with no minimum",
|
||||||
|
({ step }) => {
|
||||||
|
const result = decode(
|
||||||
|
execute(
|
||||||
|
swapToWeth(ADDRESS_THIS),
|
||||||
|
unwrapWeth(ADDRESS_THIS),
|
||||||
|
step,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
expect(result.name).toBe("Swap USDT → WETH");
|
||||||
|
expect(detail(result, "Min. received")).toBeUndefined();
|
||||||
|
expect(detail(result, "Min. paid out")).toBeUndefined();
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// The user receives 0.5 WETH and the rest of the swap's output as ETH.
|
||||||
|
test("an UNWRAP_WETH into the router, then a WRAP_ETH of 0.5 ETH to the user, reads as WETH with no minimum", () => {
|
||||||
|
const result = decode(
|
||||||
|
execute(
|
||||||
|
swapToWeth(ADDRESS_THIS),
|
||||||
|
unwrapWeth(ADDRESS_THIS),
|
||||||
|
wrapEth(MSG_SENDER, ONE_WETH / 2n),
|
||||||
|
sweep(ZERO, MSG_SENDER),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
expect(result.name).toBe("Swap USDT → WETH");
|
||||||
|
expect(labels(result)).toEqual(NO_MINIMUM_TO_USER);
|
||||||
|
});
|
||||||
|
|
||||||
|
// The UNWRAP_WETH pays the user the swap's WETH as ETH; the WRAP_ETH wraps
|
||||||
|
// the ETH an earlier V4 step paid the router.
|
||||||
|
test("an UNWRAP_WETH to the user, then a WRAP_ETH of all the router's ETH to the user, reads as ETH", () => {
|
||||||
|
const result = decode(
|
||||||
|
execute(
|
||||||
|
v4Swap(
|
||||||
|
SWAP_USDT_FOR_ETH,
|
||||||
|
SETTLE_USDT,
|
||||||
|
take(ZERO, ADDRESS_THIS),
|
||||||
|
),
|
||||||
|
swapToWeth(ADDRESS_THIS),
|
||||||
|
unwrapWeth(MSG_SENDER),
|
||||||
|
wrapEth(MSG_SENDER, CONTRACT_BALANCE),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
expect(detail(result, "Token Out").value).toBe("ETH");
|
||||||
|
expect(detail(result, "Min. received").value).toBe("1.0000 ETH");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
// https://git.eeqj.de/sneak/AutistMask/issues/606: any token a step pays the
|
// https://git.eeqj.de/sneak/AutistMask/issues/606: any token a step pays the
|
||||||
// router stays there unless a later step pays out or spends all of it, not
|
// router stays there unless a later step pays out or spends all of it, not
|
||||||
// only the swap's output. A V4 SETTLE can take more of the user's tokens than
|
// only the swap's output. A V4 SETTLE can take more of the user's tokens than
|
||||||
@@ -1711,15 +1926,6 @@ describe("a payout of part of the router's output", () => {
|
|||||||
),
|
),
|
||||||
min: "1.0000 WETH",
|
min: "1.0000 WETH",
|
||||||
},
|
},
|
||||||
{
|
|
||||||
kind: "PAY_PORTION of 25 bips, then UNWRAP_WETH",
|
|
||||||
data: execute(
|
|
||||||
swapToWeth(ADDRESS_THIS),
|
|
||||||
transfer(0x06, WETH, OTHER, 25n),
|
|
||||||
unwrapWeth(MSG_SENDER),
|
|
||||||
),
|
|
||||||
min: "1.0000 ETH",
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
kind: "V4 TAKE_PORTION of 25 bips, then TAKE_ALL",
|
kind: "V4 TAKE_PORTION of 25 bips, then TAKE_ALL",
|
||||||
data: execute(
|
data: execute(
|
||||||
|
|||||||
Reference in New Issue
Block a user