change network rpc url

hamster-shared · Oct 30, 2023 · df3fe5b · df3fe5b
1 parent 59e25f8
commit df3fe5b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/views/projects/projectsDeploymentDetail/index.vue b/src/views/projects/projectsDeploymentDetail/index.vue
@@ -79,13 +79,11 @@ const execDeploy = async () => {
     if (execStatus) {
       const { data } = await apiGetProjectsContract({ id: projectId, version: route.query.version});
       const contractMap = formatContractList(data)
-      const networkData = await apiGetNetworkByName(res.data.network)
       let deployParams = {
         projectId:projectId,
         execId: executeId,
         version: route.query.version,
         network: res.data.network,
-        rpcUrl: networkData.data.rpcUrl
       }
       newEngine.start(contractMap,execJson,deployParams)
     }

diff --git a/src/views/projects/projectsDeploymentOrchestration/components/DeployData.ts b/src/views/projects/projectsDeploymentOrchestration/components/DeployData.ts
@@ -43,7 +43,6 @@ export interface DeployParams {
   execId: number
   version:string
   network:string
-  rpcUrl:string
 }
 
 export const ERC1967_ABI = [

diff --git a/src/views/projects/projectsDeploymentOrchestration/components/utils/engine.ts b/src/views/projects/projectsDeploymentOrchestration/components/utils/engine.ts
@@ -10,6 +10,7 @@ import {callContract, deployContract, deployProxyContract, getTransaction, upgra
 import {apiUpdateExecuteInfo} from "@/apis/contractOrchestrationDeploy";
 import {apiProjectsContractDeploy} from "@/apis/projects";
 import {message} from "ant-design-vue";
+import {apiGetNetworkByName} from "@/apis/network";
 
 
 
@@ -65,7 +66,19 @@ export default class NewEngine {
             }
             if (step.status == "RUNNING") {
                 if (step.transactionHash != "" || step.transactionHash != undefined) {
-                    const receipt = await getTransaction(step.transactionHash,deployParams.rpcUrl)
+                    let network = ""
+                    try {
+                        const networkData = await apiGetNetworkByName(deployParams.network)
+                        network = networkData.data.rpcUrl
+                    } catch (e) {
+                        step.status = "FAILED"
+                        deployStep.status = "FAILED"
+                        this.isRunning = false
+                        // save exec status
+                        await saveDeployExec(deployParams.projectId,deployParams.execId,JSON.stringify(deployInfo))
+                        return
+                    }
+                    const receipt = await getTransaction(step.transactionHash,network)
                     if (receipt.status == 0 || receipt.status == undefined ) {
                         step.status = "FAILED"
                         deployStep.status = "FAILED"