fix: use manual nonce management instead

consensus-shipyard · Nov 11, 2024 · 4a33fb4 · 4a33fb4
1 parent 4220e39
commit 4a33fb4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 33 deletions.
diff --git a/.github/workflows/contracts-deployment-test.yaml b/.github/workflows/contracts-deployment-test.yaml
@@ -1,4 +1,4 @@
-name: 'Contracts: Smoke test deployment'
+name: "Contracts: Smoke test deployment"
 
 # This workflow is triggered from the main CI workflow.
 on:
@@ -17,8 +17,8 @@ jobs:
     - name: Setup Node
       uses: actions/setup-node@v4
       with:
-        node-version: '18.x'
-        cache: 'pnpm'
+        node-version: "18.x"
+        cache: "pnpm"
 
     - name: Install dependencies
       run: cd contracts && make deps
@@ -36,6 +36,6 @@ jobs:
         echo "export RPC_URL=http://127.0.0.1:1337" >> .env
         echo "export CHAIN_ID=1337" >> .env
         export PATH="$PATH:/home/runner/.config/.foundry/bin"
-        pnpm exec ganache-cli -b 1 -g0 -p1337 --account 0x$PRIVATE_KEY,1001901919191919191  &
+        pnpm exec ganache-cli -g0 -p1337 --account 0x$PRIVATE_KEY,1001901919191919191  &
         sleep 5
         make deploy-stack
diff --git a/contracts/tasks/deploy-registry.ts b/contracts/tasks/deploy-registry.ts
@@ -97,12 +97,8 @@ task('deploy-registry')
             creationPrivileges: Number(mode),
         }
 
-        console.log(`Deploying SubnetRegistryDiamond...`)
-        const registry = await hre.deployments.deploy('SubnetRegistryDiamond', {
-            from: deployer,
+        Deployments.deploy(hre, deployer, {
+            name: 'SubnetRegistryDiamond',
             args: [registryFacets.asFacetCuts(), registryConstructorParams],
-            log: true,
-            waitConfirmations: 1,
-        })
-        console.log(`SubnetRegistryDiamond deployed at ${registry.address}`)
+        });
     })
diff --git a/contracts/tasks/lib/deployments.ts b/contracts/tasks/lib/deployments.ts
@@ -68,29 +68,19 @@ export class Deployments {
                 ...(contract.libraries || []),
             )
 
-            // This is a workaround for an issue where the nonce gets reused. This can occur in load-balanced environments 
-            // where transactions are sent to different nodes, and the nonce is not consistently updated across all nodes.
-            while (true) {
-                try {
-                    const result = await hre.deployments.deploy(contract.name, {
-                        from: deployer,
-                        log: true,
-                        args: contract.args,
-                        libraries: libraries.addresses,
-                        waitConfirmations: 2,
-                    })
-                    results[contract.name] = result
-                    console.log(`${contract.name} deployed at ${result.address}`)
-                    break
-                } catch (error) {
-                    if (error instanceof Error &&(error as any).code === "NONCE_EXPIRED") {
-                        console.log(`Nonce expired. Retrying deployment of ${contract.name}`)
+            // Manually managed nonce due to a Filecoin update, which requires specifying 'pending' with
+            // getTransactionCount to retrieve the latest nonce.
+            const nonce = await hre.ethers.provider.getTransactionCount(deployer, "pending");
 
-                        continue
-                      }
-                      throw error
-                }
-            }
+            const result = await hre.deployments.deploy(contract.name, {
+                from: deployer,
+                log: true,
+                args: contract.args,
+                libraries: libraries.addresses,
+                nonce: nonce,
+            })
+            results[contract.name] = result
+            console.log(`${contract.name} deployed at ${result.address}`)
         }
 
         return new Deployments(