Merge branch 'master' into feat/rootstock-fastbtc-bridge

DefiLlama · Aug 27, 2024 · 143051f · 143051f
2 parents aa26973 + 6930c82
commit 143051f
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "ts-loader": "^9.3.1"
   },
   "dependencies": {
-    "@defillama/sdk": "^5.0.77",
+    "@defillama/sdk": "^5.0.80",
     "@graphql-typed-document-node/core": "^3.2.0",
     "@solana/web3.js": "^1.87.3",
     "async-retry": "^1.3.1",

diff --git a/src/adapters/debridgedln/index.ts b/src/adapters/debridgedln/index.ts
@@ -104,6 +104,7 @@ type ApiSolanaEvent = {
   amount: string,
   isDeposit: boolean;
   giveAmountUSD: number;
+  blockTimestamp: number;
 }
 
 const solanaBlockNumberFirstUsedByDebridge = 166833820;
@@ -131,6 +132,7 @@ const getSolanaEvents = async (fromBlock: number, toBlock: number): Promise<Even
       : event.token,
     amount: ethers.BigNumber.from(Math.round(event.giveAmountUSD)),
     isUSDVolume: true,
+    timestamp: event.blockTimestamp
   }));
 };
 

diff --git a/src/adapters/oooo/index.ts b/src/adapters/oooo/index.ts
@@ -47,7 +47,7 @@ const constructParams = (chain: SupportedChains) => {
                 ...bridgeAddress.map(async (address: string, i: number) => {
                     await wait(300 * i); // for etherscan
                     let txs: any[] = [];
-                    if (chain === "merlin" || chain === "b2-mainnet") {
+                    if (chain === "merlin" || chain === "b2-mainnet" || chain === "rsk") {
                         txs = await getTxsBlockRangeL2Scan(chain, address, fromBlock, toBlock, {
                             includeSignatures: ["0x", "0x88d695b2"],
                         });
@@ -93,7 +93,7 @@ const adapter: BridgeAdapter = {
     merlin: constructParams("merlin"),
     bsquared: constructParams("b2-mainnet"),
     bitlayer: constructParams("btr"),
-    // rootstock: constructParams("rsk"),
+    rootstock: constructParams("rsk"),
     // bevm
     // bevm_canary
     // btc

diff --git a/src/adapters/xy-finance/constants.ts b/src/adapters/xy-finance/constants.ts
@@ -23,6 +23,7 @@ export enum Chain {
   Blast = 'blast',
   XLayer = 'xlayer',
   Taiko = 'taiko',
+  CronosZkevm = 'cronos_zkevm',
 }
 
 export enum VAULTS_TOKEN {
@@ -379,6 +380,20 @@ export const YBridgeVaultsTokenContractAddress: Record<Exclude<Chain, Chain.Numb
       contractAddress: '0xFa77c2DecCB21ACb9Bf196408Bf6aD5973D07762',
       tokenAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE'
     },
+  },
+  [Chain.CronosZkevm]: {
+    [VAULTS_TOKEN.USDT]: {
+      contractAddress: '',
+      tokenAddress: ''
+    },
+    [VAULTS_TOKEN.USDC]: {
+      contractAddress: '',
+      tokenAddress: ''
+    },
+    [VAULTS_TOKEN.ETH]: {
+      contractAddress: '0xAa0b0654E79E17332d983E2351bD926cE336B9BD',
+      tokenAddress: '0x271602A97027ee1dd03b1E6e5dB153eB659A80b1'
+    },
   }
 }
 
@@ -405,7 +420,8 @@ export const YBridgeContractAddress: Record<Exclude<Chain, Chain.Numbers>, Addre
   [Chain.Wemix]: "0x73Ce60416035B8D7019f6399778c14ccf5C9c7A1",
   [Chain.Blast]: "0x73Ce60416035B8D7019f6399778c14ccf5C9c7A1",
   [Chain.XLayer]: "0x73Ce60416035B8D7019f6399778c14ccf5C9c7A1",
-  [Chain.Taiko]: "0x73Ce60416035B8D7019f6399778c14ccf5C9c7A1"
+  [Chain.Taiko]: "0x73Ce60416035B8D7019f6399778c14ccf5C9c7A1",
+  [Chain.CronosZkevm]: "0xE22747472A565e96D0867741811193895b9538f2",
 }
 
 export const XYRouterContractAddress: Record<Chain, Address> = {
@@ -432,5 +448,6 @@ export const XYRouterContractAddress: Record<Chain, Address> = {
   [Chain.Wemix]: "0x6471fAd467ac2854b403e7FE3e95FBbB3287a7ee",
   [Chain.Blast]: "0x43A86823EBBe2ECF9A384aDfD989E26A30626458",
   [Chain.XLayer]: "0x6A816cEE105a9409D8df0A83d8eeaeD9EB4309fE",
-  [Chain.Taiko]: "0xedC061306A79257f15108200C5B82ACc874C239d"
+  [Chain.Taiko]: "0xedC061306A79257f15108200C5B82ACc874C239d",
+  [Chain.CronosZkevm]: "0x986138f6ed1350a85De6B18280f7d139F74B7282",
 }
diff --git a/src/adapters/xy-finance/index.ts b/src/adapters/xy-finance/index.ts
@@ -175,6 +175,7 @@ const adapter: BridgeAdapter = {
   blast: constructParams(Chain.Blast),
   'x layer': constructParams(Chain.XLayer),
   taiko: constructParams(Chain.Taiko),
+  'cronos zkevm': constructParams(Chain.CronosZkevm),
 };
 
 export default adapter;
diff --git a/src/data/bridgeNetworkData.ts b/src/data/bridgeNetworkData.ts
@@ -168,7 +168,7 @@ export default [
       "BSC",
       "Manta",
       "Base",
-      "zkSync Era",
+      "ZKsync Era",
       "Polygon zkEVM",
       "Linea",
       "Scroll",
@@ -326,7 +326,18 @@ export default [
     iconLink: "icons:across",
     largeTxThreshold: 10000,
     url: "https://across.to/",
-    chains: ["Ethereum", "Polygon", "Optimism", "zkSync Era", "Base", "Arbitrum", "Linea", "Mode", "Blast", "Scroll"],
+    chains: [
+      "Ethereum",
+      "Polygon",
+      "Optimism",
+      "ZKsync Era",
+      "Base",
+      "Arbitrum",
+      "Linea",
+      "Mode",
+      "Blast",
+      "Scroll"
+    ],
     chainMapping: {
       "zksync era": "era",
     },
@@ -594,13 +605,13 @@ export default [
   // },
   {
     id: 26,
-    displayName: "zkSync Era Bridge",
+    displayName: "ZKsync Era Bridge",
     bridgeDbName: "zksync",
     iconLink: "chain:zksync era",
     largeTxThreshold: 10000,
     url: "https://portal.zksync.io/bridge/",
-    chains: ["Ethereum", "zkSync Era"],
-    destinationChain: "zkSync Era",
+    chains: ["Ethereum", "ZKsync Era"],
+    destinationChain: "ZKsync Era",
   },
   {
     id: 27,
@@ -618,7 +629,7 @@ export default [
       "Kava",
       "Boba",
       "Boba BNB",
-      "zkSync Era",
+      "ZKsync Era",
       "Arbitrum",
       "Arbitrum Nova",
       "Optimism",
@@ -658,7 +669,7 @@ export default [
       "Optimism",
       "Aurora",
       "BSC",
-      "zkSync Era",
+      "ZKsync Era",
       "Kava",
       "Moonbeam",
       "Moonriver",
@@ -809,7 +820,7 @@ export default [
       "Polygon",
       "Optimism",
       "Base",
-      "zkSync Era",
+      "ZKsync Era",
       "Polygon zkEVM",
       "Linea",
       "Manta",
@@ -903,7 +914,7 @@ export default [
       "Ethereum",
       "Arbitrum",
       "BSC",
-      "zkSync Era",
+      "ZKsync Era",
       "Base",
       "Scroll",
       "Linea",
@@ -949,7 +960,7 @@ export default [
       "Linea",
       "Base",
       "Arbitrum",
-      "zkSync Era",
+      "ZKsync Era",
       "BSC",
       "Polygon",
       "Klaytn",
@@ -966,12 +977,14 @@ export default [
       "X Layer",
       // "Numbers",
       "Taiko",
+      "Cronos zkEVM"
     ],
     chainMapping: {
       "zksync era": "era",
       "polygon zkevm": "polygon_zkevm",
       avalanche: "avax",
       "x layer": "xlayer",
+      "cronos zkevm": "cronos_zkevm",
     },
   },
   // {
@@ -1064,7 +1077,7 @@ export default [
       // "Blast",
       // "Arbitrum Nova",
       "Scroll",
-      "zkSync Era",
+      "ZKsync Era",
       // "Manta",
       "Mantle",
       // "Rootstock",
@@ -1093,7 +1106,7 @@ export default [
     iconLink: "icons:mes-protocol",
     url: "https://www.mesprotocol.com/",
     largeTxThreshold: 10000,
-    chains: ["Ethereum", "Arbitrum", "Optimism", "Manta", "zkSync Era", "Base", "Linea"],
+    chains: ["Ethereum", "Arbitrum", "Optimism", "Manta", "ZKsync Era", "Base", "Linea"],
     chainMapping: {
       "zksync era": "era",
     },
@@ -1128,7 +1141,7 @@ export default [
       "Blast",
       "Arbitrum Nova",
       "Scroll",
-      "zkSync Era",
+      "ZKsync Era",
       "Polygon zkEVM",
       "Merlin",
       "Bitlayer",
@@ -1226,7 +1239,7 @@ export default [
       "opBNB",
       "Mint",
 
-      "zkSync Era",
+      "ZKsync Era",
       "Polygon zkEVM",
     ],
     chainMapping: {
@@ -1302,7 +1315,7 @@ export default [
       "ZkLink",
       "opBNB",
       "Polygon",
-      "zkSync Era",
+      "ZKsync Era",
       "Polygon zkEVM",
     ],
     chainMapping: {
@@ -1326,12 +1339,26 @@ export default [
       "Merlin",
       "BSquared",
       "Bitlayer",
-      // "Rootstock",
+      "Rootstock",
+      "Scroll",
+      "zkSync Era",
+      "ZkLink",
+      "Linea",
+      "Blast",
+      "Base",
+      "Optimism",
+      "Polygon",
+      "Taiko",
+      "Fantom",
+      "Ethereum",
+      "X Layer",
     ],
     chainMapping: {
       bsquared: "b2-mainnet",
       bitlayer: "btr",
       rootstock: "rsk",
+      "zksync era": "era",
+      "x layer": "xlayer",
     },
   },
   {
@@ -1359,7 +1386,7 @@ export default [
       "X Layer",
       "Taiko",
       "ZkLink",
-      "zkSync Era",
+      "ZKsync Era",
       "Polygon zkEVM",
     ],
     chainMapping: {
@@ -1401,7 +1428,7 @@ export default [
       "ZkLink",
       "opBNB",
       "Telos",
-      "zkSync Era",
+      "ZKsync Era",
       "Polygon zkEVM",
     ],
     chainMapping: {
@@ -1431,7 +1458,7 @@ export default [
       "X Layer",
       "Taiko",
       "ZkLink",
-      "zkSync Era",
+      "ZKsync Era",
       "Merlin",
       "BSquared",
       "Bitlayer",

diff --git a/src/helpers/l2scan.ts b/src/helpers/l2scan.ts
@@ -5,6 +5,7 @@ const retry = require("async-retry");
 const endpoints = {
   merlin: "https://scan.merlinchain.io",
   "b2-mainnet": "https://explorer.bsquared.network",
+  "rsk": "https://rootstock.blockscout.com",
 } as { [chain: string]: string };
 
 export const getTxsBlockRangeL2Scan = async (