Merge branch 'main' into ds-rust-sdk

smartcontractkit · Jan 13, 2025 · faff1bb · faff1bb
2 parents 01a000f + 9983f3b
commit faff1bb
Show file tree

Hide file tree

Showing 4 changed files with 259 additions and 6 deletions.
diff --git a/src/components/CCIP/Drawer/LaneDrawer.tsx b/src/components/CCIP/Drawer/LaneDrawer.tsx
@@ -8,7 +8,7 @@ import {
   LaneFilter,
   Version,
   displayCapacity,
-  tokenPoolDisplay,
+  determineTokenMechanism,
 } from "~/config/data/ccip"
 
 import { useState } from "react"
@@ -76,7 +76,21 @@ function LaneDrawer({
                 <th>Ticker</th>
                 <th>Token address (Source)</th>
                 <th>Decimals</th>
-                <th>Mechanism</th>
+                <th>
+                  Mechanism
+                  <Tooltip
+                    label=""
+                    tip="Token pool mechanism: Lock & Mint, Burn & Mint, Lock & Unlock, Burn & Unlock."
+                    labelStyle={{
+                      marginRight: "5px",
+                    }}
+                    style={{
+                      display: "inline-block",
+                      verticalAlign: "middle",
+                      marginBottom: "2px",
+                    }}
+                  />
+                </th>
                 <th>
                   Rate limit capacity
                   <Tooltip
@@ -147,8 +161,18 @@ function LaneDrawer({
                           />
                         </td>
                         <td>{data[sourceNetwork.key].decimals}</td>
+                        <td>
+                          {inOutbound === LaneFilter.Outbound
+                            ? determineTokenMechanism(
+                                data[sourceNetwork.key].poolType,
+                                data[destinationNetwork.key].poolType
+                              )
+                            : determineTokenMechanism(
+                                data[destinationNetwork.key].poolType,
+                                data[sourceNetwork.key].poolType
+                              )}
+                        </td>
 
-                        <td>{tokenPoolDisplay(data[sourceNetwork.key].poolType)}</td>
                         <td>
                           {lane.supportedTokens &&
                             displayCapacity(

diff --git a/src/config/data/ccip/v1_2_0/mainnet/lanes.json b/src/config/data/ccip/v1_2_0/mainnet/lanes.json
@@ -3164,6 +3164,20 @@
             }
           }
         },
+        "tETH": {
+          "rateLimiterConfig": {
+            "in": {
+              "capacity": "0",
+              "isEnabled": false,
+              "rate": "0"
+            },
+            "out": {
+              "capacity": "0",
+              "isEnabled": false,
+              "rate": "0"
+            }
+          }
+        },
         "USD+": {
           "rateLimiterConfig": {
             "in": {
@@ -4398,6 +4412,18 @@
         }
       }
     },
+    "ethereum-mainnet-zksync-1": {
+      "offRamp": {
+        "address": "0x90e04B0871Ba9781DcD869251B7a6A101d08f13D",
+        "version": "1.5.0"
+      },
+      "onRamp": {
+        "address": "0x757DaD0B4017fca8E3399B4B3b23e0a6587723D1",
+        "enforceOutOfOrder": false,
+        "version": "1.5.0"
+      },
+      "rmnPermeable": false
+    },
     "mainnet": {
       "offRamp": {
         "address": "0xCA04169671A81E4fB8768cfaD46c347ae65371F1",
@@ -6168,6 +6194,18 @@
         }
       }
     },
+    "ethereum-mainnet-zksync-1": {
+      "offRamp": {
+        "address": "0x8d86CEDE37C93CD48C5d146aaF03f750714Fe127",
+        "version": "1.5.0"
+      },
+      "onRamp": {
+        "address": "0x793Aa8C07195C6a07F75C5cbDF17070564e69499",
+        "enforceOutOfOrder": false,
+        "version": "1.5.0"
+      },
+      "rmnPermeable": false
+    },
     "mainnet": {
       "offRamp": {
         "address": "0x9979c2dfEcA9051Cf7f08274d978984B2dB12C60",
@@ -6586,6 +6624,20 @@
             }
           }
         },
+        "mBTC": {
+          "rateLimiterConfig": {
+            "in": {
+              "capacity": "400000000",
+              "isEnabled": true,
+              "rate": "18518"
+            },
+            "out": {
+              "capacity": "400000000",
+              "isEnabled": true,
+              "rate": "18518"
+            }
+          }
+        },
         "SHIB": {
           "rateLimiterConfig": {
             "in": {
@@ -6632,6 +6684,30 @@
         }
       }
     },
+    "ethereum-mainnet-base-1": {
+      "offRamp": {
+        "address": "0x8d05075F2dc7D8eFFD9171664f78628c18d68F22",
+        "version": "1.5.0"
+      },
+      "onRamp": {
+        "address": "0x73B95bd224a9F5054B87577104106cD36237BaDc",
+        "enforceOutOfOrder": false,
+        "version": "1.5.0"
+      },
+      "rmnPermeable": false
+    },
+    "ethereum-mainnet-optimism-1": {
+      "offRamp": {
+        "address": "0x906e63ff31558eE1DAf6C1404e153b621CD26996",
+        "version": "1.5.0"
+      },
+      "onRamp": {
+        "address": "0xbD9148D567260c4580f00A6dd5a2bB0e626eFd62",
+        "enforceOutOfOrder": false,
+        "version": "1.5.0"
+      },
+      "rmnPermeable": false
+    },
     "mainnet": {
       "offRamp": {
         "address": "0x6BACb854483Ffe310F5Ac08879868E96AE0DC000",
@@ -6700,6 +6776,34 @@
             }
           }
         },
+        "SolvBTC": {
+          "rateLimiterConfig": {
+            "in": {
+              "capacity": "30000000000000000000",
+              "isEnabled": true,
+              "rate": "1388800000000000"
+            },
+            "out": {
+              "capacity": "30000000000000000000",
+              "isEnabled": true,
+              "rate": "1388800000000000"
+            }
+          }
+        },
+        "SolvBTC.BBN": {
+          "rateLimiterConfig": {
+            "in": {
+              "capacity": "30000000000000000000",
+              "isEnabled": true,
+              "rate": "1388800000000000"
+            },
+            "out": {
+              "capacity": "30000000000000000000",
+              "isEnabled": true,
+              "rate": "1388800000000000"
+            }
+          }
+        },
         "USDM": {
           "rateLimiterConfig": {
             "in": {
@@ -6715,6 +6819,18 @@
           }
         }
       }
+    },
+    "matic-mainnet": {
+      "offRamp": {
+        "address": "0x83ca2A80010CD1Ea1323aFf23d88294327d1Cef3",
+        "version": "1.5.0"
+      },
+      "onRamp": {
+        "address": "0x37CbA662E9c373F2166CcA0D9c576dd089D7209a",
+        "enforceOutOfOrder": false,
+        "version": "1.5.0"
+      },
+      "rmnPermeable": false
     }
   },
   "mainnet": {
@@ -7778,6 +7894,20 @@
             }
           }
         },
+        "tETH": {
+          "rateLimiterConfig": {
+            "in": {
+              "capacity": "0",
+              "isEnabled": false,
+              "rate": "0"
+            },
+            "out": {
+              "capacity": "0",
+              "isEnabled": false,
+              "rate": "0"
+            }
+          }
+        },
         "USD+": {
           "rateLimiterConfig": {
             "in": {
@@ -9094,6 +9224,20 @@
             }
           }
         },
+        "mBTC": {
+          "rateLimiterConfig": {
+            "in": {
+              "capacity": "0",
+              "isEnabled": false,
+              "rate": "0"
+            },
+            "out": {
+              "capacity": "0",
+              "isEnabled": false,
+              "rate": "0"
+            }
+          }
+        },
         "SHIB": {
           "rateLimiterConfig": {
             "in": {
@@ -9178,6 +9322,34 @@
             }
           }
         },
+        "SolvBTC": {
+          "rateLimiterConfig": {
+            "in": {
+              "capacity": "30000000000000000000",
+              "isEnabled": true,
+              "rate": "1388800000000000"
+            },
+            "out": {
+              "capacity": "30000000000000000000",
+              "isEnabled": true,
+              "rate": "1388800000000000"
+            }
+          }
+        },
+        "SolvBTC.BBN": {
+          "rateLimiterConfig": {
+            "in": {
+              "capacity": "30000000000000000000",
+              "isEnabled": true,
+              "rate": "1388800000000000"
+            },
+            "out": {
+              "capacity": "30000000000000000000",
+              "isEnabled": true,
+              "rate": "1388800000000000"
+            }
+          }
+        },
         "USDM": {
           "rateLimiterConfig": {
             "in": {
@@ -10062,6 +10234,18 @@
         }
       }
     },
+    "ethereum-mainnet-zksync-1": {
+      "offRamp": {
+        "address": "0xbd52D1661D195c4311363251ad387E504589971f",
+        "version": "1.5.0"
+      },
+      "onRamp": {
+        "address": "0x2655242E3200b99201f7d62CfF4aF04bBCfCa44C",
+        "enforceOutOfOrder": false,
+        "version": "1.5.0"
+      },
+      "rmnPermeable": false
+    },
     "mainnet": {
       "offRamp": {
         "address": "0xa06e68a11d5694316Cc819f2FFD02663e3314C7C",

diff --git a/src/config/data/ccip/v1_2_0/mainnet/tokens.json b/src/config/data/ccip/v1_2_0/mainnet/tokens.json
@@ -1095,6 +1095,15 @@
       "symbol": "mBTC",
       "tokenAddress": "0x2172fAD929E857dDfD7dDC31E24904438434cB0B"
     },
+    "ethereum-mainnet-zircuit-1": {
+      "allowListEnabled": false,
+      "decimals": 8,
+      "name": "Liquid Staked BTC",
+      "poolAddress": "0xd86e1fEDB7120369fF5175b74F4413Cb74FCAcDB",
+      "poolType": "burnMint",
+      "symbol": "mBTC",
+      "tokenAddress": "0x7FdFbE1fB9783745991CFb0a3D396acE6eE0c909"
+    },
     "mainnet": {
       "allowListEnabled": false,
       "decimals": 8,
@@ -1804,6 +1813,15 @@
       "symbol": "SolvBTC",
       "tokenAddress": "0x541FD749419CA806a8bc7da8ac23D346f2dF8B77"
     },
+    "ethereum-mainnet-zksync-1": {
+      "allowListEnabled": false,
+      "decimals": 18,
+      "name": "Solv BTC",
+      "poolAddress": "0x7F8E49d255D1f5cde2F6bD680B0362Ac6f2792ae",
+      "poolType": "burnMint",
+      "symbol": "SolvBTC",
+      "tokenAddress": "0x74eD17608cc2B5f30a59d6aF07C9aD1B1aB3A5b1"
+    },
     "mainnet": {
       "allowListEnabled": false,
       "decimals": 18,
@@ -1860,6 +1878,15 @@
       "symbol": "SolvBTC.BBN",
       "tokenAddress": "0xCC0966D8418d412c599A6421b760a847eB169A8c"
     },
+    "ethereum-mainnet-zksync-1": {
+      "allowListEnabled": false,
+      "decimals": 18,
+      "name": "SolvBTC Babylon",
+      "poolAddress": "0xb43f58c428f607466cFE8Aae2aC424c5240f3e21",
+      "poolType": "burnMint",
+      "symbol": "SolvBTC.BBN",
+      "tokenAddress": "0x2878295D69Aa3BDcf9004FCf362F0959992D801c"
+    },
     "mainnet": {
       "allowListEnabled": false,
       "decimals": 18,
@@ -2053,6 +2080,26 @@
       "tokenAddress": "0x8BF591Eae535f93a242D5A954d3Cde648b48A5A8"
     }
   },
+  "tETH": {
+    "ethereum-mainnet-arbitrum-1": {
+      "allowListEnabled": false,
+      "decimals": 18,
+      "name": "Treehouse ETH",
+      "poolAddress": "0x0C3603B0c299e680A5Af4dC83a962d66E852903B",
+      "poolType": "burnMint",
+      "symbol": "tETH",
+      "tokenAddress": "0xd09ACb80C1E8f2291862c4978A008791c9167003"
+    },
+    "mainnet": {
+      "allowListEnabled": false,
+      "decimals": 18,
+      "name": "Treehouse ETH",
+      "poolAddress": "0x8113f001eA456759264317007220cBc939cA8435",
+      "poolType": "lockRelease",
+      "symbol": "tETH",
+      "tokenAddress": "0xD11c452fc99cF405034ee446803b6F6c1F6d5ED8"
+    }
+  },
   "THE": {
     "bsc-mainnet": {
       "allowListEnabled": false,

diff --git a/src/content/data-feeds/smartdata/index.mdx b/src/content/data-feeds/smartdata/index.mdx
@@ -32,9 +32,7 @@ To find a list of available Proof of Reserve Feeds, see the [SmartData Feed Addr
 
 #### Types of Proof of Reserve Feeds
 
-Reserves are available for both cross-chain assets and offchain assets. This categorization describes the data reporting variations of Proof of Reserve feeds and helps highlight some of the inherent market risks surrounding the data quality of these feeds.
-
-Reserves are available for both offchain assets and cross-chain assets. Token issuers prove the reserves for their assets through several different methods.
+Reserves are available for both offchain assets and cross-chain assets. This categorization describes the data reporting variations of Proof of Reserve feeds and helps highlight some of the inherent market risks surrounding the data quality of these feeds.
 
 ##### Offchain reserves