@zoralabs/protocol-deployments 0.0.11 → 0.0.12

package/script/signDeploymentTransactions.ts

@@ -32,18 +32,20 @@ async function signAndSaveSignatures({
   turnkeyAccount,
   chainConfigs,
   proxyName,
+  chainId,
 }: {
   turnkeyAccount: LocalAccount;
   chainConfigs: ChainConfig[];
   proxyName: "factoryProxy" | "premintExecutorProxy";
+  chainId: number;
 }) {
   const configFolder = path.resolve(
     __dirname,
-    `../deterministicConfig/${proxyName}/`
+    `../deterministicConfig/${proxyName}/`,
   );
   const configFile = path.join(configFolder, "params.json");
   const deterministicDeployConfig = JSON.parse(
-    await readFile(configFile, "utf-8")
+    await readFile(configFile, "utf-8"),
   );
 
   const deploymentConfig: DeterministicDeploymentConfig = {
@@ -54,31 +56,34 @@ async function signAndSaveSignatures({
     proxyCreationCode: deterministicDeployConfig.proxyCreationCode as Address,
   };
 
-  const signedConfigs = await Promise.all(
-    chainConfigs.map(async (chainConfig) => {
-      return {
-        chainId: chainConfig.chainId,
-        signature: await signDeployFactory({
-          account: turnkeyAccount,
-          implementationAddress: chainConfig.implementationAddress,
-          owner: chainConfig.owner,
-          chainId: chainConfig.chainId,
-          deterministicDeploymentConfig: deploymentConfig,
-        }),
-      };
-    })
+  const chainConfig = chainConfigs.find((x) => x.chainId === chainId);
+
+  if (!chainConfig) {
+    return;
+  }
+
+  const signature = await signDeployFactory({
+    account: turnkeyAccount,
+    implementationAddress: chainConfig.implementationAddress,
+    owner: chainConfig.owner,
+    chainId: chainConfig.chainId,
+    deterministicDeploymentConfig: deploymentConfig,
+  });
+
+  const existingSignatures = JSON.parse(
+    await readFile(path.join(configFolder, "signatures.json"), "utf-8"),
   );
 
-  // aggregate above to object of key value pair indexed by chain id as number:
-  const byChainId = signedConfigs.reduce((acc, { chainId, signature }) => {
-    acc[chainId] = signature;
-    return acc;
-  }, {} as { [key: number]: string });
+  const updated = {
+    ...existingSignatures,
+    [chainId]: signature,
+  };
 
+  // aggregate above to object of key value pair indexed by chain id as number:
   // write as json to ../deterministicConfig/factoryDeploySignatures.json:
   await writeFile(
     path.join(configFolder, "signatures.json"),
-    JSON.stringify(byChainId, null, 2)
+    JSON.stringify(updated, null, 2),
   );
 }
 
@@ -86,6 +91,7 @@ async function signAndSaveUpgradeGate({
   turnkeyAccount,
   chainConfigs,
   proxyName,
+  chainId,
 }: {
   turnkeyAccount: LocalAccount;
   chainConfigs: {
@@ -93,14 +99,16 @@ async function signAndSaveUpgradeGate({
     owner: Address;
   }[];
   proxyName: "upgradeGate";
+  chainId: number;
 }) {
   const configFolder = path.resolve(
     __dirname,
-    `../deterministicConfig/${proxyName}/`
+    `../deterministicConfig/${proxyName}/`,
   );
   const configFile = path.join(configFolder, "params.json");
+
   const deterministicDeployConfig = JSON.parse(
-    await readFile(configFile, "utf-8")
+    await readFile(configFile, "utf-8"),
   );
 
   const deploymentConfig: GenericDeploymentConfiguration = {
@@ -113,47 +121,48 @@ async function signAndSaveUpgradeGate({
       deterministicDeployConfig.proxyDeployerAddress! as Address,
   };
 
-  const upgradeGateAbi = parseAbi([
-    //  ^? const abi: readonly [{ name: "balanceOf"; type: "function"; stateMutability:...
-    "function initialize(address owner)",
-  ]);
+  const upgradeGateAbi = parseAbi(["function initialize(address owner)"]);
 
-  const signedConfigs = await Promise.all(
-    chainConfigs.map(async (chainConfig) => {
-      const initCall = encodeFunctionData({
-        abi: upgradeGateAbi,
-        functionName: "initialize",
-        args: [chainConfig.owner],
-      });
+  const chainConfig = chainConfigs.find((x) => x.chainId === chainId);
 
-      return {
-        chainId: chainConfig.chainId,
-        signature: await signGenericDeploy({
-          account: turnkeyAccount,
-          chainId: chainConfig.chainId,
-          config: deploymentConfig,
-          initCall,
-        }),
-      };
-    })
+  if (!chainConfig) {
+    throw new Error(`No chain config found for chain id ${chainId}`);
+  }
+
+  const initCall = encodeFunctionData({
+    abi: upgradeGateAbi,
+    functionName: "initialize",
+    args: [chainConfig.owner],
+  });
+
+  console.log("signing", { turnkeyAccount, deploymentConfig });
+
+  const signature = await signGenericDeploy({
+    account: turnkeyAccount,
+    chainId: chainConfig.chainId,
+    config: deploymentConfig,
+    initCall,
+  });
+
+  const existingSignatures = JSON.parse(
+    await readFile(path.join(configFolder, "signatures.json"), "utf-8"),
   );
 
-  // aggregate above to object of key value pair indexed by chain id as number:
-  const byChainId = signedConfigs.reduce((acc, { chainId, signature }) => {
-    acc[chainId] = signature;
-    return acc;
-  }, {} as { [key: number]: string });
+  const updated = {
+    ...existingSignatures,
+    [chainId]: signature,
+  };
 
   // write as json to ../deterministicConfig/factoryDeploySignatures.json:
   await writeFile(
     path.join(configFolder, "signatures.json"),
-    JSON.stringify(byChainId, null, 2)
+    JSON.stringify(updated, null, 2),
   );
 }
 
 const getChainConfigs = async () => {
   const chainConfigsFiles = await glob(
-    path.resolve(__dirname, "../chainConfigs/*.json")
+    path.resolve(__dirname, "../chainConfigs/*.json"),
   );
 
   const chainConfigs = await Promise.all(
@@ -167,7 +176,7 @@ const getChainConfigs = async () => {
         chainId,
         owner: fileContents["FACTORY_OWNER"]! as Address,
       };
-    })
+    }),
   );
 
   return chainConfigs;
@@ -175,7 +184,7 @@ const getChainConfigs = async () => {
 
 const getFactoryImplConfigs = async () => {
   const addresseFiles = await glob(
-    path.resolve(__dirname, "../addresses/*.json")
+    path.resolve(__dirname, "../addresses/*.json"),
   );
 
   const chainConfigs = await Promise.all(
@@ -195,7 +204,7 @@ const getFactoryImplConfigs = async () => {
         implementationAddress: fileContents["FACTORY_IMPL"] as Address,
         owner: chainConfig["FACTORY_OWNER"] as Address,
       };
-    })
+    }),
   );
 
   return chainConfigs;
@@ -203,7 +212,7 @@ const getFactoryImplConfigs = async () => {
 
 const getPreminterImplConfigs = async () => {
   const addresseFiles = await glob(
-    path.resolve(__dirname, "../addresses/*.json")
+    path.resolve(__dirname, "../addresses/*.json"),
   );
 
   const chainConfigs = await Promise.all(
@@ -223,12 +232,23 @@ const getPreminterImplConfigs = async () => {
         implementationAddress: fileContents["PREMINTER_IMPL"] as Address,
         owner: chainConfig["FACTORY_OWNER"] as Address,
       };
-    })
+    }),
   );
 
   return chainConfigs.filter((x) => x.implementationAddress !== undefined);
 };
 
+function getChainIdPositionalArg() {
+  // parse chain id as first argument:
+  const chainIdArg = process.argv[2];
+
+  if (!chainIdArg) {
+    throw new Error("Must provide chain id as first argument");
+  }
+
+  return parseInt(chainIdArg);
+}
+
 async function main() {
   // Create a Turnkey HTTP client with API key credentials
   const httpClient = new TurnkeyClient(
@@ -240,34 +260,39 @@ async function main() {
     new ApiKeyStamper({
       apiPublicKey: process.env.TURNKEY_API_PUBLIC_KEY!,
       apiPrivateKey: process.env.TURNKEY_API_PRIVATE_KEY!,
-    })
+    }),
   );
 
   // Create the Viem custom account
   const turnkeyAccount = await createAccount({
     client: httpClient,
     organizationId: process.env.TURNKEY_ORGANIZATION_ID!,
-    privateKeyId: process.env.TURNKEY_PRIVATE_KEY_ID!,
+    signWith: process.env.TURNKEY_PRIVATE_KEY_ID!,
     // optional; will be fetched from Turnkey if not provided
     ethereumAddress: process.env.TURNKEY_TARGET_ADDRESS!,
   });
 
+  const chainId = getChainIdPositionalArg();
+
   await signAndSaveSignatures({
     turnkeyAccount,
     chainConfigs: await getFactoryImplConfigs(),
     proxyName: "factoryProxy",
+    chainId,
   });
 
   await signAndSaveSignatures({
     turnkeyAccount,
     chainConfigs: await getPreminterImplConfigs(),
     proxyName: "premintExecutorProxy",
+    chainId,
   });
 
   await signAndSaveUpgradeGate({
     turnkeyAccount,
     chainConfigs: await getChainConfigs(),
     proxyName: "upgradeGate",
+    chainId,
   });
 }
 

package/src/ZoraDeployerBase.sol

@@ -37,7 +37,6 @@ abstract contract ZoraDeployerBase is DeploymentTestingUtils, ScriptDeploymentCo
         vm.serializeAddress(deploymentJsonKey, PREMINTER_IMPL, deployment.preminterImpl);
         vm.serializeAddress(deploymentJsonKey, UPGRADE_GATE, deployment.upgradeGate);
         deploymentJson = vm.serializeAddress(deploymentJsonKey, FACTORY_PROXY, deployment.factoryProxy);
-        console2.log(deploymentJson);
     }
 
     function deployMinters(Deployment memory deployment) internal {

package/wagmi.config.ts

@@ -43,7 +43,7 @@ const getAddresses = () => {
 
   for (const addressesFile of addressesFiles) {
     const jsonAddress = JSON.parse(
-      readFileSync(`./addresses/${addressesFile}`, "utf-8")
+      readFileSync(`./addresses/${addressesFile}`, "utf-8"),
     ) as {
       FIXED_PRICE_SALE_STRATEGY: Address;
       MERKLE_MINT_SALE_STRATEGY: Address;

package/package/chainConfigs.ts

@@ -1,60 +0,0 @@
-export const chainConfigs = {
-  [1]: {
-    FACTORY_OWNER: "0xDB392f4391462d60B8B4413ef72018Ab595Af9D0",
-    MINT_FEE_RECIPIENT: "0xd1d1D4e36117aB794ec5d4c78cBD3a8904E691D0",
-    PROTOCOL_REWARDS: "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B",
-  },
-  [10]: {
-    FACTORY_OWNER: "0x4c7f7b6067fac9a737ecf2ca1a733fc85dd65a2b",
-    MINT_FEE_RECIPIENT: "0x7A810DCd0f8d83B20212326813Db6EF7E9FD030c",
-    PROTOCOL_REWARDS: "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B",
-  },
-  [11155111]: {
-    FACTORY_OWNER: "0xE51051a204afb2fC071A2406914cdEA5638e5018",
-    MINT_FEE_RECIPIENT: "0xE51051a204afb2fC071A2406914cdEA5638e5018",
-  },
-  [420]: {
-    FACTORY_OWNER: "0xbb45052B2260707655Dfd916a416264f5981192c",
-    MINT_FEE_RECIPIENT: "0x5dEe21327CD7CD6725C2578DA1c3E5bb2D2D34b2",
-    PROTOCOL_REWARDS: "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B",
-  },
-  [424]: {
-    FACTORY_OWNER: "0x8fbC66d36cceB3Ad69B4d672756da54CcFec1cD2",
-    MINT_FEE_RECIPIENT: "0x95FD5d77B206cCc0B1f7D7A4077fbE8eb4fC31eF",
-    PROTOCOL_REWARDS: "0x7777777A456fF23D9b6851184472c08FBDa73e32",
-  },
-  [5]: {
-    FACTORY_OWNER: "0xDC498668B5e6CC518fD58A2ADBF614Fd3A13D3a0",
-    MINT_FEE_RECIPIENT: "0x9444390c01Dd5b7249E53FAc31290F7dFF53450D",
-    PROTOCOL_REWARDS: "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B",
-  },
-  [58008]: {
-    FACTORY_OWNER: "0xfAe426B462f4Bc9857ED28D8473Fb85192f23E9b",
-    MINT_FEE_RECIPIENT: "0x917D86f1eBD1d9f59Dae1C00e5Af7f8689299EC4",
-  },
-  [7777777]: {
-    FACTORY_OWNER: "0xdEA20c96253dc2d64897D2b8d27A8d935dE74955",
-    MINT_FEE_RECIPIENT: "0xEcfc2ee50409E459c554a2b0376F882Ce916D853",
-    PROTOCOL_REWARDS: "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B",
-  },
-  [8453]: {
-    FACTORY_OWNER: "0x004d6611884B4A661749B64b2ADc78505c3e1AB3",
-    MINT_FEE_RECIPIENT: "0x7bf90111Ad7C22bec9E9dFf8A01A44713CC1b1B6",
-    PROTOCOL_REWARDS: "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B",
-  },
-  [84531]: {
-    FACTORY_OWNER: "0x02539E813cA450C2c7334e885423f4A899a063Fe",
-    MINT_FEE_RECIPIENT: "0x02539E813cA450C2c7334e885423f4A899a063Fe",
-    PROTOCOL_REWARDS: "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B",
-  },
-  [999]: {
-    FACTORY_OWNER: "0xE84DBB2B25F761751231a9D0DAfbdD4dC3aa8252",
-    MINT_FEE_RECIPIENT: "0xE84DBB2B25F761751231a9D0DAfbdD4dC3aa8252",
-    PROTOCOL_REWARDS: "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B",
-  },
-  [999999999]: {
-    FACTORY_OWNER: "0xdae22ce69Afcb7f4bc37D32E267645722949DE0E",
-    MINT_FEE_RECIPIENT: "0xdae22ce69Afcb7f4bc37D32E267645722949DE0E",
-    PROTOCOL_REWARDS: "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B",
-  },
-};