From aa2495c461dd6ebd171983eb8f26bf45d6652af5 Mon Sep 17 00:00:00 2001 From: bkolad Date: Fri, 21 Jul 2023 10:32:18 +0200 Subject: [PATCH 01/11] example --- examples/demo-stf/src/runtime.rs | 2 +- .../examples/sov-election/src/lib.rs | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/demo-stf/src/runtime.rs b/examples/demo-stf/src/runtime.rs index 7e59b4c7e..5da61b415 100644 --- a/examples/demo-stf/src/runtime.rs +++ b/examples/demo-stf/src/runtime.rs @@ -3,7 +3,7 @@ use sov_accounts::query::{AccountsRpcImpl, AccountsRpcServer}; #[cfg(feature = "native")] use sov_bank::query::{BankRpcImpl, BankRpcServer}; #[cfg(feature = "native")] -use sov_election::query::{ElectionRpcImpl, ElectionRpcServer}; +use sov_election::{ElectionRpcImpl, ElectionRpcServer}; #[cfg(feature = "native")] #[cfg(feature = "experimental")] use sov_evm::query::{EvmRpcImpl, EvmRpcServer}; diff --git a/module-system/module-implementations/examples/sov-election/src/lib.rs b/module-system/module-implementations/examples/sov-election/src/lib.rs index a9dc15564..608fb04d5 100644 --- a/module-system/module-implementations/examples/sov-election/src/lib.rs +++ b/module-system/module-implementations/examples/sov-election/src/lib.rs @@ -1,13 +1,14 @@ -pub mod call; -pub mod genesis; +mod call; +mod genesis; #[cfg(feature = "native")] -pub mod query; +mod query; #[cfg(test)] mod tests; mod types; +pub use query::{ElectionRpcImpl, ElectionRpcServer}; use sov_modules_api::Error; use sov_modules_macros::ModuleInfo; use sov_state::WorkingSet; From 474c1f1005866a48bc5bfe42b397b789fe18e135 Mon Sep 17 00:00:00 2001 From: bkolad Date: Fri, 21 Jul 2023 11:11:10 +0200 Subject: [PATCH 02/11] election --- .../tests/data_generation/election_data.rs | 26 +++++++++---------- examples/demo-stf/src/tests/stf_tests.rs | 6 ++--- .../demo-stf/src/tests/tx_revert_tests.rs | 19 +++++++------- .../examples/sov-election/src/lib.rs | 3 ++- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/demo-stf/src/tests/data_generation/election_data.rs b/examples/demo-stf/src/tests/data_generation/election_data.rs index 6cbbe566b..b93bfc8fc 100644 --- a/examples/demo-stf/src/tests/data_generation/election_data.rs +++ b/examples/demo-stf/src/tests/data_generation/election_data.rs @@ -32,12 +32,12 @@ impl CallGenerator { &mut self, ) -> Vec<( Rc, - sov_election::call::CallMessage, + sov_election::CallMessage, u64, )> { let mut messages = Vec::default(); - let set_candidates_message = sov_election::call::CallMessage::SetCandidates { + let set_candidates_message = sov_election::CallMessage::SetCandidates { names: vec!["candidate_1".to_owned(), "candidate_2".to_owned()], }; @@ -50,7 +50,7 @@ impl CallGenerator { for voter in self.voters.clone() { let add_voter_message = - sov_election::call::CallMessage::AddVoter(voter.pub_key().to_address()); + sov_election::CallMessage::AddVoter(voter.pub_key().to_address()); messages.push(( self.election_admin.clone(), @@ -58,7 +58,7 @@ impl CallGenerator { self.election_admin_nonce, )); - let vote_message = sov_election::call::CallMessage::Vote(1); + let vote_message = sov_election::CallMessage::Vote(1); messages.push((voter, vote_message, 0)); self.inc_nonce(); } @@ -70,12 +70,12 @@ impl CallGenerator { &mut self, ) -> Vec<( Rc, - sov_election::call::CallMessage, + sov_election::CallMessage, u64, )> { let mut messages = Vec::default(); - let freeze_message = sov_election::call::CallMessage::FreezeElection; + let freeze_message = sov_election::CallMessage::FreezeElection; messages.push(( self.election_admin.clone(), freeze_message, @@ -90,7 +90,7 @@ impl CallGenerator { &mut self, ) -> Vec<( Rc, - sov_election::call::CallMessage, + sov_election::CallMessage, u64, )> { let mut messages = Vec::default(); @@ -114,7 +114,7 @@ impl ElectionCallMessages { } impl MessageGenerator for ElectionCallMessages { - type Call = sov_election::call::CallMessage; + type Call = sov_election::CallMessage; fn create_messages(&self) -> Vec<(Rc, Self::Call, u64)> { let call_generator = &mut CallGenerator::new(self.election_admin.clone()); @@ -146,7 +146,7 @@ impl InvalidElectionCallMessages { } impl MessageGenerator for InvalidElectionCallMessages { - type Call = sov_election::call::CallMessage; + type Call = sov_election::CallMessage; fn create_messages(&self) -> Vec<(Rc, Self::Call, u64)> { let call_generator = &mut CallGenerator::new(self.election_admin.clone()); @@ -158,7 +158,7 @@ impl MessageGenerator for InvalidElectionCallMessages { // Additional invalid message: This voter already voted. { let voter = call_generator.voters[0].clone(); - let vote_message = sov_election::call::CallMessage::Vote(1); + let vote_message = sov_election::CallMessage::Vote(1); messages.push((voter, vote_message, 1)); } @@ -191,7 +191,7 @@ impl BadSigElectionCallMessages { } impl MessageGenerator for BadSigElectionCallMessages { - type Call = sov_election::call::CallMessage; + type Call = sov_election::CallMessage; fn create_messages(&self) -> Vec<(Rc, Self::Call, u64)> { let call_generator = &mut CallGenerator::new(self.election_admin.clone()); @@ -234,7 +234,7 @@ impl BadNonceElectionCallMessages { } impl MessageGenerator for BadNonceElectionCallMessages { - type Call = sov_election::call::CallMessage; + type Call = sov_election::CallMessage; fn create_messages(&self) -> Vec<(Rc, Self::Call, u64)> { let call_generator = &mut CallGenerator::new(self.election_admin.clone()); @@ -268,7 +268,7 @@ impl BadSerializationElectionCallMessages { } impl MessageGenerator for BadSerializationElectionCallMessages { - type Call = sov_election::call::CallMessage; + type Call = sov_election::CallMessage; fn create_messages(&self) -> Vec<(Rc, Self::Call, u64)> { let call_generator = &mut CallGenerator::new(self.election_admin.clone()); diff --git a/examples/demo-stf/src/tests/stf_tests.rs b/examples/demo-stf/src/tests/stf_tests.rs index fb3742f63..86e55439f 100644 --- a/examples/demo-stf/src/tests/stf_tests.rs +++ b/examples/demo-stf/src/tests/stf_tests.rs @@ -62,7 +62,7 @@ pub mod test { assert_eq!( resp, - sov_election::query::GetResultResponse::Result(Some(sov_election::Candidate { + sov_election::GetResultResponse::Result(Some(sov_election::Candidate { name: "candidate_2".to_owned(), count: 3 })) @@ -116,7 +116,7 @@ pub mod test { assert_eq!( resp, - sov_election::query::GetResultResponse::Result(Some(sov_election::Candidate { + sov_election::GetResultResponse::Result(Some(sov_election::Candidate { name: "candidate_2".to_owned(), count: 3 })) @@ -174,7 +174,7 @@ pub mod test { assert_eq!( resp, - sov_election::query::GetResultResponse::Err("Election is not frozen".to_owned()) + sov_election::GetResultResponse::Err("Election is not frozen".to_owned()) ); let resp = runtime.value_setter.query_value(&mut working_set); diff --git a/examples/demo-stf/src/tests/tx_revert_tests.rs b/examples/demo-stf/src/tests/tx_revert_tests.rs index 18b38bb94..26f7950ac 100644 --- a/examples/demo-stf/src/tests/tx_revert_tests.rs +++ b/examples/demo-stf/src/tests/tx_revert_tests.rs @@ -69,13 +69,13 @@ fn test_tx_revert() { // We sent 4 vote messages but one of them is invalid and should be reverted. let resp = runtime.election.number_of_votes(&mut working_set); - assert_eq!(resp, sov_election::query::GetNbOfVotesResponse::Result(3)); + assert_eq!(resp, sov_election::GetNbOfVotesResponse::Result(3)); let resp = runtime.election.results(&mut working_set); assert_eq!( resp, - sov_election::query::GetResultResponse::Result(Some(sov_election::Candidate { + sov_election::GetResultResponse::Result(Some(sov_election::Candidate { name: "candidate_2".to_owned(), count: 3 })) @@ -112,7 +112,7 @@ fn test_nonce_incremented_on_revert() { StateTransitionFunction::::begin_slot(&mut demo, Default::default()); let set_candidates_message = Runtime::::encode_election_call( - sov_election::call::CallMessage::SetCandidates { + sov_election::CallMessage::SetCandidates { names: vec!["candidate_1".to_owned(), "candidate_2".to_owned()], }, ); @@ -124,7 +124,7 @@ fn test_nonce_incremented_on_revert() { ); let add_voter_message = Runtime::::encode_election_call( - sov_election::call::CallMessage::AddVoter(voter.pub_key().to_address()), + sov_election::CallMessage::AddVoter(voter.pub_key().to_address()), ); let add_voter_message = Transaction::::new_signed_tx( &election_admin_private_key, @@ -133,9 +133,8 @@ fn test_nonce_incremented_on_revert() { ); // There's only 2 candidates - let vote_message = Runtime::::encode_election_call( - sov_election::call::CallMessage::Vote(100), - ); + let vote_message = + Runtime::::encode_election_call(sov_election::CallMessage::Vote(100)); let vote_message = Transaction::::new_signed_tx(&voter, vote_message, original_nonce); @@ -169,7 +168,7 @@ fn test_nonce_incremented_on_revert() { // No votes actually recorded, because there was invalid vote let resp = runtime.election.number_of_votes(&mut working_set); - assert_eq!(resp, sov_election::query::GetNbOfVotesResponse::Result(0)); + assert_eq!(resp, sov_election::GetNbOfVotesResponse::Result(0)); let nonce = match runtime .accounts @@ -235,7 +234,7 @@ fn test_tx_bad_sig() { assert_eq!( resp, - sov_election::query::GetResultResponse::Err("Election is not frozen".to_owned()) + sov_election::GetResultResponse::Err("Election is not frozen".to_owned()) ); // Sequencer is slashed @@ -311,7 +310,7 @@ fn test_tx_bad_serialization() { assert_eq!( resp, - sov_election::query::GetResultResponse::Err("Election is not frozen".to_owned()) + sov_election::GetResultResponse::Err("Election is not frozen".to_owned()) ); // Sequencer is not in list of allowed sequencers diff --git a/module-system/module-implementations/examples/sov-election/src/lib.rs b/module-system/module-implementations/examples/sov-election/src/lib.rs index 608fb04d5..6859e4acc 100644 --- a/module-system/module-implementations/examples/sov-election/src/lib.rs +++ b/module-system/module-implementations/examples/sov-election/src/lib.rs @@ -8,7 +8,8 @@ mod tests; mod types; -pub use query::{ElectionRpcImpl, ElectionRpcServer}; +pub use call::CallMessage; +pub use query::{ElectionRpcImpl, ElectionRpcServer, GetNbOfVotesResponse, GetResultResponse}; use sov_modules_api::Error; use sov_modules_macros::ModuleInfo; use sov_state::WorkingSet; From 5e322b44ea3772ba2c227391d8d6e1edd8b3348f Mon Sep 17 00:00:00 2001 From: bkolad Date: Fri, 21 Jul 2023 11:14:59 +0200 Subject: [PATCH 03/11] value-setter --- examples/demo-stf/src/batch_builder.rs | 3 +-- examples/demo-stf/src/runtime.rs | 2 +- .../src/tests/data_generation/value_setter_data.rs | 8 ++++---- examples/demo-stf/src/tests/stf_tests.rs | 6 +++--- .../examples/sov-value-setter/src/lib.rs | 8 +++++--- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/examples/demo-stf/src/batch_builder.rs b/examples/demo-stf/src/batch_builder.rs index da95ca7be..68ed56369 100644 --- a/examples/demo-stf/src/batch_builder.rs +++ b/examples/demo-stf/src/batch_builder.rs @@ -143,8 +143,7 @@ mod tests { use sov_modules_macros::{DefaultRuntime, DispatchCall, Genesis, MessageCodec}; use sov_rollup_interface::services::batch_builder::BatchBuilder; use sov_state::{DefaultStorageSpec, ProverStorage, Storage}; - use sov_value_setter::call::CallMessage; - use sov_value_setter::ValueSetterConfig; + use sov_value_setter::{CallMessage, ValueSetterConfig}; use tempfile::TempDir; use super::*; diff --git a/examples/demo-stf/src/runtime.rs b/examples/demo-stf/src/runtime.rs index 5da61b415..41bfcb2db 100644 --- a/examples/demo-stf/src/runtime.rs +++ b/examples/demo-stf/src/runtime.rs @@ -16,7 +16,7 @@ use sov_modules_macros::{DefaultRuntime, DispatchCall, Genesis, MessageCodec}; #[cfg(feature = "native")] use sov_sequencer_registry::query::{SequencerRegistryRpcImpl, SequencerRegistryRpcServer}; #[cfg(feature = "native")] -use sov_value_setter::query::{ValueSetterRpcImpl, ValueSetterRpcServer}; +use sov_value_setter::{ValueSetterRpcImpl, ValueSetterRpcServer}; /// The Rollup entrypoint. /// diff --git a/examples/demo-stf/src/tests/data_generation/value_setter_data.rs b/examples/demo-stf/src/tests/data_generation/value_setter_data.rs index 73f959d8d..a63796a50 100644 --- a/examples/demo-stf/src/tests/data_generation/value_setter_data.rs +++ b/examples/demo-stf/src/tests/data_generation/value_setter_data.rs @@ -16,7 +16,7 @@ impl ValueSetterMessages { } impl MessageGenerator for ValueSetterMessages { - type Call = sov_value_setter::call::CallMessage; + type Call = sov_value_setter::CallMessage; fn create_messages(&self) -> Vec<(Rc, Self::Call, u64)> { let admin = self.admin.clone(); @@ -25,11 +25,11 @@ impl MessageGenerator for ValueSetterMessages { let new_value = 99; - let set_value_msg_1: sov_value_setter::call::CallMessage = - sov_value_setter::call::CallMessage::SetValue(new_value); + let set_value_msg_1: sov_value_setter::CallMessage = + sov_value_setter::CallMessage::SetValue(new_value); let new_value = 33; - let set_value_msg_2 = sov_value_setter::call::CallMessage::SetValue(new_value); + let set_value_msg_2 = sov_value_setter::CallMessage::SetValue(new_value); messages.push((admin.clone(), set_value_msg_1, value_setter_admin_nonce)); diff --git a/examples/demo-stf/src/tests/stf_tests.rs b/examples/demo-stf/src/tests/stf_tests.rs index 86e55439f..2981eaa95 100644 --- a/examples/demo-stf/src/tests/stf_tests.rs +++ b/examples/demo-stf/src/tests/stf_tests.rs @@ -69,7 +69,7 @@ pub mod test { ); let resp = runtime.value_setter.query_value(&mut working_set); - assert_eq!(resp, sov_value_setter::query::Response { value: Some(33) }); + assert_eq!(resp, sov_value_setter::Response { value: Some(33) }); } } @@ -124,7 +124,7 @@ pub mod test { let resp = runtime.value_setter.query_value(&mut working_set); - assert_eq!(resp, sov_value_setter::query::Response { value: Some(33) }); + assert_eq!(resp, sov_value_setter::Response { value: Some(33) }); } #[test] @@ -179,7 +179,7 @@ pub mod test { let resp = runtime.value_setter.query_value(&mut working_set); - assert_eq!(resp, sov_value_setter::query::Response { value: None }); + assert_eq!(resp, sov_value_setter::Response { value: None }); } } diff --git a/module-system/module-implementations/examples/sov-value-setter/src/lib.rs b/module-system/module-implementations/examples/sov-value-setter/src/lib.rs index 7dc812a8e..6b03ff4cb 100644 --- a/module-system/module-implementations/examples/sov-value-setter/src/lib.rs +++ b/module-system/module-implementations/examples/sov-value-setter/src/lib.rs @@ -1,12 +1,14 @@ -pub mod call; -pub mod genesis; +mod call; +mod genesis; #[cfg(test)] mod tests; #[cfg(feature = "native")] -pub mod query; +mod query; +pub use call::CallMessage; +pub use query::{Response, ValueSetterRpcImpl, ValueSetterRpcServer}; use sov_modules_api::Error; use sov_modules_macros::ModuleInfo; use sov_state::WorkingSet; From 9266df278cb52d88ef6d2f652eb277ad4e661e5b Mon Sep 17 00:00:00 2001 From: bkolad Date: Fri, 21 Jul 2023 11:16:36 +0200 Subject: [PATCH 04/11] template --- .../module-implementations/module-template/src/lib.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/module-system/module-implementations/module-template/src/lib.rs b/module-system/module-implementations/module-template/src/lib.rs index 95df9bb56..65a1b1d55 100644 --- a/module-system/module-implementations/module-template/src/lib.rs +++ b/module-system/module-implementations/module-template/src/lib.rs @@ -1,12 +1,14 @@ -pub mod call; -pub mod genesis; +mod call; +mod genesis; #[cfg(test)] mod tests; #[cfg(feature = "native")] -pub mod query; +mod query; +pub use call::CallMessage; +pub use query::Response; use sov_modules_api::Error; use sov_modules_macros::ModuleInfo; use sov_state::WorkingSet; From bd0bfd42b009f33dabc70efe783d2b800b6f408d Mon Sep 17 00:00:00 2001 From: bkolad Date: Fri, 21 Jul 2023 11:18:07 +0200 Subject: [PATCH 05/11] accounts --- examples/demo-stf/src/runtime.rs | 2 +- examples/demo-stf/src/tests/tx_revert_tests.rs | 2 +- .../module-implementations/sov-accounts/src/lib.rs | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/demo-stf/src/runtime.rs b/examples/demo-stf/src/runtime.rs index 41bfcb2db..13d406f1b 100644 --- a/examples/demo-stf/src/runtime.rs +++ b/examples/demo-stf/src/runtime.rs @@ -1,5 +1,5 @@ #[cfg(feature = "native")] -use sov_accounts::query::{AccountsRpcImpl, AccountsRpcServer}; +use sov_accounts::{AccountsRpcImpl, AccountsRpcServer}; #[cfg(feature = "native")] use sov_bank::query::{BankRpcImpl, BankRpcServer}; #[cfg(feature = "native")] diff --git a/examples/demo-stf/src/tests/tx_revert_tests.rs b/examples/demo-stf/src/tests/tx_revert_tests.rs index 26f7950ac..c04e6fdcc 100644 --- a/examples/demo-stf/src/tests/tx_revert_tests.rs +++ b/examples/demo-stf/src/tests/tx_revert_tests.rs @@ -1,6 +1,6 @@ use borsh::BorshSerialize; use const_rollup_config::SEQUENCER_DA_ADDRESS; -use sov_accounts::query::Response; +use sov_accounts::Response; use sov_modules_api::default_context::DefaultContext; use sov_modules_api::default_signature::private_key::DefaultPrivateKey; use sov_modules_api::transaction::Transaction; diff --git a/module-system/module-implementations/sov-accounts/src/lib.rs b/module-system/module-implementations/sov-accounts/src/lib.rs index aaa8562d2..74dc7991d 100644 --- a/module-system/module-implementations/sov-accounts/src/lib.rs +++ b/module-system/module-implementations/sov-accounts/src/lib.rs @@ -1,12 +1,14 @@ pub mod hooks; -pub mod call; -pub mod genesis; +mod call; +mod genesis; #[cfg(feature = "native")] -pub mod query; +mod query; #[cfg(test)] mod tests; +pub use call::CallMessage; +pub use query::{AccountsRpcImpl, AccountsRpcServer, Response}; use sov_modules_api::Error; use sov_modules_macros::ModuleInfo; use sov_state::WorkingSet; From ba9dab19c393d66abe98c1ebc19f3b3d8e01a548 Mon Sep 17 00:00:00 2001 From: bkolad Date: Fri, 21 Jul 2023 11:21:34 +0200 Subject: [PATCH 06/11] Bank --- examples/demo-rollup/src/rng_xfers.rs | 33 +++++++++---------- examples/demo-stf/src/runtime.rs | 2 +- .../sov-bank/src/lib.rs | 8 +++-- .../sov-bank/tests/burn_test.rs | 7 ++-- .../sov-bank/tests/create_token_test.rs | 3 +- .../sov-bank/tests/freeze_test.rs | 4 +-- .../sov-bank/tests/mint_test.rs | 4 +-- .../sov-bank/tests/transfer_test.rs | 7 ++-- .../tests/helpers/mod.rs | 4 +-- 9 files changed, 34 insertions(+), 38 deletions(-) diff --git a/examples/demo-rollup/src/rng_xfers.rs b/examples/demo-rollup/src/rng_xfers.rs index 469c7eaf1..f93c800fe 100644 --- a/examples/demo-rollup/src/rng_xfers.rs +++ b/examples/demo-rollup/src/rng_xfers.rs @@ -5,8 +5,7 @@ use borsh::ser::BorshSerialize; use const_rollup_config::SEQUENCER_DA_ADDRESS; use demo_stf::runtime::Runtime; use jupiter::verifier::address::CelestiaAddress; -use sov_bank::call::CallMessage; -use sov_bank::Coins; +use sov_bank::{CallMessage, Coins}; use sov_modules_api::default_context::DefaultContext; use sov_modules_api::default_signature::private_key::DefaultPrivateKey; use sov_modules_api::transaction::Transaction; @@ -31,14 +30,13 @@ fn generate_transfers(n: usize, start_nonce: u64) -> Vec { let priv_key = DefaultPrivateKey::generate(); let address: ::Address = priv_key.pub_key().to_address(); let pk = DefaultPrivateKey::from_hex("236e80cb222c4ed0431b093b3ac53e6aa7a2273fe1f4351cd354989a823432a27b758bf2e7670fafaf6bf0015ce0ff5aa802306fc7e3f45762853ffc37180fe6").unwrap(); - let msg: sov_bank::call::CallMessage = - CallMessage::::Transfer { - to: address, - coins: Coins { - amount: 1, - token_address: token_address.clone(), - }, - }; + let msg: sov_bank::CallMessage = CallMessage::::Transfer { + to: address, + coins: Coins { + amount: 1, + token_address: token_address.clone(), + }, + }; let enc_msg = Runtime::::encode_bank_call(msg); let tx = Transaction::::new_signed_tx(&pk, enc_msg, start_nonce + (i as u64)); @@ -58,14 +56,13 @@ fn generate_create(start_nonce: u64) -> Vec { AddressBech32::try_from(sender_address) .unwrap_or_else(|_e| panic!("Failed generating token create transaction")), ); - let msg: sov_bank::call::CallMessage = - CallMessage::::CreateToken { - salt: 11, - token_name: "sov-test-token".to_string(), - initial_balance: 100000000, - minter_address: minter_address.clone(), - authorized_minters: vec![minter_address], - }; + let msg: sov_bank::CallMessage = CallMessage::::CreateToken { + salt: 11, + token_name: "sov-test-token".to_string(), + initial_balance: 100000000, + minter_address: minter_address.clone(), + authorized_minters: vec![minter_address], + }; let enc_msg = Runtime::::encode_bank_call(msg); let tx = Transaction::::new_signed_tx(&pk, enc_msg, start_nonce); let ser_tx = tx.try_to_vec().unwrap(); diff --git a/examples/demo-stf/src/runtime.rs b/examples/demo-stf/src/runtime.rs index 13d406f1b..a015c83b9 100644 --- a/examples/demo-stf/src/runtime.rs +++ b/examples/demo-stf/src/runtime.rs @@ -1,7 +1,7 @@ #[cfg(feature = "native")] use sov_accounts::{AccountsRpcImpl, AccountsRpcServer}; #[cfg(feature = "native")] -use sov_bank::query::{BankRpcImpl, BankRpcServer}; +use sov_bank::{BankRpcImpl, BankRpcServer}; #[cfg(feature = "native")] use sov_election::{ElectionRpcImpl, ElectionRpcServer}; #[cfg(feature = "native")] diff --git a/module-system/module-implementations/sov-bank/src/lib.rs b/module-system/module-implementations/sov-bank/src/lib.rs index fb0c43306..8111a28cd 100644 --- a/module-system/module-implementations/sov-bank/src/lib.rs +++ b/module-system/module-implementations/sov-bank/src/lib.rs @@ -1,10 +1,12 @@ -pub mod call; -pub mod genesis; +mod call; +mod genesis; #[cfg(feature = "native")] -pub mod query; +mod query; mod token; mod utils; +pub use call::CallMessage; +pub use query::{BalanceResponse, BankRpcImpl, BankRpcServer, TotalSupplyResponse}; use sov_modules_api::Error; use sov_modules_macros::ModuleInfo; use sov_state::WorkingSet; diff --git a/module-system/module-implementations/sov-bank/tests/burn_test.rs b/module-system/module-implementations/sov-bank/tests/burn_test.rs index 1b50c7d04..4dc9497bc 100644 --- a/module-system/module-implementations/sov-bank/tests/burn_test.rs +++ b/module-system/module-implementations/sov-bank/tests/burn_test.rs @@ -1,7 +1,8 @@ use helpers::{generate_address, C}; -use sov_bank::call::CallMessage; -use sov_bank::query::TotalSupplyResponse; -use sov_bank::{get_genesis_token_address, get_token_address, Bank, BankConfig, Coins}; +use sov_bank::{ + get_genesis_token_address, get_token_address, Bank, BankConfig, CallMessage, Coins, + TotalSupplyResponse, +}; use sov_modules_api::{Address, Context, Error, Module}; use sov_state::{DefaultStorageSpec, ProverStorage, WorkingSet}; diff --git a/module-system/module-implementations/sov-bank/tests/create_token_test.rs b/module-system/module-implementations/sov-bank/tests/create_token_test.rs index c7ab29855..023c31347 100644 --- a/module-system/module-implementations/sov-bank/tests/create_token_test.rs +++ b/module-system/module-implementations/sov-bank/tests/create_token_test.rs @@ -1,5 +1,4 @@ -use sov_bank::call::CallMessage; -use sov_bank::{get_token_address, Bank}; +use sov_bank::{get_token_address, Bank, CallMessage}; use sov_modules_api::{Context, Module}; use sov_state::{ProverStorage, WorkingSet}; diff --git a/module-system/module-implementations/sov-bank/tests/freeze_test.rs b/module-system/module-implementations/sov-bank/tests/freeze_test.rs index 716f13ead..4a01f7042 100644 --- a/module-system/module-implementations/sov-bank/tests/freeze_test.rs +++ b/module-system/module-implementations/sov-bank/tests/freeze_test.rs @@ -1,7 +1,5 @@ use helpers::{generate_address, C}; -use sov_bank::call::CallMessage; -use sov_bank::query::TotalSupplyResponse; -use sov_bank::{get_token_address, Bank, BankConfig, Coins}; +use sov_bank::{get_token_address, Bank, BankConfig, CallMessage, Coins, TotalSupplyResponse}; use sov_modules_api::{Address, Context, Error, Module}; use sov_state::{DefaultStorageSpec, ProverStorage, WorkingSet}; diff --git a/module-system/module-implementations/sov-bank/tests/mint_test.rs b/module-system/module-implementations/sov-bank/tests/mint_test.rs index 5147f39dd..f336f2f71 100644 --- a/module-system/module-implementations/sov-bank/tests/mint_test.rs +++ b/module-system/module-implementations/sov-bank/tests/mint_test.rs @@ -1,7 +1,5 @@ use helpers::{generate_address, C}; -use sov_bank::call::CallMessage; -use sov_bank::query::TotalSupplyResponse; -use sov_bank::{get_token_address, Bank, BankConfig, Coins}; +use sov_bank::{get_token_address, Bank, BankConfig, CallMessage, Coins, TotalSupplyResponse}; use sov_modules_api::{Address, Context, Error, Module}; use sov_state::{DefaultStorageSpec, ProverStorage, WorkingSet}; diff --git a/module-system/module-implementations/sov-bank/tests/transfer_test.rs b/module-system/module-implementations/sov-bank/tests/transfer_test.rs index 8b595f300..b187064a0 100644 --- a/module-system/module-implementations/sov-bank/tests/transfer_test.rs +++ b/module-system/module-implementations/sov-bank/tests/transfer_test.rs @@ -1,9 +1,10 @@ mod helpers; use helpers::*; -use sov_bank::call::CallMessage; -use sov_bank::query::TotalSupplyResponse; -use sov_bank::{get_genesis_token_address, get_token_address, Bank, BankConfig, Coins}; +use sov_bank::{ + get_genesis_token_address, get_token_address, Bank, BankConfig, CallMessage, Coins, + TotalSupplyResponse, +}; use sov_modules_api::{Address, Context, Error, Module}; use sov_state::{DefaultStorageSpec, ProverStorage, WorkingSet}; diff --git a/module-system/module-implementations/sov-sequencer-registry/tests/helpers/mod.rs b/module-system/module-implementations/sov-sequencer-registry/tests/helpers/mod.rs index b9f2442c0..9d458a09d 100644 --- a/module-system/module-implementations/sov-sequencer-registry/tests/helpers/mod.rs +++ b/module-system/module-implementations/sov-sequencer-registry/tests/helpers/mod.rs @@ -38,7 +38,7 @@ impl TestSequencer { pub fn query_balance_via_bank( &mut self, working_set: &mut WorkingSet<::Storage>, - ) -> sov_bank::query::BalanceResponse { + ) -> sov_bank::BalanceResponse { self.bank.balance_of( self.sequencer_config.seq_rollup_address.clone(), self.sequencer_config.coins_to_lock.token_address.clone(), @@ -51,7 +51,7 @@ impl TestSequencer { &mut self, user_address: ::Address, working_set: &mut WorkingSet<::Storage>, - ) -> sov_bank::query::BalanceResponse { + ) -> sov_bank::BalanceResponse { self.bank.balance_of( user_address, self.sequencer_config.coins_to_lock.token_address.clone(), From f6f87ae10c8d7a4bdbe6fe2383f986dfb26e76d5 Mon Sep 17 00:00:00 2001 From: bkolad Date: Fri, 21 Jul 2023 11:22:49 +0200 Subject: [PATCH 07/11] sov-prover-incentives --- .../sov-prover-incentives/src/lib.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/module-system/module-implementations/sov-prover-incentives/src/lib.rs b/module-system/module-implementations/sov-prover-incentives/src/lib.rs index ba05f8599..92fc4a587 100644 --- a/module-system/module-implementations/sov-prover-incentives/src/lib.rs +++ b/module-system/module-implementations/sov-prover-incentives/src/lib.rs @@ -1,13 +1,15 @@ -pub mod call; -pub mod genesis; +mod call; +mod genesis; #[cfg(test)] mod tests; #[cfg(feature = "native")] -pub mod query; +mod query; use borsh::{BorshDeserialize, BorshSerialize}; +pub use call::CallMessage; +pub use query::Response; use sov_modules_api::{Context, Error}; use sov_modules_macros::ModuleInfo; use sov_rollup_interface::zk::Zkvm; From d231e3326b3b0e6f353bd87d0f6d0437e0cf5791 Mon Sep 17 00:00:00 2001 From: bkolad Date: Fri, 21 Jul 2023 11:28:33 +0200 Subject: [PATCH 08/11] registry --- examples/demo-stf/src/runtime.rs | 2 +- .../sov-sequencer-registry/src/lib.rs | 10 ++++++---- .../tests/sequencer_registry_test.rs | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/demo-stf/src/runtime.rs b/examples/demo-stf/src/runtime.rs index a015c83b9..cbaf57aef 100644 --- a/examples/demo-stf/src/runtime.rs +++ b/examples/demo-stf/src/runtime.rs @@ -14,7 +14,7 @@ use sov_modules_api::Context; use sov_modules_macros::{cli_parser, expose_rpc}; use sov_modules_macros::{DefaultRuntime, DispatchCall, Genesis, MessageCodec}; #[cfg(feature = "native")] -use sov_sequencer_registry::query::{SequencerRegistryRpcImpl, SequencerRegistryRpcServer}; +use sov_sequencer_registry::{SequencerRegistryRpcImpl, SequencerRegistryRpcServer}; #[cfg(feature = "native")] use sov_value_setter::{ValueSetterRpcImpl, ValueSetterRpcServer}; diff --git a/module-system/module-implementations/sov-sequencer-registry/src/lib.rs b/module-system/module-implementations/sov-sequencer-registry/src/lib.rs index 0e50b58a8..d9eb9fff0 100644 --- a/module-system/module-implementations/sov-sequencer-registry/src/lib.rs +++ b/module-system/module-implementations/sov-sequencer-registry/src/lib.rs @@ -1,9 +1,11 @@ -pub mod call; -pub mod genesis; -pub mod hooks; +mod call; +mod genesis; +mod hooks; #[cfg(feature = "native")] -pub mod query; +mod query; +pub use call::CallMessage; +pub use query::{SequencerAddressResponse, SequencerRegistryRpcImpl, SequencerRegistryRpcServer}; use sov_modules_api::{CallResponse, Error, Spec}; use sov_modules_macros::ModuleInfo; use sov_state::{StateMap, StateValue, WorkingSet}; diff --git a/module-system/module-implementations/sov-sequencer-registry/tests/sequencer_registry_test.rs b/module-system/module-implementations/sov-sequencer-registry/tests/sequencer_registry_test.rs index aae19fca4..e72804a51 100644 --- a/module-system/module-implementations/sov-sequencer-registry/tests/sequencer_registry_test.rs +++ b/module-system/module-implementations/sov-sequencer-registry/tests/sequencer_registry_test.rs @@ -1,5 +1,5 @@ use sov_modules_api::{Context, Error, Module, ModuleInfo}; -use sov_sequencer_registry::call::CallMessage; +use sov_sequencer_registry::CallMessage; use sov_state::{ProverStorage, WorkingSet}; mod helpers; From 8cfb16d179da4bb58d0fd15da08ccf1f71e54d06 Mon Sep 17 00:00:00 2001 From: bkolad Date: Fri, 21 Jul 2023 11:52:17 +0200 Subject: [PATCH 09/11] fix doc --- module-system/sov-modules-macros/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module-system/sov-modules-macros/src/lib.rs b/module-system/sov-modules-macros/src/lib.rs index df448a181..2495a06f8 100644 --- a/module-system/sov-modules-macros/src/lib.rs +++ b/module-system/sov-modules-macros/src/lib.rs @@ -108,7 +108,7 @@ pub fn dispatch_call(input: TokenStream) -> TokenStream { /// use sov_modules_api::default_context::ZkDefaultContext; /// use sov_modules_macros::{ModuleInfo, ModuleCallJsonSchema}; /// use sov_state::StateMap; -/// use sov_bank::call::CallMessage; +/// use sov_bank::CallMessage; /// /// #[derive(ModuleInfo, ModuleCallJsonSchema)] /// struct TestModule { From 37903b0c24a4b2c912e16839930c0a44cfa52783 Mon Sep 17 00:00:00 2001 From: bkolad Date: Fri, 21 Jul 2023 12:56:04 +0200 Subject: [PATCH 10/11] update readme --- examples/demo-nft-module/README.md | 6 +++--- module-system/RPC_WALKTHROUGH.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/demo-nft-module/README.md b/examples/demo-nft-module/README.md index 441030d06..f44b55efc 100644 --- a/examples/demo-nft-module/README.md +++ b/examples/demo-nft-module/README.md @@ -22,7 +22,7 @@ simplicity, each token represents only an ID and won't hold any metadata. ### Structure and dependencies The Sovereign SDK provides a [module-template](../../module-system/module-implementations/module-template/README.md), -which is boilerplate that can be customised to easily build modules. +which is boilerplate that can be customized to easily build modules. ``` @@ -377,8 +377,8 @@ sov-state = { git = "https://github.com/Sovereign-Labs/sovereign-sdk.git", branc Here is some boilerplate for NFT module integration tests: ```rust -use demo_nft_module::call::CallMessage; -use demo_nft_module::query::OwnerResponse; +use demo_nft_module::CallMessage; +use demo_nft_module::OwnerResponse; use demo_nft_module::{NonFungibleToken, NonFungibleTokenConfig}; use serde::de::DeserializeOwned; use sov_modules_api::default_context::DefaultContext; diff --git a/module-system/RPC_WALKTHROUGH.md b/module-system/RPC_WALKTHROUGH.md index 8c7190025..3b656e805 100644 --- a/module-system/RPC_WALKTHROUGH.md +++ b/module-system/RPC_WALKTHROUGH.md @@ -61,7 +61,7 @@ to enable RPC servers of the modules. ```rust // This code goes in your state transition function crate. For example demo-stf/runtime.rs -use sov_bank::query::{BankRpcImpl, BankRpcServer}; +use sov_bank::{BankRpcImpl, BankRpcServer}; #[cfg_attr( feature = "native", From f341f738a767041354bafbf0b8d8c04529b793b0 Mon Sep 17 00:00:00 2001 From: bkolad Date: Fri, 21 Jul 2023 13:39:37 +0200 Subject: [PATCH 11/11] fix cfg(native) --- examples/demo-prover/Cargo.lock | 8 +++++++- .../examples/sov-election/src/lib.rs | 1 + .../examples/sov-value-setter/src/lib.rs | 1 + .../module-implementations/module-template/src/lib.rs | 1 + .../module-implementations/sov-accounts/src/lib.rs | 1 + module-system/module-implementations/sov-bank/src/lib.rs | 1 + .../sov-prover-incentives/src/lib.rs | 1 + .../sov-sequencer-registry/src/lib.rs | 1 + 8 files changed, 14 insertions(+), 1 deletion(-) diff --git a/examples/demo-prover/Cargo.lock b/examples/demo-prover/Cargo.lock index fdb3e6f54..827e740ed 100644 --- a/examples/demo-prover/Cargo.lock +++ b/examples/demo-prover/Cargo.lock @@ -3081,6 +3081,7 @@ dependencies = [ "anyhow", "borsh", "jsonrpsee", + "schemars", "serde", "serde_json", "sov-modules-api", @@ -3150,7 +3151,9 @@ dependencies = [ "anyhow", "borsh", "jsonrpsee", + "schemars", "serde", + "serde_json", "sov-modules-api", "sov-modules-macros", "sov-state", @@ -3193,7 +3196,6 @@ dependencies = [ "proc-macro2", "quote", "schemars", - "sov-modules-api", "syn 1.0.109", ] @@ -3258,7 +3260,9 @@ dependencies = [ "anyhow", "borsh", "jsonrpsee", + "schemars", "serde", + "serde_json", "sov-bank", "sov-modules-api", "sov-modules-macros", @@ -3289,7 +3293,9 @@ dependencies = [ "anyhow", "borsh", "jsonrpsee", + "schemars", "serde", + "serde_json", "sov-modules-api", "sov-modules-macros", "sov-rollup-interface", diff --git a/module-system/module-implementations/examples/sov-election/src/lib.rs b/module-system/module-implementations/examples/sov-election/src/lib.rs index 6859e4acc..621a163cf 100644 --- a/module-system/module-implementations/examples/sov-election/src/lib.rs +++ b/module-system/module-implementations/examples/sov-election/src/lib.rs @@ -9,6 +9,7 @@ mod tests; mod types; pub use call::CallMessage; +#[cfg(feature = "native")] pub use query::{ElectionRpcImpl, ElectionRpcServer, GetNbOfVotesResponse, GetResultResponse}; use sov_modules_api::Error; use sov_modules_macros::ModuleInfo; diff --git a/module-system/module-implementations/examples/sov-value-setter/src/lib.rs b/module-system/module-implementations/examples/sov-value-setter/src/lib.rs index 6b03ff4cb..e114cc48e 100644 --- a/module-system/module-implementations/examples/sov-value-setter/src/lib.rs +++ b/module-system/module-implementations/examples/sov-value-setter/src/lib.rs @@ -8,6 +8,7 @@ mod tests; mod query; pub use call::CallMessage; +#[cfg(feature = "native")] pub use query::{Response, ValueSetterRpcImpl, ValueSetterRpcServer}; use sov_modules_api::Error; use sov_modules_macros::ModuleInfo; diff --git a/module-system/module-implementations/module-template/src/lib.rs b/module-system/module-implementations/module-template/src/lib.rs index 65a1b1d55..3d44697e5 100644 --- a/module-system/module-implementations/module-template/src/lib.rs +++ b/module-system/module-implementations/module-template/src/lib.rs @@ -8,6 +8,7 @@ mod tests; mod query; pub use call::CallMessage; +#[cfg(feature = "native")] pub use query::Response; use sov_modules_api::Error; use sov_modules_macros::ModuleInfo; diff --git a/module-system/module-implementations/sov-accounts/src/lib.rs b/module-system/module-implementations/sov-accounts/src/lib.rs index 74dc7991d..81a16c492 100644 --- a/module-system/module-implementations/sov-accounts/src/lib.rs +++ b/module-system/module-implementations/sov-accounts/src/lib.rs @@ -8,6 +8,7 @@ mod query; mod tests; pub use call::CallMessage; +#[cfg(feature = "native")] pub use query::{AccountsRpcImpl, AccountsRpcServer, Response}; use sov_modules_api::Error; use sov_modules_macros::ModuleInfo; diff --git a/module-system/module-implementations/sov-bank/src/lib.rs b/module-system/module-implementations/sov-bank/src/lib.rs index 8111a28cd..d4d1f0ce3 100644 --- a/module-system/module-implementations/sov-bank/src/lib.rs +++ b/module-system/module-implementations/sov-bank/src/lib.rs @@ -6,6 +6,7 @@ mod token; mod utils; pub use call::CallMessage; +#[cfg(feature = "native")] pub use query::{BalanceResponse, BankRpcImpl, BankRpcServer, TotalSupplyResponse}; use sov_modules_api::Error; use sov_modules_macros::ModuleInfo; diff --git a/module-system/module-implementations/sov-prover-incentives/src/lib.rs b/module-system/module-implementations/sov-prover-incentives/src/lib.rs index 92fc4a587..f55b2b867 100644 --- a/module-system/module-implementations/sov-prover-incentives/src/lib.rs +++ b/module-system/module-implementations/sov-prover-incentives/src/lib.rs @@ -9,6 +9,7 @@ mod query; use borsh::{BorshDeserialize, BorshSerialize}; pub use call::CallMessage; +#[cfg(feature = "native")] pub use query::Response; use sov_modules_api::{Context, Error}; use sov_modules_macros::ModuleInfo; diff --git a/module-system/module-implementations/sov-sequencer-registry/src/lib.rs b/module-system/module-implementations/sov-sequencer-registry/src/lib.rs index d9eb9fff0..7958860b1 100644 --- a/module-system/module-implementations/sov-sequencer-registry/src/lib.rs +++ b/module-system/module-implementations/sov-sequencer-registry/src/lib.rs @@ -5,6 +5,7 @@ mod hooks; mod query; pub use call::CallMessage; +#[cfg(feature = "native")] pub use query::{SequencerAddressResponse, SequencerRegistryRpcImpl, SequencerRegistryRpcServer}; use sov_modules_api::{CallResponse, Error, Spec}; use sov_modules_macros::ModuleInfo;