Merge branch 'main' into improve-rbac-practices

smartcontractkit · Mar 11, 2024 · a78a785 · a78a785
2 parents 82d6c35 + 7022776
commit a78a785
Show file tree

Hide file tree

Showing 33 changed files with 1,311 additions and 111 deletions.
diff --git a/public/assets/chains/kroma.svg b/public/assets/chains/kroma.svg
diff --git a/public/assets/chains/wemix.svg b/public/assets/chains/wemix.svg
diff --git a/public/images/developer-responsibilities.webp b/public/images/developer-responsibilities.webp
diff --git a/public/samples/Automation/StreamsWithError.sol b/public/samples/Automation/StreamsWithError.sol
@@ -123,7 +123,7 @@ contract StreamsLookupChainlinkAutomation is
         bool success = false;
         bool isError = true;
         // Add custom logic to handle errors offchain here
-        if (errorCode == 800400) {
+        if (errorCode == 808400) {
             // Bad request error code
             _upkeepNeeded = false;
         } else {

diff --git a/src/config/data/ccip/v1_2_0/mainnet/chains.json b/src/config/data/ccip/v1_2_0/mainnet/chains.json
@@ -33,5 +33,15 @@
     "chainSelector": "15971525489660198786",
     "router": "0x881e3A65B4d4a04dD529061dd0071cf975F58bCD",
     "feeTokens": ["LINK", "WETH"]
+  },
+  "wemix-mainnet": {
+    "chainSelector": "5142893604156789321",
+    "router": "0x7798b795Fde864f4Cd1b124a38Ba9619B7F8A442",
+    "feeTokens": ["LINK", "WWEMIX"]
+  },
+  "ethereum-mainnet-kroma-1": {
+    "chainSelector": "3719320017875267166",
+    "router": "0xE93E8B0d1b1CEB44350C8758ed1E2799CCee31aB",
+    "feeTokens": ["LINK", "WETH"]
   }
 }