Update Aligned to 0.6.0 (#336)

* Sync with Aligned 0.5.2 * Start updating Aligned to 0.6.0 * Fix Aligned version update
lambdaclass · Sep 16, 2024 · 132e4ea · 132e4ea
1 parent ce3d4b1
commit 132e4ea
Show file tree

Hide file tree

Showing 12 changed files with 143 additions and 163 deletions.
diff --git a/contract/lib/aligned_layer b/contract/lib/aligned_layer
diff --git a/contract/script/MinaBridge.s.sol b/contract/script/MinaBridge.s.sol
@@ -15,15 +15,11 @@ contract MinaBridgeDeployer is Script {
         vm.startBroadcast();
 
         string memory chain = vm.envString("ETH_CHAIN");
-        address alignedServiceAddress;
+        address payable alignedServiceAddress;
         if (keccak256(bytes(chain)) == keccak256("devnet")) {
-            alignedServiceAddress = address(
-                uint160(0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8)
-            );
+            alignedServiceAddress = payable(0x1613beB3B2C4f22Ee086B2b38C1476A3cE7f78E8);
         } else if (keccak256(bytes(chain)) == keccak256("holesky")) {
-            alignedServiceAddress = address(
-                uint160(0x58F280BeBE9B34c9939C3C39e0890C81f163B623)
-            );
+            alignedServiceAddress = payable(0x58F280BeBE9B34c9939C3C39e0890C81f163B623);
         } else {
             revert UndefinedChain();
         }

diff --git a/contract/src/MinaAccountValidation.sol b/contract/src/MinaAccountValidation.sol
@@ -9,7 +9,7 @@ contract MinaAccountValidation {
     /// @notice Reference to the AlignedLayerServiceManager contract.
     AlignedLayerServiceManager aligned;
 
-    constructor(address _alignedServiceAddr) {
+    constructor(address payable _alignedServiceAddr) {
         aligned = AlignedLayerServiceManager(_alignedServiceAddr);
     }
 
@@ -33,7 +33,8 @@ contract MinaAccountValidation {
             proofGeneratorAddr,
             batchMerkleRoot,
             merkleProof,
-            verificationDataBatchIndex
+            verificationDataBatchIndex,
+            address(0)
         );
 
         if (isAccountVerified) {

diff --git a/contract/src/MinaBridge.sol b/contract/src/MinaBridge.sol
@@ -11,7 +11,7 @@ error AccountIsNotValid(bytes32 accountIdHash);
 contract MinaBridge {
     /// @notice The length of the verified state chain (also called the bridge's transition
     /// frontier) to store.
-    uint public constant BRIDGE_TRANSITION_FRONTIER_LEN = 16;
+    uint256 public constant BRIDGE_TRANSITION_FRONTIER_LEN = 16;
 
     /// @notice The state hash of the last verified chain of Mina states (also called
     /// the bridge's transition frontier).
@@ -23,7 +23,7 @@ contract MinaBridge {
     /// @notice Reference to the AlignedLayerServiceManager contract.
     AlignedLayerServiceManager aligned;
 
-    constructor(address _alignedServiceAddr, bytes32 _tipStateHash) {
+    constructor(address payable _alignedServiceAddr, bytes32 _tipStateHash) {
         aligned = AlignedLayerServiceManager(_alignedServiceAddr);
         chainStateHashes[BRIDGE_TRANSITION_FRONTIER_LEN - 1] = _tipStateHash;
     }
@@ -39,20 +39,12 @@ contract MinaBridge {
     }
 
     /// @notice Returns the latest verified chain state hashes.
-    function getChainStateHashes()
-        external
-        view
-        returns (bytes32[BRIDGE_TRANSITION_FRONTIER_LEN] memory)
-    {
+    function getChainStateHashes() external view returns (bytes32[BRIDGE_TRANSITION_FRONTIER_LEN] memory) {
         return chainStateHashes;
     }
 
     /// @notice Returns the latest verified chain ledger hashes.
-    function getChainLedgerHashes()
-        external
-        view
-        returns (bytes32[BRIDGE_TRANSITION_FRONTIER_LEN] memory)
-    {
+    function getChainLedgerHashes() external view returns (bytes32[BRIDGE_TRANSITION_FRONTIER_LEN] memory) {
         return chainLedgerHashes;
     }
 
@@ -70,14 +62,8 @@ contract MinaBridge {
             pubInputBridgeTipStateHash := mload(add(pubInput, 0x20))
         }
 
-        if (
-            pubInputBridgeTipStateHash !=
-            chainStateHashes[BRIDGE_TRANSITION_FRONTIER_LEN - 1]
-        ) {
-            revert TipStateIsWrong(
-                pubInputBridgeTipStateHash,
-                chainStateHashes[BRIDGE_TRANSITION_FRONTIER_LEN - 1]
-            );
+        if (pubInputBridgeTipStateHash != chainStateHashes[BRIDGE_TRANSITION_FRONTIER_LEN - 1]) {
+            revert TipStateIsWrong(pubInputBridgeTipStateHash, chainStateHashes[BRIDGE_TRANSITION_FRONTIER_LEN - 1]);
         }
 
         bytes32 pubInputCommitment = keccak256(pubInput);
@@ -89,7 +75,8 @@ contract MinaBridge {
             proofGeneratorAddr,
             batchMerkleRoot,
             merkleProof,
-            verificationDataBatchIndex
+            verificationDataBatchIndex,
+            address(0)
         );
 
         if (isNewStateVerified) {
@@ -103,16 +90,9 @@ contract MinaBridge {
                 // the next BRIDGE_TRANSITION_FRONTIER_LEN sets of 32 bytes are state hashes.
                 let addr_states := add(pubInput, 64)
                 // the next BRIDGE_TRANSITION_FRONTIER_LEN sets of 32 bytes are ledger hashes.
-                let addr_ledgers := add(
-                    addr_states,
-                    mul(32, BRIDGE_TRANSITION_FRONTIER_LEN)
-                )
-
-                for {
-                    let i := 0
-                } lt(i, BRIDGE_TRANSITION_FRONTIER_LEN) {
-                    i := add(i, 1)
-                } {
+                let addr_ledgers := add(addr_states, mul(32, BRIDGE_TRANSITION_FRONTIER_LEN))
+
+                for { let i := 0 } lt(i, BRIDGE_TRANSITION_FRONTIER_LEN) { i := add(i, 1) } {
                     sstore(slot_states, mload(addr_states))
                     addr_states := add(addr_states, 32)
                     slot_states := add(slot_states, 1)

diff --git a/contract/test/MinaBridge.t.sol b/contract/test/MinaBridge.t.sol
@@ -6,11 +6,11 @@ import {MinaBridge} from "../src/MinaBridge.sol";
 
 contract MinaBridgeTest is Test {
     MinaBridge public bridge;
-    uint160 alignedServiceAddress = 0x0;
+    address payable alignedServiceAddress = payable(0x0);
 
     function setUp() public {
         // FIXME(xqft): this script may be deprecated, for now we'll
         // pass 0x0 as the second constructor argument.
-        bridge = new MinaBridge(address(alignedServiceAddress), 0x0);
+        bridge = new MinaBridge(alignedServiceAddress, 0x0);
     }
 }