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

1inch-U30: fixes & updates #6292

Merged
merged 5 commits into from
Jul 4, 2024
Merged

1inch-U30: fixes & updates #6292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f980ce5
fixes & updates
max-morrow Jul 1, 2024
f7a9c50
Merge remote-tracking branch 'upstream/main' into 1inch-updates-30
grkhr Jul 2, 2024
8a8d7f5
apply easy dates
grkhr Jul 2, 2024
ed83595
Revert "apply easy dates"
grkhr Jul 2, 2024
09341c4
upd uniswap addresses
grkhr Jul 3, 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
8 changes: 7 additions & 1 deletion dex/macros/models/_project/oneinch/_meta/oneinch_mapped_contracts_macro.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@
, ('0x00000000fdac7708d0d360bddc1bc7d097f47439', 'true', 'Paraswap' , 'AugustusV6' , ['ethereum','bnb','polygon','arbitrum','avalanche_c','optimism','fantom','base'])
, ('0x000db803a70511e09da650d4c0506d0000100000', 'true', 'Paraswap' , 'AugustusV6v1' , ['ethereum','bnb','polygon','arbitrum','avalanche_c','optimism','fantom','base'])
, ('0x135896de8421be2ec868e0b811006171d9df802a', 'true', 'Paraswap' , 'LiquiditySwapAdapter' , ['ethereum'])
, ('0x6a000f20005980200259b80c5102003040001068', 'true', 'Paraswap' , 'AugustusV6v2' , ['ethereum','bnb','polygon','arbitrum','avalanche_c','gnosis','optimism','fantom','base'])
, ('0x30030701590a20B0Fb08000010400A034050C860', 'true', 'Paraswap' , 'AugustusV6v2' , ['bnb','optimism'])
, ('0xe92b586627cca7a83dc919cc7127196d70f55a06', 'true', 'Paraswap' , 'AugustusRFQ' , ['ethereum'])
, ('0x0927fd43a7a87e3e8b81df2c44b03c4756849f6d', 'true', 'Paraswap' , 'AugustusRFQ' , ['arbitrum','optimism'])
, ('0x2DF17455B96Dde3618FD6B1C3a9AA06D6aB89347', 'true', 'Paraswap' , 'AugustusRFQ' , ['fantom'])
Expand Down Expand Up @@ -231,7 +233,10 @@
, ('0x68b3465833fb72a70ecdf485e0e4c7bd8665fc45', 'true', 'Uniswap' , 'SwapRouter02' , ['ethereum','polygon','arbitrum','optimism'])
, ('0x0000000052be00ba3a005edbe83a0fb9aadb964c', 'true', 'Uniswap' , 'UNDEFINED' , ['ethereum'])
, ('0xef1c6e67703c7bd7107eed8303fbe6ec2554bf6b', 'true', 'Uniswap' , 'UniversalRouter' , ['ethereum'])
, ('0x3fc91a3afd70395cd496c647d5a6cc9d4b2b7fad', 'true', 'Uniswap' , 'UNDEFINED' , ['ethereum','bnb','polygon','arbitrum','optimism'])
, ('0x3fc91a3afd70395cd496c647d5a6cc9d4b2b7fad', 'true', 'Uniswap' , 'UniversalRouter' , ['ethereum','bnb','polygon','arbitrum','optimism'])
, ('0x4dae2f939acf50408e13d58534ff8c2776d45265', 'true', 'Uniswap' , 'UniversalRouter' , ['bnb'])
, ('0x5e325eda8064b456f4781070c0738d849c824258', 'true', 'Uniswap' , 'UniversalRouter' , ['arbitrum'])
, ('0xec7be89e9d109e7e3fec59c222cf297125fefda2', 'true', 'Uniswap' , 'UniversalRouter' , ['polygon'])
, ('0x5dc88340e1c5c6366864ee415d6034cadd1a9897', 'true', 'Uniswap' , 'UniversalRouter' , ['bnb'])
, ('0x4c60051384bd2d3c01bfc845cf5f4b44bcbe9de5', 'true', 'Uniswap' , 'UniversalRouter' , ['polygon','arbitrum'])
, ('0x643770e279d5d0733f21d6dc03a8efbabf3255b4', 'true', 'Uniswap' , 'UNDEFINED' , ['polygon'])
Expand Down Expand Up @@ -264,6 +269,7 @@
, ('0x18381c0f738146fb694de18d1106bde2be040fa4', 'true', 'ZkSwap' , 'Router' , ['zksync'])
, ('0xe7b0ce0526fbe3969035a145c9e9691d4d9d216c', 'false', 'Clipper' , 'Clipper' , ['ethereum','arbitrum'])
, ('0x655edce464cc797526600a462a8154650eee4b77', 'false', 'Clipper' , 'Clipper' , ['ethereum'])
, ('0x2e9c6Dcdca22A5952A88C4b18EDB5B54C5155BC9', 'false', 'Clipper' , 'Clipper' , ['ethereum'])
, ('0xcc12532e95c2a6a4c53af153b9b739a3cc9218a7', 'false', 'Clipper' , 'Clipper' , ['ethereum'])
, ('0x6bfce69d1df30fd2b2c8e478edec9daa643ae3b8', 'false', 'Clipper' , 'Clipper' , ['polygon'])
, ('0xd01e3549160c62acabc4d0eb89f67aafa3de8eed', 'false', 'Clipper' , 'Clipper' , ['polygon'])
Expand Down
3 changes: 2 additions & 1 deletion dex/macros/models/_project/oneinch/project/cfg/oneinch_project_orders_cfg_events_macro.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
"0x2170c741c41531aec20e7c107c24eecfdd15e69c9bb0a8dd37b1840b9e0b207b": {
"project": "Swaap",
"name": "Swap",
"pool": "topic1",
"maker_asset": "substr(topic3 , 12 + 1 , 20)",
"taker_asset": "substr(topic2 , 12 + 1 , 20)",
"making_amount": "substr(data , 32*1 + 1 , 32)",
Expand Down Expand Up @@ -139,7 +140,7 @@
"order_hash": "substr(data , 32*7 + 1 , 56)",
},
"0x78ad7ec0e9f89e74012afa58738b6b661c024cb0fd185ee2f616c0a28924bd66": {
"project": "Uniswap",
"project": "UniswapX",
"name": "Fill",
"maker": "substr(topic3 , 12 + 1 , 20)",
"taker": "substr(topic2 , 12 + 1 , 20)",
Expand Down
27 changes: 19 additions & 8 deletions dex/macros/models/_project/oneinch/project/cfg/oneinch_project_orders_cfg_methods_macro.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,17 @@
"taker_max_amount": "substr(input , 4 + 32*3 + 1 , 32)",
"making_amount": "substr(output , 32*0 + 1 , 32)",
},
"0x64a3bc15": {
"name": "fillOrKillOrder",
"event": "0x0bcc4c97732e47d9946f229edb95f5b6323f601300e4690de719993f3c371129",
"maker": "substr(input , 4 + 32*3 + 12 + 1 , 20)",
"maker_asset": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*10 + 24 + 1, 8)) + 32*1 + 4 + 12 + 1, 20)",
"taker_asset": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*11 + 24 + 1, 8)) + 32*1 + 4 + 12 + 1, 20)",
"maker_max_amount": "substr(input , 4 + 32*7 + 1 , 32)",
"taker_max_amount": "substr(input , 4 + 32*1 + 1 , 32)",
"making_amount": "substr(output , 32*0 + 1 , 32)",
"taking_amount": "substr(output , 32*1 + 1 , 32)",
},
"0xdac748d4": {
"name": "fillOtcOrder",
"event": "0xac75f773e3a92f1a02b12134d65e1f47f8a14eabe4eaf1e24624918e6a8b269f",
Expand Down Expand Up @@ -259,12 +270,12 @@
"0x52bbbe29": {
"name": "swap",
"event": "0x2170c741c41531aec20e7c107c24eecfdd15e69c9bb0a8dd37b1840b9e0b207b",
"taker": "substr(input , 4 + 32*3 + 12 + 1 , 20)",
"taker": "substr(input , 4 + 32*1 + 12 + 1 , 20)",
"pool": "substr(input , 4 + 32*7 + 1 , 32)",
"maker_asset": "substr(input , 4 + 32*10 + 12 + 1 , 20)",
"taker_asset": "substr(input , 4 + 32*9 + 12 + 1 , 20)",
"taker_max_amount": "substr(input , 4 + 32*11 + 1 , 32)",
"making_amount": "cast(abs(bytearray_to_int256(substr(output, 32*0 + 1, 32))) as varbinary)",
"taking_amount": "if(length(output) > 32, substr(output, 32 * 1 + 1, 32))",
"deadline": "substr(input , 4 + 32*6 + 1 , 32)",
},
},
"Paraswap": {
Expand Down Expand Up @@ -309,7 +320,7 @@
"receiver": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*x + 24 + 1, 8)) + 32*2 + 12 + 1, 20)",
"maker_max_amount": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*x + 24 + 1, 8)) + 32*3 + 1, 32)",
"taker_max_amount": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*x + 24 + 1, 8)) + 32*4 + 1, 32)",
"deadline": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*x + 24 + 1, 8)) + 32*5 + 24, 8)",
"deadline": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*x + 24 + 1, 8)) + 32*5 + 24 + 1, 8)",
"fee_amount": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*x + 24 + 1, 8)) + 32*7 + 1, 32)",
"making_amount": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 32*x + 24 + 1, 8)) + 32*9 + 1, 32)",
"condition": "bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 32*2 + 24 + 1, 8)) + 24 + 1, 8)) > 0",
Expand Down Expand Up @@ -369,8 +380,8 @@
"maker_min_amount": "substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + 32*11 + 1, 32)",
"taker_max_amount": "substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + bytearray_to_bigint(substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + 32*12 + 24 + 1, 8)) + 32*6 + 1, 32)",
"taker_min_amount": "substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + bytearray_to_bigint(substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + 32*12 + 24 + 1, 8)) + 32*7 + 1, 32)",
"start": "substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + 32*5 + 1, 20)",
"end": "substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + 32*6 + 1, 20)",
"start": "substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + 32*5 + 1, 32)",
"end": "substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + 32*6 + 1, 32)",
"deadline": "cast(abs(bytearray_to_int256(substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + 32*16 + 1, 32))) as varbinary)",
"nonce": "substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + 32*15 + 1, 32)",
"fee_asset": "if(bytearray_to_bigint(substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + bytearray_to_bigint(substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + 32*12 + 24 + 1, 8)) + 32*4 + 24 + 1, 8)) > 1, substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + bytearray_to_bigint(substr(input, 4 + 32*2 + bytearray_to_bigint(substr(input, 4 + 32*2 + 32*(x - 1) + 24 + 1, 8)) + 32*12 + 24 + 1, 8)) + 32*9 + 12 + 1, 20))",
Expand All @@ -391,8 +402,8 @@
"maker_min_amount": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + 32*11 + 1, 32)",
"taker_max_amount": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + 32*12 + 24 + 1, 8)) + 32*6 + 1, 32)",
"taker_min_amount": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + 32*12 + 24 + 1, 8)) + 32*7 + 1, 32)",
"start": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + 32*5 + 1, 20)",
"end": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + 32*6 + 1, 20)",
"start": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + 32*5 + 1, 32)",
"end": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + 32*6 + 1, 32)",
"deadline": "cast(abs(bytearray_to_int256(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + 32*16 + 1, 32))) as varbinary)",
"nonce": "substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + 32*15 + 1, 32)",
"fee_asset": "if(bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + 32*12 + 24 + 1, 8)) + 32*4 + 24 + 1, 8)) > 1, substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + bytearray_to_bigint(substr(input, 4 + bytearray_to_bigint(substr(input, 4 + 24 + 1, 8)) + 32*1 + 32*(x - 1) + 24 + 1, 8)) + 32*12 + 24 + 1, 8)) + 32*9 + 12 + 1, 20))",
Expand Down
Loading
Loading