Merge branch 'main' into ds-shib-public

smartcontractkit · Dec 19, 2024 · bcb88c4 · bcb88c4
2 parents c07711d + cedb61b
commit bcb88c4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 110 deletions.
diff --git a/public/files/json/feeds-aptos-testnet.json b/public/files/json/feeds-aptos-testnet.json
@@ -88,110 +88,5 @@
     "feedType": "",
     "docs": {},
     "decimals": 18
-  },
-  {
-    "compareOffchain": "",
-    "contractAddress": "x",
-    "name": "BNB / USD",
-    "path": "bnb-usd",
-    "proxyAddress": "0x011d45b006000332000000000000000000000000000000000000000000000000",
-    "threshold": 0.1,
-    "heartbeat": 1800,
-    "valuePrefix": "",
-    "assetName": "",
-    "feedCategory": "",
-    "feedType": "",
-    "docs": {},
-    "decimals": 18
-  },
-  {
-    "compareOffchain": "",
-    "contractAddress": "x",
-    "name": "POL / USD",
-    "path": "pol-usd",
-    "proxyAddress": "0x01e5984da6000332000000000000000000000000000000000000000000000000",
-    "threshold": 0.1,
-    "heartbeat": 1800,
-    "valuePrefix": "",
-    "assetName": "",
-    "feedCategory": "",
-    "feedType": "",
-    "docs": {},
-    "decimals": 18
-  },
-  {
-    "compareOffchain": "",
-    "contractAddress": "x",
-    "name": "METIS / USD",
-    "path": "metis-usd",
-    "proxyAddress": "0x01e835288b000332000000000000000000000000000000000000000000000000",
-    "threshold": 0.1,
-    "heartbeat": 1800,
-    "valuePrefix": "",
-    "assetName": "",
-    "feedCategory": "",
-    "feedType": "",
-    "docs": {},
-    "decimals": 18
-  },
-  {
-    "compareOffchain": "",
-    "contractAddress": "x",
-    "name": "DAI / USD",
-    "path": "dai-usd",
-    "proxyAddress": "0x0112be0d78000332000000000000000000000000000000000000000000000000",
-    "threshold": 0.1,
-    "heartbeat": 1800,
-    "valuePrefix": "",
-    "assetName": "",
-    "feedCategory": "",
-    "feedType": "",
-    "docs": {},
-    "decimals": 18
-  },
-  {
-    "compareOffchain": "",
-    "contractAddress": "x",
-    "name": "AVAX / USD",
-    "path": "avax-usd",
-    "proxyAddress": "0x016d7a70e3000332000000000000000000000000000000000000000000000000",
-    "threshold": 0.1,
-    "heartbeat": 1800,
-    "valuePrefix": "",
-    "assetName": "",
-    "feedCategory": "",
-    "feedType": "",
-    "docs": {},
-    "decimals": 18
-  },
-  {
-    "compareOffchain": "",
-    "contractAddress": "x",
-    "name": "WEMIX / USD",
-    "path": "wemix-usd",
-    "proxyAddress": "0x01ef65a95a000332000000000000000000000000000000000000000000000000",
-    "threshold": 0.1,
-    "heartbeat": 1800,
-    "valuePrefix": "",
-    "assetName": "",
-    "feedCategory": "",
-    "feedType": "",
-    "docs": {},
-    "decimals": 18
-  },
-  {
-    "compareOffchain": "",
-    "contractAddress": "x",
-    "name": "CELO / USD",
-    "path": "celo-usd",
-    "proxyAddress": "0x0132427bcd000332000000000000000000000000000000000000000000000000",
-    "threshold": 0.1,
-    "heartbeat": 1800,
-    "valuePrefix": "",
-    "assetName": "",
-    "feedCategory": "",
-    "feedType": "",
-    "docs": {},
-    "decimals": 18
   }
 ]
diff --git a/src/config/data/ccip/v1_2_0/mainnet/lanes.json b/src/config/data/ccip/v1_2_0/mainnet/lanes.json
@@ -4439,6 +4439,16 @@
       }
     },
     "ronin-mainnet": {
+      "offRamp": {
+        "address": "0x0A44Db4366385483cbCc9460fA55a75345553286",
+        "version": "1.5.0"
+      },
+      "onRamp": {
+        "address": "0x5dE068a87f081Ea01932769807CA569265E4f622",
+        "version": "1.5.0",
+        "enforceOutOfOrder": false
+      },
+      "rmnPermeable": false,
       "supportedTokens": {
         "LINK": {
           "rateLimiterConfig": {
@@ -8311,6 +8321,16 @@
   },
   "ronin-mainnet": {
     "ethereum-mainnet-base-1": {
+      "offRamp": {
+        "address": "0x79Dd7DB8AdEbf6622852a5ACe471a78EDc6C0883",
+        "version": "1.5.0"
+      },
+      "onRamp": {
+        "address": "0x261fE8A0C492a1Ede8cf966AED16619C772198F5",
+        "enforceOutOfOrder": false,
+        "version": "1.5.0"
+      },
+      "rmnPermeable": false,
       "supportedTokens": {
         "LINK": {
           "rateLimiterConfig": {

diff --git a/...t/data-streams/tutorials/streams-direct/solana-offchain-report-verification.mdx b/...t/data-streams/tutorials/streams-direct/solana-offchain-report-verification.mdx
@@ -131,9 +131,9 @@ default = []
 data-streams-report = { git = "https://github.com/smartcontractkit/data-streams-sdk.git" }
 sdk-off-chain = { git = "https://github.com/smartcontractkit/smart-contract-examples.git", branch = "data-streams-solana-integration", package = "sdk-off-chain"}
 
-solana-program = "2.1.6"
-solana-sdk = "2.1.6"
-solana-client = "2.1.6"
+solana-program = "1.18.26"
+solana-sdk = "1.18.26"
+solana-client = "1.18.26"
 hex = "0.4.3"
 borsh = "0.10.3"
 ```

diff --git a/src/features/data/chains.ts b/src/features/data/chains.ts
@@ -544,8 +544,7 @@ export const CHAINS: Chain[] = [
         name: "Aptos Testnet",
         explorerUrl: "",
         networkType: "testnet",
-        rddUrl:
-          "https://gist.githubusercontent.com/khadni/0894bd57169f2aaa840b89e40440e21a/raw/2cc8db69ab04f370de3ec2cee2d94b46c1282480/feeds-aptos-testnet.json",
+        rddUrl: "https://docs.chain.link/files/json/feeds-aptos-testnet.json",
         queryString: "aptos-testnet",
       },
     ],