Merge branch 'master' into feat/auto-deploy

SocketDotTech · Jun 4, 2024 · f63f59c · f63f59c
2 parents b39adc7 + 42f1703
commit f63f59c
Show file tree

Hide file tree

Showing 14 changed files with 546 additions and 26 deletions.
diff --git a/.env.example b/.env.example
@@ -71,6 +71,9 @@ POLYNOMIAL_TESTNET_RPC=''
 BOB_RPC=''
 KINTO_RPC=''
 KINTO_DEVNET_RPC=''
+SIPHER_FUNKI_TESTNET_RPC=''
+WINR_RPC=''
+BLAST_RPC=''
 
 # update these settings
 

diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json
diff --git a/hardhat.config.ts b/hardhat.config.ts
@@ -112,6 +112,11 @@ if (isProduction) {
     [HardhatChainName.BOB]: getChainConfig(ChainId.BOB),
     [HardhatChainName.KINTO]: getChainConfig(ChainId.KINTO),
     [HardhatChainName.KINTO_DEVNET]: getChainConfig(ChainId.KINTO_DEVNET),
+    [HardhatChainName.SIPHER_FUNKI_TESTNET]: getChainConfig(
+      ChainId.SIPHER_FUNKI_TESTNET
+    ),
+    [HardhatChainName.WINR]: getChainConfig(ChainId.WINR),
+    [HardhatChainName.BLAST]: getChainConfig(ChainId.BLAST),
   };
 }
 
@@ -142,7 +147,7 @@ const config: HardhatUserConfig = {
       modeTestnet: process.env.MODE_API_KEY || "",
       victionTestnet: process.env.VICTION_API_KEY || "",
       base: process.env.BASESCAN_API_KEY || "",
-      mode: process.env.MODE_API_KEY || "",
+      mode: process.env.MODE_API_KEY || "none",
       ancient8Testnet: process.env.ANCIENT8_API_KEY || "",
       ancient8Testnet2: process.env.ANCIENT8_API_KEY || "",
       hookTestnet: process.env.HOOK_API_KEY || "",
@@ -153,6 +158,9 @@ const config: HardhatUserConfig = {
       syndrSepoliaL3: process.env.SYNDR_API_KEY || "",
       kinto: process.env.KINTO_API_KEY || "",
       kinto_devnet: process.env.KINTO_DEVNET_API_KEY || "",
+      sipher_funki_testnet: "none",
+      winr: "none",
+      blast: process.env.BLASTSCAN_API_KEY || "",
     },
     customChains: [
       {
@@ -195,6 +203,38 @@ const config: HardhatUserConfig = {
           browserURL: "https://explorer.kinto.xyz",
         },
       },
+      {
+        network: "sipher_funki_testnet",
+        chainId: ChainId.SIPHER_FUNKI_TESTNET,
+        urls: {
+          apiURL: "https://sepolia-sandbox.funkichain.com/api",
+          browserURL: "https://sepolia-sandbox.funkichain.com",
+        },
+      },
+      {
+        network: "winr",
+        chainId: ChainId.WINR,
+        urls: {
+          apiURL: "https://explorerl2new-winr-mainnet-0.t.conduit.xyz/api",
+          browserURL: "https://explorerl2new-winr-mainnet-0.t.conduit.xyz",
+        },
+      },
+      {
+        network: "blast",
+        chainId: ChainId.BLAST,
+        urls: {
+          apiURL: "https://api.blastscan.io/api",
+          browserURL: "https://blastscan.io",
+        },
+      },
+      {
+        network: "mode",
+        chainId: ChainId.MODE,
+        urls: {
+          apiURL: "https://explorer.mode.network/api",
+          browserURL: "https://explorer.mode.network",
+        },
+      },
     ],
   },
   networks: {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@socket.tech/dl-core",
   "license": "UNLICENSED",
-  "version": "2.7.0",
+  "version": "2.9.0",
   "description": "Smart contracts for socket data layer.",
   "main": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",

diff --git a/scripts/deploy/config/config.ts b/scripts/deploy/config/config.ts
@@ -48,14 +48,14 @@ export const chains: Array<ChainSlug> = [
   // ChainSlug.XAI_TESTNET,
   // ChainSlug.CDK_TESTNET,
   // ChainSlug.AEVO,
-  // ChainSlug.MAINNET,
-  // ChainSlug.ARBITRUM,
-  // ChainSlug.OPTIMISM,
-  // ChainSlug.POLYGON_MAINNET,
-  // ChainSlug.LYRA,
+  ChainSlug.MAINNET,
+  ChainSlug.ARBITRUM,
+  ChainSlug.OPTIMISM,
+  ChainSlug.POLYGON_MAINNET,
+  ChainSlug.LYRA,
   // ChainSlug.BSC,
   ChainSlug.BASE,
-  // ChainSlug.MODE,
+  ChainSlug.MODE,
   // ChainSlug.ANCIENT8_TESTNET,
   // ChainSlug.ANCIENT8_TESTNET2,
   // ChainSlug.SYNDR_SEPOLIA_L3,
@@ -64,9 +64,12 @@ export const chains: Array<ChainSlug> = [
   // ChainSlug.PARALLEL,
   // ChainSlug.MANTLE,
   // ChainSlug.REYA_CRONOS,
-  ChainSlug.REYA,
+  // ChainSlug.REYA,
   // ChainSlug.POLYNOMIAL_TESTNET,
   // ChainSlug.BOB,
+  // ChainSlug.SIPHER_FUNKI_TESTNET,
+  // ChainSlug.WINR,
+  ChainSlug.BLAST,
 ];
 
 export const executionManagerVersion = CORE_CONTRACTS.ExecutionManager;
@@ -130,9 +133,9 @@ export const overrides = (
 } => {
   if (chain == ChainSlug.ARBITRUM) {
     return {
-      type,
-      gasLimit: 200_000_000,
-      gasPrice,
+      // type,
+      // gasLimit: 200_000_000,
+      // gasPrice,
     };
   } else if (chain == ChainSlug.ARBITRUM_SEPOLIA) {
     return {
@@ -142,15 +145,15 @@ export const overrides = (
     };
   } else if (chain == ChainSlug.OPTIMISM) {
     return {
-      type,
-      gasLimit: 4_000_000,
-      gasPrice,
+      // type,
+      // gasLimit: 4_000_000,
+      // gasPrice,
     };
   } else if (chain == ChainSlug.BASE) {
     return {
-      type,
-      gasLimit: 2_000_000,
-      gasPrice: 2_000_000_000,
+      // type,
+      // gasLimit: 2_000_000,
+      // gasPrice: 2_000_000_000,
     };
   } else if (chain == ChainSlug.OPTIMISM_SEPOLIA) {
     return {
@@ -168,7 +171,7 @@ export const overrides = (
     return {
       // type: 1,
       gasLimit: 4_000_000,
-      gasPrice: 40_000_000_000,
+      gasPrice: 30_000_000_000,
     };
   } else if (chain == ChainSlug.GOERLI) {
     return {
@@ -180,13 +183,13 @@ export const overrides = (
     return {
       type,
       gasLimit,
-      gasPrice: 200_000_000_000,
+      gasPrice: 50_000_000_000,
     };
   } else if (chain == ChainSlug.SEPOLIA) {
     return {
-      type,
-      gasLimit: 2_000_000,
-      gasPrice: 250_000_000_000,
+      // type,
+      // gasLimit: 2_000_000,
+      // gasPrice: 250_000_000_000,
     };
   } else if (chain == ChainSlug.AEVO_TESTNET) {
     return {
@@ -230,6 +233,12 @@ export const overrides = (
       // gasLimit,
       gasPrice: 100_000_000,
     };
+  } else if (chain == ChainSlug.MODE) {
+    return {
+      type: 1,
+      gasLimit: 10_000_000,
+      gasPrice: 1_000_000,
+    };
   } else if (chain == ChainSlug.SYNDR_SEPOLIA_L3) {
     return {
       type: 1,
@@ -284,6 +293,24 @@ export const overrides = (
       gasLimit: 4_000_000,
       gasPrice,
     };
+  } else if (chain == ChainSlug.SIPHER_FUNKI_TESTNET) {
+    return {
+      // type,
+      // gasLimit,
+      // gasPrice,
+    };
+  } else if (chain == ChainSlug.WINR) {
+    return {
+      // type,
+      // gasLimit,
+      // gasPrice,
+    };
+  } else if (chain == ChainSlug.BLAST) {
+    return {
+      // type,
+      // gasLimit,
+      // gasPrice,
+    };
   } else if (chainConfig[chain] && chainConfig[chain].overrides) {
     return chainConfig[chain].overrides!;
   } else return { type, gasLimit, gasPrice };

diff --git a/src/enums/chainId.ts b/src/enums/chainId.ts
@@ -38,4 +38,7 @@ export enum ChainId {
   BOB = 60808,
   KINTO = 7887,
   KINTO_DEVNET = 412346,
+  SIPHER_FUNKI_TESTNET = 3397901,
+  WINR = 777777,
+  BLAST = 81457,
 }
diff --git a/src/enums/chainSlug.ts b/src/enums/chainSlug.ts
@@ -40,4 +40,7 @@ export enum ChainSlug {
   BOB = ChainId.BOB,
   KINTO = ChainId.KINTO,
   KINTO_DEVNET = ChainId.KINTO_DEVNET,
+  SIPHER_FUNKI_TESTNET = ChainId.SIPHER_FUNKI_TESTNET,
+  WINR = ChainId.WINR,
+  BLAST = ChainId.BLAST,
 }
diff --git a/src/enums/chainSlugToHardhatChainName.ts b/src/enums/chainSlugToHardhatChainName.ts
@@ -41,4 +41,7 @@ export const chainSlugToHardhatChainName = {
   [ChainSlug.BOB]: HardhatChainName.BOB,
   [ChainSlug.KINTO]: HardhatChainName.KINTO,
   [ChainSlug.KINTO_DEVNET]: HardhatChainName.KINTO_DEVNET,
+  [ChainSlug.SIPHER_FUNKI_TESTNET]: HardhatChainName.SIPHER_FUNKI_TESTNET,
+  [ChainSlug.WINR]: HardhatChainName.WINR,
+  [ChainSlug.BLAST]: HardhatChainName.BLAST,
 };
diff --git a/src/enums/chainSlugToId.ts b/src/enums/chainSlugToId.ts
@@ -41,4 +41,7 @@ export const ChainSlugToId = {
   [ChainSlug.BOB]: ChainId.BOB,
   [ChainSlug.KINTO]: ChainId.KINTO,
   [ChainSlug.KINTO_DEVNET]: ChainId.KINTO_DEVNET,
+  [ChainSlug.SIPHER_FUNKI_TESTNET]: ChainId.SIPHER_FUNKI_TESTNET,
+  [ChainSlug.WINR]: ChainId.WINR,
+  [ChainSlug.BLAST]: ChainId.BLAST,
 };
diff --git a/src/enums/chainSlugToKey.ts b/src/enums/chainSlugToKey.ts
@@ -41,4 +41,7 @@ export const ChainSlugToKey = {
   [ChainSlug.BOB]: HardhatChainName.BOB,
   [ChainSlug.KINTO]: HardhatChainName.KINTO,
   [ChainSlug.KINTO_DEVNET]: HardhatChainName.KINTO_DEVNET,
+  [ChainSlug.SIPHER_FUNKI_TESTNET]: HardhatChainName.SIPHER_FUNKI_TESTNET,
+  [ChainSlug.WINR]: HardhatChainName.WINR,
+  [ChainSlug.BLAST]: HardhatChainName.BLAST,
 };
diff --git a/src/enums/hardhatChainName.ts b/src/enums/hardhatChainName.ts
@@ -38,4 +38,7 @@ export enum HardhatChainName {
   BOB = "bob",
   KINTO = "kinto",
   KINTO_DEVNET = "kinto_devnet",
+  SIPHER_FUNKI_TESTNET = "sipher_funki_testnet",
+  WINR = "winr",
+  BLAST = "blast",
 }
diff --git a/src/enums/hardhatChainNameToSlug.ts b/src/enums/hardhatChainNameToSlug.ts
@@ -40,4 +40,7 @@ export const hardhatChainNameToSlug = {
   [HardhatChainName.BOB]: ChainSlug.BOB,
   [HardhatChainName.KINTO]: ChainSlug.KINTO,
   [HardhatChainName.KINTO_DEVNET]: ChainSlug.KINTO_DEVNET,
+  [HardhatChainName.SIPHER_FUNKI_TESTNET]: ChainSlug.SIPHER_FUNKI_TESTNET,
+  [HardhatChainName.WINR]: ChainSlug.WINR,
+  [HardhatChainName.BLAST]: ChainSlug.BLAST,
 };
diff --git a/src/enums/mainnetIds.ts b/src/enums/mainnetIds.ts
@@ -17,4 +17,6 @@ export const MainnetIds: ChainSlug[] = [
   ChainSlug.SX_NETWORK,
   ChainSlug.BOB,
   ChainSlug.KINTO,
+  ChainSlug.WINR,
+  ChainSlug.BLAST,
 ];
diff --git a/src/enums/testnetIds.ts b/src/enums/testnetIds.ts
@@ -22,4 +22,5 @@ export const TestnetIds: ChainSlug[] = [
   ChainSlug.SYNDR_SEPOLIA_L3,
   ChainSlug.POLYNOMIAL_TESTNET,
   ChainSlug.KINTO_DEVNET,
+  ChainSlug.SIPHER_FUNKI_TESTNET,
 ];