add skip option when propose

hujw77 · Nov 7, 2024 · 0c9b369 · 0c9b369
1 parent ca6d58b
commit 0c9b369
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 35 deletions.
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hujw77/plugins",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "description": "Sphinx plugins",
   "main": "dist/index",
   "types": "dist/index",

diff --git a/packages/plugins/src/cli/propose/index.ts b/packages/plugins/src/cli/propose/index.ts
@@ -68,6 +68,7 @@ export interface ProposeArgs {
   networks: Array<string>
   isDryRun: boolean
   silent: boolean
+  skip: boolean
   scriptPath: string
   sphinxContext: SphinxContext
   targetContract?: string
@@ -243,7 +244,7 @@ export const propose = async (
   networkConfigArray?: Array<NetworkConfig>
   merkleTree?: SphinxMerkleTree
 }> => {
-  const { confirm, networks, isDryRun, silent, sphinxContext, targetContract } =
+  const { confirm, networks, isDryRun, silent, sphinxContext, targetContract, skip } =
     args
   const sig = args.sig === undefined ? ['run()'] : args.sig
 
@@ -382,7 +383,6 @@ export const propose = async (
   const merkleTree = makeSphinxMerkleTree(deploymentData)
 
   spinner.succeed(`Built proposal.`)
-  spinner.start(`Running simulation...`)
 
   const deploymentConfig = makeDeploymentConfig(
     networkConfigArray,
@@ -391,18 +391,21 @@ export const propose = async (
     merkleTree
   )
 
-  const gasEstimatesPromises = networkConfigArrayWithRpcUrls
-    .filter(({ networkConfig }) => networkConfig.actionInputs.length > 0)
-    .map(({ networkConfig, rpcUrl }) =>
-      sphinxContext.getNetworkGasEstimate(
-        deploymentConfig,
-        networkConfig.chainId,
-        rpcUrl
+  if (!skip) {
+    spinner.start(`Running simulation...`)
+    const gasEstimatesPromises = networkConfigArrayWithRpcUrls
+      .filter(({ networkConfig }) => networkConfig.actionInputs.length > 0)
+      .map(({ networkConfig, rpcUrl }) =>
+        sphinxContext.getNetworkGasEstimate(
+          deploymentConfig,
+          networkConfig.chainId,
+          rpcUrl
+        )
       )
-    )
-  const gasEstimates = await Promise.all(gasEstimatesPromises)
+    const gasEstimates = await Promise.all(gasEstimatesPromises)
+  }
 
-  spinner.succeed(`Simulation succeeded.`)
+  // spinner.succeed(`Simulation succeeded.`)
   const preview = getPreview(networkConfigArray, merkleTree.root)
   if (confirm || isDryRun) {
     if (!silent) {
@@ -466,25 +469,25 @@ export const propose = async (
     chainIds.push(Number(networkConfig.chainId))
   }
 
-  const proposalRequest: ProposalRequest = {
-    apiKey,
-    orgId: newConfig.orgId,
-    isTestnet,
-    chainIds,
-    projectName: newConfig.projectName,
-    safeAddress,
-    moduleAddress,
-    projectDeployments,
-    gasEstimates,
-    diff: preview,
-    compilerConfigId: undefined,
-    deploymentConfigId: undefined,
-    sphinxPluginVersion: SPHINX_PLUGINS_VERSION,
-    tree: {
-      root: merkleTree.root,
-      chainStatus,
-    },
-  }
+  // const proposalRequest: ProposalRequest = {
+  //   apiKey,
+  //   orgId: newConfig.orgId,
+  //   isTestnet,
+  //   chainIds,
+  //   projectName: newConfig.projectName,
+  //   safeAddress,
+  //   moduleAddress,
+  //   projectDeployments,
+  //   gasEstimates,
+  //   diff: preview,
+  //   compilerConfigId: undefined,
+  //   deploymentConfigId: undefined,
+  //   sphinxPluginVersion: SPHINX_PLUGINS_VERSION,
+  //   tree: {
+  //     root: merkleTree.root,
+  //     chainStatus,
+  //   },
+  // }
 
   const deploymentConfigData = JSON.stringify(deploymentConfig, null, 2)
 
@@ -519,7 +522,6 @@ export const propose = async (
     // )
   }
   return {
-    proposalRequest,
     deploymentConfigData,
     configArtifacts,
     networkConfigArray,

diff --git a/packages/plugins/src/cli/setup.ts b/packages/plugins/src/cli/setup.ts
@@ -81,6 +81,11 @@ export const makeCLI = (
             boolean: true,
             default: false,
           })
+          .option('skip', {
+            describe: 'Skip the executeion simulation.',
+            boolean: true,
+            default: false,
+          })
           .check((argv) => {
             const { networks } = argv
 
@@ -339,7 +344,7 @@ const proposeCommandHandler = async (
   argv: ProposeCommandArgs,
   sphinxContext: SphinxContext
 ): Promise<void> => {
-  const { networks, scriptPath, targetContract, silent, dryRun, confirm, sig } =
+  const { networks, scriptPath, targetContract, silent, dryRun, confirm, sig, skip } =
     argv
 
   if (dryRun && confirm) {
@@ -367,6 +372,7 @@ const proposeCommandHandler = async (
     sphinxContext,
     targetContract,
     sig,
+    skip,
   })
 }
 

diff --git a/packages/plugins/src/cli/types.ts b/packages/plugins/src/cli/types.ts
@@ -18,6 +18,7 @@ export interface ProposeCommandArgs {
   confirm: boolean
   dryRun: boolean
   silent: boolean
+  skip: boolean
   targetContract?: string
   sig?: Array<string>
 }

diff --git a/packages/plugins/src/cli/version.ts b/packages/plugins/src/cli/version.ts
@@ -1 +1 @@
-export const SPHINX_PLUGINS_VERSION = 'v0.1.28'
+export const SPHINX_PLUGINS_VERSION = 'v0.1.29'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const SPHINX_PLUGINS_VERSION = 'v0.1.28'
		export const SPHINX_PLUGINS_VERSION = 'v0.1.29'