encode lengths as le bytes in Base Encoder library

Author: jackchuma

base/Makefile

@@ -3,7 +3,8 @@
 BASE_RPC=https://base-sepolia.cbhq.net
 # BASE_RPC=https://mainnet.base.org
 
-LOCAL_SOL = 0x08AF32D8482533F5C21DA4Eb99CD287dD52339F1
+LOCAL_SOL = 0xd51905478B98b496DF834fb5409eb2e42Fd3Eb2D
+LOCAL_SPL = 0x0B462901D26be439E8229315aBdA94Bb176b55df
 REMOTE_SOL = 0x0501550155015501550155015501550155015501550155015501550155015501
 REMOTE_SPL = 0xcd43b9e91032f9346b89b99c2155981f799ebf0d8cf4f56b03dbec65bdd6bbe5
 
@@ -51,3 +52,11 @@ bridge-sol-to-solana:
 	TO=0x9827993b7b317eb6c74279d49074a13b33a3495a30637c86a7513922014ba424 \
 	AMOUNT=1000000 \
 	forge script BridgeTokensToSolanaScript --account testnet-admin --rpc-url $(BASE_RPC) --broadcast -vvvv
+
+.PHONY: bridge-tokens-to-solana
+bridge-tokens-to-solana:
+	LOCAL_TOKEN=$(LOCAL_SPL) \
+	REMOTE_TOKEN=$(REMOTE_SPL) \
+	TO=0x9827993b7b317eb6c74279d49074a13b33a3495a30637c86a7513922014ba424 \
+	AMOUNT=1000000 \
+	forge script BridgeTokensToSolanaScript --account testnet-admin --rpc-url $(BASE_RPC) --broadcast -vvvv

base/deployments/base_sepolia.json

@@ -1,8 +1,8 @@
 {
-  "MessagePasser": "0x7207c00BC575636Fa142beFaeFc927292E221aF7",
-  "CrossChainMessenger": "0x9143A3f06fBB81B37A5e9da70F59c54cDc62436a",
-  "Bridge": "0x351c4b815129D903700F6b35ce2c5d41b6d715d4",
-  "CrossChainERC20Factory": "0x508B0a6351743E0cFD34d47508906E4845Dc4D22",
-  "WrappedSOL": "0x08AF32D8482533F5C21DA4Eb99CD287dD52339F1",
-  "WrappedSPL": "0x91EDe45e81F39f7508Bf35cFe8f5c551e4f39572"
+  "MessagePasser": "0x4cDbC1CDDd0E1A109625A44770a7dF0e8dc65789",
+  "CrossChainMessenger": "0x870e6d2d935a27b6422eE990C00F62F2860e8F26",
+  "Bridge": "0x22B66c7FBC67f57d16FC94e862902098CD7b2972",
+  "CrossChainERC20Factory": "0xf2e363E638bF585267d5f0B1B85275DD6B06e3BE",
+  "WrappedSOL": "0xd51905478B98b496DF834fb5409eb2e42Fd3Eb2D",
+  "WrappedSPL": "0x0B462901D26be439E8229315aBdA94Bb176b55df"
 }

base/src/libraries/Encoder.sol

@@ -1,19 +1,23 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.15;
 
+import {LibBit} from "solady/utils/LibBit.sol";
+
 import {Bridge} from "../Bridge.sol";
 import {CrossChainMessenger} from "../CrossChainMessenger.sol";
 import {ISolanaMessagePasser} from "../interfaces/ISolanaMessagePasser.sol";
 
 library Encoder {
+    using LibBit for uint256;
+
     function encodeBridgePayload(Bridge.BridgePayload memory payload) internal pure returns (bytes memory) {
         return abi.encodePacked(
             payload.localToken,
             payload.remoteToken,
             payload.from,
             payload.to,
             payload.amount,
-            uint32(payload.extraData.length),
+            _getLeLength(payload.extraData.length),
             payload.extraData
         );
     }
@@ -23,13 +27,13 @@ library Encoder {
         pure
         returns (bytes memory)
     {
-        bytes memory serializedIxs = abi.encodePacked(uint32(payload.ixs.length));
+        bytes memory serializedIxs = abi.encodePacked(_getLeLength(payload.ixs.length));
 
         for (uint256 i; i < payload.ixs.length; i++) {
             serializedIxs = abi.encodePacked(serializedIxs, serializeIx(payload.ixs[i]));
         }
 
-        return abi.encodePacked(payload.nonce, payload.sender, uint32(serializedIxs.length), serializedIxs);
+        return abi.encodePacked(payload.nonce, payload.sender, _getLeLength(serializedIxs.length), serializedIxs);
     }
 
     function encodeMessage(uint256 nonce, address sender, ISolanaMessagePasser.Instruction[] memory ixs)
@@ -48,14 +52,14 @@ library Encoder {
 
     function serializeIx(ISolanaMessagePasser.Instruction memory ix) internal pure returns (bytes memory) {
         bytes memory data = abi.encodePacked(ix.programId);
-        data = abi.encodePacked(data, uint32(ix.accounts.length));
+        data = abi.encodePacked(data, _getLeLength(ix.accounts.length));
 
         for (uint256 i; i < ix.accounts.length; i++) {
             ISolanaMessagePasser.AccountMeta memory account = ix.accounts[i];
             data = abi.encodePacked(data, account.pubKey, account.isWritable, account.isSigner);
         }
 
-        data = abi.encodePacked(data, uint32(ix.data.length), ix.data);
+        data = abi.encodePacked(data, _getLeLength(ix.data.length), ix.data);
 
         return data;
     }
@@ -70,4 +74,8 @@ library Encoder {
 
         return abi.encodePacked(data, ix.data);
     }
+
+    function _getLeLength(uint256 inp) private pure returns (uint32) {
+        return uint32(inp.reverseBytes() >> 224);
+    }
 }