rename baseparamsbuilder to DefaultAdditionalParams

examples/examples/compose_extrinsic_offline.rs

@@ -21,7 +21,7 @@ use kitchensink_runtime::{BalancesCall, Runtime, RuntimeCall};
 use sp_keyring::AccountKeyring;
 use sp_runtime::{generic::Era, MultiAddress};
 use substrate_api_client::{
-	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, BaseExtrinsicParamsBuilder, GetHeader,
+	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, DefaultAdditionalParams, GetHeader,
 	SubmitAndWatch, XtStatus,
 };
 
@@ -45,7 +45,7 @@ async fn main() {
 	let last_finalized_header_hash = api.get_finalized_head().unwrap().unwrap();
 	let header = api.get_header(Some(last_finalized_header_hash)).unwrap().unwrap();
 	let period = 5;
-	let tx_params = BaseExtrinsicParamsBuilder::new()
+	let tx_params = DefaultAdditionalParams::new()
 		.era(Era::mortal(period, header.number.into()), last_finalized_header_hash)
 		.tip(0);
 

examples/examples/custom_nonce.rs

@@ -21,7 +21,7 @@ use kitchensink_runtime::{BalancesCall, Runtime, RuntimeCall};
 use sp_keyring::AccountKeyring;
 use sp_runtime::{generic::Era, MultiAddress};
 use substrate_api_client::{
-	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, BaseExtrinsicParamsBuilder, GetHeader,
+	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, DefaultAdditionalParams, GetHeader,
 	SubmitAndWatch, XtStatus,
 };
 
@@ -41,7 +41,7 @@ async fn main() {
 	let last_finalized_header_hash = api.get_finalized_head().unwrap().unwrap();
 	let header = api.get_header(Some(last_finalized_header_hash)).unwrap().unwrap();
 	let period = 5;
-	let tx_params = BaseExtrinsicParamsBuilder::new()
+	let tx_params = DefaultAdditionalParams::new()
 		.era(Era::mortal(period, header.number.into()), last_finalized_header_hash)
 		.tip(0);
 

primitives/src/extrinsic_params.rs

@@ -108,14 +108,14 @@ pub struct BaseExtrinsicParams<Tip, Index, Hash> {
 /// This builder allows you to provide the parameters that can be configured in order to
 /// construct a [`BaseExtrinsicParams`] value.
 #[derive(Decode, Encode, Copy, Clone, Eq, PartialEq, Debug)]
-pub struct BaseExtrinsicParamsBuilder<Tip, Hash> {
+pub struct DefaultAdditionalParams<Tip, Hash> {
 	era: Era,
 	mortality_checkpoint: Option<Hash>,
 	tip: Tip,
 }
 
-impl<Tip: Default, Hash> BaseExtrinsicParamsBuilder<Tip, Hash> {
-	/// Instantiate the default set of [`BaseExtrinsicParamsBuilder`]
+impl<Tip: Default, Hash> DefaultAdditionalParams<Tip, Hash> {
+	/// Instantiate the default set of [`DefaultAdditionalParams`]
 	pub fn new() -> Self {
 		Self::default()
 	}
@@ -139,7 +139,7 @@ impl<Tip: Default, Hash> BaseExtrinsicParamsBuilder<Tip, Hash> {
 	}
 }
 
-impl<Tip: Default, Hash> Default for BaseExtrinsicParamsBuilder<Tip, Hash> {
+impl<Tip: Default, Hash> Default for DefaultAdditionalParams<Tip, Hash> {
 	fn default() -> Self {
 		Self { era: Era::Immortal, mortality_checkpoint: None, tip: Tip::default() }
 	}
@@ -153,7 +153,7 @@ where
 	Hash: HashTrait + Encode + Copy,
 	DefaultSignedExtra<Tip, Index>: Encode,
 {
-	type AdditionalParams = BaseExtrinsicParamsBuilder<Tip, Hash>;
+	type AdditionalParams = DefaultAdditionalParams<Tip, Hash>;
 	type SignedExtra = DefaultSignedExtra<Tip, Index>;
 	type AdditionalSigned = DefaultAdditionalSigned<Hash>;
 

primitives/src/extrinsics.rs

@@ -144,7 +144,7 @@ fn encode_with_vec_prefix<T: Encode, F: Fn(&mut Vec<u8>)>(encoder: F) -> Vec<u8>
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use crate::{BaseExtrinsicParams, BaseExtrinsicParamsBuilder, ExtrinsicParams, PlainTip};
+	use crate::{BaseExtrinsicParams, DefaultAdditionalParams, ExtrinsicParams, PlainTip};
 	use sp_core::{Pair, H256 as Hash};
 	use sp_runtime::{generic::Era, testing::sr25519, MultiSignature};
 
@@ -155,7 +155,7 @@ mod tests {
 		let signature = pair.sign(msg);
 		let multi_sig = MultiSignature::from(signature);
 		let account: AccountId = pair.public().into();
-		let tx_params = BaseExtrinsicParamsBuilder::<PlainTip<u128>, Hash>::new()
+		let tx_params = DefaultAdditionalParams::<PlainTip<u128>, Hash>::new()
 			.era(Era::mortal(8, 0), Hash::from([0u8; 32]));
 
 		let default_extra = BaseExtrinsicParams::new(0, 0, 0u32, Hash::from([0u8; 32]), tx_params);

src/api/api_client.rs

@@ -265,7 +265,7 @@ where
 mod tests {
 	use super::*;
 	use crate::{
-		rpc::mocks::RpcClientMock, utils::ToHexString, BaseExtrinsicParamsBuilder,
+		rpc::mocks::RpcClientMock, utils::ToHexString, DefaultAdditionalParams,
 		PlainTipExtrinsicParams,
 	};
 	use kitchensink_runtime::Runtime;
@@ -299,7 +299,7 @@ mod tests {
 			create_mock_api(genesis_hash, runtime_version.clone(), metadata, Default::default());
 
 		// Information for Era for mortal transactions.
-		let builder = BaseExtrinsicParamsBuilder::new();
+		let builder = DefaultAdditionalParams::new();
 		api.set_extrinsic_params_builder(builder);
 
 		let nonce = 6;