feat: contract update with safe (#1320)

RequestNetwork · Jan 11, 2024 · 5c83706 · 5c83706
1 parent aafe4df
commit 5c83706
Show file tree

Hide file tree

Showing 20 changed files with 1,186 additions and 495 deletions.
diff --git a/packages/smart-contracts/README.md b/packages/smart-contracts/README.md
@@ -269,6 +269,13 @@ yarn hardhat update-contracts
 
 This command will output details about each update on each chain
 
+By default, updates are performed by a Safe wallet. They need to be confirmed by co-owners in the RN Admin Safe.
+If the contracts are to be administrated by an EOA, use the flag `eoa`:
+
+```bash
+yarn hardhat update-contracts --eoa
+```
+
 ## Tests
 
 After a local deployment:

diff --git a/packages/smart-contracts/hardhat.config.ts b/packages/smart-contracts/hardhat.config.ts
@@ -10,7 +10,6 @@ import '@matterlabs/hardhat-zksync-verify';
 import { subtask, task } from 'hardhat/config';
 import { config } from 'dotenv';
 import deployAllContracts from './scripts/test-deploy-all';
-import { deployAllPaymentContracts } from './scripts/deploy-payments';
 import { checkCreate2Deployer } from './scripts-create2/check-deployer';
 import { deployDeployer, verifyDeployer } from './scripts-create2/deploy-request-deployer';
 import { HardhatRuntimeEnvironmentExtended } from './scripts-create2/types';
@@ -306,20 +305,6 @@ task('deploy-local-env', 'Deploy a local environment').setAction(async (args, hr
   }
 });
 
-task(
-  'deploy-live-payments',
-  'Deploy payment contracts on a live network. Make sure to update all artifacts before running.',
-)
-  .addFlag('dryRun', 'to prevent any deployment')
-  .addFlag('force', 'to force re-deployment')
-  .setAction(async (args, hre) => {
-    args.force = args.force ?? false;
-    args.dryRun = args.dryRun ?? false;
-    args.simulate = args.dryRun;
-    await hre.run(DEPLOYER_KEY_GUARD);
-    await deployAllPaymentContracts(args, hre as HardhatRuntimeEnvironmentExtended);
-  });
-
 task(
   'deploy-live-storage',
   'Deploy payment contracts on a live network. Make sure to update all artifacts before running.',
@@ -365,13 +350,13 @@ task(
   await deployWithCreate2FromList(hre as HardhatRuntimeEnvironmentExtended);
 });
 
-task(
-  'update-contracts',
-  'Update the latest deployed contracts from the Create2DeploymentList',
-).setAction(async (_args, hre) => {
-  await hre.run(DEPLOYER_KEY_GUARD);
-  await updateContractsFromList(hre as HardhatRuntimeEnvironmentExtended);
-});
+task('update-contracts', 'Update the latest deployed contracts from the Create2DeploymentList')
+  .addFlag('safe', 'Is the update to be performed in Safe context')
+  .setAction(async (args, hre) => {
+    const signWithEoa = args.eoa ?? false;
+    await hre.run(DEPLOYER_KEY_GUARD);
+    await updateContractsFromList(hre as HardhatRuntimeEnvironmentExtended, signWithEoa);
+  });
 
 task(
   'verify-contract-from-deployer',

diff --git a/packages/smart-contracts/package.json b/packages/smart-contracts/package.json
@@ -68,6 +68,8 @@
     "@requestnetwork/currency": "0.12.0",
     "@requestnetwork/types": "0.39.0",
     "@requestnetwork/utils": "0.39.0",
+    "@safe-global/api-kit": "1.3.1",
+    "@safe-global/protocol-kit": "1.3.0",
     "@superfluid-finance/ethereum-contracts": "1.1.1",
     "@typechain/ethers-v5": "7.0.1",
     "@typechain/hardhat": "2.1.2",