From e7421e901807bdf38236ca9beb4c015dff0b6cc3 Mon Sep 17 00:00:00 2001 From: 0xRob <83790096+0xRobin@users.noreply.github.com> Date: Fri, 27 Dec 2024 16:01:14 +0100 Subject: [PATCH 01/21] upgrade dbt-trino to 1.9.0 (#7393) --- Pipfile | 4 +- Pipfile.lock | 209 ++++++++++++++++++++++++--------------------------- 2 files changed, 100 insertions(+), 113 deletions(-) diff --git a/Pipfile b/Pipfile index fe5bde4c96d..c9ae7c5f591 100644 --- a/Pipfile +++ b/Pipfile @@ -7,7 +7,7 @@ name = "pypi" numpy = "2.0.12" pre-commit = "2.20.0" pytest = "7.1.3" -dbt-trino = "1.8.2" +dbt-trino = "1.9.0" [requires] -python_version = "3.9" \ No newline at end of file +python_version = "3.9" diff --git a/Pipfile.lock b/Pipfile.lock index fa6d5669f33..4be5af25b65 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "ad039719a8fc32f6782de06f76f191e442fce11863ff3248c65ee3ab7e137618" + "sha256": "82294d4746cf046802c3e59758a47a7e13d24a6abec9e6f8fbfd5d2384217b9a" }, "pipfile-spec": 6, "requires": { @@ -65,114 +65,101 @@ }, "charset-normalizer": { "hashes": [ - "sha256:0099d79bdfcf5c1f0c2c72f91516702ebf8b0b8ddd8905f97a8aecf49712c621", - "sha256:0713f3adb9d03d49d365b70b84775d0a0d18e4ab08d12bc46baa6132ba78aaf6", - "sha256:07afec21bbbbf8a5cc3651aa96b980afe2526e7f048fdfb7f1014d84acc8b6d8", - "sha256:0b309d1747110feb25d7ed6b01afdec269c647d382c857ef4663bbe6ad95a912", - "sha256:0d99dd8ff461990f12d6e42c7347fd9ab2532fb70e9621ba520f9e8637161d7c", - "sha256:0de7b687289d3c1b3e8660d0741874abe7888100efe14bd0f9fd7141bcbda92b", - "sha256:1110e22af8ca26b90bd6364fe4c763329b0ebf1ee213ba32b68c73de5752323d", - "sha256:130272c698667a982a5d0e626851ceff662565379baf0ff2cc58067b81d4f11d", - "sha256:136815f06a3ae311fae551c3df1f998a1ebd01ddd424aa5603a4336997629e95", - "sha256:14215b71a762336254351b00ec720a8e85cada43b987da5a042e4ce3e82bd68e", - "sha256:1db4e7fefefd0f548d73e2e2e041f9df5c59e178b4c72fbac4cc6f535cfb1565", - "sha256:1ffd9493de4c922f2a38c2bf62b831dcec90ac673ed1ca182fe11b4d8e9f2a64", - "sha256:2006769bd1640bdf4d5641c69a3d63b71b81445473cac5ded39740a226fa88ab", - "sha256:20587d20f557fe189b7947d8e7ec5afa110ccf72a3128d61a2a387c3313f46be", - "sha256:223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e", - "sha256:27623ba66c183eca01bf9ff833875b459cad267aeeb044477fedac35e19ba907", - "sha256:285e96d9d53422efc0d7a17c60e59f37fbf3dfa942073f666db4ac71e8d726d0", - "sha256:2de62e8801ddfff069cd5c504ce3bc9672b23266597d4e4f50eda28846c322f2", - "sha256:2f6c34da58ea9c1a9515621f4d9ac379871a8f21168ba1b5e09d74250de5ad62", - "sha256:309a7de0a0ff3040acaebb35ec45d18db4b28232f21998851cfa709eeff49d62", - "sha256:35c404d74c2926d0287fbd63ed5d27eb911eb9e4a3bb2c6d294f3cfd4a9e0c23", - "sha256:3710a9751938947e6327ea9f3ea6332a09bf0ba0c09cae9cb1f250bd1f1549bc", - "sha256:3d59d125ffbd6d552765510e3f31ed75ebac2c7470c7274195b9161a32350284", - "sha256:40d3ff7fc90b98c637bda91c89d51264a3dcf210cade3a2c6f838c7268d7a4ca", - "sha256:425c5f215d0eecee9a56cdb703203dda90423247421bf0d67125add85d0c4455", - "sha256:43193c5cda5d612f247172016c4bb71251c784d7a4d9314677186a838ad34858", - "sha256:44aeb140295a2f0659e113b31cfe92c9061622cadbc9e2a2f7b8ef6b1e29ef4b", - "sha256:47334db71978b23ebcf3c0f9f5ee98b8d65992b65c9c4f2d34c2eaf5bcaf0594", - "sha256:4796efc4faf6b53a18e3d46343535caed491776a22af773f366534056c4e1fbc", - "sha256:4a51b48f42d9358460b78725283f04bddaf44a9358197b889657deba38f329db", - "sha256:4b67fdab07fdd3c10bb21edab3cbfe8cf5696f453afce75d815d9d7223fbe88b", - "sha256:4ec9dd88a5b71abfc74e9df5ebe7921c35cbb3b641181a531ca65cdb5e8e4dea", - "sha256:4f9fc98dad6c2eaa32fc3af1417d95b5e3d08aff968df0cd320066def971f9a6", - "sha256:54b6a92d009cbe2fb11054ba694bc9e284dad30a26757b1e372a1fdddaf21920", - "sha256:55f56e2ebd4e3bc50442fbc0888c9d8c94e4e06a933804e2af3e89e2f9c1c749", - "sha256:5726cf76c982532c1863fb64d8c6dd0e4c90b6ece9feb06c9f202417a31f7dd7", - "sha256:5d447056e2ca60382d460a604b6302d8db69476fd2015c81e7c35417cfabe4cd", - "sha256:5ed2e36c3e9b4f21dd9422f6893dec0abf2cca553af509b10cd630f878d3eb99", - "sha256:5ff2ed8194587faf56555927b3aa10e6fb69d931e33953943bc4f837dfee2242", - "sha256:62f60aebecfc7f4b82e3f639a7d1433a20ec32824db2199a11ad4f5e146ef5ee", - "sha256:63bc5c4ae26e4bc6be6469943b8253c0fd4e4186c43ad46e713ea61a0ba49129", - "sha256:6b40e8d38afe634559e398cc32b1472f376a4099c75fe6299ae607e404c033b2", - "sha256:6b493a043635eb376e50eedf7818f2f322eabbaa974e948bd8bdd29eb7ef2a51", - "sha256:6dba5d19c4dfab08e58d5b36304b3f92f3bd5d42c1a3fa37b5ba5cdf6dfcbcee", - "sha256:6fd30dc99682dc2c603c2b315bded2799019cea829f8bf57dc6b61efde6611c8", - "sha256:707b82d19e65c9bd28b81dde95249b07bf9f5b90ebe1ef17d9b57473f8a64b7b", - "sha256:7706f5850360ac01d80c89bcef1640683cc12ed87f42579dab6c5d3ed6888613", - "sha256:7782afc9b6b42200f7362858f9e73b1f8316afb276d316336c0ec3bd73312742", - "sha256:79983512b108e4a164b9c8d34de3992f76d48cadc9554c9e60b43f308988aabe", - "sha256:7f683ddc7eedd742e2889d2bfb96d69573fde1d92fcb811979cdb7165bb9c7d3", - "sha256:82357d85de703176b5587dbe6ade8ff67f9f69a41c0733cf2425378b49954de5", - "sha256:84450ba661fb96e9fd67629b93d2941c871ca86fc38d835d19d4225ff946a631", - "sha256:86f4e8cca779080f66ff4f191a685ced73d2f72d50216f7112185dc02b90b9b7", - "sha256:8cda06946eac330cbe6598f77bb54e690b4ca93f593dee1568ad22b04f347c15", - "sha256:8ce7fd6767a1cc5a92a639b391891bf1c268b03ec7e021c7d6d902285259685c", - "sha256:8ff4e7cdfdb1ab5698e675ca622e72d58a6fa2a8aa58195de0c0061288e6e3ea", - "sha256:9289fd5dddcf57bab41d044f1756550f9e7cf0c8e373b8cdf0ce8773dc4bd417", - "sha256:92a7e36b000bf022ef3dbb9c46bfe2d52c047d5e3f3343f43204263c5addc250", - "sha256:92db3c28b5b2a273346bebb24857fda45601aef6ae1c011c0a997106581e8a88", - "sha256:95c3c157765b031331dd4db3c775e58deaee050a3042fcad72cbc4189d7c8dca", - "sha256:980b4f289d1d90ca5efcf07958d3eb38ed9c0b7676bf2831a54d4f66f9c27dfa", - "sha256:9ae4ef0b3f6b41bad6366fb0ea4fc1d7ed051528e113a60fa2a65a9abb5b1d99", - "sha256:9c98230f5042f4945f957d006edccc2af1e03ed5e37ce7c373f00a5a4daa6149", - "sha256:9fa2566ca27d67c86569e8c85297aaf413ffab85a8960500f12ea34ff98e4c41", - "sha256:a14969b8691f7998e74663b77b4c36c0337cb1df552da83d5c9004a93afdb574", - "sha256:a8aacce6e2e1edcb6ac625fb0f8c3a9570ccc7bfba1f63419b3769ccf6a00ed0", - "sha256:a8e538f46104c815be19c975572d74afb53f29650ea2025bbfaef359d2de2f7f", - "sha256:aa41e526a5d4a9dfcfbab0716c7e8a1b215abd3f3df5a45cf18a12721d31cb5d", - "sha256:aa693779a8b50cd97570e5a0f343538a8dbd3e496fa5dcb87e29406ad0299654", - "sha256:ab22fbd9765e6954bc0bcff24c25ff71dcbfdb185fcdaca49e81bac68fe724d3", - "sha256:ab2e5bef076f5a235c3774b4f4028a680432cded7cad37bba0fd90d64b187d19", - "sha256:ab973df98fc99ab39080bfb0eb3a925181454d7c3ac8a1e695fddfae696d9e90", - "sha256:af73657b7a68211996527dbfeffbb0864e043d270580c5aef06dc4b659a4b578", - "sha256:b197e7094f232959f8f20541ead1d9862ac5ebea1d58e9849c1bf979255dfac9", - "sha256:b295729485b06c1a0683af02a9e42d2caa9db04a373dc38a6a58cdd1e8abddf1", - "sha256:b8831399554b92b72af5932cdbbd4ddc55c55f631bb13ff8fe4e6536a06c5c51", - "sha256:b8dcd239c743aa2f9c22ce674a145e0a25cb1566c495928440a181ca1ccf6719", - "sha256:bcb4f8ea87d03bc51ad04add8ceaf9b0f085ac045ab4d74e73bbc2dc033f0236", - "sha256:bd7af3717683bea4c87acd8c0d3d5b44d56120b26fd3f8a692bdd2d5260c620a", - "sha256:bf4475b82be41b07cc5e5ff94810e6a01f276e37c2d55571e3fe175e467a1a1c", - "sha256:c3e446d253bd88f6377260d07c895816ebf33ffffd56c1c792b13bff9c3e1ade", - "sha256:c57516e58fd17d03ebe67e181a4e4e2ccab1168f8c2976c6a334d4f819fe5944", - "sha256:c94057af19bc953643a33581844649a7fdab902624d2eb739738a30e2b3e60fc", - "sha256:cab5d0b79d987c67f3b9e9c53f54a61360422a5a0bc075f43cab5621d530c3b6", - "sha256:ce031db0408e487fd2775d745ce30a7cd2923667cf3b69d48d219f1d8f5ddeb6", - "sha256:cee4373f4d3ad28f1ab6290684d8e2ebdb9e7a1b74fdc39e4c211995f77bec27", - "sha256:d5b054862739d276e09928de37c79ddeec42a6e1bfc55863be96a36ba22926f6", - "sha256:dbe03226baf438ac4fda9e2d0715022fd579cb641c4cf639fa40d53b2fe6f3e2", - "sha256:dc15e99b2d8a656f8e666854404f1ba54765871104e50c8e9813af8a7db07f12", - "sha256:dcaf7c1524c0542ee2fc82cc8ec337f7a9f7edee2532421ab200d2b920fc97cf", - "sha256:dd4eda173a9fcccb5f2e2bd2a9f423d180194b1bf17cf59e3269899235b2a114", - "sha256:dd9a8bd8900e65504a305bf8ae6fa9fbc66de94178c420791d0293702fce2df7", - "sha256:de7376c29d95d6719048c194a9cf1a1b0393fbe8488a22008610b0361d834ecf", - "sha256:e7fdd52961feb4c96507aa649550ec2a0d527c086d284749b2f582f2d40a2e0d", - "sha256:e91f541a85298cf35433bf66f3fab2a4a2cff05c127eeca4af174f6d497f0d4b", - "sha256:e9e3c4c9e1ed40ea53acf11e2a386383c3304212c965773704e4603d589343ed", - "sha256:ee803480535c44e7f5ad00788526da7d85525cfefaf8acf8ab9a310000be4b03", - "sha256:f09cb5a7bbe1ecae6e87901a2eb23e0256bb524a79ccc53eb0b7629fbe7677c4", - "sha256:f19c1585933c82098c2a520f8ec1227f20e339e33aca8fa6f956f6691b784e67", - "sha256:f1a2f519ae173b5b6a2c9d5fa3116ce16e48b3462c8b96dfdded11055e3d6365", - "sha256:f28f891ccd15c514a0981f3b9db9aa23d62fe1a99997512b0491d2ed323d229a", - "sha256:f3e73a4255342d4eb26ef6df01e3962e73aa29baa3124a8e824c5d3364a65748", - "sha256:f606a1881d2663630ea5b8ce2efe2111740df4b687bd78b34a8131baa007f79b", - "sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079", - "sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482" - ], - "markers": "python_full_version >= '3.7.0'", - "version": "==3.4.0" + "sha256:0167ddc8ab6508fe81860a57dd472b2ef4060e8d378f0cc555707126830f2537", + "sha256:01732659ba9b5b873fc117534143e4feefecf3b2078b0a6a2e925271bb6f4cfa", + "sha256:01ad647cdd609225c5350561d084b42ddf732f4eeefe6e678765636791e78b9a", + "sha256:04432ad9479fa40ec0f387795ddad4437a2b50417c69fa275e212933519ff294", + "sha256:0907f11d019260cdc3f94fbdb23ff9125f6b5d1039b76003b5b0ac9d6a6c9d5b", + "sha256:0924e81d3d5e70f8126529951dac65c1010cdf117bb75eb02dd12339b57749dd", + "sha256:09b26ae6b1abf0d27570633b2b078a2a20419c99d66fb2823173d73f188ce601", + "sha256:09b5e6733cbd160dcc09589227187e242a30a49ca5cefa5a7edd3f9d19ed53fd", + "sha256:0af291f4fe114be0280cdd29d533696a77b5b49cfde5467176ecab32353395c4", + "sha256:0f55e69f030f7163dffe9fd0752b32f070566451afe180f99dbeeb81f511ad8d", + "sha256:1a2bc9f351a75ef49d664206d51f8e5ede9da246602dc2d2726837620ea034b2", + "sha256:22e14b5d70560b8dd51ec22863f370d1e595ac3d024cb8ad7d308b4cd95f8313", + "sha256:234ac59ea147c59ee4da87a0c0f098e9c8d169f4dc2a159ef720f1a61bbe27cd", + "sha256:2369eea1ee4a7610a860d88f268eb39b95cb588acd7235e02fd5a5601773d4fa", + "sha256:237bdbe6159cff53b4f24f397d43c6336c6b0b42affbe857970cefbb620911c8", + "sha256:28bf57629c75e810b6ae989f03c0828d64d6b26a5e205535585f96093e405ed1", + "sha256:2967f74ad52c3b98de4c3b32e1a44e32975e008a9cd2a8cc8966d6a5218c5cb2", + "sha256:2a75d49014d118e4198bcee5ee0a6f25856b29b12dbf7cd012791f8a6cc5c496", + "sha256:2bdfe3ac2e1bbe5b59a1a63721eb3b95fc9b6817ae4a46debbb4e11f6232428d", + "sha256:2d074908e1aecee37a7635990b2c6d504cd4766c7bc9fc86d63f9c09af3fa11b", + "sha256:2fb9bd477fdea8684f78791a6de97a953c51831ee2981f8e4f583ff3b9d9687e", + "sha256:311f30128d7d333eebd7896965bfcfbd0065f1716ec92bd5638d7748eb6f936a", + "sha256:329ce159e82018d646c7ac45b01a430369d526569ec08516081727a20e9e4af4", + "sha256:345b0426edd4e18138d6528aed636de7a9ed169b4aaf9d61a8c19e39d26838ca", + "sha256:363e2f92b0f0174b2f8238240a1a30142e3db7b957a5dd5689b0e75fb717cc78", + "sha256:3a3bd0dcd373514dcec91c411ddb9632c0d7d92aed7093b8c3bbb6d69ca74408", + "sha256:3bed14e9c89dcb10e8f3a29f9ccac4955aebe93c71ae803af79265c9ca5644c5", + "sha256:44251f18cd68a75b56585dd00dae26183e102cd5e0f9f1466e6df5da2ed64ea3", + "sha256:44ecbf16649486d4aebafeaa7ec4c9fed8b88101f4dd612dcaf65d5e815f837f", + "sha256:4532bff1b8421fd0a320463030c7520f56a79c9024a4e88f01c537316019005a", + "sha256:49402233c892a461407c512a19435d1ce275543138294f7ef013f0b63d5d3765", + "sha256:4c0907b1928a36d5a998d72d64d8eaa7244989f7aaaf947500d3a800c83a3fd6", + "sha256:4d86f7aff21ee58f26dcf5ae81a9addbd914115cdebcbb2217e4f0ed8982e146", + "sha256:5777ee0881f9499ed0f71cc82cf873d9a0ca8af166dfa0af8ec4e675b7df48e6", + "sha256:5df196eb874dae23dcfb968c83d4f8fdccb333330fe1fc278ac5ceeb101003a9", + "sha256:619a609aa74ae43d90ed2e89bdd784765de0a25ca761b93e196d938b8fd1dbbd", + "sha256:6e27f48bcd0957c6d4cb9d6fa6b61d192d0b13d5ef563e5f2ae35feafc0d179c", + "sha256:6ff8a4a60c227ad87030d76e99cd1698345d4491638dfa6673027c48b3cd395f", + "sha256:73d94b58ec7fecbc7366247d3b0b10a21681004153238750bb67bd9012414545", + "sha256:7461baadb4dc00fd9e0acbe254e3d7d2112e7f92ced2adc96e54ef6501c5f176", + "sha256:75832c08354f595c760a804588b9357d34ec00ba1c940c15e31e96d902093770", + "sha256:7709f51f5f7c853f0fb938bcd3bc59cdfdc5203635ffd18bf354f6967ea0f824", + "sha256:78baa6d91634dfb69ec52a463534bc0df05dbd546209b79a3880a34487f4b84f", + "sha256:7974a0b5ecd505609e3b19742b60cee7aa2aa2fb3151bc917e6e2646d7667dcf", + "sha256:7a4f97a081603d2050bfaffdefa5b02a9ec823f8348a572e39032caa8404a487", + "sha256:7b1bef6280950ee6c177b326508f86cad7ad4dff12454483b51d8b7d673a2c5d", + "sha256:7d053096f67cd1241601111b698f5cad775f97ab25d81567d3f59219b5f1adbd", + "sha256:804a4d582ba6e5b747c625bf1255e6b1507465494a40a2130978bda7b932c90b", + "sha256:807f52c1f798eef6cf26beb819eeb8819b1622ddfeef9d0977a8502d4db6d534", + "sha256:80ed5e856eb7f30115aaf94e4a08114ccc8813e6ed1b5efa74f9f82e8509858f", + "sha256:8417cb1f36cc0bc7eaba8ccb0e04d55f0ee52df06df3ad55259b9a323555fc8b", + "sha256:8436c508b408b82d87dc5f62496973a1805cd46727c34440b0d29d8a2f50a6c9", + "sha256:89149166622f4db9b4b6a449256291dc87a99ee53151c74cbd82a53c8c2f6ccd", + "sha256:8bfa33f4f2672964266e940dd22a195989ba31669bd84629f05fab3ef4e2d125", + "sha256:8c60ca7339acd497a55b0ea5d506b2a2612afb2826560416f6894e8b5770d4a9", + "sha256:91b36a978b5ae0ee86c394f5a54d6ef44db1de0815eb43de826d41d21e4af3de", + "sha256:955f8851919303c92343d2f66165294848d57e9bba6cf6e3625485a70a038d11", + "sha256:97f68b8d6831127e4787ad15e6757232e14e12060bec17091b85eb1486b91d8d", + "sha256:9b23ca7ef998bc739bf6ffc077c2116917eabcc901f88da1b9856b210ef63f35", + "sha256:9f0b8b1c6d84c8034a44893aba5e767bf9c7a211e313a9605d9c617d7083829f", + "sha256:aabfa34badd18f1da5ec1bc2715cadc8dca465868a4e73a0173466b688f29dda", + "sha256:ab36c8eb7e454e34e60eb55ca5d241a5d18b2c6244f6827a30e451c42410b5f7", + "sha256:b010a7a4fd316c3c484d482922d13044979e78d1861f0e0650423144c616a46a", + "sha256:b1ac5992a838106edb89654e0aebfc24f5848ae2547d22c2c3f66454daa11971", + "sha256:b7b2d86dd06bfc2ade3312a83a5c364c7ec2e3498f8734282c6c3d4b07b346b8", + "sha256:b97e690a2118911e39b4042088092771b4ae3fc3aa86518f84b8cf6888dbdb41", + "sha256:bc2722592d8998c870fa4e290c2eec2c1569b87fe58618e67d38b4665dfa680d", + "sha256:c0429126cf75e16c4f0ad00ee0eae4242dc652290f940152ca8c75c3a4b6ee8f", + "sha256:c30197aa96e8eed02200a83fba2657b4c3acd0f0aa4bdc9f6c1af8e8962e0757", + "sha256:c4c3e6da02df6fa1410a7680bd3f63d4f710232d3139089536310d027950696a", + "sha256:c75cb2a3e389853835e84a2d8fb2b81a10645b503eca9bcb98df6b5a43eb8886", + "sha256:c96836c97b1238e9c9e3fe90844c947d5afbf4f4c92762679acfe19927d81d77", + "sha256:d7f50a1f8c450f3925cb367d011448c39239bb3eb4117c36a6d354794de4ce76", + "sha256:d973f03c0cb71c5ed99037b870f2be986c3c05e63622c017ea9816881d2dd247", + "sha256:d98b1668f06378c6dbefec3b92299716b931cd4e6061f3c875a71ced1780ab85", + "sha256:d9c3cdf5390dcd29aa8056d13e8e99526cda0305acc038b96b30352aff5ff2bb", + "sha256:dad3e487649f498dd991eeb901125411559b22e8d7ab25d3aeb1af367df5efd7", + "sha256:dccbe65bd2f7f7ec22c4ff99ed56faa1e9f785482b9bbd7c717e26fd723a1d1e", + "sha256:dd78cfcda14a1ef52584dbb008f7ac81c1328c0f58184bf9a84c49c605002da6", + "sha256:e218488cd232553829be0664c2292d3af2eeeb94b32bea483cf79ac6a694e037", + "sha256:e358e64305fe12299a08e08978f51fc21fac060dcfcddd95453eabe5b93ed0e1", + "sha256:ea0d8d539afa5eb2728aa1932a988a9a7af94f18582ffae4bc10b3fbdad0626e", + "sha256:eab677309cdb30d047996b36d34caeda1dc91149e4fdca0b1a039b3f79d9a807", + "sha256:eb8178fe3dba6450a3e024e95ac49ed3400e506fd4e9e5c32d30adda88cbd407", + "sha256:ecddf25bee22fe4fe3737a399d0d177d72bc22be6913acfab364b40bce1ba83c", + "sha256:eea6ee1db730b3483adf394ea72f808b6e18cf3cb6454b4d86e04fa8c4327a12", + "sha256:f08ff5e948271dc7e18a35641d2f11a4cd8dfd5634f55228b691e62b37125eb3", + "sha256:f30bf9fd9be89ecb2360c7d94a711f00c09b976258846efe40db3d05828e8089", + "sha256:fa88b843d6e211393a37219e6a1c1df99d35e8fd90446f1118f4216e307e48cd", + "sha256:fc54db6c8593ef7d4b2a331b58653356cf04f67c960f584edb7c3d8c97e8f39e", + "sha256:fd4ec41f914fa74ad1b8304bbc634b3de73d2a0889bd32076342a573e0779e00", + "sha256:ffc9202a29ab3920fa812879e95a9e78b2465fd10be7fcbd042899695d75e616" + ], + "markers": "python_version >= '3.7'", + "version": "==3.4.1" }, "click": { "hashes": [ @@ -780,7 +767,7 @@ "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.9.0.post0" }, "python-slugify": { @@ -994,7 +981,7 @@ "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.17.0" }, "snowplow-tracker": { From 09e87af3050eb5ba914c40f3604ca824ebb39d9c Mon Sep 17 00:00:00 2001 From: yy-analytics <103118737+yy-analytics@users.noreply.github.com> Date: Mon, 30 Dec 2024 13:57:14 +0530 Subject: [PATCH 02/21] New Yield Yak strategies (#7213) * Added new TokenMill and StableJack strategies for Yield Yak * Updated sources * Small re-factor to try to reduce number of query stages * Removed unnecessary brackets * Fixed for loop positioning --- .../yield_yak/yield_yak_strategies.sql | 2 ++ .../yield_yak/yield_yak_user_yrt_balances.sql | 27 +++++++++++-------- .../yield_yak_avalanche_c_sources.yml | 8 ++++++ 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dbt_subprojects/daily_spellbook/macros/project/yield_yak/yield_yak_strategies.sql b/dbt_subprojects/daily_spellbook/macros/project/yield_yak/yield_yak_strategies.sql index 677d70269d8..cb58bcc6c86 100644 --- a/dbt_subprojects/daily_spellbook/macros/project/yield_yak/yield_yak_strategies.sql +++ b/dbt_subprojects/daily_spellbook/macros/project/yield_yak/yield_yak_strategies.sql @@ -107,6 +107,7 @@ 'PenguinStrategyForLPb', 'PlatypusStrategy', 'SonicStrategyForSA', + 'StableJackStrategy', 'StableVaultStrategyForS3D', 'StableVaultStrategyForS3F', 'StargateStrategyForLP', @@ -115,6 +116,7 @@ 'StormStrategyForSA', 'SuStrategyV2', 'SynapseStrategy', + 'TokenMillStrategy', 'UnipoolStrategyV1', 'UspPlatypusStrategy', 'Vault', diff --git a/dbt_subprojects/daily_spellbook/macros/project/yield_yak/yield_yak_user_yrt_balances.sql b/dbt_subprojects/daily_spellbook/macros/project/yield_yak/yield_yak_user_yrt_balances.sql index b9e4ed15e26..faf1f236a10 100644 --- a/dbt_subprojects/daily_spellbook/macros/project/yield_yak/yield_yak_user_yrt_balances.sql +++ b/dbt_subprojects/daily_spellbook/macros/project/yield_yak/yield_yak_user_yrt_balances.sql @@ -31,6 +31,13 @@ existing_contracts AS ( {% endif -%} new_transfers AS ( + SELECT + s.contract_address + , s.block_time + , s.block_number + , s.user_address + , s.net_transfer_amount + FROM ( {%- for strategy in yield_yak_strategies(blockchain) %} SELECT s.contract_address @@ -40,19 +47,8 @@ new_transfers AS ( , SUM(u.net_transfer_amount) AS net_transfer_amount FROM {{ source(namespace_blockchain, strategy + '_evt_Transfer') }} s CROSS JOIN UNNEST(ARRAY[s."from", s.to], ARRAY[-1 * CAST(s.value AS INT256), CAST(s.value AS INT256)]) AS u(user_address, net_transfer_amount) - {%- if is_incremental() %} - LEFT JOIN existing_contracts c - ON c.contract_address = s.contract_address - WHERE - (({{ incremental_predicate('s.evt_block_time') }} - AND s.evt_block_time > c.max_from_time) - OR c.contract_address IS NULL) -- This line allows for new contract_addresses being appended that were not already included in previous runs but also allows their entire historical data to be loaded - AND s."from" != s."to" - {%- endif %} - {%- if not is_incremental() %} WHERE s."from" != s."to" - {%- endif %} GROUP BY s.contract_address , s.evt_block_time @@ -63,6 +59,15 @@ new_transfers AS ( UNION ALL {%- endif -%} {%- endfor %} + ) s + {%- if is_incremental() %} + LEFT JOIN existing_contracts c + ON c.contract_address = s.contract_address + WHERE + ({{ incremental_predicate('s.block_time') }} + AND s.block_time > c.max_from_time) + OR c.contract_address IS NULL -- This line allows for new contract_addresses being appended that were not already included in previous runs but also allows their entire historical data to be loaded + {%- endif %} ), combined_table AS ( diff --git a/sources/yield_yak/avalanche_c/yield_yak_avalanche_c_sources.yml b/sources/yield_yak/avalanche_c/yield_yak_avalanche_c_sources.yml index 360b00d059a..d11a59bf6d5 100644 --- a/sources/yield_yak/avalanche_c/yield_yak_avalanche_c_sources.yml +++ b/sources/yield_yak/avalanche_c/yield_yak_avalanche_c_sources.yml @@ -414,6 +414,10 @@ sources: - name: SonicStrategyForSA_evt_Withdraw - name: SonicStrategyForSA_evt_Reinvest - name: SonicStrategyForSA_evt_Transfer + - name: StableJackStrategy_evt_Deposit + - name: StableJackStrategy_evt_Withdraw + - name: StableJackStrategy_evt_Reinvest + - name: StableJackStrategy_evt_Transfer - name: StableVaultStrategyForS3D_evt_Deposit - name: StableVaultStrategyForS3D_evt_Withdraw - name: StableVaultStrategyForS3D_evt_Reinvest @@ -446,6 +450,10 @@ sources: - name: SynapseStrategy_evt_Withdraw - name: SynapseStrategy_evt_Reinvest - name: SynapseStrategy_evt_Transfer + - name: TokenMillStrategy_evt_Deposit + - name: TokenMillStrategy_evt_Withdraw + - name: TokenMillStrategy_evt_Reinvest + - name: TokenMillStrategy_evt_Transfer - name: UnipoolStrategyV1_evt_Deposit - name: UnipoolStrategyV1_evt_Withdraw - name: UnipoolStrategyV1_evt_Reinvest From 9f1980986420bb0e53ca0c6c16fb266d92b37c08 Mon Sep 17 00:00:00 2001 From: Noisy <125606576+donatik27@users.noreply.github.com> Date: Mon, 30 Dec 2024 09:27:33 +0100 Subject: [PATCH 03/21] Update README.md (#7381) --- dbt_subprojects/daily_spellbook/models/_sector/alm/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbt_subprojects/daily_spellbook/models/_sector/alm/README.md b/dbt_subprojects/daily_spellbook/models/_sector/alm/README.md index cd518f1c77c..dfd2a73445f 100644 --- a/dbt_subprojects/daily_spellbook/models/_sector/alm/README.md +++ b/dbt_subprojects/daily_spellbook/models/_sector/alm/README.md @@ -41,7 +41,7 @@ Because of that, the `alm.trades` design mimics the one used for `dex.trades`. ### Data Flow Architecture -As previously said, the architecture of `alm.trades` mimics the one of `dex.trades`. Because of that, [this diagram](https://github.com/duneanalytics/spellbook/blob/main/models/_sector/dex/readme.md#data-flow-architecture) can be taken as a reference. +As previously said, the architecture of `alm.trades` mimics the one of `dex.trades`. Because of that, [this diagram](https://github.com/duneanalytics/spellbook/blob/main/dbt_subprojects/dex/models/trades/readme.md) can be taken as a reference. In `alm.trades`, the 2 macros used are: - `arrakis_compatible_v2_trades`: which tracks all the Uniswap V3 LP positions (timestamp, liquidity, and tick information) minted by Arrakis Finance vaults, and then derives the volume served for each swap based on the price movement of the pool. - `add_pool_price_usd`: which uses `prices.usd` to populate the pool price in USD, so the volume served can be expressed in USD terms. From 3bec4a2b07ee92419aa948e038cc79f5da206357 Mon Sep 17 00:00:00 2001 From: viniabussafi <131974393+viniabussafi@users.noreply.github.com> Date: Mon, 30 Dec 2024 08:27:41 +0000 Subject: [PATCH 04/21] create labels and sources for beets on sonic (#7364) * create labels and sources * Update labels_beethoven_x_schema.yml * update sources * fix copypasta * add missing comma * reflect rebranding from beethoven_x to beets * remove extra file --- .../beets/labels_beets_pools_sonic.sql | 222 ++++++++++++++++++ .../beets/labels_beets_schema.yml | 54 +++++ sources/beets/sonic/beets_sonic_sources.yml | 35 +++ 3 files changed, 311 insertions(+) create mode 100644 dbt_subprojects/daily_spellbook/models/_sector/labels/addresses/__single_category_labels__/beets/labels_beets_pools_sonic.sql create mode 100644 dbt_subprojects/daily_spellbook/models/_sector/labels/addresses/__single_category_labels__/beets/labels_beets_schema.yml create mode 100644 sources/beets/sonic/beets_sonic_sources.yml diff --git a/dbt_subprojects/daily_spellbook/models/_sector/labels/addresses/__single_category_labels__/beets/labels_beets_pools_sonic.sql b/dbt_subprojects/daily_spellbook/models/_sector/labels/addresses/__single_category_labels__/beets/labels_beets_pools_sonic.sql new file mode 100644 index 00000000000..f1a8903fbcf --- /dev/null +++ b/dbt_subprojects/daily_spellbook/models/_sector/labels/addresses/__single_category_labels__/beets/labels_beets_pools_sonic.sql @@ -0,0 +1,222 @@ +{{config( + alias = 'beets_pools_sonic', + post_hook = '{{ expose_spells(\'["sonic"]\', + "sector", + "labels", + \'["viniabussafi"]\') }}' +)}} + +WITH v2_pools AS( + WITH pools AS ( + SELECT + pool_id, + zip.tokens AS token_address, + zip.weights / pow(10, 18) AS normalized_weight, + symbol, + pool_type, + pool_name + FROM ( + SELECT + c.poolId AS pool_id, + t.tokens, + w.weights, + cc.symbol, + 'weighted' AS pool_type, + cc.name AS pool_name + FROM {{ source('beethoven_x_v2_sonic', 'Vault_evt_PoolRegistered') }} c + INNER JOIN {{ source('beethoven_x_v2_sonic', 'WeightedPoolFactory_call_create') }} cc + ON c.evt_tx_hash = cc.call_tx_hash + AND bytearray_substring(c.poolId, 1, 20) = cc.output_0 + CROSS JOIN UNNEST(cc.tokens) WITH ORDINALITY t(tokens, pos) + CROSS JOIN UNNEST(cc.normalizedWeights) WITH ORDINALITY w(weights, pos) + WHERE t.pos = w.pos + ) zip + + + UNION ALL + + SELECT + c.poolId AS pool_id, + t.tokens AS token_address, + 0 AS normalized_weight, + cc.symbol, + 'stable' AS pool_type, + cc.name AS pool_name + FROM {{ source('beethoven_x_v2_sonic', 'Vault_evt_PoolRegistered') }} c + INNER JOIN {{ source('beethoven_x_v2_sonic', 'ComposableStablePoolFactory_call_create') }} cc + ON c.evt_tx_hash = cc.call_tx_hash + AND bytearray_substring(c.poolId, 1, 20) = cc.output_0 + CROSS JOIN UNNEST(cc.tokens) AS t(tokens) +), + +settings AS ( + SELECT + pool_id, + coalesce(t.symbol, '?') AS token_symbol, + normalized_weight, + p.symbol AS pool_symbol, + p.pool_type, + p.pool_name + FROM pools p + LEFT JOIN {{ source('tokens', 'erc20') }} t ON p.token_address = t.contract_address + AND t.blockchain = 'sonic' +) + +SELECT + 'sonic' AS blockchain, + bytearray_substring(pool_id, 1, 20) AS address, + CASE WHEN pool_type IN ('stable') + THEN lower(pool_symbol) + ELSE lower(concat(array_join(array_agg(token_symbol ORDER BY token_symbol), '/'), ' ', + array_join(array_agg(cast(norm_weight AS varchar) ORDER BY token_symbol), '/'))) + END AS name, + pool_name AS poolname, + pool_type, + '2' AS version, + 'beets_v2_pool' AS category, + 'beets' AS contributor, + 'query' AS source, + TIMESTAMP'2024-12-15 00:00' AS created_at, + now() AS updated_at, + 'beets_pools_sonic' AS model_name, + 'identifier' AS label_type +FROM ( + SELECT + s1.pool_id, + token_symbol, + pool_symbol, + cast(100 * normalized_weight AS integer) AS norm_weight, + pool_type, + pool_name + FROM settings s1 + GROUP BY s1.pool_id, token_symbol, pool_symbol, normalized_weight, pool_type, pool_name +) s +GROUP BY pool_id, pool_symbol, pool_type, pool_name +ORDER BY 1), + +v3_pools AS( + WITH token_data AS ( + SELECT + pool, + ARRAY_AGG(FROM_HEX(json_extract_scalar(token, '$.token')) ORDER BY token_index) AS tokens + FROM ( + SELECT + pool, + tokenConfig, + SEQUENCE(1, CARDINALITY(tokenConfig)) AS token_index_array + FROM {{ source('beethoven_x_v3_sonic', 'Vault_evt_PoolRegistered') }} + ) AS pool_data + CROSS JOIN UNNEST(tokenConfig, token_index_array) AS t(token, token_index) + GROUP BY 1 + ), + + pools AS ( + SELECT + pool_id, + zip.tokens AS token_address, + zip.weights / POWER(10, 18) AS normalized_weight, + symbol, + pool_type + FROM ( + SELECT + c.pool AS pool_id, + t.tokens, + w.weights, + cc.symbol, + 'weighted' AS pool_type + FROM token_data c + INNER JOIN {{ source('beethoven_x_v3_sonic', 'WeightedPoolFactory_call_create') }} cc + ON c.pool = cc.output_pool + CROSS JOIN UNNEST(c.tokens) WITH ORDINALITY t(tokens, pos) + CROSS JOIN UNNEST(cc.normalizedWeights) WITH ORDINALITY w(weights, pos) + WHERE t.pos = w.pos + + UNION ALL + + SELECT + c.pool AS pool_id, + t.tokens, + 0 AS weights, + cc.symbol, + 'stable' AS pool_type + FROM token_data c + INNER JOIN {{ source('beethoven_x_v3_sonic', 'StablePoolFactory_call_create') }} cc + ON c.pool = cc.output_pool + CROSS JOIN UNNEST(c.tokens) AS t(tokens) + ) zip + ), + + settings AS ( + SELECT + pool_id, + coalesce(t.symbol, '?') AS token_symbol, + normalized_weight, + p.symbol AS pool_symbol, + p.pool_type + FROM pools p + LEFT JOIN {{ source('tokens', 'erc20') }} t ON p.token_address = t.contract_address + AND t.blockchain = 'sonic' + ) + +SELECT + 'sonic' AS blockchain, + bytearray_substring(pool_id, 1, 20) AS address, + CASE WHEN pool_type IN ('stable') + THEN lower(pool_symbol) + ELSE lower(concat(array_join(array_agg(token_symbol ORDER BY token_symbol), '/'), ' ', + array_join(array_agg(cast(norm_weight AS varchar) ORDER BY token_symbol), '/'))) + END AS name, + pool_type, + '3' AS version, + 'beets_v3_pool' AS category, + 'beets' AS contributor, + 'query' AS source, + TIMESTAMP'2024-12-15 00:00' AS created_at, + now() AS updated_at, + 'beets_pools_sonic' AS model_name, + 'identifier' AS label_type +FROM ( + SELECT + s1.pool_id, + token_symbol, + pool_symbol, + cast(100 * normalized_weight AS integer) AS norm_weight, + pool_type + FROM settings s1 + GROUP BY s1.pool_id, token_symbol, pool_symbol, normalized_weight, pool_type +) s +GROUP BY pool_id, pool_symbol, pool_type +ORDER BY 1 +) + +SELECT + blockchain, + address, + name, + pool_type, + version, + category, + contributor, + source, + created_at, + updated_at, + model_name, + label_type +FROM v2_pools + +UNION + +SELECT + blockchain, + address, + name, + pool_type, + version, + category, + contributor, + source, + created_at, + updated_at, + model_name, + label_type +FROM v3_pools \ No newline at end of file diff --git a/dbt_subprojects/daily_spellbook/models/_sector/labels/addresses/__single_category_labels__/beets/labels_beets_schema.yml b/dbt_subprojects/daily_spellbook/models/_sector/labels/addresses/__single_category_labels__/beets/labels_beets_schema.yml new file mode 100644 index 00000000000..b830022043c --- /dev/null +++ b/dbt_subprojects/daily_spellbook/models/_sector/labels/addresses/__single_category_labels__/beets/labels_beets_schema.yml @@ -0,0 +1,54 @@ +version: 2 + +models: + - name: labels_beets_pools_sonic + meta: + blockchain: sonic + sector: labels + project: beets + contributors: viniabussafi + config: + tags: ['labels', 'fantom', 'balancer', 'pools'] + description: 'Beets liquidity pools created on Sonic.' + data_tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - address + - name + - category + - model_name + - blockchain + columns: + - &blockchain + name: blockchain + description: 'Blockchain' + - &address + name: address + description: 'Address of liquidity pool' + - &name + name: name + description: 'Label name of pool containg the token symbols and their respective weights (if applicable)' + - &poolname + name: poolname + description: 'Label name of pool set at contract creation' + - &category + name: category + description: 'Label category' + - &contributor + name: contributor + description: 'Wizard(s) contributing to labels' + - &source + name: source + description: 'How were labels generated (could be static or query)' + - &created_at + name: created_at + description: 'When were labels created' + - &updated_at + name: updated_at + description: "When were labels updated for the last time" + - &model_name + name: model_name + description: "Name of the label model sourced from" + - &label_type + name: label_type + description: "Type of label (see labels overall readme)" \ No newline at end of file diff --git a/sources/beets/sonic/beets_sonic_sources.yml b/sources/beets/sonic/beets_sonic_sources.yml new file mode 100644 index 00000000000..0e6aa5daddc --- /dev/null +++ b/sources/beets/sonic/beets_sonic_sources.yml @@ -0,0 +1,35 @@ +version: 2 + +sources: + - name: beethoven_x_v2_sonic + description: > + Decoded tables related to Beethoven X, an automated portfolio manager and trading platform, on Sonic. + tables: + - name: Vault_evt_Swap + - name: Vault_evt_PoolRegistered + - name: WeightedPoolFactory_call_create + - name: Vault_evt_PoolBalanceChanged + - name: Vault_evt_PoolBalanceManaged + - name: ComposableStablePoolFactory_call_create + - name: Vault_evt_FlashLoan + - name: Vault_evt_TokensRegistered + + - name: beethoven_x_v3_sonic + description: > + Decoded tables related to Beethoven X, an automated portfolio manager and trading platform, on Sonic. + tables: + - name: Vault_evt_PoolRegistered + - name: WeightedPoolFactory_evt_PoolCreated + - name: WeightedPoolFactory_call_create + - name: Vault_evt_LiquidityAdded + - name: Vault_evt_LiquidityRemoved + - name: StablePoolFactory_evt_PoolCreated + - name: StablePoolFactory_call_create + - name: Vault_evt_Swap + - name: ProtocolFeeController_evt_ProtocolSwapFeeCollected + - name: ProtocolFeeController_evt_ProtocolYieldFeeCollected + - name: Vault_evt_Wrap + - name: Vault_evt_Unwrap + - name: Vault_evt_LiquidityAddedToBuffer + - name: Vault_evt_LiquidityRemovedFromBuffer + - name: Vault_evt_SwapFeePercentageChanged \ No newline at end of file From 2c6641ff9935b862160de0d3cbaadcca180238cf Mon Sep 17 00:00:00 2001 From: disco chuck Date: Mon, 30 Dec 2024 02:32:01 -0600 Subject: [PATCH 05/21] Adding Cattopya, Humping Unicorns, doggerinos, doggerinos accesssories, fragments of the city, bruskies, mamboners, peons v2, ripped dao and dev and draw presale passes to curated nft (#7392) --- .../avalanche_c/tokens_avalanche_c_nft_curated.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dbt_subprojects/tokens/models/tokens/avalanche_c/tokens_avalanche_c_nft_curated.sql b/dbt_subprojects/tokens/models/tokens/avalanche_c/tokens_avalanche_c_nft_curated.sql index 8c42f44a161..d1efa5e1ba0 100644 --- a/dbt_subprojects/tokens/models/tokens/avalanche_c/tokens_avalanche_c_nft_curated.sql +++ b/dbt_subprojects/tokens/models/tokens/avalanche_c/tokens_avalanche_c_nft_curated.sql @@ -9,6 +9,16 @@ SELECT contract_address, name, symbol FROM (VALUES + (0x2b9328d83becd4f04de05f129ba56781fa191e67, 'Cattopya', 'CAT'), + (0x34b4da1a0b06cfb09cb0efb46f02e667330e17db, 'Humping Unicorns', 'HUMP'), + (0x47d42b18d54ee0b94b59c3e41dcac3260e995e48, 'Doggerinos Accessories', 'DOGACC'), + (0x824ca4209DebA44Da8d2d71A4c52Bc0E62265FfA, 'Dev and Draw Presale Pass', 'DND PP'), + (0x8d904c8b6bb673d88cdbcd5798cda439f33cb3a4, 'Doggerinos', 'DOGGERINOS'), + (0x9190ba4c3d0a30128509517fa8c0f080fc603f99, 'Fragments of the City', 'CITY'), + (0xb563420b7b8119114968C70093c4966630ad16d3, 'Bruskies', 'Bruskies'), + (0xC93e7eFE0E863a1E4ffC6D2dcF7AfC1d3CCCE0b4, 'Mamboners', 'BONER'), + (0xe6cc79cA731A5e406024015bB2dE5346B52eCA2F, 'Peons V2', 'Peons V2'), + (0xfE09E309726FcDb92B05Df5f682185a0B0590dD9, 'RIPPED DAO', 'RIPPED'), (0x7098b1918eb2aa13945b8a489975bbbf0d5dd79b, 'Long Long Legacy', 'LLL'), (0xc732518034c5df52cdddf17486b9409bc7721e2c, 'Sausagers', 'MEAT'), (0x00bf1594507ccf60b41ad64524d4aba23b059f4b, 'Ferdy Frends', 'FREN'), From abd1d0c1da873b1d92a5f1a66eac26333c814531 Mon Sep 17 00:00:00 2001 From: disco chuck Date: Mon, 30 Dec 2024 02:32:14 -0600 Subject: [PATCH 06/21] Adding WOOFY, RIPPED, AURA to erc20s (#7388) --- .../models/tokens/avalanche_c/tokens_avalanche_c_erc20.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dbt_subprojects/tokens/models/tokens/avalanche_c/tokens_avalanche_c_erc20.sql b/dbt_subprojects/tokens/models/tokens/avalanche_c/tokens_avalanche_c_erc20.sql index cfe1b2720cf..3702b206a1b 100644 --- a/dbt_subprojects/tokens/models/tokens/avalanche_c/tokens_avalanche_c_erc20.sql +++ b/dbt_subprojects/tokens/models/tokens/avalanche_c/tokens_avalanche_c_erc20.sql @@ -384,4 +384,7 @@ FROM (VALUES , (0xca5d8f8a8d49439357d3cf46ca2e720702f132b8, 'GYD', 18) , (0xC509aB7bB4eDbF193b82264D499a7Fc526Cd01F4, 'stataAvaUSDC', 6) , (0xc654721fbf1f374fd9ffa3385bba2f4932a6af55, 'JUICY', 18) + , (0xBaCD77aC0c456798e05de15999CB212129d90b70, 'WOOFY', 18) + , (0xfE09E309726FcDb92B05Df5f682185a0B0590dD9, 'RIPPED', 18) + , (0x3db3aa87121d16407cfbbadf3f1c5b519182a399, 'AURA', 18) ) AS temp_table (contract_address, symbol, decimals) From c11220a75106fbad53a263ba6ac19b9441150420 Mon Sep 17 00:00:00 2001 From: disco chuck Date: Mon, 30 Dec 2024 02:32:20 -0600 Subject: [PATCH 07/21] Added 1155 Voidcaller to nft curated (#7387) --- .../tokens/avalanche_c/tokens_avalanche_c_nft_curated.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dbt_subprojects/tokens/models/tokens/avalanche_c/tokens_avalanche_c_nft_curated.sql b/dbt_subprojects/tokens/models/tokens/avalanche_c/tokens_avalanche_c_nft_curated.sql index d1efa5e1ba0..46a751ad005 100644 --- a/dbt_subprojects/tokens/models/tokens/avalanche_c/tokens_avalanche_c_nft_curated.sql +++ b/dbt_subprojects/tokens/models/tokens/avalanche_c/tokens_avalanche_c_nft_curated.sql @@ -12047,5 +12047,6 @@ FROM (VALUES (0xffd2a1cf6dbb896c4db0df992e68e99e329f7a52, 'Angels® Mike Trout 1987 35th Anniversary Chrome T87C-50 Super Rare', 'MLB-22S1-S-1987AC37-M-CHR'), (0xffddfe5194e693c8954ddd9fa9bfb54625bf434c, 'Arne Maier FCA Color Splash Facsimile Signature Team Color TK-67 Legendary', 'BUND-22TK-L-CSTK-67-S-TMC'), (0xffe416277c4a301d3525bacaba00bc4f2000c29e, 'Miami Marlins® Bryan De La Cruz Base Independence Day RWB 22 Rare', 'MLB-22S1-R-B22-M-RWB'), - (0xfff6fa52337d60dbbd222671c0397d5908e5e31d, 'Lil Walter Drip', 'LWD') + (0xfff6fa52337d60dbbd222671c0397d5908e5e31d, 'Lil Walter Drip', 'LWD'), + (0xd1b4367dd9f235f9ee61878019d66e31511e98ee, 'Voidcaller', 'VOIDCALLER') ) AS temp_table (contract_address, name, symbol) From b78323722cddfd1425509872b4c7be42a4023697 Mon Sep 17 00:00:00 2001 From: intensodefi Date: Mon, 30 Dec 2024 15:32:26 +0700 Subject: [PATCH 08/21] Add PENGU token price (#7384) * Add PENGU token price * Update prices_solana_tokens.sql --- .../tokens/models/prices/solana/prices_solana_tokens.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dbt_subprojects/tokens/models/prices/solana/prices_solana_tokens.sql b/dbt_subprojects/tokens/models/prices/solana/prices_solana_tokens.sql index 9ba81a4fa10..791f3f58b63 100644 --- a/dbt_subprojects/tokens/models/prices/solana/prices_solana_tokens.sql +++ b/dbt_subprojects/tokens/models/prices/solana/prices_solana_tokens.sql @@ -715,5 +715,6 @@ FROM ('grift1-orbit', 'solana', 'GRIFT', 'GekTNfm84QfyP2GdAHZ5AgACBRd69aNmgA5FDhZupump', 6), ('fxn-fxn', 'solana', 'FXN', '92cRC6kV5D7TiHX1j56AbkPbffo9jwcXxSDQZ8Mopump',6), ('griffain-test-griffaincom', 'solana', 'GRIFFAIN', 'KENJSUYLASHUMfHyy5o4Hp2FdNqZg1AsUPhfH2kYvEP', 6), - ('tank-agenttank', 'solana', 'TANK', 'GAMwtMB6onAvBNBQJCJFuxoaqfPH8uCQ2dewNMVVpump', 6) + ('tank-agenttank', 'solana', 'TANK', 'GAMwtMB6onAvBNBQJCJFuxoaqfPH8uCQ2dewNMVVpump', 6), + ('pengu-pudgy-penguins', 'solana', 'PENGU', '2zMMhcVQEXDtdE6vsFS7S7D5oUodfJHE8vd1gnBouauv', 6) ) as temp (token_id, blockchain, symbol, contract_address, decimals) From 7370cbe2271d5368611cbe7f51c79176cabc85b1 Mon Sep 17 00:00:00 2001 From: Savely <136869149+savvar9991@users.noreply.github.com> Date: Mon, 30 Dec 2024 19:32:33 +1100 Subject: [PATCH 09/21] Update CONTRIBUTING.md (#7382) --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 41761301108..2102ae9d859 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ Contributions in the form of issues and pull requests are very much welcome here ## [BETA] Pre-push hooks -UPDATE: These pre-push hooks require running `dbt compile` which is a fairly slow step due to the size of our project. We intend to rewrite these hooks to be more efficient but for the time being they remain cumbersome. Feel free to use them if you find them useful but the same checks will run in a Github Action when you commit your code. Feel free to uninstall if they do not bring joy, we'll let wizards know when we think we've improved them enought to warrant making them part of the general development flow. +UPDATE: These pre-push hooks require running `dbt compile` which is a fairly slow step due to the size of our project. We intend to rewrite these hooks to be more efficient but for the time being they remain cumbersome. Feel free to use them if you find them useful but the same checks will run in a Github Action when you commit your code. Feel free to uninstall if they do not bring joy, we'll let wizards know when we think we've improved them enough to warrant making them part of the general development flow. We are testing out adding pre-push hooks to our workflow. The goal is to catch common errors before code is pushed and streamline the pull request review process. @@ -126,13 +126,13 @@ example custom test: ```sql with unit_test1 as (select - case when col1 == 2 and col2 == 'moon' then True else False end as test + case when col1 = 2 and col2 = 'moon' then True else False end as test from {{ ref('mock_table' )}} where tx_id = '102'), unit_test2 as (select - case when col1 == 2 and col2 == 'moon' then True else False end as test + case when col1 = 2 and col2 = 'moon' then True else False end as test from {{ ref('mock_table' )}} where tx_id = '103'), From 67a9e87e24b36b83c26b3e2eca61195f3e5ecb15 Mon Sep 17 00:00:00 2001 From: youyyytrok Date: Mon, 30 Dec 2024 09:32:42 +0100 Subject: [PATCH 10/21] Docs: Fix Broken Links in Seeds and Tests (#7380) * fix broken links seed_overview.md * fix broken link test_overview.md --- docs/seeds/seed_overview.md | 6 +++--- docs/tests/test_overview.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/seeds/seed_overview.md b/docs/seeds/seed_overview.md index 232dce54c1a..c4fb9c71607 100644 --- a/docs/seeds/seed_overview.md +++ b/docs/seeds/seed_overview.md @@ -6,12 +6,12 @@ Seeds will be required in these sector-level spell additions to ensure proper le ## Using `dex.trades` as an Example for Sector-Level Spell Design Approach to Seeds: -1. Add new model seed to [the schema file](/seeds/_sector/dex/_schema.yml), to ensure proper data type assignments. +1. Add new model seed to [the schema file](/dbt_subprojects/dex/seeds/trades/_schema.yml), to ensure proper data type assignments. 2. Build a seed file in CSV format, which contains: - All the unique keys on the model for downstream join conditions in tests. - Fields which we want to test the results of the model execution. - - Example seed file [here](/seeds/_sector/dex/aerodrome_base_base_trades_seed.csv). -3. Within the [model schema file](/models/_sector/dex/trades/arbitrum/_schema.yml#L20-L23), call the [generic seed test](/tests/generic/check_dex_base_trades_seed.sql) with parameters necessary: + - Example seed file [here](/dbt_subprojects/dex/seeds/trades/aerodrome_base_base_trades_seed.csv). +3. Within the [model schema file](/dbt_subprojects/dex/models/trades/arbitrum/_schema.yml#23-25), call the [generic seed test](/dbt_subprojects/dex/tests/generic/check_dex_base_trades_seed.sql) with parameters necessary: - Seed file name. - Filter(s) for project versions, if the spell is split into versions per project. 4. Ultimately, following the above steps, the test query built and executed against seed files lives in the generic seed macro [here](/dbt_macros/generic-tests/check_seed_macro.sql). diff --git a/docs/tests/test_overview.md b/docs/tests/test_overview.md index 82d1d890781..c573ed113ce 100644 --- a/docs/tests/test_overview.md +++ b/docs/tests/test_overview.md @@ -11,7 +11,7 @@ Tests tied to models are highly encouraged & at times required, depending on the These tests would benefit all sector-level spells, first introduced in `nft.trades`: -- Validate column data types, as built [here](https://github.com/duneanalytics/spellbook/blob/d6b5acc1dbd01e67e6cb23d96da6f3fc3ec7d268/tests/generic/check_column_types.sql#L6) and called like [this](/models/_sector/nft/trades/chains/arbitrum/platforms/_schema.yml#L14). +- Validate column data types, as built [here](https://github.com/duneanalytics/spellbook/blob/d6b5acc1dbd01e67e6cb23d96da6f3fc3ec7d268/tests/generic/check_column_types.sql#L6) and called like [this](/dbt_subprojects/nft/models/_sector/trades/chains/arbitrum/platforms/_schema.yml#L14). ## Where to Store Tests? From f78839558ffe88cf36821572557aec0b59e73f2d Mon Sep 17 00:00:00 2001 From: Mansi <122999960+IrishLatte19@users.noreply.github.com> Date: Mon, 30 Dec 2024 14:02:49 +0530 Subject: [PATCH 11/21] Sonic Tokens (#7370) * Sonic Tokens * Sonic Tokens * Sonic Tokens * Sonic Tokens * Rename tokens_sonic.erc20.sql to tokens_sonic_erc20.sql --- .../tokens/models/tokens/_schema.yml | 6 ++--- .../tokens/sonic/tokens_sonic_erc20.sql | 27 +++++++++++++++++++ .../tokens/sonic/tokens_sonic_schema.yml | 21 +++++++++++++++ .../tokens/models/tokens/tokens_erc20.sql | 4 ++- 4 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 dbt_subprojects/tokens/models/tokens/sonic/tokens_sonic_erc20.sql create mode 100644 dbt_subprojects/tokens/models/tokens/sonic/tokens_sonic_schema.yml diff --git a/dbt_subprojects/tokens/models/tokens/_schema.yml b/dbt_subprojects/tokens/models/tokens/_schema.yml index 6c5aea7d540..1969374b9ba 100644 --- a/dbt_subprojects/tokens/models/tokens/_schema.yml +++ b/dbt_subprojects/tokens/models/tokens/_schema.yml @@ -3,11 +3,11 @@ version: 2 models: - name: tokens_erc20 meta: - blockchain: arbitrum, avalanche_c, bnb, ethereum, gnosis, mantle, optimism, fantom, polygon, base, blast, sepolia, sei, nova, worldchain, kaia, ronin, boba, flare, viction + blockchain: arbitrum, avalanche_c, bnb, ethereum, gnosis, mantle, optimism, fantom, polygon, base, blast, sepolia, sei, nova, worldchain, kaia, ronin, boba, flare, viction, sonic sector: tokens - contributors: hildobby, 0xManny, dot2dotseurat, soispoke, mtitus6, wuligy, angus_1, Henrystats, viniabussafi, jeff-dude, rantum, hosuke + contributors: hildobby, 0xManny, dot2dotseurat, soispoke, mtitus6, wuligy, angus_1, Henrystats, viniabussafi, jeff-dude, rantum, hosuke, irishlatte19 config: - tags: ['tokens','erc20', 'arbitrum', 'avalanche_c', 'bnb', 'ethereum', 'gnosis', 'mantle', 'optimism', 'fantom', 'base', 'blast', 'sei', 'nova', 'linea', 'worldchain', 'kaia', 'ronin', 'boba', 'flare', 'viction'] + tags: ['tokens','erc20', 'arbitrum', 'avalanche_c', 'bnb', 'ethereum', 'gnosis', 'mantle', 'optimism', 'fantom', 'base', 'blast', 'sei', 'nova', 'linea', 'worldchain', 'kaia', 'ronin', 'boba', 'flare', 'viction', 'sonic'] description: > Crosschain ERC20 tokens diff --git a/dbt_subprojects/tokens/models/tokens/sonic/tokens_sonic_erc20.sql b/dbt_subprojects/tokens/models/tokens/sonic/tokens_sonic_erc20.sql new file mode 100644 index 00000000000..7b2fd6541a5 --- /dev/null +++ b/dbt_subprojects/tokens/models/tokens/sonic/tokens_sonic_erc20.sql @@ -0,0 +1,27 @@ +{{ + config( + schema = 'tokens_sonic' + ,alias = 'erc20' + ,tags = ['static'] + ,materialized = 'table' + ) +}} + +SELECT + contract_address + , symbol + , decimals +FROM (VALUES + (0x309C92261178fA0CF748A855e90Ae73FDb79EBc7, 'WETH', 18) + , (0x039e2fB66102314Ce7b64Ce5Ce3E5183bc94aD38, 'WS', 18) + , (0x29219dd400f2Bf60E5a23d13Be72B486D4038894, 'USDC.e', 6) + , (0xe715cba7b5ccb33790cebff1436809d36cb17e57, 'EURC.e', 6) + , (0xf2f9f482a395b4dd5b5b92173b7d62f3aff92884, 'DOG', 18) + , (0x06341839dac9384bf96c6fc8df6983661a06356a, 'DOGE', 18) + , (0x446649f0727621bdbb76644b1910be2163b62a11, 'SONIC', 18) + , (0x9fdbc3f8abc05fa8f3ad3c17d2f806c1230c4564, 'GOGLZ', 18) + , (0x2030170901a9d87f6bd0ca9b8ad130119c7e1173, 'BABYSONIC', 9) + , (0xe5da20f15420ad15de0fa650600afc998bbe3955, 'stS', 18) + , (0xd4a5c68a1ed1fc2bb06cba2d90d6adeee7503671, 'HOOPS', 18) + +) as temp (contract_address, symbol, decimals) diff --git a/dbt_subprojects/tokens/models/tokens/sonic/tokens_sonic_schema.yml b/dbt_subprojects/tokens/models/tokens/sonic/tokens_sonic_schema.yml new file mode 100644 index 00000000000..6cc0daef3fc --- /dev/null +++ b/dbt_subprojects/tokens/models/tokens/sonic/tokens_sonic_schema.yml @@ -0,0 +1,21 @@ +version: 2 + +models: + - name: tokens_sonic_erc20 + meta: + blockchain: sonic + sector: tokens + project: erc20 + contributors: irishlatte19 + config: + tags: ['table', 'erc20', 'sonic'] + description: "ERC20 Token Addresses, Symbols and Decimals on Sonic" + columns: + - name: contract_address + description: "ERC20 token contract address" + data_tests: + - unique + - name: symbol + description: "ERC20 token symbol" + - name: decimals + description: "Number of decimals, refers to how divisible an ERC20 token can be" \ No newline at end of file diff --git a/dbt_subprojects/tokens/models/tokens/tokens_erc20.sql b/dbt_subprojects/tokens/models/tokens/tokens_erc20.sql index 04c94f3a19a..e8854fb8cca 100644 --- a/dbt_subprojects/tokens/models/tokens/tokens_erc20.sql +++ b/dbt_subprojects/tokens/models/tokens/tokens_erc20.sql @@ -32,10 +32,11 @@ ,"zksync" ,"zora" ,"bob" + ,"sonic" ]\', "sector", "tokens", - \'["bh2smith","0xManny","hildobby","soispoke","dot2dotseurat","mtitus6","wuligy","lgingerich","0xRob","jeff-dude","viniabussafi","IrishLatte19","angus_1","Henrystats","rantum"]\') }}' + \'["bh2smith","0xManny","hildobby","soispoke","dot2dotseurat","mtitus6","wuligy","lgingerich","0xRob","jeff-dude","viniabussafi","IrishLatte19","angus_1","Henrystats","rantum", "IrishLatte19"]\') }}' ) }} @@ -75,6 +76,7 @@ ,'tokens_flare': {'blockchain': 'flare', 'model': ref('tokens_flare_erc20')} ,'tokens_boba': {'blockchain': 'boba', 'model': ref('tokens_boba_erc20')} ,'tokens_viction': {'blockchain': 'viction', 'model': ref('tokens_viction_erc20')} + ,'tokens_sonic': {'blockchain': 'sonic', 'model': ref('tokens_sonic_erc20')} } %} with automated_source as ( From 4559a61a400505fdb8a1f2495319e742d33854aa Mon Sep 17 00:00:00 2001 From: viniabussafi <131974393+viniabussafi@users.noreply.github.com> Date: Mon, 30 Dec 2024 08:32:58 +0000 Subject: [PATCH 12/21] update tokens.erc20 (#7368) --- .../tokens/models/prices/arbitrum/prices_arbitrum_tokens.sql | 4 ++-- .../tokens/models/tokens/arbitrum/tokens_arbitrum_erc20.sql | 2 ++ .../tokens/models/tokens/ethereum/tokens_ethereum_erc20.sql | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dbt_subprojects/tokens/models/prices/arbitrum/prices_arbitrum_tokens.sql b/dbt_subprojects/tokens/models/prices/arbitrum/prices_arbitrum_tokens.sql index 0d231d726fc..31b062b768d 100644 --- a/dbt_subprojects/tokens/models/prices/arbitrum/prices_arbitrum_tokens.sql +++ b/dbt_subprojects/tokens/models/prices/arbitrum/prices_arbitrum_tokens.sql @@ -229,6 +229,6 @@ FROM ('usdm-mountain-protocol-usd', 'arbitrum', 'USDM', 0x59d9356e565ab3a36dd77763fc0d87feaf85508c, 18), ('usdz-anzen-usdz', 'arbitrum', 'USDZ', 0x5018609ab477cc502e170a5accf5312b86a4b94f, 18), ('trb-tellor', 'arbitrum', 'TRB', 0xd58d345fd9c82262e087d2d0607624b410d88242, 18), - ('mor-morpheusai', 'arbitrum', 'MOR', 0x092baadb7def4c3981454dd9c0a0d7ff07bcfc86, 18) - + ('mor-morpheusai', 'arbitrum', 'MOR', 0x092baadb7def4c3981454dd9c0a0d7ff07bcfc86, 18), + ('usdx-usdxmoney-usdx', 'arbitrum', 'USDX', 0xf3527ef8dE265eAa3716FB312c12847bFBA66Cef, 18) ) as temp (token_id, blockchain, symbol, contract_address, decimals) diff --git a/dbt_subprojects/tokens/models/tokens/arbitrum/tokens_arbitrum_erc20.sql b/dbt_subprojects/tokens/models/tokens/arbitrum/tokens_arbitrum_erc20.sql index edf8630b902..7635bf4ce45 100644 --- a/dbt_subprojects/tokens/models/tokens/arbitrum/tokens_arbitrum_erc20.sql +++ b/dbt_subprojects/tokens/models/tokens/arbitrum/tokens_arbitrum_erc20.sql @@ -124,4 +124,6 @@ FROM (VALUES , (0xB0BDE111812EAC913b392D80D51966eC977bE3A2, 'jUSDC', 18) , (0xf3b7994e4dA53E04155057Fd61dc501599d57877, 'farmdWETHV3', 18) , (0x521598765b0E5a4CD743f2769C06787b84617252, 'TLP', 18) + , (0xf3527ef8dE265eAa3716FB312c12847bFBA66Cef, 'USDX', 18) + , (0x7788A3538C5fc7F9c7C8A74EAC4c898fC8d87d92, 'sUSDX', 18) ) AS temp_table (contract_address, symbol, decimals) diff --git a/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_erc20.sql b/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_erc20.sql index c83ece387c6..355537fbdf1 100644 --- a/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_erc20.sql +++ b/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_erc20.sql @@ -4741,4 +4741,5 @@ FROM (VALUES , ( 0x7F4B66FF703336CfC35b901144614496Ae0b0D27, 'shezUSD', 18) , ( 0xa7b66dda0d7c7c1e43d3130491216172993d163d, 'EVS', 6) , ( 0x2371e134e3455e0593363cbf89d3b6cf53740618, 'gtWETH', 18) + , ( 0x634ed807647e07a7c038ef1956a58adbc6695f88, 'shezUSD', 18) ) AS temp_table (contract_address, symbol, decimals) From a63b1e435a81fe025e547af0e9bff94ad978f4c2 Mon Sep 17 00:00:00 2001 From: synthquest <112836792+Synthquest@users.noreply.github.com> Date: Mon, 30 Dec 2024 03:33:04 -0500 Subject: [PATCH 13/21] Ethereum RWA Balances (#7322) * init ethereum RWA balances * name change * remove balances, only include token definitions --------- Co-authored-by: 0xRob <83790096+0xRobin@users.noreply.github.com> --- .../tokens/ethereum/tokens_ethereum_rwa.sql | 36 +++++++++++++++++++ .../ethereum/tokens_ethereum_schema.yml | 23 ++++++++++++ .../_subprojects_outputs/tokens/_sources.yml | 29 +++++++++++++++ 3 files changed, 88 insertions(+) create mode 100644 dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_rwa.sql diff --git a/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_rwa.sql b/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_rwa.sql new file mode 100644 index 00000000000..8eefd5af2ed --- /dev/null +++ b/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_rwa.sql @@ -0,0 +1,36 @@ +{{ config( + schema = 'tokens_ethereum' + , alias = 'rwa' + , tags=['static'] + , post_hook='{{ expose_spells(\'["ethereum"]\', + "sector", + "tokens_ethereum", + \'["synthquest"]\') }}' + , unique_key = ['contract_address'] + ) +}} + +SELECT blockchain, contract_address, backing, symbol, decimals, name +FROM (VALUES + + ('ethereum', 0x68749665FF8D2d112Fa859AA293F07A622782F38, 'Gold-backed', 'XAUT', 6, 'Tether'), + ('ethereum', 0x45804880de22913dafe09f4980848ece6ecbaf78, 'Gold-backed', 'PAXG', 18, 'Paxos'), + ('ethereum', 0x136471a34f6ef19fe571effc1ca711fdb8e49f2b, 'Treasury-backed', 'USYC', 6, 'Hashnote'), + ('ethereum', 0x1b19c19393e2d034d8ff31ff34c81252fcbbee92, 'Treasury-backed', 'OUSG', 18, 'Ondo'), + ('ethereum', 0x7712c34205737192402172409a8F7ccef8aA2AEc, 'Treasury-backed', 'BUIDL', 6, 'Blackrock'), + ('ethereum', 0x96F6eF951840721AdBF46Ac996b59E0235CB985C, 'Treasury-backed', 'USDY', 18, 'Ondo'), + ('ethereum', 0x43415eB6ff9DB7E26A15b704e7A3eDCe97d31C4e, 'Treasury-backed', 'USTB', 6, 'Superstate'), + ('ethereum', 0xdd50C053C096CB04A3e3362E2b622529EC5f2e8a, 'Treasury-backed', 'TBILL', 6, 'Open Eden'), + ('ethereum', 0xe4880249745eAc5F1eD9d8F7DF844792D560e750, 'Treasury-backed', 'USTBL', 5, 'Spiko'), + ('ethereum', 0x8c213ee79581Ff4984583C6a801e5263418C4b86, 'Treasury-backed', 'LTF', 6, 'Centrifuge'), + ('ethereum', 0xa0769f7A8fC65e47dE93797b4e21C073c117Fc80, 'Global-Bond-backed', 'EUTBL', 5, 'Spiko'), + ('ethereum', 0x3f95AA88dDbB7D9D484aa3D482bf0a80009c52c9, 'Global-Bond-backed', 'bERNX', 18, 'Backed'), + ('ethereum', 0x2F123cF3F37CE3328CC9B5b8415f9EC5109b45e7, 'Global-Bond-backed', 'bC3M', 18, 'Backed'), + ('ethereum', 0x3Ee320c9F73a84D1717557af00695A34b26d1F1d, 'Global-Bond-backed', 'XEVT', 6, 'OpenTrade'), + ('ethereum', 0xe4A6f23Fb9e00Fca037Aa0EA0a6954dE0a6C53bF, 'Gold-backed', 'TXAU', 18, 'Aurus'), + ('ethereum', 0x34ABce75D2f8f33940c721dCA0f562617787bfF3, 'Silver-backed', 'TXAG', 18, 'Aurus'), + ('ethereum', 0x6d57B2E05F26C26b549231c866bdd39779e4a488, 'Gold-backed', 'VNXAU', 18, 'VNX'), + ('ethereum', 0x19b22DbADc298c359A1D1b59e35f352A2b40E33c, 'Platinum-backed', 'TXPT', 18, 'Aurus') + + + ) AS temp_table (blockchain, contract_address, backing, symbol, decimals, name) diff --git a/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_schema.yml b/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_schema.yml index bbe1d127dd3..410ddf70608 100644 --- a/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_schema.yml +++ b/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_schema.yml @@ -127,3 +127,26 @@ models: data_tests: - accepted_values: values: ['erc721', 'erc1155' , 'erc20', 'cryptopunks','superrare'] + + - name: tokens_ethereum_rwa + meta: + blockchain: ethereum + sector: rwa + contributors: synthquest + config: + tags: ['tokens', 'ethereum', 'rwa'] + description: > + Selection of RWA token addresses. + columns: + - name: blockchain + description: "Blockchain name" + - name: contract_address + description: "RWA token contract address" + - name: backing + description: "RWA token backing" + - name: symbol + description: "RWA token symbol" + - name: name + description: "RWA token project name" + - name: decimals + description: "Number of decimals" diff --git a/sources/_subprojects_outputs/tokens/_sources.yml b/sources/_subprojects_outputs/tokens/_sources.yml index fcaaea8777e..8bc3e6d082d 100644 --- a/sources/_subprojects_outputs/tokens/_sources.yml +++ b/sources/_subprojects_outputs/tokens/_sources.yml @@ -121,6 +121,20 @@ sources: data_type: integer - name: name data_type: varchar + - name: rwa + columns: + - name: blockchain + data_type: varchar + - name: contract_address + data_type: varbinary + - name: backing + data_type: varchar + - name: symbol + data_type: varchar + - name: decimals + data_type: integer + - name: name + data_type: varchar - name: tokens_arbitrum @@ -174,6 +188,7 @@ sources: data_type: integer - name: name data_type: varchar + - name: tokens_base @@ -289,6 +304,20 @@ sources: data_type: integer - name: name data_type: varchar + - name: rwa + columns: + - name: blockchain + data_type: varchar + - name: contract_address + data_type: varbinary + - name: backing + data_type: varchar + - name: symbol + data_type: varchar + - name: decimals + data_type: integer + - name: name + data_type: varchar - name: tokens_fantom From 0ab195d6a3dfad25c7be48adff58970859b8ad16 Mon Sep 17 00:00:00 2001 From: viniabussafi <131974393+viniabussafi@users.noreply.github.com> Date: Mon, 30 Dec 2024 08:34:19 +0000 Subject: [PATCH 14/21] add waEthUSDe to tokens.erc20 and erc4626 token mapping (#7396) Co-authored-by: 0xRob <83790096+0xRobin@users.noreply.github.com> --- .../balancer_v3_ethereum_erc4626_token_mapping.sql | 3 ++- .../models/tokens/ethereum/tokens_ethereum_erc20.sql | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dbt_subprojects/hourly_spellbook/models/_project/balancer/erc4626_tokens/ethereum/balancer_v3_ethereum_erc4626_token_mapping.sql b/dbt_subprojects/hourly_spellbook/models/_project/balancer/erc4626_tokens/ethereum/balancer_v3_ethereum_erc4626_token_mapping.sql index 5d00d403603..d939fcc5e9e 100644 --- a/dbt_subprojects/hourly_spellbook/models/_project/balancer/erc4626_tokens/ethereum/balancer_v3_ethereum_erc4626_token_mapping.sql +++ b/dbt_subprojects/hourly_spellbook/models/_project/balancer/erc4626_tokens/ethereum/balancer_v3_ethereum_erc4626_token_mapping.sql @@ -38,7 +38,8 @@ FROM (VALUES (0x7bc3485026ac48b6cf9baf0a377477fff5703af8, 'Static Aave Ethereum USDT', 'WaEthUSDT', 0xdac17f958d2ee523a2206206994597c13d831ec7, 'USDT', 6), (0x0bfc9d54fc184518a81162f8fb99c2eaca081202, 'Static Aave Ethereum WETH', 'WaEthWETH', 0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2, 'WETH', 18), (0x0fe906e030a44ef24ca8c7dc7b7c53a6c4f00ce9, 'Static Aave Ethereum Lido WETH', 'waEthLidoWETH', 0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2, 'WETH', 18), - (0x775f661b0bd1739349b9a2a3ef60be277c5d2d29, 'Static Aave Ethereum Lido wstETH', 'waEthLidowstETH', 0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0, 'wstETH', 18) + (0x775f661b0bd1739349b9a2a3ef60be277c5d2d29, 'Static Aave Ethereum Lido wstETH', 'waEthLidowstETH', 0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0, 'wstETH', 18), + (0x5F9D59db355b4A60501544637b00e94082cA575b, 'Static Aave Ethereum USDe', 'waEthUSDe', 0x4c9EDD5852cd905f086C759E8383e09bff1E68B3, 'USDe', 18) ) AS temp_table (erc4626_token, erc4626_token_name, erc4626_token_symbol, underlying_token, underlying_token_symbol, decimals) ), diff --git a/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_erc20.sql b/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_erc20.sql index 355537fbdf1..98fe7b101f0 100644 --- a/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_erc20.sql +++ b/dbt_subprojects/tokens/models/tokens/ethereum/tokens_ethereum_erc20.sql @@ -4739,7 +4739,8 @@ FROM (VALUES , ( 0x9Ba021B0a9b958B5E75cE9f6dff97C7eE52cb3E6, 'apxETH', 18) , ( 0xa4f6b2cdcb67bf8f48baa459a333d2667aa4b100, 'shezETH', 8) , ( 0x7F4B66FF703336CfC35b901144614496Ae0b0D27, 'shezUSD', 18) - , ( 0xa7b66dda0d7c7c1e43d3130491216172993d163d, 'EVS', 6) - , ( 0x2371e134e3455e0593363cbf89d3b6cf53740618, 'gtWETH', 18) - , ( 0x634ed807647e07a7c038ef1956a58adbc6695f88, 'shezUSD', 18) + , ( 0xa7b66dda0d7c7c1e43d3130491216172993d163d, 'EVS', 6) + , ( 0x2371e134e3455e0593363cbf89d3b6cf53740618, 'gtWETH', 18) + , ( 0x5F9D59db355b4A60501544637b00e94082cA575b, 'waEthUSDe', 18) + , ( 0x634Ed807647e07a7C038EF1956a58ADbc6695F88, 'shezUSD', 18) ) AS temp_table (contract_address, symbol, decimals) From 6ab44e7d3879f001a9963b2cad6f612d93b4c2e3 Mon Sep 17 00:00:00 2001 From: Peter <49856481+peterrliem@users.noreply.github.com> Date: Mon, 30 Dec 2024 16:41:10 +0800 Subject: [PATCH 15/21] Add Mavis Market to nft.trades (#7355) * Add Mavis Market to nft.trades * Add Ronin Sources * Update _sources.yml Added Ronin * Update mavis_marketplace.sql * Update nft_base_trades.sql Added Ronin * Update nft_trades.sql * Create _schema.yml * Remove schema file * Update and rename dbt_subprojects/nft/models/_sector/trades/chains/ronin/platforms/_schema.yml to dbt_subprojects/nft/models/_sector/trades/chains/ronin/nft_ronin_base_trades.sql * Rename mavis_marketplace.sql to mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Update mavis_ronin_base_trades.sql * Create _schema.yml * Update _schema.yml * Update mavis_ronin_base_trades.sql Made changes based on Rob's suggestions. Thanks Rob! --------- Co-authored-by: 0xRob <83790096+0xRobin@users.noreply.github.com> --- .../chains/ronin/nft_ronin_base_trades.sql | 49 ++++++++++ .../trades/chains/ronin/platforms/_schema.yml | 12 +++ .../platforms/mavis_ronin_base_trades.sql | 92 +++++++++++++++++++ .../models/_sector/trades/nft_base_trades.sql | 1 + .../nft/models/_sector/trades/nft_trades.sql | 2 +- sources/_sector/nft/_sources.yml | 3 + sources/_sector/nft/trades/ronin_sources.yml | 7 ++ 7 files changed, 165 insertions(+), 1 deletion(-) create mode 100644 dbt_subprojects/nft/models/_sector/trades/chains/ronin/nft_ronin_base_trades.sql create mode 100644 dbt_subprojects/nft/models/_sector/trades/chains/ronin/platforms/_schema.yml create mode 100644 dbt_subprojects/nft/models/_sector/trades/chains/ronin/platforms/mavis_ronin_base_trades.sql create mode 100644 sources/_sector/nft/trades/ronin_sources.yml diff --git a/dbt_subprojects/nft/models/_sector/trades/chains/ronin/nft_ronin_base_trades.sql b/dbt_subprojects/nft/models/_sector/trades/chains/ronin/nft_ronin_base_trades.sql new file mode 100644 index 00000000000..83f699e3415 --- /dev/null +++ b/dbt_subprojects/nft/models/_sector/trades/chains/ronin/nft_ronin_base_trades.sql @@ -0,0 +1,49 @@ +{{ config( + schema = 'nft_ronin', + alias = 'base_trades', + materialized = 'view' + ) +}} +-- (project, project_version, model) +{% set nft_models = [ + ref('mavis_ronin_base_trades') +] %} + +with base_union as ( +SELECT * FROM ( +{% for nft_model in nft_models %} + SELECT + blockchain, + project, + project_version, + block_time, + block_date, + block_month, + block_number, + tx_hash, + project_contract_address, + trade_category, + trade_type, + buyer, + seller, + nft_contract_address, + nft_token_id, + nft_amount, + price_raw, + currency_contract, + platform_fee_amount_raw, + royalty_fee_amount_raw, + platform_fee_address, + royalty_fee_address, + sub_tx_trade_id, + tx_from, + tx_to, + tx_data_marker + FROM {{ nft_model }} + {% if not loop.last %} + UNION ALL + {% endif %} + {% endfor %} + ) +) +select * from base_union diff --git a/dbt_subprojects/nft/models/_sector/trades/chains/ronin/platforms/_schema.yml b/dbt_subprojects/nft/models/_sector/trades/chains/ronin/platforms/_schema.yml new file mode 100644 index 00000000000..9da694d9865 --- /dev/null +++ b/dbt_subprojects/nft/models/_sector/trades/chains/ronin/platforms/_schema.yml @@ -0,0 +1,12 @@ +version: 2 + +models: + - name: mavis_ronin_base_trades + meta: + blockchain: ronin + sector: nft + project: mavis_ronin + contributors: ['peterrliem' ] + config: + tags: [ 'ronin', 'nft', 'trades', 'mavis' ] + description: "mavis marketplace base trades" diff --git a/dbt_subprojects/nft/models/_sector/trades/chains/ronin/platforms/mavis_ronin_base_trades.sql b/dbt_subprojects/nft/models/_sector/trades/chains/ronin/platforms/mavis_ronin_base_trades.sql new file mode 100644 index 00000000000..d7ef5b9c292 --- /dev/null +++ b/dbt_subprojects/nft/models/_sector/trades/chains/ronin/platforms/mavis_ronin_base_trades.sql @@ -0,0 +1,92 @@ +{{ config( + schema = 'mavis_ronin', + alias = 'base_trades', + materialized = 'incremental', + file_format = 'delta', + incremental_strategy = 'merge', + unique_key = ['block_number','tx_hash','sub_tx_trade_id'], + ) +}} + + +with trade_details as ( + +select + evt_block_time as block_time, + evt_block_date as block_date, + evt_block_number as block_number, + evt_tx_hash as tx_hash, + evt_tx_from as tx_from, + evt_tx_to as tx_to, + evt_index, + contract_address, + COALESCE(FROM_HEX(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[5].recipient')),FROM_HEX(json_extract_scalar(json_parse(json_extract_scalar("order", '$.info')), '$.maker'))) as seller, + FROM_HEX(json_extract_scalar("order", '$.recipient')) as buyer, + json_extract_scalar(json_parse(json_extract_scalar("order", '$.info')), '$.kind') as kind, + cast(json_extract_scalar(replace(json_extract_scalar(json_parse(json_extract_scalar("order", '$.info')),'$.assets[0]'),'\\', ''),'$.erc') as double) as erc, + FROM_HEX(json_extract_scalar(replace(json_extract_scalar(json_parse(json_extract_scalar("order", '$.info')),'$.assets[0]'),'\\', ''),'$.addr')) as nft_contract_address, + cast(json_extract_scalar(replace(json_extract_scalar(json_parse(json_extract_scalar("order", '$.info')),'$.assets[0]'),'\\', ''),'$.id') as double) as nft_token_id, + case + when cast(json_extract_scalar(replace(json_extract_scalar(json_parse(json_extract_scalar("order", '$.info')),'$.assets[0]'),'\\', ''),'$.quantity') as double) = 0 then 1 + else cast(json_extract_scalar(replace(json_extract_scalar(json_parse(json_extract_scalar("order", '$.info')),'$.assets[0]'),'\\', ''),'$.quantity') as double) + end as quantity, + FROM_HEX(json_extract_scalar(json_parse(json_extract_scalar("order", '$.info')), '$.paymentToken')) as currency_address, + CAST(json_extract_scalar("order", '$.realPrice') AS DOUBLE) as price_raw, + CAST(json_extract_scalar(json_parse(json_extract_scalar("order", '$.info')), '$.baseUnitPrice') AS DOUBLE) as base_unit_price_raw, + FROM_HEX(json_extract_scalar("order", '$.refunder')) as refunder, + FROM_HEX(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[1].recipient')) as platform_address, + CAST(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[1].value') AS DOUBLE) as platform_fee_amount_raw, + FROM_HEX(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[2].recipient')) as axie_treasury_address, + CAST(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[2].ratio') AS DOUBLE) as axie_fee_raw, + CAST(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[2].value') AS DOUBLE) as axie_fee_amount_raw, + FROM_HEX(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[3].recipient')) as ronin_treasury_address, + CAST(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[3].ratio') AS DOUBLE) as ronin_fee, + CAST(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[3].value') AS DOUBLE) as ronin_treasury_fee_amount_raw, + FROM_HEX(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[4].recipient')) as creator_royalty_address, + CAST(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[4].ratio') AS DOUBLE) as creator_royalty_fee, + CAST(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[4].value') AS DOUBLE) as creator_royalty_fee_amount_raw, + CAST(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[5].ratio')AS DOUBLE) AS seller_percentage_fee, + CAST(json_extract_scalar(json_parse(cast(concat('[', array_join(receivedAllocs, ','), ']') as varchar)),'$[5].value')AS DOUBLE) AS seller_amount_raw + FROM + {{ source('mavis_marketplace_ronin','MavisMarketPlace_evt_OrderMatched') }} + {% if is_incremental() %} + WHERE {{incremental_predicate('evt_block_time')}} + {% endif %} + ), + +base_trades as ( + + select + 'ronin' as blockchain, + 'mavis market' as project, + 'v1' as project_version, + block_time, + cast(date_trunc('day', block_time) as date) as block_date, + cast(date_trunc('month', block_time) as date) as block_month, + block_number, + nft_contract_address, + nft_token_id, + quantity as nft_amount, + seller, + buyer, + 'buy' as trade_category, + 'secondary' as trade_type, + price_raw, + currency_address as currency_contract, + contract_address as project_contract_address, + tx_hash, + platform_address as platform_fee_address, + platform_fee_amount_raw, + creator_royalty_address as royalty_fee_address, + creator_royalty_fee_amount_raw as royalty_fee_amount_raw, + axie_fee_amount_raw, + ronin_treasury_fee_amount_raw, + evt_index as sub_tx_trade_id + FROM trade_details + ) + +-- this will be removed once tx_from and tx_to are available in the base event tables +{{ add_nft_tx_data('base_trades', 'ronin') }} + + + diff --git a/dbt_subprojects/nft/models/_sector/trades/nft_base_trades.sql b/dbt_subprojects/nft/models/_sector/trades/nft_base_trades.sql index d9d70881f68..5454934eb2e 100644 --- a/dbt_subprojects/nft/models/_sector/trades/nft_base_trades.sql +++ b/dbt_subprojects/nft/models/_sector/trades/nft_base_trades.sql @@ -27,6 +27,7 @@ ,ref('nft_blast_base_trades') ,ref('nft_fantom_base_trades') ,ref('nft_nova_base_trades') + ,ref('nft_ronin_base_trades') ] %} with base_union as ( diff --git a/dbt_subprojects/nft/models/_sector/trades/nft_trades.sql b/dbt_subprojects/nft/models/_sector/trades/nft_trades.sql index d060f52e9f5..ba3ffe325d1 100644 --- a/dbt_subprojects/nft/models/_sector/trades/nft_trades.sql +++ b/dbt_subprojects/nft/models/_sector/trades/nft_trades.sql @@ -2,7 +2,7 @@ schema = 'nft', alias = 'trades', materialized = 'view', - post_hook='{{ expose_spells(\'["ethereum","solana","bnb","optimism","arbitrum","polygon","zksync", "blast"]\', + post_hook='{{ expose_spells(\'["ethereum","solana","bnb","optimism","arbitrum","polygon","zksync", "blast", "ronin", "nova"]\', "sector", "nft", \'["soispoke","0xRob", "hildobby"]\') }}') diff --git a/sources/_sector/nft/_sources.yml b/sources/_sector/nft/_sources.yml index b0169568859..1e82442e5fc 100644 --- a/sources/_sector/nft/_sources.yml +++ b/sources/_sector/nft/_sources.yml @@ -49,3 +49,6 @@ sources: - name: nft_sei tables: - name: transfers + - name: nft_ronin + tables: + - name: transfers diff --git a/sources/_sector/nft/trades/ronin_sources.yml b/sources/_sector/nft/trades/ronin_sources.yml new file mode 100644 index 00000000000..8624efeec01 --- /dev/null +++ b/sources/_sector/nft/trades/ronin_sources.yml @@ -0,0 +1,7 @@ +version: 2 + +sources: + - name: mavis_marketplace_ronin + tables: + - name: MavisMarketPlace_evt_OrderMatched + From 7209efe344e8a5513e6befc1c656fdfa86301416 Mon Sep 17 00:00:00 2001 From: hinus <64959125+cxheng315@users.noreply.github.com> Date: Mon, 30 Dec 2024 17:06:27 +0800 Subject: [PATCH 16/21] feat: add katana v3 dex ronin (#7354) * feat: add katana v3 dex ronin * Update _sources.yml fix source not found * Update katana_v3_ronin_base_trades.sql add line break * merge katana seed file * fix file not found in schema --------- Co-authored-by: 0xRob <83790096+0xRobin@users.noreply.github.com> Co-authored-by: Huang Geyang --- .../dex/models/trades/ronin/_schema.yml | 31 ++++++++++++++++--- .../trades/ronin/dex_ronin_base_trades.sql | 3 +- ...es.sql => katana_v2_ronin_base_trades.sql} | 2 +- .../platforms/katana_v3_ronin_base_trades.sql | 21 +++++++++++++ dbt_subprojects/dex/seeds/trades/_schema.yml | 12 +++---- .../trades/katana_ronin_base_trades_seed.csv | 4 ++- sources/_sector/dex/trades/ronin/_sources.yml | 6 +++- 7 files changed, 64 insertions(+), 15 deletions(-) rename dbt_subprojects/dex/models/trades/ronin/platforms/{katana_ronin_base_trades.sql => katana_v2_ronin_base_trades.sql} (98%) create mode 100644 dbt_subprojects/dex/models/trades/ronin/platforms/katana_v3_ronin_base_trades.sql diff --git a/dbt_subprojects/dex/models/trades/ronin/_schema.yml b/dbt_subprojects/dex/models/trades/ronin/_schema.yml index 9d9035dda64..9402dc644cc 100644 --- a/dbt_subprojects/dex/models/trades/ronin/_schema.yml +++ b/dbt_subprojects/dex/models/trades/ronin/_schema.yml @@ -5,19 +5,40 @@ models: data_tests: - check_dex_info_relationship - - name: katana_ronin_base_trades + - name: katana_v2_ronin_base_trades meta: blockchain: ronin sector: dex project: katana - contributors: jeff-dude + contributors: jeff-dude, cxheng315 config: - tags: [ 'ronin', 'dex', 'trades', 'katana' ] - description: "Katana ronin base trades" + tags: ["ronin", "dex", "trades", "katana"] + description: "Katana v2 ronin base trades" data_tests: - dbt_utils.unique_combination_of_columns: combination_of_columns: - tx_hash - evt_index - check_dex_base_trades_seed: - seed_file: ref('katana_ronin_base_trades_seed') \ No newline at end of file + seed_file: ref('katana_ronin_base_trades_seed') + filter: + version: 2 + + - name: katana_v3_ronin_base_trades + meta: + blockchain: ronin + sector: dex + project: katana + contributors: cxheng315 + config: + tags: ["ronin", "dex", "trades", "katana"] + description: "Katana v3 ronin base trades" + data_tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - tx_hash + - evt_index + - check_dex_base_trades_seed: + seed_file: ref('katana_ronin_base_trades_seed') + filter: + version: 3 diff --git a/dbt_subprojects/dex/models/trades/ronin/dex_ronin_base_trades.sql b/dbt_subprojects/dex/models/trades/ronin/dex_ronin_base_trades.sql index 1cd7eaa3262..108ff7cd73d 100644 --- a/dbt_subprojects/dex/models/trades/ronin/dex_ronin_base_trades.sql +++ b/dbt_subprojects/dex/models/trades/ronin/dex_ronin_base_trades.sql @@ -6,7 +6,8 @@ }} {% set base_models = [ - ref('katana_ronin_base_trades') + ref('katana_v2_ronin_base_trades') + , ref('katana_v3_ronin_base_trades') ] %} WITH base_union AS ( diff --git a/dbt_subprojects/dex/models/trades/ronin/platforms/katana_ronin_base_trades.sql b/dbt_subprojects/dex/models/trades/ronin/platforms/katana_v2_ronin_base_trades.sql similarity index 98% rename from dbt_subprojects/dex/models/trades/ronin/platforms/katana_ronin_base_trades.sql rename to dbt_subprojects/dex/models/trades/ronin/platforms/katana_v2_ronin_base_trades.sql index c2f1d62f8a6..e6a6eeb4997 100644 --- a/dbt_subprojects/dex/models/trades/ronin/platforms/katana_ronin_base_trades.sql +++ b/dbt_subprojects/dex/models/trades/ronin/platforms/katana_v2_ronin_base_trades.sql @@ -1,5 +1,5 @@ {{ config( - schema = 'katana_ronin' + schema = 'katana_v2_ronin' , alias = 'base_trades' , materialized = 'incremental' , file_format = 'delta' diff --git a/dbt_subprojects/dex/models/trades/ronin/platforms/katana_v3_ronin_base_trades.sql b/dbt_subprojects/dex/models/trades/ronin/platforms/katana_v3_ronin_base_trades.sql new file mode 100644 index 00000000000..ad3b9dd5e27 --- /dev/null +++ b/dbt_subprojects/dex/models/trades/ronin/platforms/katana_v3_ronin_base_trades.sql @@ -0,0 +1,21 @@ +{{ + config( + schema = 'katana_v3_ronin' + , alias = 'base_trades' + , materialized = 'incremental' + , file_format = 'delta' + , incremental_strategy = 'merge' + , unique_key = ['tx_hash', 'evt_index'] + , incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')] + ) +}} + +{{ + uniswap_compatible_v3_trades( + blockchain = 'ronin' + , project = 'katana' + , version = '3' + , Pair_evt_Swap = source('katana_dex_ronin', 'KatanaV3Pool_evt_Swap') + , Factory_evt_PoolCreated = source('katana_dex_ronin', 'KatanaV3Factory_evt_PoolCreated') + ) +}} diff --git a/dbt_subprojects/dex/seeds/trades/_schema.yml b/dbt_subprojects/dex/seeds/trades/_schema.yml index da4c398563d..dd32d6da28d 100644 --- a/dbt_subprojects/dex/seeds/trades/_schema.yml +++ b/dbt_subprojects/dex/seeds/trades/_schema.yml @@ -4454,7 +4454,7 @@ seeds: token_bought_amount_raw: uint256 token_sold_amount_raw: uint256 block_date: timestamp - + - name: infusion_base_base_trades_seed config: column_types: @@ -4514,7 +4514,7 @@ seeds: token_bought_amount_raw: uint256 token_sold_amount_raw: uint256 block_date: timestamp - + - name: akronswap_base_base_trades_seed config: column_types: @@ -4529,7 +4529,7 @@ seeds: token_bought_amount_raw: uint256 token_sold_amount_raw: uint256 block_date: timestamp - + - name: katana_ronin_base_trades_seed config: column_types: @@ -4559,7 +4559,7 @@ seeds: token_bought_amount_raw: uint256 token_sold_amount_raw: uint256 block_date: timestamp - + - name: elk_finance_gnosis_base_trades_seed config: column_types: @@ -4574,7 +4574,7 @@ seeds: token_bought_amount_raw: uint256 token_sold_amount_raw: uint256 block_date: timestamp - + - name: levinswap_gnosis_base_trades_seed config: column_types: @@ -4604,7 +4604,7 @@ seeds: token_bought_amount_raw: uint256 token_sold_amount_raw: uint256 block_date: timestamp - + - name: fluid_ethereum_base_trades_seed config: column_types: diff --git a/dbt_subprojects/dex/seeds/trades/katana_ronin_base_trades_seed.csv b/dbt_subprojects/dex/seeds/trades/katana_ronin_base_trades_seed.csv index d8a0d2f8ea0..a34825a4783 100644 --- a/dbt_subprojects/dex/seeds/trades/katana_ronin_base_trades_seed.csv +++ b/dbt_subprojects/dex/seeds/trades/katana_ronin_base_trades_seed.csv @@ -1,3 +1,5 @@ blockchain,project,version,block_date,tx_hash,evt_index,token_bought_address,token_sold_address,block_number,token_bought_amount_raw,token_sold_amount_raw ronin,katana,2,2024-01-17,0xca2c3b5d6aec890d5bfe1fb8616036a01b702948107fdb4a243453cfe5a6d86a,10,0x1b918543b518e34902e1e8dd76052bee43c762ff,0xe514d9deb7966c8be0ca922de8a064264ea6bcd4,31230074,12492104858888467232497,5109345881300390132 -ronin,katana,2,2023-03-01,0xcab674e07e3c5b0b6dd53b52971edabc929a2fd907b85d781f70bac74767c6e3,10,0xc99a6a985ed2cac1ef41640596c5a5f9f4e19ef5,0xe514d9deb7966c8be0ca922de8a064264ea6bcd4,22465731,1700000000000000,3070678253641756888 \ No newline at end of file +ronin,katana,2,2023-03-01,0xcab674e07e3c5b0b6dd53b52971edabc929a2fd907b85d781f70bac74767c6e3,10,0xc99a6a985ed2cac1ef41640596c5a5f9f4e19ef5,0xe514d9deb7966c8be0ca922de8a064264ea6bcd4,22465731,1700000000000000,3070678253641756888 +ronin,katana,3,2024-12-19,0x92f922acbb1a4a80b2ad56d8b6ce2cc587f2851fac7b3e37582f7578db55ee4d,160,0xc6046fa4b8961b0e9d823bb3f2dde8fe161d547d,0xe514d9deb7966c8be0ca922de8a064264ea6bcd4,40907478,234401580938417717096,26553212520000000000 +ronin,katana,3,2024-12-19,0x340763e80131db74ce992733518944ad35d1290aaae53f5eeacaeb994057f49e,39,0xe514d9deb7966c8be0ca922de8a064264ea6bcd4,0x0b7007c13325c48911f73a2dad5fa5dcbf808adc,40908371,141505036347788395809,300000000 diff --git a/sources/_sector/dex/trades/ronin/_sources.yml b/sources/_sector/dex/trades/ronin/_sources.yml index 8c61432710f..4e40c27221e 100644 --- a/sources/_sector/dex/trades/ronin/_sources.yml +++ b/sources/_sector/dex/trades/ronin/_sources.yml @@ -4,4 +4,8 @@ sources: - name: katana_dex_ronin tables: - name: KatanaPair_evt_Swap - - name: KatanaFactory_evt_PairCreated \ No newline at end of file + - name: KatanaFactory_evt_PairCreated + - name: katana_dex_ronin + tables: + - name: KatanaV3Pool_evt_Swap + - name: KatanaV3Factory_evt_PoolCreated From a1dc23d9f8b518c314c3693a500ea09b15e2af27 Mon Sep 17 00:00:00 2001 From: Patel Princi Date: Mon, 30 Dec 2024 14:36:46 +0530 Subject: [PATCH 17/21] Added Bridgers dex on optimism chain (#7358) * Saddle file added in sql * files added for saddle finance * removed filter version and some of the unwanted unique keys * adding bridgers code * adding code of birdgers optimism * change the data in seed file * change the data in seed file --- dbt_subprojects/dex/models/dex_info.sql | 1 + .../dex/models/trades/optimism/_schema.yml | 17 +++++++ .../optimism/dex_optimism_base_trades.sql | 1 + .../bridgers_optimism_base_trades.sql | 50 +++++++++++++++++++ dbt_subprojects/dex/seeds/trades/_schema.yml | 15 ++++++ .../bridgers_optimism_base_trades_seed.csv | 2 + .../_sector/dex/trades/optimism/_sources.yml | 3 ++ 7 files changed, 89 insertions(+) create mode 100644 dbt_subprojects/dex/models/trades/optimism/platforms/bridgers_optimism_base_trades.sql create mode 100644 dbt_subprojects/dex/seeds/trades/bridgers_optimism_base_trades_seed.csv diff --git a/dbt_subprojects/dex/models/dex_info.sql b/dbt_subprojects/dex/models/dex_info.sql index ef08d06f0b5..8f68ddf7469 100644 --- a/dbt_subprojects/dex/models/dex_info.sql +++ b/dbt_subprojects/dex/models/dex_info.sql @@ -192,6 +192,7 @@ FROM (VALUES , ('saddle_finance', 'Saddle Finance', 'Direct', 'saddlefinance') , ('katana', 'Katana', 'Direct', 'AxieInfinity') , ('jetswap', 'JetSwap', 'Direct', 'Jetfuelfinance') + , ('bridgers', 'Bridgers', 'Direct', 'Bridgersxyz') , ('levinswap', 'Levinswap', 'Direct', 'levinswap') , ('gravity_finance', 'GravityFinance', 'Direct', 'Gravity_Finance') , ('fluid', 'Fluid DEX', 'Direct', '0xfluid') diff --git a/dbt_subprojects/dex/models/trades/optimism/_schema.yml b/dbt_subprojects/dex/models/trades/optimism/_schema.yml index 95626994551..de83c8b4136 100644 --- a/dbt_subprojects/dex/models/trades/optimism/_schema.yml +++ b/dbt_subprojects/dex/models/trades/optimism/_schema.yml @@ -585,3 +585,20 @@ models: - evt_index - check_dex_base_trades_seed: seed_file: ref('saddle_finance_optimism_base_trades_seed') + + - name: bridgers_optimism_base_trades + meta: + blockchain: optimism + sector: dex + project: bridgers + contributors: princi + config: + tags: [ 'optimism', 'dex', 'trades', 'bridgers'] + description: "bridgers optimism base trades" + data_tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - tx_hash + - evt_index + - check_dex_base_trades_seed: + seed_file: ref('bridgers_optimism_base_trades_seed') \ No newline at end of file diff --git a/dbt_subprojects/dex/models/trades/optimism/dex_optimism_base_trades.sql b/dbt_subprojects/dex/models/trades/optimism/dex_optimism_base_trades.sql index 72bea48676f..65342178024 100644 --- a/dbt_subprojects/dex/models/trades/optimism/dex_optimism_base_trades.sql +++ b/dbt_subprojects/dex/models/trades/optimism/dex_optimism_base_trades.sql @@ -36,6 +36,7 @@ , ref('fraxswap_optimism_base_trades') , ref('swaap_v2_optimism_base_trades') , ref('saddle_finance_optimism_base_trades') + , ref('bridgers_optimism_base_trades') ] %} WITH base_union AS ( diff --git a/dbt_subprojects/dex/models/trades/optimism/platforms/bridgers_optimism_base_trades.sql b/dbt_subprojects/dex/models/trades/optimism/platforms/bridgers_optimism_base_trades.sql new file mode 100644 index 00000000000..d5a8668a166 --- /dev/null +++ b/dbt_subprojects/dex/models/trades/optimism/platforms/bridgers_optimism_base_trades.sql @@ -0,0 +1,50 @@ +{{ config( + schema = 'bridgers_optimism', + alias = 'base_trades', + partition_by = ['block_month'], + materialized = 'incremental', + file_format = 'delta', + incremental_strategy = 'merge', + unique_key = ['tx_hash', 'evt_index'] +) }} + +WITH token_swaps AS ( + SELECT + evt_block_number AS block_number, + CAST(evt_block_time AS timestamp(3) with time zone) AS block_time, + evt_tx_from AS maker, + evt_tx_to AS taker, + fromAmount AS token_sold_amount_raw, + minReturnAmount AS token_bought_amount_raw, + CAST(sender AS varbinary) AS token_sold_address, + CAST(destination AS varbinary) AS token_bought_address, + CAST(contract_address AS varbinary) AS project_contract_address, + evt_tx_hash AS tx_hash, + evt_index AS evt_index + FROM + {{ source('bridgers_optimism', 'Bridgers_evt_Swap') }} + {% if is_incremental() %} + WHERE + {{ incremental_predicate('evt_block_time') }} + {% endif %} +) + +SELECT + 'optimism' AS blockchain, + 'bridgers' AS project, + '1' AS version, + CAST(date_trunc('month', token_swaps.block_time) AS date) AS block_month, + CAST(date_trunc('day', token_swaps.block_time) AS date) AS block_date, + token_swaps.block_time, + token_swaps.block_number, + token_swaps.token_sold_amount_raw, + token_swaps.token_bought_amount_raw, + token_swaps.token_sold_address, + token_swaps.token_bought_address, + token_swaps.maker, + token_swaps.taker, + token_swaps.project_contract_address, + token_swaps.tx_hash, + token_swaps.evt_index +FROM + token_swaps diff --git a/dbt_subprojects/dex/seeds/trades/_schema.yml b/dbt_subprojects/dex/seeds/trades/_schema.yml index dd32d6da28d..8ace02b89cd 100644 --- a/dbt_subprojects/dex/seeds/trades/_schema.yml +++ b/dbt_subprojects/dex/seeds/trades/_schema.yml @@ -4561,6 +4561,21 @@ seeds: block_date: timestamp - name: elk_finance_gnosis_base_trades_seed + config: + column_types: + blockchain: varchar + project: varchar + version: varchar + tx_hash: varbinary + evt_index: uint256 + block_number: uint256 + token_bought_address: varbinary + token_sold_address: varbinary + token_bought_amount_raw: uint256 + token_sold_amount_raw: uint256 + block_date: timestamp + + - name: bridgers_optimism_base_trades_seed config: column_types: blockchain: varchar diff --git a/dbt_subprojects/dex/seeds/trades/bridgers_optimism_base_trades_seed.csv b/dbt_subprojects/dex/seeds/trades/bridgers_optimism_base_trades_seed.csv new file mode 100644 index 00000000000..abf59da46e0 --- /dev/null +++ b/dbt_subprojects/dex/seeds/trades/bridgers_optimism_base_trades_seed.csv @@ -0,0 +1,2 @@ +blockchain,project,version,block_month,block_date,block_time,block_number,token_sold_amount_raw,token_bought_amount_raw,token_sold_address,token_bought_address,maker,taker,project_contract_address,tx_hash,evt_index +optimism,birdgers,1,2024-12-01 00:00,2024-12-19 00:00,2024-12-19 21:03,129521708,9447540,9335061,0x96985c5786b86cd8108313a9e3adb9d657164746,0x5551443863617577424555435056776a3173704e5268775a4b7562584d76432d527448727042724e7659495047767639,0xc7b2e791ee0491c8df611d5ccfd87b17a0cb9897,0xf956d9fa19656d8e5219fd6fa8ba6cb198094138,0xb685760ebd368a891f27ae547391f4e2a289895b,0x6e926a4373216290e37f83947a0fa32b836c51c2c152847df6e81f74b813946d,188 diff --git a/sources/_sector/dex/trades/optimism/_sources.yml b/sources/_sector/dex/trades/optimism/_sources.yml index 3aa47f8f5cf..4d723797c87 100644 --- a/sources/_sector/dex/trades/optimism/_sources.yml +++ b/sources/_sector/dex/trades/optimism/_sources.yml @@ -98,3 +98,6 @@ sources: - name: saddle_finance_optimism tables: - name: SwapFlashLoan_evt_TokenSwap + - name: bridgers_optimism + tables: + - name: Bridgers_evt_Swap From 24022d6f7b97694dd09619e213264ae992620246 Mon Sep 17 00:00:00 2001 From: alexshchur <60445720+alexshchur@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:06:56 +0200 Subject: [PATCH 18/21] feat: expose paraswap v6 decoded trades (#7359) * feat: expose paraswap v6 decoded trades * chore: new, more verbose format for exposing spells * re-trigger build * try normalizing to lowercase * Revert "try normalizing to lowercase" This reverts commit 8a0a0d6aaec81c5263a68bffda86b6ff78ae547f. * Revert "chore: new, more verbose format for exposing spells" This reverts commit 36cb7b5c9c4fc399e91bfcbdf43b19195073c04d. * Revert "Revert "chore: new, more verbose format for exposing spells"" This reverts commit bbca1158ab43fc332a81a0a92b55b5f371f0faef. --- .../arbitrum/paraswap_v6_arbitrum_trades_decoded.sql | 7 ++++++- .../avalanche_c/paraswap_v6_avalanche_c_trades_decoded.sql | 6 +++++- .../paraswap/base/paraswap_v6_base_trades_decoded.sql | 6 +++++- .../paraswap/bnb/paraswap_v6_bnb_trades_decoded.sql | 6 +++++- .../ethereum/paraswap_v6_ethereum_trades_decoded.sql | 6 +++++- .../paraswap/fantom/paraswap_v6_fantom_trades_decoded.sql | 6 +++++- .../optimism/paraswap_v6_optimism_trades_decoded.sql | 6 +++++- .../polygon/paraswap_v6_polygon_trades_decoded.sql | 6 +++++- 8 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dbt_subprojects/dex/models/_projects/paraswap/arbitrum/paraswap_v6_arbitrum_trades_decoded.sql b/dbt_subprojects/dex/models/_projects/paraswap/arbitrum/paraswap_v6_arbitrum_trades_decoded.sql index 502fc389f43..1024152f7ff 100644 --- a/dbt_subprojects/dex/models/_projects/paraswap/arbitrum/paraswap_v6_arbitrum_trades_decoded.sql +++ b/dbt_subprojects/dex/models/_projects/paraswap/arbitrum/paraswap_v6_arbitrum_trades_decoded.sql @@ -6,8 +6,13 @@ file_format = 'delta', incremental_strategy = 'merge', incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.blockTime')], - unique_key = ['call_tx_hash', 'method', 'call_trace_address'] + unique_key = ['call_tx_hash', 'method', 'call_trace_address'], + post_hook='{{ expose_spells(blockchains = \'["arbitrum"]\', + spell_type = "project", + spell_name = "paraswap_v6", + contributors = \'["eptighte", "mwamedacen"]\') }}' ) + }} {{ paraswap_v6_trades_master('arbitrum', 'paraswap') }} \ No newline at end of file diff --git a/dbt_subprojects/dex/models/_projects/paraswap/avalanche_c/paraswap_v6_avalanche_c_trades_decoded.sql b/dbt_subprojects/dex/models/_projects/paraswap/avalanche_c/paraswap_v6_avalanche_c_trades_decoded.sql index 8115c77340e..01ff942135a 100644 --- a/dbt_subprojects/dex/models/_projects/paraswap/avalanche_c/paraswap_v6_avalanche_c_trades_decoded.sql +++ b/dbt_subprojects/dex/models/_projects/paraswap/avalanche_c/paraswap_v6_avalanche_c_trades_decoded.sql @@ -6,7 +6,11 @@ file_format = 'delta', incremental_strategy = 'merge', incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.blockTime')], - unique_key = ['call_tx_hash', 'method', 'call_trace_address'] + unique_key = ['call_tx_hash', 'method', 'call_trace_address'], + post_hook='{{ expose_spells(blockchains = \'["avalanche_c"]\', + spell_type = "project", + spell_name = "paraswap_v6", + contributors = \'["eptighte", "mwamedacen"]\') }}' ) }} diff --git a/dbt_subprojects/dex/models/_projects/paraswap/base/paraswap_v6_base_trades_decoded.sql b/dbt_subprojects/dex/models/_projects/paraswap/base/paraswap_v6_base_trades_decoded.sql index f8d2ea8f24b..3029cf2c40b 100644 --- a/dbt_subprojects/dex/models/_projects/paraswap/base/paraswap_v6_base_trades_decoded.sql +++ b/dbt_subprojects/dex/models/_projects/paraswap/base/paraswap_v6_base_trades_decoded.sql @@ -6,7 +6,11 @@ file_format = 'delta', incremental_strategy = 'merge', incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.blockTime')], - unique_key = ['call_tx_hash', 'method', 'call_trace_address'] + unique_key = ['call_tx_hash', 'method', 'call_trace_address'], + post_hook='{{ expose_spells(blockchains = \'["base"]\', + spell_type = "project", + spell_name = "paraswap_v6", + contributors = \'["eptighte", "mwamedacen"]\') }}' ) }} diff --git a/dbt_subprojects/dex/models/_projects/paraswap/bnb/paraswap_v6_bnb_trades_decoded.sql b/dbt_subprojects/dex/models/_projects/paraswap/bnb/paraswap_v6_bnb_trades_decoded.sql index 594d41c2743..257c866aa86 100644 --- a/dbt_subprojects/dex/models/_projects/paraswap/bnb/paraswap_v6_bnb_trades_decoded.sql +++ b/dbt_subprojects/dex/models/_projects/paraswap/bnb/paraswap_v6_bnb_trades_decoded.sql @@ -6,7 +6,11 @@ file_format = 'delta', incremental_strategy = 'merge', incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.blockTime')], - unique_key = ['call_tx_hash', 'method', 'call_trace_address'] + unique_key = ['call_tx_hash', 'method', 'call_trace_address'], + post_hook='{{ expose_spells(blockchains = \'["bnb"]\', + spell_type = "project", + spell_name = "paraswap_v6", + contributors = \'["eptighte", "mwamedacen"]\') }}' ) }} diff --git a/dbt_subprojects/dex/models/_projects/paraswap/ethereum/paraswap_v6_ethereum_trades_decoded.sql b/dbt_subprojects/dex/models/_projects/paraswap/ethereum/paraswap_v6_ethereum_trades_decoded.sql index eb2a0849ccc..a36e1034c9d 100644 --- a/dbt_subprojects/dex/models/_projects/paraswap/ethereum/paraswap_v6_ethereum_trades_decoded.sql +++ b/dbt_subprojects/dex/models/_projects/paraswap/ethereum/paraswap_v6_ethereum_trades_decoded.sql @@ -6,7 +6,11 @@ file_format = 'delta', incremental_strategy = 'merge', incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.blockTime')], - unique_key = ['call_tx_hash', 'method', 'call_trace_address'] + unique_key = ['call_tx_hash', 'method', 'call_trace_address'], + post_hook='{{ expose_spells(blockchains = \'["ethereum"]\', + spell_type = "project", + spell_name = "paraswap_v6", + contributors = \'["eptighte", "mwamedacen"]\') }}' ) }} diff --git a/dbt_subprojects/dex/models/_projects/paraswap/fantom/paraswap_v6_fantom_trades_decoded.sql b/dbt_subprojects/dex/models/_projects/paraswap/fantom/paraswap_v6_fantom_trades_decoded.sql index ef3047c2ff0..796f9333021 100644 --- a/dbt_subprojects/dex/models/_projects/paraswap/fantom/paraswap_v6_fantom_trades_decoded.sql +++ b/dbt_subprojects/dex/models/_projects/paraswap/fantom/paraswap_v6_fantom_trades_decoded.sql @@ -6,7 +6,11 @@ file_format = 'delta', incremental_strategy = 'merge', incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.blockTime')], - unique_key = ['call_tx_hash', 'method', 'call_trace_address'] + unique_key = ['call_tx_hash', 'method', 'call_trace_address'], + post_hook='{{ expose_spells(blockchains = \'["fantom"]\', + spell_type = "project", + spell_name = "paraswap_v6", + contributors = \'["eptighte", "mwamedacen"]\') }}' ) }} diff --git a/dbt_subprojects/dex/models/_projects/paraswap/optimism/paraswap_v6_optimism_trades_decoded.sql b/dbt_subprojects/dex/models/_projects/paraswap/optimism/paraswap_v6_optimism_trades_decoded.sql index f9fec8cccdb..e5b7223726d 100644 --- a/dbt_subprojects/dex/models/_projects/paraswap/optimism/paraswap_v6_optimism_trades_decoded.sql +++ b/dbt_subprojects/dex/models/_projects/paraswap/optimism/paraswap_v6_optimism_trades_decoded.sql @@ -6,7 +6,11 @@ file_format = 'delta', incremental_strategy = 'merge', incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.blockTime')], - unique_key = ['call_tx_hash', 'method', 'call_trace_address'] + unique_key = ['call_tx_hash', 'method', 'call_trace_address'], + post_hook='{{ expose_spells(blockchains = \'["optimism"]\', + spell_type = "project", + spell_name = "paraswap_v6", + contributors = \'["eptighte", "mwamedacen"]\') }}' ) }} diff --git a/dbt_subprojects/dex/models/_projects/paraswap/polygon/paraswap_v6_polygon_trades_decoded.sql b/dbt_subprojects/dex/models/_projects/paraswap/polygon/paraswap_v6_polygon_trades_decoded.sql index ee56d154a6b..6672db00e66 100644 --- a/dbt_subprojects/dex/models/_projects/paraswap/polygon/paraswap_v6_polygon_trades_decoded.sql +++ b/dbt_subprojects/dex/models/_projects/paraswap/polygon/paraswap_v6_polygon_trades_decoded.sql @@ -6,7 +6,11 @@ file_format = 'delta', incremental_strategy = 'merge', incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.blockTime')], - unique_key = ['call_tx_hash', 'method', 'call_trace_address'] + unique_key = ['call_tx_hash', 'method', 'call_trace_address'], + post_hook='{{ expose_spells(blockchains = \'["polygon"]\', + spell_type = "project", + spell_name = "paraswap_v6", + contributors = \'["eptighte", "mwamedacen"]\') }}' ) }} From b4d48b54b5a7e724314339ac7fd1cc0347c67336 Mon Sep 17 00:00:00 2001 From: tomfutago <35136350+tomfutago@users.noreply.github.com> Date: Mon, 30 Dec 2024 09:38:15 +0000 Subject: [PATCH 19/21] Aave v2/v3 `lending.supply` macro fix - add WrappedTokenGateway lookup (#7365) * fix: add WrappedTokenGateway lookup * fix: apply only to aave --- .../lending_aave_compatible_supply.sql | 91 ++++++++++++++----- .../aave_lido_v3_ethereum_base_supply.sql | 3 +- .../lending/supply/arbitrum/_sources.yml | 1 + .../lending/supply/avalanche_c/_sources.yml | 2 + .../_sector/lending/supply/base/_sources.yml | 1 + .../_sector/lending/supply/bnb/_sources.yml | 1 + .../lending/supply/ethereum/_sources.yml | 4 + .../lending/supply/fantom/_sources.yml | 1 + .../lending/supply/gnosis/_sources.yml | 1 + .../lending/supply/optimism/_sources.yml | 1 + .../lending/supply/polygon/_sources.yml | 2 + .../lending/supply/scroll/_sources.yml | 1 + 12 files changed, 85 insertions(+), 24 deletions(-) diff --git a/dbt_subprojects/hourly_spellbook/macros/sector/lending/lending_aave_compatible_supply.sql b/dbt_subprojects/hourly_spellbook/macros/sector/lending/lending_aave_compatible_supply.sql index 5320cf668bc..ab042cd9c11 100644 --- a/dbt_subprojects/hourly_spellbook/macros/sector/lending/lending_aave_compatible_supply.sql +++ b/dbt_subprojects/hourly_spellbook/macros/sector/lending/lending_aave_compatible_supply.sql @@ -141,6 +141,16 @@ src_LendingPool_evt_Withdraw as ( {% endif %} ), +{% if 'aave' in project %} +src_WrappedTokenGatewayV2_call_withdrawETH as ( + select * + from {{ source(project_decoded_as ~ '_' ~ blockchain, 'WrappedTokenGatewayV2_call_withdrawETH') }} + {% if is_incremental() %} + where {{ incremental_predicate('call_block_time') }} + {% endif %} +), +{% endif %} + src_LendingPool_evt_LiquidationCall as ( select * from {{ source(project_decoded_as ~ '_' ~ blockchain, 'LendingPool_evt_LiquidationCall') }} @@ -167,18 +177,30 @@ base_supply as ( union all select 'withdraw' as transaction_type, - reserve as token_address, - user as depositor, - cast(null as varbinary) as on_behalf_of, - to as withdrawn_to, + w.reserve as token_address, + w.user as depositor, + {% if 'aave' in project %} + cast(wrap.to as varbinary) + {% else %} + cast(null as varbinary) + {% endif %} as on_behalf_of, + w.to as withdrawn_to, cast(null as varbinary) as liquidator, - -1 * cast(amount as double) as amount, - contract_address, - evt_tx_hash, - evt_index, - evt_block_time, - evt_block_number - from src_LendingPool_evt_Withdraw + -1 * cast(w.amount as double) as amount, + w.contract_address, + w.evt_tx_hash, + w.evt_index, + w.evt_block_time, + w.evt_block_number + from src_LendingPool_evt_Withdraw w + {% if 'aave' in project %} + left join src_WrappedTokenGatewayV2_call_withdrawETH wrap + on w.evt_block_number = wrap.call_block_number + and w.evt_tx_hash = wrap.call_tx_hash + and w.to = wrap.contract_address + and w.amount = wrap.amount + and wrap.call_success + {% endif %} union all select 'deposit_liquidation' as transaction_type, @@ -225,7 +247,8 @@ from base_supply project, version, project_decoded_as = 'aave_v3', - decoded_contract_name = 'Pool' + decoded_contract_name = 'Pool', + decoded_wrapped_token_gateway_name = 'WrappedTokenGatewayV3' ) %} @@ -247,6 +270,16 @@ src_LendingPool_evt_Withdraw as ( {% endif %} ), +{% if 'aave' in project %} +src_WrappedTokenGatewayV3_call_withdrawETH as ( + select * + from {{ source(project_decoded_as ~ '_' ~ blockchain, decoded_wrapped_token_gateway_name ~ '_call_withdrawETH') }} + {% if is_incremental() %} + where {{ incremental_predicate('call_block_time') }} + {% endif %} +), +{% endif %} + src_LendingPool_evt_Repay as ( select * from {{ source(project_decoded_as ~ '_' ~ blockchain, decoded_contract_name ~ '_evt_Repay') }} @@ -282,18 +315,30 @@ base_supply as ( union all select 'withdraw' as transaction_type, - reserve as token_address, - user as depositor, - cast(null as varbinary) as on_behalf_of, - to as withdrawn_to, + w.reserve as token_address, + w.user as depositor, + {% if 'aave' in project %} + cast(wrap.to as varbinary) + {% else %} + cast(null as varbinary) + {% endif %} as on_behalf_of, + w.to as withdrawn_to, cast(null as varbinary) as liquidator, - -1 * cast(amount as double) as amount, - contract_address, - evt_tx_hash, - evt_index, - evt_block_time, - evt_block_number - from src_LendingPool_evt_Withdraw + -1 * cast(w.amount as double) as amount, + w.contract_address, + w.evt_tx_hash, + w.evt_index, + w.evt_block_time, + w.evt_block_number + from src_LendingPool_evt_Withdraw w + {% if 'aave' in project %} + left join src_WrappedTokenGatewayV3_call_withdrawETH wrap + on w.evt_block_number = wrap.call_block_number + and w.evt_tx_hash = wrap.call_tx_hash + and w.to = wrap.contract_address + and w.amount = wrap.amount + and wrap.call_success + {% endif %} union all select 'repay_with_atokens' as transaction_type, diff --git a/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/ethereum/platforms/aave_lido_v3_ethereum_base_supply.sql b/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/ethereum/platforms/aave_lido_v3_ethereum_base_supply.sql index 2d19eebd8c1..4e30a0cd6a6 100644 --- a/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/ethereum/platforms/aave_lido_v3_ethereum_base_supply.sql +++ b/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/ethereum/platforms/aave_lido_v3_ethereum_base_supply.sql @@ -15,6 +15,7 @@ blockchain = 'ethereum', project = 'aave_lido', version = '3', - decoded_contract_name = 'LidoPool' + decoded_contract_name = 'LidoPool', + decoded_wrapped_token_gateway_name = 'LidoWrappedTokenGatewayV3' ) }} diff --git a/sources/_sector/lending/supply/arbitrum/_sources.yml b/sources/_sector/lending/supply/arbitrum/_sources.yml index 2e2ec7b3576..4cd48c2588d 100644 --- a/sources/_sector/lending/supply/arbitrum/_sources.yml +++ b/sources/_sector/lending/supply/arbitrum/_sources.yml @@ -5,6 +5,7 @@ sources: tables: - name: L2Pool_evt_Supply - name: L2Pool_evt_Withdraw + - name: WrappedTokenGatewayV3_call_withdrawETH - name: compound_v3_arbitrum tables: diff --git a/sources/_sector/lending/supply/avalanche_c/_sources.yml b/sources/_sector/lending/supply/avalanche_c/_sources.yml index 6704f977d09..9a600dbfab2 100644 --- a/sources/_sector/lending/supply/avalanche_c/_sources.yml +++ b/sources/_sector/lending/supply/avalanche_c/_sources.yml @@ -6,12 +6,14 @@ sources: - name: LendingPool_evt_Deposit - name: LendingPool_evt_Withdraw - name: LendingPool_evt_RedeemUnderlying + - name: WrappedTokenGatewayV2_call_withdrawETH - name: aave_v3_avalanche_c tables: - name: Pool_evt_Supply - name: Pool_evt_Withdraw - name: Pool_evt_RedeemUnderlying + - name: WrappedTokenGatewayV3_call_withdrawETH - name: benqi_finance_avalanche_c tables: diff --git a/sources/_sector/lending/supply/base/_sources.yml b/sources/_sector/lending/supply/base/_sources.yml index 93a23a0e7cb..0fe93a08384 100644 --- a/sources/_sector/lending/supply/base/_sources.yml +++ b/sources/_sector/lending/supply/base/_sources.yml @@ -6,6 +6,7 @@ sources: - name: L2Pool_evt_Supply - name: L2Pool_evt_Withdraw - name: L2Pool_evt_RedeemUnderlying + - name: WrappedTokenGatewayV3_call_withdrawETH - name: compound_v3_base tables: diff --git a/sources/_sector/lending/supply/bnb/_sources.yml b/sources/_sector/lending/supply/bnb/_sources.yml index 112c7e1b820..0fdc926b6d5 100644 --- a/sources/_sector/lending/supply/bnb/_sources.yml +++ b/sources/_sector/lending/supply/bnb/_sources.yml @@ -10,6 +10,7 @@ sources: tables: - name: Pool_evt_Supply - name: Pool_evt_Withdraw + - name: WrappedTokenGatewayV3_call_withdrawETH - name: the_granary_bnb tables: diff --git a/sources/_sector/lending/supply/ethereum/_sources.yml b/sources/_sector/lending/supply/ethereum/_sources.yml index bc4108ff420..ff1a916f458 100644 --- a/sources/_sector/lending/supply/ethereum/_sources.yml +++ b/sources/_sector/lending/supply/ethereum/_sources.yml @@ -11,21 +11,25 @@ sources: tables: - name: LendingPool_evt_Deposit - name: LendingPool_evt_Withdraw + - name: WrappedTokenGatewayV2_call_withdrawETH - name: aave_v3_ethereum tables: - name: Pool_evt_Supply - name: Pool_evt_Withdraw - name: Pool_evt_ReserveDataUpdated + - name: WrappedTokenGatewayV3_call_withdrawETH - name: LidoPool_evt_Supply - name: LidoPool_evt_Withdraw - name: LidoPool_evt_ReserveDataUpdated + - name: LidoWrappedTokenGatewayV3_call_withdrawETH - name: aave_v3_etherfi_ethereum tables: - name: PoolInstance_evt_Supply - name: PoolInstance_evt_Withdraw - name: PoolInstance_evt_ReserveDataUpdated + - name: WrappedTokenGatewayV3_call_withdrawETH - name: compound_v2_ethereum tables: diff --git a/sources/_sector/lending/supply/fantom/_sources.yml b/sources/_sector/lending/supply/fantom/_sources.yml index 24027641a58..bcd7da0b21e 100644 --- a/sources/_sector/lending/supply/fantom/_sources.yml +++ b/sources/_sector/lending/supply/fantom/_sources.yml @@ -6,6 +6,7 @@ sources: - name: Pool_evt_Supply - name: Pool_evt_Withdraw - name: Pool_evt_RedeemUnderlying + - name: WrappedTokenGatewayV3_call_withdrawETH - name: the_granary_fantom tables: diff --git a/sources/_sector/lending/supply/gnosis/_sources.yml b/sources/_sector/lending/supply/gnosis/_sources.yml index fe0319ee20d..54652218d9d 100644 --- a/sources/_sector/lending/supply/gnosis/_sources.yml +++ b/sources/_sector/lending/supply/gnosis/_sources.yml @@ -10,6 +10,7 @@ sources: tables: - name: Pool_evt_Supply - name: Pool_evt_Withdraw + - name: WrappedTokenGatewayV3_call_withdrawETH - name: real_rmm_v1_gnosis tables: diff --git a/sources/_sector/lending/supply/optimism/_sources.yml b/sources/_sector/lending/supply/optimism/_sources.yml index 4e90f45f3c7..3531ec489cb 100644 --- a/sources/_sector/lending/supply/optimism/_sources.yml +++ b/sources/_sector/lending/supply/optimism/_sources.yml @@ -6,6 +6,7 @@ sources: - name: Pool_evt_Supply - name: Pool_evt_Withdraw - name: Pool_evt_RedeemUnderlying + - name: WrappedTokenGatewayV3_call_withdrawETH - name: sonne_finance_optimism tables: diff --git a/sources/_sector/lending/supply/polygon/_sources.yml b/sources/_sector/lending/supply/polygon/_sources.yml index dc3812322c7..08f15c4112d 100644 --- a/sources/_sector/lending/supply/polygon/_sources.yml +++ b/sources/_sector/lending/supply/polygon/_sources.yml @@ -6,12 +6,14 @@ sources: - name: LendingPool_evt_Deposit - name: LendingPool_evt_Withdraw - name: LendingPool_evt_RedeemUnderlying + - name: WrappedTokenGatewayV2_call_withdrawETH - name: aave_v3_polygon tables: - name: Pool_evt_Supply - name: Pool_evt_Withdraw - name: Pool_evt_RedeemUnderlying + - name: WrappedTokenGatewayV3_call_withdrawETH - name: compound_v3_polygon tables: diff --git a/sources/_sector/lending/supply/scroll/_sources.yml b/sources/_sector/lending/supply/scroll/_sources.yml index 297f65da6b7..967e06b6d80 100644 --- a/sources/_sector/lending/supply/scroll/_sources.yml +++ b/sources/_sector/lending/supply/scroll/_sources.yml @@ -5,6 +5,7 @@ sources: tables: - name: L2Pool_evt_Supply - name: L2Pool_evt_Withdraw + - name: WrappedTokenGatewayV3_call_withdrawETH - name: layer_bank_scroll tables: From ec0fee139b45f2d510be266eb466a13edbebefba Mon Sep 17 00:00:00 2001 From: tomfutago <35136350+tomfutago@users.noreply.github.com> Date: Mon, 30 Dec 2024 09:38:20 +0000 Subject: [PATCH 20/21] Add Aave v3 to lending sector for zkSync (#7366) * feat: add aave v3 to lending sector * fix: seed schema indentation * fix: update seed files --------- Co-authored-by: Huang Geyang --- .../_sector/lending/borrow/zksync/_schema.yml | 36 ++++++++++++++++ .../zksync/lending_zksync_base_borrow.sql | 3 +- .../platforms/aave_v3_zksync_base_borrow.sql | 19 +++++++++ .../_sector/lending/flashloans/_schema.yml | 35 +++++++++++++++- .../zksync/lending_zksync_base_flashloans.sql | 3 +- .../aave_v3_zksync_base_flashloans.sql | 19 +++++++++ .../_sector/lending/supply/zksync/_schema.yml | 36 ++++++++++++++++ .../zksync/lending_zksync_base_supply.sql | 3 +- .../platforms/aave_v3_zksync_base_supply.sql | 19 +++++++++ .../seeds/_sector/lending/_schema.yml | 41 +++++++++++++++++++ .../lending/aave_zksync_base_borrow_seed.csv | 4 ++ .../aave_zksync_base_flashloans_seed.csv | 4 ++ .../lending/aave_zksync_base_supply_seed.csv | 5 +++ .../lending/borrow/zksync/_sources.yml | 6 +++ .../lending/flashloans/zksync/_sources.yml | 4 ++ .../lending/supply/zksync/_sources.yml | 6 +++ 16 files changed, 238 insertions(+), 5 deletions(-) create mode 100644 dbt_subprojects/hourly_spellbook/models/_sector/lending/borrow/zksync/platforms/aave_v3_zksync_base_borrow.sql create mode 100644 dbt_subprojects/hourly_spellbook/models/_sector/lending/flashloans/zksync/platforms/aave_v3_zksync_base_flashloans.sql create mode 100644 dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/zksync/platforms/aave_v3_zksync_base_supply.sql create mode 100644 dbt_subprojects/hourly_spellbook/seeds/_sector/lending/aave_zksync_base_borrow_seed.csv create mode 100644 dbt_subprojects/hourly_spellbook/seeds/_sector/lending/aave_zksync_base_flashloans_seed.csv create mode 100644 dbt_subprojects/hourly_spellbook/seeds/_sector/lending/aave_zksync_base_supply_seed.csv diff --git a/dbt_subprojects/hourly_spellbook/models/_sector/lending/borrow/zksync/_schema.yml b/dbt_subprojects/hourly_spellbook/models/_sector/lending/borrow/zksync/_schema.yml index bc19690a235..02e1156a4f7 100644 --- a/dbt_subprojects/hourly_spellbook/models/_sector/lending/borrow/zksync/_schema.yml +++ b/dbt_subprojects/hourly_spellbook/models/_sector/lending/borrow/zksync/_schema.yml @@ -122,3 +122,39 @@ models: - *project_contract_address - *tx_hash - *evt_index + + - name: aave_v3_zksync_base_borrow + meta: + blockchain: zksync + sector: lending + project: aave + contributors: tomfutago + config: + tags: ['lending', 'borrow', 'aave', 'aave', 'zksync'] + description: "Aave v3 borrow transactions on zkSync" + data_tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - transaction_type + - token_address + - tx_hash + - evt_index + - check_lending_base_borrow_seed: + seed_file: ref('aave_zksync_base_borrow_seed') + columns: + - *blockchain + - *project + - *version + - *transaction_type + - *token_address + - *borrower + - *on_behalf_of + - *repayer + - *liquidator + - *amount + - *block_month + - *block_time + - *block_number + - *project_contract_address + - *tx_hash + - *evt_index diff --git a/dbt_subprojects/hourly_spellbook/models/_sector/lending/borrow/zksync/lending_zksync_base_borrow.sql b/dbt_subprojects/hourly_spellbook/models/_sector/lending/borrow/zksync/lending_zksync_base_borrow.sql index dbf3b1513d0..319851e2ca1 100644 --- a/dbt_subprojects/hourly_spellbook/models/_sector/lending/borrow/zksync/lending_zksync_base_borrow.sql +++ b/dbt_subprojects/hourly_spellbook/models/_sector/lending/borrow/zksync/lending_zksync_base_borrow.sql @@ -8,7 +8,8 @@ {% set models = [ - ref('zerolend_zksync_base_borrow') + ref('zerolend_zksync_base_borrow'), + ref('aave_v3_zksync_base_borrow') ] %} diff --git a/dbt_subprojects/hourly_spellbook/models/_sector/lending/borrow/zksync/platforms/aave_v3_zksync_base_borrow.sql b/dbt_subprojects/hourly_spellbook/models/_sector/lending/borrow/zksync/platforms/aave_v3_zksync_base_borrow.sql new file mode 100644 index 00000000000..3005353d5c0 --- /dev/null +++ b/dbt_subprojects/hourly_spellbook/models/_sector/lending/borrow/zksync/platforms/aave_v3_zksync_base_borrow.sql @@ -0,0 +1,19 @@ +{{ + config( + schema = 'aave_v3_zksync', + alias = 'base_borrow', + materialized = 'incremental', + file_format = 'delta', + incremental_strategy = 'merge', + unique_key = ['transaction_type', 'token_address', 'tx_hash', 'evt_index'], + incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')] + ) +}} + +{{ + lending_aave_v3_compatible_borrow( + blockchain = 'zksync', + project = 'aave', + version = '3' + ) +}} diff --git a/dbt_subprojects/hourly_spellbook/models/_sector/lending/flashloans/_schema.yml b/dbt_subprojects/hourly_spellbook/models/_sector/lending/flashloans/_schema.yml index 66d8e027203..894c67705cc 100644 --- a/dbt_subprojects/hourly_spellbook/models/_sector/lending/flashloans/_schema.yml +++ b/dbt_subprojects/hourly_spellbook/models/_sector/lending/flashloans/_schema.yml @@ -3,12 +3,12 @@ version: 2 models: - name: lending_flashloans meta: - blockchain: ethereum, celo, polygon, optimism, base, arbitrum, avalanche_c, fantom, gnosis, scroll, zksync + blockchain: ethereum, celo, polygon, optimism, base, arbitrum, avalanche_c, fantom, gnosis, zksync, zksync sector: lending project: aave contributors: tomfutago, hildobby config: - tags: ['lending', 'flashloans', 'aave', 'ethereum', 'celo', 'polygon', 'optimism', 'base', 'arbitrum', 'avalanche_c', 'fantom', 'gnosis', 'scroll', 'zksync'] + tags: ['lending', 'flashloans', 'aave', 'ethereum', 'celo', 'polygon', 'optimism', 'base', 'arbitrum', 'avalanche_c', 'fantom', 'gnosis', 'zksync', 'zksync'] description: "All lending transactions involving flashloans transactions" data_tests: - dbt_utils.unique_combination_of_columns: @@ -86,3 +86,34 @@ models: description: "Event index" data_tests: - not_null + + - name: aave_v3_zksync_base_flashloans + meta: + blockchain: zksync + sector: lending + project: aave + contributors: tomfutago + config: + tags: ['lending', 'flashloans', 'aave', 'zksync'] + description: "Aave v3 flashloans transactions on zkSync" + data_tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - tx_hash + - evt_index + - check_lending_base_flashloans_seed: + seed_file: ref('aave_zksync_base_flashloans_seed') + columns: + - *blockchain + - *project + - *version + - *recipient + - *amount + - *fee + - *token_address + - *project_contract_address + - *block_month + - *block_time + - *block_number + - *tx_hash + - *evt_index diff --git a/dbt_subprojects/hourly_spellbook/models/_sector/lending/flashloans/zksync/lending_zksync_base_flashloans.sql b/dbt_subprojects/hourly_spellbook/models/_sector/lending/flashloans/zksync/lending_zksync_base_flashloans.sql index ad81e72af5a..943eeea517b 100644 --- a/dbt_subprojects/hourly_spellbook/models/_sector/lending/flashloans/zksync/lending_zksync_base_flashloans.sql +++ b/dbt_subprojects/hourly_spellbook/models/_sector/lending/flashloans/zksync/lending_zksync_base_flashloans.sql @@ -8,7 +8,8 @@ {% set models = [ - ref('zerolend_zksync_base_flashloans') + ref('zerolend_zksync_base_flashloans'), + ref('aave_v3_zksync_base_flashloans') ] %} diff --git a/dbt_subprojects/hourly_spellbook/models/_sector/lending/flashloans/zksync/platforms/aave_v3_zksync_base_flashloans.sql b/dbt_subprojects/hourly_spellbook/models/_sector/lending/flashloans/zksync/platforms/aave_v3_zksync_base_flashloans.sql new file mode 100644 index 00000000000..821ae724b6c --- /dev/null +++ b/dbt_subprojects/hourly_spellbook/models/_sector/lending/flashloans/zksync/platforms/aave_v3_zksync_base_flashloans.sql @@ -0,0 +1,19 @@ +{{ + config( + schema = 'aave_v3_zksync', + alias = 'base_flashloans', + materialized = 'incremental', + file_format = 'delta', + incremental_strategy = 'merge', + unique_key = ['tx_hash', 'evt_index'], + incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')] + ) +}} + +{{ + lending_aave_v3_compatible_flashloans( + blockchain = 'zksync', + project = 'aave', + version = '3' + ) +}} diff --git a/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/zksync/_schema.yml b/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/zksync/_schema.yml index e5b4b2c38a4..ec65df69324 100644 --- a/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/zksync/_schema.yml +++ b/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/zksync/_schema.yml @@ -122,3 +122,39 @@ models: - *project_contract_address - *tx_hash - *evt_index + + - name: aave_v3_zksync_base_supply + meta: + blockchain: zksync + sector: lending + project: aave + contributors: tomfutago + config: + tags: ['lending', 'supply', 'aave', 'zksync'] + description: "Aave v3 supply transactions on zkSync" + data_tests: + - dbt_utils.unique_combination_of_columns: + combination_of_columns: + - transaction_type + - token_address + - tx_hash + - evt_index + - check_lending_base_supply_seed: + seed_file: ref('aave_zksync_base_supply_seed') + columns: + - *blockchain + - *project + - *version + - *transaction_type + - *token_address + - *depositor + - *on_behalf_of + - *withdrawn_to + - *liquidator + - *amount + - *block_month + - *block_time + - *block_number + - *project_contract_address + - *tx_hash + - *evt_index diff --git a/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/zksync/lending_zksync_base_supply.sql b/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/zksync/lending_zksync_base_supply.sql index 4cbc152960f..831f1cc0f72 100644 --- a/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/zksync/lending_zksync_base_supply.sql +++ b/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/zksync/lending_zksync_base_supply.sql @@ -8,7 +8,8 @@ {% set models = [ - ref('zerolend_zksync_base_supply') + ref('zerolend_zksync_base_supply'), + ref('aave_v3_zksync_base_supply') ] %} diff --git a/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/zksync/platforms/aave_v3_zksync_base_supply.sql b/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/zksync/platforms/aave_v3_zksync_base_supply.sql new file mode 100644 index 00000000000..9b51483bad5 --- /dev/null +++ b/dbt_subprojects/hourly_spellbook/models/_sector/lending/supply/zksync/platforms/aave_v3_zksync_base_supply.sql @@ -0,0 +1,19 @@ +{{ + config( + schema = 'aave_v3_zksync', + alias = 'base_supply', + materialized = 'incremental', + file_format = 'delta', + incremental_strategy = 'merge', + unique_key = ['transaction_type', 'token_address', 'tx_hash', 'evt_index'], + incremental_predicates = [incremental_predicate('DBT_INTERNAL_DEST.block_time')] + ) +}} + +{{ + lending_aave_v3_compatible_supply( + blockchain = 'zksync', + project = 'aave', + version = '3' + ) +}} diff --git a/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/_schema.yml b/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/_schema.yml index f434216529b..213fd274c94 100644 --- a/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/_schema.yml +++ b/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/_schema.yml @@ -168,6 +168,20 @@ seeds: token_address: varbinary borrower: varbinary amount: double + - name: aave_zksync_base_borrow_seed + config: + column_types: + blockchain: varchar + project: varchar + version: varchar + block_number: bigint + block_time: timestamp + tx_hash: varbinary + evt_index: bigint + transaction_type: varchar + token_address: varbinary + borrower: varbinary + amount: double - name: aave_arbitrum_base_supply_seed config: @@ -337,6 +351,20 @@ seeds: token_address: varbinary depositor: varbinary amount: double + - name: aave_zksync_base_supply_seed + config: + column_types: + blockchain: varchar + project: varchar + version: varchar + block_number: bigint + block_time: timestamp + tx_hash: varbinary + evt_index: bigint + transaction_type: varchar + token_address: varbinary + depositor: varbinary + amount: double - name: aave_arbitrum_base_flashloans_seed config: @@ -494,6 +522,19 @@ seeds: token_address: varbinary recipient: varbinary amount: double + - name: aave_zksync_base_flashloans_seed + config: + column_types: + blockchain: varchar + project: varchar + version: varchar + block_number: bigint + block_time: timestamp + tx_hash: varbinary + evt_index: bigint + token_address: varbinary + recipient: varbinary + amount: double - name: moola_celo_base_borrow_seed config: diff --git a/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/aave_zksync_base_borrow_seed.csv b/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/aave_zksync_base_borrow_seed.csv new file mode 100644 index 00000000000..37a024abb8c --- /dev/null +++ b/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/aave_zksync_base_borrow_seed.csv @@ -0,0 +1,4 @@ +blockchain,project,version,block_number,block_time,tx_hash,evt_index,transaction_type,token_address,borrower,amount +zksync,aave,3,51909048,2024-12-22 12:56:09.000 UTC,0x087a9163c4b4c34a26adb3155ad62de8883d413fdfeb1236f84b6260bec9da48,7,borrow,0x1d17cbcf0d6d143135ae902365d2e5e2a16538d4,0x72fe12b5127162f8f3d1eec3f9d232c98a032f23,110000000 +zksync,aave,3,51750031,2024-12-20 11:29:08.000 UTC,0x3a7548fe223e51d74cd4cd2bedcf9122e4853f4209cac2c49e7e9b068c90ebf2,18,borrow_liquidation,0x1d17cbcf0d6d143135ae902365d2e5e2a16538d4,0xd3b2a586180c9e306b38848d31e82f9e17d76f0c,-2770807444 +zksync,aave,3,51907646,2024-12-22 12:30:24.000 UTC,0xac913e1cb652b2aaf1aab9e886803c2d27a45f2ebd2b564548b8c5c2012d5021,14,repay,0x1d17cbcf0d6d143135ae902365d2e5e2a16538d4,0x5ba9811dff37ca8639272d509dcadfe5bec4bff7,-4100000 diff --git a/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/aave_zksync_base_flashloans_seed.csv b/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/aave_zksync_base_flashloans_seed.csv new file mode 100644 index 00000000000..d7129e1a2c0 --- /dev/null +++ b/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/aave_zksync_base_flashloans_seed.csv @@ -0,0 +1,4 @@ +blockchain,project,version,block_number,block_time,tx_hash,evt_index,token_address,recipient,amount +zksync,aave,3,51741885,2024-12-20 09:08:30.000 UTC,0x37aa4e84eb810f3cce179819b68a37acdd53104d799e60a851e75f5775faab24,28,0x1d17cbcf0d6d143135ae902365d2e5e2a16538d4,0x41c914a4a619b7969137551904a537db16905d1f,2504231355 +zksync,aave,3,51741825,2024-12-20 09:07:29.000 UTC,0x0fa867dd6cccb34159b8bfee8a1757a1af6a3e37f7f2af2f58caab044e684826,28,0x1d17cbcf0d6d143135ae902365d2e5e2a16538d4,0x41c914a4a619b7969137551904a537db16905d1f,210563615 +zksync,aave,3,51692496,2024-12-19 18:24:06.000 UTC,0x433e9869c81ae380c4ab360ad6a14a1d56e22a1adf7734b5415bb31485aac494,32,0x493257fd37edb34451f62edf8d2a0c418852ba4c,0x41c914a4a619b7969137551904a537db16905d1f,15509265 diff --git a/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/aave_zksync_base_supply_seed.csv b/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/aave_zksync_base_supply_seed.csv new file mode 100644 index 00000000000..28c24921051 --- /dev/null +++ b/dbt_subprojects/hourly_spellbook/seeds/_sector/lending/aave_zksync_base_supply_seed.csv @@ -0,0 +1,5 @@ +blockchain,project,version,block_number,block_time,tx_hash,evt_index,transaction_type,token_address,depositor,amount +zksync,aave,3,51910059,2024-12-22 13:14:37.000 UTC,0xf9fd60b0434f3b32e6f71bffa3d931f570f67fb79e9d5a3856e864c3d413d729,8,deposit,0x5a7d6b2f92c77fad6ccabd7ee0624e64907eaf3e,0xb34247a2ff891caec36375d0e58f95f8d9bf38d6,100000000000000000000 +zksync,aave,3,51750031,2024-12-20 11:29:08.000 UTC,0x3a7548fe223e51d74cd4cd2bedcf9122e4853f4209cac2c49e7e9b068c90ebf2,18,deposit_liquidation,0x5a7d6b2f92c77fad6ccabd7ee0624e64907eaf3e,0xd3b2a586180c9e306b38848d31e82f9e17d76f0c,-1.9198338954322615e+22 +zksync,aave,3,51215930,2024-12-13 18:06:30.000 UTC,0x8f3e895a74a183300d417869bcaac0edf03a65a9d737af686d222a63967e76f6,8,repay_with_atokens,0x1d17cbcf0d6d143135ae902365d2e5e2a16538d4,0x8a8a757c4c3cbb85450dfb70e61fbcbae3994054,-491998467 +zksync,aave,3,51908987,2024-12-22 12:55:05.000 UTC,0x1bf91b597c04a36bcb2d9e7c7e7c3260eb79ebe62f47a6746f5c615511e075dc,26,withdraw,0x5aea5775959fbc2557cc8789bc1bf90a239d9a91,0xd5f6c8d402e0a0222f7fa132f9e80fdcc074df5c,-20000005150310010 diff --git a/sources/_sector/lending/borrow/zksync/_sources.yml b/sources/_sector/lending/borrow/zksync/_sources.yml index eba64c2b327..a05983f222e 100644 --- a/sources/_sector/lending/borrow/zksync/_sources.yml +++ b/sources/_sector/lending/borrow/zksync/_sources.yml @@ -1,6 +1,12 @@ version: 2 sources: + - name: aave_v3_zksync + tables: + - name: Pool_evt_Borrow + - name: Pool_evt_Repay + - name: Pool_evt_LiquidationCall + - name: zerolend_zksync tables: - name: Pool_evt_Borrow diff --git a/sources/_sector/lending/flashloans/zksync/_sources.yml b/sources/_sector/lending/flashloans/zksync/_sources.yml index 4d3acf5e19e..33180194b58 100644 --- a/sources/_sector/lending/flashloans/zksync/_sources.yml +++ b/sources/_sector/lending/flashloans/zksync/_sources.yml @@ -1,6 +1,10 @@ version: 2 sources: + - name: aave_v3_zksync + tables: + - name: Pool_evt_FlashLoan + - name: zerolend_zksync tables: - name: Pool_evt_FlashLoan diff --git a/sources/_sector/lending/supply/zksync/_sources.yml b/sources/_sector/lending/supply/zksync/_sources.yml index 40e2f2be49f..18e8fe9ac4b 100644 --- a/sources/_sector/lending/supply/zksync/_sources.yml +++ b/sources/_sector/lending/supply/zksync/_sources.yml @@ -1,6 +1,12 @@ version: 2 sources: + - name: aave_v3_zksync + tables: + - name: Pool_evt_Supply + - name: Pool_evt_Withdraw + - name: WrappedTokenGatewayV3_call_withdrawETH + - name: zerolend_zksync tables: - name: Pool_evt_Supply From 01fb851bdcb06da412e5382552e5902e9c348875 Mon Sep 17 00:00:00 2001 From: bram-vdberg Date: Mon, 30 Dec 2024 10:38:25 +0100 Subject: [PATCH 21/21] Add new address for Enso (#7378) --- .../cow_protocol/arbitrum/cow_protocol_arbitrum_solvers.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/dbt_subprojects/hourly_spellbook/models/_project/cow_protocol/arbitrum/cow_protocol_arbitrum_solvers.sql b/dbt_subprojects/hourly_spellbook/models/_project/cow_protocol/arbitrum/cow_protocol_arbitrum_solvers.sql index b6f51bab053..f83aa055fab 100644 --- a/dbt_subprojects/hourly_spellbook/models/_project/cow_protocol/arbitrum/cow_protocol_arbitrum_solvers.sql +++ b/dbt_subprojects/hourly_spellbook/models/_project/cow_protocol/arbitrum/cow_protocol_arbitrum_solvers.sql @@ -55,6 +55,7 @@ known_solver_metadata (address, environment, name) as ( (0x0148538e6cA813D41eA5988008Cdc9B72d4e65A7, 'prod', 'Laita'), (0x1FA2FF499b327f53cD9a82BcAFE36093563E32e4, 'prod', 'Apollo'), (0x0148538e6cA813D41eA5988008Cdc9B72d4e65A7, 'prod', 'Laita'), + (0x9C75aae1Bd2f96D7B4E67e8C5344f3304382276E, 'prod', 'Enso'), (0x034F6Aca83F1900b0157b0123F514A29456eeA59, 'barn', 'Laita'), (0x6bf97aFe2D2C790999cDEd2a8523009eB8a0823f, 'prod', 'Portus'), (0xBB765c920f86e2A2654c4B82deB5BC2E092fF93b, 'barn', 'Portus'),