Merge branch 'main' into ya-prover-autoscaler-old-release

matter-labs · Oct 17, 2024 · 102d389 · 102d389
2 parents e0435aa + 899ffc0
commit 102d389
Showing 1 changed file with 56 additions and 2 deletions.
diff --git a/infrastructure/protocol-upgrade/src/transaction.ts b/infrastructure/protocol-upgrade/src/transaction.ts
@@ -27,12 +27,26 @@ import * as path from 'path';
 const testConfigPath = path.join(process.env.ZKSYNC_HOME as string, `etc/test_config/constant`);
 const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
 
+export enum Action {
+    Add = 0,
+    Replace = 1,
+    Remove = 2
+}
+
 export interface DiamondCutData {
     facetCuts: FacetCut[];
     initAddress: string;
     initCalldata: string;
 }
 
+export interface ChainCreationParams {
+    genesisUpgrade: string;
+    genesisBatchHash: string;
+    genesisIndexRepeatedStorageChanges: number;
+    genesisBatchCommitment: string;
+    diamondCut: DiamondCutData;
+}
+
 export interface ForceDeployment {
     // The bytecode hash to put on an address
     bytecodeHash: BytesLike;
@@ -186,6 +200,10 @@ export function prepareUpgradeCalldata(
     upgradeAddress: string,
     facetCuts: FacetCut[],
     zksyncAddress: string,
+    genesisUpgradeAddress: string,
+    genesisBatchHash: string,
+    genesisIndexRepeatedStorageChanges: number,
+    genesisBatchCommitment: string,
     prepareDirectOperation?: boolean,
     chainId?: string
 ) {
@@ -194,6 +212,21 @@ export function prepareUpgradeCalldata(
         initAddress: upgradeAddress,
         initCalldata
     };
+
+    let chainCreationDiamondCut: DiamondCutData = {
+        facetCuts: facetCuts.filter((cut) => cut.action == Action.Add),
+        initAddress: genesisUpgradeAddress,
+        initCalldata: '0x'
+    };
+
+    let chainCreationParams: ChainCreationParams = {
+        genesisUpgrade: genesisUpgradeAddress,
+        genesisBatchHash,
+        genesisIndexRepeatedStorageChanges,
+        genesisBatchCommitment,
+        diamondCut: chainCreationDiamondCut
+    };
+
     // Prepare calldata for STM
     let stm = new StateTransitionManagerFactory();
     const stmUpgradeCalldata = stm.interface.encodeFunctionData('setNewVersionUpgrade', [
@@ -203,6 +236,10 @@ export function prepareUpgradeCalldata(
         newProtocolVersion
     ]);
 
+    const stmSetChainCreationCalldata = stm.interface.encodeFunctionData('setChainCreationParams', [
+        chainCreationParams
+    ]);
+
     // Prepare calldata for upgrading diamond proxy
     let adminFacet = new AdminFacetFactory();
     const diamondProxyUpgradeCalldata = adminFacet.interface.encodeFunctionData('upgradeChainFromVersion', [
@@ -215,7 +252,8 @@ export function prepareUpgradeCalldata(
     let result: any = {
         stmUpgradeCalldata,
         chainAdminUpgradeCalldata,
-        diamondCut
+        diamondCut,
+        stmSetChainCreationCalldata
     };
 
     if (prepareDirectOperation) {
@@ -242,6 +280,10 @@ export function buildDefaultUpgradeTx(
     upgradeTimestamp,
     zksyncAddress,
     postUpgradeCalldataFlag,
+    genesisUpgradeAddress,
+    genesisBatchHash,
+    genesisIndexRepeatedStorageChanges,
+    genesisBatchCommitment,
     prepareDirectOperation?,
     chainId?
 ) {
@@ -329,6 +371,10 @@ export function buildDefaultUpgradeTx(
         upgradeAddress,
         facetCuts,
         zksyncAddress,
+        genesisUpgradeAddress,
+        genesisBatchHash,
+        genesisIndexRepeatedStorageChanges,
+        genesisBatchCommitment,
         prepareDirectOperation,
         chainId
     );
@@ -376,7 +422,11 @@ command
     .option('--zksync-address <zksyncAddress>')
     .option('--chain-id <chainId>')
     .option('--prepare-direct-operation <prepareDirectOperation>')
-    .option('--post-upgrade-calldata')
+    .option('--post-upgrade-calldata <postUpgradeCalldata>')
+    .option('--genesis-upgrade-address <genesisUpgradeAddress>')
+    .option('--genesis-batch-hash <genesisBatchHash>')
+    .option('--genesis-index-repeated-storage-changes <genesisIndexRepeatedStorageChanges>')
+    .option('--genesis-batch-commitment <genesisBatchCommitment>')
     .action(async (options) => {
         buildDefaultUpgradeTx(
             options.environment,
@@ -386,6 +436,10 @@ command
             options.upgradeTimestamp,
             options.zksyncAddress,
             options.postUpgradeCalldata,
+            options.genesisUpgradeAddress,
+            options.genesisBatchHash,
+            options.genesisIndexRepeatedStorageChanges,
+            options.genesisBatchCommitment,
             options.prepareDirectOperation,
             options.chainId
         );