Skip to content
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

Incoporate learnings into a new iteration of AllowanceHolder #246

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Incoporate learnings into a new iteration of AllowanceHolder #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
2563ede
Golf AllowanceHolder calldata decoding
duncancmt Oct 10, 2024
927c216
Add comment about technically not-memory-safe code (but it is actuall…
duncancmt Oct 10, 2024
71113e7
Use `return` instead of `revert` inside `balanceOf` to make transacti…
duncancmt Oct 10, 2024
271df28
Remove EIP-3074 (EIP-7702) footgun from AllowanceHolder (homogenizes …
duncancmt Oct 10, 2024
6fc2989
Comments
duncancmt Oct 10, 2024
65d5088
Function visibility
duncancmt Oct 10, 2024
e68e4a7
Reorder constant arguments in Yul
duncancmt Oct 10, 2024
e8ab289
Apply the all-but-one-64th rule 3 times (not 2)
duncancmt Oct 10, 2024
9b60623
Bug! The first argument word is the 4 bytes into calldata
duncancmt Oct 13, 2024
d349d18
Typo
duncancmt Oct 13, 2024
ecb00c9
Implement ABIEncoding in assembly
duncancmt Oct 15, 2024
12c4388
Implement reverting in assembly
duncancmt Oct 15, 2024
39e5224
Return strict ABIEncoding of `result`
duncancmt Oct 15, 2024
1444d8c
Update snaps
duncancmt Oct 16, 2024
635baa0
Remove Solmate `SafeTransferLib`; port AllowanceHolder to the Solady …
duncancmt Oct 17, 2024
2beee66
Update snaps
duncancmt Oct 17, 2024
2092489
Merge branch 'master' into dcmt/allowanceholder2
duncancmt Oct 30, 2024
7d63a4f
Use technique from `fastBalanceOf` in `AllowanceHolderBase`'s `_rejec…
duncancmt Oct 30, 2024
ce5c565
Update snaps
duncancmt Oct 30, 2024
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
2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_empty_DAI-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_empty_USDC-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_empty_USDT-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_maverickV2_VIP_USDC-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_rfq_DAI-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_rfq_USDC-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_rfq_USDT-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_rfq_fixedFee_sellToken_DAI-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_rfq_fixedFee_sellToken_USDC-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_rfq_fixedFee_sellToken_USDT-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_rfq_proportionalFee_sellToken_DAI-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_rfq_proportionalFee_sellToken_USDC-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_rfq_proportionalFee_sellToken_USDT-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_uniswapV2_single_chain_DAI-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_uniswapV2_single_chain_USDC-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_uniswapV2_single_chain_USDT-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_uniswapV3VIP_DAI-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_uniswapV3VIP_USDC-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_uniswapV3VIP_USDT-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_uniswapV3VIP_contract_DAI-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_uniswapV3VIP_contract_USDC-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_uniswapV3VIP_contract_USDT-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_uniswapV3_DAI-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_uniswapV3_USDC-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .forge-snapshots/allowanceHolder_uniswapV3_USDT-WETH.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 27 additions & 27 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,35 +560,35 @@ comparison.
| 0x V4 VIP | Uniswap V3 | USDC/WETH | 124669 | 0.00% |
| 0x V4 Multiplex | Uniswap V3 | USDC/WETH | 138525 | 11.11% |
| Settler VIP (warm) | Uniswap V3 | USDC/WETH | 136229 | 9.27% |
| AllowanceHolder VIP | Uniswap V3 | USDC/WETH | 125712 | 0.84% |
| AllowanceHolder VIP | Uniswap V3 | USDC/WETH | 125703 | 0.83% |
| UniswapRouter V3 | Uniswap V3 | USDC/WETH | 120978 | -2.96% |
| | | | | |
| 0x V4 VIP | Uniswap V3 | DAI/WETH | 112103 | 0.00% |
| 0x V4 Multiplex | Uniswap V3 | DAI/WETH | 125959 | 12.36% |
| Settler VIP (warm) | Uniswap V3 | DAI/WETH | 123663 | 10.31% |
| AllowanceHolder VIP | Uniswap V3 | DAI/WETH | 113146 | 0.93% |
| AllowanceHolder VIP | Uniswap V3 | DAI/WETH | 113137 | 0.92% |
| UniswapRouter V3 | Uniswap V3 | DAI/WETH | 108412 | -3.29% |
| | | | | |
| 0x V4 VIP | Uniswap V3 | USDT/WETH | 114910 | 0.00% |
| 0x V4 Multiplex | Uniswap V3 | USDT/WETH | 128766 | 12.06% |
| Settler VIP (warm) | Uniswap V3 | USDT/WETH | 126479 | 10.07% |
| AllowanceHolder VIP | Uniswap V3 | USDT/WETH | 115962 | 0.92% |
| AllowanceHolder VIP | Uniswap V3 | USDT/WETH | 115953 | 0.91% |
| UniswapRouter V3 | Uniswap V3 | USDT/WETH | 111091 | -3.32% |
| | | | | |

| Custody | DEX | Pair | Gas | % |
| -------------------- | ---------- | --------- | ------ | ------- |
| 0x V4 TransformERC20 | Uniswap V3 | USDC/WETH | 244603 | 0.00% |
| Settler | Uniswap V3 | USDC/WETH | 166693 | -31.85% |
| AllowanceHolder | Uniswap V3 | USDC/WETH | 156323 | -36.09% |
| AllowanceHolder | Uniswap V3 | USDC/WETH | 156314 | -36.09% |
| | | | | |
| 0x V4 TransformERC20 | Uniswap V3 | DAI/WETH | 221601 | 0.00% |
| Settler | Uniswap V3 | DAI/WETH | 150071 | -32.28% |
| AllowanceHolder | Uniswap V3 | DAI/WETH | 139701 | -36.96% |
| AllowanceHolder | Uniswap V3 | DAI/WETH | 139692 | -36.96% |
| | | | | |
| 0x V4 TransformERC20 | Uniswap V3 | USDT/WETH | 228500 | 0.00% |
| Settler | Uniswap V3 | USDT/WETH | 156744 | -31.40% |
| AllowanceHolder | Uniswap V3 | USDT/WETH | 146374 | -35.94% |
| AllowanceHolder | Uniswap V3 | USDT/WETH | 146365 | -35.95% |
| | | | | |

| MetaTransactions | DEX | Pair | Gas | % |
Expand All @@ -608,17 +608,17 @@ comparison.
| 0x V4 | 0x V4 | USDC/WETH | 97972 | 0.00% |
| Settler | Settler | USDC/WETH | 114362 | 16.73% |
| Settler | 0x V4 | USDC/WETH | 206164 | 110.43% |
| AllowanceHolder | Settler | USDC/WETH | 106494 | 8.70% |
| AllowanceHolder | Settler | USDC/WETH | 106485 | 8.69% |
| | | | | |
| 0x V4 | 0x V4 | DAI/WETH | 78498 | 0.00% |
| Settler | Settler | DAI/WETH | 94888 | 20.88% |
| Settler | 0x V4 | DAI/WETH | 176254 | 124.53% |
| AllowanceHolder | Settler | DAI/WETH | 87020 | 10.86% |
| AllowanceHolder | Settler | DAI/WETH | 87011 | 10.84% |
| | | | | |
| 0x V4 | 0x V4 | USDT/WETH | 89610 | 0.00% |
| Settler | Settler | USDT/WETH | 106000 | 18.29% |
| Settler | 0x V4 | USDT/WETH | 191586 | 113.80% |
| AllowanceHolder | Settler | USDT/WETH | 98132 | 9.51% |
| AllowanceHolder | Settler | USDT/WETH | 98123 | 9.50% |
| | | | | |

| Curve | DEX | Pair | Gas | % |
Expand Down Expand Up @@ -661,32 +661,32 @@ comparison.

| AllowanceHolder | DEX | Pair | Gas | % |
| ------------------------------------ | -------------- | --------- | ------ | ------- |
| execute | Uniswap V3 VIP | USDC/WETH | 125712 | 0.00% |
| Settler - external move then execute | Uniswap V3 | USDC/WETH | 140191 | 11.52% |
| execute | RFQ | USDC/WETH | 106494 | -15.29% |
| execute | Uniswap V3 VIP | USDC/WETH | 125703 | 0.00% |
| Settler - external move then execute | Uniswap V3 | USDC/WETH | 140191 | 11.53% |
| execute | RFQ | USDC/WETH | 106485 | -15.29% |
| | | | | |
| execute | Uniswap V3 VIP | DAI/WETH | 113146 | 0.00% |
| Settler - external move then execute | Uniswap V3 | DAI/WETH | 129200 | 14.19% |
| execute | RFQ | DAI/WETH | 87020 | -23.09% |
| execute | Uniswap V3 VIP | DAI/WETH | 113137 | 0.00% |
| Settler - external move then execute | Uniswap V3 | DAI/WETH | 129200 | 14.20% |
| execute | RFQ | DAI/WETH | 87011 | -23.09% |
| | | | | |
| execute | Uniswap V3 VIP | USDT/WETH | 115962 | 0.00% |
| Settler - external move then execute | Uniswap V3 | USDT/WETH | 136188 | 17.44% |
| execute | RFQ | USDT/WETH | 98132 | -15.38% |
| execute | Uniswap V3 VIP | USDT/WETH | 115953 | 0.00% |
| Settler - external move then execute | Uniswap V3 | USDT/WETH | 136188 | 17.45% |
| execute | RFQ | USDT/WETH | 98123 | -15.38% |
| | | | | |

| AllowanceHolder sell token fees | DEX | Pair | Gas | % |
| ------------------------------- | --- | --------- | ------ | ------ |
| no fee | RFQ | USDC/WETH | 106494 | 0.00% |
| proportional fee | RFQ | USDC/WETH | 154002 | 44.61% |
| fixed fee | RFQ | USDC/WETH | 122766 | 15.28% |
| no fee | RFQ | USDC/WETH | 106485 | 0.00% |
| proportional fee | RFQ | USDC/WETH | 153993 | 44.61% |
| fixed fee | RFQ | USDC/WETH | 122715 | 15.24% |
| | | | | |
| no fee | RFQ | DAI/WETH | 87020 | 0.00% |
| proportional fee | RFQ | DAI/WETH | 126416 | 45.27% |
| fixed fee | RFQ | DAI/WETH | 99118 | 13.90% |
| no fee | RFQ | DAI/WETH | 87011 | 0.00% |
| proportional fee | RFQ | DAI/WETH | 126407 | 45.28% |
| fixed fee | RFQ | DAI/WETH | 99067 | 13.86% |
| | | | | |
| no fee | RFQ | USDT/WETH | 98132 | 0.00% |
| proportional fee | RFQ | USDT/WETH | 143160 | 45.89% |
| fixed fee | RFQ | USDT/WETH | 111342 | 13.46% |
| no fee | RFQ | USDT/WETH | 98123 | 0.00% |
| proportional fee | RFQ | USDT/WETH | 143151 | 45.89% |
| fixed fee | RFQ | USDT/WETH | 111291 | 13.42% |
| | | | | |

[//]: # "END TABLES"
Expand Down
14 changes: 0 additions & 14 deletions src/allowanceholder/AllowanceHolder.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,4 @@ contract AllowanceHolder is TransientStorage, AllowanceHolderBase {
constructor() {
require(address(this) == 0x0000000000001fF3684f28c67538d4D072C22734 || block.chainid == 31337);
}

/// @inheritdoc AllowanceHolderBase
function exec(address operator, address token, uint256 amount, address payable target, bytes calldata data)
internal
override
returns (bytes memory)
{
(bytes memory result, address sender, TSlot allowance) = _exec(operator, token, amount, target, data);
// EIP-3074 seems unlikely
if (sender != tx.origin) {
_set(allowance, 0);
}
return result;
}
}
Loading
Loading