merge magicswap subgraphs (#235)

* merge magicswap subgraphs

* fix build

* add hour data

* add hour data updates

* update price feed info to use msv1 start block

* fix derivedMAGIC and amountUSD calculations

* fix volume USD calculations

* remove old magicswap exchange subgraph

* update readme

.github/workflows/deploy.yaml

@@ -15,8 +15,7 @@ on:
           - bridgeworld-kote
           - bridgeworld-recruits
           - governance-staking
-          - magicswap-exchange
-          - magicswapv2
+          - magicswap
           - smol
       version:
         description: Subgraph version

README.md

@@ -28,13 +28,9 @@ Corruption balances and removals for [Bridgeworld](https://bridgeworld.treasure.
 
 Tracking MAGIC deposited for [TreasureDAO Governance Staking](https://governance-staking.treasure.lol) (gMAGIC)
 
-### magicswap-exchange
+### magicswap
 
-Fork of [Sushiswap subgraph](https://github.com/sushiswap/subgraphs) for [MagicSwap](https://magicswap.lol)
-
-### magicswapv2
-
-Exchange data for [Magicswap v2](https://v2.magicswap.lol)
+Exchange data for [Magicswap](https://magicswap.lol)
 
 ### smol
 

packages/config/src/arbitrum-sepolia.json

@@ -68,13 +68,13 @@
   "transmolgrifier_start_block": 6249003,
   "smol_renderer_address": "0x79973af48c424de5f199a7c0369c5e9cdeb493fc",
 
-  "magicswap_factory_address": "0x9b58fc8c7B224Ae8479DA7E6eD37CA4Ac58099a9",
-  "magicswap_factory_start_block": 654981,
+  "magicswapv1_start_block": 654981,
+  "magicswapv1_uniswapv2_factory_address": "0x9b58fc8c7B224Ae8479DA7E6eD37CA4Ac58099a9",
+  "magicswapv2_start_block": 49484001,
   "magicswapv2_nft_vault_factory_address": "0x040d5778553aa5c465dfdba889e914b12895d423",
   "magicswapv2_nft_vault_factory_v2_address": "0x496f5f13816cdddd6934be1ca6a579b3838889ce",
   "magicswapv2_uniswapv2_factory_address": "0xbdfab57b9446ab3512579b7a901b74fa49fda752",
   "magicswapv2_router_address": "0xc8d7261feb0b648bc489224a18d6cdc905a0c5ab",
   "magic_usd_price_feed_address": "0xe6616a09e029d477183cba6bb6133643b522c15c",
-  "weth_address": "0x980b62da83eff3d4576c647993b0c1d7faf17c73",
-  "magicswapv2_start_block": 49484001
+  "weth_address": "0x980b62da83eff3d4576c647993b0c1d7faf17c73"
 }

packages/config/src/arbitrum.json

@@ -68,15 +68,15 @@
   "transmolgrifier_start_block": 173093282,
   "smol_renderer_address": "0x2d79de1b69bfdde8708acaef7bf52b6bbc83afd5",
 
-  "magicswap_factory_address": "0x015e379Ce0Ff195228b3A9eBDFA13F9afC155Dd7",
-  "magicswap_factory_start_block": 20547275,
+  "magicswapv1_start_block": 20547275,
+  "magicswapv1_uniswapv2_factory_address": "0x015e379Ce0Ff195228b3A9eBDFA13F9afC155Dd7",
+  "magicswapv2_start_block": 232580414,
   "magicswapv2_nft_vault_factory_address": "0x0000000000000000000000000000000000000000",
   "magicswapv2_nft_vault_factory_v2_address": "0xd67a39241fcdaf57dfbe764fa62d14e9b681f8e2",
   "magicswapv2_uniswapv2_factory_address": "0x77fa938998e196701c324149f771efd6e980df0a",
   "magicswapv2_router_address": "0xb740d5804ea2061432469119cfa40cbb4586dd17",
   "magic_usd_price_feed_address": "0x5ab0b1e2604d4b708721bc3cd1ce962958b4297e",
   "weth_address": "0x82af49447d8a07e3bd95bd0d56f35241523fbab1",
-  "magicswapv2_start_block": 232580414,
 
   "governance_staking_address": "0xc0e641c7ea263166a238285556ff61fdf37a4c79",
   "governance_staking_start_block": 60986774