rebase fixes

0xPolygonHermez · Nov 23, 2022 · c70978d · c70978d
1 parent ebe85a6
commit c70978d
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/compiled-contracts/Bridge.json b/compiled-contracts/Bridge.json
diff --git a/compiled-contracts/BridgeMock.json b/compiled-contracts/BridgeMock.json
diff --git a/compiled-contracts/ProofOfEfficiency.json b/compiled-contracts/ProofOfEfficiency.json
diff --git a/compiled-contracts/ProofOfEfficiencyMock.json b/compiled-contracts/ProofOfEfficiencyMock.json
diff --git a/contracts/Bridge.sol b/contracts/Bridge.sol
@@ -562,7 +562,7 @@ contract Bridge is
         require(
             timestampGlobalExitRoot != 0 &&
                 (block.timestamp - timestampGlobalExitRoot) >= claimTimeout,
-            "Bridge::_verifyLeaf: GLOBAL_EXIT_ROOT_INVALID"
+            "Bridge::_verifyLeaf: GLOBAL_EXIT_ROOT_INVALID_OR_NOT_YET_CLAIMABLE"
         );
 
         // Destination network must be networkID

diff --git a/contracts/ProofOfEfficiency.sol b/contracts/ProofOfEfficiency.sol
@@ -621,7 +621,7 @@ contract ProofOfEfficiency is
     }
 
     /**
-     * @notice Allows to stop the zk-evm if its possible to prove a different state root give the same batches.
+     * @notice Allows to halt the PoE if its possible to prove a different state root given the same batches
      * @param initNumBatch Batch which the aggregator starts the verification
      * @param finalNewBatch Last batch aggregator intends to verify
      * @param newLocalExitRoot  New local exit root once the batch is processed

diff --git a/docs/ProofOfEfficiency.md b/docs/ProofOfEfficiency.md
@@ -179,7 +179,7 @@ Allow the current security council to set a new security council address
     uint256[2] proofC
   ) public
 ```
-Allows to stop the zk-evm if its possible to prove a different state root give the same batches.
+Allows to halt the PoE if its possible to prove a different state root given the same batches
 
 
 #### Parameters:

diff --git a/test/contracts/bridge.test.js b/test/contracts/bridge.test.js
@@ -741,7 +741,7 @@ describe('Bridge Contract', () => {
             metadata,
         )).to.be.revertedWith('Bridge::_verifyLeaf: DESTINATION_NETWORK_DOES_NOT_MATCH');
 
-        // Check GLOBAL_EXIT_ROOT_INVALID assert
+        // Check GLOBAL_EXIT_ROOT_INVALID_OR_NOT_YET_CLAIMABLE assert
         await expect(bridgeContract.claimAsset(
             proof,
             index,
@@ -753,7 +753,7 @@ describe('Bridge Contract', () => {
             destinationAddress,
             amount,
             metadata,
-        )).to.be.revertedWith('Bridge::_verifyLeaf: GLOBAL_EXIT_ROOT_INVALID');
+        )).to.be.revertedWith('Bridge::_verifyLeaf: GLOBAL_EXIT_ROOT_INVALID_OR_NOT_YET_CLAIMABLE');
 
         // Check SMT_INVALID assert
         await expect(bridgeContract.claimAsset(
@@ -1228,7 +1228,7 @@ describe('Bridge Contract', () => {
             destinationAddress,
             amount,
             metadata,
-        )).to.be.revertedWith('Bridge::_verifyLeaf: GLOBAL_EXIT_ROOT_INVALID');
+        )).to.be.revertedWith('Bridge::_verifyLeaf: GLOBAL_EXIT_ROOT_INVALID_OR_NOT_YET_CLAIMABLE');
 
         // Can't claim because claim timeout does not expired yet ( edge case)
         await ethers.provider.send('evm_setNextBlockTimestamp', [(globalExitRootTimestamp.toNumber() + newClaimTimeout) - 1]);
@@ -1243,7 +1243,7 @@ describe('Bridge Contract', () => {
             destinationAddress,
             amount,
             metadata,
-        )).to.be.revertedWith('Bridge::_verifyLeaf: GLOBAL_EXIT_ROOT_INVALID');
+        )).to.be.revertedWith('Bridge::_verifyLeaf: GLOBAL_EXIT_ROOT_INVALID_OR_NOT_YET_CLAIMABLE');
 
         // Now can claim!
         await expect(bridgeContract.claimAsset(