chore: upgrade deployment scripts to ethers v6

CJ42 · CJ42 · commit 175ae9733b0d · 2024-02-27T14:22:01.000-07:00
diff --git a/deploy/001_deploy_universal_profile.ts b/deploy/001_deploy_universal_profile.ts
@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { DeployFunction } from 'hardhat-deploy/types';
-import { ethers } from 'hardhat';
 
 const deployUniversalProfile: DeployFunction = async ({
   deployments,
@@ -9,12 +8,9 @@ const deployUniversalProfile: DeployFunction = async ({
   const { deploy } = deployments;
   const { owner } = await getNamedAccounts();
 
-  const gasPrice = await ethers.provider.getGasPrice();
-
   await deploy('UniversalProfile', {
     from: owner,
     args: [owner],
-    gasPrice,
     log: true,
   });
 };
diff --git a/deploy/002_deploy_key_manager.ts b/deploy/002_deploy_key_manager.ts
@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { DeployFunction } from 'hardhat-deploy/types';
-import { ethers } from 'hardhat';
 
 const deployKeyManager: DeployFunction = async ({
   deployments,
@@ -11,12 +10,9 @@ const deployKeyManager: DeployFunction = async ({
 
   const UniversalProfile = await deployments.get('UniversalProfile');
 
-  const gasPrice = await ethers.provider.getGasPrice();
-
   await deploy('LSP6KeyManager', {
     from: owner,
     args: [UniversalProfile.address],
-    gasPrice,
     log: true,
   });
 };
diff --git a/deploy/003_deploy_universal_receiver_delegate.ts b/deploy/003_deploy_universal_receiver_delegate.ts
@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { DeployFunction } from 'hardhat-deploy/types';
-import { ethers } from 'hardhat';
 import { SALT } from './salt';
 
 const deployUniversalReceiverDelegateUPDeterministic: DeployFunction = async ({
@@ -10,11 +9,8 @@ const deployUniversalReceiverDelegateUPDeterministic: DeployFunction = async ({
   const { deploy } = deployments;
   const { owner: deployer } = await getNamedAccounts();
 
-  const gasPrice = await ethers.provider.getGasPrice();
-
   await deploy('LSP1UniversalReceiverDelegateUP', {
     from: deployer,
-    gasPrice,
     log: true,
     deterministicDeployment: SALT,
   });
diff --git a/deploy/005_deploy_universal_receiver_delegate_vault.ts b/deploy/005_deploy_universal_receiver_delegate_vault.ts
@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { DeployFunction } from 'hardhat-deploy/types';
-import { ethers } from 'hardhat';
 import { SALT } from './salt';
 
 const deployUniversalReceiverDelegateVaultDeterministic: DeployFunction = async ({
@@ -10,11 +9,8 @@ const deployUniversalReceiverDelegateVaultDeterministic: DeployFunction = async
   const { deploy } = deployments;
   const { owner: deployer } = await getNamedAccounts();
 
-  const gasPrice = await ethers.provider.getGasPrice();
-
   await deploy('LSP1UniversalReceiverDelegateVault', {
     from: deployer,
-    gasPrice,
     log: true,
     deterministicDeployment: SALT,
   });
diff --git a/deploy/006_deploy_base_universal_profile.ts b/deploy/006_deploy_base_universal_profile.ts
@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { DeployFunction } from 'hardhat-deploy/types';
-import { ethers } from 'hardhat';
 import { SALT } from './salt';
 
 const deployBaseUniversalProfileDeterministic: DeployFunction = async ({
@@ -10,12 +9,9 @@ const deployBaseUniversalProfileDeterministic: DeployFunction = async ({
   const { deploy } = deployments;
   const { owner: deployer } = await getNamedAccounts();
 
-  const gasPrice = await ethers.provider.getGasPrice();
-
   await deploy('UniversalProfileInit', {
     from: deployer,
     log: true,
-    gasPrice,
     deterministicDeployment: SALT,
   });
 };
diff --git a/deploy/007_deploy_base_key_manager.ts b/deploy/007_deploy_base_key_manager.ts
@@ -10,13 +10,10 @@ const deployBaseKeyManagerDeterministic: DeployFunction = async ({
   const { deploy } = deployments;
   const { owner: deployer } = await getNamedAccounts();
 
-  const gasPrice = await ethers.provider.getGasPrice();
-
   await deploy('LSP6KeyManagerInit', {
     from: deployer,
     log: true,
     gasLimit: 5_000_000,
-    gasPrice,
     deterministicDeployment: SALT,
   });
 };
diff --git a/deploy/008_deploy_lsp7_mintable.ts b/deploy/008_deploy_lsp7_mintable.ts
@@ -1,7 +1,6 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { DeployFunction } from 'hardhat-deploy/types';
-import { ethers } from 'hardhat';
-import { LSP4_TOKEN_TYPES } from '../constants';
+import { LSP4_TOKEN_TYPES } from '@lukso/lsp4-contracts/constants';
 
 const deployLSP7Mintable: DeployFunction = async ({
   deployments,
@@ -10,12 +9,9 @@ const deployLSP7Mintable: DeployFunction = async ({
   const { deploy } = deployments;
   const { owner } = await getNamedAccounts();
 
-  const gasPrice = await ethers.provider.getGasPrice();
-
   await deploy('LSP7Mintable', {
     from: owner,
     args: ['LSP7 Mintable', 'LSP7M', owner, LSP4_TOKEN_TYPES.TOKEN, false],
-    gasPrice,
     log: true,
   });
 };
diff --git a/deploy/009_deploy_lsp8_mintable.ts b/deploy/009_deploy_lsp8_mintable.ts
@@ -1,7 +1,7 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { DeployFunction } from 'hardhat-deploy/types';
-import { ethers } from 'hardhat';
-import { LSP4_TOKEN_TYPES, LSP8_TOKEN_ID_FORMAT } from '../constants';
+import { LSP4_TOKEN_TYPES } from '@lukso/lsp4-contracts/constants';
+import { LSP8_TOKEN_ID_FORMAT } from '@lukso/lsp8-contracts/constants';
 
 const deployLSP8MintableDeterministic: DeployFunction = async ({
   deployments,
@@ -10,12 +10,9 @@ const deployLSP8MintableDeterministic: DeployFunction = async ({
   const { deploy } = deployments;
   const { owner: deployer } = await getNamedAccounts();
 
-  const gasPrice = await ethers.provider.getGasPrice();
-
   await deploy('LSP8Mintable', {
     from: deployer,
     args: ['LSP8 Mintable', 'LSP8M', deployer, LSP4_TOKEN_TYPES.NFT, LSP8_TOKEN_ID_FORMAT.NUMBER],
-    gasPrice,
     log: true,
   });
 };
diff --git a/deploy/010_deploy_base_lsp7_mintable.ts b/deploy/010_deploy_base_lsp7_mintable.ts
@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { DeployFunction } from 'hardhat-deploy/types';
-import { ethers } from 'hardhat';
 import { SALT } from './salt';
 
 const deployBaseLSP7MintableDeterministic: DeployFunction = async ({
@@ -10,11 +9,8 @@ const deployBaseLSP7MintableDeterministic: DeployFunction = async ({
   const { deploy } = deployments;
   const { owner: deployer } = await getNamedAccounts();
 
-  const gasPrice = await ethers.provider.getGasPrice();
-
   await deploy('LSP7MintableInit', {
     from: deployer,
-    gasPrice,
     log: true,
     deterministicDeployment: SALT,
   });
diff --git a/deploy/011_deploy_base_lsp8_mintable.ts b/deploy/011_deploy_base_lsp8_mintable.ts
@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { DeployFunction } from 'hardhat-deploy/types';
-import { ethers } from 'hardhat';
 import { SALT } from './salt';
 
 const deployBaseLSP8Mintable: DeployFunction = async ({
@@ -10,11 +9,8 @@ const deployBaseLSP8Mintable: DeployFunction = async ({
   const { deploy } = deployments;
   const { owner } = await getNamedAccounts();
 
-  const gasPrice = await ethers.provider.getGasPrice();
-
   await deploy('LSP8MintableInit', {
     from: owner,
-    gasPrice,
     log: true,
     deterministicDeployment: SALT,
   });
diff --git a/deploy/012_deploy_vault.ts b/deploy/012_deploy_vault.ts
@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { DeployFunction } from 'hardhat-deploy/types';
-import { ethers } from 'hardhat';
 
 const deployVault: DeployFunction = async ({
   deployments,
@@ -9,12 +8,9 @@ const deployVault: DeployFunction = async ({
   const { deploy } = deployments;
   const { owner } = await getNamedAccounts();
 
-  const gasPrice = await ethers.provider.getGasPrice();
-
   await deploy('LSP9Vault', {
     from: owner,
     args: [owner],
-    gasPrice,
     log: true,
   });
 };
diff --git a/deploy/013_deploy_base_vault.ts b/deploy/013_deploy_base_vault.ts
@@ -1,6 +1,5 @@
 import { HardhatRuntimeEnvironment } from 'hardhat/types';
 import { DeployFunction } from 'hardhat-deploy/types';
-import { ethers } from 'hardhat';
 import { SALT } from './salt';
 
 const deployBaseVaultDeterministic: DeployFunction = async ({
@@ -10,12 +9,9 @@ const deployBaseVaultDeterministic: DeployFunction = async ({
   const { deploy } = deployments;
   const { owner: deployer } = await getNamedAccounts();
 
-  const gasPrice = await ethers.provider.getGasPrice();
-
   await deploy('LSP9VaultInit', {
     from: deployer,
     log: true,
-    gasPrice,
     deterministicDeployment: SALT,
   });
 };
