diff --git a/.all-contributorsrc b/.all-contributorsrc
index 48a75d1cc6..1306e0fdf5 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -392,6 +392,20 @@
"avatar_url": "https://avatars.githubusercontent.com/u/9974198?v=4",
"profile": "https://github.com/tchataigner",
"contributions": ["code"]
+ },
+ {
+ "login": "kalaninja",
+ "name": "Alexander Kalankhodzhaev",
+ "avatar_url": "https://avatars.githubusercontent.com/u/18083464?v=4",
+ "profile": "https://github.com/kalaninja",
+ "contributions": ["code"]
+ },
+ {
+ "login": "antiyro",
+ "name": "antiyro",
+ "avatar_url": "https://avatars.githubusercontent.com/u/74653697?v=4",
+ "profile": "https://github.com/antiyro",
+ "contributions": ["code"]
}
],
"contributorsPerLine": 7,
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 025f8ab220..984f49eba4 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -11,18 +11,10 @@ jobs:
runs-on: ubuntu-latest-32-cores
steps:
- uses: actions/checkout@v3
- - uses: actions/cache@v3
+ - uses: Swatinem/rust-cache@v2
with:
- path: |
- ~/.cargo/bin/
- ~/.cargo/registry/index/
- ~/.cargo/registry/cache/
- ~/.cargo/git/db/
- target/
- key:
- ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
- github.run_id }}
- fail-on-cache-miss: true
+ shared-key: "cache"
+ save-if: false
- name: Setup build deps
run: |
sudo apt-get update
diff --git a/.github/workflows/linters-cargo.yml b/.github/workflows/linters-cargo.yml
index e054ea78fe..ed40a89ca5 100644
--- a/.github/workflows/linters-cargo.yml
+++ b/.github/workflows/linters-cargo.yml
@@ -15,24 +15,10 @@ jobs:
runs-on: ubuntu-latest-32-cores
steps:
- uses: actions/checkout@v3
- - name: Retrieve cached build
- uses: actions/cache@v3
+ - uses: Swatinem/rust-cache@v2
with:
- path: |
- ~/.cargo/bin/
- ~/.cargo/registry/index/
- ~/.cargo/registry/cache/
- ~/.cargo/git/db/
- target/
- key:
- ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
- github.run_id }}
- fail-on-cache-miss: true
- restore-keys: |
- ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
- github.run_id }}
- ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
- ${{ runner.os }}-cargo
+ shared-key: "cache"
+ save-if: false
- name: Setup build deps
run: |
sudo apt-get update
diff --git a/.github/workflows/madara-commands.yml b/.github/workflows/madara-commands.yml
index 9e72f7ee1f..25635b29a2 100644
--- a/.github/workflows/madara-commands.yml
+++ b/.github/workflows/madara-commands.yml
@@ -12,22 +12,29 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
- path: |
- ~/.cargo/bin/
- ~/.cargo/registry/index/
- ~/.cargo/registry/cache/
- ~/.cargo/git/db/
- target/
+ path: target/release/madara
key:
${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
github.run_id }}
fail-on-cache-miss: true
- name: Run setup
run: |
- target/release/madara setup
+ target/release/madara setup --chain local --from-remote
- name: Create build-spec (plain)
run: |
target/release/madara build-spec --chain local > chain-plain.json
- name: Create build-spec (raw)
run: |
target/release/madara build-spec --chain chain-plain.json --raw > chain-raw.json
+ - name: Generate Sr25519 key for Aura (Leader Election)
+ id: key-gen
+ run: |
+ target/release/madara key generate --scheme Sr25519
+ echo "SEED_PHRASE=$(target/release/madara key generate --scheme Sr25519 | sed -n 's/Secret phrase:\s*//p')" >> "$GITHUB_OUTPUT"
+ - name: Derive Ed25519 key for Grandpa (Finality)
+ run: |
+ target/release/madara key inspect --scheme Ed25519 "${{ steps.key-gen.outputs.SEED_PHRASE }}"
+ - name: Add keys to the node keystore
+ run: |
+ target/release/madara key insert --scheme Sr25519 --suri "${{ steps.key-gen.outputs.SEED_PHRASE }}" --key-type aura
+ target/release/madara key insert --scheme Ed25519 --suri "${{ steps.key-gen.outputs.SEED_PHRASE }}" --key-type gran
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index aee0e72c54..fad398920e 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -20,26 +20,30 @@ jobs:
uses: ./.github/workflows/linters.yml
needs: [changelog, configs-verifier]
- rust_build:
- name: Build Rust project
- uses: ./.github/workflows/rust-build.yml
+ rust_build_test:
+ name: Build & Integration Tests
+ uses: ./.github/workflows/rust-build-test.yml
needs: [changelog, configs-verifier]
madara_commands:
name: Test Madara commands
uses: ./.github/workflows/madara-commands.yml
- needs: rust_build
+ needs: [linters, rust_build_test]
linters_cargo:
name: Run Cargo linters
uses: ./.github/workflows/linters-cargo.yml
- needs: rust_build
+ needs: madara_commands
- # TODO: Unlock when rust tests are working on main
- # coverage:
- # name: Run coverage
- # uses: ./.github/workflows/coverage.yml
- # needs: [madara_commands, linters_cargo]
+ rpc-tests:
+ name: Run rpc tests
+ uses: ./.github/workflows/starknet-rpc-tests.yml
+ needs: madara_commands
+
+ starknet-js-tests:
+ name: Run starknet-js compatibility tests
+ uses: ./.github/workflows/starknet-js-tests.yml
+ needs: madara_commands
# https://github.com/keep-starknet-strange/madara/issues/1097
# benchmark:
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index f270b23e8a..032d9081b3 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -11,15 +11,31 @@ jobs:
name: Run linters
uses: ./.github/workflows/linters.yml
- rust_build:
- name: Build Rust project
- uses: ./.github/workflows/rust-build.yml
+ rust_build_test:
+ name: Build & Integration Tests
+ uses: ./.github/workflows/rust-build-test.yml
+
+ madara_commands:
+ name: Test Madara commands
+ uses: ./.github/workflows/madara-commands.yml
+ needs: [linters, rust_build_test]
linters_cargo:
name: Run Cargo linters
uses: ./.github/workflows/linters-cargo.yml
- needs: rust_build
+ needs: madara_commands
+
+ rpc-tests:
+ name: Run rpc tests
+ uses: ./.github/workflows/starknet-rpc-tests.yml
+ needs: madara_commands
+
+ starknet-js-tests:
+ name: Run starknet-js compatibility tests
+ uses: ./.github/workflows/starknet-js-tests.yml
+ needs: madara_commands
+ # https://github.com/keep-starknet-strange/madara/issues/1097
# benchmark:
# name: Run benchmarks
# uses: ./.github/workflows/benchmarks.yml
@@ -32,7 +48,6 @@ jobs:
# # post on the pull-request page
# pull-requests: write
- # TODO change it to benchmark when enabled
rustdoc:
name: Deploy docs to GitHub Pages
uses: ./.github/workflows/rustdoc.yml
diff --git a/.github/workflows/rust-build.yml b/.github/workflows/rust-build-test.yml
similarity index 62%
rename from .github/workflows/rust-build.yml
rename to .github/workflows/rust-build-test.yml
index 84863ed340..c3ebac95f0 100644
--- a/.github/workflows/rust-build.yml
+++ b/.github/workflows/rust-build-test.yml
@@ -1,33 +1,27 @@
---
-name: Task - Build Rust
+name: Task - Build & Integration Tests
on:
workflow_dispatch:
workflow_call:
jobs:
- rust_build:
+ rust_build_test:
runs-on: ubuntu-latest-32-cores
steps:
- uses: actions/checkout@v3
-
- - name: Cache Cargo registry and git trees
- uses: actions/cache@v3
+ - uses: Swatinem/rust-cache@v2
+ with:
+ shared-key: "cache"
+ - uses: actions/cache@v3
with:
- path: |
- ~/.cargo/bin/
- ~/.cargo/registry/index/
- ~/.cargo/registry/cache/
- ~/.cargo/git/db/
- target/
+ path: target/release/madara
key:
${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
github.run_id }}
restore-keys: |
- ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
- github.run_id }}
${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
- ${{ runner.os }}-cargo
+ ${{ runner.os }}-cargo-
- name: Setup rust toolchain
if: steps.cache.outputs.cache-hit != 'true'
@@ -41,3 +35,6 @@ jobs:
- name: Build the project
run: |
cargo build --release --workspace
+
+ - name: Run integration tests
+ run: cargo test --release
diff --git a/.github/workflows/starknet-js-tests.yml b/.github/workflows/starknet-js-tests.yml
new file mode 100644
index 0000000000..d6d17bd86e
--- /dev/null
+++ b/.github/workflows/starknet-js-tests.yml
@@ -0,0 +1,33 @@
+name: Starknet-js Compatibility Tests
+
+on:
+ workflow_dispatch:
+ workflow_call:
+
+jobs:
+ test:
+ runs-on: ubuntu-latest
+ env:
+ BINARY_PATH: ../target/release/madara
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/cache@v3
+ with:
+ path: target/release/madara
+ key:
+ ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
+ github.run_id }}
+ fail-on-cache-miss: true
+ - name: Setup dev chain
+ run: |
+ ./target/release/madara setup --chain=dev --from-remote
+ - name: Run starknet-js test
+ run: |-
+ ./target/release/madara --dev --execution native &
+ NATIVE_RUN_PID=$!
+ while ! echo exit | nc localhost 9944; do sleep 1; done
+ git clone https://github.com/keep-starknet-strange/sequencer-js-compatibility-tests.git
+ cd sequencer-js-compatibility-tests
+ npm install
+ npm test
+ kill $NATIVE_RUN_PID
diff --git a/.github/workflows/starknet-rpc-tests.yml b/.github/workflows/starknet-rpc-tests.yml
new file mode 100644
index 0000000000..c7bd2068a8
--- /dev/null
+++ b/.github/workflows/starknet-rpc-tests.yml
@@ -0,0 +1,48 @@
+---
+name: Task - Rpc Tests
+
+on:
+ workflow_dispatch:
+ workflow_call:
+
+jobs:
+ rpc-tests:
+ runs-on: ubuntu-latest
+ env:
+ BINARY_PATH: ../target/release/madara
+ steps:
+ - uses: actions/checkout@v3
+ - uses: Swatinem/rust-cache@v2
+ with:
+ shared-key: "cache"
+ save-if: false
+ - uses: actions/cache@v3
+ with:
+ path: target/release/madara
+ key:
+ ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}-${{
+ github.run_id }}
+ fail-on-cache-miss: true
+ - name: Setup build deps
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y clang llvm libudev-dev protobuf-compiler
+ - name: Setup dev chain
+ run: |
+ ./target/release/madara setup --chain=dev --from-remote
+ - name: Run rpc native test
+ run: |-
+ ./target/release/madara --dev --sealing=manual --execution=Native &
+ NATIVE_RUN_PID=$!
+ while ! echo exit | nc localhost 9944; do sleep 1; done
+ cd starknet-rpc-test
+ cargo test
+ kill $NATIVE_RUN_PID
+ - name: Run rpc wasm test
+ run: |-
+ ./target/release/madara --dev --sealing=manual --execution=Wasm &
+ WASM_RUN_PID=$!
+ while ! echo exit | nc localhost 9944; do sleep 1; done
+ cd starknet-rpc-test
+ cargo test
+ kill $WASM_RUN_PID
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000000..33b6f3427b
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,24 @@
+---
+name: Task - Integration Tests
+
+on:
+ workflow_dispatch:
+ workflow_call:
+
+jobs:
+ integration-tests:
+ runs-on: ubuntu-latest
+ env:
+ BINARY_PATH: ../target/release/madara
+ steps:
+ - uses: actions/checkout@v3
+ - uses: Swatinem/rust-cache@v2
+ with:
+ shared-key: "cache"
+ save-if: false
+ - name: Setup build deps
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y clang llvm libudev-dev protobuf-compiler
+ - name: Run crates test
+ run: cargo test --release
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 4f3a722d44..2fc1a1b5fe 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,8 +1,3 @@
{
- "eslint.workingDirectories": ["tests"],
- "workbench.colorCustomizations": {
- "activityBar.background": "#561529",
- "titleBar.activeBackground": "#781E3A",
- "titleBar.activeForeground": "#FEFBFC"
- }
+ "eslint.workingDirectories": ["tests"]
}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd43a3d7bf..2b22fba22e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,19 +2,75 @@
## Next release
+## v0.5.0
+
+- chore: release v0.5.0
+- test: add transaction pool logic unit tests
+- feat(client): spawn a task that listen to storage changes and build the
+ resulting commiment state diff for each block
+- dev(StarknetRPC): log error received from node before mapping to
+ InternalServerError
+- fix: change 'nonce too high' to log in debug instead of info
+- chore: update deps, vm ressource fee cost are now FixedU128, and stored in an
+ hashmap
+- ci: change jobs order in the workflow
+- ci: run integrations tests in the same runner as build
+- ci: replace ci cache with rust-cache
+- fix(transactions): remove `nonce` field from InvokeV0 tx
+- feat(transactions): don't enforce ordering in validate_unsigned for invokeV0
+- test(pallet): add function to get braavos hash
+- fix: event commitment documentation typo
+- ci: added testing key generation in the ci
+- fix(starknet-rpc-test): init one request client per runtime
+- test: validate Nonce for unsigned user txs
+- fix: fixed declare V0 placeholder with the hash of an empty list of felts
+- feat(cli): `run` is the by default command when running the `madara` bin
+- refacto(cli): `run` and `setup` commands are defined in their own files
+- refacto(cli): `run.testnet` argument removed in favor of the substrate native
+ `chain` arg
+- feat(cli): `run.fetch_chain_spec` argument removed in favor of the substrate
+ native `chain` arg
+- feat(cli): `setup` require a source file, either from an url or a path on the
+ local filesystem
+- chore(cli): use `Url`, `Path` and `PathBuf` types rather than `String`
+- refacto(cli): moved the pallet/chain_spec/utils methods to the node crate
+- feat(cli): `madara_path` arg has been remove, we use the substrate native
+ `base_path` arg instead
+- feat(cli): sharingan chain specs are loaded during the compilation, not
+ downloaded from github
+- refacto(pallet/starknet): `GenesisLoader` refactored as `GenesisData` + a
+ `base_path` field
+- feat(cli): for `run` param `--dev` now imply `--tmp`, as it is in substrate
+- test(starknet-rpc-test): run all tests against a single madara node
+- fix(service): confusing message when node starts (output the actual sealing
+ method being used)
+- refactor(sealing): how the sealing mode is passed into runtime
+- feat(sealing): finalization for instant sealing
+- test(starknet-js-test): run basic starknetjs compatibility tests again the
+ madara node
+- feat(cache-option): add an option to enable aggressive caching in command-line
+ parameters
+- fix: Ensure transaction checks are compatible with starknet-rs
+
+## v0.4.0
+
+- chore: release v0.4.0
+- feat: better management of custom configurations for genesis assets
+- feat: use actual vm resource costs
- fix: add setup and run for rpc tests
- fix: fix clap for run command
- fix: add `madara_path` flag for setup command
- fix: add official references to configs files
-- refactor: exported chain id constant in mp-chain-id crate and added one for
- SN_MAIN
- fix: cargo update and `main` branch prettier fix
-- ci: disable pr close workflow
-- ci: add ci verification for detecting genesis changes and config hashes
-- feat: better management of custom configurations for genesis assets
- fix: fix sharingan chain spec
- fix: update madara infra to main branch
- fix: update `Cargo.lock`
+- fix: rpc test failing
+- refactor: exported chain id constant in mp-chain-id crate and added one for
+ SN_MAIN
+- ci: disable pr close workflow
+- ci: add ci verification for detecting genesis changes and config hashes
+- test: add e2e test for `estimate_fee`
## v0.3.0
diff --git a/Cargo.lock b/Cargo.lock
index 51e30fffd6..467fc3a302 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -172,9 +172,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "1.1.1"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
dependencies = [
"memchr",
]
@@ -222,9 +222,9 @@ dependencies = [
[[package]]
name = "anstream"
-version = "0.6.1"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6cd65a4b849ace0b7f6daeebcc1a1d111282227ca745458c61dbf670e52a597"
+checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
dependencies = [
"anstyle",
"anstyle-parse",
@@ -260,9 +260,9 @@ dependencies = [
[[package]]
name = "anstyle-wincon"
-version = "3.0.0"
+version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0238ca56c96dfa37bdf7c373c8886dd591322500aceeeccdb2216fe06dc2f796"
+checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
dependencies = [
"anstyle",
"windows-sys 0.48.0",
@@ -280,7 +280,7 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
dependencies = [
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
]
[[package]]
@@ -302,7 +302,7 @@ dependencies = [
"derivative",
"hashbrown 0.13.2",
"itertools 0.10.5",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"zeroize",
]
@@ -318,7 +318,7 @@ dependencies = [
"ark-std 0.3.0",
"derivative",
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"paste",
"rustc_version 0.3.3",
"zeroize",
@@ -338,7 +338,7 @@ dependencies = [
"digest 0.10.7",
"itertools 0.10.5",
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"paste",
"rustc_version 0.4.0",
"zeroize",
@@ -371,7 +371,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20"
dependencies = [
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"quote",
"syn 1.0.109",
]
@@ -383,7 +383,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
dependencies = [
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"proc-macro2",
"quote",
"syn 1.0.109",
@@ -452,7 +452,7 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c"
dependencies = [
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"rand 0.8.5",
]
@@ -462,7 +462,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
dependencies = [
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"rand 0.8.5",
]
@@ -524,7 +524,7 @@ dependencies = [
"asn1-rs-impl",
"displaydoc",
"nom",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"rusticata-macros",
"thiserror",
"time",
@@ -540,7 +540,7 @@ dependencies = [
"asn1-rs-impl",
"displaydoc",
"nom",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"rusticata-macros",
"thiserror",
"time",
@@ -612,7 +612,7 @@ dependencies = [
"log",
"parking",
"polling",
- "rustix 0.37.23",
+ "rustix 0.37.26",
"slab",
"socket2 0.4.9",
"waker-fn",
@@ -635,18 +635,18 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
name = "async-trait"
-version = "0.1.73"
+version = "0.1.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -811,7 +811,7 @@ checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa"
dependencies = [
"num-bigint",
"num-integer",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"serde",
]
@@ -859,7 +859,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -894,7 +894,7 @@ dependencies = [
[[package]]
name = "bitcoin-da"
version = "0.1.0"
-source = "git+https://github.com/KasarLabs/bitcoin-da?branch=bitcoin-da/prod#9493f923748a7dc4a88c71c9fd43c1e2ba8b65a2"
+source = "git+https://github.com/KasarLabs/bitcoin-da?branch=write_without_network#616a511497b8854456c9ac0be49e963565a74224"
dependencies = [
"bitcoin",
"bitcoin_hashes",
@@ -957,9 +957,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
[[package]]
name = "bitvec"
@@ -1075,7 +1075,7 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae"
[[package]]
name = "blockifier"
version = "0.1.0-rc2"
-source = "git+https://github.com/keep-starknet-strange/blockifier?branch=no_std-support-7578442#ccd1e88757d6415c804a9c0ee19723b607403072"
+source = "git+https://github.com/keep-starknet-strange/blockifier?branch=no_std-support-7578442#37d3e3b64123b6c31558a883ee5e5f68ffb582f4"
dependencies = [
"ark-ff 0.4.2",
"ark-secp256k1",
@@ -1087,22 +1087,22 @@ dependencies = [
"cairo-lang-vm-utils",
"cairo-vm",
"derive_more",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
"indexmap 2.0.0-pre",
"itertools 0.10.5",
"keccak",
"lazy_static",
- "libm",
"log",
"num-bigint",
"num-integer",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"parity-scale-codec",
"phf",
"scale-info",
"serde",
"serde_json",
"sha3",
+ "sp-arithmetic 6.0.0",
"spin 0.9.8",
"starknet-crypto 0.5.1",
"starknet_api",
@@ -1113,9 +1113,9 @@ dependencies = [
[[package]]
name = "bounded-collections"
-version = "0.1.8"
+version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb5b05133427c07c4776906f673ccf36c21b102c9829c641a5b56bd151d44fd6"
+checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd"
dependencies = [
"log",
"parity-scale-codec",
@@ -1141,9 +1141,9 @@ dependencies = [
[[package]]
name = "bstr"
-version = "1.6.2"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a"
+checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019"
dependencies = [
"memchr",
"serde",
@@ -1184,9 +1184,9 @@ checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
[[package]]
name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
@@ -1238,7 +1238,7 @@ dependencies = [
"lazy_static",
"num-bigint",
"num-integer",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"parity-scale-codec",
"serde",
]
@@ -1249,10 +1249,10 @@ version = "2.1.0"
source = "git+https://github.com/keep-starknet-strange/cairo.git?branch=no_std-support-8bbf530#f8b5fe438e0d201b7d1afb39c21d343ff95b5850"
dependencies = [
"cairo-lang-utils",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
"indoc",
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"parity-scale-codec",
"parity-scale-codec-derive",
"serde",
@@ -1375,7 +1375,7 @@ dependencies = [
"itertools 0.10.5",
"log",
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"once_cell",
"salsa",
"smol_str",
@@ -1395,7 +1395,7 @@ dependencies = [
"itertools 0.10.5",
"log",
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"salsa",
"smol_str",
"unescaper",
@@ -1428,7 +1428,7 @@ source = "git+https://github.com/keep-starknet-strange/cairo.git?branch=no_std-s
dependencies = [
"cairo-lang-debug",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -1461,7 +1461,7 @@ dependencies = [
"itertools 0.10.5",
"log",
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"once_cell",
"salsa",
"smol_str",
@@ -1480,7 +1480,7 @@ dependencies = [
"lalrpop",
"lalrpop-util",
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"regex",
"salsa",
"serde",
@@ -1558,7 +1558,7 @@ dependencies = [
"itertools 0.10.5",
"log",
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"thiserror",
]
@@ -1603,7 +1603,7 @@ dependencies = [
"log",
"num-bigint",
"num-integer",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"once_cell",
"serde",
"serde_json",
@@ -1621,7 +1621,7 @@ dependencies = [
"cairo-lang-filesystem",
"cairo-lang-utils",
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"salsa",
"smol_str",
"thiserror",
@@ -1643,12 +1643,12 @@ version = "2.1.0"
source = "git+https://github.com/keep-starknet-strange/cairo.git?branch=no_std-support-8bbf530#f8b5fe438e0d201b7d1afb39c21d343ff95b5850"
dependencies = [
"cairo-felt",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
"indexmap 2.0.0-pre",
"itertools 0.10.5",
"num-bigint",
"num-integer",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"parity-scale-codec",
"serde",
]
@@ -1664,10 +1664,10 @@ dependencies = [
"cairo-lang-casm",
"cairo-lang-utils",
"cairo-vm",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
"num-bigint",
"num-integer",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
]
[[package]]
@@ -1693,7 +1693,7 @@ dependencies = [
"cairo-lang-casm-contract-class",
"cairo-take_until_unbalanced",
"generic-array 0.14.7",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
"hex",
"keccak",
"lazy_static",
@@ -1701,7 +1701,7 @@ dependencies = [
"num-bigint",
"num-integer",
"num-prime",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"parity-scale-codec",
"rand 0.8.5",
"serde",
@@ -1723,9 +1723,9 @@ dependencies = [
[[package]]
name = "cargo-platform"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479"
+checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36"
dependencies = [
"serde",
]
@@ -1738,7 +1738,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
dependencies = [
"camino",
"cargo-platform",
- "semver 1.0.19",
+ "semver 1.0.20",
"serde",
"serde_json",
"thiserror",
@@ -1752,7 +1752,7 @@ checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592"
dependencies = [
"camino",
"cargo-platform",
- "semver 1.0.19",
+ "semver 1.0.20",
"serde",
"serde_json",
"thiserror",
@@ -1799,7 +1799,7 @@ source = "git+https://github.com/eigerco/celestia-node-rs?rev=bd6394b66b11065c54
dependencies = [
"celestia-types",
"http",
- "jsonrpsee 0.20.1",
+ "jsonrpsee 0.20.2",
"serde",
"thiserror",
]
@@ -1816,7 +1816,7 @@ dependencies = [
"cid 0.10.1",
"const_format",
"enum_dispatch",
- "libp2p-identity 0.2.3",
+ "libp2p-identity 0.2.7",
"multiaddr 0.18.0",
"nmt-rs",
"ruint",
@@ -1892,7 +1892,7 @@ dependencies = [
"android-tzdata",
"iana-time-zone",
"js-sys",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"serde",
"wasm-bindgen",
"windows-targets 0.48.5",
@@ -2018,7 +2018,7 @@ dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -2147,9 +2147,9 @@ checksum = "32b13ea120a812beba79e34316b3942a857c86ec1593cb34f27bb28272ce2cca"
[[package]]
name = "const-hex"
-version = "1.9.0"
+version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa72a10d0e914cad6bcad4e7409e68d230c1c2db67896e19a37f758b1fcbdab5"
+checksum = "c37be52ef5e3b394db27a2341010685ad5103c72ac15ce2e9420a7e8f93f342c"
dependencies = [
"cfg-if",
"cpufeatures",
@@ -2165,18 +2165,18 @@ checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
[[package]]
name = "const_format"
-version = "0.2.31"
+version = "0.2.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48"
+checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
dependencies = [
"const_format_proc_macros",
]
[[package]]
name = "const_format_proc_macros"
-version = "0.2.31"
+version = "0.2.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6"
+checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
dependencies = [
"proc-macro2",
"quote",
@@ -2538,7 +2538,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -2556,9 +2556,9 @@ dependencies = [
[[package]]
name = "cxx"
-version = "1.0.107"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe98ba1789d56fb3db3bee5e032774d4f421b685de7ba703643584ba24effbe"
+checksum = "c390c123d671cc547244943ecad81bdaab756c6ea332d9ca9c1f48d952a24895"
dependencies = [
"cc",
"cxxbridge-flags",
@@ -2568,9 +2568,9 @@ dependencies = [
[[package]]
name = "cxx-build"
-version = "1.0.107"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4ce20f6b8433da4841b1dadfb9468709868022d829d5ca1f2ffbda928455ea3"
+checksum = "00d3d3ac9ffb900304edf51ca719187c779f4001bb544f26c4511d621de905cf"
dependencies = [
"cc",
"codespan-reporting",
@@ -2578,24 +2578,24 @@ dependencies = [
"proc-macro2",
"quote",
"scratch",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
name = "cxxbridge-flags"
-version = "1.0.107"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20888d9e1d2298e2ff473cee30efe7d5036e437857ab68bbfea84c74dba91da2"
+checksum = "94415827ecfea0f0c74c8cad7d1a86ddb3f05354d6a6ddeda0adee5e875d2939"
[[package]]
name = "cxxbridge-macro"
-version = "1.0.107"
+version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84"
+checksum = "e33dbbe9f5621c9247f97ec14213b04f350bff4b6cebefe834c60055db266ecf"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -2643,7 +2643,7 @@ dependencies = [
"proc-macro2",
"quote",
"strsim 0.10.0",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -2665,7 +2665,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
dependencies = [
"darling_core 0.20.3",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -2725,7 +2725,7 @@ dependencies = [
"displaydoc",
"nom",
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"rusticata-macros",
]
@@ -2739,16 +2739,17 @@ dependencies = [
"displaydoc",
"nom",
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"rusticata-macros",
]
[[package]]
name = "deranged"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
dependencies = [
+ "powerfmt",
"serde",
]
@@ -2940,7 +2941,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -3020,7 +3021,7 @@ checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
dependencies = [
"der 0.7.8",
"digest 0.10.7",
- "elliptic-curve 0.13.5",
+ "elliptic-curve 0.13.6",
"rfc6979 0.4.0",
"signature 2.1.0",
"spki 0.7.2",
@@ -3037,9 +3038,9 @@ dependencies = [
[[package]]
name = "ed25519"
-version = "2.2.2"
+version = "2.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d"
+checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
dependencies = [
"pkcs8 0.10.2",
"signature 2.1.0",
@@ -3077,7 +3078,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
dependencies = [
"curve25519-dalek 4.1.1",
- "ed25519 2.2.2",
+ "ed25519 2.2.3",
"rand_core 0.6.4",
"serde",
"sha2 0.10.8",
@@ -3128,9 +3129,9 @@ dependencies = [
[[package]]
name = "elliptic-curve"
-version = "0.13.5"
+version = "0.13.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
+checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914"
dependencies = [
"base16ct 0.2.0",
"crypto-bigint 0.5.3",
@@ -3208,20 +3209,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.37",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
+ "syn 2.0.38",
]
[[package]]
@@ -3251,25 +3239,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "errno"
-version = "0.3.3"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
dependencies = [
- "errno-dragonfly",
"libc",
"windows-sys 0.48.0",
]
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
[[package]]
name = "eth-keystore"
version = "0.5.0"
@@ -3406,7 +3383,7 @@ dependencies = [
"reqwest",
"serde",
"serde_json",
- "syn 2.0.37",
+ "syn 2.0.38",
"toml 0.7.8",
"walkdir",
]
@@ -3424,7 +3401,7 @@ dependencies = [
"proc-macro2",
"quote",
"serde_json",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -3438,7 +3415,7 @@ dependencies = [
"cargo_metadata 0.17.0",
"chrono",
"const-hex",
- "elliptic-curve 0.13.5",
+ "elliptic-curve 0.13.6",
"ethabi",
"generic-array 0.14.7",
"k256",
@@ -3450,7 +3427,7 @@ dependencies = [
"serde",
"serde_json",
"strum 0.25.0",
- "syn 2.0.37",
+ "syn 2.0.38",
"tempfile",
"thiserror",
"tiny-keccak",
@@ -3465,7 +3442,7 @@ checksum = "0e53451ea4a8128fbce33966da71132cf9e1040dcfd2a2084fd7733ada7b2045"
dependencies = [
"ethers-core",
"reqwest",
- "semver 1.0.19",
+ "semver 1.0.20",
"serde",
"serde_json",
"thiserror",
@@ -3546,7 +3523,7 @@ dependencies = [
"coins-bip32",
"coins-bip39",
"const-hex",
- "elliptic-curve 0.13.5",
+ "elliptic-curve 0.13.6",
"eth-keystore",
"ethers-core",
"rand 0.8.5",
@@ -3574,7 +3551,7 @@ dependencies = [
"path-slash",
"rayon",
"regex",
- "semver 1.0.19",
+ "semver 1.0.20",
"serde",
"serde_json",
"solang-parser",
@@ -3730,7 +3707,7 @@ dependencies = [
"futures",
"futures-timer",
"log",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"parity-scale-codec",
"parking_lot 0.12.1",
"scale-info",
@@ -3756,9 +3733,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
[[package]]
name = "flate2"
-version = "1.0.27"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
dependencies = [
"crc32fast",
"libz-sys",
@@ -3781,7 +3758,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
dependencies = [
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
]
[[package]]
@@ -3997,7 +3974,7 @@ dependencies = [
"proc-macro-warning",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -4009,7 +3986,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -4019,7 +3996,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -4099,7 +4076,7 @@ version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47"
dependencies = [
- "rustix 0.38.14",
+ "rustix 0.38.20",
"windows-sys 0.48.0",
]
@@ -4191,7 +4168,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -4202,7 +4179,7 @@ checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd"
dependencies = [
"futures-io",
"rustls 0.20.9",
- "webpki 0.22.1",
+ "webpki 0.22.4",
]
[[package]]
@@ -4256,9 +4233,9 @@ dependencies = [
[[package]]
name = "genco"
-version = "0.17.6"
+version = "0.17.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3597f99dbe04460775cb349299b9532123980b17d89faeaa2da42658b7767787"
+checksum = "c4fd234893ffe9cf5b81224ebb1d21bbe2eeb94d95bac3ea25c97cba7293304d"
dependencies = [
"genco-macros",
"relative-path",
@@ -4267,13 +4244,13 @@ dependencies = [
[[package]]
name = "genco-macros"
-version = "0.17.6"
+version = "0.17.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b029ca4c73c30f813e0e92754515585ccbede98014fb26644cc7488a3833706a"
+checksum = "8e1c8cd3de2f32ee05ba2adaa90f8d0c354ffa0adeb2d186978d7ae70e5025e9"
dependencies = [
"proc-macro2",
"quote",
- "syn 1.0.109",
+ "syn 2.0.38",
]
[[package]]
@@ -4433,9 +4410,9 @@ dependencies = [
[[package]]
name = "good_lp"
-version = "1.6.1"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "869f19637130a4e8e1c3f3f83df4a00a169c1d3a77a2b2ff41736b14497c4027"
+checksum = "fa124423ded10046a849fa0ae9747c541895557f1af177e0890b09879e7e9e7d"
dependencies = [
"fnv",
"minilp",
@@ -4531,9 +4508,9 @@ dependencies = [
[[package]]
name = "hashbrown"
-version = "0.14.1"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
dependencies = [
"ahash 0.8.3",
"allocator-api2",
@@ -4783,16 +4760,16 @@ dependencies = [
[[package]]
name = "iana-time-zone"
-version = "0.1.57"
+version = "0.1.58"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
dependencies = [
"android_system_properties",
"core-foundation-sys",
"iana-time-zone-haiku",
"js-sys",
"wasm-bindgen",
- "windows 0.48.0",
+ "windows-core",
]
[[package]]
@@ -4849,9 +4826,9 @@ dependencies = [
[[package]]
name = "if-watch"
-version = "3.0.1"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9465340214b296cd17a0009acdb890d6160010b8adf8f78a00d0d7ab270f79f"
+checksum = "bbb892e5777fe09e16f3d44de7802f4daa7267ecbe8c466f19d94e25bb0c303e"
dependencies = [
"async-io",
"core-foundation",
@@ -4863,7 +4840,7 @@ dependencies = [
"rtnetlink",
"system-configuration",
"tokio",
- "windows 0.34.0",
+ "windows",
]
[[package]]
@@ -4938,12 +4915,12 @@ dependencies = [
[[package]]
name = "indexmap"
-version = "2.0.1"
+version = "2.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad227c3af19d4914570ad36d30409928b75967c298feb9ea1969db3a610bb14e"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
dependencies = [
"equivalent",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
]
[[package]]
@@ -4989,7 +4966,7 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770"
dependencies = [
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
]
[[package]]
@@ -5053,7 +5030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi 0.3.3",
- "rustix 0.38.14",
+ "rustix 0.38.20",
"windows-sys 0.48.0",
]
@@ -5083,9 +5060,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "jobserver"
-version = "0.1.26"
+version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
dependencies = [
"libc",
]
@@ -5129,15 +5106,15 @@ dependencies = [
[[package]]
name = "jsonrpsee"
-version = "0.20.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ad9b31183a8bcbe843e32ca8554ad2936633548d95a7bb6a8e14c767dea6b05"
+checksum = "de902baa44bf34a58b1a4906f8b840d7d60dcec5f41fe08b4dbc14cf9efa821c"
dependencies = [
- "jsonrpsee-core 0.20.1",
- "jsonrpsee-http-client 0.20.1",
- "jsonrpsee-proc-macros 0.20.1",
- "jsonrpsee-types 0.20.1",
- "jsonrpsee-ws-client 0.20.1",
+ "jsonrpsee-core 0.20.2",
+ "jsonrpsee-http-client 0.20.2",
+ "jsonrpsee-proc-macros 0.20.2",
+ "jsonrpsee-types 0.20.2",
+ "jsonrpsee-ws-client 0.20.2",
"tracing",
]
@@ -5168,13 +5145,13 @@ dependencies = [
[[package]]
name = "jsonrpsee-client-transport"
-version = "0.20.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97f2743cad51cc86b0dbfe316309eeb87a9d96a3d7f4dd7a99767c4b5f065335"
+checksum = "58d9851f8f5653e0433a898e9032bde4910b35d625bd9dcf33ef6e36e7c3d456"
dependencies = [
"futures-util",
"http",
- "jsonrpsee-core 0.20.1",
+ "jsonrpsee-core 0.20.2",
"pin-project",
"rustls-native-certs",
"soketto",
@@ -5217,9 +5194,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-core"
-version = "0.20.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35dc957af59ce98373bcdde0c1698060ca6c2d2e9ae357b459c7158b6df33330"
+checksum = "51f45d37af23707750136379f6799e76ebfcf2d425ec4e36d0deb7921da5e65c"
dependencies = [
"anyhow",
"async-lock",
@@ -5228,7 +5205,7 @@ dependencies = [
"futures-timer",
"futures-util",
"hyper",
- "jsonrpsee-types 0.20.1",
+ "jsonrpsee-types 0.20.2",
"rustc-hash",
"serde",
"serde_json",
@@ -5258,15 +5235,15 @@ dependencies = [
[[package]]
name = "jsonrpsee-http-client"
-version = "0.20.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0dd865d0072764cb937b0110a92b5f53e995f7101cb346beca03d93a2dea79de"
+checksum = "02308562f2e8162a32f8d6c3dc19c29c858d5d478047c886a5c3c25b5f7fa868"
dependencies = [
"async-trait",
"hyper",
"hyper-rustls 0.24.1",
- "jsonrpsee-core 0.20.1",
- "jsonrpsee-types 0.20.1",
+ "jsonrpsee-core 0.20.2",
+ "jsonrpsee-types 0.20.2",
"serde",
"serde_json",
"thiserror",
@@ -5291,9 +5268,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-proc-macros"
-version = "0.20.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cef91b1017a4edb63f65239381c18de39f88d0e0760ab626d806e196f7f51477"
+checksum = "f26b3675a943d083d0bf6e367ec755dccec56c41888afa13b191c1c4ff87c652"
dependencies = [
"heck 0.4.1",
"proc-macro-crate",
@@ -5340,9 +5317,9 @@ dependencies = [
[[package]]
name = "jsonrpsee-types"
-version = "0.20.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9e25aec855b2a7d3ed90fded6c41e8c3fb72b63f071e1be3f0004eba19b625"
+checksum = "05eaff23af19f10ba6fbb76519bed6da4d3b9bbaef13d39b7c2b6c14e532d27e"
dependencies = [
"anyhow",
"beef",
@@ -5377,14 +5354,14 @@ dependencies = [
[[package]]
name = "jsonrpsee-ws-client"
-version = "0.20.1"
+version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d88e35e9dfa89248ae3e92f689c1f0a190ce12d377eba7d2d08e5a7f6cc5694a"
+checksum = "cd34d3ab8c09f02fd4c432f256bc8b143b616b222b03050f941ee53f0e8d7b24"
dependencies = [
"http",
- "jsonrpsee-client-transport 0.20.1",
- "jsonrpsee-core 0.20.1",
- "jsonrpsee-types 0.20.1",
+ "jsonrpsee-client-transport 0.20.2",
+ "jsonrpsee-core 0.20.2",
+ "jsonrpsee-types 0.20.2",
"url",
]
@@ -5396,7 +5373,7 @@ checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378"
dependencies = [
"base64 0.21.4",
"pem",
- "ring",
+ "ring 0.16.20",
"serde",
"serde_json",
"simple_asn1",
@@ -5410,7 +5387,7 @@ checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
dependencies = [
"cfg-if",
"ecdsa 0.16.8",
- "elliptic-curve 0.13.5",
+ "elliptic-curve 0.13.6",
"once_cell",
"sha2 0.10.8",
"signature 2.1.0",
@@ -5507,9 +5484,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "libc"
-version = "0.2.148"
+version = "0.2.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
[[package]]
name = "libloading"
@@ -5523,9 +5500,9 @@ dependencies = [
[[package]]
name = "libm"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
[[package]]
name = "libp2p"
@@ -5669,15 +5646,15 @@ dependencies = [
[[package]]
name = "libp2p-identity"
-version = "0.2.3"
+version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686e73aff5e23efbb99bc85340ea6fd8686986aa7b283a881ba182cfca535ca9"
+checksum = "cdd6317441f361babc74c2989c6484eb0726045399b6648de039e1805ea96972"
dependencies = [
"bs58 0.5.0",
+ "hkdf",
"log",
"multihash 0.19.1",
"quick-protobuf",
- "rand 0.8.5",
"sha2 0.10.8",
"thiserror",
]
@@ -5882,10 +5859,10 @@ dependencies = [
"libp2p-core",
"libp2p-identity 0.1.3",
"rcgen 0.10.0",
- "ring",
+ "ring 0.16.20",
"rustls 0.20.9",
"thiserror",
- "webpki 0.22.1",
+ "webpki 0.22.4",
"x509-parser 0.14.0",
"yasna",
]
@@ -6088,15 +6065,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
[[package]]
name = "linux-raw-sys"
-version = "0.4.7"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
[[package]]
name = "lock_api"
-version = "0.4.10"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
dependencies = [
"autocfg",
"scopeguard",
@@ -6175,7 +6152,7 @@ dependencies = [
[[package]]
name = "madara"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"async-trait",
"blockifier",
@@ -6189,6 +6166,7 @@ dependencies = [
"log",
"madara-runtime",
"mc-block-proposer",
+ "mc-commitment-state-diff",
"mc-data-availability",
"mc-db",
"mc-mapping-sync",
@@ -6201,6 +6179,7 @@ dependencies = [
"mp-felt",
"mp-sequencer-address",
"pallet-starknet",
+ "reqwest",
"sc-cli",
"sc-client-api",
"sc-consensus",
@@ -6235,11 +6214,12 @@ dependencies = [
"substrate-frame-rpc-system",
"substrate-prometheus-endpoint",
"try-runtime-cli",
+ "url",
]
[[package]]
name = "madara-runtime"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"blockifier",
"frame-benchmarking",
@@ -6259,6 +6239,7 @@ dependencies = [
"pallet-timestamp",
"parity-scale-codec",
"scale-info",
+ "serde",
"sp-api",
"sp-block-builder",
"sp-consensus-aura",
@@ -6329,7 +6310,7 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
[[package]]
name = "mc-block-proposer"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"futures",
"futures-timer",
@@ -6352,6 +6333,26 @@ dependencies = [
"substrate-test-runtime-client",
]
+[[package]]
+name = "mc-commitment-state-diff"
+version = "0.4.0"
+dependencies = [
+ "blockifier",
+ "futures",
+ "indexmap 2.0.0-pre",
+ "log",
+ "mp-digest-log",
+ "mp-hashers",
+ "mp-storage",
+ "pallet-starknet",
+ "sc-client-api",
+ "sp-api",
+ "sp-blockchain",
+ "sp-runtime 7.0.0",
+ "starknet_api",
+ "thiserror",
+]
+
[[package]]
name = "mc-data-availability"
version = "0.1.0"
@@ -6367,9 +6368,7 @@ dependencies = [
"clap 4.4.6",
"ethers",
"futures",
- "hex",
- "jsonrpsee 0.20.1",
- "lazy_static",
+ "jsonrpsee 0.20.2",
"log",
"mc-db",
"mp-storage",
@@ -6380,7 +6379,6 @@ dependencies = [
"sp-api",
"sp-blockchain",
"sp-core 7.0.0",
- "sp-io 7.0.0",
"sp-keyring",
"sp-runtime 7.0.0",
"starknet_api",
@@ -6388,12 +6386,12 @@ dependencies = [
"thiserror",
"tokio",
"url",
- "uuid 1.4.1",
+ "uuid 1.5.0",
]
[[package]]
name = "mc-db"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"ethers",
"kvdb-rocksdb",
@@ -6404,12 +6402,12 @@ dependencies = [
"sp-core 7.0.0",
"sp-database",
"sp-runtime 7.0.0",
- "uuid 1.4.1",
+ "uuid 1.5.0",
]
[[package]]
name = "mc-mapping-sync"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"futures",
"futures-timer",
@@ -6430,7 +6428,7 @@ dependencies = [
[[package]]
name = "mc-rpc"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"blockifier",
"frame-support",
@@ -6466,7 +6464,7 @@ dependencies = [
[[package]]
name = "mc-rpc-core"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"anyhow",
"assert_matches",
@@ -6497,7 +6495,7 @@ dependencies = [
[[package]]
name = "mc-storage"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"blockifier",
"frame-support",
@@ -6526,7 +6524,7 @@ dependencies = [
"futures-timer",
"linked-hash-map",
"log",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"parity-scale-codec",
"parking_lot 0.12.1",
"sc-client-api",
@@ -6562,9 +6560,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
[[package]]
name = "memchr"
-version = "2.6.3"
+version = "2.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
[[package]]
name = "memfd"
@@ -6572,7 +6570,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
dependencies = [
- "rustix 0.38.14",
+ "rustix 0.38.20",
]
[[package]]
@@ -6709,7 +6707,7 @@ dependencies = [
[[package]]
name = "mp-block"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"blockifier",
"mp-felt",
@@ -6723,7 +6721,7 @@ dependencies = [
[[package]]
name = "mp-chain-id"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"mp-felt",
"starknet-ff",
@@ -6731,7 +6729,7 @@ dependencies = [
[[package]]
name = "mp-commitments"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"bitvec",
"derive_more",
@@ -6749,7 +6747,7 @@ dependencies = [
[[package]]
name = "mp-digest-log"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"assert_matches",
"mp-block",
@@ -6759,17 +6757,19 @@ dependencies = [
[[package]]
name = "mp-fee"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"blockifier",
+ "hashbrown 0.14.2",
"mp-state",
"phf",
+ "sp-arithmetic 6.0.0",
"starknet_api",
]
[[package]]
name = "mp-felt"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"cairo-vm",
"hex",
@@ -6784,7 +6784,7 @@ dependencies = [
[[package]]
name = "mp-hashers"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"mp-felt",
"parity-scale-codec",
@@ -6796,7 +6796,7 @@ dependencies = [
[[package]]
name = "mp-sequencer-address"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -6807,7 +6807,7 @@ dependencies = [
[[package]]
name = "mp-state"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"blockifier",
"starknet_api",
@@ -6815,15 +6815,17 @@ dependencies = [
[[package]]
name = "mp-storage"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
+ "lazy_static",
"parity-scale-codec",
"serde",
+ "sp-io 7.0.0",
]
[[package]]
name = "mp-transactions"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"assert_matches",
"blockifier",
@@ -6877,7 +6879,7 @@ dependencies = [
"arrayref",
"byteorder",
"data-encoding",
- "libp2p-identity 0.2.3",
+ "libp2p-identity 0.2.7",
"multibase",
"multihash 0.19.1",
"percent-encoding",
@@ -6994,7 +6996,7 @@ dependencies = [
"nalgebra-macros",
"num-complex 0.4.4",
"num-rational",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"simba",
"typenum",
]
@@ -7046,7 +7048,7 @@ dependencies = [
"matrixmultiply 0.2.4",
"num-complex 0.2.4",
"num-integer",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"rawpointer",
]
@@ -7179,7 +7181,7 @@ checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
dependencies = [
"autocfg",
"num-integer",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"rand 0.8.5",
"serde",
]
@@ -7191,7 +7193,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
dependencies = [
"autocfg",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
]
[[package]]
@@ -7200,7 +7202,7 @@ version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
dependencies = [
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
]
[[package]]
@@ -7231,7 +7233,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
dependencies = [
"autocfg",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
]
[[package]]
@@ -7242,7 +7244,7 @@ checksum = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119"
dependencies = [
"num-bigint",
"num-integer",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
]
[[package]]
@@ -7257,7 +7259,7 @@ dependencies = [
"num-bigint",
"num-integer",
"num-modular",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"rand 0.8.5",
]
@@ -7270,7 +7272,7 @@ dependencies = [
"autocfg",
"num-bigint",
"num-integer",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
]
[[package]]
@@ -7279,14 +7281,14 @@ version = "0.1.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
dependencies = [
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
]
[[package]]
name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
dependencies = [
"autocfg",
"libm",
@@ -7341,7 +7343,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -7444,7 +7446,7 @@ version = "0.10.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
"cfg-if",
"foreign-types",
"libc",
@@ -7461,7 +7463,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -7700,14 +7702,16 @@ dependencies = [
[[package]]
name = "pallet-starknet"
-version = "0.3.0"
+version = "0.4.0"
dependencies = [
"assert_matches",
"blockifier",
"cairo-lang-casm-contract-class",
+ "derive_more",
"frame-benchmarking",
"frame-support",
"frame-system",
+ "hashbrown 0.14.2",
"hex",
"hexlit",
"indexmap 2.0.0-pre",
@@ -7727,6 +7731,7 @@ dependencies = [
"pallet-timestamp",
"parity-scale-codec",
"pretty_assertions",
+ "project-root",
"reqwest",
"sc-cli",
"scale-info",
@@ -7734,6 +7739,7 @@ dependencies = [
"serde_json",
"serde_with",
"sp-api",
+ "sp-arithmetic 6.0.0",
"sp-core 7.0.0",
"sp-inherents",
"sp-io 7.0.0",
@@ -7781,9 +7787,9 @@ dependencies = [
[[package]]
name = "parity-db"
-version = "0.4.11"
+version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab512a34b3c2c5e465731cc7668edf79208bbe520be03484eeb05e63ed221735"
+checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f"
dependencies = [
"blake2",
"crc32fast",
@@ -7840,9 +7846,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304"
[[package]]
name = "parking"
-version = "2.1.1"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067"
+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
[[package]]
name = "parking_lot"
@@ -7862,7 +7868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
- "parking_lot_core 0.9.8",
+ "parking_lot_core 0.9.9",
]
[[package]]
@@ -7881,13 +7887,13 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
dependencies = [
"cfg-if",
"libc",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
"smallvec 1.11.1",
"windows-targets 0.48.5",
]
@@ -8019,7 +8025,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -8040,7 +8046,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
dependencies = [
"fixedbitset",
- "indexmap 2.0.1",
+ "indexmap 2.0.2",
]
[[package]]
@@ -8083,7 +8089,7 @@ dependencies = [
"phf_shared 0.11.2",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -8127,7 +8133,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -8243,6 +8249,12 @@ version = "1.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
[[package]]
name = "ppv-lite86"
version = "0.2.17"
@@ -8312,14 +8324,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
dependencies = [
"proc-macro2",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
name = "primitive-types"
-version = "0.12.1"
+version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
+checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
dependencies = [
"fixed-hash",
"impl-codec",
@@ -8371,18 +8383,24 @@ checksum = "0e99670bafb56b9a106419397343bdbc8b8742c3cc449fec6345f86173f47cd4"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
dependencies = [
"unicode-ident",
]
+[[package]]
+name = "project-root"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bccbff07d5ed689c4087d20d7307a52ab6141edeedf487c3876a55b86cf63df"
+
[[package]]
name = "prometheus"
version = "0.13.3"
@@ -8417,23 +8435,22 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
name = "proptest"
-version = "1.2.0"
+version = "1.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65"
+checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e"
dependencies = [
- "bitflags 1.3.2",
- "byteorder",
+ "bitflags 2.4.1",
"lazy_static",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"rand 0.8.5",
"rand_chacha 0.3.1",
"rand_xorshift",
- "regex-syntax 0.6.29",
+ "regex-syntax 0.7.5",
"unarray",
]
@@ -8496,7 +8513,7 @@ dependencies = [
"prost 0.12.1",
"prost-types 0.12.1",
"regex",
- "syn 2.0.37",
+ "syn 2.0.38",
"tempfile",
"which",
]
@@ -8524,7 +8541,7 @@ dependencies = [
"itertools 0.11.0",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -8595,20 +8612,20 @@ dependencies = [
[[package]]
name = "quinn-proto"
-version = "0.9.5"
+version = "0.9.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c956be1b23f4261676aed05a0046e204e8a6836e50203902683a718af0797989"
+checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863"
dependencies = [
"bytes",
"rand 0.8.5",
- "ring",
+ "ring 0.16.20",
"rustc-hash",
"rustls 0.20.9",
"slab",
"thiserror",
"tinyvec",
"tracing",
- "webpki 0.22.1",
+ "webpki 0.22.4",
]
[[package]]
@@ -8748,7 +8765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd"
dependencies = [
"pem",
- "ring",
+ "ring 0.16.20",
"time",
"x509-parser 0.13.2",
"yasna",
@@ -8761,7 +8778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
dependencies = [
"pem",
- "ring",
+ "ring 0.16.20",
"time",
"yasna",
]
@@ -8784,6 +8801,15 @@ dependencies = [
"bitflags 1.3.2",
]
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
[[package]]
name = "redox_users"
version = "0.4.3"
@@ -8812,7 +8838,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -8829,14 +8855,14 @@ dependencies = [
[[package]]
name = "regex"
-version = "1.9.5"
+version = "1.10.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
dependencies = [
"aho-corasick",
"memchr",
- "regex-automata 0.3.8",
- "regex-syntax 0.7.5",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
]
[[package]]
@@ -8850,13 +8876,13 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.3.8"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
dependencies = [
"aho-corasick",
"memchr",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.2",
]
[[package]]
@@ -8871,6 +8897,12 @@ version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
[[package]]
name = "relative-path"
version = "1.9.0"
@@ -8879,9 +8911,9 @@ checksum = "c707298afce11da2efef2f600116fa93ffa7a032b5d7b628aa17711ec81383ca"
[[package]]
name = "reqwest"
-version = "0.11.20"
+version = "0.11.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1"
+checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
dependencies = [
"base64 0.21.4",
"bytes",
@@ -8907,6 +8939,7 @@ dependencies = [
"serde",
"serde_json",
"serde_urlencoded",
+ "system-configuration",
"tokio",
"tokio-native-tls",
"tokio-rustls 0.24.1",
@@ -8960,11 +8993,25 @@ dependencies = [
"libc",
"once_cell",
"spin 0.5.2",
- "untrusted",
+ "untrusted 0.7.1",
"web-sys",
"winapi",
]
+[[package]]
+name = "ring"
+version = "0.17.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b"
+dependencies = [
+ "cc",
+ "getrandom 0.2.10",
+ "libc",
+ "spin 0.9.8",
+ "untrusted 0.9.0",
+ "windows-sys 0.48.0",
+]
+
[[package]]
name = "ripemd"
version = "0.1.3"
@@ -9042,7 +9089,7 @@ dependencies = [
"regex",
"relative-path",
"rustc_version 0.4.0",
- "syn 2.0.37",
+ "syn 2.0.38",
"unicode-ident",
]
@@ -9158,7 +9205,7 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.19",
+ "semver 1.0.20",
]
[[package]]
@@ -9172,9 +9219,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.36.15"
+version = "0.36.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941"
+checksum = "6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab"
dependencies = [
"bitflags 1.3.2",
"errno",
@@ -9186,9 +9233,9 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.37.23"
+version = "0.37.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06"
+checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995"
dependencies = [
"bitflags 1.3.2",
"errno",
@@ -9200,14 +9247,14 @@ dependencies = [
[[package]]
name = "rustix"
-version = "0.38.14"
+version = "0.38.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f"
+checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
"errno",
"libc",
- "linux-raw-sys 0.4.7",
+ "linux-raw-sys 0.4.10",
"windows-sys 0.48.0",
]
@@ -9219,7 +9266,7 @@ checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
dependencies = [
"base64 0.13.1",
"log",
- "ring",
+ "ring 0.16.20",
"sct 0.6.1",
"webpki 0.21.4",
]
@@ -9231,9 +9278,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99"
dependencies = [
"log",
- "ring",
+ "ring 0.16.20",
"sct 0.7.0",
- "webpki 0.22.1",
+ "webpki 0.22.4",
]
[[package]]
@@ -9243,7 +9290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8"
dependencies = [
"log",
- "ring",
+ "ring 0.16.20",
"rustls-webpki 0.101.6",
"sct 0.7.0",
]
@@ -9275,8 +9322,8 @@ version = "0.100.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3"
dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
]
[[package]]
@@ -9285,8 +9332,8 @@ version = "0.101.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe"
dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
]
[[package]]
@@ -9421,7 +9468,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -9582,7 +9629,7 @@ dependencies = [
"log",
"num-bigint",
"num-rational",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"parity-scale-codec",
"parking_lot 0.12.1",
"sc-client-api",
@@ -9762,7 +9809,7 @@ dependencies = [
"libc",
"log",
"once_cell",
- "rustix 0.36.15",
+ "rustix 0.36.16",
"sc-allocator",
"sc-executor-common",
"sp-runtime-interface 7.0.0",
@@ -10308,7 +10355,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -10321,7 +10368,7 @@ dependencies = [
"futures-timer",
"linked-hash-map",
"log",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"parity-scale-codec",
"parking_lot 0.12.1",
"sc-client-api",
@@ -10436,9 +10483,9 @@ dependencies = [
[[package]]
name = "scale-info"
-version = "2.9.0"
+version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782"
+checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60"
dependencies = [
"bitvec",
"cfg-if",
@@ -10450,9 +10497,9 @@ dependencies = [
[[package]]
name = "scale-info-derive"
-version = "2.9.0"
+version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29"
+checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19"
dependencies = [
"proc-macro-crate",
"proc-macro2",
@@ -10548,8 +10595,8 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
]
[[package]]
@@ -10558,8 +10605,8 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
]
[[package]]
@@ -10693,9 +10740,9 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.19"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
dependencies = [
"serde",
]
@@ -10729,9 +10776,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
[[package]]
name = "serde"
-version = "1.0.188"
+version = "1.0.189"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
dependencies = [
"serde_derive",
]
@@ -10758,13 +10805,13 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.188"
+version = "1.0.189"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -10797,7 +10844,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -10846,7 +10893,7 @@ dependencies = [
"darling 0.20.3",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -10921,9 +10968,9 @@ dependencies = [
[[package]]
name = "sharded-slab"
-version = "0.1.6"
+version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b21f559e07218024e7e9f90f96f601825397de0e25420135f7f952453fed0b"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
dependencies = [
"lazy_static",
]
@@ -10971,7 +11018,7 @@ checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
dependencies = [
"approx",
"num-complex 0.4.4",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"paste",
"wide",
]
@@ -10983,7 +11030,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
dependencies = [
"num-bigint",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"thiserror",
"time",
]
@@ -11050,7 +11097,7 @@ dependencies = [
"chacha20poly1305",
"curve25519-dalek 4.1.1",
"rand_core 0.6.4",
- "ring",
+ "ring 0.16.20",
"rustc_version 0.4.0",
"sha2 0.10.8",
"subtle",
@@ -11138,7 +11185,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -11174,7 +11221,7 @@ version = "6.0.0"
source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e49f6e44820affccaf517fd22af564f4b495d40"
dependencies = [
"integer-sqrt",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"parity-scale-codec",
"scale-info",
"serde",
@@ -11189,7 +11236,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb6020576e544c6824a51d651bc8df8e6ab67cd59f1c9ac09868bb81a5199ded"
dependencies = [
"integer-sqrt",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"parity-scale-codec",
"scale-info",
"serde",
@@ -11456,7 +11503,7 @@ dependencies = [
"proc-macro2",
"quote",
"sp-core-hashing 5.0.0",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -11475,7 +11522,7 @@ source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.43#5e
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -11486,7 +11533,7 @@ checksum = "c7f531814d2f16995144c74428830ccf7d94ff4a7749632b83ad8199b181140c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -11789,7 +11836,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -11802,7 +11849,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -12066,7 +12113,7 @@ dependencies = [
"parity-scale-codec",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -12234,9 +12281,9 @@ dependencies = [
[[package]]
name = "starknet-core"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b796a32a7400f7d85e95d3900b5cee7a392b2adbf7ad16093ed45ec6f8d85de6"
+checksum = "14139b1c39bdc2f1e663c12090ff5108fe50ebe62c09e15e32988dfaf445a7e4"
dependencies = [
"base64 0.21.4",
"flate2",
@@ -12261,7 +12308,7 @@ dependencies = [
"hmac 0.12.1",
"num-bigint",
"num-integer",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"rfc6979 0.4.0",
"sha2 0.10.8",
"starknet-crypto-codegen",
@@ -12281,7 +12328,7 @@ dependencies = [
"hmac 0.12.1",
"num-bigint",
"num-integer",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"rfc6979 0.4.0",
"sha2 0.10.8",
"starknet-crypto-codegen",
@@ -12298,7 +12345,7 @@ checksum = "af6527b845423542c8a16e060ea1bc43f67229848e7cd4c4d80be994a84220ce"
dependencies = [
"starknet-curve 0.4.0",
"starknet-ff",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -12359,9 +12406,8 @@ version = "0.1.0"
dependencies = [
"anyhow",
"assert_matches",
- "derive_more",
+ "async-lock",
"flate2",
- "lazy_static",
"reqwest",
"rstest",
"serde",
@@ -12401,7 +12447,7 @@ source = "git+https://github.com/keep-starknet-strange/starknet-api?branch=no_st
dependencies = [
"cairo-lang-casm-contract-class",
"derive_more",
- "hashbrown 0.14.1",
+ "hashbrown 0.14.2",
"hex",
"indexmap 2.0.0-pre",
"once_cell",
@@ -12512,7 +12558,7 @@ version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
dependencies = [
- "strum_macros 0.25.2",
+ "strum_macros 0.25.3",
]
[[package]]
@@ -12530,15 +12576,15 @@ dependencies = [
[[package]]
name = "strum_macros"
-version = "0.25.2"
+version = "0.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -12552,7 +12598,7 @@ dependencies = [
"lazy_static",
"md-5",
"rand 0.8.5",
- "ring",
+ "ring 0.16.20",
"subtle",
"thiserror",
"tokio",
@@ -12815,7 +12861,7 @@ dependencies = [
"quote",
"scale-info",
"subxt-metadata",
- "syn 2.0.37",
+ "syn 2.0.38",
"thiserror",
"tokio",
]
@@ -12829,7 +12875,7 @@ dependencies = [
"darling 0.20.3",
"proc-macro-error",
"subxt-codegen",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -12856,7 +12902,7 @@ dependencies = [
"hex",
"once_cell",
"reqwest",
- "semver 1.0.19",
+ "semver 1.0.20",
"serde",
"serde_json",
"sha2 0.10.8",
@@ -12878,9 +12924,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.37"
+version = "2.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
dependencies = [
"proc-macro2",
"quote",
@@ -12928,9 +12974,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "target-lexicon"
-version = "0.12.11"
+version = "0.12.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
+checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
[[package]]
name = "tempfile"
@@ -12941,7 +12987,7 @@ dependencies = [
"cfg-if",
"fastrand 2.0.1",
"redox_syscall 0.3.5",
- "rustix 0.38.14",
+ "rustix 0.38.20",
"windows-sys 0.48.0",
]
@@ -12952,11 +12998,11 @@ source = "git+https://github.com/eigerco/celestia-tendermint-rs.git?rev=19dc3da#
dependencies = [
"bytes",
"digest 0.10.7",
- "ed25519 2.2.2",
+ "ed25519 2.2.3",
"ed25519-consensus",
"flex-error",
"futures",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"once_cell",
"prost 0.12.1",
"prost-types 0.12.1",
@@ -12981,7 +13027,7 @@ dependencies = [
"bytes",
"flex-error",
"num-derive",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
"prost 0.12.1",
"prost-types 0.12.1",
"serde",
@@ -13035,7 +13081,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -13047,7 +13093,7 @@ dependencies = [
"proc-macro-error",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
"test-case-core",
]
@@ -13062,22 +13108,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.49"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -13137,12 +13183,13 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.29"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
dependencies = [
"deranged",
"itoa",
+ "powerfmt",
"serde",
"time-core",
"time-macros",
@@ -13218,9 +13265,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]]
name = "tokio"
-version = "1.32.0"
+version = "1.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
dependencies = [
"backtrace",
"bytes",
@@ -13243,7 +13290,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -13275,7 +13322,7 @@ checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
dependencies = [
"rustls 0.20.9",
"tokio",
- "webpki 0.22.1",
+ "webpki 0.22.4",
]
[[package]]
@@ -13366,7 +13413,7 @@ version = "0.19.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
- "indexmap 2.0.1",
+ "indexmap 2.0.2",
"serde",
"serde_spanned",
"toml_datetime",
@@ -13394,7 +13441,7 @@ version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
"bytes",
"futures-core",
"futures-util",
@@ -13420,11 +13467,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [
- "cfg-if",
"log",
"pin-project-lite 0.2.13",
"tracing-attributes",
@@ -13433,20 +13479,20 @@ dependencies = [
[[package]]
name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
dependencies = [
"once_cell",
"valuable",
@@ -13655,7 +13701,7 @@ dependencies = [
"log",
"md-5",
"rand 0.8.5",
- "ring",
+ "ring 0.16.20",
"stun",
"thiserror",
"tokio",
@@ -13790,6 +13836,12 @@ version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
[[package]]
name = "url"
version = "2.4.1"
@@ -13825,9 +13877,9 @@ dependencies = [
[[package]]
name = "uuid"
-version = "1.4.1"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
dependencies = [
"getrandom 0.2.10",
"serde",
@@ -13930,7 +13982,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
"wasm-bindgen-shared",
]
@@ -13964,7 +14016,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -14069,7 +14121,7 @@ dependencies = [
"libm",
"memory_units",
"num-rational",
- "num-traits 0.2.16",
+ "num-traits 0.2.17",
]
[[package]]
@@ -14131,7 +14183,7 @@ dependencies = [
"directories-next",
"file-per-thread-logger",
"log",
- "rustix 0.36.15",
+ "rustix 0.36.16",
"serde",
"sha2 0.10.8",
"toml 0.5.11",
@@ -14227,7 +14279,7 @@ checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846"
dependencies = [
"object 0.30.4",
"once_cell",
- "rustix 0.36.15",
+ "rustix 0.36.16",
]
[[package]]
@@ -14258,7 +14310,7 @@ dependencies = [
"memoffset 0.8.0",
"paste",
"rand 0.8.5",
- "rustix 0.36.15",
+ "rustix 0.36.16",
"wasmtime-asm-macros",
"wasmtime-environ",
"wasmtime-jit-debug",
@@ -14293,18 +14345,18 @@ version = "0.21.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
dependencies = [
- "ring",
- "untrusted",
+ "ring 0.16.20",
+ "untrusted 0.7.1",
]
[[package]]
name = "webpki"
-version = "0.22.1"
+version = "0.22.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e"
+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
dependencies = [
- "ring",
- "untrusted",
+ "ring 0.17.5",
+ "untrusted 0.9.0",
]
[[package]]
@@ -14313,7 +14365,7 @@ version = "0.22.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
dependencies = [
- "webpki 0.22.1",
+ "webpki 0.22.4",
]
[[package]]
@@ -14347,7 +14399,7 @@ dependencies = [
"rand 0.8.5",
"rcgen 0.9.3",
"regex",
- "ring",
+ "ring 0.16.20",
"rtcp",
"rtp",
"rustls 0.19.1",
@@ -14411,7 +14463,7 @@ dependencies = [
"rand 0.8.5",
"rand_core 0.6.4",
"rcgen 0.10.0",
- "ring",
+ "ring 0.16.20",
"rustls 0.19.1",
"sec1 0.3.0",
"serde",
@@ -14445,7 +14497,7 @@ dependencies = [
"tokio",
"turn",
"url",
- "uuid 1.4.1",
+ "uuid 1.5.0",
"waitgroup",
"webrtc-mdns",
"webrtc-util",
@@ -14548,14 +14600,14 @@ dependencies = [
"either",
"home",
"once_cell",
- "rustix 0.38.14",
+ "rustix 0.38.20",
]
[[package]]
name = "wide"
-version = "0.7.11"
+version = "0.7.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f"
+checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242"
dependencies = [
"bytemuck",
"safe_arch",
@@ -14600,22 +14652,19 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
-version = "0.34.0"
+version = "0.51.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f"
+checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
dependencies = [
- "windows_aarch64_msvc 0.34.0",
- "windows_i686_gnu 0.34.0",
- "windows_i686_msvc 0.34.0",
- "windows_x86_64_gnu 0.34.0",
- "windows_x86_64_msvc 0.34.0",
+ "windows-core",
+ "windows-targets 0.48.5",
]
[[package]]
-name = "windows"
-version = "0.48.0"
+name = "windows-core"
+version = "0.51.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
dependencies = [
"windows-targets 0.48.5",
]
@@ -14680,12 +14729,6 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17cffbe740121affb56fad0fc0e421804adf0ae00891205213b5cecd30db881d"
-
[[package]]
name = "windows_aarch64_msvc"
version = "0.42.2"
@@ -14698,12 +14741,6 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-[[package]]
-name = "windows_i686_gnu"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2564fde759adb79129d9b4f54be42b32c89970c18ebf93124ca8870a498688ed"
-
[[package]]
name = "windows_i686_gnu"
version = "0.42.2"
@@ -14716,12 +14753,6 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-[[package]]
-name = "windows_i686_msvc"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cd9d32ba70453522332c14d38814bceeb747d80b3958676007acadd7e166956"
-
[[package]]
name = "windows_i686_msvc"
version = "0.42.2"
@@ -14734,12 +14765,6 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfce6deae227ee8d356d19effc141a509cc503dfd1f850622ec4b0f84428e1f4"
-
[[package]]
name = "windows_x86_64_gnu"
version = "0.42.2"
@@ -14764,12 +14789,6 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d19538ccc21819d01deaf88d6a17eae6596a12e9aafdbb97916fb49896d89de9"
-
[[package]]
name = "windows_x86_64_msvc"
version = "0.42.2"
@@ -14784,9 +14803,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "winnow"
-version = "0.5.15"
+version = "0.5.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
dependencies = [
"memchr",
]
@@ -14865,7 +14884,7 @@ dependencies = [
"lazy_static",
"nom",
"oid-registry 0.4.0",
- "ring",
+ "ring 0.16.20",
"rusticata-macros",
"thiserror",
"time",
@@ -14956,7 +14975,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -15019,11 +15038,10 @@ dependencies = [
[[package]]
name = "zstd-sys"
-version = "2.0.8+zstd.1.5.5"
+version = "2.0.9+zstd.1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
+checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
dependencies = [
"cc",
- "libc",
"pkg-config",
]
diff --git a/Cargo.toml b/Cargo.toml
index ff955d484e..1c135a8e06 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,8 +22,35 @@ members = [
"crates/client/mapping-sync",
"crates/client/storage",
"crates/client/transaction-pool",
+ "crates/client/commitment-state-diff",
"starknet-rpc-test",
]
+# All previous except for `starknet-rpc-test`
+# We don't want `cargo test` to trigger its tests
+default-members = [
+ "crates/node",
+ "crates/runtime",
+ "crates/pallets/starknet",
+ "crates/primitives/digest-log",
+ "crates/primitives/transactions",
+ "crates/primitives/felt",
+ "crates/primitives/hashers",
+ "crates/primitives/fee",
+ "crates/primitives/state",
+ "crates/primitives/block",
+ "crates/primitives/sequencer-address",
+ "crates/primitives/storage",
+ "crates/primitives/commitments",
+ "crates/primitives/chain-id",
+ "crates/client/block-proposer",
+ "crates/client/db",
+ "crates/client/rpc-core",
+ "crates/client/rpc",
+ "crates/client/mapping-sync",
+ "crates/client/storage",
+ "crates/client/transaction-pool",
+ "crates/client/commitment-state-diff",
+]
[profile.release]
panic = "unwind"
@@ -39,7 +66,7 @@ rpath = false # Disables adding rpath to the binary
authors = ["Abdelhamid Bakhta <@abdelhamidbakhta>"]
edition = "2021"
repository = "https://github.com/keep-starknet-strange/madara/"
-version = "0.3.0"
+version = "0.5.0"
[workspace.dependencies]
# Substrate frame dependencies
@@ -141,7 +168,8 @@ mc-rpc = { path = "crates/client/rpc" }
mc-rpc-core = { path = "crates/client/rpc-core" }
mc-block-proposer = { path = "crates/client/block-proposer" }
mc-transaction-pool = { path = "crates/client/transaction-pool" }
-mc-data-availability = { path = "crates/client/data-availability" }
+mc-data-availability = { path = "crates/client/data-availability" }
+mc-commitment-state-diff = { path = "crates/client/commitment-state-diff" }
# Madara runtime
madara-runtime = { path = "crates/runtime" }
@@ -176,10 +204,10 @@ cairo-lang-utils = { git = "https://github.com/keep-starknet-strange/cairo.git",
# Other third party dependencies
anyhow = "1.0.75"
-flate2 = "1.0.27"
+flate2 = "1.0.28"
scale-codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
parity-scale-codec = { version = "3.2.2", default-features = false }
-scale-info = { version = "2.9.0", default-features = false }
+scale-info = { version = "2.10.0", default-features = false }
lazy_static = { version = "1.4.0", default-features = false }
log = { version = "0.4.20", default-features = false }
hex = { version = "0.4.3", default-features = false }
@@ -189,20 +217,23 @@ clap = { version = "4.4.2", default-features = false }
futures = { version = "0.3.28", default-features = false }
futures-timer = { version = "3.0.2", default-features = false }
md5 = { version = "0.7.0", default-features = false }
-reqwest = { version = "0.11.20", default-features = false }
-serde = { version = "1.0.188", default-features = false }
+reqwest = { version = "0.11.22", default-features = false }
+serde = { version = "1.0.189", default-features = false }
serde_json = { version = "1.0.107", default-features = false }
serde_with = { version = "2.3.3", default-features = false }
bitvec = { version = "1", default-features = false }
-thiserror = "1.0.48"
+thiserror = "1.0.50"
thiserror-no-std = "2.0.2"
derive_more = { version = "0.99.17", default-features = false }
rstest = "0.18.1"
pretty_assertions = "1.4.0"
linked-hash-map = { version = "0.5.6", default-features = false }
parking_lot = "0.12.1"
-async-trait = "0.1.73"
+async-trait = "0.1.74"
indexmap = { git = "https://github.com/bluss/indexmap", rev = "ca5f848e10c31e80aeaad0720d14aa2f6dd6cfb1", default-features = false }
-num-traits = "0.2.16"
+num-traits = "0.2.17"
num-bigint = "0.4.4"
phf = { version = "0.11", default-features = false }
+url = "2.4.1"
+hashbrown = "0.14.2"
+tokio = "1.33.0"
diff --git a/README.md b/README.md
index 5e3cca9dbf..f1637c8840 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,7 @@ bottlenecks of the system by running the following :
```bash
./target/release/madara setup
-flamegraph --root --open -- ./target/release/madara run --dev
+flamegraph --root --open -- ./target/release/madara --dev
```
In parallel to that, run some transactions against your node (you can use
@@ -212,6 +212,10 @@ Thanks goes to these wonderful people
kasteph
💻 |
Ayush Tomar
💻 |
tchataigner
💻 |
+ 
Alexander Kalankhodzhaev
💻 |
+
+
+ 
antiyro
💻 |
diff --git a/crates/client/block-proposer/src/lib.rs b/crates/client/block-proposer/src/lib.rs
index db32ad75dd..4bfc2f01b1 100644
--- a/crates/client/block-proposer/src/lib.rs
+++ b/crates/client/block-proposer/src/lib.rs
@@ -214,6 +214,12 @@ where
) -> Self::Proposal {
let (tx, rx) = oneshot::channel();
let spawn_handle = self.spawn_handle.clone();
+ let txs = self.transaction_pool.ready().count() > 0;
+
+ // If there are no transactions, return an error (we want to avoid empty blocks)
+ if !txs {
+ return async { Err(sp_blockchain::Error::Application("No transactions in pool".into())) }.boxed();
+ }
spawn_handle.spawn_blocking(
"madara-block-proposer",
diff --git a/crates/client/commitment-state-diff/Cargo.toml b/crates/client/commitment-state-diff/Cargo.toml
new file mode 100644
index 0000000000..1ce70587d7
--- /dev/null
+++ b/crates/client/commitment-state-diff/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "mc-commitment-state-diff"
+authors.workspace = true
+edition.workspace = true
+repository.workspace = true
+version.workspace = true
+
+[dependencies]
+# Substrate
+sc-client-api = { workspace = true }
+sp-api = { workspace = true, default-features = true }
+sp-blockchain = { workspace = true }
+sp-runtime = { workspace = true, default-features = true }
+
+# Madara
+mp-digest-log = { workspace = true, default-features = true }
+mp-hashers = { workspace = true, default-features = true }
+mp-storage = { workspace = true, default-features = true }
+pallet-starknet = { workspace = true }
+
+# Starknet
+blockifier = { workspace = true, default-features = true }
+starknet_api = { workspace = true, default-features = true }
+
+# Async
+futures = { workspace = true, default-features = true }
+
+# Others
+indexmap = { workspace = true }
+log = { workspace = true }
+thiserror = { workspace = true }
diff --git a/crates/client/commitment-state-diff/src/lib.rs b/crates/client/commitment-state-diff/src/lib.rs
new file mode 100644
index 0000000000..a00aad4ec1
--- /dev/null
+++ b/crates/client/commitment-state-diff/src/lib.rs
@@ -0,0 +1,210 @@
+use std::marker::PhantomData;
+use std::pin::Pin;
+use std::sync::Arc;
+use std::task::Poll;
+
+use blockifier::state::cached_state::CommitmentStateDiff;
+use futures::channel::mpsc;
+use futures::{Stream, StreamExt};
+use indexmap::IndexMap;
+use mp_hashers::HasherT;
+use mp_storage::{SN_COMPILED_CLASS_HASH_PREFIX, SN_CONTRACT_CLASS_HASH_PREFIX, SN_NONCE_PREFIX, SN_STORAGE_PREFIX};
+use pallet_starknet::runtime_api::StarknetRuntimeApi;
+use sc_client_api::client::BlockchainEvents;
+use sc_client_api::{StorageEventStream, StorageNotification};
+use sp_api::ProvideRuntimeApi;
+use sp_blockchain::HeaderBackend;
+use sp_runtime::traits::{Block as BlockT, Header};
+use starknet_api::api_core::{ClassHash, CompiledClassHash, ContractAddress, Nonce, PatriciaKey};
+use starknet_api::block::BlockHash;
+use starknet_api::hash::StarkFelt;
+use starknet_api::state::StorageKey as StarknetStorageKey;
+use thiserror::Error;
+
+pub struct CommitmentStateDiffWorker {
+ client: Arc,
+ storage_event_stream: StorageEventStream,
+ tx: mpsc::Sender<(BlockHash, CommitmentStateDiff)>,
+ msg: Option<(BlockHash, CommitmentStateDiff)>,
+ phantom: PhantomData,
+}
+
+impl CommitmentStateDiffWorker
+where
+ C: BlockchainEvents,
+{
+ pub fn new(client: Arc, tx: mpsc::Sender<(BlockHash, CommitmentStateDiff)>) -> Self {
+ let storage_event_stream = client
+ .storage_changes_notification_stream(None, None)
+ .expect("the node storage changes notification stream should be up and running");
+ Self { client, storage_event_stream, tx, msg: Default::default(), phantom: PhantomData }
+ }
+}
+
+impl Stream for CommitmentStateDiffWorker
+where
+ C: ProvideRuntimeApi,
+ C::Api: StarknetRuntimeApi,
+ C: HeaderBackend,
+ H: HasherT + Unpin,
+{
+ type Item = ();
+
+ // CommitmentStateDiffWorker is a state machine with two states
+ // state 1: waiting for some StorageEvent to happen, `commitment_state_diff` field is `None`
+ // state 2: waiting for the channel to be ready, `commitment_state_diff` field is `Some`
+ fn poll_next(self: Pin<&mut Self>, cx: &mut std::task::Context<'_>) -> Poll> {
+ let self_as_mut = self.get_mut();
+
+ if self_as_mut.msg.is_none() {
+ // State 1
+ match Stream::poll_next(Pin::new(&mut self_as_mut.storage_event_stream), cx) {
+ // No new block have been produced, we wait
+ Poll::Pending => return Poll::Pending,
+
+ // A new block have been produced, we process it and update our state machine
+ Poll::Ready(Some(storage_notification)) => {
+ let block_hash = storage_notification.block;
+
+ match build_commitment_state_diff::(self_as_mut.client.clone(), storage_notification) {
+ Ok(msg) => self_as_mut.msg = Some(msg),
+ Err(e) => {
+ log::error!(
+ "Block with substrate hash `{block_hash}` skiped. Failed to compute commitment state \
+ diff: {e}",
+ );
+
+ return Poll::Pending;
+ }
+ }
+ }
+
+ // The stream has been close, we close too.
+ // This should not happen tho
+ Poll::Ready(None) => return Poll::Ready(None),
+ }
+ }
+
+ // At this point self_as_mut.commitment_state_diff.is_some() == true
+ // State 2
+ match self_as_mut.tx.poll_ready(cx) {
+ // Channel is ready, we send
+ Poll::Ready(Ok(())) => {
+ // Safe to unwrap cause we already handle the `None` branch
+ let msg = self_as_mut.msg.take().unwrap();
+ // Safe to unwrap because channel is ready
+ self_as_mut.tx.start_send(msg).unwrap();
+
+ Poll::Ready(Some(()))
+ }
+
+ // Channel is full, we wait
+ Poll::Pending => Poll::Pending,
+
+ // Channel receiver have been drop, we close.
+ // This should not happen tho
+ Poll::Ready(Err(e)) => {
+ log::error!("CommitmentStateDiff channel reciever have been droped: {e}");
+ Poll::Ready(None)
+ }
+ }
+ }
+}
+
+#[derive(Debug, Error)]
+enum BuildCommitmentStateDiffError {
+ #[error("failed to interact with substrate header backend")]
+ SubstrateHeaderBackend(#[from] sp_blockchain::Error),
+ #[error("block not found")]
+ BlockNotFound,
+ #[error("digest log not found")]
+ DigestLogNotFound(#[from] mp_digest_log::FindLogError),
+}
+
+fn build_commitment_state_diff(
+ client: Arc,
+ storage_notification: StorageNotification,
+) -> Result<(BlockHash, CommitmentStateDiff), BuildCommitmentStateDiffError>
+where
+ C: ProvideRuntimeApi,
+ C::Api: StarknetRuntimeApi,
+ C: HeaderBackend,
+ H: HasherT,
+{
+ let starknet_block_hash = {
+ let header = client.header(storage_notification.block)?.ok_or(BuildCommitmentStateDiffError::BlockNotFound)?;
+ let digest = header.digest();
+ let block = mp_digest_log::find_starknet_block(digest)?;
+ block.header().hash::().into()
+ };
+
+ let mut commitment_state_diff = CommitmentStateDiff {
+ address_to_class_hash: Default::default(),
+ address_to_nonce: Default::default(),
+ storage_updates: Default::default(),
+ class_hash_to_compiled_class_hash: Default::default(),
+ };
+
+ for (_prefix, full_storage_key, change) in storage_notification.changes.iter() {
+ // The storages we are interested in all have prefix of length 32 bytes.
+ // The pallet identifier takes 16 bytes, the storage one 16 bytes.
+ // So if a storage key is smaller than 32 bytes,
+ // the program will panic when we index it to get it's prefix
+ if full_storage_key.0.len() < 32 {
+ continue;
+ }
+ let prefix = &full_storage_key.0[..32];
+
+ // All the `try_into` are safe to `unwrap` because we know what the storage contains
+ // and therefore what size it is
+ if prefix == *SN_NONCE_PREFIX {
+ let contract_address =
+ ContractAddress(PatriciaKey(StarkFelt(full_storage_key.0[32..].try_into().unwrap())));
+ // `change` is safe to unwrap as `Nonces` storage is `ValueQuery`
+ let nonce = Nonce(StarkFelt(change.unwrap().0.clone().try_into().unwrap()));
+ commitment_state_diff.address_to_nonce.insert(contract_address, nonce);
+ } else if prefix == *SN_STORAGE_PREFIX {
+ let contract_address =
+ ContractAddress(PatriciaKey(StarkFelt(full_storage_key.0[32..64].try_into().unwrap())));
+ let storage_key = StarknetStorageKey(PatriciaKey(StarkFelt(full_storage_key.0[64..].try_into().unwrap())));
+ // `change` is safe to unwrap as `StorageView` storage is `ValueQuery`
+ let value = StarkFelt(change.unwrap().0.clone().try_into().unwrap());
+
+ match commitment_state_diff.storage_updates.get_mut(&contract_address) {
+ Some(contract_storage) => {
+ contract_storage.insert(storage_key, value);
+ }
+ None => {
+ let mut contract_storage: IndexMap<_, _, _> = Default::default();
+ contract_storage.insert(storage_key, value);
+
+ commitment_state_diff.storage_updates.insert(contract_address, contract_storage);
+ }
+ }
+ } else if prefix == *SN_CONTRACT_CLASS_HASH_PREFIX {
+ let contract_address =
+ ContractAddress(PatriciaKey(StarkFelt(full_storage_key.0[32..].try_into().unwrap())));
+ // `change` is safe to unwrap as `ContractClassHashes` storage is `ValueQuery`
+ let class_hash = ClassHash(StarkFelt(change.unwrap().0.clone().try_into().unwrap()));
+
+ commitment_state_diff.address_to_class_hash.insert(contract_address, class_hash);
+ } else if prefix == *SN_COMPILED_CLASS_HASH_PREFIX {
+ let class_hash = ClassHash(StarkFelt(full_storage_key.0[32..].try_into().unwrap()));
+ // In the current state of starknet protocol, a compiled class hash can not be erased, so we should
+ // never see `change` being `None`. But there have been an "erase contract class" mechanism live on
+ // the network during the Regenesis migration. Better safe than sorry.
+ let compiled_class_hash =
+ CompiledClassHash(change.map(|data| StarkFelt(data.0.clone().try_into().unwrap())).unwrap_or_default());
+
+ commitment_state_diff.class_hash_to_compiled_class_hash.insert(class_hash, compiled_class_hash);
+ }
+ }
+
+ Ok((starknet_block_hash, commitment_state_diff))
+}
+
+pub async fn log_commitment_state_diff(mut rx: mpsc::Receiver<(BlockHash, CommitmentStateDiff)>) {
+ while let Some((block_hash, csd)) = rx.next().await {
+ log::info!("received state diff for block {block_hash}: {csd:?}");
+ }
+}
diff --git a/crates/client/data-availability/Cargo.toml b/crates/client/data-availability/Cargo.toml
index 19f9dec961..354289789c 100644
--- a/crates/client/data-availability/Cargo.toml
+++ b/crates/client/data-availability/Cargo.toml
@@ -21,7 +21,6 @@ jsonrpsee = { version = "0.20.0", features = [
"ws-client",
"macros",
] }
-lazy_static = { workspace = true }
log = "0.4.19"
reqwest = { version = "0.11.18", features = ["blocking", "json"] }
serde = { workspace = true }
@@ -36,7 +35,6 @@ sc-client-api = { workspace = true }
sp-api = { workspace = true }
sp-blockchain = { workspace = true }
sp-core = { workspace = true }
-sp-io = { workspace = true }
sp-runtime = { workspace = true }
# Starknet
diff --git a/crates/client/data-availability/src/bitcoin/mod.rs b/crates/client/data-availability/src/bitcoin/mod.rs
index 78f97e743c..b0b41b7939 100644
--- a/crates/client/data-availability/src/bitcoin/mod.rs
+++ b/crates/client/data-availability/src/bitcoin/mod.rs
@@ -3,8 +3,8 @@ pub mod config;
// Bitcoin imports
use anyhow::Result;
use async_trait::async_trait;
-use bitcoin_da::{Config as BitcoinDAConfig, Relayer};
// Bitcoincore RPC imports
+use bitcoin_da::{Config as BitcoinDAConfig, Relayer};
use ethers::types::{I256, U256};
use crate::utils::get_bytes_from_state_diff;
@@ -23,6 +23,8 @@ impl DaClient for BitcoinClient {
let state_diff_bytes = get_bytes_from_state_diff(&state_diff);
+ log::info!("Statediff size: {:?}", state_diff_bytes.len());
+
let fees_multiplicator: f64 = 1.5;
let dust: u64 = 400;
diff --git a/crates/client/data-availability/src/lib.rs b/crates/client/data-availability/src/lib.rs
index f7d835f423..54fb09d557 100644
--- a/crates/client/data-availability/src/lib.rs
+++ b/crates/client/data-availability/src/lib.rs
@@ -13,6 +13,7 @@ use anyhow::Result;
use async_trait::async_trait;
use ethers::types::{I256, U256};
use futures::StreamExt;
+use mp_storage::{SN_NONCE_PREFIX, SN_STORAGE_PREFIX};
use sc_client_api::client::BlockchainEvents;
use serde::Deserialize;
use sp_api::ProvideRuntimeApi;
@@ -41,7 +42,7 @@ pub enum DaMode {
/// run for the given block as it is applied to the current Madara state.
/// Once this execution trace is proved to the L1 Verifier(i.e. [Ethereum](https://goerli.etherscan.io/address/0x8f97970aC5a9aa8D130d35146F5b59c4aef57963))
/// the relevant [state diff](https://docs.starknet.io/documentation/architecture_and_concepts/Network_Architecture/on-chain-data) can be written and validated against the on-chain
- /// proof verification of the block propogation.
+ /// proof verification of the block propagation.
#[serde(rename = "validity")]
Validity,
/// Hybrid Volition
@@ -96,13 +97,13 @@ where
key = raw_split.1;
}
- if prefix == *utils::SN_NONCE_PREFIX {
+ if prefix == *SN_NONCE_PREFIX {
if let Some(data) = event.2 {
nonces.insert(key, data.0.as_slice());
}
}
- if prefix == *utils::SN_STORAGE_PREFIX {
+ if prefix == *SN_STORAGE_PREFIX {
if let Some(data) = event.2 {
// first 32 bytes = contract address, second 32 bytes = storage variable
let write_split = key.split_at(32);
diff --git a/crates/client/data-availability/src/utils.rs b/crates/client/data-availability/src/utils.rs
index c4b13c70da..ed0a0e743a 100644
--- a/crates/client/data-availability/src/utils.rs
+++ b/crates/client/data-availability/src/utils.rs
@@ -1,22 +1,8 @@
use std::collections::HashMap;
use ethers::types::U256;
-use lazy_static::lazy_static;
-use mp_storage::{
- PALLET_STARKNET, STARKNET_CONTRACT_CLASS, STARKNET_CONTRACT_CLASS_HASH, STARKNET_NONCE, STARKNET_STORAGE,
-};
-use sp_io::hashing::twox_128;
use url::{ParseError, Url};
-lazy_static! {
- pub static ref SN_NONCE_PREFIX: Vec = [twox_128(PALLET_STARKNET), twox_128(STARKNET_NONCE)].concat();
- pub static ref SN_CONTRACT_CLASS_HASH_PREFIX: Vec =
- [twox_128(PALLET_STARKNET), twox_128(STARKNET_CONTRACT_CLASS_HASH)].concat();
- pub static ref SN_CONTRACT_CLASS_PREFIX: Vec =
- [twox_128(PALLET_STARKNET), twox_128(STARKNET_CONTRACT_CLASS)].concat();
- pub static ref SN_STORAGE_PREFIX: Vec = [twox_128(PALLET_STARKNET), twox_128(STARKNET_STORAGE)].concat();
-}
-
// encode calldata:
// - https://docs.starknet.io/documentation/architecture_and_concepts/Data_Availability/on-chain-data/#pre_v0.11.0_example
pub fn pre_0_11_0_state_diff(
diff --git a/crates/client/db/Cargo.toml b/crates/client/db/Cargo.toml
index 3b7335ed2e..29568e2748 100644
--- a/crates/client/db/Cargo.toml
+++ b/crates/client/db/Cargo.toml
@@ -19,7 +19,7 @@ targets = ["x86_64-unknown-linux-gnu"]
ethers = "2.0.10"
kvdb-rocksdb = { version = "0.19.0", optional = true }
log = { workspace = true, default-features = true }
-parity-db = { version = "0.4.11", optional = true }
+parity-db = { version = "0.4.12", optional = true }
sc-client-db = { workspace = true, default-features = true }
scale-codec = { workspace = true, default-features = true, features = [
"derive",
diff --git a/crates/client/db/src/lib.rs b/crates/client/db/src/lib.rs
index 5414e0af79..4ae94ad267 100644
--- a/crates/client/db/src/lib.rs
+++ b/crates/client/db/src/lib.rs
@@ -19,7 +19,7 @@ mod meta_db;
use std::marker::PhantomData;
use std::path::{Path, PathBuf};
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
use da_db::DaDb;
use mapping_db::MappingDb;
@@ -38,13 +38,22 @@ struct DatabaseSettings {
}
pub(crate) mod columns {
- pub const NUM_COLUMNS: u32 = 5;
+ /// Total number of columns.
+ // ===== /!\ ===================================================================================
+ // MUST BE INCREMENTED WHEN A NEW COLUMN IN ADDED
+ // ===== /!\ ===================================================================================
+ pub const NUM_COLUMNS: u32 = 6;
pub const META: u32 = 0;
pub const BLOCK_MAPPING: u32 = 1;
pub const TRANSACTION_MAPPING: u32 = 2;
pub const SYNCED_MAPPING: u32 = 3;
pub const DA: u32 = 4;
+ /// This column is used to map starknet block hashes to a list of transaction hashes that are
+ /// contained in the block.
+ ///
+ /// This column should only be accessed if the `--cache` flag is enabled.
+ pub const STARKNET_TRANSACTION_HASHES_CACHE: u32 = 5;
}
pub mod static_keys {
@@ -72,30 +81,33 @@ impl Backend {
/// Open the database
///
/// The database will be created at db_config_dir.join()
- pub fn open(database: &DatabaseSource, db_config_dir: &Path) -> Result {
- Self::new(&DatabaseSettings {
- source: match database {
- DatabaseSource::RocksDb { .. } => {
- DatabaseSource::RocksDb { path: starknet_database_dir(db_config_dir, "rockdb"), cache_size: 0 }
- }
- DatabaseSource::ParityDb { .. } => {
- DatabaseSource::ParityDb { path: starknet_database_dir(db_config_dir, "paritydb") }
- }
- DatabaseSource::Auto { .. } => DatabaseSource::Auto {
- rocksdb_path: starknet_database_dir(db_config_dir, "rockdb"),
- paritydb_path: starknet_database_dir(db_config_dir, "paritydb"),
- cache_size: 0,
+ pub fn open(database: &DatabaseSource, db_config_dir: &Path, cache_more_things: bool) -> Result {
+ Self::new(
+ &DatabaseSettings {
+ source: match database {
+ DatabaseSource::RocksDb { .. } => {
+ DatabaseSource::RocksDb { path: starknet_database_dir(db_config_dir, "rockdb"), cache_size: 0 }
+ }
+ DatabaseSource::ParityDb { .. } => {
+ DatabaseSource::ParityDb { path: starknet_database_dir(db_config_dir, "paritydb") }
+ }
+ DatabaseSource::Auto { .. } => DatabaseSource::Auto {
+ rocksdb_path: starknet_database_dir(db_config_dir, "rockdb"),
+ paritydb_path: starknet_database_dir(db_config_dir, "paritydb"),
+ cache_size: 0,
+ },
+ _ => return Err("Supported db sources: `rocksdb` | `paritydb` | `auto`".to_string()),
},
- _ => return Err("Supported db sources: `rocksdb` | `paritydb` | `auto`".to_string()),
},
- })
+ cache_more_things,
+ )
}
- fn new(config: &DatabaseSettings) -> Result {
+ fn new(config: &DatabaseSettings, cache_more_things: bool) -> Result {
let db = db_opening_utils::open_database(config)?;
Ok(Self {
- mapping: Arc::new(MappingDb { db: db.clone(), write_lock: Arc::new(Mutex::new(())), _marker: PhantomData }),
+ mapping: Arc::new(MappingDb::new(db.clone(), cache_more_things)),
meta: Arc::new(MetaDb { db: db.clone(), _marker: PhantomData }),
da: Arc::new(DaDb { db: db.clone(), _marker: PhantomData }),
})
diff --git a/crates/client/db/src/mapping_db.rs b/crates/client/db/src/mapping_db.rs
index c4afd494b5..f8b33642f2 100644
--- a/crates/client/db/src/mapping_db.rs
+++ b/crates/client/db/src/mapping_db.rs
@@ -19,12 +19,19 @@ pub struct MappingCommitment {
/// Allow interaction with the mapping db
pub struct MappingDb {
- pub(crate) db: Arc>,
- pub(crate) write_lock: Arc>,
- pub(crate) _marker: PhantomData,
+ db: Arc>,
+ write_lock: Arc>,
+ /// Whether more information should be cached in the database.
+ cache_more_things: bool,
+ _marker: PhantomData,
}
impl MappingDb {
+ /// Creates a new instance of the mapping database.
+ pub fn new(db: Arc>, cache_more_things: bool) -> Self {
+ Self { db, write_lock: Arc::new(Mutex::new(())), cache_more_things, _marker: PhantomData }
+ }
+
/// Check if the given block hash has already been processed
pub fn is_synced(&self, block_hash: &B::Hash) -> Result {
match self.db.get(crate::columns::SYNCED_MAPPING, &block_hash.encode()) {
@@ -85,7 +92,7 @@ impl MappingDb {
transaction.set(crate::columns::SYNCED_MAPPING, &commitment.block_hash.encode(), &true.encode());
- for transaction_hash in commitment.starknet_transaction_hashes.into_iter() {
+ for transaction_hash in commitment.starknet_transaction_hashes.iter() {
transaction.set(
crate::columns::TRANSACTION_MAPPING,
&transaction_hash.encode(),
@@ -93,6 +100,14 @@ impl MappingDb {
);
}
+ if self.cache_more_things {
+ transaction.set(
+ crate::columns::STARKNET_TRANSACTION_HASHES_CACHE,
+ &commitment.starknet_block_hash.encode(),
+ &commitment.starknet_transaction_hashes.encode(),
+ );
+ }
+
self.db.commit(transaction).map_err(|e| format!("{:?}", e))?;
Ok(())
@@ -112,4 +127,30 @@ impl MappingDb {
None => Ok(None),
}
}
+
+ /// Returns the list of transaction hashes for the given block hash.
+ ///
+ /// # Arguments
+ ///
+ /// * `starknet_hash` - the hash of the starknet block to search for.
+ ///
+ /// # Returns
+ ///
+ /// The list of transaction hashes.
+ ///
+ /// This function may return `None` for two separate reasons:
+ ///
+ /// - The cache is disabled.
+ /// - The provided `starknet_hash` is not present in the cache.
+ pub fn cached_transaction_hashes_from_block_hash(&self, starknet_hash: H256) -> Result>, String> {
+ if !self.cache_more_things {
+ // The cache is not enabled, no need to even touch the database.
+ return Ok(None);
+ }
+
+ match self.db.get(crate::columns::STARKNET_TRANSACTION_HASHES_CACHE, &starknet_hash.encode()) {
+ Some(raw) => Ok(Some(Vec::::decode(&mut &raw[..]).map_err(|e| format!("{:?}", e))?)),
+ None => Ok(None),
+ }
+ }
}
diff --git a/crates/client/mapping-sync/src/lib.rs b/crates/client/mapping-sync/src/lib.rs
index 870ca1f0e7..724be1eea2 100644
--- a/crates/client/mapping-sync/src/lib.rs
+++ b/crates/client/mapping-sync/src/lib.rs
@@ -55,7 +55,6 @@ impl MappingSyncWorker {
frontier_backend: Arc>,
retry_times: usize,
sync_from: ::Number,
- hasher: PhantomData,
) -> Self {
Self {
import_notifications,
@@ -65,7 +64,7 @@ impl MappingSyncWorker {
client,
substrate_backend,
madara_backend: frontier_backend,
- hasher,
+ hasher: PhantomData,
have_next: true,
retry_times,
diff --git a/crates/client/rpc-core/src/lib.rs b/crates/client/rpc-core/src/lib.rs
index c74979120f..d35b0b718f 100644
--- a/crates/client/rpc-core/src/lib.rs
+++ b/crates/client/rpc-core/src/lib.rs
@@ -107,7 +107,7 @@ pub trait StarknetRpcApi {
/// Get the details of a transaction by a given block id and index
#[method(name = "getTransactionByBlockIdAndIndex")]
- fn get_transaction_by_block_id_and_index(&self, block_id: BlockId, index: usize) -> RpcResult;
+ fn get_transaction_by_block_id_and_index(&self, block_id: BlockId, index: u64) -> RpcResult;
/// Get the information about the result of executing the requested block
#[method(name = "getStateUpdate")]
diff --git a/crates/client/rpc/src/events/mod.rs b/crates/client/rpc/src/events/mod.rs
index c9c58411fb..fd55a8ce35 100644
--- a/crates/client/rpc/src/events/mod.rs
+++ b/crates/client/rpc/src/events/mod.rs
@@ -53,22 +53,27 @@ where
.client
.block_body(substrate_block_hash)
.map_err(|e| {
- error!("'{e}'");
+ error!("Failed to retrieve block body. Substrate block hash: {substrate_block_hash}, error: {e}");
StarknetRpcApiError::InternalServerError
})?
.ok_or(StarknetRpcApiError::BlockNotFound)?;
- let chain_id = self
- .client
- .runtime_api()
- .chain_id(substrate_block_hash)
- .map_err(|_| StarknetRpcApiError::InternalServerError)?;
+ let chain_id = self.client.runtime_api().chain_id(substrate_block_hash).map_err(|_| {
+ error!("Failed to retrieve chain id");
+ StarknetRpcApiError::InternalServerError
+ })?;
let tx_hash_and_events = self
.client
.runtime_api()
.get_starknet_events_and_their_associated_tx_hash(substrate_block_hash, block_extrinsics, chain_id)
- .map_err(|_| StarknetRpcApiError::InternalServerError)?;
+ .map_err(|e| {
+ error!(
+ "Failed to retrieve starknet events and their associated transaction hash. Substrate block hash: \
+ {substrate_block_hash}, chain ID: {chain_id:?}, error: {e}"
+ );
+ StarknetRpcApiError::InternalServerError
+ })?;
let starknet_block = get_block_by_block_hash(self.client.as_ref(), substrate_block_hash)
.ok_or(StarknetRpcApiError::BlockNotFound)?;
diff --git a/crates/client/rpc/src/lib.rs b/crates/client/rpc/src/lib.rs
index 664680a705..3411b471c4 100644
--- a/crates/client/rpc/src/lib.rs
+++ b/crates/client/rpc/src/lib.rs
@@ -157,6 +157,18 @@ where
Ok(block.header().block_number)
}
+
+ /// Returns a list of all transaction hashes in the given block.
+ ///
+ /// # Arguments
+ ///
+ /// * `block_hash` - The hash of the block containing the transactions (starknet block).
+ fn get_cached_transaction_hashes(&self, block_hash: H256) -> Option> {
+ self.backend.mapping().cached_transaction_hashes_from_block_hash(block_hash).unwrap_or_else(|err| {
+ error!("{err}");
+ None
+ })
+ }
}
/// Taken from https://github.com/paritytech/substrate/blob/master/client/rpc/src/author/mod.rs#L78
@@ -271,7 +283,7 @@ where
Ok(to_rpc_contract_class(contract_class).map_err(|e| {
error!("Failed to convert contract class at '{contract_address}' to RPC contract class: {e}");
- StarknetRpcApiError::ContractNotFound
+ StarknetRpcApiError::InvalidContractClass
})?)
}
@@ -401,13 +413,21 @@ where
let block = get_block_by_block_hash(self.client.as_ref(), substrate_block_hash).unwrap_or_default();
let chain_id = self.chain_id()?;
-
- let transactions =
- block.transactions_hashes::(Felt252Wrapper(chain_id.0)).into_iter().map(FieldElement::from).collect();
let blockhash = block.header().hash::();
+
+ let transaction_hashes = if let Some(tx_hashes) = self.get_cached_transaction_hashes(blockhash.into()) {
+ let mut v = Vec::with_capacity(tx_hashes.len());
+ for tx_hash in tx_hashes {
+ v.push(h256_to_felt(tx_hash)?);
+ }
+ v
+ } else {
+ block.transactions_hashes::(chain_id.0.into()).map(FieldElement::from).collect()
+ };
+
let parent_blockhash = block.header().parent_block_hash;
let block_with_tx_hashes = BlockWithTxHashes {
- transactions,
+ transactions: transaction_hashes,
// TODO: Status hardcoded, get status from block
status: BlockStatus::AcceptedOnL2,
block_hash: blockhash.into(),
@@ -445,11 +465,10 @@ where
/// Returns the chain id.
fn chain_id(&self) -> RpcResult {
let best_block_hash = self.client.info().best_hash;
- let chain_id = self
- .client
- .runtime_api()
- .chain_id(best_block_hash)
- .map_err(|_| StarknetRpcApiError::InternalServerError)?;
+ let chain_id = self.client.runtime_api().chain_id(best_block_hash).map_err(|e| {
+ error!("Failed to fetch chain_id with best_block_hash: {best_block_hash}, error: {e}");
+ StarknetRpcApiError::InternalServerError
+ })?;
Ok(Felt(chain_id.0))
}
@@ -470,7 +489,7 @@ where
let best_block_hash = self.client.info().best_hash;
let transaction: UserTransaction = declare_transaction.try_into().map_err(|e| {
- error!("{e}");
+ error!("Failed to convert BroadcastedDeclareTransaction to UserTransaction, error: {e}");
StarknetRpcApiError::InternalServerError
})?;
let class_hash = match transaction {
@@ -516,7 +535,7 @@ where
let best_block_hash = self.client.info().best_hash;
let transaction: UserTransaction = invoke_transaction.try_into().map_err(|e| {
- error!("{e}");
+ error!("Failed to convert BroadcastedInvokeTransaction to UserTransaction: {e}");
StarknetRpcApiError::InternalServerError
})?;
@@ -546,7 +565,7 @@ where
let best_block_hash = self.client.info().best_hash;
let transaction: UserTransaction = deploy_account_transaction.try_into().map_err(|e| {
- error!("{e}");
+ error!("Failed to convert BroadcastedDeployAccountTransaction to UserTransaction, error: {e}",);
StarknetRpcApiError::InternalServerError
})?;
@@ -581,14 +600,16 @@ where
request: Vec,
block_id: BlockId,
) -> RpcResult> {
- let is_invalid_query_transaction = request.iter().any(|tx| match tx {
- BroadcastedTransaction::Invoke(invoke_tx) => !invoke_tx.is_query,
- BroadcastedTransaction::Declare(BroadcastedDeclareTransaction::V1(tx_v1)) => !tx_v1.is_query,
- BroadcastedTransaction::Declare(BroadcastedDeclareTransaction::V2(tx_v2)) => !tx_v2.is_query,
- BroadcastedTransaction::DeployAccount(deploy_tx) => !deploy_tx.is_query,
+ let is_query = request.iter().any(|tx| match tx {
+ BroadcastedTransaction::Invoke(invoke_tx) => invoke_tx.is_query,
+ BroadcastedTransaction::Declare(BroadcastedDeclareTransaction::V1(tx_v1)) => tx_v1.is_query,
+ BroadcastedTransaction::Declare(BroadcastedDeclareTransaction::V2(tx_v2)) => tx_v2.is_query,
+ BroadcastedTransaction::DeployAccount(deploy_tx) => deploy_tx.is_query,
});
- if is_invalid_query_transaction {
- return Err(StarknetRpcApiError::UnsupportedTxVersion.into());
+ if !is_query {
+ log::error!(
+ "Got `is_query`: false. In a future version, this will fail fee estimation with UnsupportedTxVersion"
+ );
}
let substrate_block_hash = self.substrate_block_hash_from_starknet_block(block_id).map_err(|e| {
@@ -601,13 +622,13 @@ where
let mut estimates = vec![];
for tx in request {
let tx = tx.try_into().map_err(|e| {
- error!("{e}");
+ error!("Failed to convert BroadcastedTransaction to UserTransaction: {e}");
StarknetRpcApiError::InternalServerError
})?;
let (actual_fee, gas_usage) = self
.client
.runtime_api()
- .estimate_fee(substrate_block_hash, tx)
+ .estimate_fee(substrate_block_hash, tx, is_query)
.map_err(|e| {
error!("Request parameters error: {e}");
StarknetRpcApiError::InternalServerError
@@ -623,7 +644,7 @@ where
}
// Returns the details of a transaction by a given block id and index
- fn get_transaction_by_block_id_and_index(&self, block_id: BlockId, index: usize) -> RpcResult {
+ fn get_transaction_by_block_id_and_index(&self, block_id: BlockId, index: u64) -> RpcResult {
let substrate_block_hash = self.substrate_block_hash_from_starknet_block(block_id).map_err(|e| {
error!("'{e}'");
StarknetRpcApiError::BlockNotFound
@@ -631,10 +652,15 @@ where
let block = get_block_by_block_hash(self.client.as_ref(), substrate_block_hash).unwrap_or_default();
- let transaction = block.transactions().get(index).ok_or(StarknetRpcApiError::InvalidTxnIndex)?;
+ let transaction = block.transactions().get(index as usize).ok_or(StarknetRpcApiError::InvalidTxnIndex)?;
let chain_id = self.chain_id()?;
- Ok(to_starknet_core_tx::(transaction.clone(), Felt252Wrapper(chain_id.0)))
+ let transaction_hash = self
+ .get_cached_transaction_hashes(block.header().hash::().into())
+ .map(|tx_hashes| h256_to_felt(*tx_hashes.get(index as usize).ok_or(StarknetRpcApiError::InvalidTxnIndex)?))
+ .unwrap_or_else(|| Ok(transaction.compute_hash::(chain_id.0.into(), false).0))?;
+
+ Ok(to_starknet_core_tx(transaction.clone(), transaction_hash))
}
/// Get block information with full transactions given the block id
@@ -649,6 +675,21 @@ where
let chain_id = self.chain_id()?;
let chain_id = Felt252Wrapper(chain_id.0);
+ let transaction_hashes = self.get_cached_transaction_hashes(block.header().hash::().into());
+ let mut transactions = Vec::with_capacity(block.transactions().len());
+ for (index, tx) in block.transactions().iter().enumerate() {
+ let hash = transaction_hashes
+ .as_ref()
+ .map(|tx_hashes| {
+ h256_to_felt(*tx_hashes.get(index).ok_or_else(|| {
+ error!("Transaction hash not found at index: {index} in transaction hashes cache.");
+ StarknetRpcApiError::InternalServerError
+ })?)
+ })
+ .unwrap_or_else(|| Ok(tx.compute_hash::(chain_id.0.into(), false).0))?;
+ transactions.push(to_starknet_core_tx(tx.clone(), hash));
+ }
+
let block_with_txs = BlockWithTxs {
// TODO: Get status from block
status: BlockStatus::AcceptedOnL2,
@@ -658,12 +699,7 @@ where
new_root: block.header().global_state_root.into(),
timestamp: block.header().block_timestamp,
sequencer_address: Felt252Wrapper::from(block.header().sequencer_address).into(),
- transactions: block
- .transactions()
- .iter()
- .cloned()
- .map(|tx| to_starknet_core_tx::(tx, Felt252Wrapper(chain_id.0)))
- .collect::>(),
+ transactions,
};
Ok(MaybePendingBlockWithTxs::Block(block_with_txs))
@@ -726,13 +762,22 @@ where
let api = self.client.runtime_api();
let transactions = api.extrinsic_filter(substrate_block_hash, transactions).map_err(|e| {
- error!("{:#?}", e);
+ error!("Failed to filter extrinsics. Substrate block hash: {substrate_block_hash}, error: {e}");
StarknetRpcApiError::InternalServerError
})?;
- let chain_id = self.chain_id()?;
- let transactions = transactions.into_iter().map(|tx| to_starknet_core_tx::(tx, chain_id.0.into())).collect();
+ let chain_id = self.chain_id().map_err(|e| {
+ error!("Failed to retrieve chain ID. Error: {e}");
+ StarknetRpcApiError::InternalServerError
+ })?;
+ let transactions = transactions
+ .into_iter()
+ .map(|tx| {
+ let hash = tx.compute_hash::(chain_id.0.into(), false).into();
+ to_starknet_core_tx(tx, hash)
+ })
+ .collect();
Ok(transactions)
}
@@ -815,11 +860,19 @@ where
let block = get_block_by_block_hash(self.client.as_ref(), substrate_block_hash).unwrap_or_default();
let chain_id = self.chain_id()?.0.into();
- let find_tx = block
- .transactions()
- .iter()
- .find(|tx| tx.compute_hash::(chain_id, false).0 == transaction_hash)
- .map(|tx| to_starknet_core_tx::(tx.clone(), chain_id));
+ let find_tx = if let Some(tx_hashes) = self.get_cached_transaction_hashes(block.header().hash::().into()) {
+ tx_hashes
+ .into_iter()
+ .zip(block.transactions())
+ .find(|(tx_hash, _)| *tx_hash == Felt252Wrapper(transaction_hash).into())
+ .map(|(_, tx)| to_starknet_core_tx(tx.clone(), transaction_hash))
+ } else {
+ block
+ .transactions()
+ .iter()
+ .find(|tx| tx.compute_hash::(chain_id, false).0 == transaction_hash)
+ .map(|tx| to_starknet_core_tx(tx.clone(), transaction_hash))
+ };
find_tx.ok_or(StarknetRpcApiError::TxnHashNotFound.into())
}
@@ -858,7 +911,7 @@ where
.client
.block_body(substrate_block_hash)
.map_err(|e| {
- error!("'{e}'");
+ error!("Failed to get block body. Substrate block hash: {substrate_block_hash}, error: {e}");
StarknetRpcApiError::InternalServerError
})?
.ok_or(StarknetRpcApiError::BlockNotFound)?;
@@ -869,10 +922,13 @@ where
.runtime_api()
.get_events_for_tx_hash(substrate_block_hash, block_extrinsics, chain_id, transaction_hash.into())
.map_err(|e| {
- error!("'{e}'");
+ error!(
+ "Failed to get events for transaction hash. Substrate block hash: {substrate_block_hash}, \
+ transaction hash: {transaction_hash}, error: {e}"
+ );
StarknetRpcApiError::InternalServerError
})?
- .expect("the thansaction should be present in the substrate extrinsics");
+ .expect("the transaction should be present in the substrate extrinsics");
let execution_result = {
let revert_error = self
@@ -880,7 +936,10 @@ where
.runtime_api()
.get_tx_execution_outcome(substrate_block_hash, Felt252Wrapper(transaction_hash).into())
.map_err(|e| {
- error!("'{e}'");
+ error!(
+ "Failed to get transaction execution outcome. Substrate block hash: {substrate_block_hash}, \
+ transaction hash: {transaction_hash}, error: {e}"
+ );
StarknetRpcApiError::InternalServerError
})?;
@@ -1010,3 +1069,13 @@ where
},
}
}
+
+fn h256_to_felt(h256: H256) -> Result {
+ match Felt252Wrapper::try_from(h256) {
+ Ok(felt) => Ok(felt.0),
+ Err(e) => {
+ error!("failed to convert H256 to FieldElement: {e}");
+ Err(StarknetRpcApiError::InternalServerError)
+ }
+ }
+}
diff --git a/crates/client/transaction-pool/Cargo.toml b/crates/client/transaction-pool/Cargo.toml
index 2c8c5128a9..1de8b36c6a 100644
--- a/crates/client/transaction-pool/Cargo.toml
+++ b/crates/client/transaction-pool/Cargo.toml
@@ -34,3 +34,10 @@ sp-runtime = { workspace = true }
sp-tracing = { workspace = true }
sp-transaction-pool = { workspace = true }
thiserror = { workspace = true }
+
+[dev-dependencies]
+substrate-test-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
+substrate-test-runtime-client = { workspace = true }
+substrate-test-runtime-transaction-pool = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
+sc-block-builder = { workspace = true }
+sp-consensus = { workspace = true }
diff --git a/crates/client/transaction-pool/README.md b/crates/client/transaction-pool/README.md
index 09b93e87aa..83c205dc74 100644
--- a/crates/client/transaction-pool/README.md
+++ b/crates/client/transaction-pool/README.md
@@ -51,7 +51,7 @@ the pool, it's broadcasting status, block inclusion, finality, etc.
## Transaction Validity details
-Information retrieved from the the runtime are encapsulated in the
+Information retrieved from the runtime are encapsulated in the
`TransactionValidity` type.
```rust
diff --git a/crates/client/transaction-pool/src/tests.rs b/crates/client/transaction-pool/src/tests.rs
new file mode 100644
index 0000000000..39b0aa18c7
--- /dev/null
+++ b/crates/client/transaction-pool/src/tests.rs
@@ -0,0 +1,186 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+//! Testing related primitives for internal usage in this crate.
+
+use crate::graph::{BlockHash, ChainApi, ExtrinsicFor, NumberFor, Pool};
+use parking_lot::Mutex;
+use sc_transaction_pool_api::error;
+use scale_codec::Encode;
+use sp_blockchain::TreeRoute;
+use sp_runtime::{
+ generic::BlockId,
+ traits::{Block as BlockT, Hash},
+ transaction_validity::{InvalidTransaction, TransactionSource, TransactionValidity, ValidTransaction},
+};
+use std::{collections::HashSet, sync::Arc};
+use substrate_test_runtime::{
+ substrate_test_pallet::pallet::Call as PalletCall, BalancesCall, Block, Extrinsic, ExtrinsicBuilder, Hashing,
+ RuntimeCall, Transfer, TransferData, H256,
+};
+
+pub(crate) const INVALID_NONCE: u64 = 254;
+
+/// Test api that implements [`ChainApi`].
+#[derive(Clone, Debug, Default)]
+pub(crate) struct TestApi {
+ pub delay: Arc>>>,
+ pub invalidate: Arc>>,
+ pub clear_requirements: Arc>>,
+ pub add_requirements: Arc>>,
+ pub validation_requests: Arc>>,
+}
+
+impl TestApi {
+ /// Query validation requests received.
+ pub fn validation_requests(&self) -> Vec {
+ self.validation_requests.lock().clone()
+ }
+}
+
+impl ChainApi for TestApi {
+ type Block = Block;
+ type Error = error::Error;
+ type ValidationFuture = futures::future::Ready>;
+ type BodyFuture = futures::future::Ready>>>;
+
+ /// Verify extrinsic at given block.
+ fn validate_transaction(
+ &self,
+ at: &BlockId,
+ _source: TransactionSource,
+ uxt: ExtrinsicFor,
+ ) -> Self::ValidationFuture {
+ self.validation_requests.lock().push(uxt.clone());
+ let hash = self.hash_and_length(&uxt).0;
+ let block_number = self.block_id_to_number(at).unwrap().unwrap();
+
+ let res = match uxt {
+ Extrinsic { function: RuntimeCall::Balances(BalancesCall::transfer_allow_death { .. }), .. } => {
+ let TransferData { nonce, .. } = (&uxt).try_into().unwrap();
+ // This is used to control the test flow.
+ if nonce > 0 {
+ let opt = self.delay.lock().take();
+ if let Some(delay) = opt {
+ if delay.recv().is_err() {
+ println!("Error waiting for delay!");
+ }
+ }
+ }
+
+ if self.invalidate.lock().contains(&hash) {
+ InvalidTransaction::Custom(0).into()
+ } else if nonce < block_number {
+ InvalidTransaction::Stale.into()
+ } else {
+ let mut transaction = ValidTransaction {
+ priority: 4,
+ requires: if nonce > block_number { vec![vec![nonce as u8 - 1]] } else { vec![] },
+ provides: if nonce == INVALID_NONCE { vec![] } else { vec![vec![nonce as u8]] },
+ longevity: 3,
+ propagate: true,
+ };
+
+ if self.clear_requirements.lock().contains(&hash) {
+ transaction.requires.clear();
+ }
+
+ if self.add_requirements.lock().contains(&hash) {
+ transaction.requires.push(vec![128]);
+ }
+
+ Ok(transaction)
+ }
+ }
+ Extrinsic { function: RuntimeCall::SubstrateTest(PalletCall::include_data { .. }), .. } => {
+ Ok(ValidTransaction {
+ priority: 9001,
+ requires: vec![],
+ provides: vec![vec![42]],
+ longevity: 9001,
+ propagate: false,
+ })
+ }
+ Extrinsic { function: RuntimeCall::SubstrateTest(PalletCall::indexed_call { .. }), .. } => {
+ Ok(ValidTransaction {
+ priority: 9001,
+ requires: vec![],
+ provides: vec![vec![43]],
+ longevity: 9001,
+ propagate: false,
+ })
+ }
+ _ => unimplemented!(),
+ };
+
+ futures::future::ready(Ok(res))
+ }
+
+ /// Returns a block number given the block id.
+ fn block_id_to_number(&self, at: &BlockId) -> Result>, Self::Error> {
+ Ok(match at {
+ BlockId::Number(num) => Some(*num),
+ BlockId::Hash(_) => None,
+ })
+ }
+
+ /// Returns a block hash given the block id.
+ fn block_id_to_hash(
+ &self,
+ at: &BlockId,
+ ) -> Result::Hash>, Self::Error> {
+ Ok(match at {
+ BlockId::Number(num) => Some(H256::from_low_u64_be(*num)).into(),
+ BlockId::Hash(_) => None,
+ })
+ }
+
+ /// Hash the extrinsic.
+ fn hash_and_length(&self, uxt: &ExtrinsicFor) -> (BlockHash, usize) {
+ let encoded = uxt.encode();
+ let len = encoded.len();
+ (Hashing::hash(&encoded), len)
+ }
+
+ fn block_body(&self, _id: ::Hash) -> Self::BodyFuture {
+ futures::future::ready(Ok(None))
+ }
+
+ fn block_header(
+ &self,
+ _: ::Hash,
+ ) -> Result::Header>, Self::Error> {
+ Ok(None)
+ }
+
+ fn tree_route(
+ &self,
+ _from: ::Hash,
+ _to: ::Hash,
+ ) -> Result, Self::Error> {
+ unimplemented!()
+ }
+}
+
+pub(crate) fn uxt(transfer: Transfer) -> Extrinsic {
+ ExtrinsicBuilder::new_transfer(transfer).build()
+}
+
+pub(crate) fn pool() -> Pool {
+ Pool::new(Default::default(), true.into(), TestApi::default().into())
+}
diff --git a/crates/client/transaction-pool/tests/pool.rs b/crates/client/transaction-pool/tests/pool.rs
new file mode 100644
index 0000000000..8f8ca1eceb
--- /dev/null
+++ b/crates/client/transaction-pool/tests/pool.rs
@@ -0,0 +1,1461 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+
+//! Tests for top-level transaction pool api
+
+use std::collections::BTreeSet;
+use std::pin::Pin;
+use std::sync::Arc;
+
+use futures::executor::{block_on, block_on_stream};
+use futures::prelude::*;
+use futures::task::Poll;
+use sc_block_builder::BlockBuilderProvider;
+use sc_client_api::client::BlockchainEvents;
+use sc_transaction_pool::*;
+use sc_transaction_pool_api::{ChainEvent, MaintainedTransactionPool, TransactionPool, TransactionStatus};
+use scale_codec::Encode;
+use sp_blockchain::HeaderBackend;
+use sp_consensus::BlockOrigin;
+use sp_runtime::generic::BlockId;
+use sp_runtime::traits::Block as _;
+use sp_runtime::transaction_validity::{TransactionSource, ValidTransaction};
+use substrate_test_runtime_client::runtime::{
+ Block, Extrinsic, ExtrinsicBuilder, Hash, Header, Transfer, TransferData,
+};
+use substrate_test_runtime_client::AccountKeyring::*;
+use substrate_test_runtime_client::ClientBlockImportExt;
+use substrate_test_runtime_transaction_pool::{uxt, TestApi};
+
+const LOG_TARGET: &str = "txpool";
+type Nonce = u64;
+
+fn pool() -> Pool {
+ Pool::new(Default::default(), true.into(), TestApi::with_alice_nonce(209).into())
+}
+
+fn maintained_pool() -> (BasicPool, Arc, futures::executor::ThreadPool) {
+ let api = Arc::new(TestApi::with_alice_nonce(209));
+ let (pool, background_task) = create_basic_pool_with_genesis(api.clone());
+
+ let thread_pool = futures::executor::ThreadPool::new().unwrap();
+ thread_pool.spawn_ok(background_task);
+ (pool, api, thread_pool)
+}
+
+// new types just for the next function (so that "cargo clippy -- -D warnings" doesn't get mad)
+type BasicPoolTest = BasicPool;
+type BackgroundTask = Pin + Send>>;
+
+fn create_basic_pool_with_genesis(test_api: Arc) -> (BasicPoolTest, BackgroundTask) {
+ let genesis_hash = {
+ test_api
+ .chain()
+ .read()
+ .block_by_number
+ .get(&0)
+ .map(|blocks| blocks[0].0.header.hash())
+ .expect("there is block 0. qed")
+ };
+ BasicPool::new_test(test_api, genesis_hash, genesis_hash)
+}
+
+fn create_basic_pool(test_api: TestApi) -> BasicPool {
+ create_basic_pool_with_genesis(Arc::from(test_api)).0
+}
+
+const SOURCE: TransactionSource = TransactionSource::External;
+
+#[test]
+fn submission_should_work() {
+ let pool = pool();
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 209))).unwrap();
+
+ let pending: Vec<_> =
+ pool.validated_pool().ready().map(|a| TransferData::try_from(&a.data).unwrap().nonce).collect();
+ assert_eq!(pending, vec![209]);
+}
+
+#[test]
+fn multiple_submission_should_work() {
+ let pool = pool();
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 209))).unwrap();
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 210))).unwrap();
+
+ let pending: Vec<_> =
+ pool.validated_pool().ready().map(|a| TransferData::try_from(&a.data).unwrap().nonce).collect();
+ assert_eq!(pending, vec![209, 210]);
+}
+
+#[test]
+fn early_nonce_should_be_culled() {
+ sp_tracing::try_init_simple();
+ let pool = pool();
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 208))).unwrap();
+
+ let pending: Vec<_> =
+ pool.validated_pool().ready().map(|a| TransferData::try_from(&a.data).unwrap().nonce).collect();
+ assert_eq!(pending, Vec::::new());
+}
+
+#[test]
+fn late_nonce_should_be_queued() {
+ let pool = pool();
+
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 210))).unwrap();
+ let pending: Vec<_> =
+ pool.validated_pool().ready().map(|a| TransferData::try_from(&a.data).unwrap().nonce).collect();
+ assert_eq!(pending, Vec::::new());
+
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 209))).unwrap();
+ let pending: Vec<_> =
+ pool.validated_pool().ready().map(|a| TransferData::try_from(&a.data).unwrap().nonce).collect();
+ assert_eq!(pending, vec![209, 210]);
+}
+
+#[test]
+fn prune_tags_should_work() {
+ let pool = pool();
+ let hash209 = block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 209))).unwrap();
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt(Alice, 210))).unwrap();
+
+ let pending: Vec<_> =
+ pool.validated_pool().ready().map(|a| TransferData::try_from(&a.data).unwrap().nonce).collect();
+ assert_eq!(pending, vec![209, 210]);
+
+ pool.validated_pool().api().push_block(1, Vec::new(), true);
+ block_on(pool.prune_tags(&BlockId::number(1), vec![vec![209]], vec![hash209])).expect("Prune tags");
+
+ let pending: Vec<_> =
+ pool.validated_pool().ready().map(|a| TransferData::try_from(&a.data).unwrap().nonce).collect();
+ assert_eq!(pending, vec![210]);
+}
+
+#[test]
+fn should_ban_invalid_transactions() {
+ let pool = pool();
+ let uxt = uxt(Alice, 209);
+ let hash = block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt.clone())).unwrap();
+ pool.validated_pool().remove_invalid(&[hash]);
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt.clone())).unwrap_err();
+
+ // when
+ let pending: Vec<_> =
+ pool.validated_pool().ready().map(|a| TransferData::try_from(&a.data).unwrap().nonce).collect();
+ assert_eq!(pending, Vec::::new());
+
+ // then
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, uxt.clone())).unwrap_err();
+}
+
+#[test]
+fn only_prune_on_new_best() {
+ let (pool, api, _) = maintained_pool();
+ let uxt = uxt(Alice, 209);
+
+ let _ = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, uxt.clone())).expect("1. Imported");
+ pool.api().push_block(1, vec![uxt.clone()], true);
+ assert_eq!(pool.status().ready, 1);
+
+ let header = api.push_block(2, vec![uxt], true);
+ let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+}
+
+#[test]
+fn should_correctly_prune_transactions_providing_more_than_one_tag() {
+ let api = Arc::new(TestApi::with_alice_nonce(209));
+ api.set_valid_modifier(Box::new(|v: &mut ValidTransaction| {
+ v.provides.push(vec![155]);
+ }));
+ let pool = Pool::new(Default::default(), true.into(), api.clone());
+ let xt = uxt(Alice, 209);
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+ assert_eq!(pool.validated_pool().status().ready, 1);
+
+ // remove the transaction that just got imported.
+ api.increment_nonce(Alice.into());
+ api.push_block(1, Vec::new(), true);
+ block_on(pool.prune_tags(&BlockId::number(1), vec![vec![209]], vec![])).expect("1. Pruned");
+ assert_eq!(pool.validated_pool().status().ready, 0);
+ // it's re-imported to future
+ assert_eq!(pool.validated_pool().status().future, 1);
+
+ // so now let's insert another transaction that also provides the 155
+ api.increment_nonce(Alice.into());
+ api.push_block(2, Vec::new(), true);
+ let xt = uxt(Alice, 211);
+ block_on(pool.submit_one(&BlockId::number(2), SOURCE, xt.clone())).expect("2. Imported");
+ assert_eq!(pool.validated_pool().status().ready, 1);
+ assert_eq!(pool.validated_pool().status().future, 1);
+ let pending: Vec<_> =
+ pool.validated_pool().ready().map(|a| TransferData::try_from(&a.data).unwrap().nonce).collect();
+ assert_eq!(pending, vec![211]);
+
+ // prune it and make sure the pool is empty
+ api.increment_nonce(Alice.into());
+ api.push_block(3, Vec::new(), true);
+ block_on(pool.prune_tags(&BlockId::number(3), vec![vec![155]], vec![])).expect("2. Pruned");
+ assert_eq!(pool.validated_pool().status().ready, 0);
+ assert_eq!(pool.validated_pool().status().future, 2);
+}
+
+fn block_event(header: Header) -> ChainEvent {
+ ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None }
+}
+
+fn block_event_with_retracted(
+ new_best_block_header: Header,
+ retracted_start: Hash,
+ api: &TestApi,
+) -> ChainEvent {
+ let tree_route = api.tree_route(retracted_start, new_best_block_header.parent_hash).expect("Tree route exists");
+
+ ChainEvent::NewBestBlock { hash: new_best_block_header.hash(), tree_route: Some(Arc::new(tree_route)) }
+}
+
+#[test]
+fn should_prune_old_during_maintenance() {
+ let xt = uxt(Alice, 209);
+
+ let (pool, api, _guard) = maintained_pool();
+
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 1);
+
+ let header = api.push_block(1, vec![xt.clone()], true);
+
+ block_on(pool.maintain(block_event(header)));
+ assert_eq!(pool.status().ready, 0);
+}
+
+#[test]
+fn should_revalidate_during_maintenance() {
+ let xt1 = uxt(Alice, 209);
+ let xt2 = uxt(Alice, 210);
+
+ let (pool, api, _guard) = maintained_pool();
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt1.clone())).expect("1. Imported");
+ let watcher = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, xt2.clone())).expect("2. Imported");
+ assert_eq!(pool.status().ready, 2);
+ assert_eq!(api.validation_requests().len(), 2);
+
+ let header = api.push_block(1, vec![xt1.clone()], true);
+
+ api.add_invalid(&xt2);
+
+ block_on(pool.maintain(block_event(header)));
+ assert_eq!(pool.status().ready, 1);
+
+ // test that pool revalidated transaction that left ready and not included in the block
+ assert_eq!(
+ futures::executor::block_on_stream(watcher).collect::>(),
+ vec![TransactionStatus::Ready, TransactionStatus::Invalid],
+ );
+}
+
+#[test]
+fn should_resubmit_from_retracted_during_maintenance() {
+ let xt = uxt(Alice, 209);
+
+ let (pool, api, _guard) = maintained_pool();
+
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 1);
+
+ let header = api.push_block(1, vec![], true);
+ let fork_header = api.push_block(1, vec![], true);
+
+ let event = block_event_with_retracted(header, fork_header.hash(), pool.api());
+
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 1);
+}
+
+#[test]
+fn should_not_resubmit_from_retracted_during_maintenance_if_tx_is_also_in_enacted() {
+ let xt = uxt(Alice, 209);
+
+ let (pool, api, _guard) = maintained_pool();
+
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 1);
+
+ let header = api.push_block(1, vec![xt.clone()], true);
+ let fork_header = api.push_block(1, vec![xt], true);
+
+ let event = block_event_with_retracted(header, fork_header.hash(), pool.api());
+
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+}
+
+#[test]
+fn should_not_retain_invalid_hashes_from_retracted() {
+ let xt = uxt(Alice, 209);
+
+ let (pool, api, _guard) = maintained_pool();
+
+ let watcher = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 1);
+
+ let header = api.push_block(1, vec![], true);
+ let fork_header = api.push_block(1, vec![xt.clone()], true);
+ api.add_invalid(&xt);
+
+ let event = block_event_with_retracted(header, fork_header.hash(), pool.api());
+ block_on(pool.maintain(event));
+
+ assert_eq!(
+ futures::executor::block_on_stream(watcher).collect::>(),
+ vec![TransactionStatus::Ready, TransactionStatus::Invalid],
+ );
+
+ assert_eq!(pool.status().ready, 0);
+}
+
+#[test]
+fn should_revalidate_across_many_blocks() {
+ let xt1 = uxt(Alice, 209);
+ let xt2 = uxt(Alice, 210);
+ let xt3 = uxt(Alice, 211);
+
+ let (pool, api, _guard) = maintained_pool();
+
+ let watcher1 = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, xt1.clone())).expect("1. Imported");
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt2.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 2);
+
+ let header = api.push_block(1, vec![], true);
+ block_on(pool.maintain(block_event(header)));
+
+ block_on(pool.submit_one(&BlockId::number(1), SOURCE, xt3.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 3);
+
+ let header = api.push_block(2, vec![xt1.clone()], true);
+ let block_hash = header.hash();
+ block_on(pool.maintain(block_event(header.clone())));
+
+ block_on(
+ watcher1.take_while(|s| future::ready(*s != TransactionStatus::InBlock((block_hash, 0)))).collect::>(),
+ );
+
+ assert_eq!(pool.status().ready, 2);
+}
+
+#[test]
+fn should_push_watchers_during_maintenance() {
+ fn alice_uxt(nonce: u64) -> Extrinsic {
+ uxt(Alice, 209 + nonce)
+ }
+
+ // given
+ let (pool, api, _guard) = maintained_pool();
+
+ let tx0 = alice_uxt(0);
+ let watcher0 = block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx0.clone())).unwrap();
+ let tx1 = alice_uxt(1);
+ let watcher1 = block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx1.clone())).unwrap();
+ let tx2 = alice_uxt(2);
+ let watcher2 = block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx2.clone())).unwrap();
+ let tx3 = alice_uxt(3);
+ let watcher3 = block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx3.clone())).unwrap();
+ let tx4 = alice_uxt(4);
+ let watcher4 = block_on(pool.submit_and_watch(&BlockId::Number(0), SOURCE, tx4.clone())).unwrap();
+ assert_eq!(pool.status().ready, 5);
+
+ // when
+ api.add_invalid(&tx3);
+ api.add_invalid(&tx4);
+
+ // clear timer events if any
+ let header = api.push_block(1, vec![], true);
+ block_on(pool.maintain(block_event(header)));
+
+ // then
+ // hash3 is now invalid
+ // hash4 is now invalid
+ assert_eq!(
+ futures::executor::block_on_stream(watcher3).collect::>(),
+ vec![TransactionStatus::Ready, TransactionStatus::Invalid],
+ );
+ assert_eq!(
+ futures::executor::block_on_stream(watcher4).collect::>(),
+ vec![TransactionStatus::Ready, TransactionStatus::Invalid],
+ );
+ assert_eq!(pool.status().ready, 3);
+
+ // when
+ let header = api.push_block(2, vec![tx0, tx1, tx2], true);
+ let header_hash = header.hash();
+ block_on(pool.maintain(block_event(header)));
+
+ let event = ChainEvent::Finalized { hash: header_hash, tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+
+ // then
+ // events for hash0 are: Ready, InBlock
+ // events for hash1 are: Ready, InBlock
+ // events for hash2 are: Ready, InBlock
+ assert_eq!(
+ futures::executor::block_on_stream(watcher0).collect::>(),
+ vec![
+ TransactionStatus::Ready,
+ TransactionStatus::InBlock((header_hash, 0)),
+ TransactionStatus::Finalized((header_hash, 0))
+ ],
+ );
+ assert_eq!(
+ futures::executor::block_on_stream(watcher1).collect::>(),
+ vec![
+ TransactionStatus::Ready,
+ TransactionStatus::InBlock((header_hash, 1)),
+ TransactionStatus::Finalized((header_hash, 1))
+ ],
+ );
+ assert_eq!(
+ futures::executor::block_on_stream(watcher2).collect::>(),
+ vec![
+ TransactionStatus::Ready,
+ TransactionStatus::InBlock((header_hash, 2)),
+ TransactionStatus::Finalized((header_hash, 2))
+ ],
+ );
+}
+
+#[test]
+fn finalization() {
+ let xt = uxt(Alice, 209);
+ let api = TestApi::with_alice_nonce(209);
+ api.push_block(1, vec![], true);
+ let pool = create_basic_pool(api);
+ let watcher = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, xt.clone())).expect("1. Imported");
+ pool.api().push_block(2, vec![xt.clone()], true);
+
+ let header = pool.api().chain().read().block_by_number.get(&2).unwrap()[0].0.header().clone();
+ let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
+ block_on(pool.maintain(event));
+
+ let event = ChainEvent::Finalized { hash: header.hash(), tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+
+ let mut stream = futures::executor::block_on_stream(watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((header.hash(), 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((header.hash(), 0))));
+ assert_eq!(stream.next(), None);
+}
+
+#[test]
+fn fork_aware_finalization() {
+ sp_tracing::try_init_simple();
+ let api = TestApi::empty();
+ // starting block A1 (last finalized.)
+ let a_header = api.push_block(1, vec![], true);
+
+ let pool = create_basic_pool(api);
+ let mut canon_watchers = vec![];
+
+ let from_alice = uxt(Alice, 1);
+ let from_dave = uxt(Dave, 2);
+ let from_bob = uxt(Bob, 1);
+ let from_charlie = uxt(Charlie, 1);
+ pool.api().increment_nonce(Alice.into());
+ pool.api().increment_nonce(Dave.into());
+ pool.api().increment_nonce(Charlie.into());
+ pool.api().increment_nonce(Bob.into());
+
+ let from_dave_watcher;
+ let from_bob_watcher;
+ let b1;
+ let c1;
+ let d1;
+ let c2;
+ let d2;
+
+ block_on(pool.maintain(block_event(a_header)));
+
+ // block B1
+ {
+ let watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone())).expect("1. Imported");
+ let header = pool.api().push_block(2, vec![from_alice.clone()], true);
+ canon_watchers.push((watcher, header.hash()));
+ assert_eq!(pool.status().ready, 1);
+
+ log::trace!(target: LOG_TARGET, ">> B1: {:?} {:?}", header.hash(), header);
+ let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
+ b1 = header.hash();
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+ let event = ChainEvent::Finalized { hash: b1, tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+ }
+
+ // block C2
+ {
+ let header = pool.api().push_block_with_parent(b1, vec![from_dave.clone()], true);
+ from_dave_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_dave.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 1);
+ log::trace!(target: LOG_TARGET, ">> C2: {:?} {:?}", header.hash(), header);
+ let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
+ c2 = header.hash();
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+ }
+
+ // block D2
+ {
+ from_bob_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 1);
+ let header = pool.api().push_block_with_parent(c2, vec![from_bob.clone()], true);
+
+ log::trace!(target: LOG_TARGET, ">> D2: {:?} {:?}", header.hash(), header);
+ let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
+ d2 = header.hash();
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+ }
+
+ // block C1
+ {
+ let watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_charlie.clone())).expect("1.Imported");
+ assert_eq!(pool.status().ready, 1);
+ let header = pool.api().push_block_with_parent(b1, vec![from_charlie.clone()], true);
+ log::trace!(target: LOG_TARGET, ">> C1: {:?} {:?}", header.hash(), header);
+ c1 = header.hash();
+ canon_watchers.push((watcher, header.hash()));
+ let event = block_event_with_retracted(header.clone(), d2, pool.api());
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 2);
+
+ let event = ChainEvent::Finalized { hash: header.hash(), tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+ }
+
+ // block D1
+ {
+ let xt = uxt(Eve, 0);
+ let w = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, xt.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 3);
+ let header = pool.api().push_block_with_parent(c1, vec![xt.clone()], true);
+ log::trace!(target: LOG_TARGET, ">> D1: {:?} {:?}", header.hash(), header);
+ d1 = header.hash();
+ canon_watchers.push((w, header.hash()));
+
+ let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 2);
+ let event = ChainEvent::Finalized { hash: d1, tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+ }
+
+ let e1;
+
+ // block E1
+ {
+ let header = pool.api().push_block_with_parent(d1, vec![from_dave, from_bob], true);
+ log::trace!(target: LOG_TARGET, ">> E1: {:?} {:?}", header.hash(), header);
+ e1 = header.hash();
+ let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+ block_on(pool.maintain(ChainEvent::Finalized { hash: e1, tree_route: Arc::from(vec![]) }));
+ }
+
+ for (canon_watcher, h) in canon_watchers {
+ let mut stream = futures::executor::block_on_stream(canon_watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((h, 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((h, 0))));
+ assert_eq!(stream.next(), None);
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_dave_watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((c2, 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Retracted(c2)));
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((e1, 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((e1, 0))));
+ assert_eq!(stream.next(), None);
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_bob_watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((d2, 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Retracted(d2)));
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ // In block e1 we submitted: [dave, bob] xts in this order.
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((e1, 1))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((e1, 1))));
+ assert_eq!(stream.next(), None);
+ }
+}
+
+/// Tests that when pruning and retracing a tx by the same event, we generate
+/// the correct events in the correct order.
+#[test]
+fn prune_and_retract_tx_at_same_time() {
+ let api = TestApi::empty();
+ // starting block A1 (last finalized.)
+ api.push_block(1, vec![], true);
+
+ let pool = create_basic_pool(api);
+
+ let from_alice = uxt(Alice, 1);
+ pool.api().increment_nonce(Alice.into());
+
+ let watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone())).expect("1. Imported");
+
+ // Block B1
+ let b1 = {
+ let header = pool.api().push_block(2, vec![from_alice.clone()], true);
+ assert_eq!(pool.status().ready, 1);
+
+ let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+ header.hash()
+ };
+
+ // Block B2
+ let b2 = {
+ let header = pool.api().push_block(2, vec![from_alice.clone()], true);
+ assert_eq!(pool.status().ready, 0);
+
+ let event = block_event_with_retracted(header.clone(), b1, pool.api());
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+
+ let event = ChainEvent::Finalized { hash: header.hash(), tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+
+ header.hash()
+ };
+
+ {
+ let mut stream = futures::executor::block_on_stream(watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b1, 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Retracted(b1)));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b2, 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((b2, 0))));
+ assert_eq!(stream.next(), None);
+ }
+}
+
+/// This test ensures that transactions from a fork are re-submitted if
+/// the forked block is not part of the retracted blocks. This happens as the
+/// retracted block list only contains the route from the old best to the new
+/// best, without any further forks.
+///
+/// Given the following:
+///
+/// -> D0 (old best, tx0)
+/// /
+/// C - -> D1 (tx1)
+/// \
+/// -> D2 (new best)
+///
+/// Retracted will contain `D0`, but we need to re-submit `tx0` and `tx1` as both
+/// blocks are not part of the canonical chain.
+#[test]
+fn resubmit_tx_of_fork_that_is_not_part_of_retracted() {
+ let api = TestApi::empty();
+ // starting block A1 (last finalized.)
+ api.push_block(1, vec![], true);
+
+ let pool = create_basic_pool(api);
+
+ let tx0 = uxt(Alice, 1);
+ let tx1 = uxt(Dave, 2);
+ pool.api().increment_nonce(Alice.into());
+ pool.api().increment_nonce(Dave.into());
+
+ let d0;
+
+ // Block D0
+ {
+ let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx0.clone())).expect("1. Imported");
+ let header = pool.api().push_block(2, vec![tx0.clone()], true);
+ assert_eq!(pool.status().ready, 1);
+
+ let event = ChainEvent::NewBestBlock { hash: header.hash(), tree_route: None };
+ d0 = header.hash();
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+ }
+
+ // Block D1
+ {
+ let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx1.clone())).expect("1. Imported");
+ pool.api().push_block(2, vec![tx1.clone()], false);
+ assert_eq!(pool.status().ready, 1);
+ }
+
+ // Block D2
+ {
+ // push new best block
+ let header = pool.api().push_block(2, vec![], true);
+ let event = block_event_with_retracted(header, d0, pool.api());
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 2);
+ }
+}
+
+#[test]
+fn resubmit_from_retracted_fork() {
+ let api = TestApi::empty();
+ // starting block A1 (last finalized.)
+ api.push_block(1, vec![], true);
+
+ let pool = create_basic_pool(api);
+
+ let tx0 = uxt(Alice, 1);
+ let tx1 = uxt(Dave, 2);
+ let tx2 = uxt(Bob, 3);
+
+ // Transactions of the fork that will be enacted later
+ let tx3 = uxt(Eve, 1);
+ let tx4 = uxt(Ferdie, 2);
+ let tx5 = uxt(One, 3);
+
+ pool.api().increment_nonce(Alice.into());
+ pool.api().increment_nonce(Dave.into());
+ pool.api().increment_nonce(Bob.into());
+ pool.api().increment_nonce(Eve.into());
+ pool.api().increment_nonce(Ferdie.into());
+ pool.api().increment_nonce(One.into());
+
+ // Block D0
+ {
+ let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx0.clone())).expect("1. Imported");
+ let header = pool.api().push_block(2, vec![tx0.clone()], true);
+ assert_eq!(pool.status().ready, 1);
+
+ block_on(pool.maintain(block_event(header)));
+ assert_eq!(pool.status().ready, 0);
+ }
+
+ // Block E0
+ {
+ let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx1.clone())).expect("1. Imported");
+ let header = pool.api().push_block(3, vec![tx1.clone()], true);
+ block_on(pool.maintain(block_event(header)));
+ assert_eq!(pool.status().ready, 0);
+ }
+
+ // Block F0
+ let f0 = {
+ let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx2.clone())).expect("1. Imported");
+ let header = pool.api().push_block(4, vec![tx2.clone()], true);
+ block_on(pool.maintain(block_event(header.clone())));
+ assert_eq!(pool.status().ready, 0);
+ header.hash()
+ };
+
+ // Block D1
+ let d1 = {
+ let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx3.clone())).expect("1. Imported");
+ let header = pool.api().push_block(2, vec![tx3.clone()], true);
+ assert_eq!(pool.status().ready, 1);
+ header.hash()
+ };
+
+ // Block E1
+ let e1 = {
+ let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx4.clone())).expect("1. Imported");
+ let header = pool.api().push_block_with_parent(d1, vec![tx4.clone()], true);
+ assert_eq!(pool.status().ready, 2);
+ header.hash()
+ };
+
+ // Block F1
+ let f1_header = {
+ let _ = block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, tx5.clone())).expect("1. Imported");
+ let header = pool.api().push_block_with_parent(e1, vec![tx5.clone()], true);
+ // Don't announce the block event to the pool directly, because we will
+ // re-org to this block.
+ assert_eq!(pool.status().ready, 3);
+ header
+ };
+
+ let ready = pool.ready().map(|t| t.data.encode()).collect::>();
+ let expected_ready = vec![tx3, tx4, tx5].iter().map(Encode::encode).collect::>();
+ assert_eq!(expected_ready, ready);
+
+ let event = block_event_with_retracted(f1_header, f0, pool.api());
+ block_on(pool.maintain(event));
+
+ assert_eq!(pool.status().ready, 3);
+ let ready = pool.ready().map(|t| t.data.encode()).collect::>();
+ let expected_ready = vec![tx0, tx1, tx2].iter().map(Encode::encode).collect::>();
+ assert_eq!(expected_ready, ready);
+}
+
+#[test]
+fn ready_set_should_not_resolve_before_block_update() {
+ let (pool, _api, _guard) = maintained_pool();
+ let xt1 = uxt(Alice, 209);
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt1.clone())).expect("1. Imported");
+
+ assert!(pool.ready_at(1).now_or_never().is_none());
+}
+
+#[test]
+fn ready_set_should_resolve_after_block_update() {
+ let (pool, api, _guard) = maintained_pool();
+ let header = api.push_block(1, vec![], true);
+
+ let xt1 = uxt(Alice, 209);
+
+ block_on(pool.submit_one(&BlockId::number(1), SOURCE, xt1.clone())).expect("1. Imported");
+ block_on(pool.maintain(block_event(header)));
+
+ assert!(pool.ready_at(1).now_or_never().is_some());
+}
+
+#[test]
+fn ready_set_should_eventually_resolve_when_block_update_arrives() {
+ let (pool, api, _guard) = maintained_pool();
+ let header = api.push_block(1, vec![], true);
+
+ let xt1 = uxt(Alice, 209);
+
+ block_on(pool.submit_one(&BlockId::number(1), SOURCE, xt1.clone())).expect("1. Imported");
+
+ let noop_waker = futures::task::noop_waker();
+ let mut context = futures::task::Context::from_waker(&noop_waker);
+
+ let mut ready_set_future = pool.ready_at(1);
+ if ready_set_future.poll_unpin(&mut context).is_ready() {
+ panic!("Ready set should not be ready before block update!");
+ }
+
+ block_on(pool.maintain(block_event(header)));
+
+ match ready_set_future.poll_unpin(&mut context) {
+ Poll::Pending => {
+ panic!("Ready set should become ready after block update!");
+ }
+ Poll::Ready(iterator) => {
+ let data = iterator.collect::>();
+ assert_eq!(data.len(), 1);
+ }
+ }
+}
+
+#[test]
+fn import_notification_to_pool_maintain_works() {
+ let mut client = Arc::new(substrate_test_runtime_client::new());
+
+ let best_hash = client.info().best_hash;
+ let finalized_hash = client.info().finalized_hash;
+
+ let pool = Arc::new(
+ BasicPool::new_test(
+ Arc::new(FullChainApi::new(client.clone(), None, &sp_core::testing::TaskExecutor::new())),
+ best_hash,
+ finalized_hash,
+ )
+ .0,
+ );
+
+ // Prepare the extrisic, push it to the pool and check that it was added.
+ let xt = uxt(Alice, 0);
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 1);
+
+ let mut import_stream = block_on_stream(client.import_notification_stream());
+
+ // Build the block with the transaction included
+ let mut block_builder = client.new_block(Default::default()).unwrap();
+ block_builder.push(xt).unwrap();
+ let block = block_builder.build().unwrap().block;
+ block_on(client.import(BlockOrigin::Own, block)).unwrap();
+
+ // Get the notification of the block import and maintain the pool with it,
+ // Now, the pool should not contain any transactions.
+ let evt = import_stream.next().expect("Importing a block leads to an event");
+ block_on(pool.maintain(evt.try_into().expect("Imported as new best block")));
+ assert_eq!(pool.status().ready, 0);
+}
+
+// When we prune transactions, we need to make sure that we remove
+#[test]
+fn pruning_a_transaction_should_remove_it_from_best_transaction() {
+ let (pool, api, _guard) = maintained_pool();
+
+ let xt1 = ExtrinsicBuilder::new_include_data(Vec::new()).build();
+
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt1.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 1);
+ let header = api.push_block(1, vec![xt1.clone()], true);
+
+ // This will prune `xt1`.
+ block_on(pool.maintain(block_event(header)));
+
+ assert_eq!(pool.status().ready, 0);
+}
+
+#[test]
+fn stale_transactions_are_pruned() {
+ sp_tracing::try_init_simple();
+
+ // Our initial transactions
+ let xts = vec![
+ Transfer { from: Alice.into(), to: Bob.into(), nonce: 1, amount: 1 },
+ Transfer { from: Alice.into(), to: Bob.into(), nonce: 2, amount: 1 },
+ Transfer { from: Alice.into(), to: Bob.into(), nonce: 3, amount: 1 },
+ ];
+
+ let (pool, api, _guard) = maintained_pool();
+
+ xts.into_iter().for_each(|xt| {
+ block_on(pool.submit_one(&BlockId::number(0), SOURCE, xt.into_unchecked_extrinsic())).expect("1. Imported");
+ });
+ assert_eq!(pool.status().ready, 0);
+ assert_eq!(pool.status().future, 3);
+
+ // Almost the same as our initial transactions, but with some different `amount`s to make them
+ // generate a different hash
+ let xts = vec![
+ Transfer { from: Alice.into(), to: Bob.into(), nonce: 1, amount: 2 }.into_unchecked_extrinsic(),
+ Transfer { from: Alice.into(), to: Bob.into(), nonce: 2, amount: 2 }.into_unchecked_extrinsic(),
+ Transfer { from: Alice.into(), to: Bob.into(), nonce: 3, amount: 2 }.into_unchecked_extrinsic(),
+ ];
+
+ // Import block
+ let header = api.push_block(1, xts, true);
+ block_on(pool.maintain(block_event(header)));
+ // The imported transactions have a different hash and should not evict our initial
+ // transactions.
+ assert_eq!(pool.status().future, 3);
+
+ // Import enough blocks to make our transactions stale
+ for n in 1..66 {
+ let header = api.push_block(n, vec![], true);
+ block_on(pool.maintain(block_event(header)));
+ }
+
+ assert_eq!(pool.status().future, 0);
+ assert_eq!(pool.status().ready, 0);
+}
+
+#[test]
+fn finalized_only_handled_correctly() {
+ sp_tracing::try_init_simple();
+ let xt = uxt(Alice, 209);
+
+ let (pool, api, _guard) = maintained_pool();
+
+ let watcher = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 1);
+
+ let header = api.push_block(1, vec![xt], true);
+
+ let event = ChainEvent::Finalized { hash: header.clone().hash(), tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+
+ assert_eq!(pool.status().ready, 0);
+
+ {
+ let mut stream = futures::executor::block_on_stream(watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((header.clone().hash(), 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((header.hash(), 0))));
+ assert_eq!(stream.next(), None);
+ }
+}
+
+#[test]
+fn best_block_after_finalized_handled_correctly() {
+ sp_tracing::try_init_simple();
+ let xt = uxt(Alice, 209);
+
+ let (pool, api, _guard) = maintained_pool();
+
+ let watcher = block_on(pool.submit_and_watch(&BlockId::number(0), SOURCE, xt.clone())).expect("1. Imported");
+ assert_eq!(pool.status().ready, 1);
+
+ let header = api.push_block(1, vec![xt], true);
+
+ let event = ChainEvent::Finalized { hash: header.clone().hash(), tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+ block_on(pool.maintain(block_event(header.clone())));
+
+ assert_eq!(pool.status().ready, 0);
+
+ {
+ let mut stream = futures::executor::block_on_stream(watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((header.clone().hash(), 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((header.hash(), 0))));
+ assert_eq!(stream.next(), None);
+ }
+}
+
+#[test]
+fn switching_fork_with_finalized_works() {
+ sp_tracing::try_init_simple();
+ let api = TestApi::empty();
+ // starting block A1 (last finalized.)
+ let a_header = api.push_block(1, vec![], true);
+
+ let pool = create_basic_pool(api);
+
+ let from_alice = uxt(Alice, 1);
+ let from_bob = uxt(Bob, 2);
+ pool.api().increment_nonce(Alice.into());
+ pool.api().increment_nonce(Bob.into());
+
+ let from_alice_watcher;
+ let from_bob_watcher;
+ let b1_header;
+ let b2_header;
+
+ // block B1
+ {
+ from_alice_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone())).expect("1. Imported");
+ let header = pool.api().push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
+ assert_eq!(pool.status().ready, 1);
+ log::trace!(target: LOG_TARGET, ">> B1: {:?} {:?}", header.hash(), header);
+ b1_header = header;
+ }
+
+ // block B2
+ {
+ from_bob_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone())).expect("1. Imported");
+ let header =
+ pool.api().push_block_with_parent(a_header.hash(), vec![from_alice.clone(), from_bob.clone()], true);
+ assert_eq!(pool.status().ready, 2);
+
+ log::trace!(target: LOG_TARGET, ">> B2: {:?} {:?}", header.hash(), header);
+ b2_header = header;
+ }
+
+ {
+ let event = ChainEvent::NewBestBlock { hash: b1_header.hash(), tree_route: None };
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 1);
+ }
+
+ {
+ let event = ChainEvent::Finalized { hash: b2_header.hash(), tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_alice_watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b1_header.hash(), 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Retracted(b1_header.hash())));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b2_header.hash(), 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((b2_header.hash(), 0))));
+ assert_eq!(stream.next(), None);
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_bob_watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b2_header.hash(), 1))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((b2_header.hash(), 1))));
+ assert_eq!(stream.next(), None);
+ }
+}
+
+#[test]
+fn switching_fork_multiple_times_works() {
+ sp_tracing::try_init_simple();
+ let api = TestApi::empty();
+ // starting block A1 (last finalized.)
+ let a_header = api.push_block(1, vec![], true);
+
+ let pool = create_basic_pool(api);
+
+ let from_alice = uxt(Alice, 1);
+ let from_bob = uxt(Bob, 2);
+ pool.api().increment_nonce(Alice.into());
+ pool.api().increment_nonce(Bob.into());
+
+ let from_alice_watcher;
+ let from_bob_watcher;
+ let b1_header;
+ let b2_header;
+
+ // block B1
+ {
+ from_alice_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone())).expect("1. Imported");
+ let header = pool.api().push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
+ assert_eq!(pool.status().ready, 1);
+ log::trace!(target: LOG_TARGET, ">> B1: {:?} {:?}", header.hash(), header);
+ b1_header = header;
+ }
+
+ // block B2
+ {
+ from_bob_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone())).expect("1. Imported");
+ let header =
+ pool.api().push_block_with_parent(a_header.hash(), vec![from_alice.clone(), from_bob.clone()], true);
+ assert_eq!(pool.status().ready, 2);
+
+ log::trace!(target: LOG_TARGET, ">> B2: {:?} {:?}", header.hash(), header);
+ b2_header = header;
+ }
+
+ {
+ // phase-0
+ let event = ChainEvent::NewBestBlock { hash: b1_header.hash(), tree_route: None };
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 1);
+ }
+
+ {
+ // phase-1
+ let event = block_event_with_retracted(b2_header.clone(), b1_header.hash(), pool.api());
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+ }
+
+ {
+ // phase-2
+ let event = block_event_with_retracted(b1_header.clone(), b2_header.hash(), pool.api());
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 1);
+ }
+
+ {
+ // phase-3
+ let event = ChainEvent::Finalized { hash: b2_header.hash(), tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_alice_watcher);
+ // phase-0
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b1_header.hash(), 0))));
+ // phase-1
+ assert_eq!(stream.next(), Some(TransactionStatus::Retracted(b1_header.hash())));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b2_header.hash(), 0))));
+ // phase-2
+ assert_eq!(stream.next(), Some(TransactionStatus::Retracted(b2_header.hash())));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b1_header.hash(), 0))));
+ // phase-3
+ assert_eq!(stream.next(), Some(TransactionStatus::Retracted(b1_header.hash())));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b2_header.hash(), 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((b2_header.hash(), 0))));
+ assert_eq!(stream.next(), None);
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_bob_watcher);
+ // phase-1
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b2_header.hash(), 1))));
+ // phase-2
+ assert_eq!(stream.next(), Some(TransactionStatus::Retracted(b2_header.hash())));
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ // phase-3
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b2_header.hash(), 1))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((b2_header.hash(), 1))));
+ assert_eq!(stream.next(), None);
+ }
+}
+
+#[test]
+fn two_blocks_delayed_finalization_works() {
+ sp_tracing::try_init_simple();
+ let api = TestApi::empty();
+ // starting block A1 (last finalized.)
+ let a_header = api.push_block(1, vec![], true);
+
+ let pool = create_basic_pool(api);
+
+ let from_alice = uxt(Alice, 1);
+ let from_bob = uxt(Bob, 2);
+ let from_charlie = uxt(Charlie, 3);
+ pool.api().increment_nonce(Alice.into());
+ pool.api().increment_nonce(Bob.into());
+ pool.api().increment_nonce(Charlie.into());
+
+ let from_alice_watcher;
+ let from_bob_watcher;
+ let from_charlie_watcher;
+ let b1_header;
+ let c1_header;
+ let d1_header;
+
+ // block B1
+ {
+ from_alice_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone())).expect("1. Imported");
+ let header = pool.api().push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
+ assert_eq!(pool.status().ready, 1);
+
+ log::trace!(target: LOG_TARGET, ">> B1: {:?} {:?}", header.hash(), header);
+ b1_header = header;
+ }
+
+ // block C1
+ {
+ from_bob_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone())).expect("1. Imported");
+ let header = pool.api().push_block_with_parent(b1_header.hash(), vec![from_bob.clone()], true);
+ assert_eq!(pool.status().ready, 2);
+
+ log::trace!(target: LOG_TARGET, ">> C1: {:?} {:?}", header.hash(), header);
+ c1_header = header;
+ }
+
+ // block D1
+ {
+ from_charlie_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_charlie.clone())).expect("1. Imported");
+ let header = pool.api().push_block_with_parent(c1_header.hash(), vec![from_charlie.clone()], true);
+ assert_eq!(pool.status().ready, 3);
+
+ log::trace!(target: LOG_TARGET, ">> D1: {:?} {:?}", header.hash(), header);
+ d1_header = header;
+ }
+
+ {
+ let event = ChainEvent::Finalized { hash: a_header.hash(), tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 3);
+ }
+
+ {
+ let event = ChainEvent::NewBestBlock { hash: d1_header.hash(), tree_route: None };
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+ }
+
+ {
+ let event = ChainEvent::Finalized { hash: c1_header.hash(), tree_route: Arc::from(vec![b1_header.hash()]) };
+ block_on(pool.maintain(event));
+ }
+
+ // this is to collect events from_charlie_watcher and make sure nothing was retracted
+ {
+ let event = ChainEvent::Finalized { hash: d1_header.hash(), tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_alice_watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b1_header.hash(), 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((b1_header.hash(), 0))));
+ assert_eq!(stream.next(), None);
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_bob_watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((c1_header.hash(), 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((c1_header.hash(), 0))));
+ assert_eq!(stream.next(), None);
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_charlie_watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((d1_header.hash(), 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((d1_header.hash(), 0))));
+ assert_eq!(stream.next(), None);
+ }
+}
+
+#[test]
+fn delayed_finalization_does_not_retract() {
+ sp_tracing::try_init_simple();
+ let api = TestApi::empty();
+ // starting block A1 (last finalized.)
+ let a_header = api.push_block(1, vec![], true);
+
+ let pool = create_basic_pool(api);
+
+ let from_alice = uxt(Alice, 1);
+ let from_bob = uxt(Bob, 2);
+ pool.api().increment_nonce(Alice.into());
+ pool.api().increment_nonce(Bob.into());
+
+ let from_alice_watcher;
+ let from_bob_watcher;
+ let b1_header;
+ let c1_header;
+
+ // block B1
+ {
+ from_alice_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone())).expect("1. Imported");
+ let header = pool.api().push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
+ assert_eq!(pool.status().ready, 1);
+
+ log::trace!(target: LOG_TARGET, ">> B1: {:?} {:?}", header.hash(), header);
+ b1_header = header;
+ }
+
+ // block C1
+ {
+ from_bob_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone())).expect("1. Imported");
+ let header = pool.api().push_block_with_parent(b1_header.hash(), vec![from_bob.clone()], true);
+ assert_eq!(pool.status().ready, 2);
+
+ log::trace!(target: LOG_TARGET, ">> C1: {:?} {:?}", header.hash(), header);
+ c1_header = header;
+ }
+
+ {
+ // phase-0
+ let event = ChainEvent::NewBestBlock { hash: b1_header.hash(), tree_route: None };
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 1);
+ }
+
+ {
+ // phase-1
+ let event = ChainEvent::NewBestBlock { hash: c1_header.hash(), tree_route: None };
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+ }
+
+ {
+ // phase-2
+ let event = ChainEvent::Finalized { hash: b1_header.hash(), tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+ }
+
+ {
+ // phase-3
+ let event = ChainEvent::Finalized { hash: c1_header.hash(), tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_alice_watcher);
+ // phase-0
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b1_header.hash(), 0))));
+ // phase-2
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((b1_header.hash(), 0))));
+ assert_eq!(stream.next(), None);
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_bob_watcher);
+ // phase-0
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ // phase-1
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((c1_header.hash(), 0))));
+ // phase-3
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((c1_header.hash(), 0))));
+ assert_eq!(stream.next(), None);
+ }
+}
+
+#[test]
+fn best_block_after_finalization_does_not_retract() {
+ sp_tracing::try_init_simple();
+ let api = TestApi::empty();
+ // starting block A1 (last finalized.)
+ let a_header = api.push_block(1, vec![], true);
+
+ let pool = create_basic_pool(api);
+
+ let from_alice = uxt(Alice, 1);
+ let from_bob = uxt(Bob, 2);
+ pool.api().increment_nonce(Alice.into());
+ pool.api().increment_nonce(Bob.into());
+
+ let from_alice_watcher;
+ let from_bob_watcher;
+ let b1_header;
+ let c1_header;
+
+ // block B1
+ {
+ from_alice_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_alice.clone())).expect("1. Imported");
+ let header = pool.api().push_block_with_parent(a_header.hash(), vec![from_alice.clone()], true);
+ assert_eq!(pool.status().ready, 1);
+
+ log::trace!(target: LOG_TARGET, ">> B1: {:?} {:?}", header.hash(), header);
+ b1_header = header;
+ }
+
+ // block C1
+ {
+ from_bob_watcher =
+ block_on(pool.submit_and_watch(&BlockId::number(1), SOURCE, from_bob.clone())).expect("1. Imported");
+ let header = pool.api().push_block_with_parent(b1_header.hash(), vec![from_bob.clone()], true);
+ assert_eq!(pool.status().ready, 2);
+
+ log::trace!(target: LOG_TARGET, ">> C1: {:?} {:?}", header.hash(), header);
+ c1_header = header;
+ }
+
+ {
+ let event = ChainEvent::Finalized { hash: a_header.hash(), tree_route: Arc::from(vec![]) };
+ block_on(pool.maintain(event));
+ }
+
+ {
+ let event = ChainEvent::Finalized {
+ hash: c1_header.hash(),
+ tree_route: Arc::from(vec![a_header.hash(), b1_header.hash()]),
+ };
+ block_on(pool.maintain(event));
+ assert_eq!(pool.status().ready, 0);
+ }
+
+ {
+ let event = ChainEvent::NewBestBlock { hash: b1_header.hash(), tree_route: None };
+ block_on(pool.maintain(event));
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_alice_watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((b1_header.hash(), 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((b1_header.hash(), 0))));
+ assert_eq!(stream.next(), None);
+ }
+
+ {
+ let mut stream = futures::executor::block_on_stream(from_bob_watcher);
+ assert_eq!(stream.next(), Some(TransactionStatus::Ready));
+ assert_eq!(stream.next(), Some(TransactionStatus::InBlock((c1_header.hash(), 0))));
+ assert_eq!(stream.next(), Some(TransactionStatus::Finalized((c1_header.hash(), 0))));
+ assert_eq!(stream.next(), None);
+ }
+}
diff --git a/crates/node/Cargo.toml b/crates/node/Cargo.toml
index fdbf6fa9d7..e18a9d7e09 100644
--- a/crates/node/Cargo.toml
+++ b/crates/node/Cargo.toml
@@ -75,6 +75,8 @@ frame-benchmarking-cli = { workspace = true }
blockifier = { workspace = true }
hex = { workspace = true }
madara-runtime = { workspace = true }
+mc-block-proposer = { workspace = true }
+mc-commitment-state-diff = { workspace = true }
mc-data-availability = { workspace = true }
mc-block-proposer = { workspace = true }
mc-db = { workspace = true }
@@ -94,7 +96,9 @@ mp-sequencer-address = { workspace = true, features = ["client"] }
# CLI-specific dependencies
try-runtime-cli = { optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
+reqwest = { workspace = true }
serde_json = { workspace = true }
+url = { workspace = true }
[build-dependencies]
substrate-build-script-utils = { workspace = true }
@@ -111,3 +115,6 @@ runtime-benchmarks = [
# in the near future.
try-runtime = ["madara-runtime/try-runtime", "try-runtime-cli/try-runtime"]
disable-transaction-fee = ["madara-runtime/disable-transaction-fee"]
+# Load sharingan chain-specs during the compilation
+# This is the way to run a sharingan chain
+sharingan = []
diff --git a/crates/node/src/chain_spec.rs b/crates/node/src/chain_spec.rs
index 4b7e1b43b8..6ff7d0693f 100644
--- a/crates/node/src/chain_spec.rs
+++ b/crates/node/src/chain_spec.rs
@@ -1,10 +1,9 @@
use std::path::PathBuf;
-use madara_runtime::{AuraConfig, EnableManualSeal, GenesisConfig, GrandpaConfig, SystemConfig, WASM_BINARY};
+use madara_runtime::{AuraConfig, GenesisConfig, GrandpaConfig, SealingMode, SystemConfig, WASM_BINARY};
use mp_felt::Felt252Wrapper;
-use pallet_starknet::genesis_loader::{GenesisLoader, HexFelt};
-use pallet_starknet::utils;
-use sc_service::ChainType;
+use pallet_starknet::genesis_loader::{GenesisData, GenesisLoader, HexFelt};
+use sc_service::{BasePath, ChainType};
use serde::{Deserialize, Serialize};
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
use sp_consensus_grandpa::AuthorityId as GrandpaId;
@@ -12,6 +11,11 @@ use sp_core::storage::Storage;
use sp_core::{Pair, Public};
use sp_state_machine::BasicExternalities;
+use crate::constants::DEV_CHAIN_ID;
+
+pub const GENESIS_ASSETS_DIR: &str = "genesis-assets/";
+pub const GENESIS_ASSETS_FILE: &str = "genesis.json";
+
/// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
pub type ChainSpec = sc_service::GenericChainSpec;
@@ -23,18 +27,19 @@ pub type DevChainSpec = sc_service::GenericChainSpec;
pub struct DevGenesisExt {
/// Genesis config.
genesis_config: GenesisConfig,
- /// The flag that if enable manual-seal mode.
- enable_manual_seal: Option,
+ /// The sealing mode being used.
+ sealing: SealingMode,
}
-/// If enable_manual_seal is true, then the runtime storage variable EnableManualSeal will be set to
-/// true. This is just a common way to pass information from the chain spec to the runtime.
+/// The `sealing` from the `DevGenesisExt` is passed to the runtime via the storage. The runtime
+/// can then use this information to adjust accordingly. This is just a common way to pass
+/// information from the chain spec to the runtime.
+///
+/// NOTE: if `sealing` is `None`, then the runtime will use the default sealing mode.
impl sp_runtime::BuildStorage for DevGenesisExt {
fn assimilate_storage(&self, storage: &mut Storage) -> Result<(), String> {
BasicExternalities::execute_with_storage(storage, || {
- if let Some(enable_manual_seal) = &self.enable_manual_seal {
- EnableManualSeal::set(enable_manual_seal);
- }
+ madara_runtime::Sealing::set(&self.sealing);
});
self.genesis_config.assimilate_storage(storage)
}
@@ -50,29 +55,31 @@ pub fn authority_keys_from_seed(s: &str) -> (AuraId, GrandpaId) {
(get_from_seed::(s), get_from_seed::(s))
}
-pub fn development_config(enable_manual_seal: Option, madara_path: PathBuf) -> Result {
+pub fn development_config(sealing: SealingMode, base_path: BasePath) -> Result {
let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;
- let genesis_loader = load_genesis(madara_path);
+ let chain_id = DEV_CHAIN_ID;
Ok(DevChainSpec::from_genesis(
// Name
"Development",
// ID
- "dev",
+ chain_id,
ChainType::Development,
move || {
+ let genesis_loader = load_genesis(base_path.config_dir(chain_id));
+
// Logging the development account
print_development_accounts(&genesis_loader);
DevGenesisExt {
genesis_config: testnet_genesis(
- genesis_loader.clone(),
+ genesis_loader,
wasm_binary,
// Initial PoA authorities
vec![authority_keys_from_seed("Alice")],
true,
),
- enable_manual_seal,
+ sealing: sealing.clone(),
}
},
// Bootnodes
@@ -93,10 +100,11 @@ pub fn development_config(enable_manual_seal: Option, madara_path: PathBuf
// accounts with addresses 0x1 and 0x4 are NO VALIDATE accounts (don't require PK)
// accounts with addresses 0x2 and 0x3 have the same PK
pub fn print_development_accounts(genesis_loader: &GenesisLoader) {
- let no_validate_account_address = genesis_loader.contracts[0].0.0;
- let argent_account_address = genesis_loader.contracts[1].0.0;
- let oz_account_address = genesis_loader.contracts[2].0.0;
- let cairo_1_no_validate_account_address = genesis_loader.contracts[3].0.0;
+ // TODO: this is only true by luck. It's not enforced by anything
+ let no_validate_account_address = genesis_loader.data().contracts[0].0.0;
+ let argent_account_address = genesis_loader.data().contracts[1].0.0;
+ let oz_account_address = genesis_loader.data().contracts[2].0.0;
+ let cairo_1_no_validate_account_address = genesis_loader.data().contracts[3].0.0;
let argent_pk: HexFelt =
Felt252Wrapper::from_hex_be("0x00c1cf1490de1352865301bb8705143f3ef938f97fdf892f1090dcb5ac7bcd1d")
@@ -109,19 +117,20 @@ pub fn print_development_accounts(genesis_loader: &GenesisLoader) {
log::info!("🧪 CAIRO 1 with address: {cairo_1_no_validate_account_address:#x} and no pk");
}
-pub fn local_testnet_config(madara_path: PathBuf) -> Result {
+pub fn local_testnet_config(base_path: BasePath, chain_id: &str) -> Result {
let wasm_binary = WASM_BINARY.ok_or_else(|| "Development wasm not available".to_string())?;
- let genesis_loader = load_genesis(madara_path);
+
+ let owned_chain_id = chain_id.to_owned();
Ok(ChainSpec::from_genesis(
// Name
"Local Testnet",
// ID
- "local_testnet",
+ chain_id,
ChainType::Local,
move || {
testnet_genesis(
- genesis_loader.clone(),
+ load_genesis(base_path.config_dir(&owned_chain_id)),
wasm_binary,
// Initial PoA authorities
// Intended to be only 2
@@ -143,14 +152,13 @@ pub fn local_testnet_config(madara_path: PathBuf) -> Result {
))
}
-fn load_genesis(madara_path: PathBuf) -> GenesisLoader {
- let madara_path = madara_path.to_str().unwrap().to_string();
- let genesis_path = madara_path.clone() + "/configs/genesis-assets/genesis.json";
- let genesis = utils::read_file_to_string(genesis_path)
+fn load_genesis(data_path: PathBuf) -> GenesisLoader {
+ let genesis_path = data_path.join(GENESIS_ASSETS_DIR).join(GENESIS_ASSETS_FILE);
+ let genesis_file_content = std::fs::read_to_string(genesis_path)
.expect("Failed to read genesis file. Please run `madara setup` before opening an issue.");
- let mut genesis_loader: GenesisLoader = serde_json::from_str(&genesis).expect("Failed loading genesis");
- genesis_loader.set_madara_path(madara_path);
- genesis_loader
+ let genesis_data: GenesisData = serde_json::from_str(&genesis_file_content).expect("Failed loading genesis");
+
+ GenesisLoader::new(data_path, genesis_data)
}
/// Configure initial storage state for FRAME modules.
diff --git a/crates/node/src/cli.rs b/crates/node/src/cli.rs
index 732c818768..6bda3c781b 100644
--- a/crates/node/src/cli.rs
+++ b/crates/node/src/cli.rs
@@ -1,76 +1,12 @@
-use std::path::PathBuf;
-
-use mc_data_availability::DaLayer;
-use sc_cli::RunCmd;
-
-use crate::constants;
-
-/// Returns the `madara_path` default value ($HOME/.madara) as a string
-fn get_default_madara_path() -> String {
- let home_path = std::env::var("HOME").unwrap_or(std::env::var("USERPROFILE").unwrap_or(".".into()));
- format!("{}/.madara", home_path)
-}
-
-/// Available Sealing methods.
-#[derive(Debug, Copy, Clone, clap::ValueEnum, Default)]
-pub enum Sealing {
- // Seal using rpc method.
- #[default]
- Manual,
- // Seal when transaction is executed.
- Instant,
-}
-
-/// Available testnets.
-#[derive(Debug, Copy, Clone, PartialEq, clap::ValueEnum)]
-pub enum Testnet {
- Sharingan,
-}
+use crate::commands::{ExtendedRunCmd, SetupCmd};
#[derive(Debug, clap::Parser)]
pub struct Cli {
#[command(subcommand)]
pub subcommand: Option,
- /// Path to the folder where all configuration files and data are stored
- /// base_path will always be overwritten by madara_path
- /// in the case you use the --tmp, the base_path will be changed during the runtime
- #[clap(global = true, long, default_value = get_default_madara_path())]
- pub madara_path: Option,
-
- /// Choose sealing method.
- #[clap(global = true, long, value_enum, ignore_case = true)]
- pub sealing: Option,
-}
-
-#[derive(Clone, Debug, clap::Args)]
-pub struct ExtendedRunCmd {
#[clap(flatten)]
- pub run_cmd: RunCmd,
-
- /// Choose a supported DA Layer
- #[clap(long)]
- pub da_layer: Option,
-
- /// Load a custom chain-spec from an url
- /// If you want to load a chain spec that is present in your filesystem, use `--chain=`
- #[clap(long, conflicts_with = "testnet")]
- pub fetch_chain_spec: Option,
-
- /// Choose a supported testnet chain which will load some default values
- /// The testnets will allways be fetched when this flag is passed to search for updates
- #[clap(long, conflicts_with = "fetch_chain_spec", conflicts_with = "chain")]
- pub testnet: Option,
-}
-
-#[derive(Debug, clap::Args)]
-pub struct SetupCmd {
- /// Load a index.json file for downloading assets
- /// The index.json must follow the format of the official index.json
- /// (https://github.com/keep-starknet-strange/madara/blob/main/configs/index.json)
- /// Where the `md5` and `url` fields are optional
- #[clap(long, default_value = constants::DEFAULT_CONFIGS_URL)]
- pub fetch_madara_configs: Option,
+ pub run: ExtendedRunCmd,
}
#[allow(clippy::large_enum_variant)]
@@ -108,10 +44,7 @@ pub enum Subcommand {
/// Revert the chain to a previous state.
Revert(sc_cli::RevertCmd),
- // Run madara node
- Run(ExtendedRunCmd),
-
- // Setup madara node
+ /// Setup madara node
Setup(SetupCmd),
/// Try some command against runtime state.
diff --git a/crates/node/src/command.rs b/crates/node/src/command.rs
index 5bf981e9cc..9bad7ddb3a 100644
--- a/crates/node/src/command.rs
+++ b/crates/node/src/command.rs
@@ -1,14 +1,15 @@
-use std::path::PathBuf;
-
use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE};
use madara_runtime::Block;
-use mc_data_availability::DaLayer;
-use pallet_starknet::utils;
-use sc_cli::{ChainSpec, RpcMethods, RuntimeVersion, SubstrateCli};
+use sc_cli::{ChainSpec, RuntimeVersion, SubstrateCli};
use crate::benchmarking::{inherent_benchmark_data, RemarkBuilder};
-use crate::cli::{Cli, ExtendedRunCmd, SetupCmd, Subcommand, Testnet};
-use crate::{chain_spec, configs, constants, service};
+use crate::cli::{Cli, Subcommand};
+use crate::commands::run_node;
+use crate::constants::DEV_CHAIN_ID;
+#[cfg(feature = "sharingan")]
+use crate::constants::SHARINGAN_CHAIN_ID;
+use crate::{chain_spec, service};
+
impl SubstrateCli for Cli {
fn impl_name() -> String {
"Madara Node".into()
@@ -34,19 +35,22 @@ impl SubstrateCli for Cli {
2017
}
- fn load_spec(&self, id: &str) -> Result, String> {
+ fn load_spec(&self, id: &str) -> Result, String> {
Ok(match id {
- "dev" => {
- let enable_manual_seal = self.sealing.map(|_| true);
- Box::new(chain_spec::development_config(
- enable_manual_seal,
- self.madara_path.clone().expect("`madara_path` expected to be set with clap default value"),
- )?)
+ DEV_CHAIN_ID => {
+ let sealing = self.run.sealing.map(Into::into).unwrap_or_default();
+ let base_path = self.run.base_path().map_err(|e| e.to_string())?;
+ Box::new(chain_spec::development_config(sealing, base_path)?)
}
- "" | "local" | "madara-local" => Box::new(chain_spec::local_testnet_config(
- self.madara_path.clone().expect("`madara_path` expected to be set with clap default value"),
+ #[cfg(feature = "sharingan")]
+ SHARINGAN_CHAIN_ID => Box::new(chain_spec::ChainSpec::from_json_bytes(
+ &include_bytes!("../../../configs/chain-specs/testnet-sharingan-raw.json")[..],
)?),
- path => Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path))?),
+ "" | "local" | "madara-local" => {
+ let base_path = self.run.base_path().map_err(|e| e.to_string())?;
+ Box::new(chain_spec::local_testnet_config(base_path, id)?)
+ }
+ path_or_url => Box::new(chain_spec::ChainSpec::from_json_file(std::path::PathBuf::from(path_or_url))?),
})
}
@@ -55,107 +59,9 @@ impl SubstrateCli for Cli {
}
}
-fn get_madara_path_string(madara_path: &Option) -> String {
- madara_path
- .clone()
- .expect("`madara_path` expected to be set with clap default value")
- .into_os_string()
- .into_string()
- .expect("Failed to convert `madara_path` to string")
-}
-
-fn set_dev_environment(cmd: &mut ExtendedRunCmd) {
- // create a reproducible dev environment
- cmd.run_cmd.shared_params.dev = false;
- cmd.run_cmd.shared_params.chain = Some("dev".to_string());
-
- cmd.run_cmd.force_authoring = true;
- cmd.run_cmd.alice = true;
-
- // we can't set `--rpc-cors=all`, so it needs to be set manually if we want to connect with external
- // hosts
- cmd.run_cmd.rpc_external = true;
- cmd.run_cmd.rpc_methods = RpcMethods::Unsafe;
-}
-
-fn try_set_testnet(madara_path: &Option, cmd: &mut ExtendedRunCmd) -> Result<(), String> {
- // checks if it should retrieve and enable a specific chain-spec
- let madara_path = get_madara_path_string(madara_path);
- let local_path = utils::get_project_path();
-
- if cmd.testnet == Some(Testnet::Sharingan) {
- if let Ok(ref src_path) = local_path {
- let src_path = src_path.clone() + "/configs/chain-specs/testnet-sharingan-raw.json";
- utils::copy_from_filesystem(src_path, madara_path.clone() + "/chain-specs")?;
- cmd.run_cmd.shared_params.chain = Some(madara_path + "/chain-specs/testnet-sharingan-raw.json");
- } else {
- utils::fetch_from_url(
- constants::SHARINGAN_CHAIN_SPEC_URL.to_string(),
- madara_path.clone() + "/configs/chain-specs/",
- )?;
- cmd.run_cmd.shared_params.chain = Some(madara_path + "/chain-specs/testnet-sharingan-raw.json");
- }
- }
-
- if cmd.run_cmd.shared_params.chain.is_some() {
- cmd.run_cmd.rpc_external = true;
- cmd.run_cmd.rpc_methods = RpcMethods::Unsafe;
- }
-
- Ok(())
-}
-
-fn set_chain_spec(madara_path: &Option, cmd: &mut ExtendedRunCmd) -> Result<(), String> {
- let madara_path = get_madara_path_string(madara_path);
- let chain_spec_url = cmd
- .fetch_chain_spec
- .clone()
- .expect("`chain_spec_url` expected to be set because the function is called upon verification");
- utils::fetch_from_url(chain_spec_url.clone(), madara_path.clone() + "/chain-specs")?;
- let chain_spec =
- chain_spec_url.split('/').last().expect("Failed to get chain spec file name from `chain_spec_url`");
- cmd.run_cmd.shared_params.chain = Some(madara_path + "/chain-specs/" + chain_spec);
-
- Ok(())
-}
-
-fn fetch_madara_configs(madara_path: &Option, cmd: &SetupCmd) -> Result<(), String> {
- let madara_path = get_madara_path_string(madara_path);
- let local_path = utils::get_project_path();
-
- if let Ok(ref src_path) = local_path {
- let index_path = src_path.clone() + "/configs/index.json";
- utils::copy_from_filesystem(index_path, madara_path.clone() + "/configs")?;
-
- let madara_configs: configs::Configs =
- serde_json::from_str(&utils::read_file_to_string(madara_path.clone() + "/configs/index.json")?)
- .expect("Failed to serialize index.json string to json");
- for asset in madara_configs.genesis_assets {
- let src_path = src_path.clone() + "/configs/genesis-assets/" + &asset.name;
- utils::copy_from_filesystem(src_path, madara_path.clone() + "/configs/genesis-assets")?;
- }
- } else if let Some(configs_url) = &cmd.fetch_madara_configs {
- utils::fetch_from_url(configs_url.to_string(), madara_path.clone() + "/configs")?;
-
- let madara_configs: configs::Configs =
- serde_json::from_str(&utils::read_file_to_string(madara_path.clone() + "/configs/index.json")?)
- .expect("Failed to serialize index.json string to json");
-
- for asset in madara_configs.genesis_assets {
- configs::fetch_and_validate_file(
- madara_configs.remote_base_path.clone(),
- asset,
- madara_path.clone() + "/configs/genesis-assets/",
- )?;
- }
- }
-
- Ok(())
-}
-
/// Parse and run command line arguments
pub fn run() -> sc_cli::Result<()> {
- let mut cli = Cli::from_args();
+ let cli = Cli::from_args();
match cli.subcommand {
Some(Subcommand::Key(ref cmd)) => cmd.run(&cli),
@@ -166,28 +72,28 @@ pub fn run() -> sc_cli::Result<()> {
Some(Subcommand::CheckBlock(ref cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.async_run(|mut config| {
- let (client, _, import_queue, task_manager, _) = service::new_chain_ops(&mut config)?;
+ let (client, _, import_queue, task_manager, _) = service::new_chain_ops(&mut config, cli.run.cache)?;
Ok((cmd.run(client, import_queue), task_manager))
})
}
Some(Subcommand::ExportBlocks(ref cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.async_run(|mut config| {
- let (client, _, _, task_manager, _) = service::new_chain_ops(&mut config)?;
+ let (client, _, _, task_manager, _) = service::new_chain_ops(&mut config, cli.run.cache)?;
Ok((cmd.run(client, config.database), task_manager))
})
}
Some(Subcommand::ExportState(ref cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.async_run(|mut config| {
- let (client, _, _, task_manager, _) = service::new_chain_ops(&mut config)?;
+ let (client, _, _, task_manager, _) = service::new_chain_ops(&mut config, cli.run.cache)?;
Ok((cmd.run(client, config.chain_spec), task_manager))
})
}
Some(Subcommand::ImportBlocks(ref cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.async_run(|mut config| {
- let (client, _, import_queue, task_manager, _) = service::new_chain_ops(&mut config)?;
+ let (client, _, import_queue, task_manager, _) = service::new_chain_ops(&mut config, cli.run.cache)?;
Ok((cmd.run(client, import_queue), task_manager))
})
}
@@ -198,7 +104,7 @@ pub fn run() -> sc_cli::Result<()> {
Some(Subcommand::Revert(ref cmd)) => {
let runner = cli.create_runner(cmd)?;
runner.async_run(|mut config| {
- let (client, backend, _, task_manager, _) = service::new_chain_ops(&mut config)?;
+ let (client, backend, _, task_manager, _) = service::new_chain_ops(&mut config, cli.run.cache)?;
let aux_revert = Box::new(|client, _, blocks| {
sc_consensus_grandpa::revert(client, blocks)?;
Ok(())
@@ -223,7 +129,7 @@ pub fn run() -> sc_cli::Result<()> {
cmd.run::(config)
}
BenchmarkCmd::Block(cmd) => {
- let (client, _, _, _, _) = service::new_chain_ops(&mut config)?;
+ let (client, _, _, _, _) = service::new_chain_ops(&mut config, cli.run.cache)?;
cmd.run(client)
}
#[cfg(not(feature = "runtime-benchmarks"))]
@@ -239,13 +145,13 @@ pub fn run() -> sc_cli::Result<()> {
cmd.run(config, client, db, storage)
}
BenchmarkCmd::Overhead(cmd) => {
- let (client, _, _, _, _) = service::new_chain_ops(&mut config)?;
+ let (client, _, _, _, _) = service::new_chain_ops(&mut config, cli.run.cache)?;
let ext_builder = RemarkBuilder::new(client.clone());
cmd.run(config, client, inherent_benchmark_data()?, Vec::new(), &ext_builder)
}
BenchmarkCmd::Extrinsic(cmd) => {
- let (client, _, _, _, _) = service::new_chain_ops(&mut config)?;
+ let (client, _, _, _, _) = service::new_chain_ops(&mut config, cli.run.cache)?;
// Register the *Remark* builder.
let ext_factory = ExtrinsicFactory(vec![Box::new(RemarkBuilder::new(client.clone()))]);
@@ -275,57 +181,7 @@ pub fn run() -> sc_cli::Result<()> {
let runner = cli.create_runner(cmd)?;
runner.sync_run(|config| cmd.run::(&config))
}
- Some(Subcommand::Run(ref mut cmd)) => {
- cmd.run_cmd.shared_params.base_path = cli.madara_path.clone();
- let madara_path = get_madara_path_string(&cli.madara_path);
-
- // Set the node_key_file for substrate in the case that it was not manually setted
- if cmd.run_cmd.network_params.node_key_params.node_key_file.is_none() {
- cmd.run_cmd.network_params.node_key_params.node_key_file =
- Some((madara_path.clone() + "/p2p-key.ed25519").into());
- }
-
- if cmd.run_cmd.shared_params.dev {
- set_dev_environment(cmd);
- }
-
- if cmd.fetch_chain_spec.is_some() {
- set_chain_spec(&cli.madara_path, cmd)?;
- }
-
- if cmd.testnet.is_some() {
- try_set_testnet(&cli.madara_path, cmd)?;
- }
-
- let da_config: Option<(DaLayer, PathBuf)> = match cmd.da_layer {
- Some(da_layer) => {
- let da_path = std::path::PathBuf::from(madara_path.clone() + "/da-config.json");
- if !da_path.exists() {
- log::info!("{} does not contain DA config", madara_path);
- return Err("DA config not available".into());
- }
-
- Some((da_layer, da_path))
- }
- None => {
- log::info!("Madara initialized w/o DA layer");
- None
- }
- };
-
- // pre assign variables because of cmd mutable borrow
- let run_cmd: sc_cli::RunCmd = cmd.run_cmd.clone();
- let sealing = cli.sealing;
-
- let runner = cli.create_runner(&run_cmd)?;
- runner.run_node_until_exit(|config| async move {
- service::new_full(config, sealing, da_config).map_err(sc_cli::Error::Service)
- })
- }
- Some(Subcommand::Setup(cmd)) => {
- fetch_madara_configs(&cli.madara_path, &cmd)?;
- Ok(())
- }
- _ => Err("You need to specify some subcommand. E.g. `madara run`".into()),
+ Some(Subcommand::Setup(ref cmd)) => cmd.run(),
+ None => run_node(cli),
}
}
diff --git a/crates/node/src/commands/mod.rs b/crates/node/src/commands/mod.rs
new file mode 100644
index 0000000000..4d63d52db8
--- /dev/null
+++ b/crates/node/src/commands/mod.rs
@@ -0,0 +1,5 @@
+mod run;
+mod setup;
+
+pub use run::*;
+pub use setup::*;
diff --git a/crates/node/src/commands/run.rs b/crates/node/src/commands/run.rs
new file mode 100644
index 0000000000..f4549ceba7
--- /dev/null
+++ b/crates/node/src/commands/run.rs
@@ -0,0 +1,110 @@
+use std::path::PathBuf;
+
+use madara_runtime::SealingMode;
+use mc_data_availability::DaLayer;
+use sc_cli::{Result, RpcMethods, RunCmd, SubstrateCli};
+use sc_service::BasePath;
+use serde::{Deserialize, Serialize};
+
+use crate::cli::Cli;
+use crate::service;
+
+/// Available Sealing methods.
+#[derive(Debug, Copy, Clone, clap::ValueEnum, Default, Serialize, Deserialize)]
+pub enum Sealing {
+ /// Seal using rpc method.
+ #[default]
+ Manual,
+ /// Seal when transaction is executed. This mode does not finalize blocks, if you want to
+ /// finalize blocks use `--sealing=instant-finality`.
+ Instant,
+ /// Seal when transaction is executed with finalization.
+ InstantFinality,
+}
+
+impl From for SealingMode {
+ fn from(value: Sealing) -> Self {
+ match value {
+ Sealing::Manual => SealingMode::Manual,
+ Sealing::Instant => SealingMode::Instant { finalize: false },
+ Sealing::InstantFinality => SealingMode::Instant { finalize: true },
+ }
+ }
+}
+
+#[derive(Clone, Debug, clap::Args)]
+pub struct ExtendedRunCmd {
+ #[clap(flatten)]
+ pub base: RunCmd,
+
+ /// Choose sealing method.
+ #[clap(long, value_enum, ignore_case = true)]
+ pub sealing: Option,
+
+ /// Choose a supported DA Layer
+ #[clap(long)]
+ pub da_layer: Option,
+
+ /// When enabled, more information about the blocks and their transaction is cached and stored
+ /// in the database.
+ ///
+ /// This may improve response times for RPCs that require that information, but it also
+ /// increases the memory footprint of the node.
+ #[clap(long)]
+ pub cache: bool,
+}
+
+impl ExtendedRunCmd {
+ pub fn base_path(&self) -> Result {
+ Ok(self
+ .base
+ .shared_params
+ .base_path()?
+ .unwrap_or_else(|| BasePath::from_project("", "", &::executable_name())))
+ }
+}
+
+pub fn run_node(mut cli: Cli) -> Result<()> {
+ if cli.run.base.shared_params.dev {
+ override_dev_environment(&mut cli.run);
+ }
+ let runner = cli.create_runner(&cli.run.base)?;
+ let data_path = &runner.config().data_path;
+
+ let da_config: Option<(DaLayer, PathBuf)> = match cli.run.da_layer {
+ Some(da_layer) => {
+ let da_path = data_path.join("da-config.json");
+ if !da_path.exists() {
+ log::info!("{} does not contain DA config", da_path.display());
+ return Err("DA config not available".into());
+ }
+
+ Some((da_layer, da_path))
+ }
+ None => {
+ log::info!("Madara initialized w/o DA layer");
+ None
+ }
+ };
+ runner.run_node_until_exit(|config| async move {
+ let sealing = cli.run.sealing.map(Into::into).unwrap_or_default();
+ let cache = cli.run.cache;
+ service::new_full(config, sealing, da_config, cache).map_err(sc_cli::Error::Service)
+ })
+}
+
+fn override_dev_environment(cmd: &mut ExtendedRunCmd) {
+ // create a reproducible dev environment
+ // by disabling the default substrate `dev` behaviour
+ cmd.base.shared_params.dev = false;
+ cmd.base.shared_params.chain = Some("dev".to_string());
+
+ cmd.base.force_authoring = true;
+ cmd.base.alice = true;
+ cmd.base.tmp = true;
+
+ // we can't set `--rpc-cors=all`, so it needs to be set manually if we want to connect with external
+ // hosts
+ cmd.base.rpc_external = true;
+ cmd.base.rpc_methods = RpcMethods::Unsafe;
+}
diff --git a/crates/node/src/commands/setup.rs b/crates/node/src/commands/setup.rs
new file mode 100644
index 0000000000..b1a925a80b
--- /dev/null
+++ b/crates/node/src/commands/setup.rs
@@ -0,0 +1,182 @@
+use std::path::{Path, PathBuf};
+
+use sc_cli::{Error, Result, SubstrateCli};
+use sc_service::BasePath;
+use url::Url;
+
+use crate::chain_spec::GENESIS_ASSETS_DIR;
+use crate::cli::Cli;
+use crate::configs::FileInfos;
+use crate::{configs, constants};
+
+/// Define a way to retrieve an index.json file
+
+/// The index.json must follow the format of the official index.json
+/// (https://github.com/keep-starknet-strange/madara/blob/main/configs/index.json)
+/// Where the `md5` and `url` fields are optional
+#[derive(Debug, clap::Args)]
+#[group(required = true, multiple = false)]
+pub struct SetupSource {
+ /// Download an index.json file for an url
+ #[clap(
+ long,
+ conflicts_with="from_local",
+ value_hint=clap::ValueHint::Url,
+ // This combination of properties allow us to use a default value only if the arg is passed without value.
+ // If it is not passed at all, no default value is used.
+ // See: https://docs.rs/clap/latest/clap/struct.Arg.html#method.default_missing_value
+ num_args = 0..=1, require_equals=true, default_missing_value = Some(constants::DEFAULT_CONFIGS_URL)
+ )]
+ pub from_remote: Option,
+
+ /// Copy an index.json file for an url
+ #[clap(long, conflicts_with = "from_remote")]
+ pub from_local: Option,
+}
+
+#[derive(Debug, clap::Args)]
+pub struct SetupCmd {
+ #[arg(long, value_name = "CHAIN_SPEC")]
+ pub chain: Option,
+
+ /// Specify custom base path.
+ #[arg(long, short = 'd', value_name = "PATH")]
+ pub base_path: Option,
+
+ #[clap(flatten)]
+ pub source: SetupSource,
+}
+
+impl SetupCmd {
+ fn chain_id(&self) -> String {
+ match self.chain {
+ Some(ref chain) => chain.clone(),
+ None => "".into(),
+ }
+ }
+
+ fn base_path(&self) -> Option {
+ self.base_path.as_ref().map(|bp| BasePath::from(bp.clone()))
+ }
+}
+
+impl SetupCmd {
+ pub fn run(&self) -> Result<()> {
+ log::info!("setup cmd: {:?}", self);
+ let dest_config_dir_path = {
+ let chain_id = self.chain_id();
+ let base_path = self.base_path().unwrap_or_else(|| BasePath::from_project("", "", &Cli::executable_name()));
+ base_path.config_dir(&chain_id)
+ };
+ log::info!("Setting up madara config at '{}'", dest_config_dir_path.display());
+
+ // Load config from disk
+ if let Some(src_configs_dir_path) = &self.source.from_local {
+ // Build the source file path
+ let src_configs_dir_path = PathBuf::from(src_configs_dir_path);
+ let index_file_path = src_configs_dir_path.join("index.json");
+
+ // Read, deserialize and copy it
+ let madara_configs = {
+ let src_file_content =
+ std::fs::read_to_string(index_file_path).map_err(|e| Error::Application(Box::new(e)))?;
+ // Make sure content is valid before writing it to disk
+ let configs_content: configs::Configs = serde_json::from_str(&src_file_content)
+ .map_err(|e| Error::Input(format!("invalid `index.json` content: {}", e)))?;
+ write_content_to_disk(src_file_content, dest_config_dir_path.join("index.json").as_path())?;
+
+ configs_content
+ };
+
+ // Copy each asset
+ for asset in madara_configs.genesis_assets {
+ copy_file(
+ &src_configs_dir_path.join(GENESIS_ASSETS_DIR).join(asset.name),
+ &dest_config_dir_path.join(GENESIS_ASSETS_DIR),
+ )?;
+ }
+ // Load config form a remote server
+ } else if let Some(configs_url) = &self.source.from_remote {
+ // Build the source url
+ let configs_url = Url::parse(configs_url)
+ .map_err(|e| Error::Input(format!("invalid input for 'fetch_madara_configs': {}", e)))?;
+ println!("Fetching chain config from '{}'", &configs_url);
+
+ // Query, deserialize and copy it
+ let madara_configs = {
+ let response = reqwest::blocking::get(configs_url).map_err(|e| Error::Application(Box::new(e)))?;
+ let bytes = response.bytes().map_err(|e| Error::Application(Box::new(e)))?;
+ // Make sure content is valid before writing it to disk
+ let configs_content: configs::Configs =
+ serde_json::from_slice(&bytes[..]).map_err(|e| Error::Application(Box::new(e)))?;
+ write_content_to_disk(bytes, dest_config_dir_path.join("index.json").as_path())?;
+
+ configs_content
+ };
+
+ // Query and copy each asset
+ let base_url = Url::parse(&madara_configs.remote_base_path).map_err(|e| Error::Application(Box::new(e)))?;
+ for asset in madara_configs.genesis_assets {
+ fetch_and_validate_genesis_assets(&base_url, asset, &dest_config_dir_path)?;
+ }
+ } else {
+ unreachable!(
+ "clap::Args is derived upon `SetupSource` in a way that guarantee that either `from_remote` or \
+ `from_local` is present"
+ );
+ }
+
+ Ok(())
+ }
+}
+
+fn write_content_to_disk>(config_content: T, dest_config_file_path: &Path) -> Result<()> {
+ std::fs::create_dir_all(
+ dest_config_file_path.parent().expect("dest_config_file_path should be the path to a file, not a dict"),
+ )?;
+ let mut dest_file = std::fs::File::create(dest_config_file_path)?;
+ let mut reader = std::io::Cursor::new(config_content);
+ std::io::copy(&mut reader, &mut dest_file)?;
+
+ Ok(())
+}
+
+fn copy_file(src_path: &Path, dest_dir_path: &PathBuf) -> Result<()> {
+ if !src_path.exists() {
+ return Err(format!("Source file '{}' does not exist", src_path.display()).into());
+ }
+
+ std::fs::create_dir_all(dest_dir_path)?;
+ let dest_file_path = dest_dir_path.join(src_path.file_name().ok_or("File name not found")?);
+ std::fs::copy(src_path, dest_file_path)?;
+
+ Ok(())
+}
+
+fn fetch_and_validate_genesis_assets(base_remote_url: &Url, file: FileInfos, base_path: &Path) -> Result<()> {
+ let full_url = base_remote_url
+ .join(GENESIS_ASSETS_DIR)
+ .map_err(|e| Error::Application(Box::new(e)))?
+ .join(&file.name)
+ .map_err(|e| Error::Application(Box::new(e)))?;
+ println!("Fetching '{}'", &full_url);
+ let dest_path = base_path.join(GENESIS_ASSETS_DIR);
+
+ // Copy
+ let file_as_bytes = {
+ let response = reqwest::blocking::get(full_url.clone()).map_err(|e| Error::Application(Box::new(e)))?;
+ let bytes = response.bytes().map_err(|e| Error::Application(Box::new(e)))?;
+ write_content_to_disk(&bytes, &dest_path.join(file.name))?;
+ bytes
+ };
+
+ if let Some(file_hash) = file.md5 {
+ let digest = md5::compute(file_as_bytes);
+ let hash = format!("{:x}", digest);
+ if hash != file_hash {
+ return Err(Error::Input(format!("Hash mismatch for file '{}': {} != {}", full_url, hash, file_hash)));
+ }
+ }
+
+ Ok(())
+}
diff --git a/crates/node/src/configs.rs b/crates/node/src/configs.rs
index 190e6d0732..f228d65f8a 100644
--- a/crates/node/src/configs.rs
+++ b/crates/node/src/configs.rs
@@ -1,35 +1,14 @@
-use pallet_starknet::utils;
use serde::Deserialize;
#[derive(Deserialize)]
pub struct Configs {
pub remote_base_path: String,
- pub genesis_assets: Vec,
+ pub genesis_assets: Vec,
}
#[derive(Deserialize)]
-pub struct File {
+pub struct FileInfos {
pub name: String,
pub md5: Option,
pub url: Option,
}
-
-pub fn fetch_and_validate_file(remote_base_path: String, file: File, dest_path: String) -> Result<(), String> {
- let full_url = file.url.unwrap_or_else(|| {
- remote_base_path
- + &dest_path.split("configs/").collect::>()[1].split('/').collect::>().join("/")
- + &file.name
- });
- utils::fetch_from_url(full_url, dest_path.clone())?;
-
- if let Some(file_hash) = file.md5 {
- let file_str = utils::read_file_to_string(dest_path + &file.name)?;
- let digest = md5::compute(file_str.as_bytes());
- let hash = format!("{:x}", digest);
- if hash != file_hash {
- return Err(format!("File hash mismatch: {} != {}", hash, file_hash));
- }
- }
-
- Ok(())
-}
diff --git a/crates/node/src/constants.rs b/crates/node/src/constants.rs
index 96b7255325..1034bbe161 100644
--- a/crates/node/src/constants.rs
+++ b/crates/node/src/constants.rs
@@ -1,4 +1,7 @@
pub const DEFAULT_CONFIGS_URL: &str =
"https://raw.githubusercontent.com/keep-starknet-strange/madara/main/configs/index.json";
-pub const SHARINGAN_CHAIN_SPEC_URL: &str = "https://raw.githubusercontent.com/keep-starknet-strange/madara/main/configs/chain-specs/testnet-sharingan-raw.json";
+pub const DEV_CHAIN_ID: &str = "dev";
+
+#[cfg(feature = "sharingan")]
+pub const SHARINGAN_CHAIN_ID: &str = "sharingan";
diff --git a/crates/node/src/main.rs b/crates/node/src/main.rs
index e996a0b812..58bd3ee0ae 100644
--- a/crates/node/src/main.rs
+++ b/crates/node/src/main.rs
@@ -7,6 +7,7 @@ mod benchmarking;
mod chain_spec;
mod cli;
mod command;
+mod commands;
mod configs;
mod constants;
mod genesis_block;
diff --git a/crates/node/src/service.rs b/crates/node/src/service.rs
index dda02391e0..ab428577ee 100644
--- a/crates/node/src/service.rs
+++ b/crates/node/src/service.rs
@@ -1,17 +1,18 @@
//! Service and ServiceFactory implementation. Specialized wrapper over substrate service.
use std::cell::RefCell;
-use std::marker::PhantomData;
use std::path::PathBuf;
use std::sync::Arc;
use std::time::Duration;
use futures::channel::mpsc;
use futures::future;
+use futures::future::BoxFuture;
use futures::prelude::*;
use madara_runtime::opaque::Block;
-use madara_runtime::{self, Hash, RuntimeApi, StarknetHasher};
+use madara_runtime::{self, Hash, RuntimeApi, SealingMode, StarknetHasher};
use mc_block_proposer::ProposerFactory;
+use mc_commitment_state_diff::{log_commitment_state_diff, CommitmentStateDiffWorker};
use mc_data_availability::avail::config::AvailConfig;
use mc_data_availability::avail::AvailClient;
use mc_data_availability::bitcoin::config::BitcoinConfig;
@@ -43,7 +44,6 @@ use sp_offchain::STORAGE_PREFIX;
use sp_runtime::traits::BlakeTwo256;
use sp_trie::PrefixedMemoryDB;
-use crate::cli::Sealing;
use crate::genesis_block::MadaraGenesisBlockBuilder;
use crate::rpc::StarknetDeps;
use crate::starknet::{db_config_dir, MadaraBackend};
@@ -78,6 +78,7 @@ type BoxBlockImport = sc_consensus::BoxBlockImport(
config: &Configuration,
build_import_queue: BIQ,
+ cache_more_things: bool,
) -> Result<
sc_service::PartialComponents<
FullClient,
@@ -166,7 +167,7 @@ where
telemetry.as_ref().map(|x| x.handle()),
)?;
- let madara_backend = Arc::new(MadaraBackend::open(&config.database, &db_config_dir(config))?);
+ let madara_backend = Arc::new(MadaraBackend::open(&config.database, &db_config_dir(config), cache_more_things)?);
let (import_queue, block_import) = build_import_queue(
client.clone(),
@@ -254,13 +255,18 @@ where
}
/// Builds a new service for a full client.
+///
+/// # Arguments
+///
+/// - `cache`: whether more information should be cached when storing the block in the database.
pub fn new_full(
config: Configuration,
- sealing: Option,
+ sealing: SealingMode,
da_layer: Option<(DaLayer, PathBuf)>,
+ cache_more_things: bool,
) -> Result {
let build_import_queue =
- if sealing.is_some() { build_manual_seal_import_queue } else { build_aura_grandpa_import_queue };
+ if sealing.is_default() { build_aura_grandpa_import_queue } else { build_manual_seal_import_queue };
let sc_service::PartialComponents {
client,
@@ -271,7 +277,7 @@ pub fn new_full(
select_chain,
transaction_pool,
other: (block_import, grandpa_link, mut telemetry, madara_backend),
- } = new_partial(&config, build_import_queue)?;
+ } = new_partial(&config, build_import_queue, cache_more_things)?;
let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
@@ -280,9 +286,7 @@ pub fn new_full(
&config.chain_spec,
);
- let warp_sync_params = if sealing.is_some() {
- None
- } else {
+ let warp_sync_params = if sealing.is_default() {
net_config
.add_notification_protocol(sc_consensus_grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone()));
let warp_sync = Arc::new(sc_consensus_grandpa::warp_proof::NetworkProvider::new(
@@ -291,6 +295,8 @@ pub fn new_full(
Vec::default(),
));
Some(WarpSyncParams::WithProvider(warp_sync))
+ } else {
+ None
};
let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
@@ -313,14 +319,18 @@ pub fn new_full(
let force_authoring = config.force_authoring;
let backoff_authoring_blocks: Option<()> = None;
let name = config.network.node_name.clone();
- let enable_grandpa = !config.disable_grandpa && sealing.is_none();
+ let enable_grandpa = !config.disable_grandpa && sealing.is_default();
let prometheus_registry = config.prometheus_registry().cloned();
let starting_block = client.info().best_number;
// Channel for the rpc handler to communicate with the authorship task.
- // TODO: commands_stream is is currently unused, but should be used to implement the `sealing`
- // parameter
- let (command_sink, commands_stream) = mpsc::channel(1000);
+ let (command_sink, commands_stream) = match sealing {
+ SealingMode::Manual => {
+ let (sender, receiver) = mpsc::channel(1000);
+ (Some(sender), Some(receiver))
+ }
+ _ => (None, None),
+ };
let overrides = overrides_handle(client.clone());
let starknet_rpc_params = StarknetDeps {
@@ -343,7 +353,7 @@ pub fn new_full(
graph: graph.clone(),
deny_unsafe,
starknet: starknet_rpc_params.clone(),
- command_sink: if sealing.is_some() { Some(command_sink.clone()) } else { None },
+ command_sink: command_sink.clone(),
};
crate::rpc::create_full(deps).map_err(Into::into)
})
@@ -367,7 +377,7 @@ pub fn new_full(
task_manager.spawn_essential_handle().spawn(
"mc-mapping-sync-worker",
Some("madara"),
- MappingSyncWorker::new(
+ MappingSyncWorker::<_, _, _, StarknetHasher>::new(
client.import_notification_stream(),
Duration::new(6, 0),
client.clone(),
@@ -375,11 +385,25 @@ pub fn new_full(
madara_backend.clone(),
3,
0,
- PhantomData::,
)
.for_each(|()| future::ready(())),
);
+ let (commitment_state_diff_tx, commitment_state_diff_rx) = mpsc::channel(5);
+
+ task_manager.spawn_essential_handle().spawn(
+ "commitment-state-diff",
+ Some("madara"),
+ CommitmentStateDiffWorker::<_, _, StarknetHasher>::new(client.clone(), commitment_state_diff_tx)
+ .for_each(|()| future::ready(())),
+ );
+
+ task_manager.spawn_essential_handle().spawn(
+ "commitment-state-logger",
+ Some("madara"),
+ log_commitment_state_diff(commitment_state_diff_rx),
+ );
+
// initialize data availability worker
if let Some((da_layer, da_path)) = da_layer {
let da_client: Box = match da_layer {
@@ -415,7 +439,9 @@ pub fn new_full(
if role.is_authority() {
// manual-seal authorship
- if let Some(sealing) = sealing {
+ if !sealing.is_default() {
+ log::info!("{} sealing enabled.", sealing);
+
run_manual_seal_authorship(
sealing,
client,
@@ -429,7 +455,6 @@ pub fn new_full(
network_starter.start_network();
- log::info!("Manual Seal Ready");
return Ok(task_manager);
}
@@ -539,14 +564,14 @@ pub fn new_full(
#[allow(clippy::too_many_arguments)]
fn run_manual_seal_authorship(
- sealing: Sealing,
+ sealing: SealingMode,
client: Arc,
transaction_pool: Arc>,
select_chain: FullSelectChain,
block_import: BoxBlockImport,
task_manager: &TaskManager,
prometheus_registry: Option<&Registry>,
- commands_stream: mpsc::Receiver>,
+ commands_stream: Option>>,
) -> Result<(), ServiceError>
where
RuntimeApi: ConstructRuntimeApi,
@@ -592,21 +617,21 @@ where
Ok(timestamp)
};
- let manual_seal = match sealing {
- Sealing::Manual => future::Either::Left(sc_consensus_manual_seal::run_manual_seal(
- sc_consensus_manual_seal::ManualSealParams {
+ let manual_seal: BoxFuture<_> = match sealing {
+ SealingMode::Manual => {
+ Box::pin(sc_consensus_manual_seal::run_manual_seal(sc_consensus_manual_seal::ManualSealParams {
block_import,
env: proposer_factory,
client,
pool: transaction_pool,
- commands_stream,
+ commands_stream: commands_stream.expect("Manual sealing requires a channel from RPC."),
select_chain,
consensus_data_provider: None,
create_inherent_data_providers,
- },
- )),
- Sealing::Instant => future::Either::Right(sc_consensus_manual_seal::run_instant_seal(
- sc_consensus_manual_seal::InstantSealParams {
+ }))
+ }
+ SealingMode::Instant { finalize } => {
+ let instant_seal_params = sc_consensus_manual_seal::InstantSealParams {
block_import,
env: proposer_factory,
client,
@@ -614,8 +639,14 @@ where
select_chain,
consensus_data_provider: None,
create_inherent_data_providers,
- },
- )),
+ };
+ if finalize {
+ Box::pin(sc_consensus_manual_seal::run_instant_seal_and_finalize(instant_seal_params))
+ } else {
+ Box::pin(sc_consensus_manual_seal::run_instant_seal(instant_seal_params))
+ }
+ }
+ _ => unreachable!("Other sealing modes are not expected in manual-seal."),
};
// we spawn the future on a background thread managed by service.
@@ -634,9 +665,9 @@ type ChainOpsResult = Result<
ServiceError,
>;
-pub fn new_chain_ops(config: &mut Configuration) -> ChainOpsResult {
+pub fn new_chain_ops(config: &mut Configuration, cache_more_things: bool) -> ChainOpsResult {
config.keystore = sc_service::config::KeystoreConfig::InMemory;
let sc_service::PartialComponents { client, backend, import_queue, task_manager, other, .. } =
- new_partial::<_>(config, build_aura_grandpa_import_queue)?;
+ new_partial::<_>(config, build_aura_grandpa_import_queue, cache_more_things)?;
Ok((client, backend, import_queue, task_manager, other.3))
}
diff --git a/crates/pallets/starknet/Cargo.toml b/crates/pallets/starknet/Cargo.toml
index 900e216019..c901e88add 100644
--- a/crates/pallets/starknet/Cargo.toml
+++ b/crates/pallets/starknet/Cargo.toml
@@ -47,6 +47,7 @@ frame-system = { workspace = true }
sc-cli = { workspace = true, optional = true }
# Substrate primitives
sp-api = { workspace = true }
+sp-arithmetic = { workspace = true }
sp-core = { workspace = true }
sp-inherents = { workspace = true }
sp-io = { workspace = true }
@@ -58,6 +59,8 @@ sp-std = { workspace = true }
cairo-lang-casm-contract-class = { workspace = true, optional = true, features = [
"std",
] }
+derive_more = { workspace = true }
+hashbrown = { workspace = true }
hex = { workspace = true }
indexmap = { workspace = true }
log = { workspace = true }
@@ -79,6 +82,7 @@ lazy_static = "1.4.0"
hexlit = "0.5.5"
assert_matches = "1.5.0"
starknet-ff = { workspace = true }
+project-root = "0.2.2"
[features]
default = ["std"]
@@ -96,6 +100,8 @@ std = [
# Starknet
"starknet-crypto/std",
"blockifier/std",
+ "mp-sequencer-address/std",
+ "mp-felt/std",
# Other third party dependencies
"dep:reqwest",
"dep:cairo-lang-casm-contract-class",
diff --git a/crates/pallets/starknet/src/genesis_loader.rs b/crates/pallets/starknet/src/genesis_loader.rs
index 841b78455d..616d01bd53 100644
--- a/crates/pallets/starknet/src/genesis_loader.rs
+++ b/crates/pallets/starknet/src/genesis_loader.rs
@@ -1,15 +1,17 @@
use std::fmt;
+use std::path::PathBuf;
use std::string::String;
use std::vec::Vec;
use blockifier::execution::contract_class::ContractClass as StarknetContractClass;
+use derive_more::Constructor;
use mp_felt::Felt252Wrapper;
use serde::{Deserialize, Serialize};
use serde_with::serde_as;
use starknet_core::serde::unsigned_field_element::UfeHex;
use starknet_crypto::FieldElement;
-use crate::{utils, GenesisConfig};
+use crate::GenesisConfig;
/// A wrapper for FieldElement that implements serde's Serialize and Deserialize for hex strings.
#[serde_as]
@@ -36,9 +38,8 @@ type StorageKey = HexFelt;
type ContractStorageKey = (ContractAddress, StorageKey);
type StorageValue = HexFelt;
-#[derive(Deserialize, Serialize, Clone)]
-pub struct GenesisLoader {
- pub madara_path: Option,
+#[derive(Deserialize, Serialize)]
+pub struct GenesisData {
pub contract_classes: Vec<(ClassHash, ContractClass)>,
pub contracts: Vec<(ContractAddress, ClassHash)>,
pub storage: Vec<(ContractStorageKey, StorageValue)>,
@@ -46,6 +47,18 @@ pub struct GenesisLoader {
pub seq_addr_updated: bool,
}
+#[derive(Constructor)]
+pub struct GenesisLoader {
+ base_path: PathBuf,
+ data: GenesisData,
+}
+
+impl GenesisLoader {
+ pub fn data(&self) -> &GenesisData {
+ &self.data
+ }
+}
+
#[derive(Deserialize, Serialize, Clone)]
#[serde(untagged)]
pub enum ContractClass {
@@ -53,45 +66,31 @@ pub enum ContractClass {
Class(StarknetContractClass),
}
-impl GenesisLoader {
- pub fn set_madara_path(&mut self, madara_path: String) {
- self.madara_path = Some(madara_path);
- }
-}
-
impl From for GenesisConfig {
fn from(loader: GenesisLoader) -> Self {
let contract_classes = loader
+ .data
.contract_classes
.into_iter()
.map(|(hash, class)| {
let hash = Felt252Wrapper(hash.0).into();
match class {
- ContractClass::Path { path, version } => {
- let contract_path = match loader.madara_path.clone() {
- Some(madara_path) => madara_path + "/configs/" + &path,
- None => {
- let project_path = utils::get_project_path()
- .expect("A Project path should be present in order to load the genesis contracts");
- project_path + "/" + &path
- }
- };
- (
- hash,
- read_contract_class_from_json(
- &utils::read_file_to_string(contract_path).expect(
- "Some contract is missing in the config folder. Try to run `madara setup` before \
- opening an issue.",
- ),
- version,
+ ContractClass::Path { path, version } => (
+ hash,
+ read_contract_class_from_json(
+ &std::fs::read_to_string(loader.base_path.join(path)).expect(
+ "Some contract is missing in the config folder. Try to run `madara setup` before \
+ opening an issue.",
),
- )
- }
+ version,
+ ),
+ ),
ContractClass::Class(class) => (hash, class),
}
})
.collect::>();
let contracts = loader
+ .data
.contracts
.into_iter()
.map(|(address, hash)| {
@@ -101,6 +100,7 @@ impl From for GenesisConfig {
})
.collect::>();
let storage = loader
+ .data
.storage
.into_iter()
.map(|(key, value)| {
@@ -109,14 +109,14 @@ impl From for GenesisConfig {
(key, value)
})
.collect::>();
- let fee_token_address = Felt252Wrapper(loader.fee_token_address.0).into();
+ let fee_token_address = Felt252Wrapper(loader.data.fee_token_address.0).into();
GenesisConfig {
contracts,
contract_classes,
storage,
fee_token_address,
- seq_addr_updated: loader.seq_addr_updated,
+ seq_addr_updated: loader.data.seq_addr_updated,
..Default::default()
}
}
@@ -159,13 +159,7 @@ mod tests {
#[test]
fn test_deserialize_loader() {
// When
- let loader: GenesisLoader = serde_json::from_str(
- &utils::read_file_to_string(
- utils::get_project_path().unwrap() + "/crates/pallets/starknet/src/tests/mock/genesis.json",
- )
- .unwrap(),
- )
- .unwrap();
+ let loader: GenesisData = serde_json::from_str(include_str!("./tests/mock/genesis.json")).unwrap();
// Then
assert_eq!(13, loader.contract_classes.len());
@@ -182,8 +176,7 @@ mod tests {
let storage_value = FieldElement::from(4u8).into();
let fee_token_address = FieldElement::from(5u8).into();
- let genesis_loader = GenesisLoader {
- madara_path: None,
+ let genesis_loader = GenesisData {
contract_classes: vec![(class_hash, class)],
contracts: vec![(contract_address, class_hash)],
storage: vec![((contract_address, storage_key), storage_value)],
@@ -195,7 +188,7 @@ mod tests {
let serialized_loader = serde_json::to_string(&genesis_loader).unwrap();
// Then
- let expected = r#"{"madara_path":null,"contract_classes":[["0x1",{"path":"cairo-contracts/ERC20.json","version":0}]],"contracts":[["0x2","0x1"]],"storage":[[["0x2","0x3"],"0x4"]],"fee_token_address":"0x5","seq_addr_updated":false}"#;
+ let expected = r#"{"contract_classes":[["0x1",{"path":"cairo-contracts/ERC20.json","version":0}]],"contracts":[["0x2","0x1"]],"storage":[[["0x2","0x3"],"0x4"]],"fee_token_address":"0x5","seq_addr_updated":false}"#;
assert_eq!(expected, serialized_loader);
}
}
diff --git a/crates/pallets/starknet/src/lib.rs b/crates/pallets/starknet/src/lib.rs
index f6813e7641..4203db1686 100644
--- a/crates/pallets/starknet/src/lib.rs
+++ b/crates/pallets/starknet/src/lib.rs
@@ -51,9 +51,6 @@ pub mod runtime_api;
pub mod transaction_validation;
/// The Starknet pallet's runtime custom types.
pub mod types;
-/// Util functions for madara.
-#[cfg(feature = "std")]
-pub mod utils;
/// Everything needed to run the pallet offchain workers
mod offchain_worker;
@@ -674,7 +671,10 @@ pub mod pallet {
false,
T::DisableNonceValidation::get(),
)
- .map_err(|_| Error::::TransactionExecutionFailed)?;
+ .map_err(|e| {
+ log::error!("Failed to consume l1 message: {}", e);
+ Error::::TransactionExecutionFailed
+ })?;
let tx_hash = transaction.tx_hash;
Self::emit_and_store_tx_and_fees_events(
@@ -746,24 +746,27 @@ pub mod pallet {
let sender_nonce: Felt252Wrapper = Pallet::::nonce(sender_address).into();
let transaction_nonce = transaction.nonce();
- // Reject transaction with an already used Nonce
- if sender_nonce > *transaction_nonce {
- Err(InvalidTransaction::Stale)?;
- }
-
- // A transaction with a nonce higher than the expected nonce is placed in
- // the future queue of the transaction pool.
- if sender_nonce < *transaction_nonce {
- log!(
- info,
- "Nonce is too high. Expected: {:?}, got: {:?}. This transaction will be placed in the \
- transaction pool and executed in the future when the nonce is reached.",
- sender_nonce,
- transaction_nonce
- );
- }
+ // InvokeV0 does not have a nonce
+ if let Some(transaction_nonce) = transaction_nonce {
+ // Reject transaction with an already used Nonce
+ if sender_nonce > *transaction_nonce {
+ Err(InvalidTransaction::Stale)?;
+ }
+
+ // A transaction with a nonce higher than the expected nonce is placed in
+ // the future queue of the transaction pool.
+ if sender_nonce < *transaction_nonce {
+ log!(
+ debug,
+ "Nonce is too high. Expected: {:?}, got: {:?}. This transaction will be placed in the \
+ transaction pool and executed in the future when the nonce is reached.",
+ sender_nonce,
+ transaction_nonce
+ );
+ }
+ };
- (transaction.sender_address(), sender_nonce, *transaction_nonce)
+ (transaction.sender_address(), sender_nonce, transaction_nonce.cloned())
} else {
// TODO: create and check L1 messages Nonce
unimplemented!()
@@ -786,23 +789,30 @@ pub mod pallet {
false,
),
}
- .map_err(|_| InvalidTransaction::BadProof)?;
+ .map_err(|e| {
+ log::error!("failed to validate tx: {}", e);
+ InvalidTransaction::BadProof
+ })?;
}
- let nonce_for_priority: u64 =
- transaction_nonce.try_into().map_err(|_| InvalidTransaction::Custom(NONCE_DECODE_FAILURE))?;
+ let nonce_for_priority: u64 = transaction_nonce
+ .unwrap_or(Felt252Wrapper::ZERO)
+ .try_into()
+ .map_err(|_| InvalidTransaction::Custom(NONCE_DECODE_FAILURE))?;
let mut valid_transaction_builder = ValidTransaction::with_tag_prefix("starknet")
.priority(u64::MAX - nonce_for_priority)
- .and_provides((sender_address, transaction_nonce))
.longevity(T::TransactionLongevity::get())
.propagate(true);
- // Enforce waiting for the tx with the previous nonce,
- // to be either executed or ordered before in the block
- if transaction_nonce > sender_nonce {
- valid_transaction_builder = valid_transaction_builder
- .and_requires((sender_address, Felt252Wrapper(transaction_nonce.0 - FieldElement::ONE)));
+ if let Some(transaction_nonce) = transaction_nonce {
+ valid_transaction_builder = valid_transaction_builder.and_provides((sender_address, transaction_nonce));
+ // Enforce waiting for the tx with the previous nonce,
+ // to be either executed or ordered before in the block
+ if transaction_nonce > sender_nonce {
+ valid_transaction_builder = valid_transaction_builder
+ .and_requires((sender_address, Felt252Wrapper(transaction_nonce.0 - FieldElement::ONE)));
+ }
}
valid_transaction_builder.build()
@@ -854,7 +864,7 @@ impl Pallet {
/// Creates a [BlockContext] object. The [BlockContext] is needed by the blockifier to execute
/// properly the transaction. Substrate caches data so it's fine to call multiple times this
/// function, only the first transaction/block will be "slow" to load these data.
- fn get_block_context() -> BlockContext {
+ pub fn get_block_context() -> BlockContext {
let block_number = UniqueSaturatedInto::::unique_saturated_into(frame_system::Pallet::::block_number());
let block_timestamp = Self::block_timestamp();
@@ -876,7 +886,7 @@ impl Pallet {
invoke_tx_max_n_steps: T::InvokeTxMaxNSteps::get(),
validate_max_n_steps: T::ValidateMaxNSteps::get(),
gas_price,
- max_recursion_depth: T::MaxRecursionDepth::get() as usize,
+ max_recursion_depth: T::MaxRecursionDepth::get(),
}
}
@@ -949,7 +959,7 @@ impl Pallet {
let max_n_steps = block_context.invoke_tx_max_n_steps;
let mut resources = ExecutionResources::default();
let mut entry_point_execution_context =
- EntryPointExecutionContext::new(block_context, Default::default(), max_n_steps as usize);
+ EntryPointExecutionContext::new(block_context, Default::default(), max_n_steps);
match entrypoint.execute(
&mut BlockifierStateAdapter::::default(),
@@ -1082,7 +1092,7 @@ impl Pallet {
}
/// Estimate the fee associated with transaction
- pub fn estimate_fee(transaction: UserTransaction) -> Result<(u64, u64), DispatchError> {
+ pub fn estimate_fee(transaction: UserTransaction, is_query: bool) -> Result<(u64, u64), DispatchError> {
let chain_id = Self::chain_id();
fn execute_tx_and_rollback(
@@ -1106,20 +1116,20 @@ impl Pallet {
let execution_result = match transaction {
UserTransaction::Declare(tx, contract_class) => execute_tx_and_rollback(
- tx.try_into_executable::(chain_id, contract_class, true)
+ tx.try_into_executable::(chain_id, contract_class, is_query)
.map_err(|_| Error::::InvalidContractClass)?,
&mut blockifier_state_adapter,
&block_context,
disable_nonce_validation,
),
UserTransaction::DeployAccount(tx) => execute_tx_and_rollback(
- tx.into_executable::(chain_id, true),
+ tx.into_executable::(chain_id, is_query),
&mut blockifier_state_adapter,
&block_context,
disable_nonce_validation,
),
UserTransaction::Invoke(tx) => execute_tx_and_rollback(
- tx.into_executable::(chain_id, true),
+ tx.into_executable::(chain_id, is_query),
&mut blockifier_state_adapter,
&block_context,
disable_nonce_validation,
diff --git a/crates/pallets/starknet/src/runtime_api.rs b/crates/pallets/starknet/src/runtime_api.rs
index 19d9fa1c38..466fd5bc6e 100644
--- a/crates/pallets/starknet/src/runtime_api.rs
+++ b/crates/pallets/starknet/src/runtime_api.rs
@@ -5,15 +5,19 @@
// Specifically, the macro generates a trait (`StarknetRuntimeApi`) with unused type parameters.
#![allow(clippy::extra_unused_type_parameters)]
+use alloc::sync::Arc;
+
use blockifier::execution::contract_class::ContractClass;
use mp_felt::Felt252Wrapper;
use mp_transactions::{Transaction, TxType, UserTransaction};
use sp_api::BlockT;
pub extern crate alloc;
+use alloc::string::String;
use alloc::vec::Vec;
use sp_runtime::DispatchError;
-use starknet_api::api_core::{ClassHash, ContractAddress, EntryPointSelector, Nonce};
+use starknet_api::api_core::{ChainId, ClassHash, ContractAddress, EntryPointSelector, Nonce};
+use starknet_api::block::{BlockNumber, BlockTimestamp};
use starknet_api::hash::StarkFelt;
use starknet_api::state::StorageKey;
use starknet_api::transaction::{Calldata, Event as StarknetEvent, TransactionHash};
@@ -42,7 +46,7 @@ sp_api::decl_runtime_apis! {
/// Returns the chain id.
fn chain_id() -> Felt252Wrapper;
/// Returns fee estimate
- fn estimate_fee(transaction: UserTransaction) -> Result<(u64, u64), DispatchError>;
+ fn estimate_fee(transaction: UserTransaction, is_query: bool) -> Result<(u64, u64), DispatchError>;
/// Filters extrinsic transactions to return only Starknet transactions
///
/// To support runtime upgrades, the client must be unaware of the specific extrinsic
@@ -60,6 +64,8 @@ sp_api::decl_runtime_apis! {
fn get_starknet_events_and_their_associated_tx_hash(block_extrinsics: Vec<::Extrinsic>, chain_id: Felt252Wrapper) -> Vec<(Felt252Wrapper, StarknetEvent)>;
/// Return the outcome of the tx execution
fn get_tx_execution_outcome(tx_hash: TransactionHash) -> Option>;
+ /// Return the block context
+ fn get_block_context() -> BlockContext;
}
pub trait ConvertTransactionRuntimeApi {
@@ -69,3 +75,61 @@ sp_api::decl_runtime_apis! {
fn convert_error(error: DispatchError) -> StarknetTransactionExecutionError;
}
}
+
+#[derive(Clone, Debug, parity_scale_codec::Encode, parity_scale_codec::Decode, scale_info::TypeInfo)]
+pub struct BlockContext {
+ pub chain_id: String,
+ pub block_number: u64,
+ pub block_timestamp: u64,
+
+ // Fee-related.
+ pub sequencer_address: ContractAddress,
+ pub fee_token_address: ContractAddress,
+ pub vm_resource_fee_cost: Vec<(String, sp_arithmetic::fixed_point::FixedU128)>,
+ pub gas_price: u128, // In wei.
+
+ // Limits.
+ pub invoke_tx_max_n_steps: u32,
+ pub validate_max_n_steps: u32,
+ pub max_recursion_depth: u32,
+}
+
+#[cfg(feature = "std")]
+use std::collections::HashMap;
+
+#[cfg(not(feature = "std"))]
+use hashbrown::HashMap;
+
+impl From for blockifier::block_context::BlockContext {
+ fn from(value: BlockContext) -> Self {
+ Self {
+ chain_id: ChainId(value.chain_id),
+ block_number: BlockNumber(value.block_number),
+ block_timestamp: BlockTimestamp(value.block_timestamp),
+ sequencer_address: value.sequencer_address,
+ fee_token_address: value.fee_token_address,
+ vm_resource_fee_cost: Arc::new(HashMap::from_iter(value.vm_resource_fee_cost)),
+ gas_price: value.gas_price,
+ invoke_tx_max_n_steps: value.invoke_tx_max_n_steps,
+ validate_max_n_steps: value.validate_max_n_steps,
+ max_recursion_depth: value.max_recursion_depth,
+ }
+ }
+}
+
+impl From for BlockContext {
+ fn from(value: blockifier::block_context::BlockContext) -> Self {
+ Self {
+ chain_id: value.chain_id.0,
+ block_number: value.block_number.0,
+ block_timestamp: value.block_timestamp.0,
+ sequencer_address: value.sequencer_address,
+ fee_token_address: value.fee_token_address,
+ vm_resource_fee_cost: Vec::from_iter(value.vm_resource_fee_cost.iter().map(|(k, v)| (k.clone(), *v))),
+ gas_price: value.gas_price,
+ invoke_tx_max_n_steps: value.invoke_tx_max_n_steps,
+ validate_max_n_steps: value.validate_max_n_steps,
+ max_recursion_depth: value.max_recursion_depth,
+ }
+ }
+}
diff --git a/crates/pallets/starknet/src/tests/block.rs b/crates/pallets/starknet/src/tests/block.rs
index 3c47519814..6ccd36c700 100644
--- a/crates/pallets/starknet/src/tests/block.rs
+++ b/crates/pallets/starknet/src/tests/block.rs
@@ -1,5 +1,4 @@
use alloc::sync::Arc;
-use std::collections::HashMap;
use frame_support::assert_ok;
use mp_digest_log::{ensure_log, find_starknet_block};
@@ -110,7 +109,7 @@ fn get_block_context_works() {
block_context.fee_token_address
);
// correct vm_resource_fee_cost
- let vm_resoursce_fee_cost: Arc> = Default::default();
+ let vm_resoursce_fee_cost: Arc<_> = Default::default();
assert_eq!(vm_resoursce_fee_cost, block_context.vm_resource_fee_cost);
// correct invoke_tx_max_n_steps: T::InvokeTxMaxNSteps::get(),
assert_eq!(InvokeTxMaxNSteps::get(), block_context.invoke_tx_max_n_steps);
diff --git a/crates/pallets/starknet/src/tests/declare_tx.rs b/crates/pallets/starknet/src/tests/declare_tx.rs
index c2b2a994b3..28838687f6 100644
--- a/crates/pallets/starknet/src/tests/declare_tx.rs
+++ b/crates/pallets/starknet/src/tests/declare_tx.rs
@@ -4,14 +4,17 @@ use mp_felt::Felt252Wrapper;
use mp_transactions::compute_hash::ComputeTransactionHash;
use mp_transactions::{DeclareTransactionV1, DeclareTransactionV2};
use sp_runtime::traits::ValidateUnsigned;
-use sp_runtime::transaction_validity::{TransactionSource, TransactionValidityError, ValidTransaction};
-use starknet_api::api_core::ClassHash;
+use sp_runtime::transaction_validity::{
+ InvalidTransaction, TransactionSource, TransactionValidityError, ValidTransaction,
+};
+use starknet_api::api_core::{ClassHash, Nonce};
+use starknet_api::hash::StarkFelt;
use starknet_crypto::FieldElement;
use super::mock::default_mock::*;
use super::mock::*;
use super::utils::{get_contract_class, sign_message_hash};
-use crate::tests::get_declare_dummy;
+use crate::tests::{get_declare_dummy, set_nonce};
use crate::{Config, Error};
#[test]
@@ -364,3 +367,30 @@ fn test_verify_require_tag() {
assert_eq!(validate_result, valid_transaction_expected)
});
}
+
+#[test]
+fn test_verify_nonce_in_unsigned_tx() {
+ new_test_ext::().execute_with(|| {
+ basic_test_setup(2);
+
+ let transaction = get_declare_dummy(
+ Starknet::chain_id(),
+ Felt252Wrapper::ONE,
+ AccountType::V0(AccountTypeV0Inner::NoValidate),
+ );
+ let erc20_class = get_contract_class("ERC20.json", 0);
+
+ let tx_sender = (*transaction.sender_address()).into();
+ let tx_source = TransactionSource::InBlock;
+ let call = crate::Call::declare { transaction, contract_class: erc20_class };
+
+ assert!(Starknet::validate_unsigned(tx_source, &call).is_ok());
+
+ set_nonce::(&tx_sender, &Nonce(StarkFelt::from(2u64)));
+
+ assert_eq!(
+ Starknet::validate_unsigned(tx_source, &call),
+ Err(TransactionValidityError::Invalid(InvalidTransaction::Stale))
+ );
+ });
+}
diff --git a/crates/pallets/starknet/src/tests/deploy_account_tx.rs b/crates/pallets/starknet/src/tests/deploy_account_tx.rs
index 9397f58980..7b416b1e66 100644
--- a/crates/pallets/starknet/src/tests/deploy_account_tx.rs
+++ b/crates/pallets/starknet/src/tests/deploy_account_tx.rs
@@ -3,17 +3,17 @@ use mp_felt::Felt252Wrapper;
use mp_transactions::compute_hash::ComputeTransactionHash;
use mp_transactions::DeployAccountTransaction;
use sp_runtime::traits::ValidateUnsigned;
-use sp_runtime::transaction_validity::TransactionSource;
-use starknet_api::api_core::ContractAddress;
+use sp_runtime::transaction_validity::{InvalidTransaction, TransactionSource, TransactionValidityError};
+use starknet_api::api_core::{ContractAddress, Nonce};
use starknet_api::hash::StarkFelt;
use starknet_api::transaction::{Event as StarknetEvent, EventContent, EventData, EventKey};
use starknet_crypto::FieldElement;
use super::mock::default_mock::*;
use super::mock::*;
-use super::utils::sign_message_hash;
+use super::utils::{sign_message_hash, sign_message_hash_braavos};
use crate::tests::constants::{ACCOUNT_PUBLIC_KEY, SALT};
-use crate::tests::{get_deploy_account_dummy, set_infinite_tokens};
+use crate::tests::{get_deploy_account_dummy, set_infinite_tokens, set_nonce};
use crate::{Config, Error, Event, StorageView};
#[test]
@@ -50,7 +50,7 @@ fn given_contract_run_deploy_account_tx_works() {
data: EventData(vec![
address.0.0, // From
StarkFelt::try_from("0xdead").unwrap(), // To
- StarkFelt::try_from("0xa582").unwrap(), // Amount low
+ StarkFelt::try_from("0x195a").unwrap(), // Amount low
StarkFelt::from(0u128), // Amount high
]),
},
@@ -262,14 +262,56 @@ fn given_contract_run_deploy_account_braavos_tx_works() {
class_hash: proxy_class_hash.into(),
};
- // Braavos has a complicated signature mecanism, they add stuffs around the tx_hash and then sign
- // the whole thing. This hardcoded value is the expected "thing" that bravos expect you to
- // sign for this transaction. Roll with it for now
- let value_to_sign =
- Felt252Wrapper::from_hex_be("0x06a8bb3d81c2ad23db93f01f72f987feac5210a95bc530eabb6abfaa5a769944").unwrap();
- let mut signatures = sign_message_hash(value_to_sign);
- signatures.extend_from_slice(&[Felt252Wrapper::ZERO; 8]);
- deploy_tx.signature = signatures;
+ let tx_hash = deploy_tx.compute_hash::<::SystemHash>(Starknet::chain_id(), false);
+ deploy_tx.signature = sign_message_hash_braavos(tx_hash, Felt252Wrapper::ZERO, &[Felt252Wrapper::ZERO; 7]);
+
+ let address = deploy_tx.account_address().into();
+ set_infinite_tokens::(&address);
+ set_signer(address, AccountType::V0(AccountTypeV0Inner::Braavos));
+
+ assert_ok!(Starknet::deploy_account(none_origin, deploy_tx));
+ assert_eq!(Starknet::contract_class_hash_by_address(address), proxy_class_hash);
+ });
+}
+
+#[test]
+fn given_contract_run_deploy_account_braavos_tx_works_whis_hardware_signer() {
+ new_test_ext::().execute_with(|| {
+ basic_test_setup(2);
+
+ let none_origin = RuntimeOrigin::none();
+ let (proxy_class_hash, calldata) = account_helper(AccountType::V0(AccountTypeV0Inner::BraavosProxy));
+ let mut calldata: Vec<_> = calldata.0.iter().map(|e| Felt252Wrapper::from(*e)).collect();
+ calldata.push(Felt252Wrapper::ONE);
+ calldata.push(Felt252Wrapper::from_hex_be(ACCOUNT_PUBLIC_KEY).unwrap());
+
+ let mut deploy_tx = DeployAccountTransaction {
+ max_fee: u64::MAX as u128,
+ signature: vec![],
+ nonce: Felt252Wrapper::ZERO,
+ contract_address_salt: *SALT,
+ constructor_calldata: calldata,
+ class_hash: proxy_class_hash.into(),
+ };
+
+ let tx_hash = deploy_tx.compute_hash::<::SystemHash>(Starknet::chain_id(), false);
+
+ // signer fields are hardware public key generated from some random private key
+ // it's possible to add only one additional secp256r1 signer
+ let signer_model = [
+ Felt252Wrapper::from_hex_be("0x23fc01adbb70af88935aeaecde1240ea").unwrap(), /* signer_0= pk_x_uint256
+ * low 128 bits */
+ Felt252Wrapper::from_hex_be("0xea0cb2b3f76a88bba0d8dc7556c40df9").unwrap(), /* signer_1= pk_x_uint256
+ * high 128 bits */
+ Felt252Wrapper::from_hex_be("0x663b66d81aa5eed14537e814b02745c0").unwrap(), /* signer_2= pk_y_uint256
+ * low 128 bits */
+ Felt252Wrapper::from_hex_be("0x76d91b936d094b864af4cfaaeec89fb1").unwrap(), /* signer_3= pk_y_uint256
+ * high 128 bits */
+ Felt252Wrapper::TWO, // type= SIGNER_TYPE_SECP256R1
+ Felt252Wrapper::ZERO, // reserved_0
+ Felt252Wrapper::ZERO, // reserved_1
+ ];
+ deploy_tx.signature = sign_message_hash_braavos(tx_hash, Felt252Wrapper::ZERO, &signer_model);
let address = deploy_tx.account_address().into();
set_infinite_tokens::(&address);
@@ -335,3 +377,26 @@ fn set_signer(address: ContractAddress, account_type: AccountType) {
StarkFelt::try_from(ACCOUNT_PUBLIC_KEY).unwrap(),
);
}
+
+#[test]
+fn test_verify_nonce_in_unsigned_tx() {
+ new_test_ext::().execute_with(|| {
+ basic_test_setup(2);
+
+ let transaction =
+ get_deploy_account_dummy(Felt252Wrapper::ZERO, *SALT, AccountType::V0(AccountTypeV0Inner::NoValidate));
+
+ let tx_sender = transaction.account_address().into();
+ let tx_source = TransactionSource::InBlock;
+ let call = crate::Call::deploy_account { transaction };
+
+ assert!(Starknet::validate_unsigned(tx_source, &call).is_ok());
+
+ set_nonce::(&tx_sender, &Nonce(StarkFelt::from(1u64)));
+
+ assert_eq!(
+ Starknet::validate_unsigned(tx_source, &call),
+ Err(TransactionValidityError::Invalid(InvalidTransaction::Stale))
+ );
+ });
+}
diff --git a/crates/pallets/starknet/src/tests/erc20.rs b/crates/pallets/starknet/src/tests/erc20.rs
index afbcd02e06..40444250da 100644
--- a/crates/pallets/starknet/src/tests/erc20.rs
+++ b/crates/pallets/starknet/src/tests/erc20.rs
@@ -104,7 +104,7 @@ fn given_erc20_transfer_when_invoke_then_it_works() {
sender_account.0.0, // From
StarkFelt::try_from("0x000000000000000000000000000000000000000000000000000000000000dead")
.unwrap(), // Sequencer address
- StarkFelt::try_from("0x0000000000000000000000000000000000000000000000000000000000028942")
+ StarkFelt::try_from("0x00000000000000000000000000000000000000000000000000000000000198de")
.unwrap(), // Amount low
StarkFelt::from(0u128), // Amount high
]),
@@ -198,7 +198,7 @@ fn given_erc20_transfer_when_invoke_then_it_works() {
data: EventData(vec![
sender_account.0.0, // From
StarkFelt::try_from("0xdead").unwrap(), // Sequencer address
- StarkFelt::try_from("0x1b85a").unwrap(), // Amount low
+ StarkFelt::try_from("0xf118").unwrap(), // Amount low
StarkFelt::from(0u128), // Amount high
])},
from_address: Starknet::fee_token_address(),
diff --git a/crates/pallets/starknet/src/tests/invoke_tx.rs b/crates/pallets/starknet/src/tests/invoke_tx.rs
index 1fd32d8f99..e0d643f937 100644
--- a/crates/pallets/starknet/src/tests/invoke_tx.rs
+++ b/crates/pallets/starknet/src/tests/invoke_tx.rs
@@ -5,8 +5,10 @@ use mp_transactions::compute_hash::ComputeTransactionHash;
use mp_transactions::{InvokeTransaction, InvokeTransactionV1};
use pretty_assertions::assert_eq;
use sp_runtime::traits::ValidateUnsigned;
-use sp_runtime::transaction_validity::{TransactionSource, TransactionValidityError, ValidTransaction};
-use starknet_api::api_core::{ContractAddress, PatriciaKey};
+use sp_runtime::transaction_validity::{
+ InvalidTransaction, TransactionSource, TransactionValidityError, ValidTransaction,
+};
+use starknet_api::api_core::{ContractAddress, Nonce, PatriciaKey};
use starknet_api::hash::StarkFelt;
use starknet_api::state::StorageKey;
use starknet_api::transaction::{Event as StarknetEvent, EventContent, EventData, EventKey, Fee, TransactionHash};
@@ -20,9 +22,9 @@ use super::utils::sign_message_hash;
use crate::message::Message;
use crate::tests::{
get_invoke_argent_dummy, get_invoke_braavos_dummy, get_invoke_dummy, get_invoke_emit_event_dummy,
- get_invoke_nonce_dummy, get_invoke_openzeppelin_dummy, get_storage_read_write_dummy,
+ get_invoke_nonce_dummy, get_invoke_openzeppelin_dummy, get_storage_read_write_dummy, set_nonce,
};
-use crate::{Config, Error, Event, StorageView};
+use crate::{Call, Config, Error, Event, StorageView};
#[test]
fn given_hardcoded_contract_run_invoke_tx_fails_sender_not_deployed() {
@@ -96,7 +98,7 @@ fn given_hardcoded_contract_run_invoke_tx_then_it_works() {
StarkFelt::try_from(BLOCKIFIER_ACCOUNT_ADDRESS).unwrap(),
StarkFelt::try_from("0x000000000000000000000000000000000000000000000000000000000000dead")
.unwrap(),
- StarkFelt::try_from("0x000000000000000000000000000000000000000000000000000000000000a136")
+ StarkFelt::try_from("0x00000000000000000000000000000000000000000000000000000000000001a4")
.unwrap(),
StarkFelt::from(0u128),
]),
@@ -142,7 +144,7 @@ fn given_hardcoded_contract_run_invoke_tx_then_event_is_emitted() {
StarkFelt::try_from("0x01a3339ec92ac1061e3e0f8e704106286c642eaf302e94a582e5f95ef5e6b4d0")
.unwrap(), // From
StarkFelt::try_from("0xdead").unwrap(), // To
- StarkFelt::try_from("0xa334").unwrap(), // Amount low
+ StarkFelt::try_from("0x1a4").unwrap(), // Amount low
StarkFelt::from(0u128), // Amount high
]),
},
@@ -491,3 +493,25 @@ fn test_verify_require_tag() {
assert_eq!(validate_result.unwrap(), valid_transaction_expected.unwrap())
});
}
+
+#[test]
+fn test_verify_nonce_in_unsigned_tx() {
+ new_test_ext::().execute_with(|| {
+ basic_test_setup(2);
+
+ let transaction = get_invoke_dummy(Felt252Wrapper::ZERO);
+
+ let tx_sender = transaction.sender_address.into();
+ let tx_source = TransactionSource::InBlock;
+ let call = Call::invoke { transaction: transaction.into() };
+
+ assert!(Starknet::validate_unsigned(tx_source, &call).is_ok());
+
+ set_nonce::(&tx_sender, &Nonce(StarkFelt::from(1u64)));
+
+ assert_eq!(
+ Starknet::validate_unsigned(tx_source, &call),
+ Err(TransactionValidityError::Invalid(InvalidTransaction::Stale))
+ );
+ });
+}
diff --git a/crates/pallets/starknet/src/tests/mock/setup_mock.rs b/crates/pallets/starknet/src/tests/mock/setup_mock.rs
index db3f8ea1ed..fbdb7cc356 100644
--- a/crates/pallets/starknet/src/tests/mock/setup_mock.rs
+++ b/crates/pallets/starknet/src/tests/mock/setup_mock.rs
@@ -1,6 +1,6 @@
use frame_support::traits::GenesisBuild;
-use crate::genesis_loader::GenesisLoader;
+use crate::genesis_loader::{GenesisData, GenesisLoader};
use crate::{Config, GenesisConfig};
// Configure a mock runtime to test the pallet.
@@ -126,8 +126,9 @@ macro_rules! mock_runtime {
pub fn new_test_ext() -> sp_io::TestExternalities {
let mut t = frame_system::GenesisConfig::default().build_storage::().unwrap();
- let genesis: GenesisLoader = serde_json::from_str(std::include_str!("./genesis.json")).unwrap();
- let genesis: GenesisConfig = genesis.into();
+ let genesis_data: GenesisData = serde_json::from_str(std::include_str!("./genesis.json")).unwrap();
+ let genesis_loader = GenesisLoader::new(project_root::get_project_root().unwrap(), genesis_data);
+ let genesis: GenesisConfig = genesis_loader.into();
genesis.assimilate_storage(&mut t).unwrap();
diff --git a/crates/pallets/starknet/src/tests/mod.rs b/crates/pallets/starknet/src/tests/mod.rs
index 72a6203f50..6bbd7a87f6 100644
--- a/crates/pallets/starknet/src/tests/mod.rs
+++ b/crates/pallets/starknet/src/tests/mod.rs
@@ -3,7 +3,7 @@ use blockifier::state::state_api::State;
use mp_felt::Felt252Wrapper;
use mp_transactions::compute_hash::ComputeTransactionHash;
use mp_transactions::{DeclareTransaction, DeclareTransactionV1, DeployAccountTransaction, InvokeTransactionV1};
-use starknet_api::api_core::ContractAddress;
+use starknet_api::api_core::{ContractAddress, Nonce};
use starknet_api::hash::StarkFelt;
use self::mock::default_mock::{MockRuntime, Starknet};
@@ -11,7 +11,7 @@ use self::mock::{get_account_address, AccountType};
use crate::blockifier_state_adapter::BlockifierStateAdapter;
use crate::tests::mock::account_helper;
use crate::tests::utils::sign_message_hash;
-use crate::Config;
+use crate::{Config, Nonces};
mod account_helper;
mod call_contract;
@@ -219,3 +219,8 @@ pub fn set_infinite_tokens(contract_address: &ContractAddress) {
state_adapter.set_storage_at(fee_token_address, low_key, StarkFelt::from(u64::MAX as u128));
state_adapter.set_storage_at(fee_token_address, high_key, StarkFelt::from(u64::MAX as u128));
}
+
+/// Sets nonce for the given address.
+pub fn set_nonce(address: &ContractAddress, nonce: &Nonce) {
+ Nonces::::insert(address, nonce)
+}
diff --git a/crates/pallets/starknet/src/tests/query_tx.rs b/crates/pallets/starknet/src/tests/query_tx.rs
index 15a602dedb..215fb7aae1 100644
--- a/crates/pallets/starknet/src/tests/query_tx.rs
+++ b/crates/pallets/starknet/src/tests/query_tx.rs
@@ -17,14 +17,14 @@ fn estimates_tx_fee_successfully_no_validate() {
let tx = get_invoke_dummy(Felt252Wrapper::ZERO);
let tx = UserTransaction::Invoke(tx.into());
- let (actual, l1_gas_usage) = Starknet::estimate_fee(tx).unwrap();
+ let (actual, l1_gas_usage) = Starknet::estimate_fee(tx, true).unwrap();
assert!(actual > 0, "actual fee is missing");
assert!(l1_gas_usage == 0, "this should not be charged any l1_gas as it does not store nor send messages");
let tx = get_storage_read_write_dummy();
let tx = UserTransaction::Invoke(tx.into());
- let (actual, l1_gas_usage) = Starknet::estimate_fee(tx).unwrap();
+ let (actual, l1_gas_usage) = Starknet::estimate_fee(tx, true).unwrap();
assert!(actual > 0, "actual fee is missing");
assert!(l1_gas_usage > 0, "this should be charged l1_gas as it store a value to storage");
});
@@ -39,7 +39,7 @@ fn estimates_tx_fee_with_query_version() {
let pre_storage = Starknet::pending().len();
let tx = UserTransaction::Invoke(tx.into());
- assert_ok!(Starknet::estimate_fee(tx));
+ assert_ok!(Starknet::estimate_fee(tx, true));
assert!(pre_storage == Starknet::pending().len(), "estimate should not add a tx to pending");
});
@@ -57,7 +57,7 @@ fn executable_tx_should_not_be_estimable() {
// it should not be valid for estimate calls
assert_err!(
- Starknet::estimate_fee(UserTransaction::Invoke(tx.clone().into())),
+ Starknet::estimate_fee(UserTransaction::Invoke(tx.clone().into()), true),
Error::::TransactionExecutionFailed
);
@@ -77,7 +77,7 @@ fn query_tx_should_not_be_executable() {
tx.signature = sign_message_hash(tx_hash);
// it should be valid for estimate calls
- assert_ok!(Starknet::estimate_fee(UserTransaction::Invoke(tx.clone().into())),);
+ assert_ok!(Starknet::estimate_fee(UserTransaction::Invoke(tx.clone().into()), true),);
// it should not be executable
assert_err!(
diff --git a/crates/pallets/starknet/src/tests/utils.rs b/crates/pallets/starknet/src/tests/utils.rs
index 7f6859ee1b..53b0348152 100644
--- a/crates/pallets/starknet/src/tests/utils.rs
+++ b/crates/pallets/starknet/src/tests/utils.rs
@@ -5,6 +5,8 @@ use std::{env, fs};
use blockifier::execution::contract_class::ContractClass;
use mp_felt::Felt252Wrapper;
+use mp_hashers::pedersen::PedersenHasher;
+use mp_hashers::HasherT;
use mp_transactions::{InvokeTransaction, InvokeTransactionV1};
use starknet_api::api_core::EntryPointSelector;
use starknet_api::hash::StarkFelt;
@@ -28,6 +30,30 @@ pub fn get_contract_class(resource_path: &str, version: u8) -> ContractClass {
read_contract_class_from_json(&raw_contract_class, version)
}
+pub fn sign_message_hash_braavos(
+ tx_hash: Felt252Wrapper,
+ actual_impl_hash: Felt252Wrapper,
+ signer_model: &[Felt252Wrapper; 7],
+) -> Vec {
+ // struct SignerModel {
+ // signer_0: felt,
+ // signer_1: felt,
+ // signer_2: felt,
+ // signer_3: felt,
+ // type: felt,
+ // reserved_0: felt,
+ // reserved_1: felt,
+ // }
+ let mut elements = vec![tx_hash.0, actual_impl_hash.0];
+ elements.extend_from_slice(&signer_model.iter().map(|e| e.0).collect::