Merge pull request #198 from CarmineOptions/development

feat: new airdrop
CarmineOptions · Jun 27, 2024 · a3e4fdb · a3e4fdb
2 parents f8a26b7 + 412dd48
commit a3e4fdb
Show file tree

Hide file tree

Showing 49 changed files with 2,761 additions and 576 deletions.
diff --git a/config-mainnet.json b/config-mainnet.json
@@ -7,6 +7,8 @@
   "USDC_ADDRESS": "0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8",
   "BTC_ADDRESS": "0x03fe2b97c1fd336e750087d68b9b867997fd64a2661ff3ca5a7c771641e8e7ac",
   "STRK_ADDRESS": "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d",
+  "VE_CRM_ADDRESS": "0x3c0286e9e428a130ae7fbbe911b794e8a829c367dd788e7cfe3efb0367548fa",
+  "CRM_ADDRESS": "0x51c4b1fe3bf6774b87ad0b15ef5d1472759076e42944fff9b9f641ff13e5bbe",
   "ETH_USDC_CALL_ADDRESS": "0x70cad6be2c3fc48c745e4a4b70ef578d9c79b46ffac4cd93ec7b61f951c7c5c",
   "ETH_USDC_PUT_ADDRESS": "0x466e3a6731571cf5d74c5b0d9c508bfb71438de10f9a13269177b01d6f07159",
   "BTC_USDC_CALL_ADDRESS": "0x35db72a814c9b30301f646a8fa8c192ff63a0dc82beb390a36e6e9eba55b6db",

diff --git a/config-testnet.json b/config-testnet.json
@@ -2,11 +2,13 @@
   "NETWORK": "testnet",
   "API_URL": "https://api.carmine.finance",
   "AMM_ADDRESS": "0x07587280e108db0681eb60190ed1f5bd737965177f6c13551ab2e50d6644d382",
-  "GOVERNANCE_ADDRESS": "TODO",
+  "GOVERNANCE_ADDRESS": "0x02c027aad2668aa66d232d846c190785ade993b032f9ad44893739b365b89d34",
   "ETH_ADDRESS": "0x49d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7",
   "USDC_ADDRESS": "0x07b5be4ebf7c50f67d54d328c45ee21b06de8e39240c7943b25ab811c07c43e4",
   "BTC_ADDRESS": "0x00c6164da852d230360333d6ade3551ee3e48124c815704f51fa7f12d8287dcc",
   "STRK_ADDRESS": "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d",
+  "VE_CRM_ADDRESS": "0x4a6bd0934f92e8419280e3b7d83db9a1ed15c25991ee91713042dddebe72b7e",
+  "CRM_ADDRESS": "0x5e5bf796ce003158104836ce0eb92ba4387676cc43ba9bfa540cdabe66c2c7e",
   "ETH_USDC_CALL_ADDRESS": "0x201f9513450a32a1f3803f289ee7d104735cd1f933712fffc1cdae98ad6c008",
   "ETH_USDC_PUT_ADDRESS": "0x3271dbd7dc85550648cd561595fae76393490a8650b9225e9b4392e09b20c7c",
   "BTC_USDC_CALL_ADDRESS": "0x6fbe70f97f93f9b42707b7cadabba472eb810af5fe1f06da04583b1724a8c2b",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
     ]
   },
   "devDependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "*",
+    "@babel/plugin-transform-private-property-in-object": "^7.24.7",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/github": "^10.0.6",
@@ -74,4 +74,4 @@
     "typescript": "^4.8.4",
     "web-vitals": "^2.1.4"
   }
-}
+}
diff --git a/src/App.tsx b/src/App.tsx
@@ -45,8 +45,8 @@ const App = () => {
         <CssBaseline />
         {acceptedTermsAndConditions ? (
           <>
-            <Slip />
             <Router>
+              <Slip />
               <Routes>
                 {oldPathRedirects.map(([oldPath, newPath], i) => (
                   <Route
@@ -67,7 +67,7 @@ const App = () => {
                 <Route path="/apy-info" element={<APYInfoPage />} />
                 <Route path="/settings" element={<Settings />} />
                 <Route path="/dashboard" element={<TradeDashboardPage />} />
-                <Route path="/governance" element={<Governance />} />
+                <Route path="/governance/:target?" element={<Governance />} />
                 <Route path="/leaderboard" element={<LeaderboardPage />} />
                 <Route path="/rewards" element={<StarknetRewards />} />
                 <Route path="*" element={<NotFound />} />