From 8b93809901d3b40f0ecaeeec199f71598e97882c Mon Sep 17 00:00:00 2001 From: max-morrow Date: Wed, 31 Jul 2024 22:13:13 +0300 Subject: [PATCH] 1inch-U34: config hot fixes (#6460) * fixed project orders methods config fixed maker token allocation in 0x5dc7b981 * fixed project orders config * 0x new addr * added versions --------- Co-authored-by: grkhr --- .../_meta/oneinch_mapped_contracts_macro.sql | 21 ++++++++++++------- ...neinch_project_orders_cfg_events_macro.sql | 10 ++++----- ...einch_project_orders_cfg_methods_macro.sql | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dbt_subprojects/daily_spellbook/macros/models/_project/oneinch/_meta/oneinch_mapped_contracts_macro.sql b/dbt_subprojects/daily_spellbook/macros/models/_project/oneinch/_meta/oneinch_mapped_contracts_macro.sql index 901cf4b9f76..b733e2417db 100644 --- a/dbt_subprojects/daily_spellbook/macros/models/_project/oneinch/_meta/oneinch_mapped_contracts_macro.sql +++ b/dbt_subprojects/daily_spellbook/macros/models/_project/oneinch/_meta/oneinch_mapped_contracts_macro.sql @@ -272,13 +272,20 @@ , ('0x3f93c3d9304a70c9104642ab8cd37b1e2a7c203a', 'true', 'ZeroEx' , 'ExchangeV2' , ['bnb']) , ('0x145f83ad6108391cbf9ed554e5ce1dbd984437f8', 'true', 'ZeroEx' , 'ExchangeV2' , ['bnb','polygon']) , ('0x61935cbdd02287b511119ddb11aeb42f1593b7ef', 'true', 'ZeroEx' , 'ExchangeV3' , ['ethereum']) - , ('0x7f6cee965959295cc64d0e6c00d99d6532d8e86b', 'true', 'ZeroEx' , 'Settler' , ['ethereum']) - , ('0x7600f49428e551af89d5c6b8e77b8cf3e198f936', 'true', 'ZeroEx' , 'Settler' , ['optimism']) - , ('0x6aec4d9f02d6d4b9a09c588922ebc81a532b94d0', 'true', 'ZeroEx' , 'Settler' , ['polygon']) - , ('0x466da4a5809665d640048177baa9c4975dc4e5e6', 'true', 'ZeroEx' , 'Settler' , ['avalanche_c']) - , ('0x55873e4b1dd63ab3fea3ca47c10277655ac2dce0', 'true', 'ZeroEx' , 'Settler' , ['base']) - , ('0xb2845bb0e9166357938445539eb9be94338594f2', 'true', 'ZeroEx' , 'Settler' , ['bnb']) - , ('0x2b6625aafc65373e5a82a0349f777fa11f7f04d1', 'true', 'ZeroEx' , 'Settler' , ['arbitrum']) + , ('0x7f6cee965959295cc64d0e6c00d99d6532d8e86b', 'true', 'ZeroEx' , 'SettlerV1' , ['ethereum']) + , ('0x7600f49428e551af89d5c6b8e77b8cf3e198f936', 'true', 'ZeroEx' , 'SettlerV1' , ['optimism']) + , ('0x6aec4d9f02d6d4b9a09c588922ebc81a532b94d0', 'true', 'ZeroEx' , 'SettlerV1' , ['polygon']) + , ('0x466da4a5809665d640048177baa9c4975dc4e5e6', 'true', 'ZeroEx' , 'SettlerV1' , ['avalanche_c']) + , ('0x55873e4b1dd63ab3fea3ca47c10277655ac2dce0', 'true', 'ZeroEx' , 'SettlerV1' , ['base']) + , ('0xb2845bb0e9166357938445539eb9be94338594f2', 'true', 'ZeroEx' , 'SettlerV1' , ['bnb']) + , ('0x2b6625aafc65373e5a82a0349f777fa11f7f04d1', 'true', 'ZeroEx' , 'SettlerV1' , ['arbitrum']) + , ('0x07e594aa718bb872b526e93eed830a8d2a6a1071', 'true', 'ZeroEx' , 'SettlerV2' , ['ethereum']) + , ('0x1a3b48ea0c6e9a52511a196a287fa8371e5ee7a0', 'true', 'ZeroEx' , 'SettlerV2' , ['optimism']) + , ('0xd2aeae6dc50a8efa8919e7783125cacde3b4e930', 'true', 'ZeroEx' , 'SettlerV2' , ['polygon']) + , ('0x4147ef0dc9156db568ac8cbe2c98be0fc9ea175c', 'true', 'ZeroEx' , 'SettlerV2' , ['avalanche_c']) + , ('0x163631ebf9550476156d78748dff6b1c691d89e1', 'true', 'ZeroEx' , 'SettlerV2' , ['base']) + , ('0x0be366a2cffa54901b05c19b76c7a29f5608ad25', 'true', 'ZeroEx' , 'SettlerV2' , ['bnb']) + , ('0xc8e09d4ac2bf8b83a842068a0a6e79e118414a1d', 'true', 'ZeroEx' , 'SettlerV2' , ['arbitrum']) , ('0x18381c0f738146fb694de18d1106bde2be040fa4', 'true', 'ZkSwap' , 'Router' , ['zksync']) , ('0xe7b0ce0526fbe3969035a145c9e9691d4d9d216c', 'false', 'Clipper' , 'Clipper' , ['ethereum','arbitrum']) , ('0x655edce464cc797526600a462a8154650eee4b77', 'false', 'Clipper' , 'Clipper' , ['ethereum']) diff --git a/dbt_subprojects/daily_spellbook/macros/models/_project/oneinch/project/cfg/oneinch_project_orders_cfg_events_macro.sql b/dbt_subprojects/daily_spellbook/macros/models/_project/oneinch/project/cfg/oneinch_project_orders_cfg_events_macro.sql index 7be3ca5fd4e..fd3d44007a6 100644 --- a/dbt_subprojects/daily_spellbook/macros/models/_project/oneinch/project/cfg/oneinch_project_orders_cfg_events_macro.sql +++ b/dbt_subprojects/daily_spellbook/macros/models/_project/oneinch/project/cfg/oneinch_project_orders_cfg_events_macro.sql @@ -112,11 +112,11 @@ "0x4be05c8d54f5e056ab2cfa033e9f582057001268c3e28561bb999d35d2c8f2c8": { "project": "Clipper", "name": "Swapped", - "taker": "substr(topic3 , 12 + 1 , 20)", - "maker_asset": "substr(topic2 , 12 + 1 , 20)", - "taker_asset": "substr(topic1 , 12 + 1 , 20)", - "making_amount": "substr(data , 32*1 + 1 , 32)", - "taking_amount": "substr(data , 32*0 + 1 , 32)", + "taker": "coalesce(substr(topic3, 12 + 1, 20), substr(data, 32*2 + 12 + 1, 20))", + "maker_asset": "coalesce(substr(topic2, 12 + 1, 20), substr(data, 32*1 + 12 + 1, 20))", + "taker_asset": "coalesce(substr(topic1, 12 + 1, 20), substr(data, 32*0 + 12 + 1, 20))", + "making_amount": "substr(data, 32*if(topic1 is null, 4, 1) + 1, 32)", + "taking_amount": "substr(data, 32*if(topic1 is null, 3, 0) + 1, 32)", }, "0x2170c741c41531aec20e7c107c24eecfdd15e69c9bb0a8dd37b1840b9e0b207b": { "project": "Swaap", diff --git a/dbt_subprojects/daily_spellbook/macros/models/_project/oneinch/project/cfg/oneinch_project_orders_cfg_methods_macro.sql b/dbt_subprojects/daily_spellbook/macros/models/_project/oneinch/project/cfg/oneinch_project_orders_cfg_methods_macro.sql index e15f886b2dd..768ed1d70cd 100644 --- a/dbt_subprojects/daily_spellbook/macros/models/_project/oneinch/project/cfg/oneinch_project_orders_cfg_methods_macro.sql +++ b/dbt_subprojects/daily_spellbook/macros/models/_project/oneinch/project/cfg/oneinch_project_orders_cfg_methods_macro.sql @@ -257,7 +257,7 @@ "event": "null", "maker": "substr(input, 4 + 32*1 + bytearray_to_bigint(substr(input, 4 + 32*1 + 24 + 1, 8)) + 32*2 + 1, 20)", "taker": "substr(input , 4 + 32*2 + 12 + 1 , 20)", - "maker_asset": "substr(input, 4 + 32*1 + bytearray_to_bigint(substr(input, 4 + 32*1 + 24 + 1, 8)) + 32*2 + 20*3 + 1, 20)", + "maker_asset": "substr(input, 4 + 32*1 + bytearray_to_bigint(substr(input, 4 + 32*1 + 24 + 1, 8)) + 32*14 + 5 + 1, 20)", "taker_asset": "substr(input, 4 + 32*1 + bytearray_to_bigint(substr(input, 4 + 32*1 + 24 + 1, 8)) + 32*2 + 20*4 + 1, 20)", "making_amount": "substr(output , 32*0 + 1 , 32)", "taking_amount": "substr(input, 4 + 32*1 + bytearray_to_bigint(substr(input, 4 + 32*1 + 24 + 1, 8)) + 32*2 + 20*5 + 32*1 + 1, 32)",