From 6d0d5f7920bb35a884406b3f2fab894d8a284131 Mon Sep 17 00:00:00 2001 From: Thomas Butler <58192340+trbutler4@users.noreply.github.com> Date: Tue, 3 Oct 2023 13:17:38 -0500 Subject: [PATCH 01/45] feat: use actual resource cost (#1139) --- CHANGELOG.md | 1 + .../starknet/src/tests/deploy_account_tx.rs | 2 +- crates/pallets/starknet/src/tests/erc20.rs | 4 ++-- crates/pallets/starknet/src/tests/invoke_tx.rs | 4 ++-- crates/primitives/fee/src/lib.rs | 17 +++++++---------- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd43a3d7bf..fd61d3f28c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next release +- 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 diff --git a/crates/pallets/starknet/src/tests/deploy_account_tx.rs b/crates/pallets/starknet/src/tests/deploy_account_tx.rs index 9397f58980..f035ef7e69 100644 --- a/crates/pallets/starknet/src/tests/deploy_account_tx.rs +++ b/crates/pallets/starknet/src/tests/deploy_account_tx.rs @@ -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 ]), }, 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..6f603a4c2b 100644 --- a/crates/pallets/starknet/src/tests/invoke_tx.rs +++ b/crates/pallets/starknet/src/tests/invoke_tx.rs @@ -96,7 +96,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 +142,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 ]), }, diff --git a/crates/primitives/fee/src/lib.rs b/crates/primitives/fee/src/lib.rs index a4838da243..25160dd443 100644 --- a/crates/primitives/fee/src/lib.rs +++ b/crates/primitives/fee/src/lib.rs @@ -33,17 +33,14 @@ pub const FEE_TRANSFER_N_STORAGE_CHANGES: u8 = 2; // Sender and sequencer balanc /// Number of storage updates to actually charge for the fee transfer tx. pub const FEE_TRANSFER_N_STORAGE_CHANGES_TO_CHARGE: u8 = FEE_TRANSFER_N_STORAGE_CHANGES - 1; // Exclude the sequencer balance update, since it's charged once throughout the batch. -// TODO: add real values here. -// FIXME: https://github.com/keep-starknet-strange/madara/issues/330 static VM_RESOURCE_FEE_COSTS: phf::Map<&'static str, f64> = phf_map! { - "n_steps" => 1_f64, - "pedersen_builtin" => 1_f64, - "range_check_builtin" => 1_f64, - "ecdsa_builtin" => 1_f64, - "bitwise_builtin" => 1_f64, - "poseidon_builtin" => 1_f64, - "output_builtin" => 1_f64, - "ec_op_builtin" => 1_f64, + "n_steps" => 0.01_f64, + "pedersen_builtin" => 0.32_f64, + "range_check_builtin" => 0.16_f64, + "ecdsa_builtin" => 20.48_f64, + "bitwise_builtin" => 0.64_f64, + "poseidon_builtin" => 0.32_f64, + "ec_op_builtin" => 10.24_f64, }; /// Gets the transaction resources. From 6207f1c3a1376ac9e26d3a18a9685328422ec580 Mon Sep 17 00:00:00 2001 From: Ayush Tomar <41674634+ayushtom@users.noreply.github.com> Date: Wed, 4 Oct 2023 02:54:08 +0530 Subject: [PATCH 02/45] fix: add mp-sequencer-address in pallet crate (#1162) --- .vscode/settings.json | 7 +------ CHANGELOG.md | 1 + crates/pallets/starknet/Cargo.toml | 2 ++ 3 files changed, 4 insertions(+), 6 deletions(-) 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 fd61d3f28c..b808400b5c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next release +- dev: fix rpc test failing - feat: use actual vm resource costs - fix: add setup and run for rpc tests - fix: fix clap for run command diff --git a/crates/pallets/starknet/Cargo.toml b/crates/pallets/starknet/Cargo.toml index 900e216019..8045bcebc1 100644 --- a/crates/pallets/starknet/Cargo.toml +++ b/crates/pallets/starknet/Cargo.toml @@ -96,6 +96,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", From 1b4457c854e55858719e72acb6b7829cbc46f4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Delabrouille?= <34384633+tdelabro@users.noreply.github.com> Date: Fri, 6 Oct 2023 15:29:30 +0200 Subject: [PATCH 03/45] chore: release v0.4.0 (#1171) --- CHANGELOG.md | 15 +++++++++------ Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b808400b5c..5ab66469f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,21 +2,24 @@ ## Next release -- dev: fix rpc test failing +## 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 ## v0.3.0 diff --git a/Cargo.toml b/Cargo.toml index c3ca56aec1..8114572fe5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,7 +39,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.4.0" [workspace.dependencies] # Substrate frame dependencies From cd8c1cedb958ee77fad2afba28589adc66084258 Mon Sep 17 00:00:00 2001 From: antiyro Date: Fri, 6 Oct 2023 15:36:00 +0200 Subject: [PATCH 04/45] implemented transaction verification --- crates/client/block-proposer/src/lib.rs | 6 ++++ crates/client/data-availability/src/utils.rs | 35 ++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/crates/client/block-proposer/src/lib.rs b/crates/client/block-proposer/src/lib.rs index db32ad75dd..752b3e4b19 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 or handle it appropriately. + 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/data-availability/src/utils.rs b/crates/client/data-availability/src/utils.rs index c4b13c70da..f0977f3cb3 100644 --- a/crates/client/data-availability/src/utils.rs +++ b/crates/client/data-availability/src/utils.rs @@ -5,6 +5,8 @@ use lazy_static::lazy_static; use mp_storage::{ PALLET_STARKNET, STARKNET_CONTRACT_CLASS, STARKNET_CONTRACT_CLASS_HASH, STARKNET_NONCE, STARKNET_STORAGE, }; +use reqwest::{StatusCode, header::{HeaderMap, CONTENT_TYPE}}; +use serde_json::json; use sp_io::hashing::twox_128; use url::{ParseError, Url}; @@ -67,3 +69,36 @@ pub fn is_valid_ws_endpoint(endpoint: &str) -> bool { pub fn is_valid_http_endpoint(endpoint: &str) -> bool { if let Ok(url) = get_valid_url(endpoint) { matches!(url.scheme(), "http" | "https") } else { false } } + +async fn create_block(rpc_port: u16) -> Result { + let client = reqwest::Client::new(); + let mut headers = HeaderMap::new(); + headers.insert(CONTENT_TYPE, "application/json ".parse().unwrap()); + + let url = format!("http://localhost:{}/", rpc_port); + let payload = json!({ + "id": 1, + "jsonrpc": "2.0", + "method": "engine_createBlock", + "params": [true, true, null] + }); + + let response = client.post(url) + .headers(headers.clone()) + .json(&payload) + .send().await?; + + Ok(response.status()) +} + + +/// Check for digest for the last block and create block if it has at least x txs +pub async fn check_block(rpc_port: u16) -> Result<(), reqwest::Error> { + let mut status = create_block(rpc_port).await?; + + while status != StatusCode::OK { + status = create_block(rpc_port).await?; + } + + Ok(()) +} \ No newline at end of file From e47db87f8bc5bdde5227846c34bc8d0011f8c455 Mon Sep 17 00:00:00 2001 From: antiyro Date: Sat, 7 Oct 2023 11:34:35 +0200 Subject: [PATCH 05/45] cleaned up --- crates/client/block-proposer/src/lib.rs | 2 +- crates/client/data-availability/src/utils.rs | 33 -------------------- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/crates/client/block-proposer/src/lib.rs b/crates/client/block-proposer/src/lib.rs index 752b3e4b19..4bfc2f01b1 100644 --- a/crates/client/block-proposer/src/lib.rs +++ b/crates/client/block-proposer/src/lib.rs @@ -216,7 +216,7 @@ where let spawn_handle = self.spawn_handle.clone(); let txs = self.transaction_pool.ready().count() > 0; - // If there are no transactions, return an error or handle it appropriately. + // 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(); } diff --git a/crates/client/data-availability/src/utils.rs b/crates/client/data-availability/src/utils.rs index f0977f3cb3..425aadd8c4 100644 --- a/crates/client/data-availability/src/utils.rs +++ b/crates/client/data-availability/src/utils.rs @@ -68,37 +68,4 @@ pub fn is_valid_ws_endpoint(endpoint: &str) -> bool { pub fn is_valid_http_endpoint(endpoint: &str) -> bool { if let Ok(url) = get_valid_url(endpoint) { matches!(url.scheme(), "http" | "https") } else { false } -} - -async fn create_block(rpc_port: u16) -> Result { - let client = reqwest::Client::new(); - let mut headers = HeaderMap::new(); - headers.insert(CONTENT_TYPE, "application/json ".parse().unwrap()); - - let url = format!("http://localhost:{}/", rpc_port); - let payload = json!({ - "id": 1, - "jsonrpc": "2.0", - "method": "engine_createBlock", - "params": [true, true, null] - }); - - let response = client.post(url) - .headers(headers.clone()) - .json(&payload) - .send().await?; - - Ok(response.status()) -} - - -/// Check for digest for the last block and create block if it has at least x txs -pub async fn check_block(rpc_port: u16) -> Result<(), reqwest::Error> { - let mut status = create_block(rpc_port).await?; - - while status != StatusCode::OK { - status = create_block(rpc_port).await?; - } - - Ok(()) } \ No newline at end of file From 407e8575dd4b1900ed757438e64485ebe5cc7f6f Mon Sep 17 00:00:00 2001 From: kasteph Date: Mon, 9 Oct 2023 18:51:11 +0200 Subject: [PATCH 06/45] test: add e2e test for rpc's estimate_fee (#1153) --- CHANGELOG.md | 1 + starknet-rpc-test/Cargo.toml | 4 + starknet-rpc-test/estimate_fee.rs | 121 ++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 starknet-rpc-test/estimate_fee.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ab66469f8..f23870d27b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ 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/starknet-rpc-test/Cargo.toml b/starknet-rpc-test/Cargo.toml index 01a92ea125..7e67decaa7 100644 --- a/starknet-rpc-test/Cargo.toml +++ b/starknet-rpc-test/Cargo.toml @@ -105,3 +105,7 @@ path = "get_transaction_receipt.rs" [[test]] name = "starknet_get_events" path = "get_events.rs" + +[[test]] +name = "starknet_estimate_fee" +path = "estimate_fee.rs" diff --git a/starknet-rpc-test/estimate_fee.rs b/starknet-rpc-test/estimate_fee.rs new file mode 100644 index 0000000000..0bfe32a0c9 --- /dev/null +++ b/starknet-rpc-test/estimate_fee.rs @@ -0,0 +1,121 @@ +extern crate starknet_rpc_test; + +use assert_matches::assert_matches; +use rstest::rstest; +use starknet_core::types::{BlockId, BlockTag, BroadcastedInvokeTransaction, BroadcastedTransaction, StarknetError}; +use starknet_ff::FieldElement; +use starknet_providers::ProviderError::StarknetError as StarknetProviderError; +use starknet_providers::{MaybeUnknownErrorCode, Provider, StarknetErrorWithMessage}; +use starknet_rpc_test::constants::ACCOUNT_CONTRACT; +use starknet_rpc_test::fixtures::madara; +use starknet_rpc_test::MadaraClient; + +#[rstest] +#[tokio::test] +async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { + let madara = madara.await; + let rpc = madara.get_starknet_client(); + + let ok_invoke_transaction = BroadcastedTransaction::Invoke(BroadcastedInvokeTransaction { + max_fee: FieldElement::ZERO, + signature: vec![], + nonce: FieldElement::ZERO, + sender_address: FieldElement::from_hex_be(ACCOUNT_CONTRACT).unwrap(), + calldata: vec![ + FieldElement::from_hex_be("5a02acdbf218464be3dd787df7a302f71fab586cad5588410ba88b3ed7b3a21").unwrap(), + FieldElement::from_hex_be("3d7905601c217734671143d457f0db37f7f8883112abd34b92c4abfeafde0c3").unwrap(), + FieldElement::from_hex_be("2").unwrap(), + FieldElement::from_hex_be("e150b6c2db6ed644483b01685571de46d2045f267d437632b508c19f3eb877").unwrap(), + FieldElement::from_hex_be("494196e88ce16bff11180d59f3c75e4ba3475d9fba76249ab5f044bcd25add6").unwrap(), + ], + is_query: true, + }); + + assert_matches!( + rpc.estimate_fee(&vec![ok_invoke_transaction], BlockId::Hash(FieldElement::ZERO)).await, + Err(StarknetProviderError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::BlockNotFound + ); + + Ok(()) +} + +#[rstest] +#[tokio::test] +async fn fail_if_one_txn_cannot_be_executed(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { + let madara = madara.await; + let rpc = madara.get_starknet_client(); + + madara.create_empty_block().await?; + + let bad_invoke_transaction = BroadcastedTransaction::Invoke(BroadcastedInvokeTransaction { + max_fee: FieldElement::default(), + nonce: FieldElement::ZERO, + sender_address: FieldElement::default(), + signature: vec![], + calldata: vec![FieldElement::from_hex_be("0x0").unwrap()], + is_query: true, + }); + + // from mainnet tx: 0x000c52079f33dcb44a58904fac3803fd908ac28d6632b67179ee06f2daccb4b5 + // https://starkscan.co/tx/0x000c52079f33dcb44a58904fac3803fd908ac28d6632b67179ee06f2daccb4b5 + let ok_invoke_transaction = BroadcastedTransaction::Invoke(BroadcastedInvokeTransaction { + max_fee: FieldElement::ZERO, + signature: vec![], + nonce: FieldElement::ZERO, + sender_address: FieldElement::from_hex_be(ACCOUNT_CONTRACT).unwrap(), + calldata: vec![ + FieldElement::from_hex_be("5a02acdbf218464be3dd787df7a302f71fab586cad5588410ba88b3ed7b3a21").unwrap(), + FieldElement::from_hex_be("3d7905601c217734671143d457f0db37f7f8883112abd34b92c4abfeafde0c3").unwrap(), + FieldElement::from_hex_be("2").unwrap(), + FieldElement::from_hex_be("e150b6c2db6ed644483b01685571de46d2045f267d437632b508c19f3eb877").unwrap(), + FieldElement::from_hex_be("494196e88ce16bff11180d59f3c75e4ba3475d9fba76249ab5f044bcd25add6").unwrap(), + ], + is_query: true, + }); + + assert_matches!( + rpc.estimate_fee(&vec![ + bad_invoke_transaction, + ok_invoke_transaction, + ], BlockId::Tag(BlockTag::Latest)).await, + Err(StarknetProviderError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::ContractError + ); + + Ok(()) +} + +#[rstest] +#[tokio::test] +async fn works_ok(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { + let madara = madara.await; + let rpc = madara.get_starknet_client(); + + // from mainnet tx: 0x000c52079f33dcb44a58904fac3803fd908ac28d6632b67179ee06f2daccb4b5 + // https://starkscan.co/tx/0x000c52079f33dcb44a58904fac3803fd908ac28d6632b67179ee06f2daccb4b5 + let invoke_transaction = BroadcastedTransaction::Invoke(BroadcastedInvokeTransaction { + max_fee: FieldElement::ZERO, + signature: vec![], + nonce: FieldElement::ZERO, + sender_address: FieldElement::from_hex_be(ACCOUNT_CONTRACT).unwrap(), + calldata: vec![ + FieldElement::from_hex_be("5a02acdbf218464be3dd787df7a302f71fab586cad5588410ba88b3ed7b3a21").unwrap(), + FieldElement::from_hex_be("3d7905601c217734671143d457f0db37f7f8883112abd34b92c4abfeafde0c3").unwrap(), + FieldElement::from_hex_be("2").unwrap(), + FieldElement::from_hex_be("e150b6c2db6ed644483b01685571de46d2045f267d437632b508c19f3eb877").unwrap(), + FieldElement::from_hex_be("494196e88ce16bff11180d59f3c75e4ba3475d9fba76249ab5f044bcd25add6").unwrap(), + ], + is_query: true, + }); + + let estimate = + rpc.estimate_fee(&vec![invoke_transaction.clone(), invoke_transaction], BlockId::Tag(BlockTag::Latest)).await?; + + assert_eq!(estimate.len(), 2); + assert_eq!(estimate[0].overall_fee, 410); + assert_eq!(estimate[1].overall_fee, 410); + // https://starkscan.co/block/5 + assert_eq!(estimate[0].gas_consumed, 0); + assert_eq!(estimate[1].gas_consumed, 0); + + Ok(()) +} From 7364b5c83c5d224af870c220124b0e24c083619b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 13:57:39 +0900 Subject: [PATCH 07/45] build(deps): bump reqwest from 0.11.20 to 0.11.22 (#1174) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Oak <5263301+d-roak@users.noreply.github.com> --- Cargo.lock | 45 ++++++++++++++++++------------------ Cargo.toml | 2 +- starknet-rpc-test/Cargo.toml | 2 +- 3 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6528a35562..7c491da0af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6067,7 +6067,7 @@ dependencies = [ [[package]] name = "madara" -version = "0.3.0" +version = "0.4.0" dependencies = [ "async-trait", "blockifier", @@ -6131,7 +6131,7 @@ dependencies = [ [[package]] name = "madara-runtime" -version = "0.3.0" +version = "0.4.0" dependencies = [ "blockifier", "frame-benchmarking", @@ -6221,7 +6221,7 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "mc-block-proposer" -version = "0.3.0" +version = "0.4.0" dependencies = [ "futures", "futures-timer", @@ -6281,7 +6281,7 @@ dependencies = [ [[package]] name = "mc-db" -version = "0.3.0" +version = "0.4.0" dependencies = [ "ethers", "kvdb-rocksdb", @@ -6297,7 +6297,7 @@ dependencies = [ [[package]] name = "mc-mapping-sync" -version = "0.3.0" +version = "0.4.0" dependencies = [ "futures", "futures-timer", @@ -6318,7 +6318,7 @@ dependencies = [ [[package]] name = "mc-rpc" -version = "0.3.0" +version = "0.4.0" dependencies = [ "blockifier", "frame-support", @@ -6354,7 +6354,7 @@ dependencies = [ [[package]] name = "mc-rpc-core" -version = "0.3.0" +version = "0.4.0" dependencies = [ "anyhow", "assert_matches", @@ -6385,7 +6385,7 @@ dependencies = [ [[package]] name = "mc-storage" -version = "0.3.0" +version = "0.4.0" dependencies = [ "blockifier", "frame-support", @@ -6597,7 +6597,7 @@ dependencies = [ [[package]] name = "mp-block" -version = "0.3.0" +version = "0.4.0" dependencies = [ "blockifier", "mp-felt", @@ -6611,7 +6611,7 @@ dependencies = [ [[package]] name = "mp-chain-id" -version = "0.3.0" +version = "0.4.0" dependencies = [ "mp-felt", "starknet-ff", @@ -6619,7 +6619,7 @@ dependencies = [ [[package]] name = "mp-commitments" -version = "0.3.0" +version = "0.4.0" dependencies = [ "bitvec", "derive_more", @@ -6637,7 +6637,7 @@ dependencies = [ [[package]] name = "mp-digest-log" -version = "0.3.0" +version = "0.4.0" dependencies = [ "assert_matches", "mp-block", @@ -6647,7 +6647,7 @@ dependencies = [ [[package]] name = "mp-fee" -version = "0.3.0" +version = "0.4.0" dependencies = [ "blockifier", "mp-state", @@ -6657,7 +6657,7 @@ dependencies = [ [[package]] name = "mp-felt" -version = "0.3.0" +version = "0.4.0" dependencies = [ "cairo-vm", "hex", @@ -6672,7 +6672,7 @@ dependencies = [ [[package]] name = "mp-hashers" -version = "0.3.0" +version = "0.4.0" dependencies = [ "mp-felt", "parity-scale-codec", @@ -6684,7 +6684,7 @@ dependencies = [ [[package]] name = "mp-sequencer-address" -version = "0.3.0" +version = "0.4.0" dependencies = [ "async-trait", "parity-scale-codec", @@ -6695,7 +6695,7 @@ dependencies = [ [[package]] name = "mp-state" -version = "0.3.0" +version = "0.4.0" dependencies = [ "blockifier", "starknet_api", @@ -6703,7 +6703,7 @@ dependencies = [ [[package]] name = "mp-storage" -version = "0.3.0" +version = "0.4.0" dependencies = [ "parity-scale-codec", "serde", @@ -6711,7 +6711,7 @@ dependencies = [ [[package]] name = "mp-transactions" -version = "0.3.0" +version = "0.4.0" dependencies = [ "assert_matches", "blockifier", @@ -7588,7 +7588,7 @@ dependencies = [ [[package]] name = "pallet-starknet" -version = "0.3.0" +version = "0.4.0" dependencies = [ "assert_matches", "blockifier", @@ -8767,9 +8767,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", @@ -8795,6 +8795,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", diff --git a/Cargo.toml b/Cargo.toml index 8114572fe5..63879ceb7f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -189,7 +189,7 @@ 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 } +reqwest = { version = "0.11.22", default-features = false } serde = { version = "1.0.188", default-features = false } serde_json = { version = "1.0.107", default-features = false } serde_with = { version = "2.3.3", default-features = false } diff --git a/starknet-rpc-test/Cargo.toml b/starknet-rpc-test/Cargo.toml index 7e67decaa7..80bb785f9b 100644 --- a/starknet-rpc-test/Cargo.toml +++ b/starknet-rpc-test/Cargo.toml @@ -11,7 +11,7 @@ assert_matches = "1.5.0" derive_more = "0.99.17" flate2 = { workspace = true } lazy_static = "1.4.0" -reqwest = "0.11.18" +reqwest = "0.11.22" rstest = "0.18.1" serde = { version = "1.0.179", features = ["derive"] } serde_json = "1.0.107" From fd6ec548954e18188535e8d18cc4460eef5f8f4f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 14:12:27 +0900 Subject: [PATCH 08/45] build(deps): bump num-traits from 0.2.16 to 0.2.17 (#1173) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Oak <5263301+d-roak@users.noreply.github.com> --- Cargo.lock | 110 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 2 +- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7c491da0af..79218369cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", @@ -811,7 +811,7 @@ checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" dependencies = [ "num-bigint", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", "serde", ] @@ -1024,7 +1024,7 @@ dependencies = [ "log", "num-bigint", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", "parity-scale-codec", "phf", "scale-info", @@ -1166,7 +1166,7 @@ dependencies = [ "lazy_static", "num-bigint", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", "parity-scale-codec", "serde", ] @@ -1180,7 +1180,7 @@ dependencies = [ "hashbrown 0.14.1", "indoc", "num-bigint", - "num-traits 0.2.16", + "num-traits 0.2.17", "parity-scale-codec", "parity-scale-codec-derive", "serde", @@ -1303,7 +1303,7 @@ dependencies = [ "itertools 0.10.5", "log", "num-bigint", - "num-traits 0.2.16", + "num-traits 0.2.17", "once_cell", "salsa", "smol_str", @@ -1323,7 +1323,7 @@ dependencies = [ "itertools 0.10.5", "log", "num-bigint", - "num-traits 0.2.16", + "num-traits 0.2.17", "salsa", "smol_str", "unescaper", @@ -1389,7 +1389,7 @@ dependencies = [ "itertools 0.10.5", "log", "num-bigint", - "num-traits 0.2.16", + "num-traits 0.2.17", "once_cell", "salsa", "smol_str", @@ -1408,7 +1408,7 @@ dependencies = [ "lalrpop", "lalrpop-util", "num-bigint", - "num-traits 0.2.16", + "num-traits 0.2.17", "regex", "salsa", "serde", @@ -1486,7 +1486,7 @@ dependencies = [ "itertools 0.10.5", "log", "num-bigint", - "num-traits 0.2.16", + "num-traits 0.2.17", "thiserror", ] @@ -1531,7 +1531,7 @@ dependencies = [ "log", "num-bigint", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", "once_cell", "serde", "serde_json", @@ -1549,7 +1549,7 @@ dependencies = [ "cairo-lang-filesystem", "cairo-lang-utils", "num-bigint", - "num-traits 0.2.16", + "num-traits 0.2.17", "salsa", "smol_str", "thiserror", @@ -1576,7 +1576,7 @@ dependencies = [ "itertools 0.10.5", "num-bigint", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", "parity-scale-codec", "serde", ] @@ -1595,7 +1595,7 @@ dependencies = [ "hashbrown 0.14.1", "num-bigint", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -1629,7 +1629,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", @@ -1820,7 +1820,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", @@ -2653,7 +2653,7 @@ dependencies = [ "displaydoc", "nom", "num-bigint", - "num-traits 0.2.16", + "num-traits 0.2.17", "rusticata-macros", ] @@ -2667,7 +2667,7 @@ dependencies = [ "displaydoc", "nom", "num-bigint", - "num-traits 0.2.16", + "num-traits 0.2.17", "rusticata-macros", ] @@ -3639,7 +3639,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", @@ -3690,7 +3690,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]] @@ -4892,7 +4892,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]] @@ -6414,7 +6414,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", @@ -6882,7 +6882,7 @@ dependencies = [ "nalgebra-macros", "num-complex 0.4.4", "num-rational", - "num-traits 0.2.16", + "num-traits 0.2.17", "simba", "typenum", ] @@ -6934,7 +6934,7 @@ dependencies = [ "matrixmultiply 0.2.4", "num-complex 0.2.4", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", "rawpointer", ] @@ -7067,7 +7067,7 @@ checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" dependencies = [ "autocfg", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", "rand 0.8.5", "serde", ] @@ -7079,7 +7079,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]] @@ -7088,7 +7088,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]] @@ -7119,7 +7119,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]] @@ -7130,7 +7130,7 @@ checksum = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119" dependencies = [ "num-bigint", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -7145,7 +7145,7 @@ dependencies = [ "num-bigint", "num-integer", "num-modular", - "num-traits 0.2.16", + "num-traits 0.2.17", "rand 0.8.5", ] @@ -7158,7 +7158,7 @@ dependencies = [ "autocfg", "num-bigint", "num-integer", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] @@ -7167,14 +7167,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", @@ -8317,7 +8317,7 @@ dependencies = [ "bitflags 1.3.2", "byteorder", "lazy_static", - "num-traits 0.2.16", + "num-traits 0.2.17", "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", @@ -9471,7 +9471,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", @@ -10210,7 +10210,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", @@ -10839,7 +10839,7 @@ checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae" dependencies = [ "approx", "num-complex 0.4.4", - "num-traits 0.2.16", + "num-traits 0.2.17", "paste", "wide", ] @@ -10851,7 +10851,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", ] @@ -11042,7 +11042,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", @@ -11057,7 +11057,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", @@ -12129,7 +12129,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", @@ -12149,7 +12149,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", @@ -12824,7 +12824,7 @@ dependencies = [ "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", @@ -12849,7 +12849,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", @@ -13937,7 +13937,7 @@ dependencies = [ "libm", "memory_units", "num-rational", - "num-traits 0.2.16", + "num-traits 0.2.17", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 63879ceb7f..f33e7071b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -203,6 +203,6 @@ linked-hash-map = { version = "0.5.6", default-features = false } parking_lot = "0.12.1" async-trait = "0.1.73" 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 } From 36f1cbea70128d49ae3e61481456a57c97491a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Delabrouille?= <34384633+tdelabro@users.noreply.github.com> Date: Wed, 11 Oct 2023 11:42:29 +0200 Subject: [PATCH 09/45] refacto: improve node cli (#1165) --- .github/workflows/madara-commands.yml | 2 +- CHANGELOG.md | 18 ++ Cargo.lock | 10 + Cargo.toml | 1 + README.md | 2 +- crates/node/Cargo.toml | 5 + crates/node/src/chain_spec.rs | 51 +++-- crates/node/src/cli.rs | 71 +------ crates/node/src/command.rs | 190 +++--------------- crates/node/src/commands/mod.rs | 5 + crates/node/src/commands/run.rs | 87 ++++++++ crates/node/src/commands/setup.rs | 182 +++++++++++++++++ crates/node/src/configs.rs | 25 +-- crates/node/src/constants.rs | 5 +- crates/node/src/main.rs | 1 + crates/node/src/service.rs | 2 +- crates/pallets/starknet/Cargo.toml | 2 + crates/pallets/starknet/src/genesis_loader.rs | 73 +++---- crates/pallets/starknet/src/lib.rs | 3 - .../starknet/src/tests/mock/setup_mock.rs | 7 +- crates/pallets/starknet/src/utils.rs | 98 --------- docs/getting-started.md | 6 +- docs/rpc-contribution.md | 2 +- docs/sharingan-starter-pack.md | 2 +- 24 files changed, 416 insertions(+), 434 deletions(-) create mode 100644 crates/node/src/commands/mod.rs create mode 100644 crates/node/src/commands/run.rs create mode 100644 crates/node/src/commands/setup.rs delete mode 100644 crates/pallets/starknet/src/utils.rs diff --git a/.github/workflows/madara-commands.yml b/.github/workflows/madara-commands.yml index 9e72f7ee1f..c4ccb2a79c 100644 --- a/.github/workflows/madara-commands.yml +++ b/.github/workflows/madara-commands.yml @@ -24,7 +24,7 @@ jobs: 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 diff --git a/CHANGELOG.md b/CHANGELOG.md index f23870d27b..c7b25dce17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,24 @@ ## Next release +- 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 + ## v0.4.0 - chore: release v0.4.0 diff --git a/Cargo.lock b/Cargo.lock index 79218369cc..7b6c0efa65 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6093,6 +6093,7 @@ dependencies = [ "mp-felt", "mp-sequencer-address", "pallet-starknet", + "reqwest", "sc-cli", "sc-client-api", "sc-consensus", @@ -6127,6 +6128,7 @@ dependencies = [ "substrate-frame-rpc-system", "substrate-prometheus-endpoint", "try-runtime-cli", + "url", ] [[package]] @@ -7593,6 +7595,7 @@ dependencies = [ "assert_matches", "blockifier", "cairo-lang-casm-contract-class", + "derive_more", "frame-benchmarking", "frame-support", "frame-system", @@ -7615,6 +7618,7 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "pretty_assertions", + "project-root", "reqwest", "sc-cli", "scale-info", @@ -8271,6 +8275,12 @@ 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" diff --git a/Cargo.toml b/Cargo.toml index f33e7071b2..25b38f025a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -206,3 +206,4 @@ indexmap = { git = "https://github.com/bluss/indexmap", rev = "ca5f848e10c31e80a num-traits = "0.2.17" num-bigint = "0.4.4" phf = { version = "0.11", default-features = false } +url = "2.4.1" diff --git a/README.md b/README.md index 29d0bc38c9..272db1b998 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,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 diff --git a/crates/node/Cargo.toml b/crates/node/Cargo.toml index c0e37a4b38..cc7355ef82 100644 --- a/crates/node/Cargo.toml +++ b/crates/node/Cargo.toml @@ -94,7 +94,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 +113,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..d35de96c80 100644 --- a/crates/node/src/chain_spec.rs +++ b/crates/node/src/chain_spec.rs @@ -2,9 +2,8 @@ use std::path::PathBuf; use madara_runtime::{AuraConfig, EnableManualSeal, GenesisConfig, GrandpaConfig, 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; @@ -50,23 +54,25 @@ 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(enable_manual_seal: Option, 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")], @@ -93,10 +99,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 +116,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 +151,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..a801228ade 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,9 +44,6 @@ pub enum Subcommand { /// Revert the chain to a previous state. Revert(sc_cli::RevertCmd), - // Run madara node - Run(ExtendedRunCmd), - // Setup madara node Setup(SetupCmd), diff --git a/crates/node/src/command.rs b/crates/node/src/command.rs index 5bf981e9cc..b3061526f2 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() @@ -36,17 +37,20 @@ impl SubstrateCli for Cli { 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 enable_manual_seal = self.run.sealing.map(|_| true); + let base_path = self.run.base_path().map_err(|e| e.to_string())?; + Box::new(chain_spec::development_config(enable_manual_seal, 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), @@ -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..110d9ef408 --- /dev/null +++ b/crates/node/src/commands/run.rs @@ -0,0 +1,87 @@ +use std::path::PathBuf; + +use mc_data_availability::DaLayer; +use sc_cli::{Result, RpcMethods, RunCmd, SubstrateCli}; +use sc_service::BasePath; + +use crate::cli::Cli; +use crate::service; + +/// 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, +} + +#[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, +} + +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 + } + }; + let sealing = cli.run.sealing; + + runner.run_node_until_exit(|config| async move { + service::new_full(config, sealing, da_config).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 8bffe87571..063a0f9d6b 100644 --- a/crates/node/src/service.rs +++ b/crates/node/src/service.rs @@ -41,7 +41,7 @@ use sp_offchain::STORAGE_PREFIX; use sp_runtime::traits::BlakeTwo256; use sp_trie::PrefixedMemoryDB; -use crate::cli::Sealing; +use crate::commands::Sealing; use crate::genesis_block::MadaraGenesisBlockBuilder; use crate::rpc::StarknetDeps; use crate::starknet::{db_config_dir, MadaraBackend}; diff --git a/crates/pallets/starknet/Cargo.toml b/crates/pallets/starknet/Cargo.toml index 8045bcebc1..476434e714 100644 --- a/crates/pallets/starknet/Cargo.toml +++ b/crates/pallets/starknet/Cargo.toml @@ -58,6 +58,7 @@ sp-std = { workspace = true } cairo-lang-casm-contract-class = { workspace = true, optional = true, features = [ "std", ] } +derive_more = { workspace = true } hex = { workspace = true } indexmap = { workspace = true } log = { workspace = true } @@ -79,6 +80,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"] diff --git a/crates/pallets/starknet/src/genesis_loader.rs b/crates/pallets/starknet/src/genesis_loader.rs index 841b78455d..edc8cf2a69 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)], diff --git a/crates/pallets/starknet/src/lib.rs b/crates/pallets/starknet/src/lib.rs index f6813e7641..9262ccc8f8 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; 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/utils.rs b/crates/pallets/starknet/src/utils.rs deleted file mode 100644 index 60fa2be185..0000000000 --- a/crates/pallets/starknet/src/utils.rs +++ /dev/null @@ -1,98 +0,0 @@ -#[derive(Debug)] -pub enum Error { - Cli(sc_cli::Error), -} - -impl From for sc_cli::Error { - fn from(err: Error) -> Self { - match err { - Error::Cli(err) => err, - } - } -} - -impl From for String { - fn from(err: Error) -> Self { - match err { - Error::Cli(err) => err.to_string(), - } - } -} - -impl From> for Error { - fn from(err: Box) -> Self { - Error::Cli(sc_cli::Error::Input(err.to_string())) - } -} - -impl From for Error { - fn from(err: std::io::Error) -> Self { - Error::Cli(sc_cli::Error::Io(err)) - } -} - -impl From for Error { - fn from(err: reqwest::Error) -> Self { - Error::Cli(sc_cli::Error::Input(err.to_string())) - } -} - -impl From<&str> for Error { - fn from(err: &str) -> Self { - Error::Cli(sc_cli::Error::Input(err.to_string())) - } -} - -impl From for Error { - fn from(err: core::str::Utf8Error) -> Self { - Error::Cli(sc_cli::Error::Input(err.to_string())) - } -} - -pub fn get_project_path() -> Result { - let workspace = std::process::Command::new(env!("CARGO")) - .args(["locate-project", "--workspace", "--message-format=plain"]) - .output()?; - - let mut dir = std::path::PathBuf::from(std::str::from_utf8(&workspace.stdout)?.trim()); - dir.pop(); - Ok(dir.to_str().ok_or("Failed to get project path")?.to_string()) -} - -pub fn copy_from_filesystem(src_path: String, dest_path: String) -> Result<(), Error> { - log::info!("Trying to copy {} to {} from filesystem", src_path, dest_path); - let src = std::path::PathBuf::from(src_path.clone()); - if !src.exists() { - log::info!("{} does not exist", src_path); - return Err("File does not exist".into()); - } - - let mut dst = std::path::PathBuf::from(dest_path.clone()); - std::fs::create_dir_all(&dst)?; - dst.push(src.file_name().ok_or("File name not found")?); - std::fs::copy(src, dst)?; - - log::info!("Copied {} to {} from filesystem", src_path, dest_path); - Ok(()) -} - -pub fn fetch_from_url(target: String, dest_path: String) -> Result<(), Error> { - log::info!("Trying to fetch {} to {} from url", target, dest_path); - let mut dst = std::path::PathBuf::from(dest_path); - std::fs::create_dir_all(&dst)?; - dst.push(target.split('/').last().expect("Failed to get file name from `target` while fetching url")); - - let response = reqwest::blocking::get(target.clone())?; - - let mut file = std::fs::File::create(dst)?; - let bytes = response.bytes()?; - - let mut content = std::io::Cursor::new(bytes); - std::io::copy(&mut content, &mut file)?; - - Ok(()) -} - -pub fn read_file_to_string(path: String) -> Result { - Ok(std::fs::read_to_string(path)?) -} diff --git a/docs/getting-started.md b/docs/getting-started.md index fa8f0469ab..c489682d3e 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -82,7 +82,7 @@ state: ```bash ./target/release/madara setup -./target/release/madara run --dev +./target/release/madara --dev ``` Purge the development chain's state: @@ -94,7 +94,7 @@ Purge the development chain's state: Start the development chain with detailed logging: ```bash -RUST_BACKTRACE=1 ./target/release/madara run -ldebug --dev +RUST_BACKTRACE=1 ./target/release/madara -ldebug --dev ``` > Development chain means that the state of our chain will be in a tmp folder @@ -119,7 +119,7 @@ commands shows how to use a newly created folder as our db base path. $ mkdir my-chain-state // Use of that folder to store the chain state -$ ./target/release/madara run --dev --base-path ./my-chain-state/ +$ ./target/release/madara --dev --base-path ./my-chain-state/ // Check the folder structure created inside the base path after running the chain $ ls ./my-chain-state diff --git a/docs/rpc-contribution.md b/docs/rpc-contribution.md index 4968ff5133..68b6406ce1 100644 --- a/docs/rpc-contribution.md +++ b/docs/rpc-contribution.md @@ -19,7 +19,7 @@ There are two ways you can build madara to quickly test it: 1. `cargo build --release`, which will then allow us to setup madara with `./target/release/madara setup`, and then run it with - `./target/release/madara run`. This will start the sequencer WITHOUT peers. + `./target/release/madara`. This will start the sequencer WITHOUT peers. That's not a problem if you just want to test that your RPC method is accessible, and to test (de)serialization of your RPC parameters. diff --git a/docs/sharingan-starter-pack.md b/docs/sharingan-starter-pack.md index 66846b919f..6135da306e 100644 --- a/docs/sharingan-starter-pack.md +++ b/docs/sharingan-starter-pack.md @@ -227,7 +227,7 @@ If you prefer having Madara compiled locally, you must: ```bash ./target/release/madara setup -./target/release/madara run --testnet sharingan --telemetry-url 'wss://telemetry.madara.zone/submit 0' +./target/release/madara --testnet sharingan --telemetry-url 'wss://telemetry.madara.zone/submit 0' ``` This will store the data into `$HOME/.madara`. From 5003054b326a2abde5e43a2c31c7de92bd5ca24e Mon Sep 17 00:00:00 2001 From: antiyro <74653697+antiyro@users.noreply.github.com> Date: Wed, 11 Oct 2023 15:54:31 +0200 Subject: [PATCH 10/45] fix: declareV0 hash computation (#1179) --- CHANGELOG.md | 1 + README.md | 1 + crates/primitives/transactions/src/compute_hash.rs | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7b25dce17..d2cabc4661 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next release +- 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 diff --git a/README.md b/README.md index 272db1b998..9e17b44fb6 100644 --- a/README.md +++ b/README.md @@ -252,6 +252,7 @@ Thanks goes to these wonderful people kasteph
kasteph
💻 Ayush Tomar
Ayush Tomar
💻 tchataigner
tchataigner
💻 + antiyro
antiyro
💻 diff --git a/crates/primitives/transactions/src/compute_hash.rs b/crates/primitives/transactions/src/compute_hash.rs index 4ea4245613..7137d881ea 100644 --- a/crates/primitives/transactions/src/compute_hash.rs +++ b/crates/primitives/transactions/src/compute_hash.rs @@ -91,7 +91,7 @@ impl ComputeTransactionHash for DeclareTransactionV0 { let version = if is_query { SIMULATE_TX_VERSION_OFFSET } else { FieldElement::ZERO }; let sender_address = self.sender_address.into(); let entrypoint_selector = FieldElement::ZERO; - let alignment_placeholder = FieldElement::ZERO; + let alignment_placeholder = compute_hash_on_elements(&[]); let max_fee = FieldElement::from(self.max_fee); let chain_id = chain_id.into(); let class_hash = self.class_hash.into(); From 6a1df162438100b1a8b35038a1deb25f39ba8499 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Delabrouille?= <34384633+tdelabro@users.noreply.github.com> Date: Thu, 12 Oct 2023 14:17:15 +0200 Subject: [PATCH 11/45] tests: add rpc tests to CI (#1145) --- .github/workflows/pull-request.yml | 11 + .github/workflows/starknet-rpc-tests.yml | 49 +++ .github/workflows/tests.yml | 32 ++ CHANGELOG.md | 1 + Cargo.lock | 5 +- Cargo.toml | 25 ++ crates/client/rpc-core/src/lib.rs | 2 +- crates/client/rpc/src/lib.rs | 6 +- crates/pallets/starknet/src/genesis_loader.rs | 2 +- crates/pallets/starknet/src/lib.rs | 5 +- .../transactions/src/compute_hash_tests.rs | 2 +- starknet-rpc-test/Cargo.toml | 5 +- starknet-rpc-test/add_declare_transaction.rs | 112 +++--- .../add_deploy_account_transaction.rs | 77 ++-- starknet-rpc-test/add_invoke_transaction.rs | 125 ++++--- starknet-rpc-test/call.rs | 96 +++-- starknet-rpc-test/chain_id.rs | 8 +- starknet-rpc-test/estimate_fee.rs | 21 +- .../get_block_hash_and_number.rs | 53 +-- starknet-rpc-test/get_block_number.rs | 28 +- .../get_block_transaction_count.rs | 35 +- starknet-rpc-test/get_block_with_tx_hashes.rs | 76 ++-- starknet-rpc-test/get_block_with_txs.rs | 315 ++++++---------- starknet-rpc-test/get_class.rs | 28 +- starknet-rpc-test/get_class_at.rs | 27 +- starknet-rpc-test/get_class_hash_at.rs | 21 +- starknet-rpc-test/get_events.rs | 353 +++++++++--------- starknet-rpc-test/get_nonce.rs | 42 +-- starknet-rpc-test/get_storage_at.rs | 27 +- .../get_transaction_by_blockid_and_index.rs | 89 ++--- starknet-rpc-test/get_transaction_by_hash.rs | 22 +- starknet-rpc-test/get_transaction_receipt.rs | 144 +++---- starknet-rpc-test/pending_transactions.rs | 61 +-- starknet-rpc-test/src/constants.rs | 2 - starknet-rpc-test/src/fixtures.rs | 23 +- starknet-rpc-test/src/lib.rs | 160 +------- starknet-rpc-test/src/utils.rs | 119 +----- 37 files changed, 1008 insertions(+), 1201 deletions(-) create mode 100644 .github/workflows/starknet-rpc-tests.yml create mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index aee0e72c54..d64a2b462e 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -35,6 +35,16 @@ jobs: uses: ./.github/workflows/linters-cargo.yml needs: rust_build + tests: + name: Run tests + uses: ./.github/workflows/tests.yml + needs: rust_build + + rpc-tests: + name: Run rpc tests + uses: ./.github/workflows/starknet-rpc-tests.yml + needs: rust_build + # TODO: Unlock when rust tests are working on main # coverage: # name: Run coverage @@ -42,6 +52,7 @@ jobs: # needs: [madara_commands, linters_cargo] # https://github.com/keep-starknet-strange/madara/issues/1097 + # benchmark: # name: Run benchmarks # uses: ./.github/workflows/benchmarks.yml diff --git a/.github/workflows/starknet-rpc-tests.yml b/.github/workflows/starknet-rpc-tests.yml new file mode 100644 index 0000000000..6ccf244cde --- /dev/null +++ b/.github/workflows/starknet-rpc-tests.yml @@ -0,0 +1,49 @@ +--- +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: actions/cache@v3 + 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 + - 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..17a8ea3fd4 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,32 @@ +--- +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: actions/cache@v3 + 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 + - 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/CHANGELOG.md b/CHANGELOG.md index d2cabc4661..5122446d74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ - 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-rpx-test): run all tests against a single madara node ## v0.4.0 diff --git a/Cargo.lock b/Cargo.lock index 7b6c0efa65..d752e54600 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12237,9 +12237,8 @@ version = "0.1.0" dependencies = [ "anyhow", "assert_matches", - "derive_more", + "async-lock", "flate2", - "lazy_static", "reqwest", "rstest", "serde", @@ -13548,7 +13547,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand 0.8.5", + "rand 0.7.3", "static_assertions", ] diff --git a/Cargo.toml b/Cargo.toml index 25b38f025a..a3e27436aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,6 +24,31 @@ members = [ "crates/client/transaction-pool", "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", +] [profile.release] panic = "unwind" 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/lib.rs b/crates/client/rpc/src/lib.rs index 664680a705..c7d5ca3ad5 100644 --- a/crates/client/rpc/src/lib.rs +++ b/crates/client/rpc/src/lib.rs @@ -271,7 +271,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 })?) } @@ -623,7 +623,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,7 +631,7 @@ 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))) diff --git a/crates/pallets/starknet/src/genesis_loader.rs b/crates/pallets/starknet/src/genesis_loader.rs index edc8cf2a69..616d01bd53 100644 --- a/crates/pallets/starknet/src/genesis_loader.rs +++ b/crates/pallets/starknet/src/genesis_loader.rs @@ -188,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 9262ccc8f8..12169e7025 100644 --- a/crates/pallets/starknet/src/lib.rs +++ b/crates/pallets/starknet/src/lib.rs @@ -783,7 +783,10 @@ 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 = diff --git a/crates/primitives/transactions/src/compute_hash_tests.rs b/crates/primitives/transactions/src/compute_hash_tests.rs index a68c460404..ce04ff9849 100644 --- a/crates/primitives/transactions/src/compute_hash_tests.rs +++ b/crates/primitives/transactions/src/compute_hash_tests.rs @@ -73,7 +73,7 @@ fn test_deploy_account_tx_hash() { fn test_declare_v0_tx_hash() { // Computed with `calculate_declare_transaction_hash` from the cairo lang package let expected_tx_hash = - Felt252Wrapper::from_hex_be("0x07cdcb35e703351a74a0e6e8c045ce861eece44f0bca06dbbc569b4d8c0a2ae2").unwrap(); + Felt252Wrapper::from_hex_be("0x052b849ca86ca1a1ce6ac7e069900a221b5741786bffe023804ef714f7bb46da").unwrap(); let chain_id = Felt252Wrapper(FieldElement::from_byte_slice_be(b"SN_GOERLI").unwrap()); diff --git a/starknet-rpc-test/Cargo.toml b/starknet-rpc-test/Cargo.toml index 80bb785f9b..e5cc195f3f 100644 --- a/starknet-rpc-test/Cargo.toml +++ b/starknet-rpc-test/Cargo.toml @@ -8,10 +8,9 @@ edition = "2021" anyhow = "1.0.72" assert_matches = "1.5.0" -derive_more = "0.99.17" +async-lock = "2.8.0" flate2 = { workspace = true } -lazy_static = "1.4.0" -reqwest = "0.11.22" +reqwest = "0.11.18" rstest = "0.18.1" serde = { version = "1.0.179", features = ["derive"] } serde_json = "1.0.107" diff --git a/starknet-rpc-test/add_declare_transaction.rs b/starknet-rpc-test/add_declare_transaction.rs index e4e5675895..2fdc3f9953 100644 --- a/starknet-rpc-test/add_declare_transaction.rs +++ b/starknet-rpc-test/add_declare_transaction.rs @@ -5,26 +5,28 @@ use std::vec; use assert_matches::assert_matches; use rstest::rstest; use starknet_accounts::Account; -use starknet_core::types::{BlockId, BlockTag, DeclareTransactionResult, StarknetError}; +use starknet_core::types::{BlockId, DeclareTransactionResult, StarknetError}; use starknet_ff::FieldElement; use starknet_providers::{MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage}; use starknet_rpc_test::constants::{ARGENT_CONTRACT_ADDRESS, FEE_TOKEN_ADDRESS, SIGNER_PRIVATE}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::utils::{create_account, read_erc20_balance, AccountActions, U256}; -use starknet_rpc_test::{MadaraClient, SendTransactionError, Transaction, TransactionResult}; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; +use starknet_rpc_test::utils::{build_single_owner_account, read_erc20_balance, AccountActions, U256}; +use starknet_rpc_test::{SendTransactionError, Transaction, TransactionResult}; #[rstest] #[tokio::test] -async fn fail_validation_step(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - // using incorrect private key to generate the wrong signature - let account = create_account(rpc, "0x1234", ARGENT_CONTRACT_ADDRESS, true); - let (declare_tx, _, _) = - account.declare_contract("./contracts/Counter.sierra.json", "./contracts/Counter.casm.json"); - - let txs = madara.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; +async fn fail_validation_step(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + + let txs = { + // using incorrect private key to generate the wrong signature + let account = build_single_owner_account(&rpc, "0x1234", ARGENT_CONTRACT_ADDRESS, true); + let (declare_tx, _, _) = + account.declare_contract("./contracts/Counter.sierra.json", "./contracts/Counter.casm.json"); + + let mut madara_write_lock = madara.write().await; + madara_write_lock.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await? + }; assert_eq!(txs.len(), 1); let declare_tx_result = txs[0].as_ref().unwrap_err(); @@ -43,36 +45,42 @@ async fn fail_validation_step(#[future] madara: MadaraClient) -> Result<(), anyh #[rstest] #[tokio::test] -async fn fail_execution_step_with_no_storage_change(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +#[ignore = "this test drain the account, wich make other tests fail afterward. We have to find another way to make \ + this one fail"] +async fn fail_execution_step_with_no_storage_change(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); let (declare_tx, expected_class_hash, _) = account.declare_contract("./contracts/Counter.sierra.json", "./contracts/Counter.casm.json"); - // draining account so the txn fails during execution - let balance = - read_erc20_balance(rpc, FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(), account.address()).await; - madara - .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens_u256( - FieldElement::from_hex_be("0x1234").unwrap(), - // subtractin 150k to keep some fees for the transfer - U256 { low: balance[0] - FieldElement::from_dec_str("150000").unwrap(), high: balance[1] }, - None, - ))]) - .await?; - - // declaring contract - let txs = madara.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; + let (block_number, txs) = { + let mut madara_write_lock = madara.write().await; + // draining account so the txn fails during execution + let balance = + read_erc20_balance(&rpc, FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(), account.address()).await; + madara_write_lock + .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens_u256( + FieldElement::from_hex_be("0x1234").unwrap(), + // subtractin 150k to keep some fees for the transfer + U256 { low: balance[0] - FieldElement::from_dec_str("150000").unwrap(), high: balance[1] }, + None, + ))]) + .await?; + + // declaring contract + let txs = madara_write_lock.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; + let block_number = rpc.block_number().await?; + (block_number, txs) + }; assert_eq!(txs.len(), 1); - assert!(txs[0].as_ref().is_ok()); + assert!(txs[0].is_ok()); // transaction failed during execution, no change in storage - assert!(rpc.get_class(BlockId::Tag(BlockTag::Latest), expected_class_hash).await.is_err()); + assert!(rpc.get_class(BlockId::Number(block_number), expected_class_hash).await.is_err()); // doesn't get included in block - let included_txs = rpc.get_block_transaction_count(BlockId::Tag(BlockTag::Latest)).await?; + let included_txs = rpc.get_block_transaction_count(BlockId::Number(block_number)).await?; assert_eq!(included_txs, 0); Ok(()) @@ -80,15 +88,20 @@ async fn fail_execution_step_with_no_storage_change(#[future] madara: MadaraClie #[rstest] #[tokio::test] -async fn works_with_storage_change(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +#[ignore = "class already declared"] +async fn works_with_storage_change(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); let (declare_tx, expected_class_hash, _) = account.declare_contract("./contracts/Counter.sierra.json", "./contracts/Counter.casm.json"); - let mut txs = madara.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; + let (mut txs, block_number) = { + let mut madara_write_lock = madara.write().await; + let txs = madara_write_lock.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; + let block_number = rpc.block_number().await?; + (txs, block_number) + }; assert_eq!(txs.len(), 1); let declare_tx_result = txs.remove(0); @@ -104,10 +117,10 @@ async fn works_with_storage_change(#[future] madara: MadaraClient) -> Result<(), _ => panic!("Expected declare transaction result"), } - assert!(rpc.get_class(BlockId::Tag(BlockTag::Latest), expected_class_hash).await.is_ok()); + assert!(rpc.get_class(BlockId::Number(block_number), expected_class_hash).await.is_ok()); // included in block - let included_txs = rpc.get_block_transaction_count(BlockId::Tag(BlockTag::Latest)).await?; + let included_txs = rpc.get_block_transaction_count(BlockId::Number(block_number)).await?; assert_eq!(included_txs, 1); Ok(()) @@ -115,16 +128,18 @@ async fn works_with_storage_change(#[future] madara: MadaraClient) -> Result<(), #[rstest] #[tokio::test] -async fn fails_already_declared(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +#[ignore = "unpredictable behaviour depending on the test execution order"] +async fn fails_already_declared(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; // first declaration works - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); let (declare_tx, _, _) = account.declare_contract("./contracts/Counter.sierra.json", "./contracts/Counter.casm.json"); - let txs = madara.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; + let mut madara_write_lock = madara.write().await; + // The first one will fail too for now + let txs = madara_write_lock.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; assert_eq!(txs.len(), 1); assert!(txs[0].as_ref().is_ok()); @@ -133,7 +148,8 @@ async fn fails_already_declared(#[future] madara: MadaraClient) -> Result<(), an let (declare_tx, _, _) = account.declare_contract("./contracts/Counter.sierra.json", "./contracts/Counter.casm.json"); - let mut txs = madara.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; + let mut txs = madara_write_lock.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; + assert_eq!(txs.len(), 1); let declare_tx_result = txs.remove(0); assert_matches!( diff --git a/starknet-rpc-test/add_deploy_account_transaction.rs b/starknet-rpc-test/add_deploy_account_transaction.rs index c754085ad5..9cbd1dfb48 100644 --- a/starknet-rpc-test/add_deploy_account_transaction.rs +++ b/starknet-rpc-test/add_deploy_account_transaction.rs @@ -7,20 +7,23 @@ use starknet_accounts::AccountFactory; use starknet_core::types::{BlockId, BlockTag, DeployAccountTransactionResult}; use starknet_ff::FieldElement; use starknet_providers::Provider; -use starknet_rpc_test::constants::{ARGENT_CONTRACT_ADDRESS, CAIRO_1_ACCOUNT_CONTRACT_CLASS_HASH, SIGNER_PRIVATE}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::utils::{build_deploy_account_tx, build_oz_account_factory, create_account, AccountActions}; -use starknet_rpc_test::{MadaraClient, Transaction, TransactionResult}; +use starknet_rpc_test::constants::{ + ARGENT_CONTRACT_ADDRESS, CAIRO_1_ACCOUNT_CONTRACT_CLASS_HASH, MAX_FEE_OVERRIDE, SIGNER_PRIVATE, +}; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; +use starknet_rpc_test::utils::{ + build_deploy_account_tx, build_oz_account_factory, build_single_owner_account, AccountActions, +}; +use starknet_rpc_test::{Transaction, TransactionResult}; #[rstest] #[tokio::test] -async fn fail_execution_step_with_no_storage_change(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_execution_step_with_no_storage_change(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; // deploy account let oz_factory = build_oz_account_factory( - rpc, + &rpc, SIGNER_PRIVATE, FieldElement::from_hex_be(CAIRO_1_ACCOUNT_CONTRACT_CLASS_HASH).unwrap(), ) @@ -28,8 +31,9 @@ async fn fail_execution_step_with_no_storage_change(#[future] madara: MadaraClie let account_deploy_txn = build_deploy_account_tx(&oz_factory, FieldElement::ONE); let account_address = account_deploy_txn.address(); + let mut madara_write_lock = madara.write().await; // as the account isn't funded, this should fail - let txs = madara.create_block_with_txs(vec![Transaction::AccountDeployment(account_deploy_txn)]).await?; + let txs = madara_write_lock.create_block_with_txs(vec![Transaction::AccountDeployment(account_deploy_txn)]).await?; assert_eq!(txs.len(), 1); assert!(txs[0].as_ref().is_ok()); @@ -46,55 +50,58 @@ async fn fail_execution_step_with_no_storage_change(#[future] madara: MadaraClie #[rstest] #[tokio::test] -async fn works_with_storage_change(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn works_with_storage_change(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; // deploy account - let oz_factory = - build_oz_account_factory(rpc, "0x123", FieldElement::from_hex_be(CAIRO_1_ACCOUNT_CONTRACT_CLASS_HASH).unwrap()) - .await; + let oz_factory = build_oz_account_factory( + &rpc, + "0x789", + FieldElement::from_hex_be(CAIRO_1_ACCOUNT_CONTRACT_CLASS_HASH).unwrap(), + ) + .await; let account_deploy_txn = build_deploy_account_tx(&oz_factory, FieldElement::ONE); let account_address = account_deploy_txn.address(); - let funding_account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - - let mut txs = madara - .create_block_with_txs(vec![ - Transaction::Execution(funding_account.transfer_tokens( - account_address, - FieldElement::from_hex_be("0xFFFFFFFFFFFF").unwrap(), - None, - )), - Transaction::AccountDeployment(account_deploy_txn), - ]) - .await?; + let funding_account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + + let (mut txs, block_number) = { + let mut madara_write_lock = madara.write().await; + let txs = madara_write_lock + .create_block_with_txs(vec![ + Transaction::Execution(funding_account.transfer_tokens( + account_address, + FieldElement::from_hex_be(MAX_FEE_OVERRIDE).unwrap(), + None, + )), + Transaction::AccountDeployment(account_deploy_txn), + ]) + .await?; + let block_number = rpc.block_number().await?; + + (txs, block_number) + }; assert_eq!(txs.len(), 2); let account_deploy_tx_result = txs.remove(1); match account_deploy_tx_result { // passes the validation stage Ok(TransactionResult::AccountDeployment(DeployAccountTransactionResult { - transaction_hash, + transaction_hash: _, contract_address, })) => { - assert_eq!( - transaction_hash, - FieldElement::from_hex_be("0x02105f08ba02511ccef6ff6676a1481645ec33c9e0d9f7d654b0590aa6afb013") - .unwrap() - ); assert_eq!(contract_address, account_address); } _ => panic!("Expected declare transaction result"), } - let class_hash_result = rpc.get_class_hash_at(BlockId::Tag(BlockTag::Latest), account_address).await; + let class_hash_result = rpc.get_class_hash_at(BlockId::Number(block_number), account_address).await; match class_hash_result { Ok(class_hash) => assert_eq!(class_hash, oz_factory.class_hash()), Err(e) => panic!("Expected class hash to be present, got error: {}", e), } // included in block - let included_txs = rpc.get_block_transaction_count(BlockId::Tag(BlockTag::Latest)).await?; + let included_txs = rpc.get_block_transaction_count(BlockId::Number(block_number)).await?; assert_eq!(included_txs, 2); // fund transfer + deploy Ok(()) diff --git a/starknet-rpc-test/add_invoke_transaction.rs b/starknet-rpc-test/add_invoke_transaction.rs index 45e69b9690..44bad6fe78 100644 --- a/starknet-rpc-test/add_invoke_transaction.rs +++ b/starknet-rpc-test/add_invoke_transaction.rs @@ -5,30 +5,32 @@ use std::vec; use assert_matches::assert_matches; use rstest::rstest; use starknet_accounts::Account; -use starknet_core::types::{BlockId, BlockTag, InvokeTransactionResult, StarknetError}; +use starknet_core::types::{BlockId, StarknetError}; use starknet_ff::FieldElement; use starknet_providers::{MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage}; use starknet_rpc_test::constants::{ARGENT_CONTRACT_ADDRESS, FEE_TOKEN_ADDRESS, SIGNER_PRIVATE}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::utils::{create_account, read_erc20_balance, AccountActions, U256}; -use starknet_rpc_test::{MadaraClient, SendTransactionError, Transaction, TransactionResult}; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; +use starknet_rpc_test::utils::{build_single_owner_account, read_erc20_balance, AccountActions, U256}; +use starknet_rpc_test::{SendTransactionError, Transaction}; #[rstest] #[tokio::test] -async fn fail_validation_step(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - // using incorrect private key to generate the wrong signature - let account = create_account(rpc, "0x1234", ARGENT_CONTRACT_ADDRESS, true); - - let txs = madara - .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens( - FieldElement::from_hex_be("0x123").unwrap(), - FieldElement::ONE, - None, - ))]) - .await?; +async fn fail_validation_step(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + + let txs = { + let mut madara_write_lock = madara.write().await; + // using incorrect private key to generate the wrong signature + let account = build_single_owner_account(&rpc, "0x1234", ARGENT_CONTRACT_ADDRESS, true); + + madara_write_lock + .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens( + FieldElement::from_hex_be("0x123").unwrap(), + FieldElement::ONE, + None, + ))]) + .await? + }; assert_eq!(txs.len(), 1); @@ -48,44 +50,38 @@ async fn fail_validation_step(#[future] madara: MadaraClient) -> Result<(), anyh #[rstest] #[tokio::test] -async fn works_with_storage_change(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn works_with_storage_change(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - let funding_account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let funding_account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); let recipient_account = FieldElement::from_hex_be("0x123").unwrap(); let fee_token_address = FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(); - let initial_balance = read_erc20_balance(rpc, fee_token_address, recipient_account).await; - - let mut txs = madara - .create_block_with_txs(vec![Transaction::Execution(funding_account.transfer_tokens( - recipient_account, - FieldElement::ONE, - None, - ))]) - .await?; - - let final_balance = read_erc20_balance(rpc, fee_token_address, recipient_account).await; + let (txs, initial_balance, final_balance, block_number) = { + let mut madara_write_lock = madara.write().await; + let initial_balance = read_erc20_balance(&rpc, fee_token_address, recipient_account).await; + + let txs = madara_write_lock + .create_block_with_txs(vec![Transaction::Execution(funding_account.transfer_tokens( + recipient_account, + FieldElement::ONE, + None, + ))]) + .await?; + + let final_balance = read_erc20_balance(&rpc, fee_token_address, recipient_account).await; + let block_number = rpc.block_number().await?; + (txs, initial_balance, final_balance, block_number) + }; assert_eq!(txs.len(), 1); - let invoke_tx_result = txs.remove(0); - match invoke_tx_result { - Ok(TransactionResult::Execution(InvokeTransactionResult { transaction_hash })) => { - assert_eq!( - transaction_hash, - FieldElement::from_hex_be("0x05605a03e0e1ed95469d887a172346ba0ff90a9b25a02214ade7caa978ab3eec") - .unwrap() - ) - } - _ => panic!("Expected invoke transaction result"), - } + assert!(txs[0].is_ok()); assert_eq!(final_balance[1], initial_balance[1]); // higher 128 bits are equal assert_eq!(final_balance[0] - initial_balance[0], FieldElement::ONE); // lower 128 bits differ by one // included in block - let included_txs = rpc.get_block_transaction_count(BlockId::Tag(BlockTag::Latest)).await?; + let included_txs = rpc.get_block_transaction_count(BlockId::Number(block_number)).await?; assert_eq!(included_txs, 1); Ok(()) @@ -93,31 +89,38 @@ async fn works_with_storage_change(#[future] madara: MadaraClient) -> Result<(), #[rstest] #[tokio::test] -async fn fail_execution_step_with_no_storage_change(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { +async fn fail_execution_step_with_no_storage_change(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { // we will try to transfer all the funds of the funding account // so the transaction will fail in the execution step as we won't have // funds to pay the fees - let madara = madara.await; - let rpc = madara.get_starknet_client(); + let rpc = madara.get_starknet_client().await; let fee_token_address = FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(); - let funding_account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - let funding_account_balance = read_erc20_balance(rpc, fee_token_address, funding_account.address()).await; + let funding_account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - let recipient_account = FieldElement::from_hex_be("0x123").unwrap(); - let initial_balance = read_erc20_balance(rpc, fee_token_address, recipient_account).await; + let (block_number, initial_balance, final_balance, txs) = { + let mut madara_write_lock = madara.write().await; + let funding_account_balance = read_erc20_balance(&rpc, fee_token_address, funding_account.address()).await; + + let recipient_account = FieldElement::from_hex_be("0x123").unwrap(); + let initial_balance = read_erc20_balance(&rpc, fee_token_address, recipient_account).await; + + let txs = madara_write_lock + .create_block_with_txs(vec![Transaction::Execution(funding_account.transfer_tokens_u256( + recipient_account, + U256 { low: funding_account_balance[0], high: funding_account_balance[1] }, /* send all the + * available funds */ + None, + ))]) + .await?; - let txs = madara - .create_block_with_txs(vec![Transaction::Execution(funding_account.transfer_tokens_u256( - recipient_account, - U256 { low: funding_account_balance[0], high: funding_account_balance[1] }, // send all the available funds - None, - ))]) - .await?; + let final_balance = read_erc20_balance(&rpc, fee_token_address, recipient_account).await; + let block_number = rpc.block_number().await?; - let final_balance = read_erc20_balance(rpc, fee_token_address, recipient_account).await; + (block_number, initial_balance, final_balance, txs) + }; assert_eq!(txs.len(), 1); @@ -127,7 +130,7 @@ async fn fail_execution_step_with_no_storage_change(#[future] madara: MadaraClie assert_eq!(final_balance, initial_balance); // doesn't get included in block - let included_txs = rpc.get_block_transaction_count(BlockId::Tag(BlockTag::Latest)).await?; + let included_txs = rpc.get_block_transaction_count(BlockId::Number(block_number)).await?; assert_eq!(included_txs, 0); Ok(()) diff --git a/starknet-rpc-test/call.rs b/starknet-rpc-test/call.rs index 22f7598f34..94da902380 100644 --- a/starknet-rpc-test/call.rs +++ b/starknet-rpc-test/call.rs @@ -1,5 +1,7 @@ #![feature(assert_matches)] +mod get_block_hash_and_number; + extern crate starknet_rpc_test; use std::assert_matches::assert_matches; @@ -12,17 +14,14 @@ use starknet_core::utils::get_selector_from_name; use starknet_ff::FieldElement; use starknet_providers::{MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage}; use starknet_rpc_test::constants::{ARGENT_CONTRACT_ADDRESS, FEE_TOKEN_ADDRESS, SIGNER_PRIVATE}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::utils::{create_account, AccountActions}; -use starknet_rpc_test::{MadaraClient, Transaction}; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; +use starknet_rpc_test::utils::{build_single_owner_account, AccountActions}; +use starknet_rpc_test::Transaction; #[rstest] #[tokio::test] -async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - madara.create_empty_block().await?; +async fn fail_non_existing_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_matches!( rpc.call( @@ -46,11 +45,8 @@ async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn fail_non_existing_entrypoint(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - madara.create_empty_block().await?; +async fn fail_non_existing_entrypoint(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_matches!( rpc.call( @@ -74,11 +70,8 @@ async fn fail_non_existing_entrypoint(#[future] madara: MadaraClient) -> Result< #[rstest] #[tokio::test] -async fn fail_incorrect_calldata(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - madara.create_empty_block().await?; +async fn fail_incorrect_calldata(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_matches!( rpc.call( @@ -102,11 +95,8 @@ async fn fail_incorrect_calldata(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn works_on_correct_call_no_calldata(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - madara.create_empty_block().await?; +async fn works_on_correct_call_no_calldata(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_eq!( rpc.call( @@ -127,11 +117,8 @@ async fn works_on_correct_call_no_calldata(#[future] madara: MadaraClient) -> Re #[rstest] #[tokio::test] -async fn works_on_correct_call_with_calldata(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - madara.create_empty_block().await?; +async fn works_on_correct_call_with_calldata(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert!( rpc.call( @@ -152,30 +139,35 @@ async fn works_on_correct_call_with_calldata(#[future] madara: MadaraClient) -> #[rstest] #[tokio::test] -async fn works_on_mutable_call_without_modifying_storage(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - madara.create_empty_block().await?; - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - - let (declare_tx, class_hash, _) = - account.declare_contract("./contracts/Counter.sierra.json", "./contracts/Counter.casm.json"); - let contract_factory = ContractFactory::new(class_hash, account.clone()); - - // manually setting fee else estimate_fee will be called and it will fail - // as contract is not declared yet (declared in the same block as deployment) - let max_fee = FieldElement::from_hex_be("0x1000000000").unwrap(); - - // manually incrementing nonce else as both declare and deploy are in the same block - // so automatic nonce calculation will fail - let nonce = rpc.get_nonce(BlockId::Tag(BlockTag::Latest), account.address()).await.unwrap() + FieldElement::ONE; - - let deploy_tx = - Execution::from(&contract_factory.deploy(vec![], FieldElement::ZERO, true).max_fee(max_fee).nonce(nonce)); - - // declare and deploy contract - madara.create_block_with_txs(vec![Transaction::Declaration(declare_tx), Transaction::Execution(deploy_tx)]).await?; +async fn works_on_mutable_call_without_modifying_storage(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + + { + let mut madara_write_lock = madara.write().await; + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + + let (declare_tx, class_hash, _) = + account.declare_contract("./contracts/Counter.sierra.json", "./contracts/Counter.casm.json"); + let contract_factory = ContractFactory::new(class_hash, account.clone()); + + // manually setting fee else estimate_fee will be called and it will fail + // as contract is not declared yet (declared in the same block as deployment) + let max_fee = FieldElement::from_hex_be("0x1000000000").unwrap(); + + // manually incrementing nonce else as both declare and deploy are in the same block + // so automatic nonce calculation will fail + let nonce = rpc.get_nonce(BlockId::Tag(BlockTag::Latest), account.address()).await.unwrap() + FieldElement::ONE; + + let deploy_tx = + Execution::from(&contract_factory.deploy(vec![], FieldElement::ZERO, true).max_fee(max_fee).nonce(nonce)); + + println!("before declare"); + // declare and deploy contract + madara_write_lock.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; + println!("before execute"); + madara_write_lock.create_block_with_txs(vec![Transaction::Execution(deploy_tx)]).await?; + println!("after block"); + } // address of deployed contract (will always be the same for 0 salt) let contract_address = diff --git a/starknet-rpc-test/chain_id.rs b/starknet-rpc-test/chain_id.rs index 3738dc95f3..494fcbc4d8 100644 --- a/starknet-rpc-test/chain_id.rs +++ b/starknet-rpc-test/chain_id.rs @@ -3,14 +3,12 @@ extern crate starknet_rpc_test; use rstest::rstest; use starknet_providers::Provider; use starknet_rpc_test::constants::SN_GOERLI_CHAIN_ID; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::MadaraClient; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; #[rstest] #[tokio::test] -async fn returns_hardcoded_chain_id(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn returns_hardcoded_chain_id(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_eq!(rpc.chain_id().await?, SN_GOERLI_CHAIN_ID); diff --git a/starknet-rpc-test/estimate_fee.rs b/starknet-rpc-test/estimate_fee.rs index 0bfe32a0c9..3982876153 100644 --- a/starknet-rpc-test/estimate_fee.rs +++ b/starknet-rpc-test/estimate_fee.rs @@ -7,14 +7,12 @@ use starknet_ff::FieldElement; use starknet_providers::ProviderError::StarknetError as StarknetProviderError; use starknet_providers::{MaybeUnknownErrorCode, Provider, StarknetErrorWithMessage}; use starknet_rpc_test::constants::ACCOUNT_CONTRACT; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::MadaraClient; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; #[rstest] #[tokio::test] -async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_non_existing_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; let ok_invoke_transaction = BroadcastedTransaction::Invoke(BroadcastedInvokeTransaction { max_fee: FieldElement::ZERO, @@ -41,11 +39,8 @@ async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn fail_if_one_txn_cannot_be_executed(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - madara.create_empty_block().await?; +async fn fail_if_one_txn_cannot_be_executed(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; let bad_invoke_transaction = BroadcastedTransaction::Invoke(BroadcastedInvokeTransaction { max_fee: FieldElement::default(), @@ -86,9 +81,8 @@ async fn fail_if_one_txn_cannot_be_executed(#[future] madara: MadaraClient) -> R #[rstest] #[tokio::test] -async fn works_ok(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn works_ok(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; // from mainnet tx: 0x000c52079f33dcb44a58904fac3803fd908ac28d6632b67179ee06f2daccb4b5 // https://starkscan.co/tx/0x000c52079f33dcb44a58904fac3803fd908ac28d6632b67179ee06f2daccb4b5 @@ -110,6 +104,7 @@ async fn works_ok(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { let estimate = rpc.estimate_fee(&vec![invoke_transaction.clone(), invoke_transaction], BlockId::Tag(BlockTag::Latest)).await?; + // TODO: instead execute the tx and check that the actual fee are the same as the estimated ones assert_eq!(estimate.len(), 2); assert_eq!(estimate[0].overall_fee, 410); assert_eq!(estimate[1].overall_fee, 410); diff --git a/starknet-rpc-test/get_block_hash_and_number.rs b/starknet-rpc-test/get_block_hash_and_number.rs index 40c353170e..9b29960160 100644 --- a/starknet-rpc-test/get_block_hash_and_number.rs +++ b/starknet-rpc-test/get_block_hash_and_number.rs @@ -1,46 +1,27 @@ extern crate starknet_rpc_test; use rstest::rstest; -use starknet_ff::FieldElement; +use starknet_core::types::BlockId; use starknet_providers::Provider; -use starknet_rpc_test::constants::{ARGENT_CONTRACT_ADDRESS, MINT_AMOUNT, SIGNER_PRIVATE}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::utils::{create_account, AccountActions}; -use starknet_rpc_test::{MadaraClient, Transaction}; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; #[rstest] #[tokio::test] -async fn work_ok_at_start_and_with_new_blocks(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - assert_eq!( - rpc.block_hash_and_number().await?.block_hash, - FieldElement::from_hex_be("0x031ebd02657f940683ae7bddf19716932c56d463fc16662d14031f8635df52ad").unwrap() - ); - assert_eq!(rpc.block_hash_and_number().await?.block_number, 0); - - madara.create_empty_block().await?; - assert_eq!( - rpc.block_hash_and_number().await?.block_hash, - FieldElement::from_hex_be("0x001d68e058e03162e4864ef575445c38deea4fad6b56974ef9012e8429c2e7b9").unwrap() - ); - assert_eq!(rpc.block_hash_and_number().await?.block_number, 1); - - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - - let token_transfer_tx = Transaction::Execution(account.transfer_tokens( - FieldElement::from_hex_be(ARGENT_CONTRACT_ADDRESS).expect("Invalid Contract Address"), - FieldElement::from_hex_be(MINT_AMOUNT).expect("Invalid Mint Amount"), - None, - )); - - madara.create_block_with_txs(vec![token_transfer_tx]).await?; - assert_eq!(rpc.block_hash_and_number().await?.block_number, 2); - assert_eq!( - rpc.block_hash_and_number().await?.block_hash, - FieldElement::from_hex_be("0x049b84477d7b0e2f6d6e3cf7dffcb8e5e12b6bb07f673daf7e85b06e69fd041b").unwrap() - ); +async fn work_ok_at_start_and_with_new_blocks(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + + { + let _madara_write_lock = madara.write(); + let block_number = rpc.block_number().await?; + let (hash, number) = match rpc.get_block_with_tx_hashes(BlockId::Number(block_number)).await.unwrap() { + starknet_core::types::MaybePendingBlockWithTxHashes::Block(b) => (b.block_hash, b.block_number), + _ => panic!(), + }; + + let res = rpc.block_hash_and_number().await?; + assert_eq!(res.block_hash, hash); + assert_eq!(res.block_number, number); + } Ok(()) } diff --git a/starknet-rpc-test/get_block_number.rs b/starknet-rpc-test/get_block_number.rs index ba1565aaa3..0e5b392626 100644 --- a/starknet-rpc-test/get_block_number.rs +++ b/starknet-rpc-test/get_block_number.rs @@ -2,28 +2,26 @@ extern crate starknet_rpc_test; use rstest::rstest; use starknet_providers::Provider; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::MadaraClient; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; #[rstest] #[tokio::test] -async fn work_ok_up_to_1000(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_up_to_1000(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - assert_eq!(rpc.block_number().await?, 0); + { + let mut madara_write_lock = madara.write().await; + let block_number = rpc.block_number().await?; - madara.create_empty_block().await?; - assert_eq!(rpc.block_number().await?, 1); + madara_write_lock.create_empty_block().await?; + assert_eq!(rpc.block_number().await?, 1 + block_number); - madara.run_to_block(20).await?; - assert_eq!(rpc.block_number().await?, 20); + madara_write_lock.run_to_block(block_number + 20).await?; + assert_eq!(rpc.block_number().await?, 20 + block_number); - madara.create_n_blocks(4).await?; - assert_eq!(rpc.block_number().await?, 24); - - madara.run_to_block(1000).await?; - assert_eq!(rpc.block_number().await?, 1000); + madara_write_lock.create_n_blocks(4).await?; + assert_eq!(rpc.block_number().await?, 24 + block_number); + } Ok(()) } diff --git a/starknet-rpc-test/get_block_transaction_count.rs b/starknet-rpc-test/get_block_transaction_count.rs index 2d7aa1f6c4..30fa0d52dd 100644 --- a/starknet-rpc-test/get_block_transaction_count.rs +++ b/starknet-rpc-test/get_block_transaction_count.rs @@ -10,17 +10,17 @@ use starknet_core::types::{BlockId, BlockTag}; use starknet_ff::FieldElement; use starknet_providers::{Provider, ProviderError}; use starknet_rpc_test::constants::{ARGENT_CONTRACT_ADDRESS, MINT_AMOUNT, SIGNER_PRIVATE}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::utils::{create_account, AccountActions}; -use starknet_rpc_test::{MadaraClient, Transaction}; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; +use starknet_rpc_test::utils::{build_single_owner_account, AccountActions}; +use starknet_rpc_test::Transaction; #[rstest] #[tokio::test] -async fn work_ok_with_empty_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_with_empty_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - madara.create_empty_block().await?; + let mut madara_write_lock = madara.write().await; + madara_write_lock.create_empty_block().await?; assert_eq!(rpc.get_block_transaction_count(BlockId::Tag(BlockTag::Latest)).await?, 0); Ok(()) @@ -28,11 +28,8 @@ async fn work_ok_with_empty_block(#[future] madara: MadaraClient) -> Result<(), #[rstest] #[tokio::test] -async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - madara.create_empty_block().await?; +async fn fail_non_existing_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_matches!( rpc.get_block_transaction_count(BlockId::Hash(FieldElement::ZERO)).await.err(), @@ -44,19 +41,18 @@ async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn work_ok_with_block_one_tx(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_with_block_one_tx(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let mut madara_write_lock = madara.write().await; + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); let token_transfer_tx = account.transfer_tokens( account.address(), FieldElement::from_hex_be(MINT_AMOUNT).expect("Invalid Mint Amount"), None, ); - madara.create_block_with_txs(vec![Transaction::Execution(token_transfer_tx)]).await?; - + madara_write_lock.create_block_with_txs(vec![Transaction::Execution(token_transfer_tx)]).await?; assert_eq!(rpc.get_block_transaction_count(BlockId::Tag(BlockTag::Latest)).await?, 1); Ok(()) @@ -66,8 +62,7 @@ async fn work_ok_with_block_one_tx(#[future] madara: MadaraClient) -> Result<(), // #[rstest] // #[tokio::test] // async fn work_ok_with_block_multiple_txs(#[future] _madara: MadaraClient) -> Result<(), -// anyhow::Error> { let madara = madara.await; -// let rpc = madara.get_starknet_client(); +// anyhow::Error> { // let rpc = madara.get_starknet_client().await; // madara // .create_block_with_txs( diff --git a/starknet-rpc-test/get_block_with_tx_hashes.rs b/starknet-rpc-test/get_block_with_tx_hashes.rs index c34746109f..918f490e17 100644 --- a/starknet-rpc-test/get_block_with_tx_hashes.rs +++ b/starknet-rpc-test/get_block_with_tx_hashes.rs @@ -6,23 +6,18 @@ use std::assert_matches::assert_matches; use anyhow::anyhow; use rstest::rstest; -use starknet_core::types::{ - BlockId, BlockStatus, BlockTag, BlockWithTxHashes, MaybePendingBlockWithTxHashes, StarknetError, -}; +use starknet_core::types::{BlockId, BlockTag, MaybePendingBlockWithTxHashes, StarknetError}; use starknet_ff::FieldElement; use starknet_providers::{MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage}; use starknet_rpc_test::constants::{ARGENT_CONTRACT_ADDRESS, SIGNER_PRIVATE}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::utils::{assert_equal_blocks_with_tx_hashes, create_account, AccountActions}; -use starknet_rpc_test::{MadaraClient, Transaction}; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; +use starknet_rpc_test::utils::{build_single_owner_account, AccountActions}; +use starknet_rpc_test::Transaction; #[rstest] #[tokio::test] -async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - madara.create_empty_block().await?; +async fn fail_non_existing_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_matches!( rpc.get_block_with_tx_hashes(BlockId::Hash(FieldElement::ZERO)).await.err(), @@ -37,47 +32,28 @@ async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn works_with_correct_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - madara - .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens( - FieldElement::from_hex_be("0x1234").unwrap(), - FieldElement::ONE, - None, - ))]) - .await?; - - let block = match rpc.get_block_with_tx_hashes(BlockId::Tag(BlockTag::Latest)).await.unwrap() { - MaybePendingBlockWithTxHashes::Block(block) => block, - MaybePendingBlockWithTxHashes::PendingBlock(_) => return Err(anyhow!("Expected block, got pending block")), +async fn works_with_correct_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + + let block = { + let mut madara_write_lock = madara.write().await; + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + + madara_write_lock + .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens( + FieldElement::from_hex_be("0x1234").unwrap(), + FieldElement::ONE, + None, + ))]) + .await?; + + match rpc.get_block_with_tx_hashes(BlockId::Tag(BlockTag::Latest)).await? { + MaybePendingBlockWithTxHashes::Block(block) => block, + MaybePendingBlockWithTxHashes::PendingBlock(_) => return Err(anyhow!("Expected block, got pending block")), + } }; - assert_equal_blocks_with_tx_hashes( - block.clone(), - BlockWithTxHashes { - status: BlockStatus::AcceptedOnL2, - block_hash: FieldElement::from_hex_be("0x015e8bc7066c6d98d71c52bd52bb8eb0d1747eaa189c7f90a2a31045edccf2a8") - .unwrap(), - parent_hash: FieldElement::from_hex_be( - "0x031ebd02657f940683ae7bddf19716932c56d463fc16662d14031f8635df52ad", - ) - .unwrap(), - block_number: 1, - new_root: FieldElement::ZERO, - sequencer_address: FieldElement::from_hex_be( - "0x000000000000000000000000000000000000000000000000000000000000dead", - ) - .unwrap(), - transactions: vec![ - FieldElement::from_hex_be("0x069d9d0ac1f5a4ad8d8e9a3954da53b5dc8ed239c02ad04492b9e15c50fe6d11") - .unwrap(), - ], - timestamp: block.timestamp, // timestamps can vary so just using the actual timestamp - }, - ); + assert_eq!(block.transactions.len(), 1); Ok(()) } diff --git a/starknet-rpc-test/get_block_with_txs.rs b/starknet-rpc-test/get_block_with_txs.rs index 1fc152a4fd..cf023e66ae 100644 --- a/starknet-rpc-test/get_block_with_txs.rs +++ b/starknet-rpc-test/get_block_with_txs.rs @@ -6,9 +6,9 @@ use std::assert_matches::assert_matches; use anyhow::anyhow; use rstest::rstest; +use starknet_accounts::Account; use starknet_core::types::{ - BlockId, BlockStatus, BlockTag, BlockWithTxs, DeclareTransaction, DeclareTransactionV2, DeployAccountTransaction, - InvokeTransaction, InvokeTransactionV1, MaybePendingBlockWithTxs, StarknetError, + BlockId, BlockStatus, BlockTag, DeclareTransaction, InvokeTransaction, MaybePendingBlockWithTxs, StarknetError, Transaction as StarknetTransaction, }; use starknet_core::utils::get_selector_from_name; @@ -17,19 +17,16 @@ use starknet_providers::{MaybeUnknownErrorCode, Provider, ProviderError, Starkne use starknet_rpc_test::constants::{ ARGENT_CONTRACT_ADDRESS, CAIRO_1_ACCOUNT_CONTRACT_CLASS_HASH, FEE_TOKEN_ADDRESS, MAX_FEE_OVERRIDE, SIGNER_PRIVATE, }; -use starknet_rpc_test::fixtures::madara; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; use starknet_rpc_test::utils::{ - assert_equal_blocks_with_txs, build_deploy_account_tx, build_oz_account_factory, create_account, AccountActions, + build_deploy_account_tx, build_oz_account_factory, build_single_owner_account, AccountActions, }; -use starknet_rpc_test::{MadaraClient, Transaction}; +use starknet_rpc_test::Transaction; #[rstest] #[tokio::test] -async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - madara.create_empty_block().await?; +async fn fail_non_existing_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_matches!( rpc.get_block_with_txs(BlockId::Hash(FieldElement::ZERO)).await.err(), @@ -44,69 +41,52 @@ async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn works_with_invoke_txn(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn works_with_invoke_txn(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); let recipient = FieldElement::from_hex_be("0x1234").unwrap(); - madara - .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens( - recipient, - FieldElement::ONE, - None, - ))]) - .await?; - - let block = match rpc.get_block_with_txs(BlockId::Tag(BlockTag::Latest)).await.unwrap() { - MaybePendingBlockWithTxs::Block(block) => block, - MaybePendingBlockWithTxs::PendingBlock(_) => return Err(anyhow!("Expected block, got pending block")), + let (current_nonce, block) = { + let mut madara_write_lock = madara.write().await; + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let nonce = rpc.get_nonce(BlockId::Tag(BlockTag::Latest), account.address()).await?; + + madara_write_lock + .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens( + recipient, + FieldElement::ONE, + None, + ))]) + .await?; + + let block = match rpc.get_block_with_txs(BlockId::Tag(BlockTag::Latest)).await.unwrap() { + MaybePendingBlockWithTxs::Block(block) => block, + MaybePendingBlockWithTxs::PendingBlock(_) => return Err(anyhow!("Expected block, got pending block")), + }; + + (nonce, block) }; - assert_equal_blocks_with_txs( - block.clone(), - BlockWithTxs { - status: BlockStatus::AcceptedOnL2, - block_hash: FieldElement::from_hex_be("0x015e8bc7066c6d98d71c52bd52bb8eb0d1747eaa189c7f90a2a31045edccf2a8") - .unwrap(), - parent_hash: FieldElement::from_hex_be( - "0x031ebd02657f940683ae7bddf19716932c56d463fc16662d14031f8635df52ad", - ) - .unwrap(), - block_number: 1, - new_root: FieldElement::ZERO, - sequencer_address: FieldElement::from_hex_be( - "0x000000000000000000000000000000000000000000000000000000000000dead", - ) - .unwrap(), - timestamp: block.timestamp, - transactions: vec![StarknetTransaction::Invoke(InvokeTransaction::V1(InvokeTransactionV1 { - transaction_hash: FieldElement::from_hex_be( - "0x069d9d0ac1f5a4ad8d8e9a3954da53b5dc8ed239c02ad04492b9e15c50fe6d11", - ) - .unwrap(), - max_fee: FieldElement::from_hex_be(MAX_FEE_OVERRIDE).unwrap(), - signature: vec![ - FieldElement::from_hex_be("0x0611fcebbeffcbe80056f163dba051de342fbf139ece6071663a6f5d1100f4db") - .unwrap(), - FieldElement::from_hex_be("0x02c52a90217e781fd959fe961076d580c07b1bfb8e120576a55f2cb04c699a67") - .unwrap(), - ], - nonce: FieldElement::ZERO, - sender_address: FieldElement::TWO, - calldata: vec![ - FieldElement::ONE, - FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(), - get_selector_from_name("transfer").unwrap(), - FieldElement::ZERO, - FieldElement::THREE, - FieldElement::THREE, - recipient, - FieldElement::ONE, - FieldElement::ZERO, - ], - }))], - }, + assert_eq!(block.transactions.len(), 1); + let tx = match &block.transactions[0] { + StarknetTransaction::Invoke(InvokeTransaction::V1(tx)) => tx, + _ => return Err(anyhow!("Expected an invoke transaction v1")), + }; + assert_eq!(tx.sender_address, FieldElement::TWO); + assert_eq!(tx.nonce, current_nonce); + assert_eq!(tx.max_fee, FieldElement::from_hex_be(MAX_FEE_OVERRIDE).unwrap()); + assert_eq!( + tx.calldata, + vec![ + FieldElement::ONE, + FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(), + get_selector_from_name("transfer").unwrap(), + FieldElement::ZERO, + FieldElement::THREE, + FieldElement::THREE, + recipient, + FieldElement::ONE, + FieldElement::ZERO, + ] ); Ok(()) @@ -114,98 +94,54 @@ async fn works_with_invoke_txn(#[future] madara: MadaraClient) -> Result<(), any #[rstest] #[tokio::test] -async fn works_with_deploy_account_txn(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn works_with_deploy_account_txn(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; let class_hash = FieldElement::from_hex_be(CAIRO_1_ACCOUNT_CONTRACT_CLASS_HASH).unwrap(); let contract_address_salt = FieldElement::ONE; let max_fee = FieldElement::from_hex_be(MAX_FEE_OVERRIDE).unwrap(); - let oz_factory = build_oz_account_factory(rpc, "0x123", class_hash).await; - let account_deploy_txn = build_deploy_account_tx(&oz_factory, FieldElement::ONE); + let (deploy_nonce, block) = { + let mut madara_write_lock = madara.write().await; + let oz_factory = build_oz_account_factory(&rpc, "0x123", class_hash).await; + let account_deploy_txn = build_deploy_account_tx(&oz_factory, FieldElement::ONE); + + let funding_account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let account_address = account_deploy_txn.address(); + let deploy_nonce = rpc.get_nonce(BlockId::Tag(BlockTag::Latest), account_deploy_txn.address()).await?; - let funding_account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - let account_address = account_deploy_txn.address(); + // We execute the funding in a different block, because we have no way to guarantee the tx execution + // order once in the mempool + madara_write_lock + .create_block_with_txs(vec![Transaction::Execution(funding_account.transfer_tokens( + account_address, + max_fee, + None, + ))]) + .await?; + + madara_write_lock.create_block_with_txs(vec![Transaction::AccountDeployment(account_deploy_txn)]).await?; - madara - .create_block_with_txs(vec![ - Transaction::Execution(funding_account.transfer_tokens(account_address, max_fee, None)), - Transaction::AccountDeployment(account_deploy_txn), - ]) - .await?; + let block = match rpc.get_block_with_txs(BlockId::Tag(BlockTag::Latest)).await.unwrap() { + MaybePendingBlockWithTxs::Block(block) => block, + MaybePendingBlockWithTxs::PendingBlock(_) => return Err(anyhow!("Expected block, got pending block")), + }; - let block = match rpc.get_block_with_txs(BlockId::Tag(BlockTag::Latest)).await.unwrap() { - MaybePendingBlockWithTxs::Block(block) => block, - MaybePendingBlockWithTxs::PendingBlock(_) => return Err(anyhow!("Expected block, got pending block")), + (deploy_nonce, block) }; - assert_equal_blocks_with_txs( - block.clone(), - BlockWithTxs { - status: BlockStatus::AcceptedOnL2, - block_hash: FieldElement::from_hex_be("0x04d16ce836f8c4f15b30669313fd8b2e3d0118a6e9e5ee8a5de44b954056bdd8") - .unwrap(), - parent_hash: FieldElement::from_hex_be( - "0x031ebd02657f940683ae7bddf19716932c56d463fc16662d14031f8635df52ad", - ) - .unwrap(), - block_number: 1, - new_root: FieldElement::ZERO, - sequencer_address: FieldElement::from_hex_be( - "0x000000000000000000000000000000000000000000000000000000000000dead", - ) - .unwrap(), - timestamp: block.timestamp, - transactions: vec![ - StarknetTransaction::Invoke(InvokeTransaction::V1(InvokeTransactionV1 { - transaction_hash: FieldElement::from_hex_be( - "0x03be8055eece65051368768a6b92ae51e1a228edb04ebbd269e3bab555c4ed0e", - ) - .unwrap(), - max_fee: FieldElement::from_hex_be(MAX_FEE_OVERRIDE).unwrap(), - signature: vec![ - FieldElement::from_hex_be("0x0676c246cb9d166ee69e20278767837e543a9982641d05e03ca3ea9bdb7629eb") - .unwrap(), - FieldElement::from_hex_be("0x066a8ee0282af011008df1a07bd30b20575b2a7b267a2ca5428eba7c8589b0ef") - .unwrap(), - ], - nonce: FieldElement::ZERO, - sender_address: FieldElement::TWO, - calldata: vec![ - FieldElement::ONE, - FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(), - get_selector_from_name("transfer").unwrap(), - FieldElement::ZERO, - FieldElement::THREE, - FieldElement::THREE, - account_address, - max_fee, // transfer uses the same max_fee as the deploy txn internally - FieldElement::ZERO, - ], - })), - StarknetTransaction::DeployAccount(DeployAccountTransaction { - transaction_hash: FieldElement::from_hex_be( - "0x02105f08ba02511ccef6ff6676a1481645ec33c9e0d9f7d654b0590aa6afb013", - ) - .unwrap(), - max_fee, - signature: vec![ - FieldElement::from_hex_be("0x06bea565e0ac2450b1765ce3fec2ffd665f88b7c1c809a5713f795ab9641e133") - .unwrap(), - FieldElement::from_hex_be("0x00d8227bb300a313abb456689776dec594c2807b57824bf1159933e95946d227") - .unwrap(), - ], - nonce: FieldElement::ZERO, - contract_address_salt, - constructor_calldata: vec![ - FieldElement::from_hex_be("0x0566d69d8c99f62bc71118399bab25c1f03719463eab8d6a444cd11ece131616") - .unwrap(), - ], - class_hash, - }), - ], - }, + assert_eq!(block.transactions.len(), 1); + let tx = match &block.transactions[0] { + StarknetTransaction::DeployAccount(tx) => tx, + _ => return Err(anyhow!("Expected an deploy transaction v1")), + }; + assert_eq!(tx.nonce, deploy_nonce); + assert_eq!(tx.max_fee, max_fee); + assert_eq!(tx.contract_address_salt, contract_address_salt); + assert_eq!(tx.class_hash, class_hash); + assert_eq!( + tx.constructor_calldata, + vec![FieldElement::from_hex_be("0x0566d69d8c99f62bc71118399bab25c1f03719463eab8d6a444cd11ece131616").unwrap(),] ); Ok(()) @@ -213,61 +149,44 @@ async fn works_with_deploy_account_txn(#[future] madara: MadaraClient) -> Result #[rstest] #[tokio::test] -async fn works_with_declare_txn(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - let (declare_tx, class_hash, compiled_class_hash) = - account.declare_contract("./contracts/Counter.sierra.json", "./contracts/Counter.casm.json"); +#[ignore = "class already declared"] +async fn works_with_declare_txn(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; // manually setting fee else estimate_fee will be called and it will fail // as the nonce has not been updated yet let max_fee = FieldElement::from_hex_be(MAX_FEE_OVERRIDE).unwrap(); - madara.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; + let (current_nonce, class_hash, compiled_class_hash, block) = { + let mut madara_write_lock = madara.write().await; + + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let nonce = rpc.get_nonce(BlockId::Tag(BlockTag::Latest), account.address()).await?; + let (declare_tx, class_hash, compiled_class_hash) = + account.declare_contract("./contracts/Counter.sierra.json", "./contracts/Counter.casm.json"); - let block = match rpc.get_block_with_txs(BlockId::Tag(BlockTag::Latest)).await.unwrap() { - MaybePendingBlockWithTxs::Block(block) => block, - MaybePendingBlockWithTxs::PendingBlock(_) => return Err(anyhow!("Expected block, got pending block")), + madara_write_lock.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; + + let block = match rpc.get_block_with_txs(BlockId::Tag(BlockTag::Latest)).await.unwrap() { + MaybePendingBlockWithTxs::Block(block) => block, + MaybePendingBlockWithTxs::PendingBlock(_) => { + return Err(anyhow!("Expected block, got pending block")); + } + }; + (nonce, class_hash, compiled_class_hash, block) }; - assert_equal_blocks_with_txs( - block.clone(), - BlockWithTxs { - status: BlockStatus::AcceptedOnL2, - block_hash: FieldElement::from_hex_be("0x065e90b2a9571d961a874056372238922aeefc54984d78db15f7146797746a0b") - .unwrap(), - parent_hash: FieldElement::from_hex_be( - "0x031ebd02657f940683ae7bddf19716932c56d463fc16662d14031f8635df52ad", - ) - .unwrap(), - block_number: 1, - new_root: FieldElement::ZERO, - sequencer_address: FieldElement::from_hex_be( - "0x000000000000000000000000000000000000000000000000000000000000dead", - ) - .unwrap(), - timestamp: block.timestamp, - transactions: vec![StarknetTransaction::Declare(DeclareTransaction::V2(DeclareTransactionV2 { - transaction_hash: FieldElement::from_hex_be( - "0x05e0f64e8140019f2657f244dd9fd136d18acc6f52d8a0b85d3f84a110d4c708", - ) - .unwrap(), - max_fee, - signature: vec![ - FieldElement::from_hex_be("0x047a258d089e26d77f4dfcb87ad6e2537ca729c228bc75aeb9d2332cd525a25f") - .unwrap(), - FieldElement::from_hex_be("0x00b3ce21b372da9e878fd5730297589f22f7ad7a0d45520ef41602f001f90c5b") - .unwrap(), - ], - nonce: FieldElement::ZERO, - sender_address: FieldElement::TWO, - class_hash, - compiled_class_hash, - }))], - }, - ); + assert_eq!(block.status, BlockStatus::AcceptedOnL2); + assert_eq!(block.transactions.len(), 1); + let tx = match &block.transactions[0] { + StarknetTransaction::Declare(DeclareTransaction::V2(tx)) => tx, + _ => return Err(anyhow!("Expected an declare transaction v2")), + }; + assert_eq!(tx.sender_address, FieldElement::TWO); + assert_eq!(tx.nonce, current_nonce); + assert_eq!(tx.max_fee, max_fee); + assert_eq!(tx.class_hash, class_hash); + assert_eq!(tx.compiled_class_hash, compiled_class_hash); Ok(()) } diff --git a/starknet-rpc-test/get_class.rs b/starknet-rpc-test/get_class.rs index 66565b1d69..63f4b41256 100644 --- a/starknet-rpc-test/get_class.rs +++ b/starknet-rpc-test/get_class.rs @@ -12,14 +12,13 @@ use starknet_ff::FieldElement; use starknet_providers::ProviderError::StarknetError as StarknetProviderError; use starknet_providers::{MaybeUnknownErrorCode, Provider, StarknetErrorWithMessage}; use starknet_rpc_test::constants::{CAIRO_1_ACCOUNT_CONTRACT_CLASS_HASH, TEST_CONTRACT_CLASS_HASH}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::MadaraClient; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; #[rstest] #[tokio::test] -async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_non_existing_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let test_contract_class_hash = FieldElement::from_hex_be(TEST_CONTRACT_CLASS_HASH).expect("Invalid Contract Address"); @@ -38,9 +37,9 @@ async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn fail_non_existing_class_hash(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_non_existing_class_hash(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let unknown_contract_class_hash = FieldElement::from_hex_be("0x4269DEADBEEF").expect("Invalid Contract classh hash"); @@ -59,9 +58,9 @@ async fn fail_non_existing_class_hash(#[future] madara: MadaraClient) -> Result< #[rstest] #[tokio::test] -async fn work_ok_retrieving_class_for_contract_version_0(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_retrieving_class_for_contract_version_0(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let test_contract_class_hash = FieldElement::from_hex_be(TEST_CONTRACT_CLASS_HASH).expect("Invalid Contract Class Hash"); @@ -90,11 +89,12 @@ async fn work_ok_retrieving_class_for_contract_version_0(#[future] madara: Madar Ok(()) } +#[ignore = "conversion between contract class types is incomplete"] #[rstest] #[tokio::test] -async fn work_ok_retrieving_class_for_contract_version_1(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_retrieving_class_for_contract_version_1(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let test_contract_class_hash = FieldElement::from_hex_be(CAIRO_1_ACCOUNT_CONTRACT_CLASS_HASH).expect("Invalid Contract Class Hash"); diff --git a/starknet-rpc-test/get_class_at.rs b/starknet-rpc-test/get_class_at.rs index a309c13108..07d7c3fa77 100644 --- a/starknet-rpc-test/get_class_at.rs +++ b/starknet-rpc-test/get_class_at.rs @@ -12,14 +12,13 @@ use starknet_ff::FieldElement; use starknet_providers::ProviderError::StarknetError as StarknetProviderError; use starknet_providers::{MaybeUnknownErrorCode, Provider, StarknetErrorWithMessage}; use starknet_rpc_test::constants::{CAIRO_1_ACCOUNT_CONTRACT, TEST_CONTRACT_ADDRESS}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::MadaraClient; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; #[rstest] #[tokio::test] -async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_non_existing_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let test_contract_address = FieldElement::from_hex_be(TEST_CONTRACT_ADDRESS).expect("Invalid Contract Address"); assert_matches!( @@ -37,9 +36,9 @@ async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn fail_non_existing_contract(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_non_existing_contract(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let unknown_contract_address = FieldElement::from_hex_be("0x4269DEADBEEF").expect("Invalid Contract Address"); assert_matches!( @@ -57,9 +56,9 @@ async fn fail_non_existing_contract(#[future] madara: MadaraClient) -> Result<() #[rstest] #[tokio::test] -async fn work_ok_retrieving_class_for_contract_version_0(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_retrieving_class_for_contract_version_0(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let test_contract_address = FieldElement::from_hex_be(TEST_CONTRACT_ADDRESS).expect("Invalid Contract Address"); let test_contract_class_bytes = include_bytes!("../cairo-contracts/build/test.json"); @@ -90,9 +89,9 @@ async fn work_ok_retrieving_class_for_contract_version_0(#[future] madara: Madar #[rstest] #[ignore] #[tokio::test] -async fn work_ok_retrieving_class_for_contract_version_1(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_retrieving_class_for_contract_version_1(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let test_contract_address = FieldElement::from_hex_be(CAIRO_1_ACCOUNT_CONTRACT).expect("Invalid Contract Address"); let test_contract_class_bytes = include_bytes!("../cairo-contracts/build/cairo_1/NoValidateAccount.sierra.json"); diff --git a/starknet-rpc-test/get_class_hash_at.rs b/starknet-rpc-test/get_class_hash_at.rs index 76dbdff32d..e5e25d13d2 100644 --- a/starknet-rpc-test/get_class_hash_at.rs +++ b/starknet-rpc-test/get_class_hash_at.rs @@ -7,14 +7,13 @@ use starknet_ff::FieldElement; use starknet_providers::ProviderError::StarknetError as StarknetProviderError; use starknet_providers::{MaybeUnknownErrorCode, Provider, StarknetErrorWithMessage}; use starknet_rpc_test::constants::{TEST_CONTRACT_ADDRESS, TEST_CONTRACT_CLASS_HASH}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::MadaraClient; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; #[rstest] #[tokio::test] -async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_non_existing_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let test_contract_address = FieldElement::from_hex_be(TEST_CONTRACT_ADDRESS).expect("Invalid Contract Address"); assert_matches!( @@ -32,9 +31,9 @@ async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn fail_non_existing_contract(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_non_existing_contract(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let unknown_contract_address = FieldElement::from_hex_be("0x4269DEADBEEF").expect("Invalid Contract Address"); assert_matches!( @@ -52,9 +51,9 @@ async fn fail_non_existing_contract(#[future] madara: MadaraClient) -> Result<() #[rstest] #[tokio::test] -async fn work_ok_retrieving_class_hash(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_retrieving_class_hash(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let test_contract_address = FieldElement::from_hex_be(TEST_CONTRACT_ADDRESS).expect("Invalid Contract Address"); assert_eq!( diff --git a/starknet-rpc-test/get_events.rs b/starknet-rpc-test/get_events.rs index 3b3c8c5197..7ff415eec5 100644 --- a/starknet-rpc-test/get_events.rs +++ b/starknet-rpc-test/get_events.rs @@ -9,18 +9,18 @@ use starknet_ff::FieldElement; use starknet_providers::jsonrpc::HttpTransport; use starknet_providers::{JsonRpcClient, MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage}; use starknet_rpc_test::constants::{ARGENT_CONTRACT_ADDRESS, FEE_TOKEN_ADDRESS, SEQUENCER_ADDRESS, SIGNER_PRIVATE}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::utils::{assert_eq_emitted_event, create_account, AccountActions}; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; +use starknet_rpc_test::utils::{assert_eq_emitted_event, build_single_owner_account, AccountActions}; use starknet_rpc_test::{MadaraClient, Transaction, TransactionResult}; async fn transfer_tokens( rpc: &JsonRpcClient, - madara: &MadaraClient, + madara_write_lock: &mut async_lock::RwLockWriteGuard<'_, MadaraClient>, recipient: FieldElement, transfer_amount: FieldElement, ) -> (FieldElement, FieldElement) { - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - let mut txs = madara + let account = build_single_owner_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let mut txs = madara_write_lock .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens(recipient, transfer_amount, None))]) .await .unwrap(); @@ -34,9 +34,8 @@ async fn transfer_tokens( #[rstest] #[tokio::test] -async fn fail_invalid_continuation_token(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_invalid_continuation_token(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; let events_result = rpc .get_events( @@ -64,9 +63,8 @@ async fn fail_invalid_continuation_token(#[future] madara: MadaraClient) -> Resu #[rstest] #[tokio::test] -async fn fail_chunk_size_too_big(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_chunk_size_too_big(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; let events_result = rpc .get_events( @@ -94,9 +92,8 @@ async fn fail_chunk_size_too_big(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn fail_keys_too_big(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_keys_too_big(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; let events_result = rpc .get_events( @@ -124,85 +121,91 @@ async fn fail_keys_too_big(#[future] madara: MadaraClient) -> Result<(), anyhow: #[rstest] #[tokio::test] -async fn work_one_block_no_filter(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_one_block_no_filter(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; let recipient = FieldElement::from_hex_be("0x123").unwrap(); let transfer_amount = FieldElement::ONE; - let (transaction_hash, account_address) = transfer_tokens(rpc, &madara, recipient, transfer_amount).await; + + let mut madara_write_lock = madara.write().await; + let block_number = rpc.block_number().await?; + let (transaction_hash, account_address) = + transfer_tokens(&rpc, &mut madara_write_lock, recipient, transfer_amount).await; let events_result = rpc - .get_events(EventFilter { from_block: None, to_block: None, address: None, keys: None }, None, 10) + .get_events(EventFilter { from_block: None, to_block: None, address: None, keys: None }, None, 1000) .await .unwrap(); let fee_token_address = FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(); let block_hash = FieldElement::from_hex_be("0x0742520489186d3d79b09e1d14ec7e69d515a3c915e6cfd8fd4ca65299372a45").unwrap(); - let block_number = 1; let expected_fee = FieldElement::from_hex_be("0x1d010").unwrap(); - - assert_eq_emitted_event( - events_result.events, - vec![ - EmittedEvent { - from_address: fee_token_address, - keys: vec![get_selector_from_name("Transfer").unwrap()], - data: vec![ - account_address, // from - recipient, // to - transfer_amount, // value low - FieldElement::ZERO, // value high - ], - block_hash, - block_number, - transaction_hash, - }, - EmittedEvent { - from_address: account_address, - keys: vec![get_selector_from_name("transaction_executed").unwrap()], - data: vec![ - transaction_hash, // txn hash - FieldElement::TWO, // response_len - FieldElement::ONE, - FieldElement::ONE, - ], - block_hash, - block_number, - transaction_hash, - }, - EmittedEvent { - from_address: fee_token_address, - keys: vec![get_selector_from_name("Transfer").unwrap()], - data: vec![ - account_address, // from - FieldElement::from_hex_be(SEQUENCER_ADDRESS).unwrap(), // to (sequencer address) - expected_fee, // value low - FieldElement::ZERO, // value high - ], - block_hash, - block_number, - transaction_hash, - }, - ], - ); assert_eq!(events_result.continuation_token, None); + assert!(events_result.events.as_slice().windows(3).any(|w| { + assert_eq_emitted_event( + w, + &[ + EmittedEvent { + from_address: fee_token_address, + keys: vec![get_selector_from_name("Transfer").unwrap()], + data: vec![ + account_address, // from + recipient, // to + transfer_amount, // value low + FieldElement::ZERO, // value high + ], + block_hash, + block_number, + transaction_hash, + }, + EmittedEvent { + from_address: account_address, + keys: vec![get_selector_from_name("transaction_executed").unwrap()], + data: vec![ + transaction_hash, // txn hash + FieldElement::TWO, // response_len + FieldElement::ONE, + FieldElement::ONE, + ], + block_hash, + block_number, + transaction_hash, + }, + EmittedEvent { + from_address: fee_token_address, + keys: vec![get_selector_from_name("Transfer").unwrap()], + data: vec![ + account_address, // from + FieldElement::from_hex_be(SEQUENCER_ADDRESS).unwrap(), // to (sequencer address) + expected_fee, // value low + FieldElement::ZERO, // value high + ], + block_hash, + block_number, + transaction_hash, + }, + ], + ) + })); + Ok(()) } #[rstest] #[tokio::test] async fn work_one_block_with_chunk_filter_and_continuation_token( - #[future] madara: MadaraClient, + madara: &ThreadSafeMadaraClient, ) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); + let rpc = madara.get_starknet_client().await; let recipient = FieldElement::from_hex_be("0x123").unwrap(); let transfer_amount = FieldElement::ONE; - let (transaction_hash, account_address) = transfer_tokens(rpc, &madara, recipient, transfer_amount).await; + let mut madara_write_lock = madara.write().await; + let block_number = rpc.block_number().await?; + let (transaction_hash, account_address) = + transfer_tokens(&rpc, &mut madara_write_lock, recipient, transfer_amount).await; let events_result = rpc .get_events(EventFilter { from_block: None, to_block: None, address: None, keys: None }, None, 1) @@ -212,67 +215,52 @@ async fn work_one_block_with_chunk_filter_and_continuation_token( let fee_token_address = FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(); let block_hash = FieldElement::from_hex_be("0x0742520489186d3d79b09e1d14ec7e69d515a3c915e6cfd8fd4ca65299372a45").unwrap(); - let block_number = 1; - assert_eq_emitted_event( - events_result.events, - vec![EmittedEvent { - from_address: fee_token_address, - keys: vec![get_selector_from_name("Transfer").unwrap()], - data: vec![ - account_address, // from - recipient, // to - transfer_amount, // value low - FieldElement::ZERO, // value high - ], - block_hash, - block_number, - transaction_hash, - }], - ); - assert_eq!(events_result.continuation_token, Some("1,1".into())); + assert!(events_result.continuation_token.as_ref().unwrap().ends_with(",1")); let events_result = rpc .get_events( EventFilter { from_block: None, to_block: None, address: None, keys: None }, events_result.continuation_token, - 10, + 1000, ) .await .unwrap(); let expected_fee = FieldElement::from_hex_be("0x1d010").unwrap(); - assert_eq_emitted_event( - events_result.events, - vec![ - EmittedEvent { - from_address: account_address, - keys: vec![get_selector_from_name("transaction_executed").unwrap()], - data: vec![ - transaction_hash, // txn hash - FieldElement::TWO, // response_len - FieldElement::ONE, - FieldElement::ONE, - ], - block_hash, - block_number, - transaction_hash, - }, - EmittedEvent { - from_address: fee_token_address, - keys: vec![get_selector_from_name("Transfer").unwrap()], - data: vec![ - account_address, // from - FieldElement::from_hex_be(SEQUENCER_ADDRESS).unwrap(), // to (sequencer address) - expected_fee, // value low - FieldElement::ZERO, // value high - ], - block_hash, - block_number, - transaction_hash, - }, - ], - ); + assert!(events_result.events.as_slice().windows(2).any(|w| { + assert_eq_emitted_event( + w, + &[ + EmittedEvent { + from_address: account_address, + keys: vec![get_selector_from_name("transaction_executed").unwrap()], + data: vec![ + transaction_hash, // txn hash + FieldElement::TWO, // response_len + FieldElement::ONE, + FieldElement::ONE, + ], + block_hash, + block_number, + transaction_hash, + }, + EmittedEvent { + from_address: fee_token_address, + keys: vec![get_selector_from_name("Transfer").unwrap()], + data: vec![ + account_address, // from + FieldElement::from_hex_be(SEQUENCER_ADDRESS).unwrap(), // to (sequencer address) + expected_fee, // value low + FieldElement::ZERO, // value high + ], + block_hash, + block_number, + transaction_hash, + }, + ], + ) + })); Ok(()) } @@ -280,25 +268,27 @@ async fn work_one_block_with_chunk_filter_and_continuation_token( #[rstest] #[tokio::test] async fn work_two_blocks_with_block_filter_and_continuation_token( - #[future] madara: MadaraClient, + madara: &ThreadSafeMadaraClient, ) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); + let rpc = madara.get_starknet_client().await; let recipient = FieldElement::from_hex_be("0x123").unwrap(); let transfer_amount = FieldElement::ONE; + let mut madara_write_lock = madara.write().await; + let block_number = rpc.block_number().await?; // first block - let (transaction_hash_1, account_address) = transfer_tokens(rpc, &madara, recipient, transfer_amount).await; + let (transaction_hash_1, account_address) = + transfer_tokens(&rpc, &mut madara_write_lock, recipient, transfer_amount).await; // second block - let (transaction_hash_2, _) = transfer_tokens(rpc, &madara, recipient, transfer_amount).await; + let (transaction_hash_2, _) = transfer_tokens(&rpc, &mut madara_write_lock, recipient, transfer_amount).await; // get first event of first block let events_result = rpc .get_events( EventFilter { - from_block: Some(BlockId::Number(1)), - to_block: Some(BlockId::Number(1)), + from_block: Some(BlockId::Number(block_number + 1)), + to_block: Some(BlockId::Number(block_number + 1)), address: None, keys: None, }, @@ -310,9 +300,9 @@ async fn work_two_blocks_with_block_filter_and_continuation_token( let fee_token_address = FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(); - assert_eq_emitted_event( - events_result.events, - vec![EmittedEvent { + assert!(assert_eq_emitted_event( + &events_result.events, + &[EmittedEvent { from_address: fee_token_address, keys: vec![get_selector_from_name("Transfer").unwrap()], data: vec![ @@ -326,15 +316,15 @@ async fn work_two_blocks_with_block_filter_and_continuation_token( block_number: 1, transaction_hash: transaction_hash_1, }], - ); + )); assert_eq!(events_result.continuation_token, Some("0,1".into())); // get first event of second block let events_result = rpc .get_events( EventFilter { - from_block: Some(BlockId::Number(2)), - to_block: Some(BlockId::Number(2)), + from_block: Some(BlockId::Number(block_number + 2)), + to_block: Some(BlockId::Number(block_number + 2)), address: None, keys: None, }, @@ -344,9 +334,9 @@ async fn work_two_blocks_with_block_filter_and_continuation_token( .await .unwrap(); - assert_eq_emitted_event( - events_result.events, - vec![EmittedEvent { + assert!(assert_eq_emitted_event( + &events_result.events, + &[EmittedEvent { from_address: fee_token_address, keys: vec![get_selector_from_name("Transfer").unwrap()], data: vec![ @@ -360,7 +350,7 @@ async fn work_two_blocks_with_block_filter_and_continuation_token( block_number: 2, transaction_hash: transaction_hash_2, }], - ); + )); assert_eq!(events_result.continuation_token, Some("0,1".into())); @@ -369,19 +359,20 @@ async fn work_two_blocks_with_block_filter_and_continuation_token( #[rstest] #[tokio::test] -async fn work_one_block_address_filter(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_one_block_address_filter(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; let recipient = FieldElement::from_hex_be("0x123").unwrap(); let transfer_amount = FieldElement::ONE; - let (transaction_hash, account_address) = transfer_tokens(rpc, &madara, recipient, transfer_amount).await; + let mut madara_write_lock = madara.write().await; + let (transaction_hash, account_address) = + transfer_tokens(&rpc, &mut madara_write_lock, recipient, transfer_amount).await; let events_result = rpc .get_events( EventFilter { from_block: None, to_block: None, address: Some(account_address), keys: None }, None, - 10, + 1000, ) .await .unwrap(); @@ -390,22 +381,25 @@ async fn work_one_block_address_filter(#[future] madara: MadaraClient) -> Result FieldElement::from_hex_be("0x0742520489186d3d79b09e1d14ec7e69d515a3c915e6cfd8fd4ca65299372a45").unwrap(); let block_number = 1; - assert_eq_emitted_event( - events_result.events, - vec![EmittedEvent { - from_address: account_address, - keys: vec![get_selector_from_name("transaction_executed").unwrap()], - data: vec![ - transaction_hash, // txn hash - FieldElement::TWO, // response_len - FieldElement::ONE, - FieldElement::ONE, - ], - block_hash, - block_number, - transaction_hash, - }], - ); + assert!(events_result.events.as_slice().windows(1).any(|w| { + assert_eq_emitted_event( + w, + &[EmittedEvent { + from_address: account_address, + keys: vec![get_selector_from_name("transaction_executed").unwrap()], + data: vec![ + transaction_hash, // txn hash + FieldElement::TWO, // response_len + FieldElement::ONE, + FieldElement::ONE, + ], + block_hash, + block_number, + transaction_hash, + }], + ) + })); + assert_eq!(events_result.continuation_token, None); Ok(()) @@ -413,20 +407,21 @@ async fn work_one_block_address_filter(#[future] madara: MadaraClient) -> Result #[rstest] #[tokio::test] -async fn work_one_block_key_filter(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_one_block_key_filter(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; let recipient = FieldElement::from_hex_be("0x123").unwrap(); let transfer_amount = FieldElement::ONE; - let (transaction_hash, account_address) = transfer_tokens(rpc, &madara, recipient, transfer_amount).await; + let mut madara_write_lock = madara.write().await; + let (transaction_hash, account_address) = + transfer_tokens(&rpc, &mut madara_write_lock, recipient, transfer_amount).await; let key = get_selector_from_name("transaction_executed").unwrap(); let events_result = rpc .get_events( EventFilter { from_block: None, to_block: None, address: None, keys: Some(vec![vec![key]]) }, None, - 10, + 1000, ) .await .unwrap(); @@ -435,22 +430,24 @@ async fn work_one_block_key_filter(#[future] madara: MadaraClient) -> Result<(), FieldElement::from_hex_be("0x0742520489186d3d79b09e1d14ec7e69d515a3c915e6cfd8fd4ca65299372a45").unwrap(); let block_number = 1; - assert_eq_emitted_event( - events_result.events, - vec![EmittedEvent { - from_address: account_address, - keys: vec![key], - data: vec![ - transaction_hash, // txn hash - FieldElement::TWO, // response_len - FieldElement::ONE, - FieldElement::ONE, - ], - block_hash, - block_number, - transaction_hash, - }], - ); + assert!(events_result.events.as_slice().windows(1).any(|w| { + assert_eq_emitted_event( + w, + &[EmittedEvent { + from_address: account_address, + keys: vec![key], + data: vec![ + transaction_hash, // txn hash + FieldElement::TWO, // response_len + FieldElement::ONE, + FieldElement::ONE, + ], + block_hash, + block_number, + transaction_hash, + }], + ) + })); assert_eq!(events_result.continuation_token, None); Ok(()) diff --git a/starknet-rpc-test/get_nonce.rs b/starknet-rpc-test/get_nonce.rs index 242c80b303..a3122402e8 100644 --- a/starknet-rpc-test/get_nonce.rs +++ b/starknet-rpc-test/get_nonce.rs @@ -12,15 +12,14 @@ use starknet_providers::{MaybeUnknownErrorCode, Provider, ProviderError, Starkne use starknet_rpc_test::constants::{ ARGENT_CONTRACT_ADDRESS, CONTRACT_ADDRESS, MINT_AMOUNT, SIGNER_PRIVATE, TEST_CONTRACT_ADDRESS, }; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::utils::{create_account, AccountActions}; -use starknet_rpc_test::{MadaraClient, Transaction}; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; +use starknet_rpc_test::utils::{build_single_owner_account, AccountActions}; +use starknet_rpc_test::Transaction; #[rstest] #[tokio::test] -async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_non_existing_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_matches!( rpc @@ -37,18 +36,16 @@ async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn work_ok_non_used_contract_address(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_non_used_contract_address(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_eq!( rpc.get_nonce( BlockId::Number(0), FieldElement::from_hex_be("0x4269DEADBEEF").expect("Invalid Contract Address") ) - .await - .ok(), - Some(FieldElement::ZERO) + .await?, + FieldElement::ZERO ); Ok(()) @@ -56,9 +53,8 @@ async fn work_ok_non_used_contract_address(#[future] madara: MadaraClient) -> Re #[rstest] #[tokio::test] -async fn work_ok_non_account_contract(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_non_account_contract(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_eq!( rpc.get_nonce( @@ -75,13 +71,14 @@ async fn work_ok_non_account_contract(#[future] madara: MadaraClient) -> Result< #[rstest] #[tokio::test] -async fn work_ok_account_with_tx(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_account_with_tx(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let mut madara_write_lock = madara.write().await; + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let current_nonce = rpc.get_nonce(BlockId::Tag(BlockTag::Latest), account.address()).await?; - madara + madara_write_lock .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens( account.address(), FieldElement::from_hex_be(MINT_AMOUNT).expect("Invalid Mint Amount"), @@ -89,7 +86,10 @@ async fn work_ok_account_with_tx(#[future] madara: MadaraClient) -> Result<(), a ))]) .await?; - assert_eq!(rpc.get_nonce(BlockId::Tag(BlockTag::Latest), account.address(),).await.ok(), Some(FieldElement::ONE)); + assert_eq!( + rpc.get_nonce(BlockId::Tag(BlockTag::Latest), account.address()).await?, + current_nonce + FieldElement::ONE + ); Ok(()) } diff --git a/starknet-rpc-test/get_storage_at.rs b/starknet-rpc-test/get_storage_at.rs index e6a9aa5c5a..ff42624e86 100644 --- a/starknet-rpc-test/get_storage_at.rs +++ b/starknet-rpc-test/get_storage_at.rs @@ -7,14 +7,13 @@ use starknet_ff::FieldElement; use starknet_providers::ProviderError::StarknetError as StarknetProviderError; use starknet_providers::{MaybeUnknownErrorCode, Provider, StarknetErrorWithMessage}; use starknet_rpc_test::constants::{FEE_TOKEN_ADDRESS, MAX_U256}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::MadaraClient; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; #[rstest] #[tokio::test] -async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_non_existing_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let fee_token_address = FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).expect("Invalid Contract Address"); assert_matches!( @@ -22,7 +21,7 @@ async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), a .get_storage_at( fee_token_address, FieldElement::from_hex_be("0x7b62949c85c6af8a50c11c22927f9302f7a2e40bc93b4c988415915b0f97f09").unwrap(), - BlockId::Number(100), + BlockId::Hash(FieldElement::ZERO), ) .await, Err(StarknetProviderError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(code), .. })) if code == StarknetError::BlockNotFound @@ -33,9 +32,9 @@ async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn fail_non_existing_contract(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_non_existing_contract(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + let invalid_contract_address = FieldElement::from_hex_be("0x051e59c2c182a58fb0a74349bfa4769cbbcba32547591dd3fb1def8623997d00") .expect("Invalid Contract Address"); @@ -60,9 +59,8 @@ async fn fail_non_existing_contract(#[future] madara: MadaraClient) -> Result<() #[rstest] #[tokio::test] -async fn work_ok_at_previous_contract(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_at_previous_contract(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; let fee_token_address = FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).expect("Invalid Contract Address"); @@ -81,9 +79,8 @@ async fn work_ok_at_previous_contract(#[future] madara: MadaraClient) -> Result< #[rstest] #[tokio::test] -async fn return_0_for_uninitialized_key(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn return_0_for_uninitialized_key(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; let fee_token_address = FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).expect("Invalid Contract Address"); diff --git a/starknet-rpc-test/get_transaction_by_blockid_and_index.rs b/starknet-rpc-test/get_transaction_by_blockid_and_index.rs index da88061bcb..f2099fb97c 100644 --- a/starknet-rpc-test/get_transaction_by_blockid_and_index.rs +++ b/starknet-rpc-test/get_transaction_by_blockid_and_index.rs @@ -10,18 +10,17 @@ use starknet_ff::FieldElement; use starknet_providers::ProviderError::StarknetError as StarknetProviderError; use starknet_providers::{MaybeUnknownErrorCode, Provider, StarknetErrorWithMessage}; use starknet_rpc_test::constants::{ARGENT_CONTRACT_ADDRESS, MINT_AMOUNT, SIGNER_PRIVATE, TEST_CONTRACT_CLASS_HASH}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::utils::{create_account, AccountActions}; -use starknet_rpc_test::{MadaraClient, Transaction as TransactionEnum}; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; +use starknet_rpc_test::utils::{build_single_owner_account, AccountActions}; +use starknet_rpc_test::Transaction as TransactionEnum; #[rstest] #[tokio::test] -async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_non_existing_block(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_matches!( - rpc.get_transaction_by_block_id_and_index(BlockId::Number(1), 0).await, + rpc.get_transaction_by_block_id_and_index(BlockId::Hash(FieldElement::ZERO), 0).await, Err(StarknetProviderError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(StarknetError::BlockNotFound), .. @@ -33,12 +32,11 @@ async fn fail_non_existing_block(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn fail_out_of_block_index(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_out_of_block_index(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_matches!( - rpc.get_transaction_by_block_id_and_index(BlockId::Tag(BlockTag::Latest), 0).await, + rpc.get_transaction_by_block_id_and_index(BlockId::Tag(BlockTag::Latest), u64::MAX).await, Err(StarknetProviderError(StarknetErrorWithMessage { code: MaybeUnknownErrorCode::Known(StarknetError::InvalidTransactionIndex), .. @@ -50,43 +48,52 @@ async fn fail_out_of_block_index(#[future] madara: MadaraClient) -> Result<(), a #[rstest] #[tokio::test] -async fn work_ok_by_compare_with_get_block_with_tx(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_ok_by_compare_with_get_block_with_tx(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - let argent_account_address = account.address(); + let (tx_1, tx_2, block_with_txs, argent_account_address, base_nonce) = { + let mut madara_write_lock = madara.write().await; + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let argent_account_address = account.address(); + let nonce = rpc.get_nonce(BlockId::Tag(BlockTag::Latest), account.address()).await?; - madara.create_empty_block().await?; + madara_write_lock.create_empty_block().await?; - let execution_1 = account.transfer_tokens( - argent_account_address, - FieldElement::from_hex_be(MINT_AMOUNT).expect("Invalid Mint Amount"), - None, - ); - - let execution_2 = account - .transfer_tokens( - FieldElement::from_hex_be(TEST_CONTRACT_CLASS_HASH).expect("Invalid Contract Address"), + let execution_1 = account.transfer_tokens( + argent_account_address, FieldElement::from_hex_be(MINT_AMOUNT).expect("Invalid Mint Amount"), None, - ) - .nonce(FieldElement::ONE) - .max_fee(FieldElement::from_hex_be("0xDEADB").unwrap()); - - madara - .create_block_with_txs(vec![TransactionEnum::Execution(execution_1), TransactionEnum::Execution(execution_2)]) - .await?; - - let tx_1 = rpc.get_transaction_by_block_id_and_index(BlockId::Tag(BlockTag::Latest), 0).await?; - let tx_2 = rpc.get_transaction_by_block_id_and_index(BlockId::Tag(BlockTag::Latest), 1).await?; + ); + + let execution_2 = account + .transfer_tokens( + FieldElement::from_hex_be(TEST_CONTRACT_CLASS_HASH).expect("Invalid Contract Address"), + FieldElement::from_hex_be(MINT_AMOUNT).expect("Invalid Mint Amount"), + None, + ) + .nonce(nonce + FieldElement::ONE) + .max_fee(FieldElement::from_hex_be("0xDEADB").unwrap()); + + madara_write_lock + .create_block_with_txs(vec![ + TransactionEnum::Execution(execution_1), + TransactionEnum::Execution(execution_2), + ]) + .await?; + + let tx_1 = rpc.get_transaction_by_block_id_and_index(BlockId::Tag(BlockTag::Latest), 0).await?; + let tx_2 = rpc.get_transaction_by_block_id_and_index(BlockId::Tag(BlockTag::Latest), 1).await?; + let block_with_txs = rpc.get_block_with_txs(BlockId::Tag(BlockTag::Latest)).await?; + + (tx_1, tx_2, block_with_txs, argent_account_address, nonce) + }; let tx_1_hash = assert_matches!(tx_1, Transaction::Invoke(InvokeTransaction::V1(InvokeTransactionV1 { nonce, sender_address, transaction_hash, .. - })) if nonce == FieldElement::ZERO + })) if nonce == base_nonce && sender_address == argent_account_address => transaction_hash); @@ -96,19 +103,17 @@ async fn work_ok_by_compare_with_get_block_with_tx(#[future] madara: MadaraClien max_fee, transaction_hash, .. - })) if nonce == FieldElement::ONE + })) if nonce == base_nonce + FieldElement::ONE && sender_address == argent_account_address && max_fee == FieldElement::from_hex_be("0xDEADB").unwrap() => transaction_hash); - let block_with_txs = rpc.get_block_with_txs(BlockId::Tag(BlockTag::Latest)).await?; - assert_matches!(get_transaction_from_block_with_txs(&block_with_txs, 0), Transaction::Invoke(InvokeTransaction::V1(InvokeTransactionV1 { nonce, sender_address, transaction_hash, .. - })) if nonce == &FieldElement::ZERO + })) if *nonce == base_nonce && sender_address == &argent_account_address && transaction_hash == &tx_1_hash); @@ -118,7 +123,7 @@ async fn work_ok_by_compare_with_get_block_with_tx(#[future] madara: MadaraClien max_fee, transaction_hash, .. - })) if nonce == &FieldElement::ONE + })) if *nonce == base_nonce + FieldElement::ONE && sender_address == &argent_account_address && max_fee == &FieldElement::from_hex_be("0xDEADB").unwrap() && transaction_hash == &tx_2_hash); diff --git a/starknet-rpc-test/get_transaction_by_hash.rs b/starknet-rpc-test/get_transaction_by_hash.rs index f738b8a215..a4cdf7d443 100644 --- a/starknet-rpc-test/get_transaction_by_hash.rs +++ b/starknet-rpc-test/get_transaction_by_hash.rs @@ -6,18 +6,19 @@ use starknet_core::types::StarknetError; use starknet_ff::FieldElement; use starknet_providers::{MaybeUnknownErrorCode, Provider, ProviderError, StarknetErrorWithMessage}; use starknet_rpc_test::constants::{ARGENT_CONTRACT_ADDRESS, SIGNER_PRIVATE}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::utils::{assert_poll, create_account, AccountActions}; -use starknet_rpc_test::{MadaraClient, Transaction, TransactionResult}; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; +use starknet_rpc_test::utils::{assert_poll, build_single_owner_account, AccountActions}; +use starknet_rpc_test::{Transaction, TransactionResult}; #[rstest] #[tokio::test] -async fn work_valid_transaction_hash(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_valid_transaction_hash(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - let mut txs = madara + let mut madara_write_lock = madara.write().await; + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + + let mut txs = madara_write_lock .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens( FieldElement::from_hex_be("0x123").unwrap(), FieldElement::ONE, @@ -43,9 +44,8 @@ async fn work_valid_transaction_hash(#[future] madara: MadaraClient) -> Result<( #[rstest] #[tokio::test] -async fn fail_invalid_transaction_hash(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_invalid_transaction_hash(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert_matches!( rpc.get_transaction_by_hash(FieldElement::from_hex_be("0x123").unwrap()).await, diff --git a/starknet-rpc-test/get_transaction_receipt.rs b/starknet-rpc-test/get_transaction_receipt.rs index 19cf996e34..7173701799 100644 --- a/starknet-rpc-test/get_transaction_receipt.rs +++ b/starknet-rpc-test/get_transaction_receipt.rs @@ -2,7 +2,6 @@ extern crate starknet_rpc_test; use assert_matches::assert_matches; use rstest::rstest; -use starknet_accounts::Account; use starknet_core::types::{ DeclareTransactionReceipt, Event, ExecutionResult, MaybePendingTransactionReceipt, TransactionFinalityStatus, TransactionReceipt, @@ -14,12 +13,12 @@ use starknet_providers::{JsonRpcClient, Provider, ProviderError}; use starknet_rpc_test::constants::{ ARGENT_CONTRACT_ADDRESS, CAIRO_1_ACCOUNT_CONTRACT_CLASS_HASH, FEE_TOKEN_ADDRESS, SEQUENCER_ADDRESS, SIGNER_PRIVATE, }; -use starknet_rpc_test::fixtures::madara; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; use starknet_rpc_test::utils::{ assert_eq_event, assert_eq_msg_to_l1, assert_poll, build_deploy_account_tx, build_oz_account_factory, - create_account, AccountActions, + build_single_owner_account, AccountActions, }; -use starknet_rpc_test::{MadaraClient, Transaction, TransactionResult}; +use starknet_rpc_test::{Transaction, TransactionResult}; type TransactionReceiptResult = Result>>; @@ -37,16 +36,23 @@ async fn get_transaction_receipt( #[rstest] #[tokio::test] -async fn work_with_invoke_transaction(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_with_invoke_transaction(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); let recepient = FieldElement::from_hex_be("0x123").unwrap(); let transfer_amount = FieldElement::ONE; - let mut txs = madara - .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens(recepient, transfer_amount, None))]) - .await?; + + let mut txs = { + let mut madara_write_lock = madara.write().await; + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + madara_write_lock + .create_block_with_txs(vec![Transaction::Execution(account.transfer_tokens( + recepient, + transfer_amount, + None, + ))]) + .await? + }; assert_eq!(txs.len(), 1); let rpc_response = match txs.remove(0).unwrap() { @@ -54,21 +60,15 @@ async fn work_with_invoke_transaction(#[future] madara: MadaraClient) -> Result< _ => panic!("expected execution result"), }; - let invoke_tx_receipt = get_transaction_receipt(rpc, rpc_response.transaction_hash).await; + let invoke_tx_receipt = get_transaction_receipt(&rpc, rpc_response.transaction_hash).await; let fee_token_address = FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(); - let expected_fee = FieldElement::from_hex_be("0x1d010").unwrap(); + let expected_fee = FieldElement::from_hex_be("0xf154").unwrap(); match invoke_tx_receipt { Ok(MaybePendingTransactionReceipt::Receipt(TransactionReceipt::Invoke(receipt))) => { assert_eq!(receipt.transaction_hash, rpc_response.transaction_hash); // assert_eq!(receipt.actual_fee, expected_fee); TODO: Fix in RPC assert_eq!(receipt.finality_status, TransactionFinalityStatus::AcceptedOnL2); - assert_eq!( - receipt.block_hash, - FieldElement::from_hex_be("0x0742520489186d3d79b09e1d14ec7e69d515a3c915e6cfd8fd4ca65299372a45") - .unwrap() - ); - assert_eq!(receipt.block_number, 1); assert_eq_msg_to_l1(receipt.messages_sent, vec![]); assert_eq_event( receipt.events, @@ -77,14 +77,14 @@ async fn work_with_invoke_transaction(#[future] madara: MadaraClient) -> Result< from_address: fee_token_address, keys: vec![get_selector_from_name("Transfer").unwrap()], data: vec![ - account.address(), // from - recepient, // to - transfer_amount, // value low - FieldElement::ZERO, // value high + FieldElement::from_hex_be(ARGENT_CONTRACT_ADDRESS).unwrap(), // from + recepient, // to + transfer_amount, // value low + FieldElement::ZERO, // value high ], }, Event { - from_address: account.address(), + from_address: FieldElement::from_hex_be(ARGENT_CONTRACT_ADDRESS).unwrap(), // from keys: vec![get_selector_from_name("transaction_executed").unwrap()], data: vec![ rpc_response.transaction_hash, // txn hash @@ -97,10 +97,10 @@ async fn work_with_invoke_transaction(#[future] madara: MadaraClient) -> Result< from_address: fee_token_address, keys: vec![get_selector_from_name("Transfer").unwrap()], data: vec![ - account.address(), // from - FieldElement::from_hex_be(SEQUENCER_ADDRESS).unwrap(), // to (sequencer address) - expected_fee, // value low - FieldElement::ZERO, // value high + FieldElement::from_hex_be(ARGENT_CONTRACT_ADDRESS).unwrap(), // from + FieldElement::from_hex_be(SEQUENCER_ADDRESS).unwrap(), // to (sequencer address) + expected_fee, // value low + FieldElement::ZERO, // value high ], }, ], @@ -116,15 +116,17 @@ async fn work_with_invoke_transaction(#[future] madara: MadaraClient) -> Result< #[rstest] #[tokio::test] #[ignore = "class already declared"] -async fn work_with_declare_transaction(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn work_with_declare_transaction(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - let (declare_tx, _, _) = - account.declare_contract("./contracts/Counter.sierra.json", "./contracts/Counter.casm.json"); + let mut txs = { + let mut madara_write_lock = madara.write().await; + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let (declare_tx, _, _) = + account.declare_contract("./contracts/Counter.sierra.json", "./contracts/Counter.casm.json"); - let mut txs = madara.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await?; + madara_write_lock.create_block_with_txs(vec![Transaction::Declaration(declare_tx)]).await? + }; let rpc_response_declare = match txs.remove(0).unwrap() { TransactionResult::Declaration(rpc_response) => rpc_response, @@ -133,7 +135,7 @@ async fn work_with_declare_transaction(#[future] madara: MadaraClient) -> Result // not validating the fields inside the transaction as // that is covered in get_block_with_txs - let declare_tx_receipt = get_transaction_receipt(rpc, rpc_response_declare.transaction_hash).await; + let declare_tx_receipt = get_transaction_receipt(&rpc, rpc_response_declare.transaction_hash).await; let assert_declare_tx_receipt = |d1: TransactionReceiptResult, d2: DeclareTransactionReceipt| { let d1 = match d1 { @@ -155,6 +157,7 @@ async fn work_with_declare_transaction(#[future] madara: MadaraClient) -> Result let fee_token_address = FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(); let expected_fee = FieldElement::from_hex_be("0x000000000000000000000000000000000000000000000000000000000000d3ae").unwrap(); + assert_declare_tx_receipt( declare_tx_receipt, DeclareTransactionReceipt { @@ -172,10 +175,10 @@ async fn work_with_declare_transaction(#[future] madara: MadaraClient) -> Result from_address: fee_token_address, keys: vec![get_selector_from_name("Transfer").unwrap()], data: vec![ - account.address(), // from - FieldElement::from_hex_be(SEQUENCER_ADDRESS).unwrap(), // to (sequencer address) - expected_fee, // value low - FieldElement::ZERO, // value high + FieldElement::from_hex_be(ARGENT_CONTRACT_ADDRESS).unwrap(), // to (sequencer address) + FieldElement::from_hex_be(SEQUENCER_ADDRESS).unwrap(), // to (sequencer address) + expected_fee, // value low + FieldElement::ZERO, // value high ], }], execution_result: ExecutionResult::Succeeded, @@ -187,51 +190,51 @@ async fn work_with_declare_transaction(#[future] madara: MadaraClient) -> Result #[rstest] #[tokio::test] -async fn work_with_deploy_account_transaction(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - let oz_factory = - build_oz_account_factory(rpc, "0x123", FieldElement::from_hex_be(CAIRO_1_ACCOUNT_CONTRACT_CLASS_HASH).unwrap()) - .await; - let account_deploy_txn = build_deploy_account_tx(&oz_factory, FieldElement::ONE); - let account_address = account_deploy_txn.address(); - - // add funds to deploy account - let funding_account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - assert!( - madara +async fn work_with_deploy_account_transaction(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + + let (mut txs, account_address) = { + let mut madara_write_lock = madara.write().await; + let oz_factory = build_oz_account_factory( + &rpc, + "0x456", + FieldElement::from_hex_be(CAIRO_1_ACCOUNT_CONTRACT_CLASS_HASH).unwrap(), + ) + .await; + let account_deploy_txn = build_deploy_account_tx(&oz_factory, FieldElement::ONE); + let account_address = account_deploy_txn.address(); + + // add funds to deploy account + let funding_account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + madara_write_lock .create_block_with_txs(vec![Transaction::Execution(funding_account.transfer_tokens( account_address, - FieldElement::from_hex_be("0xFFFFFFFFFF").unwrap(), + FieldElement::from_hex_be("0x100000").unwrap(), None, ))]) - .await - .is_ok() - ); + .await?; - let mut txs = madara.create_block_with_txs(vec![Transaction::AccountDeployment(account_deploy_txn)]).await?; + let txs = + madara_write_lock.create_block_with_txs(vec![Transaction::AccountDeployment(account_deploy_txn)]).await?; + (txs, account_address) + }; + + assert_eq!(txs.len(), 1); let rpc_response = match txs.remove(0).unwrap() { TransactionResult::AccountDeployment(rpc_response) => rpc_response, _ => panic!("expected execution result"), }; - let account_deployment_tx_receipt = get_transaction_receipt(rpc, rpc_response.transaction_hash).await; + let account_deployment_tx_receipt = get_transaction_receipt(&rpc, rpc_response.transaction_hash).await; let fee_token_address = FieldElement::from_hex_be(FEE_TOKEN_ADDRESS).unwrap(); - let expected_fee = FieldElement::from_hex_be("0x10d9c").unwrap(); + let expected_fee = FieldElement::from_hex_be("0x790e").unwrap(); match account_deployment_tx_receipt { Ok(MaybePendingTransactionReceipt::Receipt(TransactionReceipt::DeployAccount(receipt))) => { assert_eq!(receipt.transaction_hash, rpc_response.transaction_hash); // assert_eq!(receipt.actual_fee, expected_fee); TODO: fix in code assert_eq!(receipt.finality_status, TransactionFinalityStatus::AcceptedOnL2); - assert_eq!( - receipt.block_hash, - FieldElement::from_hex_be("0x043c3527516079ca568868dcfa9421e4cfe74df3b153535ef55612c980b4c666") - .unwrap() - ); - assert_eq!(receipt.block_number, 2); assert_eq_msg_to_l1(receipt.messages_sent, vec![]); assert_eq_event( receipt.events, @@ -239,7 +242,7 @@ async fn work_with_deploy_account_transaction(#[future] madara: MadaraClient) -> from_address: fee_token_address, keys: vec![get_selector_from_name("Transfer").unwrap()], data: vec![ - account_address, // from + account_address, FieldElement::from_hex_be(SEQUENCER_ADDRESS).unwrap(), // to expected_fee, // value low FieldElement::ZERO, // value high @@ -257,9 +260,8 @@ async fn work_with_deploy_account_transaction(#[future] madara: MadaraClient) -> #[rstest] #[tokio::test] -async fn fail_invalid_transaction_hash(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn fail_invalid_transaction_hash(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; assert!(rpc.get_transaction_receipt(FieldElement::ZERO).await.is_err()); diff --git a/starknet-rpc-test/pending_transactions.rs b/starknet-rpc-test/pending_transactions.rs index 5fffde41bd..a767e4fb1f 100644 --- a/starknet-rpc-test/pending_transactions.rs +++ b/starknet-rpc-test/pending_transactions.rs @@ -1,24 +1,29 @@ extern crate starknet_rpc_test; use rstest::rstest; +use starknet_accounts::Account; +use starknet_core::types::{BlockId, BlockTag}; use starknet_ff::FieldElement; use starknet_providers::Provider; use starknet_rpc_test::constants::{ARGENT_CONTRACT_ADDRESS, SIGNER_PRIVATE}; -use starknet_rpc_test::fixtures::madara; -use starknet_rpc_test::utils::{create_account, AccountActions}; -use starknet_rpc_test::MadaraClient; +use starknet_rpc_test::fixtures::{madara, ThreadSafeMadaraClient}; +use starknet_rpc_test::utils::{build_single_owner_account, AccountActions}; #[rstest] #[tokio::test] -async fn works_with_one_pending_transaction(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn works_with_one_pending_transaction(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + + let mut madara_write_lock = madara.write().await; account.transfer_tokens(FieldElement::from_hex_be("0x123").unwrap(), FieldElement::ONE, None).send().await?; let pending_txs = rpc.pending_transactions().await?; + // Seal block + madara_write_lock.create_empty_block().await?; + // not validating the fields inside the transaction as // that is covered in get_block_with_txs assert_eq!(pending_txs.len(), 1); @@ -28,37 +33,47 @@ async fn works_with_one_pending_transaction(#[future] madara: MadaraClient) -> R #[rstest] #[tokio::test] -async fn works_with_500_pending_transactions(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); - - let account = create_account(rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); - - // loop from 1 to 500 - for nonce in 1..501 { - let transfer_result = account - .transfer_tokens(FieldElement::from_hex_be("0x123").unwrap(), FieldElement::ONE, Some(nonce)) +async fn works_with_50_pending_transactions(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; + + let mut madara_write_lock = madara.write().await; + let account = build_single_owner_account(&rpc, SIGNER_PRIVATE, ARGENT_CONTRACT_ADDRESS, true); + let nonce = rpc.get_nonce(BlockId::Tag(BlockTag::Latest), account.address()).await?; + let nonce = nonce.to_bytes_be(); + let nonce: u64 = nonce[31] as u64; + + // loop from 0 to 50 + for nonce_idx in 0..50 { + let _ = account + .transfer_tokens( + FieldElement::from_hex_be("0x123").unwrap(), + FieldElement::ONE, + Some(nonce + nonce_idx as u64), + ) .send() .await; - assert!(transfer_result.is_ok()); } let pending_txs = rpc.pending_transactions().await?; + // Seal block + madara_write_lock.create_empty_block().await?; // not validating the fields inside the transaction as // that is covered in get_block_with_txs - assert_eq!(pending_txs.len(), 500); + assert_eq!(pending_txs.len(), 50); Ok(()) } #[rstest] #[tokio::test] -async fn works_without_pending_transactions(#[future] madara: MadaraClient) -> Result<(), anyhow::Error> { - let madara = madara.await; - let rpc = madara.get_starknet_client(); +async fn works_without_pending_transactions(madara: &ThreadSafeMadaraClient) -> Result<(), anyhow::Error> { + let rpc = madara.get_starknet_client().await; - let pending_txs = rpc.pending_transactions().await?; + let pending_txs = { + let _madara_write_lock = madara.write(); + rpc.pending_transactions().await? + }; // not validating the fields inside the transaction as // that is covered in get_block_with_txs diff --git a/starknet-rpc-test/src/constants.rs b/starknet-rpc-test/src/constants.rs index 8e179e98dd..a03ac22b5c 100644 --- a/starknet-rpc-test/src/constants.rs +++ b/starknet-rpc-test/src/constants.rs @@ -24,8 +24,6 @@ pub const FEE_TOKEN_ADDRESS: &str = "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96 pub const TOKEN_CLASS_HASH: &str = "0x0000000000000000000000000000000000000000000000000000000000010000"; pub const ARGENT_CONTRACT_ADDRESS: &str = "0x0000000000000000000000000000000000000000000000000000000000000002"; -pub const ENDING_PORT: u16 = 65535; - pub const MAX_U256: &str = "0xffffffffffffffffffffffffffffffff"; pub const MAX_FEE_OVERRIDE: &str = "0x100000"; diff --git a/starknet-rpc-test/src/fixtures.rs b/starknet-rpc-test/src/fixtures.rs index 2bd8840d9e..6feec8bd2f 100644 --- a/starknet-rpc-test/src/fixtures.rs +++ b/starknet-rpc-test/src/fixtures.rs @@ -1,8 +1,25 @@ +use async_lock::RwLock; use rstest::fixture; +use starknet_providers::jsonrpc::HttpTransport; +use starknet_providers::JsonRpcClient; -use crate::{ExecutionStrategy, MadaraClient}; +use crate::MadaraClient; + +pub struct ThreadSafeMadaraClient(RwLock); #[fixture] -pub async fn madara() -> MadaraClient { - MadaraClient::new(ExecutionStrategy::Native).await +#[once] +pub fn madara() -> ThreadSafeMadaraClient { + ThreadSafeMadaraClient(RwLock::new(MadaraClient::new())) +} + +impl ThreadSafeMadaraClient { + pub async fn get_starknet_client(&self) -> JsonRpcClient { + let inner = self.0.read(); + inner.await.get_starknet_client() + } + + pub async fn write(&self) -> async_lock::RwLockWriteGuard<'_, MadaraClient> { + self.0.write().await + } } diff --git a/starknet-rpc-test/src/lib.rs b/starknet-rpc-test/src/lib.rs index c4f4a1e6fe..fc095460a6 100644 --- a/starknet-rpc-test/src/lib.rs +++ b/starknet-rpc-test/src/lib.rs @@ -2,14 +2,8 @@ use std::cell::Cell; use std::fmt::Debug; -use std::net::TcpListener; -use std::path::Path; -use std::process::{Child, Command, Stdio}; use anyhow::anyhow; -use constants::ENDING_PORT; -use derive_more::Display; -use lazy_static::lazy_static; use reqwest::header::CONTENT_TYPE; use reqwest::{Client, Response}; use serde_json::json; @@ -22,8 +16,6 @@ use starknet_providers::jsonrpc::{HttpTransport, HttpTransportError, JsonRpcClie use starknet_providers::Provider; use starknet_signers::local_wallet::SignError; use starknet_signers::LocalWallet; -use thiserror::Error; -use tokio::sync::Mutex; use url::Url; /// Constants (addresses, contracts...) @@ -33,6 +25,8 @@ pub mod utils; pub mod fixtures; +const NODE_RPC_URL: &str = "http://localhost:9944"; + type RpcAccount<'a> = SingleOwnerAccount<&'a JsonRpcClient, LocalWallet>; pub type RpcOzAccountFactory<'a> = OpenZeppelinAccountFactory>; type TransactionExecution<'a> = Execution<'a, RpcAccount<'a>>; @@ -87,146 +81,28 @@ impl Transaction<'_> { } } -lazy_static! { - /// This is to prevent TOCTOU errors; i.e. one background madara node might find one - /// port to be free, and while it's trying to start listening to it, another instance - /// finds that it's free and tries occupying it - /// Using the mutex in `get_free_port_listener` might be safer than using no mutex at all, - /// but not sufficiently safe - static ref FREE_PORT_ATTRIBUTION_MUTEX: Mutex<()> = Mutex::new(()); -} - #[derive(Debug)] /// A wrapper over the Madara process handle, reqwest client and request counter -/// -/// When this struct goes out of scope, it's `Drop` impl -/// will take care of killing the Madara process. pub struct MadaraClient { - process: Child, client: Client, rpc_request_count: Cell, - starknet_client: JsonRpcClient, - port: u16, -} - -#[derive(Display)] -pub enum ExecutionStrategy { - Native, - Wasm, -} - -#[derive(Error, Debug)] -pub enum TestError { - #[error("No free ports")] - NoFreePorts, + url: Url, } -struct NodePorts { - rpc_port: u16, - p2p_port: u16, -} - -impl Drop for MadaraClient { - fn drop(&mut self) { - if let Err(e) = self.process.kill() { - eprintln!("Could not kill Madara process: {}", e) - } - } -} - -fn find_available_ports() -> Result { - let mut available_ports = Vec::new(); - - for index in 0..3 { - let mut selected_port = 0; - let mut port = 1024 + index * 20000 + (std::process::id() % 20000) as u16; - - while selected_port == 0 && port < ENDING_PORT { - if TcpListener::bind(("127.0.0.1", port)).is_ok() { - selected_port = port; - } - port += 1; - } - - if selected_port == 0 { - return Err(TestError::NoFreePorts); - } - - available_ports.push(selected_port); +impl Default for MadaraClient { + fn default() -> Self { + let url = Url::parse(NODE_RPC_URL).expect("Invalid JSONRPC Url"); + MadaraClient { client: Client::new(), url, rpc_request_count: Default::default() } } - - Ok(NodePorts { rpc_port: available_ports[0], p2p_port: available_ports[1] }) } impl MadaraClient { - async fn init(execution: ExecutionStrategy) -> Result { - let NodePorts { p2p_port, rpc_port } = find_available_ports()?; - - let manifest_path = Path::new(&env!("CARGO_MANIFEST_DIR")); - let repository_root = manifest_path.parent().expect("Failed to get parent directory of CARGO_MANIFEST_DIR"); - - std::env::set_current_dir(repository_root).expect("Failed to change working directory"); - - let madara_log = std::env::var("MADARA_LOG").unwrap_or_else(|_| "false".to_string()); - - Command::new("cargo") - .stdout(Stdio::null()) - .stderr(if madara_log == "true" { Stdio::inherit() } else { Stdio::null() }) - .args(["run", "--release", "--", "setup"]) - .spawn() - .expect("Could not setup madara node"); - - let child_handle = Command::new("cargo") - // Silence Madara stdout and stderr - .stdout(Stdio::null()) - .stderr(if madara_log == "true" { Stdio::inherit() } else { Stdio::null() }) - .args([ - "run", - "--release", - "--", - "run", - "--sealing=manual", - &format!("--execution={execution}"), - "--dev", - "--tmp", - &format!("--port={p2p_port}"), - &format!("--rpc-port={rpc_port}"), - ]) - .spawn() - .expect("Could not start background madara node"); - - let host = &format!("http://localhost:{rpc_port}"); - - let starknet_client = JsonRpcClient::new(HttpTransport::new(Url::parse(host).expect("Invalid JSONRPC Url"))); - - Ok(MadaraClient { - process: child_handle, - client: Client::new(), - starknet_client, - rpc_request_count: Default::default(), - port: rpc_port, - }) - } - - pub async fn new(execution: ExecutionStrategy) -> Self { - // we keep the reference, otherwise the mutex unlocks immediately - let _mutex_guard = FREE_PORT_ATTRIBUTION_MUTEX.lock().await; - - let madara = Self::init(execution).await.expect("Couldn't start Madara Node"); - - // Wait until node is ready - loop { - match madara.health().await { - Ok(is_ready) if is_ready => break, - _ => {} - } - } - - madara + pub fn new() -> Self { + Default::default() } - pub async fn run_to_block(&self, target_block: u64) -> anyhow::Result<()> { - let mut current_block = self.starknet_client.block_number().await?; + pub async fn run_to_block(&mut self, target_block: u64) -> anyhow::Result<()> { + let mut current_block = self.get_starknet_client().block_number().await?; if current_block >= target_block { return Err(anyhow!("target_block must be in the future")); @@ -240,7 +116,7 @@ impl MadaraClient { Ok(()) } - pub async fn create_n_blocks(&self, mut n: u64) -> anyhow::Result<()> { + pub async fn create_n_blocks(&mut self, mut n: u64) -> anyhow::Result<()> { while n > 0 { self.create_empty_block().await?; n -= 1; @@ -258,7 +134,7 @@ impl MadaraClient { let response = self .client - .post(&format!("http://localhost:{0}", self.port)) + .post("http://localhost:9944") .header(CONTENT_TYPE, "application/json; charset=utf-8") .body(body) .send() @@ -271,11 +147,11 @@ impl MadaraClient { Ok(response) } - pub fn get_starknet_client(&self) -> &JsonRpcClient { - &self.starknet_client + pub fn get_starknet_client(&self) -> JsonRpcClient { + JsonRpcClient::new(HttpTransport::new(self.url.clone())) } - pub async fn create_empty_block(&self) -> anyhow::Result<()> { + pub async fn create_empty_block(&mut self) -> anyhow::Result<()> { let body = json!({ "method": "engine_createBlock", "params": [true, true], @@ -287,7 +163,7 @@ impl MadaraClient { } pub async fn create_block_with_txs( - &self, + &mut self, transactions: Vec>, ) -> anyhow::Result>> { let body = json!({ @@ -306,7 +182,7 @@ impl MadaraClient { response.status().is_success().then_some(results).ok_or(anyhow!("failed to create a new block")) } - pub async fn create_block_with_parent(&self, parent_hash: &str) -> anyhow::Result<()> { + pub async fn create_block_with_parent(&mut self, parent_hash: &str) -> anyhow::Result<()> { let body = json!({ "method": "engine_createBlock", "params": [json!(true), json!(true), json!(parent_hash)], diff --git a/starknet-rpc-test/src/utils.rs b/starknet-rpc-test/src/utils.rs index 9778e1671d..165e739fea 100644 --- a/starknet-rpc-test/src/utils.rs +++ b/starknet-rpc-test/src/utils.rs @@ -5,10 +5,7 @@ use starknet_accounts::{Account, AccountFactory, Call, OpenZeppelinAccountFactor use starknet_core::chain_id; use starknet_core::types::contract::legacy::LegacyContractClass; use starknet_core::types::contract::{CompiledClass, SierraClass}; -use starknet_core::types::{ - BlockId, BlockTag, BlockWithTxHashes, BlockWithTxs, DeclareTransaction, EmittedEvent, Event, FieldElement, - FunctionCall, InvokeTransaction, MsgToL1, Transaction, -}; +use starknet_core::types::{BlockId, BlockTag, EmittedEvent, Event, FieldElement, FunctionCall, MsgToL1}; use starknet_core::utils::get_selector_from_name; use starknet_providers::jsonrpc::{HttpTransport, JsonRpcClient}; use starknet_providers::Provider; @@ -25,7 +22,7 @@ pub struct U256 { pub low: FieldElement, } -pub fn create_account<'a>( +pub fn build_single_owner_account<'a>( rpc: &'a JsonRpcClient, private_key: &str, account_address: &str, @@ -170,100 +167,6 @@ impl AccountActions for SingleOwnerAccount<&JsonRpcClient, LocalW } } -// a short way to do it is to serialize both blocks and compare them -// however, in case of failures, the assert messages will be less informative -// hence, we compare each field separately -pub fn assert_equal_blocks_with_tx_hashes(b1: BlockWithTxHashes, b2: BlockWithTxHashes) { - assert_eq!(b1.transactions, b2.transactions); - assert_eq!(b1.status, b2.status); - assert_eq!(b1.block_hash, b2.block_hash); - assert_eq!(b1.parent_hash, b2.parent_hash); - assert_eq!(b1.block_number, b2.block_number); - assert_eq!(b1.new_root, b2.new_root); - assert_eq!(b1.sequencer_address, b2.sequencer_address); -} - -pub fn assert_equal_blocks_with_txs(b1: BlockWithTxs, b2: BlockWithTxs) { - assert_eq!(b1.status, b2.status); - assert_eq!(b1.block_hash, b2.block_hash); - assert_eq!(b1.parent_hash, b2.parent_hash); - assert_eq!(b1.block_number, b2.block_number); - assert_eq!(b1.new_root, b2.new_root); - assert_eq!(b1.sequencer_address, b2.sequencer_address); - assert_eq!(b1.transactions.len(), b2.transactions.len()); - for (tx1, tx2) in b1.transactions.iter().zip(b2.transactions.iter()) { - assert_equal_transactions(tx1, tx2); - } -} - -pub fn assert_equal_transactions(tx1: &Transaction, tx2: &Transaction) { - match tx1 { - Transaction::Invoke(InvokeTransaction::V1(tx1)) => { - let tx2 = match tx2 { - Transaction::Invoke(InvokeTransaction::V1(tx)) => tx, - _ => panic!("Expected Invoke transaction"), - }; - assert_eq!(tx1.transaction_hash, tx2.transaction_hash); - assert_eq!(tx1.max_fee, tx2.max_fee); - assert_eq!(tx1.signature, tx2.signature); - assert_eq!(tx1.nonce, tx2.nonce); - assert_eq!(tx1.sender_address, tx2.sender_address); - assert_eq!(tx1.calldata, tx2.calldata); - } - Transaction::L1Handler(tx1) => { - let tx2 = match tx2 { - Transaction::L1Handler(tx) => tx, - _ => panic!("Expected L1Handler transaction"), - }; - assert_eq!(tx1.transaction_hash, tx2.transaction_hash); - assert_eq!(tx1.version, tx2.version); - assert_eq!(tx1.nonce, tx2.nonce); - assert_eq!(tx1.contract_address, tx2.contract_address); - assert_eq!(tx1.entry_point_selector, tx2.entry_point_selector); - assert_eq!(tx1.calldata, tx2.calldata); - } - Transaction::Declare(DeclareTransaction::V2(tx1)) => { - let tx2 = match tx2 { - Transaction::Declare(DeclareTransaction::V2(tx)) => tx, - _ => panic!("Expected DeclareV2 transaction"), - }; - assert_eq!(tx1.nonce, tx2.nonce); - assert_eq!(tx1.sender_address, tx2.sender_address); - assert_eq!(tx1.max_fee, tx2.max_fee); - assert_eq!(tx1.signature, tx2.signature); - assert_eq!(tx1.class_hash, tx2.class_hash); - assert_eq!(tx1.compiled_class_hash, tx2.compiled_class_hash); - assert_eq!(tx1.transaction_hash, tx2.transaction_hash); - } - Transaction::Declare(DeclareTransaction::V1(tx1)) => { - let tx2 = match tx2 { - Transaction::Declare(DeclareTransaction::V1(tx)) => tx, - _ => panic!("Expected DeclareV1 transaction"), - }; - assert_eq!(tx1.nonce, tx2.nonce); - assert_eq!(tx1.sender_address, tx2.sender_address); - assert_eq!(tx1.max_fee, tx2.max_fee); - assert_eq!(tx1.signature, tx2.signature); - assert_eq!(tx1.class_hash, tx2.class_hash); - assert_eq!(tx1.transaction_hash, tx2.transaction_hash); - } - Transaction::DeployAccount(tx1) => { - let tx2 = match tx2 { - Transaction::DeployAccount(tx) => tx, - _ => panic!("Expected DeployAccount transaction"), - }; - assert_eq!(tx1.transaction_hash, tx2.transaction_hash); - assert_eq!(tx1.max_fee, tx2.max_fee); - assert_eq!(tx1.signature, tx2.signature); - assert_eq!(tx1.nonce, tx2.nonce); - assert_eq!(tx1.contract_address_salt, tx2.contract_address_salt); - assert_eq!(tx1.constructor_calldata, tx2.constructor_calldata); - assert_eq!(tx1.class_hash, tx2.class_hash); - } - _ => unimplemented!("transaction either deprecated or will be deprecated in the future"), - } -} - pub fn assert_eq_msg_to_l1(l1: Vec, l2: Vec) { assert_eq!(l1.len(), l2.len()); for (m1, m2) in l1.iter().zip(l2.iter()) { @@ -282,16 +185,16 @@ pub fn assert_eq_event(l1: Vec, l2: Vec) { } } -pub fn assert_eq_emitted_event(l1: Vec, l2: Vec) { +pub fn assert_eq_emitted_event(l1: &[EmittedEvent], l2: &[EmittedEvent]) -> bool { assert_eq!(l1.len(), l2.len()); - for (e1, e2) in l1.iter().zip(l2.iter()) { - assert_eq!(e1.data, e2.data); - assert_eq!(e1.from_address, e2.from_address); - assert_eq!(e1.keys, e2.keys); - assert_eq!(e1.block_hash, e2.block_hash); - assert_eq!(e1.block_number, e2.block_number); - assert_eq!(e1.transaction_hash, e2.transaction_hash); - } + l1.iter().zip(l2.iter()).all(|(e1, e2)| { + e1.data == e2.data + || e1.from_address == e2.from_address + || e1.keys == e2.keys + || e1.block_hash == e2.block_hash + || e1.block_number == e2.block_number + || e1.transaction_hash == e2.transaction_hash + }) } pub async fn assert_poll(f: F, polling_time_ms: u64, max_poll_count: u32) From a2357190985eb8095a05da4a4e040723e67eb94c Mon Sep 17 00:00:00 2001 From: Daniel Bigos Date: Thu, 12 Oct 2023 14:20:56 +0200 Subject: [PATCH 12/45] test: validate_unsigned noce logic for User transactions (#1172) --- CHANGELOG.md | 1 + .../pallets/starknet/src/tests/declare_tx.rs | 36 +++++++++++++++++-- .../starknet/src/tests/deploy_account_tx.rs | 29 +++++++++++++-- .../pallets/starknet/src/tests/invoke_tx.rs | 32 ++++++++++++++--- crates/pallets/starknet/src/tests/mod.rs | 9 +++-- 5 files changed, 95 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5122446d74..8cf01e5dac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next release +- 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 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 f035ef7e69..6e43c1dc3a 100644 --- a/crates/pallets/starknet/src/tests/deploy_account_tx.rs +++ b/crates/pallets/starknet/src/tests/deploy_account_tx.rs @@ -3,8 +3,8 @@ 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; @@ -13,7 +13,7 @@ use super::mock::default_mock::*; use super::mock::*; use super::utils::sign_message_hash; 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] @@ -335,3 +335,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/invoke_tx.rs b/crates/pallets/starknet/src/tests/invoke_tx.rs index 6f603a4c2b..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() { @@ -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/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) +} From 29a8b112f5a09dc2ad9a29989b95b7e3a15623ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Delabrouille?= <34384633+tdelabro@users.noreply.github.com> Date: Thu, 12 Oct 2023 15:29:08 +0200 Subject: [PATCH 13/45] fix(starknet-rpc-test): don't share reqwest client across test runtimes (#1184) --- CHANGELOG.md | 3 ++- starknet-rpc-test/src/lib.rs | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cf01e5dac..23cf8515ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next release +- 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 @@ -21,7 +22,7 @@ - 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-rpx-test): run all tests against a single madara node +- test(starknet-rpc-test): run all tests against a single madara node ## v0.4.0 diff --git a/starknet-rpc-test/src/lib.rs b/starknet-rpc-test/src/lib.rs index fc095460a6..48dc13b5ab 100644 --- a/starknet-rpc-test/src/lib.rs +++ b/starknet-rpc-test/src/lib.rs @@ -84,7 +84,6 @@ impl Transaction<'_> { #[derive(Debug)] /// A wrapper over the Madara process handle, reqwest client and request counter pub struct MadaraClient { - client: Client, rpc_request_count: Cell, url: Url, } @@ -92,7 +91,7 @@ pub struct MadaraClient { impl Default for MadaraClient { fn default() -> Self { let url = Url::parse(NODE_RPC_URL).expect("Invalid JSONRPC Url"); - MadaraClient { client: Client::new(), url, rpc_request_count: Default::default() } + MadaraClient { url, rpc_request_count: Default::default() } } } @@ -132,8 +131,7 @@ impl MadaraClient { let body = serde_json::to_string(&body).expect("the json body must be serializable"); - let response = self - .client + let response = Client::new() .post("http://localhost:9944") .header(CONTENT_TYPE, "application/json; charset=utf-8") .body(body) From ee2602aed93eb54b9582f67ff926b16f403a69df Mon Sep 17 00:00:00 2001 From: Oak <5263301+d-roak@users.noreply.github.com> Date: Thu, 12 Oct 2023 23:05:57 +0900 Subject: [PATCH 14/45] ci: tests key generation commands (#1182) --- .github/workflows/madara-commands.yml | 12 ++++++++++++ CHANGELOG.md | 1 + 2 files changed, 13 insertions(+) diff --git a/.github/workflows/madara-commands.yml b/.github/workflows/madara-commands.yml index c4ccb2a79c..5b6e907d27 100644 --- a/.github/workflows/madara-commands.yml +++ b/.github/workflows/madara-commands.yml @@ -31,3 +31,15 @@ jobs: - 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/CHANGELOG.md b/CHANGELOG.md index 23cf8515ba..bb2c687fd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next release +- 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 From dfb29ffa7b6a15055dc331c97965068be75bb8ba Mon Sep 17 00:00:00 2001 From: Alexander Kalankhodzhaev Date: Thu, 12 Oct 2023 22:49:19 +0700 Subject: [PATCH 15/45] docs: fix setup and run commands in `getting-started.md` (#1186) --- docs/getting-started.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/getting-started.md b/docs/getting-started.md index c489682d3e..ced3036600 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -16,17 +16,17 @@ rustup show Use Rust's native `cargo` command to build and launch the template node: ```sh -cargo run --release -- setup -cargo run --release -- run --dev +cargo run --release -- setup --chain=dev --from-remote +cargo run --release -- --dev ``` The node also supports to use manual seal (to produce block manually through RPC). This is also used by the typescript tests: ```sh -$ cargo run --release -- run --dev --sealing=manual +$ cargo run --release -- --dev --sealing=manual # Or -$ cargo run --release -- run --dev --sealing=instant +$ cargo run --release -- --dev --sealing=instant ``` Log level can be specified with `-l` flag. For example, `-ldebug` will show @@ -34,7 +34,7 @@ debug logs. It can also be specified via the `RUST_LOG` environment variable. For example: ```sh -RUSTLOG=runtime=info cargo run --release -- run --dev +RUSTLOG=runtime=info cargo run --release -- --dev ``` ### Cargo Build @@ -81,7 +81,7 @@ This command will start the single-node development chain with non-persistent state: ```bash -./target/release/madara setup +./target/release/madara setup --chain=dev --from-remote ./target/release/madara --dev ``` From 629f36cbd7f355d40ed46710124a7873c84e59f6 Mon Sep 17 00:00:00 2001 From: antiyro <74653697+antiyro@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:50:34 +0200 Subject: [PATCH 16/45] doc: fix event commitment documentation typo (#1187) --- CHANGELOG.md | 1 + crates/primitives/commitments/src/lib.rs | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb2c687fd9..22f7b67c11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next release +- 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 diff --git a/crates/primitives/commitments/src/lib.rs b/crates/primitives/commitments/src/lib.rs index ce113e6ef4..fd8f31f624 100644 --- a/crates/primitives/commitments/src/lib.rs +++ b/crates/primitives/commitments/src/lib.rs @@ -161,7 +161,7 @@ pub(crate) fn calculate_transaction_commitment( tree.commit() } -/// Calculate transaction commitment hash value. +/// Calculate event commitment hash value. /// /// The event commitment is the root of the Patricia Merkle tree with height 64 /// constructed by adding the event hash @@ -170,11 +170,11 @@ pub(crate) fn calculate_transaction_commitment( /// /// # Arguments /// -/// * `transactions` - The transactions to get the events from. +/// * `events` - The events to calculate the commitment from. /// /// # Returns /// -/// The merkle root of the merkle tree built from the transactions and the number of events. +/// The merkle root of the merkle tree built from the events. pub(crate) fn calculate_event_commitment(events: &[Event]) -> Felt252Wrapper { let mut tree = CommitmentTree::::default(); events.iter().enumerate().for_each(|(id, event)| { From 85cb7268475c08535799136951294f8469ca2d34 Mon Sep 17 00:00:00 2001 From: Tony Bo <61715244+tonypony220@users.noreply.github.com> Date: Thu, 12 Oct 2023 22:02:04 +0200 Subject: [PATCH 17/45] test: added sign_message_hash_braavos function (#1131) --- CHANGELOG.md | 1 + .../starknet/src/tests/deploy_account_tx.rs | 60 ++++++++++++++++--- crates/pallets/starknet/src/tests/utils.rs | 26 ++++++++ 3 files changed, 78 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22f7b67c11..1851e32c5b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next release +- 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 diff --git a/crates/pallets/starknet/src/tests/deploy_account_tx.rs b/crates/pallets/starknet/src/tests/deploy_account_tx.rs index 6e43c1dc3a..7b416b1e66 100644 --- a/crates/pallets/starknet/src/tests/deploy_account_tx.rs +++ b/crates/pallets/starknet/src/tests/deploy_account_tx.rs @@ -11,7 +11,7 @@ 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, set_nonce}; use crate::{Config, Error, Event, StorageView}; @@ -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); 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::>()); + let braavos_hash = PedersenHasher::compute_hash_on_elements(&elements); + + let mut signatures = sign_message_hash(Felt252Wrapper(braavos_hash)); + signatures.push(actual_impl_hash); + signatures.extend_from_slice(signer_model); + signatures +} + pub fn sign_message_hash(hash: Felt252Wrapper) -> Vec { let signature = sign( &FieldElement::from_str(ACCOUNT_PRIVATE_KEY).unwrap(), From d9ec4a1e66a9f5b6e13eb23a785312101e34a958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Delabrouille?= <34384633+tdelabro@users.noreply.github.com> Date: Fri, 13 Oct 2023 12:35:43 +0200 Subject: [PATCH 18/45] fix(transactions): remove nonce field from InvokeV0 tx (#1185) --- CHANGELOG.md | 2 + crates/pallets/starknet/src/lib.rs | 57 +++++++++++-------- .../transactions/src/compute_hash.rs | 2 - .../transactions/src/compute_hash_tests.rs | 3 +- crates/primitives/transactions/src/getters.rs | 12 ++-- crates/primitives/transactions/src/lib.rs | 1 - .../src/to_starknet_core_transaction.rs | 1 - 7 files changed, 41 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1851e32c5b..08947ed7d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Next release +- 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 diff --git a/crates/pallets/starknet/src/lib.rs b/crates/pallets/starknet/src/lib.rs index 12169e7025..4a01644b9d 100644 --- a/crates/pallets/starknet/src/lib.rs +++ b/crates/pallets/starknet/src/lib.rs @@ -743,24 +743,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!( + 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 + ); + } + }; - (transaction.sender_address(), sender_nonce, *transaction_nonce) + (transaction.sender_address(), sender_nonce, transaction_nonce.cloned()) } else { // TODO: create and check L1 messages Nonce unimplemented!() @@ -789,20 +792,24 @@ pub mod pallet { })?; } - 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() diff --git a/crates/primitives/transactions/src/compute_hash.rs b/crates/primitives/transactions/src/compute_hash.rs index 7137d881ea..a08100a734 100644 --- a/crates/primitives/transactions/src/compute_hash.rs +++ b/crates/primitives/transactions/src/compute_hash.rs @@ -35,7 +35,6 @@ impl ComputeTransactionHash for InvokeTransactionV0 { let calldata_hash = compute_hash_on_elements(convert_calldata(&self.calldata)); let max_fee = FieldElement::from(self.max_fee); let chain_id = chain_id.into(); - let nonce = FieldElement::from(self.nonce); H::compute_hash_on_elements(&[ prefix, @@ -45,7 +44,6 @@ impl ComputeTransactionHash for InvokeTransactionV0 { calldata_hash, max_fee, chain_id, - nonce, ]) .into() } diff --git a/crates/primitives/transactions/src/compute_hash_tests.rs b/crates/primitives/transactions/src/compute_hash_tests.rs index ce04ff9849..d90270a762 100644 --- a/crates/primitives/transactions/src/compute_hash_tests.rs +++ b/crates/primitives/transactions/src/compute_hash_tests.rs @@ -173,14 +173,13 @@ fn test_declare_v2_tx_hash() { fn test_invoke_tx_v0_hash() { // Computed with `calculate_transaction_hash_common` from the cairo lang package let expected_tx_hash = - Felt252Wrapper::from_hex_be("0x054f8e66281306dd43fb035e1bf8b1f7baad8f28390f6de1f337e6be5490f1f7").unwrap(); + Felt252Wrapper::from_hex_be("0x0006a8aca140749156148fa84f432f7f7b7318c119d97dd1808848fc74d1a8a6").unwrap(); let chain_id = Felt252Wrapper(FieldElement::from_byte_slice_be(b"SN_GOERLI").unwrap()); let transaction = InvokeTransactionV0 { max_fee: 1, signature: vec![], - nonce: Felt252Wrapper::ZERO, contract_address: Default::default(), entry_point_selector: Default::default(), calldata: vec![Felt252Wrapper::ONE, Felt252Wrapper::TWO, Felt252Wrapper::THREE], diff --git a/crates/primitives/transactions/src/getters.rs b/crates/primitives/transactions/src/getters.rs index 68c9589017..790628d325 100644 --- a/crates/primitives/transactions/src/getters.rs +++ b/crates/primitives/transactions/src/getters.rs @@ -48,10 +48,10 @@ impl UserTransaction { } } - pub fn nonce(&self) -> &Felt252Wrapper { + pub fn nonce(&self) -> Option<&Felt252Wrapper> { match self { - UserTransaction::Declare(tx, _) => tx.nonce(), - UserTransaction::DeployAccount(tx) => tx.nonce(), + UserTransaction::Declare(tx, _) => Some(tx.nonce()), + UserTransaction::DeployAccount(tx) => Some(tx.nonce()), UserTransaction::Invoke(tx) => tx.nonce(), } } @@ -182,10 +182,10 @@ impl InvokeTransaction { } } - pub fn nonce(&self) -> &Felt252Wrapper { + pub fn nonce(&self) -> Option<&Felt252Wrapper> { match self { - InvokeTransaction::V0(tx) => &tx.nonce, - InvokeTransaction::V1(tx) => &tx.nonce, + InvokeTransaction::V0(_) => None, + InvokeTransaction::V1(tx) => Some(&tx.nonce), } } diff --git a/crates/primitives/transactions/src/lib.rs b/crates/primitives/transactions/src/lib.rs index 0b8de96c01..a5c079939c 100644 --- a/crates/primitives/transactions/src/lib.rs +++ b/crates/primitives/transactions/src/lib.rs @@ -98,7 +98,6 @@ pub enum InvokeTransaction { pub struct InvokeTransactionV0 { pub max_fee: u128, pub signature: Vec, - pub nonce: Felt252Wrapper, pub contract_address: Felt252Wrapper, pub entry_point_selector: Felt252Wrapper, pub calldata: Vec, diff --git a/crates/primitives/transactions/src/to_starknet_core_transaction.rs b/crates/primitives/transactions/src/to_starknet_core_transaction.rs index 53cef64453..726626a470 100644 --- a/crates/primitives/transactions/src/to_starknet_core_transaction.rs +++ b/crates/primitives/transactions/src/to_starknet_core_transaction.rs @@ -91,7 +91,6 @@ pub fn to_starknet_core_tx( super::InvokeTransaction::V0(super::InvokeTransactionV0 { max_fee, signature, - nonce: _, contract_address, entry_point_selector, calldata, From ce991f3a61ca6c0950e0a7a9877b6961a0c0f79e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 06:04:09 +0000 Subject: [PATCH 19/45] build(deps): bump tokio from 1.32.0 to 1.33.0 (#1194) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 6 +++--- starknet-rpc-test/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d752e54600..9bdb995018 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -13095,9 +13095,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", @@ -13547,7 +13547,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand 0.7.3", + "rand 0.8.5", "static_assertions", ] diff --git a/starknet-rpc-test/Cargo.toml b/starknet-rpc-test/Cargo.toml index e5cc195f3f..ca8ac5dfc2 100644 --- a/starknet-rpc-test/Cargo.toml +++ b/starknet-rpc-test/Cargo.toml @@ -22,7 +22,7 @@ starknet-ff = { workspace = true } starknet-providers = { workspace = true } starknet-signers = { workspace = true } thiserror = { workspace = true } -tokio = { version = "1.29.1", features = ["rt", "macros", "parking_lot"] } +tokio = { version = "1.33.0", features = ["rt", "macros", "parking_lot"] } url = "2.4.1" [[test]] From b7d2c4c637f654c99e91f4cba1cb593e576ebd21 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 06:04:38 +0000 Subject: [PATCH 20/45] build(deps): bump serde from 1.0.188 to 1.0.189 (#1193) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- starknet-rpc-test/Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9bdb995018..bff649ad46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10607,9 +10607,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", ] @@ -10636,9 +10636,9 @@ 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", diff --git a/Cargo.toml b/Cargo.toml index a3e27436aa..a625ed6f18 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -215,7 +215,7 @@ 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.22", default-features = false } -serde = { version = "1.0.188", 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 } diff --git a/starknet-rpc-test/Cargo.toml b/starknet-rpc-test/Cargo.toml index ca8ac5dfc2..3536209d90 100644 --- a/starknet-rpc-test/Cargo.toml +++ b/starknet-rpc-test/Cargo.toml @@ -12,7 +12,7 @@ async-lock = "2.8.0" flate2 = { workspace = true } reqwest = "0.11.18" rstest = "0.18.1" -serde = { version = "1.0.179", features = ["derive"] } +serde = { version = "1.0.189", features = ["derive"] } serde_json = "1.0.107" starknet-accounts = { workspace = true } starknet-contract = { workspace = true } From f699a9466be38f9de943780a74099a568681c88b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 06:08:43 +0000 Subject: [PATCH 21/45] build(deps): bump async-trait from 0.1.73 to 0.1.74 (#1191) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bff649ad46..9d4367f0b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -640,9 +640,9 @@ dependencies = [ [[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", diff --git a/Cargo.toml b/Cargo.toml index a625ed6f18..ff8a556b69 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -226,7 +226,7 @@ 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.17" num-bigint = "0.4.4" From 006ecb46d94f1c0865b9c4a587f174a66785806b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 06:09:09 +0000 Subject: [PATCH 22/45] build(deps): bump parity-db from 0.4.11 to 0.4.12 (#1192) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- crates/client/db/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d4367f0b5..97d53ec1cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7673,9 +7673,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", 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", From 14928ef0eb2f8f911d62d9821cc6ce718f593d51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 06:35:58 +0000 Subject: [PATCH 23/45] build(deps): bump flate2 from 1.0.27 to 1.0.28 (#1190) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 97d53ec1cb..41ad81e88c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3665,9 +3665,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", diff --git a/Cargo.toml b/Cargo.toml index ff8a556b69..8211bd7bbd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -201,7 +201,7 @@ 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 } From 2afd5fdfa1085332bf566a10f5f19617fe40fb8b Mon Sep 17 00:00:00 2001 From: Oak <5263301+d-roak@users.noreply.github.com> Date: Mon, 16 Oct 2023 17:46:41 +0900 Subject: [PATCH 24/45] ci: rust cache (#1188) --- .github/workflows/coverage.yml | 14 +- .github/workflows/linters-cargo.yml | 20 +- .github/workflows/madara-commands.yml | 7 +- .github/workflows/pull-request.yml | 24 +- .github/workflows/push.yml | 20 +- .../{rust-build.yml => rust-build-test.yml} | 25 +- .github/workflows/starknet-rpc-tests.yml | 11 +- .github/workflows/tests.yml | 14 +- CHANGELOG.md | 3 + Cargo.lock | 502 +++++++++--------- 10 files changed, 296 insertions(+), 344 deletions(-) rename .github/workflows/{rust-build.yml => rust-build-test.yml} (62%) 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 f9871df984..7d4b79a896 100644 --- a/.github/workflows/linters-cargo.yml +++ b/.github/workflows/linters-cargo.yml @@ -11,24 +11,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 5b6e907d27..25635b29a2 100644 --- a/.github/workflows/madara-commands.yml +++ b/.github/workflows/madara-commands.yml @@ -12,12 +12,7 @@ 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 }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index d64a2b462e..b8bd4fe637 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -20,39 +20,27 @@ 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 - - tests: - name: Run tests - uses: ./.github/workflows/tests.yml - needs: rust_build + needs: madara_commands rpc-tests: name: Run rpc tests uses: ./.github/workflows/starknet-rpc-tests.yml - needs: rust_build - - # TODO: Unlock when rust tests are working on main - # coverage: - # name: Run coverage - # uses: ./.github/workflows/coverage.yml - # needs: [madara_commands, linters_cargo] + needs: madara_commands # https://github.com/keep-starknet-strange/madara/issues/1097 - # benchmark: # name: Run benchmarks # uses: ./.github/workflows/benchmarks.yml diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index f270b23e8a..cbade8649d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -11,15 +11,26 @@ 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 + # https://github.com/keep-starknet-strange/madara/issues/1097 # benchmark: # name: Run benchmarks # uses: ./.github/workflows/benchmarks.yml @@ -32,7 +43,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-rpc-tests.yml b/.github/workflows/starknet-rpc-tests.yml index 6ccf244cde..c7bd2068a8 100644 --- a/.github/workflows/starknet-rpc-tests.yml +++ b/.github/workflows/starknet-rpc-tests.yml @@ -12,14 +12,13 @@ jobs: 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: | - ~/.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 }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 17a8ea3fd4..33b6f3427b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,18 +12,10 @@ jobs: BINARY_PATH: ../target/release/madara 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/CHANGELOG.md b/CHANGELOG.md index 08947ed7d8..baafc6660a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## Next release +- 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 diff --git a/Cargo.lock b/Cargo.lock index 41ad81e88c..69a75a0875 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", @@ -612,7 +612,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.23", + "rustix 0.37.25", "slab", "socket2 0.4.9", "waker-fn", @@ -635,7 +635,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -646,7 +646,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -859,7 +859,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -1041,9 +1041,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", @@ -1069,9 +1069,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", @@ -1112,9 +1112,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" @@ -1356,7 +1356,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]] @@ -1651,9 +1651,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", ] @@ -1666,7 +1666,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", "thiserror", @@ -1680,7 +1680,7 @@ checksum = "e7daec1a2a2129eeba1644b220b4647ec537b0b5d4bfd6876fcc5a540056b592" dependencies = [ "camino", "cargo-platform", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", "thiserror", @@ -1744,7 +1744,7 @@ dependencies = [ "cid 0.10.1", "const_format", "enum_dispatch", - "libp2p-identity 0.2.3", + "libp2p-identity 0.2.5", "multiaddr 0.18.0", "nmt-rs", "ruint", @@ -1946,7 +1946,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2075,9 +2075,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", @@ -2466,7 +2466,7 @@ checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2484,9 +2484,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", @@ -2496,9 +2496,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", @@ -2506,24 +2506,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]] @@ -2571,7 +2571,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2593,7 +2593,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2868,7 +2868,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -2942,7 +2942,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", @@ -3050,9 +3050,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", @@ -3130,7 +3130,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3160,25 +3160,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" @@ -3315,7 +3304,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "syn 2.0.37", + "syn 2.0.38", "toml 0.7.8", "walkdir", ] @@ -3333,7 +3322,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3347,7 +3336,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", @@ -3359,7 +3348,7 @@ dependencies = [ "serde", "serde_json", "strum 0.25.0", - "syn 2.0.37", + "syn 2.0.38", "tempfile", "thiserror", "tiny-keccak", @@ -3374,7 +3363,7 @@ checksum = "0e53451ea4a8128fbce33966da71132cf9e1040dcfd2a2084fd7733ada7b2045" dependencies = [ "ethers-core", "reqwest", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", "thiserror", @@ -3455,7 +3444,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", @@ -3483,7 +3472,7 @@ dependencies = [ "path-slash", "rayon", "regex", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", "solang-parser", @@ -3906,7 +3895,7 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3918,7 +3907,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -3928,7 +3917,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]] @@ -4008,7 +3997,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.19", "windows-sys 0.48.0", ] @@ -4100,7 +4089,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -4111,7 +4100,7 @@ checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", "rustls 0.20.9", - "webpki 0.22.1", + "webpki 0.22.4", ] [[package]] @@ -4165,9 +4154,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", @@ -4176,13 +4165,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]] @@ -4342,9 +4331,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", @@ -4752,9 +4741,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", @@ -4766,7 +4755,7 @@ dependencies = [ "rtnetlink", "system-configuration", "tokio", - "windows 0.34.0", + "windows 0.51.1", ] [[package]] @@ -4841,9 +4830,9 @@ 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", @@ -4956,7 +4945,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.19", "windows-sys 0.48.0", ] @@ -4986,9 +4975,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", ] @@ -5288,7 +5277,7 @@ checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ "base64 0.21.4", "pem", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -5302,7 +5291,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", @@ -5399,9 +5388,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" @@ -5415,9 +5404,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" @@ -5561,11 +5550,12 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "686e73aff5e23efbb99bc85340ea6fd8686986aa7b283a881ba182cfca535ca9" +checksum = "57bf6e730ec5e7022958da53ffb03b326e681b7316939012ae9b3c7449a812d4" dependencies = [ "bs58 0.5.0", + "hkdf", "log", "multihash 0.19.1", "quick-protobuf", @@ -5774,10 +5764,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", ] @@ -5980,9 +5970,9 @@ 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" @@ -6452,9 +6442,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" @@ -6462,7 +6452,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.19", ] [[package]] @@ -6767,7 +6757,7 @@ dependencies = [ "arrayref", "byteorder", "data-encoding", - "libp2p-identity 0.2.3", + "libp2p-identity 0.2.5", "multibase", "multihash 0.19.1", "percent-encoding", @@ -7231,7 +7221,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -7351,7 +7341,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -7911,7 +7901,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -7932,7 +7922,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.1", + "indexmap 2.0.2", ] [[package]] @@ -7975,7 +7965,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -8019,7 +8009,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -8204,14 +8194,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", @@ -8263,14 +8253,14 @@ 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", ] @@ -8315,23 +8305,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.0", "lazy_static", "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", ] @@ -8394,7 +8383,7 @@ dependencies = [ "prost 0.12.1", "prost-types 0.12.1", "regex", - "syn 2.0.37", + "syn 2.0.38", "tempfile", "which", ] @@ -8422,7 +8411,7 @@ dependencies = [ "itertools 0.11.0", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -8493,20 +8482,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]] @@ -8646,7 +8635,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", @@ -8659,7 +8648,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b" dependencies = [ "pem", - "ring", + "ring 0.16.20", "time", "yasna", ] @@ -8710,7 +8699,7 @@ checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -8727,14 +8716,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.5" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.8", - "regex-syntax 0.7.5", + "regex-automata 0.4.1", + "regex-syntax 0.8.1", ] [[package]] @@ -8748,13 +8737,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.1", ] [[package]] @@ -8769,6 +8758,12 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +[[package]] +name = "regex-syntax" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" + [[package]] name = "relative-path" version = "1.9.0" @@ -8859,11 +8854,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +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" @@ -8941,7 +8950,7 @@ dependencies = [ "regex", "relative-path", "rustc_version 0.4.0", - "syn 2.0.37", + "syn 2.0.38", "unicode-ident", ] @@ -9057,7 +9066,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]] @@ -9071,9 +9080,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", @@ -9085,9 +9094,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" dependencies = [ "bitflags 1.3.2", "errno", @@ -9099,14 +9108,14 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.14" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.7", + "linux-raw-sys 0.4.10", "windows-sys 0.48.0", ] @@ -9118,7 +9127,7 @@ checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ "base64 0.13.1", "log", - "ring", + "ring 0.16.20", "sct 0.6.1", "webpki 0.21.4", ] @@ -9130,9 +9139,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]] @@ -9142,7 +9151,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", ] @@ -9174,8 +9183,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]] @@ -9184,8 +9193,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]] @@ -9320,7 +9329,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -9661,7 +9670,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", @@ -10207,7 +10216,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -10447,8 +10456,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]] @@ -10457,8 +10466,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]] @@ -10571,9 +10580,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", ] @@ -10642,7 +10651,7 @@ checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -10675,7 +10684,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -10724,7 +10733,7 @@ dependencies = [ "darling 0.20.3", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -10799,9 +10808,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", ] @@ -10928,7 +10937,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", @@ -11016,7 +11025,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -11334,7 +11343,7 @@ dependencies = [ "proc-macro2", "quote", "sp-core-hashing 5.0.0", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -11353,7 +11362,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]] @@ -11364,7 +11373,7 @@ checksum = "c7f531814d2f16995144c74428830ccf7d94ff4a7749632b83ad8199b181140c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -11667,7 +11676,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -11680,7 +11689,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -11944,7 +11953,7 @@ dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -12112,9 +12121,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", @@ -12176,7 +12185,7 @@ checksum = "af6527b845423542c8a16e060ea1bc43f67229848e7cd4c4d80be994a84220ce" dependencies = [ "starknet-curve 0.4.0", "starknet-ff", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -12415,7 +12424,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -12429,7 +12438,7 @@ dependencies = [ "lazy_static", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "subtle", "thiserror", "tokio", @@ -12692,7 +12701,7 @@ dependencies = [ "quote", "scale-info", "subxt-metadata", - "syn 2.0.37", + "syn 2.0.38", "thiserror", "tokio", ] @@ -12706,7 +12715,7 @@ dependencies = [ "darling 0.20.3", "proc-macro-error", "subxt-codegen", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -12733,7 +12742,7 @@ dependencies = [ "hex", "once_cell", "reqwest", - "semver 1.0.19", + "semver 1.0.20", "serde", "serde_json", "sha2 0.10.8", @@ -12755,9 +12764,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", @@ -12818,7 +12827,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.14", + "rustix 0.38.19", "windows-sys 0.48.0", ] @@ -12912,7 +12921,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -12924,7 +12933,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "test-case-core", ] @@ -12954,7 +12963,7 @@ checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -13120,7 +13129,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -13152,7 +13161,7 @@ checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls 0.20.9", "tokio", - "webpki 0.22.1", + "webpki 0.22.4", ] [[package]] @@ -13243,7 +13252,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", @@ -13316,7 +13325,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -13532,7 +13541,7 @@ dependencies = [ "log", "md-5", "rand 0.8.5", - "ring", + "ring 0.16.20", "stun", "thiserror", "tokio", @@ -13667,6 +13676,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" @@ -13807,7 +13822,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -13841,7 +13856,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -14008,7 +14023,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", @@ -14104,7 +14119,7 @@ checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846" dependencies = [ "object 0.30.4", "once_cell", - "rustix 0.36.15", + "rustix 0.36.16", ] [[package]] @@ -14135,7 +14150,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", @@ -14170,18 +14185,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.3", + "untrusted 0.9.0", ] [[package]] @@ -14190,7 +14205,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]] @@ -14224,7 +14239,7 @@ dependencies = [ "rand 0.8.5", "rcgen 0.9.3", "regex", - "ring", + "ring 0.16.20", "rtcp", "rtp", "rustls 0.19.1", @@ -14288,7 +14303,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", @@ -14425,14 +14440,14 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.14", + "rustix 0.38.19", ] [[package]] name = "wide" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" +checksum = "ebecebefc38ff1860b4bc47550bbfa63af5746061cf0d29fcd7fa63171602598" dependencies = [ "bytemuck", "safe_arch", @@ -14477,22 +14492,28 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.34.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45296b64204227616fdbf2614cefa4c236b98ee64dfaaaa435207ed99fe7829f" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" 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-targets 0.48.5", ] [[package]] name = "windows" -version = "0.48.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets 0.48.5", ] @@ -14557,12 +14578,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" @@ -14575,12 +14590,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" @@ -14593,12 +14602,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" @@ -14611,12 +14614,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" @@ -14641,12 +14638,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" @@ -14661,9 +14652,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" dependencies = [ "memchr", ] @@ -14742,7 +14733,7 @@ dependencies = [ "lazy_static", "nom", "oid-registry 0.4.0", - "ring", + "ring 0.16.20", "rusticata-macros", "thiserror", "time", @@ -14833,7 +14824,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.37", + "syn 2.0.38", ] [[package]] @@ -14896,11 +14887,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", ] From 490caca24f1ff882d52c6d5bf8d5ebbe7ed6605c Mon Sep 17 00:00:00 2001 From: Alexander Kalankhodzhaev Date: Wed, 18 Oct 2023 17:18:36 +0700 Subject: [PATCH 25/45] refactor: non-default sealing (#1189) --- CHANGELOG.md | 4 +++ Cargo.lock | 1 + crates/node/src/chain_spec.rs | 21 +++++------ crates/node/src/cli.rs | 2 +- crates/node/src/command.rs | 6 ++-- crates/node/src/commands/run.rs | 23 +++++++++--- crates/node/src/service.rs | 63 +++++++++++++++++++-------------- crates/runtime/Cargo.toml | 1 + crates/runtime/src/config.rs | 34 +++++++++++++++++- crates/runtime/src/pallets.rs | 6 ++-- 10 files changed, 113 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index baafc6660a..2f0d91d828 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,10 @@ `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 ## v0.4.0 diff --git a/Cargo.lock b/Cargo.lock index 69a75a0875..dd04b01f44 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6143,6 +6143,7 @@ dependencies = [ "pallet-timestamp", "parity-scale-codec", "scale-info", + "serde", "sp-api", "sp-block-builder", "sp-consensus-aura", diff --git a/crates/node/src/chain_spec.rs b/crates/node/src/chain_spec.rs index d35de96c80..6ff7d0693f 100644 --- a/crates/node/src/chain_spec.rs +++ b/crates/node/src/chain_spec.rs @@ -1,6 +1,6 @@ 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::{GenesisData, GenesisLoader, HexFelt}; use sc_service::{BasePath, ChainType}; @@ -27,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) } @@ -54,7 +55,7 @@ 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, base_path: BasePath) -> 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 chain_id = DEV_CHAIN_ID; @@ -78,7 +79,7 @@ pub fn development_config(enable_manual_seal: Option, base_path: BasePath) vec![authority_keys_from_seed("Alice")], true, ), - enable_manual_seal, + sealing: sealing.clone(), } }, // Bootnodes diff --git a/crates/node/src/cli.rs b/crates/node/src/cli.rs index a801228ade..6bda3c781b 100644 --- a/crates/node/src/cli.rs +++ b/crates/node/src/cli.rs @@ -44,7 +44,7 @@ pub enum Subcommand { /// Revert the chain to a previous state. Revert(sc_cli::RevertCmd), - // 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 b3061526f2..33053fd5c9 100644 --- a/crates/node/src/command.rs +++ b/crates/node/src/command.rs @@ -35,12 +35,12 @@ 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_CHAIN_ID => { - let enable_manual_seal = self.run.sealing.map(|_| true); + 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(enable_manual_seal, base_path)?) + Box::new(chain_spec::development_config(sealing, base_path)?) } #[cfg(feature = "sharingan")] SHARINGAN_CHAIN_ID => Box::new(chain_spec::ChainSpec::from_json_bytes( diff --git a/crates/node/src/commands/run.rs b/crates/node/src/commands/run.rs index 110d9ef408..7eb6583826 100644 --- a/crates/node/src/commands/run.rs +++ b/crates/node/src/commands/run.rs @@ -1,20 +1,35 @@ 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)] +#[derive(Debug, Copy, Clone, clap::ValueEnum, Default, Serialize, Deserialize)] pub enum Sealing { - // Seal using rpc method. + /// Seal using rpc method. #[default] Manual, - // Seal when transaction is executed. + /// 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)] @@ -63,9 +78,9 @@ pub fn run_node(mut cli: Cli) -> Result<()> { None } }; - let sealing = cli.run.sealing; runner.run_node_until_exit(|config| async move { + let sealing = cli.run.sealing.map(Into::into).unwrap_or_default(); service::new_full(config, sealing, da_config).map_err(sc_cli::Error::Service) }) } diff --git a/crates/node/src/service.rs b/crates/node/src/service.rs index 063a0f9d6b..38bdbfd4f7 100644 --- a/crates/node/src/service.rs +++ b/crates/node/src/service.rs @@ -8,9 +8,10 @@ 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_data_availability::avail::config::AvailConfig; use mc_data_availability::avail::AvailClient; @@ -41,7 +42,6 @@ use sp_offchain::STORAGE_PREFIX; use sp_runtime::traits::BlakeTwo256; use sp_trie::PrefixedMemoryDB; -use crate::commands::Sealing; use crate::genesis_block::MadaraGenesisBlockBuilder; use crate::rpc::StarknetDeps; use crate::starknet::{db_config_dir, MadaraBackend}; @@ -254,11 +254,11 @@ where /// Builds a new service for a full client. pub fn new_full( config: Configuration, - sealing: Option, + sealing: SealingMode, da_layer: Option<(DaLayer, PathBuf)>, ) -> 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, @@ -278,9 +278,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( @@ -289,6 +287,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) = @@ -311,14 +311,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 { @@ -341,7 +345,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) }) @@ -409,7 +413,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, @@ -423,7 +429,6 @@ pub fn new_full( network_starter.start_network(); - log::info!("Manual Seal Ready"); return Ok(task_manager); } @@ -533,14 +538,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, @@ -586,21 +591,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, @@ -608,8 +613,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. diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml index bb4048ad09..9b8c242cf3 100644 --- a/crates/runtime/Cargo.toml +++ b/crates/runtime/Cargo.toml @@ -18,6 +18,7 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] parity-scale-codec = { workspace = true, features = [] } scale-info = { workspace = true, features = [] } +serde = { workspace = true } sp-api = { workspace = true } sp-block-builder = { workspace = true } diff --git a/crates/runtime/src/config.rs b/crates/runtime/src/config.rs index 3897e646fd..9e568f326d 100644 --- a/crates/runtime/src/config.rs +++ b/crates/runtime/src/config.rs @@ -6,6 +6,9 @@ pub use frame_support::weights::constants::{ pub use frame_support::weights::{IdentityFee, Weight}; pub use frame_support::{construct_runtime, parameter_types, StorageValue}; pub use frame_system::Call as SystemCall; +use parity_scale_codec::{Decode, Encode}; +use serde::{Deserialize, Serialize}; +use sp_core::RuntimeDebug; use sp_runtime::create_runtime_str; #[cfg(any(feature = "std", test))] pub use sp_runtime::BuildStorage; @@ -77,7 +80,36 @@ parameter_types! { pub const SS58Prefix: u8 = 42; } +/// The current sealing mode being used. This is needed for the runtime to adjust its behavior +/// accordingly, e.g. suppress Aura validations in `OnTimestampSet` for manual or instant sealing. +#[derive(Default, Clone, PartialEq, Decode, Encode, RuntimeDebug, Deserialize, Serialize)] +pub enum SealingMode { + #[default] + Default, + Manual, + Instant { + finalize: bool, + }, +} + +impl SealingMode { + pub fn is_default(&self) -> bool { + matches!(self, SealingMode::Default) + } +} + +#[cfg(feature = "std")] +impl std::fmt::Display for SealingMode { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + SealingMode::Default => write!(f, "Default"), + SealingMode::Manual => write!(f, "Manual"), + SealingMode::Instant { finalize } => write!(f, "Instant (finalize: {})", finalize), + } + } +} + // This storage item will be used to check if we are in the manual sealing mode parameter_types! { - pub storage EnableManualSeal: bool = false; + pub storage Sealing: SealingMode = SealingMode::default(); } diff --git a/crates/runtime/src/pallets.rs b/crates/runtime/src/pallets.rs index 9a5d2699a3..b619c46702 100644 --- a/crates/runtime/src/pallets.rs +++ b/crates/runtime/src/pallets.rs @@ -143,7 +143,7 @@ impl pallet_grandpa::Config for Runtime { /// -------------------------------------- /// Timestamp manipulation. -/// For instance, we need it to set the timestamp of the Starkknet block. +/// For instance, we need it to set the timestamp of the Starknet block. impl pallet_timestamp::Config for Runtime { /// A timestamp: milliseconds since the unix epoch. type Moment = u64; @@ -163,11 +163,11 @@ parameter_types! { } /// Implement the OnTimestampSet trait to override the default Aura. -/// This is needed to support manual sealing. +/// This is needed to suppress Aura validations in case of non-default sealing. pub struct ConsensusOnTimestampSet(PhantomData); impl OnTimestampSet for ConsensusOnTimestampSet { fn on_timestamp_set(moment: T::Moment) { - if EnableManualSeal::get() { + if Sealing::get() != SealingMode::Default { return; } as OnTimestampSet>::on_timestamp_set(moment) From 8f6a29c9d5f9b3a93ec99d3d19be54396147c92a Mon Sep 17 00:00:00 2001 From: "Abdel @ StarkWare" <45264458+abdelhamidbakhta@users.noreply.github.com> Date: Thu, 19 Oct 2023 09:22:16 +0200 Subject: [PATCH 26/45] :busts_in_silhouette: Add @kalaninja as a contributor (#1198) --- .all-contributorsrc | 233 +++++++++++++++++++++++++++++++++----------- README.md | 2 +- 2 files changed, 178 insertions(+), 57 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 48a75d1cc6..e023e247a8 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -3,7 +3,9 @@ "projectOwner": "keep-starknet-strange", "repoType": "github", "repoHost": "https://github.com", - "files": ["README.md"], + "files": [ + "README.md" + ], "imageSize": 100, "commit": true, "commitConvention": "gitmoji", @@ -13,385 +15,504 @@ "name": "Abdel @ StarkWare ", "avatar_url": "https://avatars.githubusercontent.com/u/45264458?v=4", "profile": "https://github.com/abdelhamidbakhta", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "tdelabro", "name": "Timothée Delabrouille", "avatar_url": "https://avatars.githubusercontent.com/u/34384633?v=4", "profile": "https://github.com/tdelabro", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "EvolveArt", "name": "0xevolve", "avatar_url": "https://avatars.githubusercontent.com/u/12902455?v=4", "profile": "https://github.com/EvolveArt", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "LucasLvy", "name": "Lucas @ StarkWare", "avatar_url": "https://avatars.githubusercontent.com/u/70894690?v=4", "profile": "https://github.com/LucasLvy", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "DavideSilva", "name": "Davide Silva", "avatar_url": "https://avatars.githubusercontent.com/u/2940022?v=4", "profile": "https://github.com/DavideSilva", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "finiam", "name": "Finiam", "avatar_url": "https://avatars.githubusercontent.com/u/58513848?v=4", "profile": "https://www.finiam.com/", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "ZePedroResende", "name": "Resende", "avatar_url": "https://avatars.githubusercontent.com/u/17102689?v=4", "profile": "https://github.com/ZePedroResende", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "drspacemn", "name": "drspacemn", "avatar_url": "https://avatars.githubusercontent.com/u/16685321?v=4", "profile": "https://github.com/drspacemn", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "tarrencev", "name": "Tarrence van As", "avatar_url": "https://avatars.githubusercontent.com/u/4740651?v=4", "profile": "https://github.com/tarrencev", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "hsyodyssey", "name": "Siyuan Han", "avatar_url": "https://avatars.githubusercontent.com/u/47173566?v=4", "profile": "https://home.cse.ust.hk/~shanaj/", - "contributions": ["doc"] + "contributions": [ + "doc" + ] }, { "login": "zediogoviana", "name": "Zé Diogo", "avatar_url": "https://avatars.githubusercontent.com/u/25623039?v=4", "profile": "https://zediogoviana.github.io/", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "Matth26", "name": "Matthias Monnier", "avatar_url": "https://avatars.githubusercontent.com/u/9798638?v=4", "profile": "https://github.com/Matth26", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "glihm", "name": "glihm", "avatar_url": "https://avatars.githubusercontent.com/u/7962849?v=4", "profile": "https://github.com/glihm", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "0xEniotna", "name": "Antoine", "avatar_url": "https://avatars.githubusercontent.com/u/101047205?v=4", "profile": "https://github.com/0xEniotna", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "ClementWalter", "name": "Clément Walter", "avatar_url": "https://avatars.githubusercontent.com/u/18620296?v=4", "profile": "https://www.linkedin.com/in/clementwalter/", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "Eikix", "name": "Elias Tazartes", "avatar_url": "https://avatars.githubusercontent.com/u/66871571?v=4", "profile": "https://github.com/Eikix", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "xJonathanLEI", "name": "Jonathan LEI", "avatar_url": "https://avatars.githubusercontent.com/u/19556359?v=4", "profile": "https://github.com/xJonathanLEI", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "greged93", "name": "greged93", "avatar_url": "https://avatars.githubusercontent.com/u/82421016?v=4", "profile": "https://github.com/greged93", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "dubzn", "name": "Santiago Galván (Dub)", "avatar_url": "https://avatars.githubusercontent.com/u/58611754?v=4", "profile": "https://github.com/dubzn", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "ftupas", "name": "ftupas", "avatar_url": "https://avatars.githubusercontent.com/u/35031356?v=4", "profile": "https://github.com/ftupas", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "phklive", "name": "Paul-Henry Kajfasz", "avatar_url": "https://avatars.githubusercontent.com/u/42912740?v=4", "profile": "https://github.com/phklive", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "chirag-bgh", "name": "chirag-bgh", "avatar_url": "https://avatars.githubusercontent.com/u/76247491?v=4", "profile": "https://github.com/chirag-bgh", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "danilowhk", "name": "danilowhk", "avatar_url": "https://avatars.githubusercontent.com/u/12735159?v=4", "profile": "https://github.com/danilowhk", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "bajpai244", "name": "Harsh Bajpai", "avatar_url": "https://avatars.githubusercontent.com/u/41180869?v=4", "profile": "https://github.com/bajpai244", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "amanusk", "name": "amanusk", "avatar_url": "https://avatars.githubusercontent.com/u/7280933?v=4", "profile": "https://github.com/amanusk", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "dpinones", "name": "Damián Piñones", "avatar_url": "https://avatars.githubusercontent.com/u/30808181?v=4", "profile": "https://github.com/dpinones", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "marioiordanov", "name": "marioiordanov", "avatar_url": "https://avatars.githubusercontent.com/u/102791638?v=4", "profile": "https://github.com/marioiordanov", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "dbejarano820", "name": "Daniel Bejarano", "avatar_url": "https://avatars.githubusercontent.com/u/58019353?v=4", "profile": "https://github.com/dbejarano820", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "sparqet", "name": "sparqet", "avatar_url": "https://avatars.githubusercontent.com/u/37338401?v=4", "profile": "https://github.com/sparqet", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "robinstraub", "name": "Robin Straub", "avatar_url": "https://avatars.githubusercontent.com/u/17799181?v=4", "profile": "https://github.com/robinstraub", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "edisontim", "name": "tedison", "avatar_url": "https://avatars.githubusercontent.com/u/76473430?v=4", "profile": "https://github.com/edisontim", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "lana-shanghai", "name": "lanaivina", "avatar_url": "https://avatars.githubusercontent.com/u/31368580?v=4", "profile": "https://github.com/lana-shanghai", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "d-roak", "name": "Oak", "avatar_url": "https://avatars.githubusercontent.com/u/5263301?v=4", "profile": "https://droak.sh/", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "rkdud007", "name": "Pia", "avatar_url": "https://avatars.githubusercontent.com/u/76558220?v=4", "profile": "https://github.com/rkdud007", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "apoorvsadana", "name": "apoorvsadana", "avatar_url": "https://avatars.githubusercontent.com/u/95699312?v=4", "profile": "https://github.com/apoorvsadana", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "fracek", "name": "Francesco Ceccon", "avatar_url": "https://avatars.githubusercontent.com/u/282580?v=4", "profile": "https://ceccon.me/", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "ptisserand", "name": "ptisserand", "avatar_url": "https://avatars.githubusercontent.com/u/544314?v=4", "profile": "https://github.com/ptisserand", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "zizou0x", "name": "Zizou", "avatar_url": "https://avatars.githubusercontent.com/u/111426680?v=4", "profile": "https://github.com/zizou0x", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "makluganteng", "name": "V.O.T", "avatar_url": "https://avatars.githubusercontent.com/u/74396818?v=4", "profile": "https://github.com/makluganteng", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "MdTeach", "name": "Abishek Bashyal", "avatar_url": "https://avatars.githubusercontent.com/u/19630321?v=4", "profile": "https://github.com/MdTeach", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "kariy", "name": "Ammar Arif", "avatar_url": "https://avatars.githubusercontent.com/u/26515232?v=4", "profile": "https://github.com/kariy", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "lambda-0x", "name": "lambda-0x", "avatar_url": "https://avatars.githubusercontent.com/u/87354252?v=4", "profile": "https://github.com/lambda-0x", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "exp-table", "name": "exp_table", "avatar_url": "https://avatars.githubusercontent.com/u/76456212?v=4", "profile": "https://github.com/exp-table", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "Pilouche", "name": "Pilou", "avatar_url": "https://avatars.githubusercontent.com/u/26655725?v=4", "profile": "https://github.com/Pilouche", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "hel-kame", "name": "hithem", "avatar_url": "https://avatars.githubusercontent.com/u/117039823?v=4", "profile": "https://github.com/hel-kame", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "clexmond", "name": "Chris Lexmond", "avatar_url": "https://avatars.githubusercontent.com/u/706094?v=4", "profile": "https://github.com/clexmond", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "Tidus91", "name": "Tidus91", "avatar_url": "https://avatars.githubusercontent.com/u/65631603?v=4", "profile": "https://github.com/Tidus91", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "nikania", "name": "Veronika S", "avatar_url": "https://avatars.githubusercontent.com/u/54669079?v=4", "profile": "https://github.com/nikania", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "0xAsten", "name": "Asten", "avatar_url": "https://avatars.githubusercontent.com/u/114395459?v=4", "profile": "https://github.com/0xAsten", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "ben2077", "name": "ben2077", "avatar_url": "https://avatars.githubusercontent.com/u/22720665?v=4", "profile": "https://github.com/ben2077", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "m-kus", "name": "Michael Zaikin", "avatar_url": "https://avatars.githubusercontent.com/u/44951260?v=4", "profile": "https://github.com/m-kus", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "joaopereira12", "name": "João Pereira", "avatar_url": "https://avatars.githubusercontent.com/u/77340776?v=4", "profile": "https://www.linkedin.com/in/jo%C3%A3o-pereira-91a087230/", - "contributions": ["doc"] + "contributions": [ + "doc" + ] }, { "login": "kasteph", "name": "kasteph", "avatar_url": "https://avatars.githubusercontent.com/u/3408478?v=4", "profile": "https://github.com/kasteph", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "ayushtom", "name": "Ayush Tomar", "avatar_url": "https://avatars.githubusercontent.com/u/41674634?v=4", "profile": "https://github.com/ayushtom", - "contributions": ["code"] + "contributions": [ + "code" + ] }, { "login": "tchataigner", "name": "tchataigner", "avatar_url": "https://avatars.githubusercontent.com/u/9974198?v=4", "profile": "https://github.com/tchataigner", - "contributions": ["code"] + "contributions": [ + "code" + ] + }, + { + "login": "kalaninja", + "name": "Alexander Kalankhodzhaev", + "avatar_url": "https://avatars.githubusercontent.com/u/18083464?v=4", + "profile": "https://github.com/kalaninja", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/README.md b/README.md index 9e17b44fb6..9232fd7b0a 100644 --- a/README.md +++ b/README.md @@ -252,7 +252,7 @@ Thanks goes to these wonderful people kasteph
kasteph
💻 Ayush Tomar
Ayush Tomar
💻 tchataigner
tchataigner
💻 - antiyro
antiyro
💻 + Alexander Kalankhodzhaev
Alexander Kalankhodzhaev
💻 From 73cc3c0e0a36cd4d0af3da18a0de7685fc49def1 Mon Sep 17 00:00:00 2001 From: "Abdel @ StarkWare" <45264458+abdelhamidbakhta@users.noreply.github.com> Date: Thu, 19 Oct 2023 09:38:35 +0200 Subject: [PATCH 27/45] fix linter (#1199) --- .all-contributorsrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index e023e247a8..5213073201 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -501,6 +501,7 @@ "name": "tchataigner", "avatar_url": "https://avatars.githubusercontent.com/u/9974198?v=4", "profile": "https://github.com/tchataigner", + "contributions": ["code"] "contributions": [ "code" ] From 85a4896af115d39ea0bdc16e418fa72bae5d56ae Mon Sep 17 00:00:00 2001 From: "Abdel @ StarkWare" <45264458+abdelhamidbakhta@users.noreply.github.com> Date: Thu, 19 Oct 2023 09:46:09 +0200 Subject: [PATCH 28/45] fix linter (#1200) --- .all-contributorsrc | 10 +++++++++- README.md | 3 +++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 5213073201..2b3a0dd749 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -501,7 +501,6 @@ "name": "tchataigner", "avatar_url": "https://avatars.githubusercontent.com/u/9974198?v=4", "profile": "https://github.com/tchataigner", - "contributions": ["code"] "contributions": [ "code" ] @@ -514,6 +513,15 @@ "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/README.md b/README.md index 9232fd7b0a..6e6efbf739 100644 --- a/README.md +++ b/README.md @@ -254,6 +254,9 @@ Thanks goes to these wonderful people tchataigner
tchataigner
💻 Alexander Kalankhodzhaev
Alexander Kalankhodzhaev
💻 + + antiyro
antiyro
💻 + From 02ebc51588f8f48a14cc3be4157f6b76b77b8fa4 Mon Sep 17 00:00:00 2001 From: "Abdel @ StarkWare" <45264458+abdelhamidbakhta@users.noreply.github.com> Date: Thu, 19 Oct 2023 09:49:45 +0200 Subject: [PATCH 29/45] =?UTF-8?q?=F0=9F=9A=A8=20prettier=20fix=20(#1201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .all-contributorsrc | 232 +++++++++++--------------------------------- madara-infra | 2 +- 2 files changed, 59 insertions(+), 175 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 2b3a0dd749..1306e0fdf5 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -3,9 +3,7 @@ "projectOwner": "keep-starknet-strange", "repoType": "github", "repoHost": "https://github.com", - "files": [ - "README.md" - ], + "files": ["README.md"], "imageSize": 100, "commit": true, "commitConvention": "gitmoji", @@ -15,513 +13,399 @@ "name": "Abdel @ StarkWare ", "avatar_url": "https://avatars.githubusercontent.com/u/45264458?v=4", "profile": "https://github.com/abdelhamidbakhta", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "tdelabro", "name": "Timothée Delabrouille", "avatar_url": "https://avatars.githubusercontent.com/u/34384633?v=4", "profile": "https://github.com/tdelabro", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "EvolveArt", "name": "0xevolve", "avatar_url": "https://avatars.githubusercontent.com/u/12902455?v=4", "profile": "https://github.com/EvolveArt", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "LucasLvy", "name": "Lucas @ StarkWare", "avatar_url": "https://avatars.githubusercontent.com/u/70894690?v=4", "profile": "https://github.com/LucasLvy", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "DavideSilva", "name": "Davide Silva", "avatar_url": "https://avatars.githubusercontent.com/u/2940022?v=4", "profile": "https://github.com/DavideSilva", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "finiam", "name": "Finiam", "avatar_url": "https://avatars.githubusercontent.com/u/58513848?v=4", "profile": "https://www.finiam.com/", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "ZePedroResende", "name": "Resende", "avatar_url": "https://avatars.githubusercontent.com/u/17102689?v=4", "profile": "https://github.com/ZePedroResende", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "drspacemn", "name": "drspacemn", "avatar_url": "https://avatars.githubusercontent.com/u/16685321?v=4", "profile": "https://github.com/drspacemn", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "tarrencev", "name": "Tarrence van As", "avatar_url": "https://avatars.githubusercontent.com/u/4740651?v=4", "profile": "https://github.com/tarrencev", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "hsyodyssey", "name": "Siyuan Han", "avatar_url": "https://avatars.githubusercontent.com/u/47173566?v=4", "profile": "https://home.cse.ust.hk/~shanaj/", - "contributions": [ - "doc" - ] + "contributions": ["doc"] }, { "login": "zediogoviana", "name": "Zé Diogo", "avatar_url": "https://avatars.githubusercontent.com/u/25623039?v=4", "profile": "https://zediogoviana.github.io/", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "Matth26", "name": "Matthias Monnier", "avatar_url": "https://avatars.githubusercontent.com/u/9798638?v=4", "profile": "https://github.com/Matth26", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "glihm", "name": "glihm", "avatar_url": "https://avatars.githubusercontent.com/u/7962849?v=4", "profile": "https://github.com/glihm", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "0xEniotna", "name": "Antoine", "avatar_url": "https://avatars.githubusercontent.com/u/101047205?v=4", "profile": "https://github.com/0xEniotna", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "ClementWalter", "name": "Clément Walter", "avatar_url": "https://avatars.githubusercontent.com/u/18620296?v=4", "profile": "https://www.linkedin.com/in/clementwalter/", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "Eikix", "name": "Elias Tazartes", "avatar_url": "https://avatars.githubusercontent.com/u/66871571?v=4", "profile": "https://github.com/Eikix", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "xJonathanLEI", "name": "Jonathan LEI", "avatar_url": "https://avatars.githubusercontent.com/u/19556359?v=4", "profile": "https://github.com/xJonathanLEI", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "greged93", "name": "greged93", "avatar_url": "https://avatars.githubusercontent.com/u/82421016?v=4", "profile": "https://github.com/greged93", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "dubzn", "name": "Santiago Galván (Dub)", "avatar_url": "https://avatars.githubusercontent.com/u/58611754?v=4", "profile": "https://github.com/dubzn", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "ftupas", "name": "ftupas", "avatar_url": "https://avatars.githubusercontent.com/u/35031356?v=4", "profile": "https://github.com/ftupas", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "phklive", "name": "Paul-Henry Kajfasz", "avatar_url": "https://avatars.githubusercontent.com/u/42912740?v=4", "profile": "https://github.com/phklive", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "chirag-bgh", "name": "chirag-bgh", "avatar_url": "https://avatars.githubusercontent.com/u/76247491?v=4", "profile": "https://github.com/chirag-bgh", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "danilowhk", "name": "danilowhk", "avatar_url": "https://avatars.githubusercontent.com/u/12735159?v=4", "profile": "https://github.com/danilowhk", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "bajpai244", "name": "Harsh Bajpai", "avatar_url": "https://avatars.githubusercontent.com/u/41180869?v=4", "profile": "https://github.com/bajpai244", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "amanusk", "name": "amanusk", "avatar_url": "https://avatars.githubusercontent.com/u/7280933?v=4", "profile": "https://github.com/amanusk", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "dpinones", "name": "Damián Piñones", "avatar_url": "https://avatars.githubusercontent.com/u/30808181?v=4", "profile": "https://github.com/dpinones", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "marioiordanov", "name": "marioiordanov", "avatar_url": "https://avatars.githubusercontent.com/u/102791638?v=4", "profile": "https://github.com/marioiordanov", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "dbejarano820", "name": "Daniel Bejarano", "avatar_url": "https://avatars.githubusercontent.com/u/58019353?v=4", "profile": "https://github.com/dbejarano820", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "sparqet", "name": "sparqet", "avatar_url": "https://avatars.githubusercontent.com/u/37338401?v=4", "profile": "https://github.com/sparqet", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "robinstraub", "name": "Robin Straub", "avatar_url": "https://avatars.githubusercontent.com/u/17799181?v=4", "profile": "https://github.com/robinstraub", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "edisontim", "name": "tedison", "avatar_url": "https://avatars.githubusercontent.com/u/76473430?v=4", "profile": "https://github.com/edisontim", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "lana-shanghai", "name": "lanaivina", "avatar_url": "https://avatars.githubusercontent.com/u/31368580?v=4", "profile": "https://github.com/lana-shanghai", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "d-roak", "name": "Oak", "avatar_url": "https://avatars.githubusercontent.com/u/5263301?v=4", "profile": "https://droak.sh/", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "rkdud007", "name": "Pia", "avatar_url": "https://avatars.githubusercontent.com/u/76558220?v=4", "profile": "https://github.com/rkdud007", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "apoorvsadana", "name": "apoorvsadana", "avatar_url": "https://avatars.githubusercontent.com/u/95699312?v=4", "profile": "https://github.com/apoorvsadana", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "fracek", "name": "Francesco Ceccon", "avatar_url": "https://avatars.githubusercontent.com/u/282580?v=4", "profile": "https://ceccon.me/", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "ptisserand", "name": "ptisserand", "avatar_url": "https://avatars.githubusercontent.com/u/544314?v=4", "profile": "https://github.com/ptisserand", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "zizou0x", "name": "Zizou", "avatar_url": "https://avatars.githubusercontent.com/u/111426680?v=4", "profile": "https://github.com/zizou0x", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "makluganteng", "name": "V.O.T", "avatar_url": "https://avatars.githubusercontent.com/u/74396818?v=4", "profile": "https://github.com/makluganteng", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "MdTeach", "name": "Abishek Bashyal", "avatar_url": "https://avatars.githubusercontent.com/u/19630321?v=4", "profile": "https://github.com/MdTeach", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "kariy", "name": "Ammar Arif", "avatar_url": "https://avatars.githubusercontent.com/u/26515232?v=4", "profile": "https://github.com/kariy", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "lambda-0x", "name": "lambda-0x", "avatar_url": "https://avatars.githubusercontent.com/u/87354252?v=4", "profile": "https://github.com/lambda-0x", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "exp-table", "name": "exp_table", "avatar_url": "https://avatars.githubusercontent.com/u/76456212?v=4", "profile": "https://github.com/exp-table", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "Pilouche", "name": "Pilou", "avatar_url": "https://avatars.githubusercontent.com/u/26655725?v=4", "profile": "https://github.com/Pilouche", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "hel-kame", "name": "hithem", "avatar_url": "https://avatars.githubusercontent.com/u/117039823?v=4", "profile": "https://github.com/hel-kame", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "clexmond", "name": "Chris Lexmond", "avatar_url": "https://avatars.githubusercontent.com/u/706094?v=4", "profile": "https://github.com/clexmond", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "Tidus91", "name": "Tidus91", "avatar_url": "https://avatars.githubusercontent.com/u/65631603?v=4", "profile": "https://github.com/Tidus91", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "nikania", "name": "Veronika S", "avatar_url": "https://avatars.githubusercontent.com/u/54669079?v=4", "profile": "https://github.com/nikania", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "0xAsten", "name": "Asten", "avatar_url": "https://avatars.githubusercontent.com/u/114395459?v=4", "profile": "https://github.com/0xAsten", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "ben2077", "name": "ben2077", "avatar_url": "https://avatars.githubusercontent.com/u/22720665?v=4", "profile": "https://github.com/ben2077", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "m-kus", "name": "Michael Zaikin", "avatar_url": "https://avatars.githubusercontent.com/u/44951260?v=4", "profile": "https://github.com/m-kus", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "joaopereira12", "name": "João Pereira", "avatar_url": "https://avatars.githubusercontent.com/u/77340776?v=4", "profile": "https://www.linkedin.com/in/jo%C3%A3o-pereira-91a087230/", - "contributions": [ - "doc" - ] + "contributions": ["doc"] }, { "login": "kasteph", "name": "kasteph", "avatar_url": "https://avatars.githubusercontent.com/u/3408478?v=4", "profile": "https://github.com/kasteph", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "ayushtom", "name": "Ayush Tomar", "avatar_url": "https://avatars.githubusercontent.com/u/41674634?v=4", "profile": "https://github.com/ayushtom", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "tchataigner", "name": "tchataigner", "avatar_url": "https://avatars.githubusercontent.com/u/9974198?v=4", "profile": "https://github.com/tchataigner", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "kalaninja", "name": "Alexander Kalankhodzhaev", "avatar_url": "https://avatars.githubusercontent.com/u/18083464?v=4", "profile": "https://github.com/kalaninja", - "contributions": [ - "code" - ] + "contributions": ["code"] }, { "login": "antiyro", "name": "antiyro", "avatar_url": "https://avatars.githubusercontent.com/u/74653697?v=4", "profile": "https://github.com/antiyro", - "contributions": [ - "code" - ] + "contributions": ["code"] } ], "contributorsPerLine": 7, diff --git a/madara-infra b/madara-infra index d14adc999f..5603c9175d 160000 --- a/madara-infra +++ b/madara-infra @@ -1 +1 @@ -Subproject commit d14adc999fe37ae0495459edba7e226f8841815f +Subproject commit 5603c9175d9cacd72d3095e9f7b2bf15646590e5 From 645d9f0afac104be3bea2f3fa2a1ec57900c3a9d Mon Sep 17 00:00:00 2001 From: Nils <80390054+nils-mathieu@users.noreply.github.com> Date: Thu, 19 Oct 2023 16:32:26 +0200 Subject: [PATCH 30/45] feat: add `--cache` option, allows caching more information into the database (#1197) --- CHANGELOG.md | 2 + crates/client/db/src/lib.rs | 50 ++++++++------ crates/client/db/src/mapping_db.rs | 49 ++++++++++++-- crates/client/mapping-sync/src/lib.rs | 3 +- crates/client/rpc/src/lib.rs | 66 +++++++++++++++---- crates/node/src/command.rs | 16 ++--- crates/node/src/commands/run.rs | 12 +++- crates/node/src/service.rs | 18 +++-- crates/primitives/block/src/lib.rs | 11 +++- .../src/to_starknet_core_transaction.rs | 26 +++----- 10 files changed, 177 insertions(+), 76 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f0d91d828..f2fa448826 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,8 @@ method being used) - refactor(sealing): how the sealing mode is passed into runtime - feat(sealing): finalization for instant sealing +- feat(cache-option): add an option to enable aggressive caching in the + command-line parameters ## v0.4.0 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/src/lib.rs b/crates/client/rpc/src/lib.rs index c7d5ca3ad5..9de838c80b 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 @@ -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(), @@ -634,7 +654,12 @@ where 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 +674,16 @@ 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(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 +693,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)) @@ -731,7 +761,7 @@ where })?; let chain_id = self.chain_id()?; - let transactions = transactions.into_iter().map(|tx| to_starknet_core_tx::(tx, chain_id.0.into())).collect(); + let transactions = transactions.into_iter().map(|tx| to_starknet_core_tx::(tx, chain_id.0)).collect(); Ok(transactions) } @@ -819,7 +849,7 @@ where .transactions() .iter() .find(|tx| tx.compute_hash::(chain_id, false).0 == transaction_hash) - .map(|tx| to_starknet_core_tx::(tx.clone(), chain_id)); + .map(|tx| to_starknet_core_tx::(tx.clone(), transaction_hash)); find_tx.ok_or(StarknetRpcApiError::TxnHashNotFound.into()) } @@ -1010,3 +1040,13 @@ where }, } } + +fn h256_to_felt(h256: H256) -> Result { + match Felt252Wrapper::try_from(h256) { + Ok(felt) => Ok(felt.0), + Err(err) => { + error!("failed to convert H256 to FieldElement: {err}"); + Err(StarknetRpcApiError::InternalServerError) + } + } +} diff --git a/crates/node/src/command.rs b/crates/node/src/command.rs index 33053fd5c9..9bad7ddb3a 100644 --- a/crates/node/src/command.rs +++ b/crates/node/src/command.rs @@ -72,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)) }) } @@ -104,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(()) @@ -129,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"))] @@ -145,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()))]); diff --git a/crates/node/src/commands/run.rs b/crates/node/src/commands/run.rs index 7eb6583826..f4549ceba7 100644 --- a/crates/node/src/commands/run.rs +++ b/crates/node/src/commands/run.rs @@ -44,6 +44,14 @@ pub struct ExtendedRunCmd { /// 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 { @@ -78,10 +86,10 @@ pub fn run_node(mut cli: Cli) -> Result<()> { None } }; - runner.run_node_until_exit(|config| async move { let sealing = cli.run.sealing.map(Into::into).unwrap_or_default(); - service::new_full(config, sealing, da_config).map_err(sc_cli::Error::Service) + let cache = cli.run.cache; + service::new_full(config, sealing, da_config, cache).map_err(sc_cli::Error::Service) }) } diff --git a/crates/node/src/service.rs b/crates/node/src/service.rs index 38bdbfd4f7..44dc8bd5bf 100644 --- a/crates/node/src/service.rs +++ b/crates/node/src/service.rs @@ -1,7 +1,6 @@ //! 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; @@ -76,6 +75,7 @@ type BoxBlockImport = sc_consensus::BoxBlockImport( config: &Configuration, build_import_queue: BIQ, + cache_more_things: bool, ) -> Result< sc_service::PartialComponents< FullClient, @@ -164,7 +164,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(), @@ -252,10 +252,15 @@ 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: SealingMode, da_layer: Option<(DaLayer, PathBuf)>, + cache_more_things: bool, ) -> Result { let build_import_queue = if sealing.is_default() { build_aura_grandpa_import_queue } else { build_manual_seal_import_queue }; @@ -269,7 +274,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); @@ -369,7 +374,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(), @@ -377,7 +382,6 @@ pub fn new_full( madara_backend.clone(), 3, 0, - PhantomData::, ) .for_each(|()| future::ready(())), ); @@ -639,9 +643,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/primitives/block/src/lib.rs b/crates/primitives/block/src/lib.rs index 61f1e8d88d..2131480cb6 100644 --- a/crates/primitives/block/src/lib.rs +++ b/crates/primitives/block/src/lib.rs @@ -48,9 +48,14 @@ impl Block { &self.transactions } - /// Return a reference to all transaction hashes - pub fn transactions_hashes(&self, chain_id: Felt252Wrapper) -> Vec { - self.transactions.iter().map(|tx| tx.compute_hash::(chain_id, false)).collect() + /// Returns an iterator that iterates over all transaction hashes. + /// + /// Those transactions are computed using the given `chain_id`. + pub fn transactions_hashes( + &self, + chain_id: Felt252Wrapper, + ) -> impl '_ + Iterator { + self.transactions.iter().map(move |tx| tx.compute_hash::(chain_id, false)) } } diff --git a/crates/primitives/transactions/src/to_starknet_core_transaction.rs b/crates/primitives/transactions/src/to_starknet_core_transaction.rs index 726626a470..f5d619eb8f 100644 --- a/crates/primitives/transactions/src/to_starknet_core_transaction.rs +++ b/crates/primitives/transactions/src/to_starknet_core_transaction.rs @@ -4,8 +4,6 @@ use mp_felt::Felt252Wrapper; use mp_hashers::HasherT; use starknet_crypto::FieldElement; -use super::compute_hash::ComputeTransactionHash; - fn cast_vec_of_felt_252_wrappers(data: Vec) -> Vec { // Non-copy but less dangerous than transmute // https://doc.rust-lang.org/std/mem/fn.transmute.html#alternatives @@ -15,12 +13,10 @@ fn cast_vec_of_felt_252_wrappers(data: Vec) -> Vec pub fn to_starknet_core_tx( tx: super::Transaction, - chain_id: Felt252Wrapper, + transaction_hash: FieldElement, ) -> starknet_core::types::Transaction { match tx { super::Transaction::Declare(tx) => { - let tx_hash = tx.compute_hash::(chain_id, false); - let tx = match tx { super::DeclareTransaction::V0(super::DeclareTransactionV0 { max_fee, @@ -29,7 +25,7 @@ pub fn to_starknet_core_tx( class_hash, sender_address, }) => starknet_core::types::DeclareTransaction::V0(starknet_core::types::DeclareTransactionV0 { - transaction_hash: tx_hash.0, + transaction_hash, max_fee: max_fee.into(), signature: cast_vec_of_felt_252_wrappers(signature), class_hash: class_hash.into(), @@ -42,7 +38,7 @@ pub fn to_starknet_core_tx( class_hash, sender_address, }) => starknet_core::types::DeclareTransaction::V1(starknet_core::types::DeclareTransactionV1 { - transaction_hash: tx_hash.0, + transaction_hash, max_fee: max_fee.into(), signature: cast_vec_of_felt_252_wrappers(signature), nonce: nonce.into(), @@ -57,7 +53,7 @@ pub fn to_starknet_core_tx( sender_address, compiled_class_hash, }) => starknet_core::types::DeclareTransaction::V2(starknet_core::types::DeclareTransactionV2 { - transaction_hash: tx_hash.0, + transaction_hash, max_fee: max_fee.into(), signature: cast_vec_of_felt_252_wrappers(signature), nonce: nonce.into(), @@ -70,10 +66,8 @@ pub fn to_starknet_core_tx( starknet_core::types::Transaction::Declare(tx) } super::Transaction::DeployAccount(tx) => { - let tx_hash = tx.compute_hash::(chain_id, false); - let tx = starknet_core::types::DeployAccountTransaction { - transaction_hash: tx_hash.0, + transaction_hash, max_fee: tx.max_fee.into(), signature: cast_vec_of_felt_252_wrappers(tx.signature), nonce: tx.nonce.into(), @@ -85,8 +79,6 @@ pub fn to_starknet_core_tx( starknet_core::types::Transaction::DeployAccount(tx) } super::Transaction::Invoke(tx) => { - let tx_hash = tx.compute_hash::(chain_id, false); - let tx = match tx { super::InvokeTransaction::V0(super::InvokeTransactionV0 { max_fee, @@ -95,7 +87,7 @@ pub fn to_starknet_core_tx( entry_point_selector, calldata, }) => starknet_core::types::InvokeTransaction::V0(starknet_core::types::InvokeTransactionV0 { - transaction_hash: tx_hash.0, + transaction_hash, max_fee: max_fee.into(), signature: cast_vec_of_felt_252_wrappers(signature), contract_address: contract_address.into(), @@ -109,7 +101,7 @@ pub fn to_starknet_core_tx( sender_address, calldata, }) => starknet_core::types::InvokeTransaction::V1(starknet_core::types::InvokeTransactionV1 { - transaction_hash: tx_hash.0, + transaction_hash, max_fee: max_fee.into(), signature: cast_vec_of_felt_252_wrappers(signature), nonce: nonce.into(), @@ -121,10 +113,8 @@ pub fn to_starknet_core_tx( starknet_core::types::Transaction::Invoke(tx) } super::Transaction::L1Handler(tx) => { - let tx_hash = tx.compute_hash::(chain_id, false); - let tx = starknet_core::types::L1HandlerTransaction { - transaction_hash: tx_hash.0, + transaction_hash, version: 0, nonce: tx.nonce, contract_address: tx.contract_address.into(), From 7210c6db94ed230cf375dfa22a098350709b95e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Delabrouille?= <34384633+tdelabro@users.noreply.github.com> Date: Fri, 20 Oct 2023 13:48:17 +0200 Subject: [PATCH 31/45] chore: rework vm ressource fee (#1204) --- CHANGELOG.md | 2 + Cargo.lock | 236 +++++++++--------- Cargo.toml | 1 + crates/pallets/starknet/src/lib.rs | 9 +- crates/pallets/starknet/src/tests/block.rs | 3 +- crates/primitives/fee/Cargo.toml | 2 + crates/primitives/fee/src/lib.rs | 79 ++++-- .../primitives/transactions/src/execution.rs | 10 +- 8 files changed, 194 insertions(+), 148 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2fa448826..21b4d5dc04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Next release +- 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 diff --git a/Cargo.lock b/Cargo.lock index dd04b01f44..181876e26c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -885,9 +885,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" @@ -1003,7 +1003,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", @@ -1015,12 +1015,11 @@ 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", @@ -1031,6 +1030,7 @@ dependencies = [ "serde", "serde_json", "sha3", + "sp-arithmetic 6.0.0", "spin 0.9.8", "starknet-crypto 0.5.1", "starknet_api", @@ -1177,7 +1177,7 @@ 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.17", @@ -1571,7 +1571,7 @@ 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", @@ -1592,7 +1592,7 @@ 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.17", @@ -1621,7 +1621,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", @@ -1727,7 +1727,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", ] @@ -1744,7 +1744,7 @@ dependencies = [ "cid 0.10.1", "const_format", "enum_dispatch", - "libp2p-identity 0.2.5", + "libp2p-identity 0.2.7", "multiaddr 0.18.0", "nmt-rs", "ruint", @@ -2093,18 +2093,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", @@ -2673,10 +2673,11 @@ dependencies = [ [[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", ] @@ -2959,9 +2960,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", @@ -2999,7 +3000,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", @@ -4429,9 +4430,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", @@ -4675,16 +4676,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]] @@ -4755,7 +4756,7 @@ dependencies = [ "rtnetlink", "system-configuration", "tokio", - "windows 0.51.1", + "windows", ] [[package]] @@ -4835,7 +4836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.2", ] [[package]] @@ -5010,15 +5011,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", ] @@ -5049,13 +5050,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", @@ -5098,9 +5099,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", @@ -5109,7 +5110,7 @@ dependencies = [ "futures-timer", "futures-util", "hyper", - "jsonrpsee-types 0.20.1", + "jsonrpsee-types 0.20.2", "rustc-hash", "serde", "serde_json", @@ -5139,15 +5140,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", @@ -5172,9 +5173,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", @@ -5221,9 +5222,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", @@ -5258,14 +5259,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", ] @@ -5550,16 +5551,15 @@ dependencies = [ [[package]] name = "libp2p-identity" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bf6e730ec5e7022958da53ffb03b326e681b7316939012ae9b3c7449a812d4" +checksum = "cdd6317441f361babc74c2989c6484eb0726045399b6648de039e1805ea96972" dependencies = [ "bs58 0.5.0", "hkdf", "log", "multihash 0.19.1", "quick-protobuf", - "rand 0.8.5", "sha2 0.10.8", "thiserror", ] @@ -5976,9 +5976,9 @@ 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", @@ -6249,7 +6249,7 @@ dependencies = [ "clap 4.4.6", "ethers", "futures", - "jsonrpsee 0.20.1", + "jsonrpsee 0.20.2", "lazy_static", "log", "mc-db", @@ -6269,7 +6269,7 @@ dependencies = [ "thiserror", "tokio", "url", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -6285,7 +6285,7 @@ dependencies = [ "sp-core 7.0.0", "sp-database", "sp-runtime 7.0.0", - "uuid 1.4.1", + "uuid 1.5.0", ] [[package]] @@ -6643,8 +6643,10 @@ name = "mp-fee" version = "0.4.0" dependencies = [ "blockifier", + "hashbrown 0.14.2", "mp-state", "phf", + "sp-arithmetic 6.0.0", "starknet_api", ] @@ -6758,7 +6760,7 @@ dependencies = [ "arrayref", "byteorder", "data-encoding", - "libp2p-identity 0.2.5", + "libp2p-identity 0.2.7", "multibase", "multihash 0.19.1", "percent-encoding", @@ -7325,7 +7327,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", @@ -7723,9 +7725,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" @@ -7745,7 +7747,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]] @@ -7764,13 +7766,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", ] @@ -8126,6 +8128,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" @@ -8315,7 +8323,7 @@ version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "lazy_static", "num-traits 0.2.17", "rand 0.8.5", @@ -8672,6 +8680,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" @@ -8717,14 +8734,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.0" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.1", - "regex-syntax 0.8.1", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -8738,13 +8755,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.1", + "regex-syntax 0.8.2", ] [[package]] @@ -8761,9 +8778,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "regex-syntax" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "relative-path" @@ -8862,9 +8879,9 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.3" +version = "0.17.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", "getrandom 0.2.10", @@ -9113,7 +9130,7 @@ version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys 0.4.10", @@ -12288,7 +12305,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", @@ -12399,7 +12416,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]] @@ -12417,9 +12434,9 @@ 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", @@ -12839,7 +12856,7 @@ 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", @@ -13024,12 +13041,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", @@ -13281,7 +13299,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", @@ -13307,11 +13325,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", @@ -13320,9 +13337,9 @@ 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", @@ -13331,9 +13348,9 @@ dependencies = [ [[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", @@ -13718,9 +13735,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", @@ -14196,7 +14213,7 @@ version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.17.3", + "ring 0.17.5", "untrusted 0.9.0", ] @@ -14338,7 +14355,7 @@ dependencies = [ "tokio", "turn", "url", - "uuid 1.4.1", + "uuid 1.5.0", "waitgroup", "webrtc-mdns", "webrtc-util", @@ -14446,9 +14463,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebecebefc38ff1860b4bc47550bbfa63af5746061cf0d29fcd7fa63171602598" +checksum = "c68938b57b33da363195412cfc5fc37c9ed49aa9cfe2156fde64b8d2c9498242" dependencies = [ "bytemuck", "safe_arch", @@ -14491,15 +14508,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.51.1" @@ -14653,9 +14661,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.16" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index 8211bd7bbd..e753fab674 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -232,3 +232,4 @@ 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" diff --git a/crates/pallets/starknet/src/lib.rs b/crates/pallets/starknet/src/lib.rs index 4a01644b9d..20d2c5fae8 100644 --- a/crates/pallets/starknet/src/lib.rs +++ b/crates/pallets/starknet/src/lib.rs @@ -671,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( @@ -883,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(), } } @@ -956,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(), 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/primitives/fee/Cargo.toml b/crates/primitives/fee/Cargo.toml index 374f81e1be..b2f634b005 100644 --- a/crates/primitives/fee/Cargo.toml +++ b/crates/primitives/fee/Cargo.toml @@ -12,8 +12,10 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] blockifier = { workspace = true } +hashbrown = { workspace = true } mp-state = { workspace = true } phf = { workspace = true } +sp-arithmetic = { workspace = true } starknet_api = { workspace = true } [features] diff --git a/crates/primitives/fee/src/lib.rs b/crates/primitives/fee/src/lib.rs index 25160dd443..aab90ef0e3 100644 --- a/crates/primitives/fee/src/lib.rs +++ b/crates/primitives/fee/src/lib.rs @@ -6,6 +6,8 @@ pub extern crate alloc; use alloc::vec; use alloc::vec::Vec; +#[cfg(feature = "std")] +use std::collections::HashMap; use blockifier::abi::constants::GAS_USAGE; use blockifier::block_context::BlockContext; @@ -18,8 +20,11 @@ use blockifier::transaction::errors::TransactionExecutionError; use blockifier::transaction::objects::{AccountTransactionContext, ResourcesMapping, TransactionExecutionResult}; use blockifier::transaction::transaction_types::TransactionType; use blockifier::transaction::transaction_utils::{calculate_l1_gas_usage, calculate_tx_resources}; +#[cfg(not(feature = "std"))] +use hashbrown::HashMap; use mp_state::{FeeConfig, StateChanges}; -use phf::phf_map; +use sp_arithmetic::fixed_point::{FixedPointNumber, FixedU128}; +use sp_arithmetic::traits::Zero; use starknet_api::api_core::EntryPointSelector; use starknet_api::calldata; use starknet_api::deprecated_contract_class::EntryPointType; @@ -33,15 +38,33 @@ pub const FEE_TRANSFER_N_STORAGE_CHANGES: u8 = 2; // Sender and sequencer balanc /// Number of storage updates to actually charge for the fee transfer tx. pub const FEE_TRANSFER_N_STORAGE_CHANGES_TO_CHARGE: u8 = FEE_TRANSFER_N_STORAGE_CHANGES - 1; // Exclude the sequencer balance update, since it's charged once throughout the batch. -static VM_RESOURCE_FEE_COSTS: phf::Map<&'static str, f64> = phf_map! { - "n_steps" => 0.01_f64, - "pedersen_builtin" => 0.32_f64, - "range_check_builtin" => 0.16_f64, - "ecdsa_builtin" => 20.48_f64, - "bitwise_builtin" => 0.64_f64, - "poseidon_builtin" => 0.32_f64, - "ec_op_builtin" => 10.24_f64, -}; +pub static VM_RESOURCE_FEE_COSTS: [(&str, FixedU128); 7] = [ + ("n_steps", FixedU128::from_inner(10_000_000_000_000_000)), + ("pedersen_builtin", FixedU128::from_inner(320_000_000_000_000_000)), + ("range_check_builtin", FixedU128::from_inner(160_000_000_000_000_000)), + ("ecdsa_builtin", FixedU128::from_inner(20_480_000_000_000_000_000)), + ("bitwise_builtin", FixedU128::from_inner(640_000_000_000_000_000)), + ("poseidon_builtin", FixedU128::from_inner(320_000_000_000_000_000)), + ("ec_op_builtin", FixedU128::from_inner(10_240_000_000_000_000_000)), +]; + +#[cfg(test)] +mod vm_resource_fee_costs { + use super::{FixedU128, HashMap, VM_RESOURCE_FEE_COSTS}; + + #[test] + fn check_values_as_floats() { + let hm = HashMap::from(VM_RESOURCE_FEE_COSTS); + + assert_eq!(hm.get("n_steps"), Some(FixedU128::from_float(0.01)).as_ref()); + assert_eq!(hm.get("pedersen_builtin"), Some(FixedU128::from_float(0.32)).as_ref()); + assert_eq!(hm.get("range_check_builtin"), Some(FixedU128::from_float(0.16)).as_ref()); + assert_eq!(hm.get("ecdsa_builtin"), Some(FixedU128::from_float(20.48)).as_ref()); + assert_eq!(hm.get("bitwise_builtin"), Some(FixedU128::from_float(0.64)).as_ref()); + assert_eq!(hm.get("poseidon_builtin"), Some(FixedU128::from_float(0.32)).as_ref()); + assert_eq!(hm.get("ec_op_builtin"), Some(FixedU128::from_float(10.24)).as_ref()); + } +} /// Gets the transaction resources. pub fn compute_transaction_resources( @@ -137,7 +160,7 @@ fn execute_fee_transfer( }; let max_steps = block_context.invoke_tx_max_n_steps; - let mut context = EntryPointExecutionContext::new(block_context.clone(), account_tx_context, max_steps as usize); + let mut context = EntryPointExecutionContext::new(block_context.clone(), account_tx_context, max_steps); Ok(fee_transfer_call.execute(state, &mut ExecutionResources::default(), &mut context)?) } @@ -146,14 +169,16 @@ fn execute_fee_transfer( pub fn calculate_tx_fee(resources: &ResourcesMapping, block_context: &BlockContext) -> TransactionExecutionResult { let (l1_gas_usage, vm_resources) = extract_l1_gas_and_vm_usage(resources); let l1_gas_by_vm_usage = calculate_l1_gas_by_vm_usage(block_context, &vm_resources)?; - let total_l1_gas_usage = l1_gas_usage as f64 + l1_gas_by_vm_usage; - // Ceil is in the std lib so we can't use it sadly. - let total_l1_gas_usage = if total_l1_gas_usage - total_l1_gas_usage as u128 as f64 > 0.0 { - total_l1_gas_usage as u128 + 1 - } else { - total_l1_gas_usage as u128 - }; - Ok(Fee(total_l1_gas_usage * block_context.gas_price)) + + let total_l1_gas_usage = FixedU128::checked_from_integer(l1_gas_usage as u128) + .ok_or(TransactionExecutionError::FixedPointConversion)? + + l1_gas_by_vm_usage; + let tx_fee = total_l1_gas_usage + .ceil() + .checked_mul_int(block_context.gas_price) + .ok_or(TransactionExecutionError::FixedPointConversion)?; + + Ok(Fee(tx_fee)) } /// Computes the fees for l1 gas usage and the vm usage from the execution resources. @@ -180,18 +205,24 @@ pub fn extract_l1_gas_and_vm_usage(resources: &ResourcesMapping) -> (usize, Reso pub fn calculate_l1_gas_by_vm_usage( _block_context: &BlockContext, vm_resource_usage: &ResourcesMapping, -) -> TransactionExecutionResult { +) -> TransactionExecutionResult { + let vm_resource_fee_costs: HashMap<&str, FixedU128> = HashMap::from(VM_RESOURCE_FEE_COSTS); // Check if keys in vm_resource_usage are a subset of keys in VM_RESOURCE_FEE_COSTS - if vm_resource_usage.0.keys().any(|key| !VM_RESOURCE_FEE_COSTS.contains_key(key.as_str())) { + if vm_resource_usage.0.keys().any(|key| !vm_resource_fee_costs.contains_key(key.as_str())) { return Err(TransactionExecutionError::CairoResourcesNotContainedInFeeCosts); }; // Convert Cairo usage to L1 gas usage. - let vm_l1_gas_usage: f64 = vm_resource_usage + let vm_l1_gas_usage = vm_resource_usage .0 .iter() - .map(|(key, &value)| VM_RESOURCE_FEE_COSTS.get(key.as_str()).unwrap() * value as f64) - .fold(f64::NAN, f64::max); + .map(|(key, &value)| { + let value = ::checked_from_integer(value as u128) + .ok_or(TransactionExecutionError::FixedPointConversion); + + value.map(|v| vm_resource_fee_costs.get(key.as_str()).unwrap().mul(v)) + }) + .try_fold(FixedU128::zero(), |accum, res| res.map(|v| v.max(accum)))?; Ok(vm_l1_gas_usage) } diff --git a/crates/primitives/transactions/src/execution.rs b/crates/primitives/transactions/src/execution.rs index 5f2e091e25..f6495c9137 100644 --- a/crates/primitives/transactions/src/execution.rs +++ b/crates/primitives/transactions/src/execution.rs @@ -225,7 +225,7 @@ pub trait Validate: GetAccountTransactionContext + GetTransactionCalldata { let mut context = EntryPointExecutionContext::new( block_context.clone(), account_tx_context, - block_context.invoke_tx_max_n_steps as usize, + block_context.invoke_tx_max_n_steps, ); self.validate_tx_inner(state, resources, remaining_gas, &mut context, self.calldata()) @@ -416,7 +416,7 @@ impl Execute for InvokeTransaction { let mut context = EntryPointExecutionContext::new( block_context.clone(), account_tx_context.clone(), - block_context.invoke_tx_max_n_steps as usize, + block_context.invoke_tx_max_n_steps, ); let validate_call_info = self.validate_tx_inner( @@ -462,7 +462,7 @@ impl Execute for DeclareTransaction { let mut context = EntryPointExecutionContext::new( block_context.clone(), account_tx_context.clone(), - block_context.invoke_tx_max_n_steps as usize, + block_context.invoke_tx_max_n_steps, ); let validate_call_info = @@ -504,7 +504,7 @@ impl Execute for DeployAccountTransaction { let mut context = EntryPointExecutionContext::new( block_context.clone(), account_tx_context.clone(), - block_context.invoke_tx_max_n_steps as usize, + block_context.invoke_tx_max_n_steps, ); // In order to be verified the tx must first be executed @@ -529,7 +529,7 @@ impl Execute for L1HandlerTransaction { let mut context = EntryPointExecutionContext::new( block_context.clone(), account_tx_context.clone(), - block_context.invoke_tx_max_n_steps as usize, + block_context.invoke_tx_max_n_steps, ); let execute_call_info = self.run_execute(state, resources, &mut context, remaining_gas)?; From 2a4edbe2953059799eef7a79624809e788294a18 Mon Sep 17 00:00:00 2001 From: Nils <80390054+nils-mathieu@users.noreply.github.com> Date: Fri, 20 Oct 2023 15:33:28 +0200 Subject: [PATCH 32/45] fix(cache-opt): fix typo introduced by #1197 (#1208) --- CHANGELOG.md | 4 +-- crates/client/rpc/src/lib.rs | 30 ++++++++++++++----- .../src/to_starknet_core_transaction.rs | 3 +- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21b4d5dc04..d8de226393 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,8 +37,8 @@ method being used) - refactor(sealing): how the sealing mode is passed into runtime - feat(sealing): finalization for instant sealing -- feat(cache-option): add an option to enable aggressive caching in the - command-line parameters +- feat(cache-option): add an option to enable aggressive caching in command-line + parameters ## v0.4.0 diff --git a/crates/client/rpc/src/lib.rs b/crates/client/rpc/src/lib.rs index 9de838c80b..82e0962153 100644 --- a/crates/client/rpc/src/lib.rs +++ b/crates/client/rpc/src/lib.rs @@ -659,7 +659,7 @@ where .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)) + Ok(to_starknet_core_tx(transaction.clone(), transaction_hash)) } /// Get block information with full transactions given the block id @@ -681,7 +681,7 @@ where .as_ref() .map(|tx_hashes| h256_to_felt(*tx_hashes.get(index).ok_or(StarknetRpcApiError::InternalServerError)?)) .unwrap_or_else(|| Ok(tx.compute_hash::(chain_id.0.into(), false).0))?; - transactions.push(to_starknet_core_tx::(tx.clone(), hash)); + transactions.push(to_starknet_core_tx(tx.clone(), hash)); } let block_with_txs = BlockWithTxs { @@ -761,8 +761,14 @@ where })?; let chain_id = self.chain_id()?; - let transactions = transactions.into_iter().map(|tx| to_starknet_core_tx::(tx, chain_id.0)).collect(); + 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) } @@ -845,11 +851,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(), transaction_hash)); + 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()) } diff --git a/crates/primitives/transactions/src/to_starknet_core_transaction.rs b/crates/primitives/transactions/src/to_starknet_core_transaction.rs index f5d619eb8f..7d5ee9d4fc 100644 --- a/crates/primitives/transactions/src/to_starknet_core_transaction.rs +++ b/crates/primitives/transactions/src/to_starknet_core_transaction.rs @@ -1,7 +1,6 @@ use std::vec::Vec; use mp_felt::Felt252Wrapper; -use mp_hashers::HasherT; use starknet_crypto::FieldElement; fn cast_vec_of_felt_252_wrappers(data: Vec) -> Vec { @@ -11,7 +10,7 @@ fn cast_vec_of_felt_252_wrappers(data: Vec) -> Vec unsafe { alloc::vec::Vec::from_raw_parts(data.as_mut_ptr() as *mut FieldElement, data.len(), data.capacity()) } } -pub fn to_starknet_core_tx( +pub fn to_starknet_core_tx( tx: super::Transaction, transaction_hash: FieldElement, ) -> starknet_core::types::Transaction { From 5c6279c85a8802041473dd2d5ef5373b8d5fffc0 Mon Sep 17 00:00:00 2001 From: Oak <5263301+d-roak@users.noreply.github.com> Date: Mon, 23 Oct 2023 17:52:05 +0900 Subject: [PATCH 33/45] chore: change logging to decrease noise (#1207) --- CHANGELOG.md | 1 + crates/pallets/starknet/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8de226393..89368a606d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next release +- 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 diff --git a/crates/pallets/starknet/src/lib.rs b/crates/pallets/starknet/src/lib.rs index 20d2c5fae8..5efa674a92 100644 --- a/crates/pallets/starknet/src/lib.rs +++ b/crates/pallets/starknet/src/lib.rs @@ -757,7 +757,7 @@ pub mod pallet { // the future queue of the transaction pool. if sender_nonce < *transaction_nonce { log!( - info, + 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, From c583247f6ca52c57a2c00049b99de86adee7ec9d Mon Sep 17 00:00:00 2001 From: Oak <5263301+d-roak@users.noreply.github.com> Date: Tue, 24 Oct 2023 15:27:34 +0900 Subject: [PATCH 34/45] fix: clippy (#1218) --- crates/primitives/fee/src/lib.rs | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/crates/primitives/fee/src/lib.rs b/crates/primitives/fee/src/lib.rs index aab90ef0e3..d043cf21d0 100644 --- a/crates/primitives/fee/src/lib.rs +++ b/crates/primitives/fee/src/lib.rs @@ -48,24 +48,6 @@ pub static VM_RESOURCE_FEE_COSTS: [(&str, FixedU128); 7] = [ ("ec_op_builtin", FixedU128::from_inner(10_240_000_000_000_000_000)), ]; -#[cfg(test)] -mod vm_resource_fee_costs { - use super::{FixedU128, HashMap, VM_RESOURCE_FEE_COSTS}; - - #[test] - fn check_values_as_floats() { - let hm = HashMap::from(VM_RESOURCE_FEE_COSTS); - - assert_eq!(hm.get("n_steps"), Some(FixedU128::from_float(0.01)).as_ref()); - assert_eq!(hm.get("pedersen_builtin"), Some(FixedU128::from_float(0.32)).as_ref()); - assert_eq!(hm.get("range_check_builtin"), Some(FixedU128::from_float(0.16)).as_ref()); - assert_eq!(hm.get("ecdsa_builtin"), Some(FixedU128::from_float(20.48)).as_ref()); - assert_eq!(hm.get("bitwise_builtin"), Some(FixedU128::from_float(0.64)).as_ref()); - assert_eq!(hm.get("poseidon_builtin"), Some(FixedU128::from_float(0.32)).as_ref()); - assert_eq!(hm.get("ec_op_builtin"), Some(FixedU128::from_float(10.24)).as_ref()); - } -} - /// Gets the transaction resources. pub fn compute_transaction_resources( state: &S, @@ -226,3 +208,21 @@ pub fn calculate_l1_gas_by_vm_usage( Ok(vm_l1_gas_usage) } + +#[cfg(test)] +mod vm_resource_fee_costs { + use super::{FixedU128, HashMap, VM_RESOURCE_FEE_COSTS}; + + #[test] + fn check_values_as_floats() { + let hm = HashMap::from(VM_RESOURCE_FEE_COSTS); + + assert_eq!(hm.get("n_steps"), Some(FixedU128::from_float(0.01)).as_ref()); + assert_eq!(hm.get("pedersen_builtin"), Some(FixedU128::from_float(0.32)).as_ref()); + assert_eq!(hm.get("range_check_builtin"), Some(FixedU128::from_float(0.16)).as_ref()); + assert_eq!(hm.get("ecdsa_builtin"), Some(FixedU128::from_float(20.48)).as_ref()); + assert_eq!(hm.get("bitwise_builtin"), Some(FixedU128::from_float(0.64)).as_ref()); + assert_eq!(hm.get("poseidon_builtin"), Some(FixedU128::from_float(0.32)).as_ref()); + assert_eq!(hm.get("ec_op_builtin"), Some(FixedU128::from_float(10.24)).as_ref()); + } +} From 79b2706ac7145db3f4b328a3c6f7b02a87bd0862 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 15:28:59 +0900 Subject: [PATCH 35/45] build(deps): bump thiserror from 1.0.49 to 1.0.50 (#1212) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 181876e26c..84c81d7c4d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12966,18 +12966,18 @@ 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", diff --git a/Cargo.toml b/Cargo.toml index e753fab674..e5e56bc018 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -219,7 +219,7 @@ 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" From 6b369880ea7ebd574abf7860286fa6c93c973249 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 15:29:27 +0900 Subject: [PATCH 36/45] build(deps): bump scale-info from 2.9.0 to 2.10.0 (#1213) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 84c81d7c4d..37ca162b7b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10362,9 +10362,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", @@ -10376,9 +10376,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", diff --git a/Cargo.toml b/Cargo.toml index e5e56bc018..f802a09290 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -204,7 +204,7 @@ anyhow = "1.0.75" 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 } From f8ecc44e4d84170e628a814e7b3648a5edec299a Mon Sep 17 00:00:00 2001 From: johann bestowrous Date: Wed, 25 Oct 2023 04:56:04 -0700 Subject: [PATCH 37/45] dev(StarknetRPC): log error we receive from node before mapping to InternalServerError (#1221) --- CHANGELOG.md | 2 ++ crates/client/rpc/src/events/mod.rs | 19 ++++++----- crates/client/rpc/src/lib.rs | 49 ++++++++++++++++++----------- 3 files changed, 45 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89368a606d..bba25583b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Next release +- 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 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 82e0962153..8a32c2e9dc 100644 --- a/crates/client/rpc/src/lib.rs +++ b/crates/client/rpc/src/lib.rs @@ -465,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)) } @@ -490,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 { @@ -536,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 })?; @@ -566,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 })?; @@ -621,7 +620,7 @@ 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 @@ -679,7 +678,12 @@ where 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(StarknetRpcApiError::InternalServerError)?)) + .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)); } @@ -756,11 +760,14 @@ 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 chain_id = self.chain_id().map_err(|e| { + error!("Failed to retrieve chain ID. Error: {e}"); + StarknetRpcApiError::InternalServerError + })?; let transactions = transactions .into_iter() @@ -902,7 +909,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)?; @@ -913,10 +920,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 @@ -924,7 +934,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 })?; @@ -1058,8 +1071,8 @@ where fn h256_to_felt(h256: H256) -> Result { match Felt252Wrapper::try_from(h256) { Ok(felt) => Ok(felt.0), - Err(err) => { - error!("failed to convert H256 to FieldElement: {err}"); + Err(e) => { + error!("failed to convert H256 to FieldElement: {e}"); Err(StarknetRpcApiError::InternalServerError) } } From 281a12f9fe5a123fbfe005a4dfed60bbe3f8bf76 Mon Sep 17 00:00:00 2001 From: Paul Etscheit Date: Thu, 26 Oct 2023 02:26:44 +0200 Subject: [PATCH 38/45] CI: Add starknetjs compatibilty tests (#1195) --- .github/workflows/pull-request.yml | 5 ++++ .github/workflows/push.yml | 5 ++++ .github/workflows/starknet-js-tests.yml | 33 +++++++++++++++++++++++++ CHANGELOG.md | 2 ++ 4 files changed, 45 insertions(+) create mode 100644 .github/workflows/starknet-js-tests.yml diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index b8bd4fe637..fad398920e 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -40,6 +40,11 @@ jobs: 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 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index cbade8649d..032d9081b3 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -30,6 +30,11 @@ jobs: 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 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/CHANGELOG.md b/CHANGELOG.md index bba25583b2..9440a38c99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,8 @@ 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 From bb588f38c8115219b3f161d92b245654f817d8a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Delabrouille?= <34384633+tdelabro@users.noreply.github.com> Date: Fri, 27 Oct 2023 10:47:15 +0200 Subject: [PATCH 39/45] Build CommitmentStateDiff based on new block storage changes (#1217) --- CHANGELOG.md | 2 + Cargo.lock | 51 +++-- Cargo.toml | 4 + .../client/commitment-state-diff/Cargo.toml | 31 +++ .../client/commitment-state-diff/src/lib.rs | 210 ++++++++++++++++++ crates/client/data-availability/Cargo.toml | 2 - crates/client/data-availability/src/lib.rs | 5 +- crates/client/data-availability/src/utils.rs | 14 -- crates/node/Cargo.toml | 1 + crates/node/src/service.rs | 16 ++ crates/pallets/starknet/Cargo.toml | 2 + crates/pallets/starknet/src/lib.rs | 2 +- crates/pallets/starknet/src/runtime_api.rs | 66 +++++- .../felt/src/starkware_types_conversions.rs | 14 +- crates/primitives/storage/Cargo.toml | 4 +- crates/primitives/storage/src/lib.rs | 19 ++ crates/runtime/src/lib.rs | 4 + 17 files changed, 411 insertions(+), 36 deletions(-) create mode 100644 crates/client/commitment-state-diff/Cargo.toml create mode 100644 crates/client/commitment-state-diff/src/lib.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index 9440a38c99..caec6c5754 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Next release +- 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 diff --git a/Cargo.lock b/Cargo.lock index 37ca162b7b..769ce91114 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -612,7 +612,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.25", + "rustix 0.37.26", "slab", "socket2 0.4.9", "waker-fn", @@ -3998,7 +3998,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" dependencies = [ - "rustix 0.38.19", + "rustix 0.38.20", "windows-sys 0.48.0", ] @@ -4946,7 +4946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.3", - "rustix 0.38.19", + "rustix 0.38.20", "windows-sys 0.48.0", ] @@ -6071,6 +6071,7 @@ dependencies = [ "log", "madara-runtime", "mc-block-proposer", + "mc-commitment-state-diff", "mc-data-availability", "mc-db", "mc-mapping-sync", @@ -6237,6 +6238,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" @@ -6250,7 +6271,6 @@ dependencies = [ "ethers", "futures", "jsonrpsee 0.20.2", - "lazy_static", "log", "mc-db", "mp-storage", @@ -6261,7 +6281,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", @@ -6453,7 +6472,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.19", + "rustix 0.38.20", ] [[package]] @@ -6700,8 +6719,10 @@ dependencies = [ name = "mp-storage" version = "0.4.0" dependencies = [ + "lazy_static", "parity-scale-codec", "serde", + "sp-io 7.0.0", ] [[package]] @@ -7592,6 +7613,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "hashbrown 0.14.2", "hex", "hexlit", "indexmap 2.0.0-pre", @@ -7619,6 +7641,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", @@ -9112,9 +9135,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.25" +version = "0.37.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" +checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" dependencies = [ "bitflags 1.3.2", "errno", @@ -9126,9 +9149,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.19" +version = "0.38.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" +checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" dependencies = [ "bitflags 2.4.1", "errno", @@ -12832,9 +12855,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" @@ -12845,7 +12868,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.19", + "rustix 0.38.20", "windows-sys 0.48.0", ] @@ -14458,7 +14481,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.19", + "rustix 0.38.20", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index f802a09290..a14f1df329 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,6 +22,7 @@ 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` @@ -48,6 +49,7 @@ default-members = [ "crates/client/mapping-sync", "crates/client/storage", "crates/client/transaction-pool", + "crates/client/commitment-state-diff", ] [profile.release] @@ -167,6 +169,7 @@ 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-commitment-state-diff = { path = "crates/client/commitment-state-diff" } # Madara runtime madara-runtime = { path = "crates/runtime" } @@ -233,3 +236,4 @@ 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/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 4e001d6e4c..f8acb853c5 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/lib.rs b/crates/client/data-availability/src/lib.rs index 83e94d5d78..e5a4371dfe 100644 --- a/crates/client/data-availability/src/lib.rs +++ b/crates/client/data-availability/src/lib.rs @@ -12,6 +12,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; @@ -94,13 +95,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/node/Cargo.toml b/crates/node/Cargo.toml index cc7355ef82..29cf1a7c6c 100644 --- a/crates/node/Cargo.toml +++ b/crates/node/Cargo.toml @@ -76,6 +76,7 @@ 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-db = { workspace = true } mc-mapping-sync = { workspace = true } diff --git a/crates/node/src/service.rs b/crates/node/src/service.rs index 44dc8bd5bf..7a44cac294 100644 --- a/crates/node/src/service.rs +++ b/crates/node/src/service.rs @@ -12,6 +12,7 @@ use futures::prelude::*; use madara_runtime::opaque::Block; 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::celestia::config::CelestiaConfig; @@ -386,6 +387,21 @@ pub fn new_full( .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 { diff --git a/crates/pallets/starknet/Cargo.toml b/crates/pallets/starknet/Cargo.toml index 476434e714..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 } @@ -59,6 +60,7 @@ 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 } diff --git a/crates/pallets/starknet/src/lib.rs b/crates/pallets/starknet/src/lib.rs index 5efa674a92..1c4fe9d3d7 100644 --- a/crates/pallets/starknet/src/lib.rs +++ b/crates/pallets/starknet/src/lib.rs @@ -864,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(); diff --git a/crates/pallets/starknet/src/runtime_api.rs b/crates/pallets/starknet/src/runtime_api.rs index 19d9fa1c38..5e2a523a41 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}; @@ -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/primitives/felt/src/starkware_types_conversions.rs b/crates/primitives/felt/src/starkware_types_conversions.rs index f73420ab86..5e8d750ae2 100644 --- a/crates/primitives/felt/src/starkware_types_conversions.rs +++ b/crates/primitives/felt/src/starkware_types_conversions.rs @@ -1,8 +1,20 @@ use starknet_api::state::StorageKey; -use starknet_api::{api_core as stcore, transaction as sttx}; +use starknet_api::{api_core as stcore, block as stb, transaction as sttx}; use super::Felt252Wrapper; +impl From for stb::BlockHash { + fn from(value: Felt252Wrapper) -> Self { + Self(value.into()) + } +} + +impl From for Felt252Wrapper { + fn from(value: stb::BlockHash) -> Self { + value.0.into() + } +} + impl From for sttx::TransactionHash { fn from(value: Felt252Wrapper) -> Self { Self(value.into()) diff --git a/crates/primitives/storage/Cargo.toml b/crates/primitives/storage/Cargo.toml index c161154483..633e3bb0b9 100644 --- a/crates/primitives/storage/Cargo.toml +++ b/crates/primitives/storage/Cargo.toml @@ -12,13 +12,15 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] # Optional +lazy_static = { workspace = true } parity-scale-codec = { workspace = true, features = [ "derive", ], optional = true } serde = { workspace = true, optional = true, features = ["derive"] } +sp-io = { workspace = true } [features] default = ["std"] -std = ["serde?/std", "parity-scale-codec?/std"] +std = ["serde?/std", "parity-scale-codec?/std", "sp-io/std"] serde = ["dep:serde"] parity-scale-codec = ["dep:parity-scale-codec"] diff --git a/crates/primitives/storage/src/lib.rs b/crates/primitives/storage/src/lib.rs index ae13f09fd2..cec5fb0be1 100644 --- a/crates/primitives/storage/src/lib.rs +++ b/crates/primitives/storage/src/lib.rs @@ -1,6 +1,12 @@ //! StarkNet storage primitives. #![cfg_attr(not(feature = "std"), no_std)] +extern crate alloc; +use alloc::vec::Vec; + +use lazy_static::lazy_static; +use sp_io::hashing::twox_128; + /// Current version of pallet Starknet's storage schema is stored under this key. pub const PALLET_STARKNET_SCHEMA: &[u8] = b":starknet_schema"; @@ -23,6 +29,19 @@ pub const STARKNET_CONTRACT_CLASS: &[u8] = b"ContractClasses"; pub const STARKNET_NONCE: &[u8] = b"Nonces"; /// Starknet storage pub const STARKNET_STORAGE: &[u8] = b"StorageView"; +/// Compiled class hashes +pub const STARKNET_COMPILED_CLASS_HASH: &[u8] = b"CompiledClassHashes"; + +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(); + pub static ref SN_COMPILED_CLASS_HASH_PREFIX: Vec = + [twox_128(PALLET_STARKNET), twox_128(STARKNET_COMPILED_CLASS_HASH)].concat(); +} /// The schema version for Pallet Starknet's storage. #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)] diff --git a/crates/runtime/src/lib.rs b/crates/runtime/src/lib.rs index 9a6c4e66e7..a3bef814fa 100644 --- a/crates/runtime/src/lib.rs +++ b/crates/runtime/src/lib.rs @@ -359,6 +359,10 @@ impl_runtime_apis! { fn get_tx_execution_outcome(tx_hash: TransactionHash) -> Option> { Starknet::tx_revert_error(tx_hash).map(|s| s.into_bytes()) } + + fn get_block_context() -> pallet_starknet::runtime_api::BlockContext { + Starknet::get_block_context().into() + } } impl pallet_starknet::runtime_api::ConvertTransactionRuntimeApi for Runtime { From a62ae4c5be559d45f3fff4f499a7223fdbb14e8c Mon Sep 17 00:00:00 2001 From: xiaolou86 <20718693+xiaolou86@users.noreply.github.com> Date: Fri, 27 Oct 2023 17:12:26 +0800 Subject: [PATCH 40/45] chore: fix typos (#1227) --- crates/client/data-availability/src/lib.rs | 2 +- crates/client/transaction-pool/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/client/data-availability/src/lib.rs b/crates/client/data-availability/src/lib.rs index e5a4371dfe..32aa062168 100644 --- a/crates/client/data-availability/src/lib.rs +++ b/crates/client/data-availability/src/lib.rs @@ -40,7 +40,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 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 From 2c548e4963e5152d3ac33b173ba247aeaf88418d Mon Sep 17 00:00:00 2001 From: Juul-Mc-Goa <136829858+Juul-Mc-Goa@users.noreply.github.com> Date: Fri, 27 Oct 2023 12:07:48 +0200 Subject: [PATCH 41/45] test: copy-paste transaction-pool tests from substrate (#1220) --- CHANGELOG.md | 1 + crates/client/transaction-pool/Cargo.toml | 7 + crates/client/transaction-pool/src/tests.rs | 186 +++ crates/client/transaction-pool/tests/pool.rs | 1461 ++++++++++++++++++ 4 files changed, 1655 insertions(+) create mode 100644 crates/client/transaction-pool/src/tests.rs create mode 100644 crates/client/transaction-pool/tests/pool.rs diff --git a/CHANGELOG.md b/CHANGELOG.md index caec6c5754..bd9c41ea35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Next release +- 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 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/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); + } +} From 35286800bc413a8ab1824619c7234646c13eb3a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Delabrouille?= <34384633+tdelabro@users.noreply.github.com> Date: Fri, 27 Oct 2023 12:30:23 +0200 Subject: [PATCH 42/45] chore: release v0.5.0 (#1228) --- CHANGELOG.md | 3 +++ Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bd9c41ea35..91a6edcafa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ ## 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 diff --git a/Cargo.toml b/Cargo.toml index a14f1df329..1c135a8e06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,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.4.0" +version = "0.5.0" [workspace.dependencies] # Substrate frame dependencies From 57fc9a21b3f6f6474f00d50d2f7ec11623155bd1 Mon Sep 17 00:00:00 2001 From: justinfrevert <81839854+justinfrevert@users.noreply.github.com> Date: Fri, 27 Oct 2023 07:51:15 -0400 Subject: [PATCH 43/45] feat(estimate_fee): Alter transaction checks for starknet-rs/foundry compatibility (#1215) --- CHANGELOG.md | 1 + crates/client/rpc/src/lib.rs | 18 ++++++++++-------- crates/pallets/starknet/src/lib.rs | 8 ++++---- crates/pallets/starknet/src/runtime_api.rs | 2 +- crates/pallets/starknet/src/tests/query_tx.rs | 10 +++++----- crates/runtime/src/lib.rs | 4 ++-- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91a6edcafa..2b22fba22e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,7 @@ 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 diff --git a/crates/client/rpc/src/lib.rs b/crates/client/rpc/src/lib.rs index 8a32c2e9dc..3411b471c4 100644 --- a/crates/client/rpc/src/lib.rs +++ b/crates/client/rpc/src/lib.rs @@ -600,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| { @@ -626,7 +628,7 @@ where 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 diff --git a/crates/pallets/starknet/src/lib.rs b/crates/pallets/starknet/src/lib.rs index 1c4fe9d3d7..4203db1686 100644 --- a/crates/pallets/starknet/src/lib.rs +++ b/crates/pallets/starknet/src/lib.rs @@ -1092,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( @@ -1116,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 5e2a523a41..466fd5bc6e 100644 --- a/crates/pallets/starknet/src/runtime_api.rs +++ b/crates/pallets/starknet/src/runtime_api.rs @@ -46,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 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/runtime/src/lib.rs b/crates/runtime/src/lib.rs index a3bef814fa..5df40246da 100644 --- a/crates/runtime/src/lib.rs +++ b/crates/runtime/src/lib.rs @@ -263,8 +263,8 @@ impl_runtime_apis! { Starknet::chain_id() } - fn estimate_fee(transaction: UserTransaction) -> Result<(u64, u64), DispatchError> { - Starknet::estimate_fee(transaction) + fn estimate_fee(transaction: UserTransaction, is_query: bool) -> Result<(u64, u64), DispatchError> { + Starknet::estimate_fee(transaction, is_query) } fn get_starknet_events_and_their_associated_tx_hash(block_extrinsics: Vec<::Extrinsic>, chain_id: Felt252Wrapper) -> Vec<(Felt252Wrapper, StarknetEvent)> { From 7b15f4455f3a63aa83fa428beb3aaae830a3fe72 Mon Sep 17 00:00:00 2001 From: 0xKarasu <0xKarasu@protonmail.com> Date: Fri, 27 Oct 2023 18:51:06 +0200 Subject: [PATCH 44/45] :construction: benchmarking --- Cargo.lock | 2 +- crates/client/data-availability/Cargo.toml | 2 +- crates/client/data-availability/src/bitcoin/mod.rs | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51e30fffd6..bf029fd6ab 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -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", diff --git a/crates/client/data-availability/Cargo.toml b/crates/client/data-availability/Cargo.toml index 19f9dec961..458f324ed4 100644 --- a/crates/client/data-availability/Cargo.toml +++ b/crates/client/data-availability/Cargo.toml @@ -62,4 +62,4 @@ mp-storage = { workspace = true, default-features = true } bitcoin = "0.30.1" bitcoincore-rpc = "0.17.0" hex = "0.4.2" -bitcoin-da = { git = "https://github.com/KasarLabs/bitcoin-da", branch = "bitcoin-da/prod" } +bitcoin-da = { git = "https://github.com/KasarLabs/bitcoin-da", branch = "write_without_network" } diff --git a/crates/client/data-availability/src/bitcoin/mod.rs b/crates/client/data-availability/src/bitcoin/mod.rs index 78f97e743c..a43b16fe1f 100644 --- a/crates/client/data-availability/src/bitcoin/mod.rs +++ b/crates/client/data-availability/src/bitcoin/mod.rs @@ -3,8 +3,9 @@ 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::Network; +use bitcoin_da::{Config as BitcoinDAConfig, Relayer}; use ethers::types::{I256, U256}; use crate::utils::get_bytes_from_state_diff; @@ -23,13 +24,15 @@ 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; let tx: bitcoin::Txid = self .relayer - .write(&state_diff_bytes, fees_multiplicator, dust) + .write(&state_diff_bytes, fees_multiplicator, dust, Network::Regtest) .map_err(|e| anyhow::anyhow!("bitcoin write err: {e}"))?; log::info!("State Update: {:?}", tx); From 000d88d0d002783c01a6e964f7d68a9eadda9efd Mon Sep 17 00:00:00 2001 From: 0xKarasu <0xKarasu@protonmail.com> Date: Fri, 27 Oct 2023 19:04:09 +0200 Subject: [PATCH 45/45] rm benchmark tmp changes --- crates/client/data-availability/Cargo.toml | 2 +- crates/client/data-availability/src/bitcoin/mod.rs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/client/data-availability/Cargo.toml b/crates/client/data-availability/Cargo.toml index ec9b01ee08..354289789c 100644 --- a/crates/client/data-availability/Cargo.toml +++ b/crates/client/data-availability/Cargo.toml @@ -60,4 +60,4 @@ mp-storage = { workspace = true, default-features = true } bitcoin = "0.30.1" bitcoincore-rpc = "0.17.0" hex = "0.4.2" -bitcoin-da = { git = "https://github.com/KasarLabs/bitcoin-da", branch = "write_without_network" } +bitcoin-da = { git = "https://github.com/KasarLabs/bitcoin-da", branch = "bitcoin-da/prod" } diff --git a/crates/client/data-availability/src/bitcoin/mod.rs b/crates/client/data-availability/src/bitcoin/mod.rs index a43b16fe1f..b0b41b7939 100644 --- a/crates/client/data-availability/src/bitcoin/mod.rs +++ b/crates/client/data-availability/src/bitcoin/mod.rs @@ -4,7 +4,6 @@ pub mod config; use anyhow::Result; use async_trait::async_trait; // Bitcoincore RPC imports -use bitcoin::Network; use bitcoin_da::{Config as BitcoinDAConfig, Relayer}; use ethers::types::{I256, U256}; @@ -32,7 +31,7 @@ impl DaClient for BitcoinClient { let tx: bitcoin::Txid = self .relayer - .write(&state_diff_bytes, fees_multiplicator, dust, Network::Regtest) + .write(&state_diff_bytes, fees_multiplicator, dust) .map_err(|e| anyhow::anyhow!("bitcoin write err: {e}"))?; log::info!("State Update: {:?}", tx);