Merge pull request #339 from SocketDotTech/fast2-rm

Fast2 rm
SocketDotTech · Nov 15, 2023 · 9da878a · 9da878a
2 parents 52e65f6 + 1b35528
commit 9da878a
Show file tree

Hide file tree

Showing 10 changed files with 199 additions and 574 deletions.
diff --git a/deployments/dev_addresses.json b/deployments/dev_addresses.json
diff --git a/deployments/prod_addresses.json b/deployments/prod_addresses.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@socket.tech/dl-core",
   "license": "UNLICENSED",
-  "version": "2.4.11-test.1",
+  "version": "2.4.11-test.2",
   "description": "Smart contracts for socket data layer.",
   "main": "./dist/src/index.js",
   "types": "./dist/src/index.d.ts",

diff --git a/scripts/constants/config.ts b/scripts/constants/config.ts
@@ -18,8 +18,7 @@ export const getDefaultIntegrationType = (
 ): IntegrationTypes => {
   return switchboards?.[chain]?.[sibling]
     ? IntegrationTypes.native
-    : IntegrationTypes.fast2;
-  // : IntegrationTypes.fast; // revert back this when migration done
+    : IntegrationTypes.fast; // revert back this when migration done
 };
 
 export const switchboards = {

diff --git a/scripts/deploy/2-check-roles.ts b/scripts/deploy/2-check-roles.ts
@@ -126,38 +126,6 @@ const main = async () => {
   });
   summary.push(s);
 
-  // Setup Fast Switchboard2 roles
-  s = await checkAndUpdateRoles({
-    userSpecificRoles: [
-      {
-        userAddress: ownerAddress,
-        filterRoles: [
-          ROLES.RESCUE_ROLE,
-          ROLES.GOVERNANCE_ROLE,
-          ROLES.TRIP_ROLE,
-          ROLES.UN_TRIP_ROLE,
-          ROLES.WITHDRAW_ROLE,
-          ROLES.FEES_UPDATER_ROLE,
-        ],
-      },
-      {
-        userAddress: transmitterAddress,
-        filterRoles: [ROLES.FEES_UPDATER_ROLE],
-      },
-      {
-        userAddress: watcherAddress,
-        filterRoles: [ROLES.WATCHER_ROLE],
-      },
-    ],
-
-    contractName: CORE_CONTRACTS.FastSwitchboard2,
-    filterChains,
-    filterSiblingChains,
-    sendTransaction,
-    newRoleStatus,
-  });
-  summary.push(s);
-
   // Grant watcher role to watcher for OptimisticSwitchboard
   s = await checkAndUpdateRoles({
     userSpecificRoles: [

diff --git a/scripts/deploy/3-configure.ts b/scripts/deploy/3-configure.ts
@@ -105,8 +105,8 @@ export const main = async () => {
         addr = await registerSwitchboards(
           chain,
           siblingSlugs,
-          CORE_CONTRACTS.FastSwitchboard2,
-          IntegrationTypes.fast2,
+          CORE_CONTRACTS.FastSwitchboard,
+          IntegrationTypes.fast,
           addr,
           addresses,
           socketSigner

diff --git a/scripts/deploy/helpers/fastSwitchboards.ts b/scripts/deploy/helpers/fastSwitchboards.ts
@@ -37,7 +37,7 @@ const main = async (srcChains: ChainSlug[], dstChains: ChainSlug[]) => {
     await Promise.all(
       srcChainSlugs.map(async (chainSlug) => {
         let fastSwitchboardAddress =
-          addresses[chainSlug as ChainSlug]?.FastSwitchboard2;
+          addresses[chainSlug as ChainSlug]?.FastSwitchboard;
         if (!fastSwitchboardAddress) return;
 
         let siblingChains = dstChainSlugs.filter((s) => chainSlug !== s);

diff --git a/scripts/deploy/scripts/deploySwitchboard.ts b/scripts/deploy/scripts/deploySwitchboard.ts
@@ -22,9 +22,9 @@ export default async function deploySwitchboards(
   mode: DeploymentMode
 ): Promise<ChainSocketAddresses> {
   let updatedConfig: any = sourceConfig;
-  if (!sourceConfig.FastSwitchboard2)
+  if (!sourceConfig.FastSwitchboard)
     updatedConfig = await deploySwitchboard(
-      IntegrationTypes.fast2,
+      IntegrationTypes.fast,
       chainSlug,
       "",
       signer,

diff --git a/scripts/deploy/single-click-deploy/addChain.ts b/scripts/deploy/single-click-deploy/addChain.ts
@@ -59,8 +59,8 @@ export const main = async () => {
   let addr = await registerSwitchboards(
     chain,
     siblings,
-    CORE_CONTRACTS.FastSwitchboard2,
-    IntegrationTypes.fast2,
+    CORE_CONTRACTS.FastSwitchboard,
+    IntegrationTypes.fast,
     addresses[chain],
     allAddresses,
     socketSigner

diff --git a/scripts/deploy/single-click-deploy/configureChain.ts b/scripts/deploy/single-click-deploy/configureChain.ts
@@ -53,8 +53,8 @@ export const main = async () => {
     addr = await registerSwitchboards(
       sibling,
       [chain],
-      CORE_CONTRACTS.FastSwitchboard2,
-      IntegrationTypes.fast2,
+      CORE_CONTRACTS.FastSwitchboard,
+      IntegrationTypes.fast,
       addresses[sibling]!,
       addresses,
       socketSigner
@@ -115,26 +115,6 @@ const grantRoles = async () => {
     newRoleStatus,
   });
 
-  // Setup Fast Switchboard2 roles
-  await checkAndUpdateRoles({
-    userSpecificRoles: [
-      {
-        userAddress: config.feeUpdaterAddress,
-        filterRoles: [ROLES.FEES_UPDATER_ROLE],
-      },
-      {
-        userAddress: config.watcherAddress,
-        filterRoles: [ROLES.WATCHER_ROLE],
-      },
-    ],
-
-    contractName: CORE_CONTRACTS.FastSwitchboard2,
-    filterChains,
-    filterSiblingChains: [chain],
-    sendTransaction,
-    newRoleStatus,
-  });
-
   // Grant watcher role to watcher for OptimisticSwitchboard
   await checkAndUpdateRoles({
     userSpecificRoles: [