feat: L3 support

.github/workflows/coverage.yml

@@ -39,6 +39,16 @@ jobs:
         with:
           version: nightly
 
+      - name: Restore Madara binary
+        uses: actions/cache@v3
+        id: cache-madara
+        with:
+          path: test-artifacts/madara
+          key: ${{ runner.os }}-madara-bin-
+          restore-keys: |
+            ${{ runner.os }}-madara-bin-
+          fail-on-cache-miss: true
+
       - name: Build and run tests
         env:
           ETH_FORK_URL: ${{ secrets.ETH_FORK_URL }}

.github/workflows/pull-request.yml

@@ -35,17 +35,17 @@ jobs:
     needs: rust_check
     uses: ./.github/workflows/linters-cargo.yml
 
-  coverage:
-    name: Run Coverage
-    needs: update_db_version
-    secrets: inherit
-    uses: ./.github/workflows/coverage.yml
-
   build:
     name: Build Madara
     needs: update_db_version
     uses: ./.github/workflows/build.yml
 
+  coverage:
+    name: Run Coverage
+    needs: build
+    secrets: inherit
+    uses: ./.github/workflows/coverage.yml
+
   js_test:
     name: Run JS Tests
     needs: build

.github/workflows/rust-test.yml

@@ -20,6 +20,24 @@ jobs:
       - uses: foundry-rs/foundry-toolchain@v1
         with:
           version: nightly
+      - name: Launch Anvil
+        run: anvil --fork-url $ANVIL_FORK_URL --fork-block-number $ANVIL_BLOCK_NUMBER &
+        env:
+          ANVIL_FORK_URL: "https://eth.merkle.io"
+          ANVIL_BLOCK_NUMBER: 20395662
+      - name: Wait for Anvil to be ready
+        run: |
+          while ! nc -z localhost 8545; do
+            sleep 1
+          done
+      # TODO : For now madara binary is stored in aws s3 bucket :
+      #        After the proper release binaries are implemented
+      #        We can directly use that and we can remove this
+      #        temporary AWS implementation
+      - name: Download madara binary for l2 client testing
+        run: |
+          curl -L https://madara-test-binary.s3.us-west-1.amazonaws.com/madara-linux -o ./test-artifacts/madara
+          chmod +x ./test-artifacts/madara
 
       - name: Run unit tests
         run: |

.gitignore

@@ -65,3 +65,6 @@ tmp/
 # Running madara with make and docker compose
 .secrets
 image.tar.gz
+
+# madara test artifacts for testing l2 clients for appchains
+test-artifacts/madara

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Next release
 
+- feat: settlement client introduced instead of just ethereum, starknet client added for settlement
 - fix(primitives): limit legacy class sizes
 - fix(block_production): dynamic block closing now adds special address with prev block hash
 - fix(rpc): call, simulate, estimate rpcs executed on top of the block, not at the start of it

Cargo.toml

@@ -1,10 +1,9 @@
 [workspace]
 members = [
-  # madara
   "crates/madara/client/db",
   "crates/madara/client/exec",
   "crates/madara/client/sync",
-  "crates/madara/client/eth",
+  "crates/madara/client/settlement_client",
   "crates/madara/client/rpc",
   "crates/madara/client/gateway/client",
   "crates/madara/client/gateway/server",
@@ -32,11 +31,10 @@ members = [
 resolver = "2"
 # Everything except test-related packages, so that they are not compiled when doing `cargo build`.
 default-members = [
-  # madara
   "crates/madara/client/db",
   "crates/madara/client/exec",
   "crates/madara/client/sync",
-  "crates/madara/client/eth",
+  "crates/madara/client/settlement_client",
   "crates/madara/client/gateway/client",
   "crates/madara/client/gateway/server",
   "crates/madara/client/rpc",
@@ -132,7 +130,7 @@ mc-rpc = { path = "crates/madara/client/rpc" }
 mc-gateway-client = { path = "crates/madara/client/gateway/client" }
 mc-gateway-server = { path = "crates/madara/client/gateway/server" }
 mc-sync = { path = "crates/madara/client/sync" }
-mc-eth = { path = "crates/madara/client/eth" }
+mc-settlement-client = { path = "crates/madara/client/settlement_client" }
 mc-mempool = { path = "crates/madara/client/mempool" }
 mc-block-production = { path = "crates/madara/client/block_production" }
 mc-block-import = { path = "crates/madara/client/block_import" }
@@ -143,6 +141,8 @@ m-cairo-test-contracts = { path = "crates/madara/cairo-test-contracts" }
 
 # Starknet dependencies
 cairo-vm = "=1.0.1"
+starknet-accounts = "0.11.0"
+starknet-contract = "0.11.0"
 starknet-core = "0.12"
 starknet-crypto = "0.7"
 starknet-providers = "0.12"

cairo/src/appchain_test.cairo

@@ -0,0 +1,53 @@
+#[starknet::contract]
+mod StateUpdateContract {
+    type StateRoot = felt252;
+    type BlockNumber = felt252;
+    type BlockHash = felt252;
+
+    #[storage]
+    struct Storage {
+        state_root: StateRoot,
+        block_number: BlockNumber,
+        block_hash: BlockHash,
+    }
+
+    #[event]
+    #[derive(Drop, starknet::Event)]
+    enum Event {
+        LogStateUpdate: LogStateUpdate
+    }
+
+    #[derive(Drop, starknet::Event)]
+    struct LogStateUpdate {
+        state_root: felt252,
+        block_number: felt252,
+        block_hash: felt252,
+    }
+
+    #[constructor]
+    fn constructor(ref self: ContractState) {
+        // Initialize with default values
+        self.state_root.write(0);
+        self.block_number.write(0);
+        self.block_hash.write(0);
+    }
+
+    #[external(v0)]
+    fn update_state(
+        ref self: ContractState,
+        block_number: BlockNumber,
+        state_root: StateRoot,
+        block_hash: BlockHash
+    ) {
+        self.state_root.write(state_root);
+        self.block_number.write(block_number);
+        self.block_hash.write(block_hash);
+
+        self.emit(LogStateUpdate { state_root, block_number, block_hash, });
+    }
+
+    #[external(v0)]
+    fn get_state(self: @ContractState) -> (StateRoot, BlockNumber, BlockHash) {
+        (self.state_root.read(), self.block_number.read(), self.block_hash.read())
+    }
+}

cairo/src/lib.cairo

@@ -1,3 +1,5 @@
 
 pub mod test_account;
 pub mod hello;
+pub mod appchain_test;
+pub mod messaging_test;