feat: L3 support

.github/workflows/coverage.yml

@@ -39,6 +39,15 @@ jobs:
         with:
           version: nightly
 
+      # 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: Build and run tests
         env:
           ETH_FORK_URL: ${{ secrets.ETH_FORK_URL }}

.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

@@ -68,3 +68,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 : l3 support
 - 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
 - fix(compilation): crate-level compilation

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",
@@ -31,11 +30,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",
@@ -129,7 +127,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" }

crates/madara/client/db/docs/flat_storage.md

@@ -6,14 +6,14 @@ We may want to remove that flat storage from bonsai-trie as it's not used and we
 
 Instead, we have implemented our own optimized lookup, which is implemented with a column that looks like this:
 
-![schema flat_storage](./flat_storage.png)
+![schema flat_storage](flat_storage.png)
 
 The trick here is to rely on the fact that rocksdb columns are sorted trees.
 The rocksdb `get` operation does not allow getting the value of (contract_1, key_1) at block 15 here, because
 the key has not been modified at that block.
 Instead, we use rocksdb iterators.
 
-![schema flat_storage_iterator](./flat_storage_iterator.png)
+![schema flat_storage_iterator](flat_storage_iterator.png)
 
 This allows us to get the most recent value for a (contract, key) at that block, by using a single rocksdb lookup.
 

crates/madara/client/devnet/README.md

@@ -1,7 +1,7 @@
 # Devnet predeployed contract addresses
 
 The devnet always has the predeployed contract addresses at these addresses, with these private keys.
-They are OpenZeppelin contracts, see [cairo-artifacts](../../../cairo-artifacts/README.md).
+They are OpenZeppelin contracts, see [cairo-artifacts](../../../../cairo-artifacts/README.md).
 They are also shown on node startup.
 
 ```sh

crates/madara/client/eth/Cargo.toml → crates/madara/client/settlement_client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 description = "This crate is responsible to handle l1 communication"
-name = "mc-eth"
+name = "mc-settlement-client"
 authors.workspace = true
 edition.workspace = true
 license.workspace = true
@@ -35,13 +35,20 @@ starknet_api.workspace = true
 # Other
 alloy.workspace = true
 anyhow.workspace = true
+assert_matches = "1.5.0"
 bigdecimal.workspace = true
 bitvec.workspace = true
 futures = { workspace = true, default-features = true }
 
 regex = "1.10.5"
 serde = { workspace = true, default-features = true }
 serde_json = "1"
+starknet-accounts = "0.11.0"
+starknet-contract = "0.11.0"
+starknet-core = { workspace = true }
+starknet-crypto = { workspace = true }
+starknet-providers = { workspace = true }
+starknet-signers = { workspace = true }
 thiserror.workspace = true
 time = "0.3.36"
 tokio = { workspace = true, features = [
@@ -54,6 +61,9 @@ url.workspace = true
 
 
 #Instrumentation
+async-trait = { workspace = true }
+hex = "0.4.3"
+matchers = "0.1.0"
 opentelemetry = { workspace = true, features = ["metrics", "logs"] }
 opentelemetry-appender-tracing = { workspace = true, default-features = false }
 opentelemetry-otlp = { workspace = true, features = [
@@ -64,6 +74,7 @@ opentelemetry-otlp = { workspace = true, features = [
 opentelemetry-semantic-conventions = { workspace = true }
 opentelemetry-stdout = { workspace = true }
 opentelemetry_sdk = { workspace = true, features = ["rt-tokio", "logs"] }
+reqwest = "0.11.27"
 tracing = { workspace = true }
 tracing-core = { workspace = true, default-features = false }
 tracing-opentelemetry = { workspace = true }