diff --git a/scripts/README.md b/scripts/README.md index 1c5a85e..c65dd18 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -50,9 +50,10 @@ Create a `.env` file. Use the `env.example` as a template. Set the following val ### `step0.ts` -In this step we deploy the `MultiCallDeploy` only. We use the standard deployment key (Orange key) for this deployment. +In this step we deploy the `MultiCallDeploy` only. We use the standard deployment key (Orange key) for this deployment, as the address of the MultiCallDeploy strictly does +not need to be the same across all the environments. -* Set the value of RELAYER_SUBMITTER_EOA_PUB_KEY to match the EOA of the primary Relayer submitter. +* Set the value of RELAYER_SUBMITTER_EOA_PUB_KEY to match the EOA of the primary Relayer submitter. The Submitter EOA is granted execute permission on the MultiCallDeploy. * Set the `accountIndex` to 0 in `wallet-options.ts`. * Execute the command `npx hardhat run scripts/step0.ts --network ` diff --git a/scripts/step0.ts b/scripts/step0.ts index 19875eb..d2d5b84 100644 --- a/scripts/step0.ts +++ b/scripts/step0.ts @@ -33,6 +33,7 @@ async function step0(): Promise { fs.writeFileSync('step0.json', JSON.stringify({ multiCallAdminPubKey: multiCallAdminPubKey, multiCallDeploy: multiCallDeploy.address, + submitterAddress: submitterAddress, }, null, 1)); return env; diff --git a/scripts/step1.ts b/scripts/step1.ts index d727653..7770815 100644 --- a/scripts/step1.ts +++ b/scripts/step1.ts @@ -15,14 +15,11 @@ import { waitForInput } from './helper-functions'; **/ async function step1(): Promise { const env = loadEnvironmentInfo(hre.network.name); - const { network, submitterAddress } = env; - const multiCallAdminPubKey = process.env.MULTICALL_ADMIN_PUB_KEY; + const { network } = env; const factoryAdminPubKey = process.env.FACTORY_ADMIN_PUB_KEY; const multiCallDeployAddress = 'CHANGE_ME'; console.log(`[${network}] Starting deployment...`); - console.log(`[${network}] Submitter address ${submitterAddress}`); - console.log(`[${network}] multiCallAdminPubKey ${multiCallAdminPubKey}`); console.log(`[${network}] factoryAdminPubKey ${factoryAdminPubKey}`); console.log(`[${network}] multiCallDeployAddress ${multiCallDeployAddress}`); @@ -36,7 +33,6 @@ async function step1(): Promise { const factory = await deployContract(env, wallets, 'Factory', [factoryAdminPubKey, multiCallDeployAddress]); fs.writeFileSync('step1.json', JSON.stringify({ - multiCallAdminPubKey: multiCallAdminPubKey, factoryAdminPubKey: factoryAdminPubKey, multiCallDeploy: multiCallDeployAddress, factory: factory.address,