Merge branch 'main' into fix-replay-panic

consensus-shipyard · Nov 11, 2024 · 707563f · 707563f
2 parents 735754f + 0d44ac3
commit 707563f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 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

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,16 +68,22 @@ export class Deployments {
                 ...(contract.libraries || []),
             )
 
+            // 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");
+
             const result = await hre.deployments.deploy(contract.name, {
                 from: deployer,
                 log: true,
                 args: contract.args,
                 libraries: libraries.addresses,
+                nonce: nonce,
                 waitConfirmations: 1,
             })
             results[contract.name] = result
             console.log(`${contract.name} deployed at ${result.address}`)
         }
+
         return new Deployments(
             await Deployments.resolveContracts(hre, Object.keys(results)),
             results,