chore: upgrade prepare upgrade scripts

FuelLabs · Sep 26, 2024 · 56b08ef · 56b08ef
1 parent b4056e4
commit 56b08ef
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 19 deletions.
diff --git a/packages/solidity-contracts/deploy/upgradeTest/prepareUpgrade.chain_state.ts b/packages/solidity-contracts/deploy/upgradeTest/prepareUpgrade.chain_state.ts
@@ -2,7 +2,7 @@ import type { HardhatRuntimeEnvironment } from 'hardhat/types';
 import type { DeployFunction } from 'hardhat-deploy/dist/types';
 
 import { FuelChainState__factory as FuelChainState } from '../../typechain';
-import { TransactionResponse, getCreateAddress } from 'ethers';
+import { TransactionResponse } from 'ethers';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const {

diff --git a/packages/solidity-contracts/deploy/upgradeTest/prepareUpgrade.erc20_gateway_v4.ts b/packages/solidity-contracts/deploy/upgradeTest/prepareUpgrade.erc20_gateway_v4.ts
@@ -2,6 +2,7 @@ import type { HardhatRuntimeEnvironment } from 'hardhat/types';
 import type { DeployFunction } from 'hardhat-deploy/dist/types';
 
 import { FuelERC20GatewayV4__factory as FuelERC20Gateway } from '../../typechain';
+import { TransactionResponse } from 'ethers';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const {
@@ -11,27 +12,29 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const contractDeployment = await hre.deployments.get('FuelERC20GatewayV4');
 
-  const contract = await hre.ethers.getContractFactory('FuelERC20GatewayV4');
+  const factory = await hre.ethers.getContractFactory('FuelERC20GatewayV4');
 
-  const implementationAddress = await prepareUpgrade(
-    contractDeployment.address,
-    contract,
-    {
-      kind: 'uups',
-      constructorArgs: contractDeployment.linkedData.constructorArgs,
-    }
+  const response = (await prepareUpgrade(contractDeployment.address, factory, {
+    kind: 'uups',
+    constructorArgs: contractDeployment.linkedData.constructorArgs,
+    getTxResponse: true,
+  })) as TransactionResponse;
+
+  const receipt = await hre.ethers.provider.getTransactionReceipt(
+    response.hash
   );
 
   await save('FuelERC20GatewayV4', {
     address: contractDeployment.address,
     abi: [...FuelERC20Gateway.abi],
     implementation: contractDeployment.implementation,
+    transactionHash: response.hash,
     linkedData: {
       factory: 'FuelERC20GatewayV4',
       constructorArgs: contractDeployment.linkedData.constructorArgs,
       initArgs: contractDeployment.linkedData.initArgs,
       isProxy: false,
-      newImplementation: implementationAddress.toString(),
+      newImplementation: receipt?.contractAddress,
     },
   });
 };

diff --git a/packages/solidity-contracts/deploy/upgradeTest/prepareUpgrade.fuel_message_portal_v3.ts b/packages/solidity-contracts/deploy/upgradeTest/prepareUpgrade.fuel_message_portal_v3.ts
@@ -2,6 +2,7 @@ import type { HardhatRuntimeEnvironment } from 'hardhat/types';
 import type { DeployFunction } from 'hardhat-deploy/dist/types';
 
 import { FuelMessagePortalV3__factory as FuelMessagePortal } from '../../typechain';
+import { TransactionResponse } from 'ethers';
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const {
@@ -11,27 +12,29 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
 
   const contractDeployment = await hre.deployments.get('FuelMessagePortalV3');
 
-  const contract = await hre.ethers.getContractFactory('FuelMessagePortalV3');
+  const factory = await hre.ethers.getContractFactory('FuelMessagePortalV3');
 
-  const implementationAddress = await prepareUpgrade(
-    contractDeployment.address,
-    contract,
-    {
-      kind: 'uups',
-      constructorArgs: contractDeployment.linkedData.constructorArgs,
-    }
+  const response = (await prepareUpgrade(contractDeployment.address, factory, {
+    kind: 'uups',
+    constructorArgs: contractDeployment.linkedData.constructorArgs,
+    getTxResponse: true,
+  })) as TransactionResponse;
+
+  const receipt = await hre.ethers.provider.getTransactionReceipt(
+    response.hash
   );
 
   await save('FuelMessagePortalV3', {
     address: contractDeployment.address,
     abi: [...FuelMessagePortal.abi],
     implementation: contractDeployment.implementation,
+    transactionHash: response.hash,
     linkedData: {
       factory: 'FuelMessagePortalV3',
       constructorArgs: contractDeployment.linkedData.constructorArgs,
       initArgs: contractDeployment.linkedData.initArgs,
       isProxy: false,
-      newImplementation: implementationAddress.toString(),
+      newImplementation: receipt?.contractAddress,
     },
   });
 };