rebase changes

0xPolygonHermez · Jan 25, 2024 · 99d76cb · 99d76cb
1 parent 278e6a8
commit 99d76cb
Show file tree

Hide file tree

Showing 42 changed files with 9,032 additions and 22,791 deletions.
diff --git a/compiled-contracts/FflonkVerifier.json b/compiled-contracts/FflonkVerifier.json
diff --git a/compiled-contracts/PolygonDataComittee.json b/compiled-contracts/PolygonDataComittee.json
diff --git a/compiled-contracts/PolygonRollupManager.json b/compiled-contracts/PolygonRollupManager.json
diff --git a/compiled-contracts/PolygonRollupManagerMock.json b/compiled-contracts/PolygonRollupManagerMock.json
diff --git a/compiled-contracts/PolygonRollupManagerMockInternalTest.json b/compiled-contracts/PolygonRollupManagerMockInternalTest.json
diff --git a/compiled-contracts/PolygonValidiumEtrog.json b/compiled-contracts/PolygonValidiumEtrog.json
diff --git a/compiled-contracts/PolygonZkEVM.json b/compiled-contracts/PolygonZkEVM.json
diff --git a/compiled-contracts/PolygonZkEVMBridge.json b/compiled-contracts/PolygonZkEVMBridge.json
diff --git a/compiled-contracts/PolygonZkEVMBridgeMock.json b/compiled-contracts/PolygonZkEVMBridgeMock.json
diff --git a/compiled-contracts/PolygonZkEVMBridgeV2.json b/compiled-contracts/PolygonZkEVMBridgeV2.json
diff --git a/compiled-contracts/PolygonZkEVMEtrog.json b/compiled-contracts/PolygonZkEVMEtrog.json
diff --git a/compiled-contracts/PolygonZkEVMExistentEtrog.json b/compiled-contracts/PolygonZkEVMExistentEtrog.json
diff --git a/compiled-contracts/PolygonZkEVMGlobalExitRootV2.json b/compiled-contracts/PolygonZkEVMGlobalExitRootV2.json
diff --git a/compiled-contracts/PolygonZkEVMMock.json b/compiled-contracts/PolygonZkEVMMock.json
diff --git a/compiled-contracts/PolygonZkEVMTimelock.json b/compiled-contracts/PolygonZkEVMTimelock.json
diff --git a/compiled-contracts/TokenWrapped.json b/compiled-contracts/TokenWrapped.json
diff --git a/compiled-contracts/VerifierRollupHelperMock.json b/compiled-contracts/VerifierRollupHelperMock.json
@@ -28,8 +28,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561000f575f80fd5b5061014e8061001d5f395ff3fe608060405234801561000f575f80fd5b5060043610610029575f3560e01c80639121da8a1461002d575b5f80fd5b61004361003b366004610084565b600192915050565b604051901515815260200160405180910390f35b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b5f80610320808486031215610097575f80fd5b6103008401858111156100a8575f80fd5b8493508561031f8601126100ba575f80fd5b604051602080820182811067ffffffffffffffff821117156100de576100de610057565b6040529286019281888511156100f2575f80fd5b5b8484101561010a57833581529281019281016100f3565b50949790965094505050505056fea26469706673582212200c852f4a1d01c92e0fb5e8f4280798a001f24ebd189c2b9b048aabb0266d233764736f6c63430008140033",
-  "deployedBytecode": "0x608060405234801561000f575f80fd5b5060043610610029575f3560e01c80639121da8a1461002d575b5f80fd5b61004361003b366004610084565b600192915050565b604051901515815260200160405180910390f35b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b5f80610320808486031215610097575f80fd5b6103008401858111156100a8575f80fd5b8493508561031f8601126100ba575f80fd5b604051602080820182811067ffffffffffffffff821117156100de576100de610057565b6040529286019281888511156100f2575f80fd5b5b8484101561010a57833581529281019281016100f3565b50949790965094505050505056fea26469706673582212200c852f4a1d01c92e0fb5e8f4280798a001f24ebd189c2b9b048aabb0266d233764736f6c63430008140033",
+  "bytecode": "0x608060405234801561000f575f80fd5b5061014e8061001d5f395ff3fe608060405234801561000f575f80fd5b5060043610610029575f3560e01c80639121da8a1461002d575b5f80fd5b61004361003b366004610084565b600192915050565b604051901515815260200160405180910390f35b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b5f80610320808486031215610097575f80fd5b6103008401858111156100a8575f80fd5b8493508561031f8601126100ba575f80fd5b604051602080820182811067ffffffffffffffff821117156100de576100de610057565b6040529286019281888511156100f2575f80fd5b5b8484101561010a57833581529281019281016100f3565b50949790965094505050505056fea2646970667358221220cd116917bfb356f793a2cef2885c134856a021af9708cf6e35bd8e053205c63b64736f6c63430008140033",
+  "deployedBytecode": "0x608060405234801561000f575f80fd5b5060043610610029575f3560e01c80639121da8a1461002d575b5f80fd5b61004361003b366004610084565b600192915050565b604051901515815260200160405180910390f35b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b5f80610320808486031215610097575f80fd5b6103008401858111156100a8575f80fd5b8493508561031f8601126100ba575f80fd5b604051602080820182811067ffffffffffffffff821117156100de576100de610057565b6040529286019281888511156100f2575f80fd5b5b8484101561010a57833581529281019281016100f3565b50949790965094505050505056fea2646970667358221220cd116917bfb356f793a2cef2885c134856a021af9708cf6e35bd8e053205c63b64736f6c63430008140033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }
diff --git a/deployment/v2/verifyContracts.js b/deployment/v2/verifyContracts.js
@@ -90,7 +90,7 @@ async function main() {
             },
         );
     } catch (error) {
-        //expect(error.message.toLowerCase().includes('proxyadmin')).to.be.equal(true);
+        // expect(error.message.toLowerCase().includes('proxyadmin')).to.be.equal(true);
     }
 
     // verify global exit root address
@@ -106,7 +106,7 @@ async function main() {
             },
         );
     } catch (error) {
-        //expect(error.message.toLowerCase().includes('proxyadmin')).to.be.equal(true);
+        // expect(error.message.toLowerCase().includes('proxyadmin')).to.be.equal(true);
     }
 
     try {
@@ -154,18 +154,17 @@ async function main() {
         // expect(error.message.toLowerCase().includes('proxyadmin')).to.be.equal(true);
     }
 
-        // verify verifier
-        try {
-            await hre.run(
-                'verify:verify',
-                {
-                    address: createRollupOutputParameters.verifierAddress,
-                },
-            );
-        } catch (error) {
-            expect(error.message.toLowerCase().includes('already verified')).to.be.equal(true);
-        }
-
+    // verify verifier
+    try {
+        await hre.run(
+            'verify:verify',
+            {
+                address: createRollupOutputParameters.verifierAddress,
+            },
+        );
+    } catch (error) {
+        expect(error.message.toLowerCase().includes('already verified')).to.be.equal(true);
+    }
 
     // verify zkEVM address
     try {

diff --git a/docs/mainnetUpgraded/PolygonZkEVMUpgraded.md b/docs/mainnetUpgraded/PolygonZkEVMUpgraded.md
@@ -1,5 +1,4 @@
 Contract responsible for managing the state and the updates of the L2 network
-This contract will NOT BE USED IN PRODUCTION, will be used only in testnet enviroment
 
 
 ## Functions