, client: Arc, sync: Arc>, - subscriptions: SubscriptionTaskExecutor, + executor: SubscriptionTaskExecutor, overrides: Arc>, starting_block: u64, pubsub_notification_sinks: Arc>>, _marker: PhantomData, } +impl Clone for EthPubSub { + fn clone(&self) -> Self { + Self { + pool: self.pool.clone(), + client: self.client.clone(), + sync: self.sync.clone(), + executor: self.executor.clone(), + overrides: self.overrides.clone(), + starting_block: self.starting_block, + pubsub_notification_sinks: self.pubsub_notification_sinks.clone(), + _marker: PhantomData::, + } + } +} + impl EthPubSub where - C: HeaderBackend, + P: TransactionPool + 'static, + C: ProvideRuntimeApi, + C::Api: EthereumRuntimeRPCApi, + C: HeaderBackend + StorageProvider, + BE: Backend + 'static, { pub fn new( pool: Arc, client: Arc, sync: Arc>, - subscriptions: SubscriptionTaskExecutor, + executor: SubscriptionTaskExecutor, overrides: Arc>, pubsub_notification_sinks: Arc< EthereumBlockNotificationSinks>, >, ) -> Self { // Capture the best block as seen on initialization. Used for syncing subscriptions. - let starting_block = - UniqueSaturatedInto::::unique_saturated_into(client.info().best_number); + let best_number = client.info().best_number; + let starting_block = UniqueSaturatedInto::::unique_saturated_into(best_number); Self { pool, client, sync, - subscriptions, + executor, overrides, starting_block, pubsub_notification_sinks, _marker: PhantomData, } } -} -struct EthSubscriptionResult; -impl EthSubscriptionResult { - pub fn new_heads(block: EthereumBlock) -> PubSubResult { - PubSubResult::Header(Box::new(Rich { - inner: Header { - hash: Some(H256::from(keccak_256(&rlp::encode(&block.header)))), - parent_hash: block.header.parent_hash, - uncles_hash: block.header.ommers_hash, - author: block.header.beneficiary, - miner: Some(block.header.beneficiary), - state_root: block.header.state_root, - transactions_root: block.header.transactions_root, - receipts_root: block.header.receipts_root, - number: Some(block.header.number), - gas_used: block.header.gas_used, - gas_limit: block.header.gas_limit, - extra_data: Bytes(block.header.extra_data.clone()), - logs_bloom: block.header.logs_bloom, - timestamp: U256::from(block.header.timestamp), - difficulty: block.header.difficulty, - nonce: Some(block.header.nonce), - size: Some(U256::from(rlp::encode(&block.header).len() as u32)), - }, - extra_info: BTreeMap::new(), - })) + fn notify_header( + &self, + notification: EthereumBlockNotification, + ) -> future::Ready> { + let res = if notification.is_new_best { + let schema = fc_storage::onchain_storage_schema(&*self.client, notification.hash); + let handler = self + .overrides + .schemas + .get(&schema) + .unwrap_or(&self.overrides.fallback); + handler.current_block(notification.hash) + } else { + None + }; + future::ready(res.map(PubSubResult::header)) } - pub fn logs( - block: EthereumBlock, - receipts: Vec, + + fn notify_logs( + &self, + notification: EthereumBlockNotification, params: &FilteredParams, - ) -> Vec { - let block_hash = H256::from(keccak_256(&rlp::encode(&block.header))); - let mut logs: Vec = vec![]; - let mut log_index: u32 = 0; - for (receipt_index, receipt) in receipts.into_iter().enumerate() { - let receipt_logs = match receipt { - ethereum::ReceiptV3::Legacy(d) - | ethereum::ReceiptV3::EIP2930(d) - | ethereum::ReceiptV3::EIP1559(d) => d.logs, + ) -> future::Ready>> { + let res = if notification.is_new_best { + let substrate_hash = notification.hash; + + let schema = fc_storage::onchain_storage_schema(&*self.client, substrate_hash); + let handler = self + .overrides + .schemas + .get(&schema) + .unwrap_or(&self.overrides.fallback); + + let block = handler.current_block(substrate_hash); + let receipts = handler.current_receipts(substrate_hash); + + match (block, receipts) { + (Some(block), Some(receipts)) => Some((block, receipts)), + _ => None, + } + } else { + None + }; + future::ready(res.map(|(block, receipts)| PubSubResult::logs(block, receipts, params))) + } + + fn pending_transaction(&self, hash: &TxHash) -> future::Ready> { + let res = if let Some(xt) = self.pool.ready_transaction(hash) { + let best_block = self.client.info().best_hash; + + let api = self.client.runtime_api(); + + let api_version = if let Ok(Some(api_version)) = + api.api_version::>(best_block) + { + api_version + } else { + return future::ready(None); }; - let mut transaction_log_index: u32 = 0; - let transaction_hash: Option = if receipt_logs.len() > 0 { - Some(block.transactions[receipt_index].hash()) + + let xts = vec![xt.data().clone()]; + + let txs: Option> = if api_version > 1 { + api.extrinsic_filter(best_block, xts).ok() } else { - None + #[allow(deprecated)] + if let Ok(legacy) = api.extrinsic_filter_before_version_2(best_block, xts) { + Some(legacy.into_iter().map(|tx| tx.into()).collect()) + } else { + None + } }; - for log in receipt_logs { - if Self::add_log(block_hash, &log, &block, params) { - logs.push(Log { - address: log.address, - topics: log.topics, - data: Bytes(log.data), - block_hash: Some(block_hash), - block_number: Some(block.header.number), - transaction_hash, - transaction_index: Some(U256::from(receipt_index)), - log_index: Some(U256::from(log_index)), - transaction_log_index: Some(U256::from(transaction_log_index)), - removed: false, - }); + + match txs { + Some(txs) => { + if txs.len() == 1 { + Some(txs[0].clone()) + } else { + None + } } - log_index += 1; - transaction_log_index += 1; + _ => None, } - } - logs - } - fn add_log( - block_hash: H256, - ethereum_log: ðereum::Log, - block: &EthereumBlock, - params: &FilteredParams, - ) -> bool { - let log = Log { - address: ethereum_log.address, - topics: ethereum_log.topics.clone(), - data: Bytes(ethereum_log.data.clone()), - block_hash: None, - block_number: None, - transaction_hash: None, - transaction_index: None, - log_index: None, - transaction_log_index: None, - removed: false, + } else { + None }; - if params.filter.is_some() { - let block_number = - UniqueSaturatedInto::::unique_saturated_into(block.header.number); - if !params.filter_block_range(block_number) - || !params.filter_block_hash(block_hash) - || !params.filter_address(&log) - || !params.filter_topics(&log) - { - return false; - } + future::ready(res.map(|tx| PubSubResult::transaction_hash(&tx))) + } + + async fn syncing_status(&self) -> PubSubSyncing { + if self.sync.is_major_syncing() { + // Best imported block. + let current_number = self.client.info().best_number; + // Get the target block to sync. + let highest_number = self.sync.best_seen_block().await.ok().flatten(); + + PubSubSyncing::Syncing(SyncingStatus { + starting_block: self.starting_block, + current_block: UniqueSaturatedInto::::unique_saturated_into(current_number), + highest_block: highest_number + .map(UniqueSaturatedInto::::unique_saturated_into), + }) + } else { + PubSubSyncing::Synced(false) } - true } } @@ -208,198 +234,64 @@ where C: HeaderBackend + StorageProvider, BE: Backend + 'static, { - fn subscribe( - &self, - mut sink: SubscriptionSink, - kind: Kind, - params: Option, - ) -> SubscriptionResult { - sink.accept()?; - + fn subscribe(&self, pending: PendingSubscriptionSink, kind: Kind, params: Option) { let filtered_params = match params { Some(Params::Logs(filter)) => FilteredParams::new(Some(filter)), _ => FilteredParams::default(), }; - let client = self.client.clone(); + let pubsub = self.clone(); // Everytime a new subscription is created, a new mpsc channel is added to the sink pool. let (inner_sink, block_notification_stream) = sc_utils::mpsc::tracing_unbounded("pubsub_notification_stream", 100_000); self.pubsub_notification_sinks.lock().push(inner_sink); - let pool = self.pool.clone(); - let sync = self.sync.clone(); - let overrides = self.overrides.clone(); - let starting_block = self.starting_block; + let fut = async move { match kind { - Kind::Logs => { + Kind::NewHeads => { let stream = block_notification_stream - .filter_map(move |notification| { - if notification.is_new_best { - let substrate_hash = notification.hash; - - let schema = fc_storage::onchain_storage_schema( - client.as_ref(), - substrate_hash, - ); - let handler = overrides - .schemas - .get(&schema) - .unwrap_or(&overrides.fallback); - - let block = handler.current_block(substrate_hash); - let receipts = handler.current_receipts(substrate_hash); - - match (receipts, block) { - (Some(receipts), Some(block)) => { - futures::future::ready(Some((block, receipts))) - } - _ => futures::future::ready(None), - } - } else { - futures::future::ready(None) - } - }) - .flat_map(move |(block, receipts)| { - futures::stream::iter(EthSubscriptionResult::logs( - block, - receipts, - &filtered_params, - )) - }) - .map(|x| PubSubResult::Log(Box::new(x))); - sink.pipe_from_stream(stream).await; + .filter_map(move |notification| pubsub.notify_header(notification)); + pipe_from_stream(pending, stream).await } - Kind::NewHeads => { + Kind::Logs => { let stream = block_notification_stream .filter_map(move |notification| { - if notification.is_new_best { - let schema = fc_storage::onchain_storage_schema( - client.as_ref(), - notification.hash, - ); - let handler = overrides - .schemas - .get(&schema) - .unwrap_or(&overrides.fallback); - - let block = handler.current_block(notification.hash); - futures::future::ready(block) - } else { - futures::future::ready(None) - } + pubsub.notify_logs(notification, &filtered_params) }) - .map(EthSubscriptionResult::new_heads); - sink.pipe_from_stream(stream).await; + .flat_map(futures::stream::iter); + pipe_from_stream(pending, stream).await } Kind::NewPendingTransactions => { - use sc_transaction_pool_api::InPoolTransaction; - + let pool = pubsub.pool.clone(); let stream = pool .import_notification_stream() - .filter_map(move |txhash| { - if let Some(xt) = pool.ready_transaction(&txhash) { - let best_block = client.info().best_hash; - - let api = client.runtime_api(); - - let api_version = if let Ok(Some(api_version)) = - api.api_version::>(best_block) - { - api_version - } else { - return futures::future::ready(None); - }; - - let xts = vec![xt.data().clone()]; - - let txs: Option> = if api_version > 1 { - api.extrinsic_filter(best_block, xts).ok() - } else { - #[allow(deprecated)] - if let Ok(legacy) = - api.extrinsic_filter_before_version_2(best_block, xts) - { - Some(legacy.into_iter().map(|tx| tx.into()).collect()) - } else { - None - } - }; - - let res = match txs { - Some(txs) => { - if txs.len() == 1 { - Some(txs[0].clone()) - } else { - None - } - } - _ => None, - }; - futures::future::ready(res) - } else { - futures::future::ready(None) - } - }) - .map(|transaction| PubSubResult::TransactionHash(transaction.hash())); - sink.pipe_from_stream(stream).await; + .filter_map(move |hash| pubsub.pending_transaction(&hash)); + pipe_from_stream(pending, stream).await; } Kind::Syncing => { - let client = Arc::clone(&client); - let sync = Arc::clone(&sync); - // Gets the node syncing status. - // The response is expected to be serialized either as a plain boolean - // if the node is not syncing, or a structure containing syncing metadata - // in case it is. - async fn status, B: BlockT>( - client: Arc, - sync: Arc>, - starting_block: u64, - ) -> PubSubSyncStatus { - if sync.is_major_syncing() { - // Get the target block to sync. - // This value is only exposed through substrate async Api - // in the `NetworkService`. - let highest_block = sync - .status() - .await - .ok() - .and_then(|res| res.best_seen_block) - .map(UniqueSaturatedInto::::unique_saturated_into); - // Best imported block. - let current_block = UniqueSaturatedInto::::unique_saturated_into( - client.info().best_number, - ); - - PubSubSyncStatus::Detailed(SyncStatusMetadata { - syncing: true, - starting_block, - current_block, - highest_block, - }) - } else { - PubSubSyncStatus::Simple(false) - } - } + let Ok(sink) = pending.accept().await else { + return; + }; // On connection subscriber expects a value. // Because import notifications are only emitted when the node is synced or // in case of reorg, the first event is emitted right away. - let _ = sink.send(&PubSubResult::SyncState( - status(Arc::clone(&client), Arc::clone(&sync), starting_block).await, - )); + let syncing_status = pubsub.syncing_status().await; + let msg = to_sub_message(&sink, &PubSubResult::SyncingStatus(syncing_status)); + let _ = sink.send(msg).await; // When the node is not under a major syncing (i.e. from genesis), react // normally to import notifications. // // Only send new notifications down the pipe when the syncing status changed. - let mut stream = client.clone().import_notification_stream(); - let mut last_syncing_status = sync.is_major_syncing(); + let mut stream = pubsub.client.import_notification_stream(); + let mut last_syncing_status = pubsub.sync.is_major_syncing(); while (stream.next().await).is_some() { - let syncing_status = sync.is_major_syncing(); + let syncing_status = pubsub.sync.is_major_syncing(); if syncing_status != last_syncing_status { - let _ = sink.send(&PubSubResult::SyncState( - status(client.clone(), sync.clone(), starting_block).await, - )); + let syncing_status = pubsub.syncing_status().await; + let msg = + to_sub_message(&sink, &PubSubResult::SyncingStatus(syncing_status)); + let _ = sink.send(msg).await; } last_syncing_status = syncing_status; } @@ -407,11 +299,8 @@ where } } .boxed(); - self.subscriptions.spawn( - "frontier-rpc-subscription", - Some("rpc"), - fut.map(drop).boxed(), - ); - Ok(()) + + self.executor + .spawn("frontier-rpc-subscription", Some("rpc"), fut); } } diff --git a/client/rpc/src/lib.rs b/client/rpc/src/lib.rs index 7942c9dd3d..afc7df5c56 100644 --- a/client/rpc/src/lib.rs +++ b/client/rpc/src/lib.rs @@ -287,24 +287,29 @@ pub mod frontier_backend_client { } } -pub fn err(code: i32, message: T, data: Option<&[u8]>) -> jsonrpsee::core::Error { - jsonrpsee::core::Error::Call(jsonrpsee::types::error::CallError::Custom( - jsonrpsee::types::error::ErrorObject::owned( - code, - message.to_string(), - data.map(|bytes| { - jsonrpsee::core::to_json_raw_value(&format!("0x{}", hex::encode(bytes))) - .expect("fail to serialize data") - }), - ), - )) +pub fn err( + code: i32, + message: T, + data: Option<&[u8]>, +) -> jsonrpsee::types::error::ErrorObjectOwned { + jsonrpsee::types::error::ErrorObject::owned( + code, + message.to_string(), + data.map(|bytes| { + jsonrpsee::core::to_json_raw_value(&format!("0x{}", hex::encode(bytes))) + .expect("fail to serialize data") + }), + ) } -pub fn internal_err(message: T) -> jsonrpsee::core::Error { +pub fn internal_err(message: T) -> jsonrpsee::types::error::ErrorObjectOwned { err(jsonrpsee::types::error::INTERNAL_ERROR_CODE, message, None) } -pub fn internal_err_with_data(message: T, data: &[u8]) -> jsonrpsee::core::Error { +pub fn internal_err_with_data( + message: T, + data: &[u8], +) -> jsonrpsee::types::error::ErrorObjectOwned { err( jsonrpsee::types::error::INTERNAL_ERROR_CODE, message, diff --git a/client/rpc/src/signer.rs b/client/rpc/src/signer.rs index c1c90fb4a0..cf3ddae099 100644 --- a/client/rpc/src/signer.rs +++ b/client/rpc/src/signer.rs @@ -18,7 +18,7 @@ use ethereum::TransactionV2 as EthereumTransaction; use ethereum_types::{H160, H256}; -use jsonrpsee::core::Error; +use jsonrpsee::types::ErrorObjectOwned; // Substrate use sp_core::hashing::keccak_256; // Frontier @@ -35,7 +35,7 @@ pub trait EthSigner: Send + Sync { &self, message: TransactionMessage, address: &H160, - ) -> Result; + ) -> Result; } pub struct EthDevSigner { @@ -75,7 +75,7 @@ impl EthSigner for EthDevSigner { &self, message: TransactionMessage, address: &H160, - ) -> Result { + ) -> Result { let mut transaction = None; for secret in &self.keys { diff --git a/docs/yarn.lock b/docs/yarn.lock index 09110ddd21..16a4534c44 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -3894,9 +3894,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.14.8" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" - integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== + version "1.15.4" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" + integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== for-in@^1.0.2: version "1.0.2" @@ -4578,9 +4578,9 @@ ip-regex@^2.1.0: integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= ip@^1.1.0, ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + version "1.1.9" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396" + integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ== ipaddr.js@1.9.1, ipaddr.js@^1.9.0: version "1.9.1" diff --git a/frame/ethereum/src/mock.rs b/frame/ethereum/src/mock.rs index 3734bc42de..814d5e9551 100644 --- a/frame/ethereum/src/mock.rs +++ b/frame/ethereum/src/mock.rs @@ -101,7 +101,6 @@ impl pallet_balances::Config for Test { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; - type MaxHolds = ConstU32<5>; type MaxFreezes = ConstU32<1>; } diff --git a/frame/evm/precompile/dispatch/src/mock.rs b/frame/evm/precompile/dispatch/src/mock.rs index fb90ce6a08..01a66d779d 100644 --- a/frame/evm/precompile/dispatch/src/mock.rs +++ b/frame/evm/precompile/dispatch/src/mock.rs @@ -98,7 +98,6 @@ impl pallet_balances::Config for Test { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = (); type MaxReserves = (); - type MaxHolds = (); type MaxFreezes = (); } diff --git a/frame/evm/src/mock.rs b/frame/evm/src/mock.rs index 33c7e22154..1249f62620 100644 --- a/frame/evm/src/mock.rs +++ b/frame/evm/src/mock.rs @@ -91,7 +91,6 @@ impl pallet_balances::Config for Test { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = (); type MaxReserves = (); - type MaxHolds = (); type MaxFreezes = (); } diff --git a/precompiles/src/solidity/codec/xcm.rs b/precompiles/src/solidity/codec/xcm.rs index 9e387aa9c8..e3cdc2ca0d 100644 --- a/precompiles/src/solidity/codec/xcm.rs +++ b/precompiles/src/solidity/codec/xcm.rs @@ -25,7 +25,7 @@ use frame_support::{ensure, traits::ConstU32}; use sp_core::H256; use sp_std::vec::Vec; use sp_weights::Weight; -use xcm::latest::{Junction, Junctions, MultiLocation, NetworkId}; +use xcm::latest::{Junction, Junctions, Location, NetworkId}; use crate::solidity::{ codec::{bytes::*, Codec, Reader, Writer}, @@ -358,12 +358,12 @@ impl Codec for Junctions { } // Cannot used derive macro since it is a foreign struct. -impl Codec for MultiLocation { +impl Codec for Location { fn read(reader: &mut Reader) -> MayRevert { let (parents, interior) = reader .read() .map_in_tuple_to_field(&["parents", "interior"])?; - Ok(MultiLocation { parents, interior }) + Ok(Location { parents, interior }) } fn write(writer: &mut Writer, value: Self) { diff --git a/precompiles/tests-external/lib.rs b/precompiles/tests-external/lib.rs index 471f535075..42a7682f91 100644 --- a/precompiles/tests-external/lib.rs +++ b/precompiles/tests-external/lib.rs @@ -101,7 +101,6 @@ impl pallet_balances::Config for Runtime { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = (); type MaxReserves = (); - type MaxHolds = (); type MaxFreezes = (); } diff --git a/primitives/account/src/lib.rs b/primitives/account/src/lib.rs index fe6906f99c..ee05acec9e 100644 --- a/primitives/account/src/lib.rs +++ b/primitives/account/src/lib.rs @@ -20,8 +20,9 @@ use scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; // Substrate -use sp_core::{ecdsa, RuntimeDebug, H160, H256}; +use sp_core::{crypto::AccountId32, ecdsa, RuntimeDebug, H160, H256}; use sp_io::hashing::keccak_256; +use sp_runtime::MultiSignature; use sp_runtime_interface::pass_by::PassByInner; /// A fully Ethereum-compatible `AccountId`. @@ -159,6 +160,13 @@ impl From<[u8; 32]> for AccountId20 { } } +impl From for AccountId20 { + fn from(account: AccountId32) -> Self { + let bytes: &[u8; 32] = account.as_ref(); + Self::from(*bytes) + } +} + #[derive(Eq, PartialEq, Clone, RuntimeDebug, Encode, Decode, TypeInfo)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct EthereumSignature(ecdsa::Signature); @@ -185,9 +193,23 @@ impl sp_runtime::traits::Verify for EthereumSignature { } } +impl From for EthereumSignature { + fn from(signature: MultiSignature) -> Self { + match signature { + MultiSignature::Ed25519(_) => { + panic!("Ed25519 not supported for EthereumSignature") + } + MultiSignature::Sr25519(_) => { + panic!("Sr25519 not supported for EthereumSignature") + } + MultiSignature::Ecdsa(sig) => Self(sig), + } + } +} + impl EthereumSignature { pub fn new(s: ecdsa::Signature) -> Self { - EthereumSignature(s) + Self(s) } } diff --git a/template/examples/contract-erc20/truffle/package-lock.json b/template/examples/contract-erc20/truffle/package-lock.json index dfc6eee70d..12a0c47f41 100644 --- a/template/examples/contract-erc20/truffle/package-lock.json +++ b/template/examples/contract-erc20/truffle/package-lock.json @@ -1467,9 +1467,9 @@ } }, "apollo-server-core": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.12.0.tgz", - "integrity": "sha512-hq7iH6Cgldgmnjs9FVSZeKWRpi0/ZR+iJ1arzeD2VXGxxgk1mAm/cz1Tx0TYgegZI+FvvrRl0UhKEx7sLnIxIg==", + "version": "3.12.1", + "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.12.1.tgz", + "integrity": "sha512-9SF5WAkkV0FZQ2HVUWI9Jada1U0jg7e8NCN9EklbtvaCeUlOLyXyM+KCWuZ7+dqHxjshbtcwylPHutt3uzoNkw==", "optional": true, "requires": { "@apollo/utils.keyvaluecache": "^1.0.1", @@ -1498,9 +1498,9 @@ }, "dependencies": { "uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", "optional": true } } @@ -3034,9 +3034,9 @@ "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==" }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "optional": true }, "for-each": { diff --git a/template/node/src/service.rs b/template/node/src/service.rs index 611f10e2c4..c6c856f931 100644 --- a/template/node/src/service.rs +++ b/template/node/src/service.rs @@ -8,7 +8,7 @@ use prometheus_endpoint::Registry; use sc_client_api::{Backend, BlockBackend}; use sc_consensus::BasicQueue; use sc_executor::NativeExecutionDispatch; -use sc_network_sync::warp::{WarpSyncParams, WarpSyncProvider}; +use sc_network_sync::strategy::warp::{WarpSyncParams, WarpSyncProvider}; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker}; use sc_transaction_pool_api::OffchainTransactionPoolFactory; diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs index 7b10f60b05..9684ebf008 100644 --- a/template/runtime/src/lib.rs +++ b/template/runtime/src/lib.rs @@ -280,7 +280,6 @@ impl pallet_balances::Config for Runtime { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; - type MaxHolds = ConstU32<5>; type MaxFreezes = ConstU32<1>; } diff --git a/ts-tests/package-lock.json b/ts-tests/package-lock.json index 784f259142..83763f549e 100644 --- a/ts-tests/package-lock.json +++ b/ts-tests/package-lock.json @@ -4310,9 +4310,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "funding": [ { "type": "individual", @@ -13310,9 +13310,9 @@ } }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "optional": true }, "for-each": { diff --git a/ts-tests/tests/test-execute.ts b/ts-tests/tests/test-execute.ts index aef7adf3a9..afbf731588 100644 --- a/ts-tests/tests/test-execute.ts +++ b/ts-tests/tests/test-execute.ts @@ -261,6 +261,6 @@ describeWithFrontier("Frontier RPC (RPC execution)", (context) => { input: "0x12345678", }, ]); - expect((result as any).error.message).to.match(/^Ambiguous value for `data` and `input`/); + expect(result.error.data).to.match(/^Ambiguous value for `data` and `input`/); }); });
, client: Arc, sync: Arc>, - subscriptions: SubscriptionTaskExecutor, + executor: SubscriptionTaskExecutor, overrides: Arc>, pubsub_notification_sinks: Arc< EthereumBlockNotificationSinks>, >, ) -> Self { // Capture the best block as seen on initialization. Used for syncing subscriptions. - let starting_block = - UniqueSaturatedInto::::unique_saturated_into(client.info().best_number); + let best_number = client.info().best_number; + let starting_block = UniqueSaturatedInto::::unique_saturated_into(best_number); Self { pool, client, sync, - subscriptions, + executor, overrides, starting_block, pubsub_notification_sinks, _marker: PhantomData, } } -} -struct EthSubscriptionResult; -impl EthSubscriptionResult { - pub fn new_heads(block: EthereumBlock) -> PubSubResult { - PubSubResult::Header(Box::new(Rich { - inner: Header { - hash: Some(H256::from(keccak_256(&rlp::encode(&block.header)))), - parent_hash: block.header.parent_hash, - uncles_hash: block.header.ommers_hash, - author: block.header.beneficiary, - miner: Some(block.header.beneficiary), - state_root: block.header.state_root, - transactions_root: block.header.transactions_root, - receipts_root: block.header.receipts_root, - number: Some(block.header.number), - gas_used: block.header.gas_used, - gas_limit: block.header.gas_limit, - extra_data: Bytes(block.header.extra_data.clone()), - logs_bloom: block.header.logs_bloom, - timestamp: U256::from(block.header.timestamp), - difficulty: block.header.difficulty, - nonce: Some(block.header.nonce), - size: Some(U256::from(rlp::encode(&block.header).len() as u32)), - }, - extra_info: BTreeMap::new(), - })) + fn notify_header( + &self, + notification: EthereumBlockNotification, + ) -> future::Ready> { + let res = if notification.is_new_best { + let schema = fc_storage::onchain_storage_schema(&*self.client, notification.hash); + let handler = self + .overrides + .schemas + .get(&schema) + .unwrap_or(&self.overrides.fallback); + handler.current_block(notification.hash) + } else { + None + }; + future::ready(res.map(PubSubResult::header)) } - pub fn logs( - block: EthereumBlock, - receipts: Vec, + + fn notify_logs( + &self, + notification: EthereumBlockNotification, params: &FilteredParams, - ) -> Vec { - let block_hash = H256::from(keccak_256(&rlp::encode(&block.header))); - let mut logs: Vec = vec![]; - let mut log_index: u32 = 0; - for (receipt_index, receipt) in receipts.into_iter().enumerate() { - let receipt_logs = match receipt { - ethereum::ReceiptV3::Legacy(d) - | ethereum::ReceiptV3::EIP2930(d) - | ethereum::ReceiptV3::EIP1559(d) => d.logs, + ) -> future::Ready>> { + let res = if notification.is_new_best { + let substrate_hash = notification.hash; + + let schema = fc_storage::onchain_storage_schema(&*self.client, substrate_hash); + let handler = self + .overrides + .schemas + .get(&schema) + .unwrap_or(&self.overrides.fallback); + + let block = handler.current_block(substrate_hash); + let receipts = handler.current_receipts(substrate_hash); + + match (block, receipts) { + (Some(block), Some(receipts)) => Some((block, receipts)), + _ => None, + } + } else { + None + }; + future::ready(res.map(|(block, receipts)| PubSubResult::logs(block, receipts, params))) + } + + fn pending_transaction(&self, hash: &TxHash) -> future::Ready> { + let res = if let Some(xt) = self.pool.ready_transaction(hash) { + let best_block = self.client.info().best_hash; + + let api = self.client.runtime_api(); + + let api_version = if let Ok(Some(api_version)) = + api.api_version::>(best_block) + { + api_version + } else { + return future::ready(None); }; - let mut transaction_log_index: u32 = 0; - let transaction_hash: Option = if receipt_logs.len() > 0 { - Some(block.transactions[receipt_index].hash()) + + let xts = vec![xt.data().clone()]; + + let txs: Option> = if api_version > 1 { + api.extrinsic_filter(best_block, xts).ok() } else { - None + #[allow(deprecated)] + if let Ok(legacy) = api.extrinsic_filter_before_version_2(best_block, xts) { + Some(legacy.into_iter().map(|tx| tx.into()).collect()) + } else { + None + } }; - for log in receipt_logs { - if Self::add_log(block_hash, &log, &block, params) { - logs.push(Log { - address: log.address, - topics: log.topics, - data: Bytes(log.data), - block_hash: Some(block_hash), - block_number: Some(block.header.number), - transaction_hash, - transaction_index: Some(U256::from(receipt_index)), - log_index: Some(U256::from(log_index)), - transaction_log_index: Some(U256::from(transaction_log_index)), - removed: false, - }); + + match txs { + Some(txs) => { + if txs.len() == 1 { + Some(txs[0].clone()) + } else { + None + } } - log_index += 1; - transaction_log_index += 1; + _ => None, } - } - logs - } - fn add_log( - block_hash: H256, - ethereum_log: ðereum::Log, - block: &EthereumBlock, - params: &FilteredParams, - ) -> bool { - let log = Log { - address: ethereum_log.address, - topics: ethereum_log.topics.clone(), - data: Bytes(ethereum_log.data.clone()), - block_hash: None, - block_number: None, - transaction_hash: None, - transaction_index: None, - log_index: None, - transaction_log_index: None, - removed: false, + } else { + None }; - if params.filter.is_some() { - let block_number = - UniqueSaturatedInto::::unique_saturated_into(block.header.number); - if !params.filter_block_range(block_number) - || !params.filter_block_hash(block_hash) - || !params.filter_address(&log) - || !params.filter_topics(&log) - { - return false; - } + future::ready(res.map(|tx| PubSubResult::transaction_hash(&tx))) + } + + async fn syncing_status(&self) -> PubSubSyncing { + if self.sync.is_major_syncing() { + // Best imported block. + let current_number = self.client.info().best_number; + // Get the target block to sync. + let highest_number = self.sync.best_seen_block().await.ok().flatten(); + + PubSubSyncing::Syncing(SyncingStatus { + starting_block: self.starting_block, + current_block: UniqueSaturatedInto::::unique_saturated_into(current_number), + highest_block: highest_number + .map(UniqueSaturatedInto::::unique_saturated_into), + }) + } else { + PubSubSyncing::Synced(false) } - true } } @@ -208,198 +234,64 @@ where C: HeaderBackend + StorageProvider, BE: Backend + 'static, { - fn subscribe( - &self, - mut sink: SubscriptionSink, - kind: Kind, - params: Option, - ) -> SubscriptionResult { - sink.accept()?; - + fn subscribe(&self, pending: PendingSubscriptionSink, kind: Kind, params: Option) { let filtered_params = match params { Some(Params::Logs(filter)) => FilteredParams::new(Some(filter)), _ => FilteredParams::default(), }; - let client = self.client.clone(); + let pubsub = self.clone(); // Everytime a new subscription is created, a new mpsc channel is added to the sink pool. let (inner_sink, block_notification_stream) = sc_utils::mpsc::tracing_unbounded("pubsub_notification_stream", 100_000); self.pubsub_notification_sinks.lock().push(inner_sink); - let pool = self.pool.clone(); - let sync = self.sync.clone(); - let overrides = self.overrides.clone(); - let starting_block = self.starting_block; + let fut = async move { match kind { - Kind::Logs => { + Kind::NewHeads => { let stream = block_notification_stream - .filter_map(move |notification| { - if notification.is_new_best { - let substrate_hash = notification.hash; - - let schema = fc_storage::onchain_storage_schema( - client.as_ref(), - substrate_hash, - ); - let handler = overrides - .schemas - .get(&schema) - .unwrap_or(&overrides.fallback); - - let block = handler.current_block(substrate_hash); - let receipts = handler.current_receipts(substrate_hash); - - match (receipts, block) { - (Some(receipts), Some(block)) => { - futures::future::ready(Some((block, receipts))) - } - _ => futures::future::ready(None), - } - } else { - futures::future::ready(None) - } - }) - .flat_map(move |(block, receipts)| { - futures::stream::iter(EthSubscriptionResult::logs( - block, - receipts, - &filtered_params, - )) - }) - .map(|x| PubSubResult::Log(Box::new(x))); - sink.pipe_from_stream(stream).await; + .filter_map(move |notification| pubsub.notify_header(notification)); + pipe_from_stream(pending, stream).await } - Kind::NewHeads => { + Kind::Logs => { let stream = block_notification_stream .filter_map(move |notification| { - if notification.is_new_best { - let schema = fc_storage::onchain_storage_schema( - client.as_ref(), - notification.hash, - ); - let handler = overrides - .schemas - .get(&schema) - .unwrap_or(&overrides.fallback); - - let block = handler.current_block(notification.hash); - futures::future::ready(block) - } else { - futures::future::ready(None) - } + pubsub.notify_logs(notification, &filtered_params) }) - .map(EthSubscriptionResult::new_heads); - sink.pipe_from_stream(stream).await; + .flat_map(futures::stream::iter); + pipe_from_stream(pending, stream).await } Kind::NewPendingTransactions => { - use sc_transaction_pool_api::InPoolTransaction; - + let pool = pubsub.pool.clone(); let stream = pool .import_notification_stream() - .filter_map(move |txhash| { - if let Some(xt) = pool.ready_transaction(&txhash) { - let best_block = client.info().best_hash; - - let api = client.runtime_api(); - - let api_version = if let Ok(Some(api_version)) = - api.api_version::>(best_block) - { - api_version - } else { - return futures::future::ready(None); - }; - - let xts = vec![xt.data().clone()]; - - let txs: Option> = if api_version > 1 { - api.extrinsic_filter(best_block, xts).ok() - } else { - #[allow(deprecated)] - if let Ok(legacy) = - api.extrinsic_filter_before_version_2(best_block, xts) - { - Some(legacy.into_iter().map(|tx| tx.into()).collect()) - } else { - None - } - }; - - let res = match txs { - Some(txs) => { - if txs.len() == 1 { - Some(txs[0].clone()) - } else { - None - } - } - _ => None, - }; - futures::future::ready(res) - } else { - futures::future::ready(None) - } - }) - .map(|transaction| PubSubResult::TransactionHash(transaction.hash())); - sink.pipe_from_stream(stream).await; + .filter_map(move |hash| pubsub.pending_transaction(&hash)); + pipe_from_stream(pending, stream).await; } Kind::Syncing => { - let client = Arc::clone(&client); - let sync = Arc::clone(&sync); - // Gets the node syncing status. - // The response is expected to be serialized either as a plain boolean - // if the node is not syncing, or a structure containing syncing metadata - // in case it is. - async fn status, B: BlockT>( - client: Arc, - sync: Arc>, - starting_block: u64, - ) -> PubSubSyncStatus { - if sync.is_major_syncing() { - // Get the target block to sync. - // This value is only exposed through substrate async Api - // in the `NetworkService`. - let highest_block = sync - .status() - .await - .ok() - .and_then(|res| res.best_seen_block) - .map(UniqueSaturatedInto::::unique_saturated_into); - // Best imported block. - let current_block = UniqueSaturatedInto::::unique_saturated_into( - client.info().best_number, - ); - - PubSubSyncStatus::Detailed(SyncStatusMetadata { - syncing: true, - starting_block, - current_block, - highest_block, - }) - } else { - PubSubSyncStatus::Simple(false) - } - } + let Ok(sink) = pending.accept().await else { + return; + }; // On connection subscriber expects a value. // Because import notifications are only emitted when the node is synced or // in case of reorg, the first event is emitted right away. - let _ = sink.send(&PubSubResult::SyncState( - status(Arc::clone(&client), Arc::clone(&sync), starting_block).await, - )); + let syncing_status = pubsub.syncing_status().await; + let msg = to_sub_message(&sink, &PubSubResult::SyncingStatus(syncing_status)); + let _ = sink.send(msg).await; // When the node is not under a major syncing (i.e. from genesis), react // normally to import notifications. // // Only send new notifications down the pipe when the syncing status changed. - let mut stream = client.clone().import_notification_stream(); - let mut last_syncing_status = sync.is_major_syncing(); + let mut stream = pubsub.client.import_notification_stream(); + let mut last_syncing_status = pubsub.sync.is_major_syncing(); while (stream.next().await).is_some() { - let syncing_status = sync.is_major_syncing(); + let syncing_status = pubsub.sync.is_major_syncing(); if syncing_status != last_syncing_status { - let _ = sink.send(&PubSubResult::SyncState( - status(client.clone(), sync.clone(), starting_block).await, - )); + let syncing_status = pubsub.syncing_status().await; + let msg = + to_sub_message(&sink, &PubSubResult::SyncingStatus(syncing_status)); + let _ = sink.send(msg).await; } last_syncing_status = syncing_status; } @@ -407,11 +299,8 @@ where } } .boxed(); - self.subscriptions.spawn( - "frontier-rpc-subscription", - Some("rpc"), - fut.map(drop).boxed(), - ); - Ok(()) + + self.executor + .spawn("frontier-rpc-subscription", Some("rpc"), fut); } } diff --git a/client/rpc/src/lib.rs b/client/rpc/src/lib.rs index 7942c9dd3d..afc7df5c56 100644 --- a/client/rpc/src/lib.rs +++ b/client/rpc/src/lib.rs @@ -287,24 +287,29 @@ pub mod frontier_backend_client { } } -pub fn err(code: i32, message: T, data: Option<&[u8]>) -> jsonrpsee::core::Error { - jsonrpsee::core::Error::Call(jsonrpsee::types::error::CallError::Custom( - jsonrpsee::types::error::ErrorObject::owned( - code, - message.to_string(), - data.map(|bytes| { - jsonrpsee::core::to_json_raw_value(&format!("0x{}", hex::encode(bytes))) - .expect("fail to serialize data") - }), - ), - )) +pub fn err( + code: i32, + message: T, + data: Option<&[u8]>, +) -> jsonrpsee::types::error::ErrorObjectOwned { + jsonrpsee::types::error::ErrorObject::owned( + code, + message.to_string(), + data.map(|bytes| { + jsonrpsee::core::to_json_raw_value(&format!("0x{}", hex::encode(bytes))) + .expect("fail to serialize data") + }), + ) } -pub fn internal_err(message: T) -> jsonrpsee::core::Error { +pub fn internal_err(message: T) -> jsonrpsee::types::error::ErrorObjectOwned { err(jsonrpsee::types::error::INTERNAL_ERROR_CODE, message, None) } -pub fn internal_err_with_data(message: T, data: &[u8]) -> jsonrpsee::core::Error { +pub fn internal_err_with_data( + message: T, + data: &[u8], +) -> jsonrpsee::types::error::ErrorObjectOwned { err( jsonrpsee::types::error::INTERNAL_ERROR_CODE, message, diff --git a/client/rpc/src/signer.rs b/client/rpc/src/signer.rs index c1c90fb4a0..cf3ddae099 100644 --- a/client/rpc/src/signer.rs +++ b/client/rpc/src/signer.rs @@ -18,7 +18,7 @@ use ethereum::TransactionV2 as EthereumTransaction; use ethereum_types::{H160, H256}; -use jsonrpsee::core::Error; +use jsonrpsee::types::ErrorObjectOwned; // Substrate use sp_core::hashing::keccak_256; // Frontier @@ -35,7 +35,7 @@ pub trait EthSigner: Send + Sync { &self, message: TransactionMessage, address: &H160, - ) -> Result; + ) -> Result; } pub struct EthDevSigner { @@ -75,7 +75,7 @@ impl EthSigner for EthDevSigner { &self, message: TransactionMessage, address: &H160, - ) -> Result { + ) -> Result { let mut transaction = None; for secret in &self.keys { diff --git a/docs/yarn.lock b/docs/yarn.lock index 09110ddd21..16a4534c44 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -3894,9 +3894,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.14.8" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" - integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== + version "1.15.4" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" + integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== for-in@^1.0.2: version "1.0.2" @@ -4578,9 +4578,9 @@ ip-regex@^2.1.0: integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= ip@^1.1.0, ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + version "1.1.9" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396" + integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ== ipaddr.js@1.9.1, ipaddr.js@^1.9.0: version "1.9.1" diff --git a/frame/ethereum/src/mock.rs b/frame/ethereum/src/mock.rs index 3734bc42de..814d5e9551 100644 --- a/frame/ethereum/src/mock.rs +++ b/frame/ethereum/src/mock.rs @@ -101,7 +101,6 @@ impl pallet_balances::Config for Test { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; - type MaxHolds = ConstU32<5>; type MaxFreezes = ConstU32<1>; } diff --git a/frame/evm/precompile/dispatch/src/mock.rs b/frame/evm/precompile/dispatch/src/mock.rs index fb90ce6a08..01a66d779d 100644 --- a/frame/evm/precompile/dispatch/src/mock.rs +++ b/frame/evm/precompile/dispatch/src/mock.rs @@ -98,7 +98,6 @@ impl pallet_balances::Config for Test { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = (); type MaxReserves = (); - type MaxHolds = (); type MaxFreezes = (); } diff --git a/frame/evm/src/mock.rs b/frame/evm/src/mock.rs index 33c7e22154..1249f62620 100644 --- a/frame/evm/src/mock.rs +++ b/frame/evm/src/mock.rs @@ -91,7 +91,6 @@ impl pallet_balances::Config for Test { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = (); type MaxReserves = (); - type MaxHolds = (); type MaxFreezes = (); } diff --git a/precompiles/src/solidity/codec/xcm.rs b/precompiles/src/solidity/codec/xcm.rs index 9e387aa9c8..e3cdc2ca0d 100644 --- a/precompiles/src/solidity/codec/xcm.rs +++ b/precompiles/src/solidity/codec/xcm.rs @@ -25,7 +25,7 @@ use frame_support::{ensure, traits::ConstU32}; use sp_core::H256; use sp_std::vec::Vec; use sp_weights::Weight; -use xcm::latest::{Junction, Junctions, MultiLocation, NetworkId}; +use xcm::latest::{Junction, Junctions, Location, NetworkId}; use crate::solidity::{ codec::{bytes::*, Codec, Reader, Writer}, @@ -358,12 +358,12 @@ impl Codec for Junctions { } // Cannot used derive macro since it is a foreign struct. -impl Codec for MultiLocation { +impl Codec for Location { fn read(reader: &mut Reader) -> MayRevert { let (parents, interior) = reader .read() .map_in_tuple_to_field(&["parents", "interior"])?; - Ok(MultiLocation { parents, interior }) + Ok(Location { parents, interior }) } fn write(writer: &mut Writer, value: Self) { diff --git a/precompiles/tests-external/lib.rs b/precompiles/tests-external/lib.rs index 471f535075..42a7682f91 100644 --- a/precompiles/tests-external/lib.rs +++ b/precompiles/tests-external/lib.rs @@ -101,7 +101,6 @@ impl pallet_balances::Config for Runtime { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = (); type MaxReserves = (); - type MaxHolds = (); type MaxFreezes = (); } diff --git a/primitives/account/src/lib.rs b/primitives/account/src/lib.rs index fe6906f99c..ee05acec9e 100644 --- a/primitives/account/src/lib.rs +++ b/primitives/account/src/lib.rs @@ -20,8 +20,9 @@ use scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; // Substrate -use sp_core::{ecdsa, RuntimeDebug, H160, H256}; +use sp_core::{crypto::AccountId32, ecdsa, RuntimeDebug, H160, H256}; use sp_io::hashing::keccak_256; +use sp_runtime::MultiSignature; use sp_runtime_interface::pass_by::PassByInner; /// A fully Ethereum-compatible `AccountId`. @@ -159,6 +160,13 @@ impl From<[u8; 32]> for AccountId20 { } } +impl From for AccountId20 { + fn from(account: AccountId32) -> Self { + let bytes: &[u8; 32] = account.as_ref(); + Self::from(*bytes) + } +} + #[derive(Eq, PartialEq, Clone, RuntimeDebug, Encode, Decode, TypeInfo)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct EthereumSignature(ecdsa::Signature); @@ -185,9 +193,23 @@ impl sp_runtime::traits::Verify for EthereumSignature { } } +impl From for EthereumSignature { + fn from(signature: MultiSignature) -> Self { + match signature { + MultiSignature::Ed25519(_) => { + panic!("Ed25519 not supported for EthereumSignature") + } + MultiSignature::Sr25519(_) => { + panic!("Sr25519 not supported for EthereumSignature") + } + MultiSignature::Ecdsa(sig) => Self(sig), + } + } +} + impl EthereumSignature { pub fn new(s: ecdsa::Signature) -> Self { - EthereumSignature(s) + Self(s) } } diff --git a/template/examples/contract-erc20/truffle/package-lock.json b/template/examples/contract-erc20/truffle/package-lock.json index dfc6eee70d..12a0c47f41 100644 --- a/template/examples/contract-erc20/truffle/package-lock.json +++ b/template/examples/contract-erc20/truffle/package-lock.json @@ -1467,9 +1467,9 @@ } }, "apollo-server-core": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.12.0.tgz", - "integrity": "sha512-hq7iH6Cgldgmnjs9FVSZeKWRpi0/ZR+iJ1arzeD2VXGxxgk1mAm/cz1Tx0TYgegZI+FvvrRl0UhKEx7sLnIxIg==", + "version": "3.12.1", + "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.12.1.tgz", + "integrity": "sha512-9SF5WAkkV0FZQ2HVUWI9Jada1U0jg7e8NCN9EklbtvaCeUlOLyXyM+KCWuZ7+dqHxjshbtcwylPHutt3uzoNkw==", "optional": true, "requires": { "@apollo/utils.keyvaluecache": "^1.0.1", @@ -1498,9 +1498,9 @@ }, "dependencies": { "uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", "optional": true } } @@ -3034,9 +3034,9 @@ "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==" }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "optional": true }, "for-each": { diff --git a/template/node/src/service.rs b/template/node/src/service.rs index 611f10e2c4..c6c856f931 100644 --- a/template/node/src/service.rs +++ b/template/node/src/service.rs @@ -8,7 +8,7 @@ use prometheus_endpoint::Registry; use sc_client_api::{Backend, BlockBackend}; use sc_consensus::BasicQueue; use sc_executor::NativeExecutionDispatch; -use sc_network_sync::warp::{WarpSyncParams, WarpSyncProvider}; +use sc_network_sync::strategy::warp::{WarpSyncParams, WarpSyncProvider}; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker}; use sc_transaction_pool_api::OffchainTransactionPoolFactory; diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs index 7b10f60b05..9684ebf008 100644 --- a/template/runtime/src/lib.rs +++ b/template/runtime/src/lib.rs @@ -280,7 +280,6 @@ impl pallet_balances::Config for Runtime { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; - type MaxHolds = ConstU32<5>; type MaxFreezes = ConstU32<1>; } diff --git a/ts-tests/package-lock.json b/ts-tests/package-lock.json index 784f259142..83763f549e 100644 --- a/ts-tests/package-lock.json +++ b/ts-tests/package-lock.json @@ -4310,9 +4310,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "funding": [ { "type": "individual", @@ -13310,9 +13310,9 @@ } }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "optional": true }, "for-each": { diff --git a/ts-tests/tests/test-execute.ts b/ts-tests/tests/test-execute.ts index aef7adf3a9..afbf731588 100644 --- a/ts-tests/tests/test-execute.ts +++ b/ts-tests/tests/test-execute.ts @@ -261,6 +261,6 @@ describeWithFrontier("Frontier RPC (RPC execution)", (context) => { input: "0x12345678", }, ]); - expect((result as any).error.message).to.match(/^Ambiguous value for `data` and `input`/); + expect(result.error.data).to.match(/^Ambiguous value for `data` and `input`/); }); });
) -> future::Ready> { + let res = if let Some(xt) = self.pool.ready_transaction(hash) { + let best_block = self.client.info().best_hash; + + let api = self.client.runtime_api(); + + let api_version = if let Ok(Some(api_version)) = + api.api_version::>(best_block) + { + api_version + } else { + return future::ready(None); }; - let mut transaction_log_index: u32 = 0; - let transaction_hash: Option = if receipt_logs.len() > 0 { - Some(block.transactions[receipt_index].hash()) + + let xts = vec![xt.data().clone()]; + + let txs: Option> = if api_version > 1 { + api.extrinsic_filter(best_block, xts).ok() } else { - None + #[allow(deprecated)] + if let Ok(legacy) = api.extrinsic_filter_before_version_2(best_block, xts) { + Some(legacy.into_iter().map(|tx| tx.into()).collect()) + } else { + None + } }; - for log in receipt_logs { - if Self::add_log(block_hash, &log, &block, params) { - logs.push(Log { - address: log.address, - topics: log.topics, - data: Bytes(log.data), - block_hash: Some(block_hash), - block_number: Some(block.header.number), - transaction_hash, - transaction_index: Some(U256::from(receipt_index)), - log_index: Some(U256::from(log_index)), - transaction_log_index: Some(U256::from(transaction_log_index)), - removed: false, - }); + + match txs { + Some(txs) => { + if txs.len() == 1 { + Some(txs[0].clone()) + } else { + None + } } - log_index += 1; - transaction_log_index += 1; + _ => None, } - } - logs - } - fn add_log( - block_hash: H256, - ethereum_log: ðereum::Log, - block: &EthereumBlock, - params: &FilteredParams, - ) -> bool { - let log = Log { - address: ethereum_log.address, - topics: ethereum_log.topics.clone(), - data: Bytes(ethereum_log.data.clone()), - block_hash: None, - block_number: None, - transaction_hash: None, - transaction_index: None, - log_index: None, - transaction_log_index: None, - removed: false, + } else { + None }; - if params.filter.is_some() { - let block_number = - UniqueSaturatedInto::::unique_saturated_into(block.header.number); - if !params.filter_block_range(block_number) - || !params.filter_block_hash(block_hash) - || !params.filter_address(&log) - || !params.filter_topics(&log) - { - return false; - } + future::ready(res.map(|tx| PubSubResult::transaction_hash(&tx))) + } + + async fn syncing_status(&self) -> PubSubSyncing { + if self.sync.is_major_syncing() { + // Best imported block. + let current_number = self.client.info().best_number; + // Get the target block to sync. + let highest_number = self.sync.best_seen_block().await.ok().flatten(); + + PubSubSyncing::Syncing(SyncingStatus { + starting_block: self.starting_block, + current_block: UniqueSaturatedInto::::unique_saturated_into(current_number), + highest_block: highest_number + .map(UniqueSaturatedInto::::unique_saturated_into), + }) + } else { + PubSubSyncing::Synced(false) } - true } } @@ -208,198 +234,64 @@ where C: HeaderBackend + StorageProvider, BE: Backend + 'static, { - fn subscribe( - &self, - mut sink: SubscriptionSink, - kind: Kind, - params: Option, - ) -> SubscriptionResult { - sink.accept()?; - + fn subscribe(&self, pending: PendingSubscriptionSink, kind: Kind, params: Option) { let filtered_params = match params { Some(Params::Logs(filter)) => FilteredParams::new(Some(filter)), _ => FilteredParams::default(), }; - let client = self.client.clone(); + let pubsub = self.clone(); // Everytime a new subscription is created, a new mpsc channel is added to the sink pool. let (inner_sink, block_notification_stream) = sc_utils::mpsc::tracing_unbounded("pubsub_notification_stream", 100_000); self.pubsub_notification_sinks.lock().push(inner_sink); - let pool = self.pool.clone(); - let sync = self.sync.clone(); - let overrides = self.overrides.clone(); - let starting_block = self.starting_block; + let fut = async move { match kind { - Kind::Logs => { + Kind::NewHeads => { let stream = block_notification_stream - .filter_map(move |notification| { - if notification.is_new_best { - let substrate_hash = notification.hash; - - let schema = fc_storage::onchain_storage_schema( - client.as_ref(), - substrate_hash, - ); - let handler = overrides - .schemas - .get(&schema) - .unwrap_or(&overrides.fallback); - - let block = handler.current_block(substrate_hash); - let receipts = handler.current_receipts(substrate_hash); - - match (receipts, block) { - (Some(receipts), Some(block)) => { - futures::future::ready(Some((block, receipts))) - } - _ => futures::future::ready(None), - } - } else { - futures::future::ready(None) - } - }) - .flat_map(move |(block, receipts)| { - futures::stream::iter(EthSubscriptionResult::logs( - block, - receipts, - &filtered_params, - )) - }) - .map(|x| PubSubResult::Log(Box::new(x))); - sink.pipe_from_stream(stream).await; + .filter_map(move |notification| pubsub.notify_header(notification)); + pipe_from_stream(pending, stream).await } - Kind::NewHeads => { + Kind::Logs => { let stream = block_notification_stream .filter_map(move |notification| { - if notification.is_new_best { - let schema = fc_storage::onchain_storage_schema( - client.as_ref(), - notification.hash, - ); - let handler = overrides - .schemas - .get(&schema) - .unwrap_or(&overrides.fallback); - - let block = handler.current_block(notification.hash); - futures::future::ready(block) - } else { - futures::future::ready(None) - } + pubsub.notify_logs(notification, &filtered_params) }) - .map(EthSubscriptionResult::new_heads); - sink.pipe_from_stream(stream).await; + .flat_map(futures::stream::iter); + pipe_from_stream(pending, stream).await } Kind::NewPendingTransactions => { - use sc_transaction_pool_api::InPoolTransaction; - + let pool = pubsub.pool.clone(); let stream = pool .import_notification_stream() - .filter_map(move |txhash| { - if let Some(xt) = pool.ready_transaction(&txhash) { - let best_block = client.info().best_hash; - - let api = client.runtime_api(); - - let api_version = if let Ok(Some(api_version)) = - api.api_version::>(best_block) - { - api_version - } else { - return futures::future::ready(None); - }; - - let xts = vec![xt.data().clone()]; - - let txs: Option> = if api_version > 1 { - api.extrinsic_filter(best_block, xts).ok() - } else { - #[allow(deprecated)] - if let Ok(legacy) = - api.extrinsic_filter_before_version_2(best_block, xts) - { - Some(legacy.into_iter().map(|tx| tx.into()).collect()) - } else { - None - } - }; - - let res = match txs { - Some(txs) => { - if txs.len() == 1 { - Some(txs[0].clone()) - } else { - None - } - } - _ => None, - }; - futures::future::ready(res) - } else { - futures::future::ready(None) - } - }) - .map(|transaction| PubSubResult::TransactionHash(transaction.hash())); - sink.pipe_from_stream(stream).await; + .filter_map(move |hash| pubsub.pending_transaction(&hash)); + pipe_from_stream(pending, stream).await; } Kind::Syncing => { - let client = Arc::clone(&client); - let sync = Arc::clone(&sync); - // Gets the node syncing status. - // The response is expected to be serialized either as a plain boolean - // if the node is not syncing, or a structure containing syncing metadata - // in case it is. - async fn status, B: BlockT>( - client: Arc, - sync: Arc>, - starting_block: u64, - ) -> PubSubSyncStatus { - if sync.is_major_syncing() { - // Get the target block to sync. - // This value is only exposed through substrate async Api - // in the `NetworkService`. - let highest_block = sync - .status() - .await - .ok() - .and_then(|res| res.best_seen_block) - .map(UniqueSaturatedInto::::unique_saturated_into); - // Best imported block. - let current_block = UniqueSaturatedInto::::unique_saturated_into( - client.info().best_number, - ); - - PubSubSyncStatus::Detailed(SyncStatusMetadata { - syncing: true, - starting_block, - current_block, - highest_block, - }) - } else { - PubSubSyncStatus::Simple(false) - } - } + let Ok(sink) = pending.accept().await else { + return; + }; // On connection subscriber expects a value. // Because import notifications are only emitted when the node is synced or // in case of reorg, the first event is emitted right away. - let _ = sink.send(&PubSubResult::SyncState( - status(Arc::clone(&client), Arc::clone(&sync), starting_block).await, - )); + let syncing_status = pubsub.syncing_status().await; + let msg = to_sub_message(&sink, &PubSubResult::SyncingStatus(syncing_status)); + let _ = sink.send(msg).await; // When the node is not under a major syncing (i.e. from genesis), react // normally to import notifications. // // Only send new notifications down the pipe when the syncing status changed. - let mut stream = client.clone().import_notification_stream(); - let mut last_syncing_status = sync.is_major_syncing(); + let mut stream = pubsub.client.import_notification_stream(); + let mut last_syncing_status = pubsub.sync.is_major_syncing(); while (stream.next().await).is_some() { - let syncing_status = sync.is_major_syncing(); + let syncing_status = pubsub.sync.is_major_syncing(); if syncing_status != last_syncing_status { - let _ = sink.send(&PubSubResult::SyncState( - status(client.clone(), sync.clone(), starting_block).await, - )); + let syncing_status = pubsub.syncing_status().await; + let msg = + to_sub_message(&sink, &PubSubResult::SyncingStatus(syncing_status)); + let _ = sink.send(msg).await; } last_syncing_status = syncing_status; } @@ -407,11 +299,8 @@ where } } .boxed(); - self.subscriptions.spawn( - "frontier-rpc-subscription", - Some("rpc"), - fut.map(drop).boxed(), - ); - Ok(()) + + self.executor + .spawn("frontier-rpc-subscription", Some("rpc"), fut); } } diff --git a/client/rpc/src/lib.rs b/client/rpc/src/lib.rs index 7942c9dd3d..afc7df5c56 100644 --- a/client/rpc/src/lib.rs +++ b/client/rpc/src/lib.rs @@ -287,24 +287,29 @@ pub mod frontier_backend_client { } } -pub fn err(code: i32, message: T, data: Option<&[u8]>) -> jsonrpsee::core::Error { - jsonrpsee::core::Error::Call(jsonrpsee::types::error::CallError::Custom( - jsonrpsee::types::error::ErrorObject::owned( - code, - message.to_string(), - data.map(|bytes| { - jsonrpsee::core::to_json_raw_value(&format!("0x{}", hex::encode(bytes))) - .expect("fail to serialize data") - }), - ), - )) +pub fn err( + code: i32, + message: T, + data: Option<&[u8]>, +) -> jsonrpsee::types::error::ErrorObjectOwned { + jsonrpsee::types::error::ErrorObject::owned( + code, + message.to_string(), + data.map(|bytes| { + jsonrpsee::core::to_json_raw_value(&format!("0x{}", hex::encode(bytes))) + .expect("fail to serialize data") + }), + ) } -pub fn internal_err(message: T) -> jsonrpsee::core::Error { +pub fn internal_err(message: T) -> jsonrpsee::types::error::ErrorObjectOwned { err(jsonrpsee::types::error::INTERNAL_ERROR_CODE, message, None) } -pub fn internal_err_with_data(message: T, data: &[u8]) -> jsonrpsee::core::Error { +pub fn internal_err_with_data( + message: T, + data: &[u8], +) -> jsonrpsee::types::error::ErrorObjectOwned { err( jsonrpsee::types::error::INTERNAL_ERROR_CODE, message, diff --git a/client/rpc/src/signer.rs b/client/rpc/src/signer.rs index c1c90fb4a0..cf3ddae099 100644 --- a/client/rpc/src/signer.rs +++ b/client/rpc/src/signer.rs @@ -18,7 +18,7 @@ use ethereum::TransactionV2 as EthereumTransaction; use ethereum_types::{H160, H256}; -use jsonrpsee::core::Error; +use jsonrpsee::types::ErrorObjectOwned; // Substrate use sp_core::hashing::keccak_256; // Frontier @@ -35,7 +35,7 @@ pub trait EthSigner: Send + Sync { &self, message: TransactionMessage, address: &H160, - ) -> Result; + ) -> Result; } pub struct EthDevSigner { @@ -75,7 +75,7 @@ impl EthSigner for EthDevSigner { &self, message: TransactionMessage, address: &H160, - ) -> Result { + ) -> Result { let mut transaction = None; for secret in &self.keys { diff --git a/docs/yarn.lock b/docs/yarn.lock index 09110ddd21..16a4534c44 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -3894,9 +3894,9 @@ flush-write-stream@^1.0.0: readable-stream "^2.3.6" follow-redirects@^1.0.0: - version "1.14.8" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" - integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== + version "1.15.4" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf" + integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw== for-in@^1.0.2: version "1.0.2" @@ -4578,9 +4578,9 @@ ip-regex@^2.1.0: integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= ip@^1.1.0, ip@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + version "1.1.9" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.9.tgz#8dfbcc99a754d07f425310b86a99546b1151e396" + integrity sha512-cyRxvOEpNHNtchU3Ln9KC/auJgup87llfQpQ+t5ghoC/UhL16SWzbueiCsdTnWmqAWl7LadfuwhlqmtOaqMHdQ== ipaddr.js@1.9.1, ipaddr.js@^1.9.0: version "1.9.1" diff --git a/frame/ethereum/src/mock.rs b/frame/ethereum/src/mock.rs index 3734bc42de..814d5e9551 100644 --- a/frame/ethereum/src/mock.rs +++ b/frame/ethereum/src/mock.rs @@ -101,7 +101,6 @@ impl pallet_balances::Config for Test { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; - type MaxHolds = ConstU32<5>; type MaxFreezes = ConstU32<1>; } diff --git a/frame/evm/precompile/dispatch/src/mock.rs b/frame/evm/precompile/dispatch/src/mock.rs index fb90ce6a08..01a66d779d 100644 --- a/frame/evm/precompile/dispatch/src/mock.rs +++ b/frame/evm/precompile/dispatch/src/mock.rs @@ -98,7 +98,6 @@ impl pallet_balances::Config for Test { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = (); type MaxReserves = (); - type MaxHolds = (); type MaxFreezes = (); } diff --git a/frame/evm/src/mock.rs b/frame/evm/src/mock.rs index 33c7e22154..1249f62620 100644 --- a/frame/evm/src/mock.rs +++ b/frame/evm/src/mock.rs @@ -91,7 +91,6 @@ impl pallet_balances::Config for Test { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = (); type MaxReserves = (); - type MaxHolds = (); type MaxFreezes = (); } diff --git a/precompiles/src/solidity/codec/xcm.rs b/precompiles/src/solidity/codec/xcm.rs index 9e387aa9c8..e3cdc2ca0d 100644 --- a/precompiles/src/solidity/codec/xcm.rs +++ b/precompiles/src/solidity/codec/xcm.rs @@ -25,7 +25,7 @@ use frame_support::{ensure, traits::ConstU32}; use sp_core::H256; use sp_std::vec::Vec; use sp_weights::Weight; -use xcm::latest::{Junction, Junctions, MultiLocation, NetworkId}; +use xcm::latest::{Junction, Junctions, Location, NetworkId}; use crate::solidity::{ codec::{bytes::*, Codec, Reader, Writer}, @@ -358,12 +358,12 @@ impl Codec for Junctions { } // Cannot used derive macro since it is a foreign struct. -impl Codec for MultiLocation { +impl Codec for Location { fn read(reader: &mut Reader) -> MayRevert { let (parents, interior) = reader .read() .map_in_tuple_to_field(&["parents", "interior"])?; - Ok(MultiLocation { parents, interior }) + Ok(Location { parents, interior }) } fn write(writer: &mut Writer, value: Self) { diff --git a/precompiles/tests-external/lib.rs b/precompiles/tests-external/lib.rs index 471f535075..42a7682f91 100644 --- a/precompiles/tests-external/lib.rs +++ b/precompiles/tests-external/lib.rs @@ -101,7 +101,6 @@ impl pallet_balances::Config for Runtime { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = (); type MaxReserves = (); - type MaxHolds = (); type MaxFreezes = (); } diff --git a/primitives/account/src/lib.rs b/primitives/account/src/lib.rs index fe6906f99c..ee05acec9e 100644 --- a/primitives/account/src/lib.rs +++ b/primitives/account/src/lib.rs @@ -20,8 +20,9 @@ use scale_codec::{Decode, Encode, MaxEncodedLen}; use scale_info::TypeInfo; // Substrate -use sp_core::{ecdsa, RuntimeDebug, H160, H256}; +use sp_core::{crypto::AccountId32, ecdsa, RuntimeDebug, H160, H256}; use sp_io::hashing::keccak_256; +use sp_runtime::MultiSignature; use sp_runtime_interface::pass_by::PassByInner; /// A fully Ethereum-compatible `AccountId`. @@ -159,6 +160,13 @@ impl From<[u8; 32]> for AccountId20 { } } +impl From for AccountId20 { + fn from(account: AccountId32) -> Self { + let bytes: &[u8; 32] = account.as_ref(); + Self::from(*bytes) + } +} + #[derive(Eq, PartialEq, Clone, RuntimeDebug, Encode, Decode, TypeInfo)] #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] pub struct EthereumSignature(ecdsa::Signature); @@ -185,9 +193,23 @@ impl sp_runtime::traits::Verify for EthereumSignature { } } +impl From for EthereumSignature { + fn from(signature: MultiSignature) -> Self { + match signature { + MultiSignature::Ed25519(_) => { + panic!("Ed25519 not supported for EthereumSignature") + } + MultiSignature::Sr25519(_) => { + panic!("Sr25519 not supported for EthereumSignature") + } + MultiSignature::Ecdsa(sig) => Self(sig), + } + } +} + impl EthereumSignature { pub fn new(s: ecdsa::Signature) -> Self { - EthereumSignature(s) + Self(s) } } diff --git a/template/examples/contract-erc20/truffle/package-lock.json b/template/examples/contract-erc20/truffle/package-lock.json index dfc6eee70d..12a0c47f41 100644 --- a/template/examples/contract-erc20/truffle/package-lock.json +++ b/template/examples/contract-erc20/truffle/package-lock.json @@ -1467,9 +1467,9 @@ } }, "apollo-server-core": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.12.0.tgz", - "integrity": "sha512-hq7iH6Cgldgmnjs9FVSZeKWRpi0/ZR+iJ1arzeD2VXGxxgk1mAm/cz1Tx0TYgegZI+FvvrRl0UhKEx7sLnIxIg==", + "version": "3.12.1", + "resolved": "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.12.1.tgz", + "integrity": "sha512-9SF5WAkkV0FZQ2HVUWI9Jada1U0jg7e8NCN9EklbtvaCeUlOLyXyM+KCWuZ7+dqHxjshbtcwylPHutt3uzoNkw==", "optional": true, "requires": { "@apollo/utils.keyvaluecache": "^1.0.1", @@ -1498,9 +1498,9 @@ }, "dependencies": { "uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", "optional": true } } @@ -3034,9 +3034,9 @@ "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==" }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "optional": true }, "for-each": { diff --git a/template/node/src/service.rs b/template/node/src/service.rs index 611f10e2c4..c6c856f931 100644 --- a/template/node/src/service.rs +++ b/template/node/src/service.rs @@ -8,7 +8,7 @@ use prometheus_endpoint::Registry; use sc_client_api::{Backend, BlockBackend}; use sc_consensus::BasicQueue; use sc_executor::NativeExecutionDispatch; -use sc_network_sync::warp::{WarpSyncParams, WarpSyncProvider}; +use sc_network_sync::strategy::warp::{WarpSyncParams, WarpSyncProvider}; use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager}; use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker}; use sc_transaction_pool_api::OffchainTransactionPoolFactory; diff --git a/template/runtime/src/lib.rs b/template/runtime/src/lib.rs index 7b10f60b05..9684ebf008 100644 --- a/template/runtime/src/lib.rs +++ b/template/runtime/src/lib.rs @@ -280,7 +280,6 @@ impl pallet_balances::Config for Runtime { type FreezeIdentifier = RuntimeFreezeReason; type MaxLocks = MaxLocks; type MaxReserves = MaxReserves; - type MaxHolds = ConstU32<5>; type MaxFreezes = ConstU32<1>; } diff --git a/ts-tests/package-lock.json b/ts-tests/package-lock.json index 784f259142..83763f549e 100644 --- a/ts-tests/package-lock.json +++ b/ts-tests/package-lock.json @@ -4310,9 +4310,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "funding": [ { "type": "individual", @@ -13310,9 +13310,9 @@ } }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "optional": true }, "for-each": { diff --git a/ts-tests/tests/test-execute.ts b/ts-tests/tests/test-execute.ts index aef7adf3a9..afbf731588 100644 --- a/ts-tests/tests/test-execute.ts +++ b/ts-tests/tests/test-execute.ts @@ -261,6 +261,6 @@ describeWithFrontier("Frontier RPC (RPC execution)", (context) => { input: "0x12345678", }, ]); - expect((result as any).error.message).to.match(/^Ambiguous value for `data` and `input`/); + expect(result.error.data).to.match(/^Ambiguous value for `data` and `input`/); }); });