Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge moonbeam-polkadot-v0.9.13 #2

Open
wants to merge 1 commit into
base: new-polkadot-v0.9.11
Choose a base branch
from
Open

Merge moonbeam-polkadot-v0.9.13 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/rpc-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jsonrpc-core-client = "18.0"
jsonrpc-derive = "18.0"
jsonrpc-pubsub = "18.0"
rustc-hex = "2.1.0"
ethereum = { version = "0.10.0", features = ["with-codec"] }
ethereum = { version = "0.11.1", features = ["with-codec"] }
sha3 = "0.8"
ethereum-types = "0.12"
serde = { version = "1.0", features = ["derive"] }
Expand Down
3 changes: 3 additions & 0 deletions client/rpc-core/src/types/call_request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
// along with this program. If not, see <https://www.gnu.org/licenses/>.

use crate::types::Bytes;
use ethereum::AccessListItem;
use ethereum_types::{H160, U256};
use serde::Deserialize;

Expand All @@ -43,4 +44,6 @@ pub struct CallRequest {
pub data: Option<Bytes>,
/// Nonce
pub nonce: Option<U256>,
/// AccessList
pub access_list: Option<Vec<AccessListItem>>,
}
12 changes: 6 additions & 6 deletions client/rpc-core/src/types/transaction_request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ use crate::types::Bytes;
use ethereum::{
AccessListItem, EIP1559TransactionMessage, EIP2930TransactionMessage, LegacyTransactionMessage,
};
use ethereum_types::{H160, H256, U256};
use ethereum_types::{H160, U256};
use serde::{Deserialize, Serialize};

pub enum TransactionMessage {
Expand All @@ -32,7 +32,7 @@ pub enum TransactionMessage {
}

/// Transaction request coming from RPC
#[derive(Debug, Clone, Default, Eq, PartialEq, Hash, Serialize, Deserialize)]
#[derive(Debug, Clone, Default, Eq, PartialEq, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
#[serde(rename_all = "camelCase")]
pub struct TransactionRequest {
Expand All @@ -57,9 +57,9 @@ pub struct TransactionRequest {
pub data: Option<Bytes>,
/// Transaction's nonce
pub nonce: Option<U256>,
/// TODO! Pre-pay to warm storage access.
/// Pre-pay to warm storage access.
#[serde(default)]
pub access_list: Option<Vec<(H160, Vec<H256>)>>,
pub access_list: Option<Vec<AccessListItem>>,
}

impl Into<Option<TransactionMessage>> for TransactionRequest {
Expand Down Expand Up @@ -98,7 +98,7 @@ impl Into<Option<TransactionMessage>> for TransactionRequest {
.access_list
.unwrap()
.into_iter()
.map(|(address, slots)| AccessListItem { address, slots })
.map(|item| item)
.collect(),
})),
// EIP1559
Expand All @@ -122,7 +122,7 @@ impl Into<Option<TransactionMessage>> for TransactionRequest {
.access_list
.unwrap_or(Vec::new())
.into_iter()
.map(|(address, slots)| AccessListItem { address, slots })
.map(|item| item)
.collect(),
}))
}
Expand Down
4 changes: 2 additions & 2 deletions client/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jsonrpc-core-client = "18.0"
jsonrpc-pubsub = "18.0"
log = "0.4.8"
ethereum-types = "0.12"
evm = "0.33.0"
evm = "0.33.1"
fc-consensus = { version = "2.0.0-dev", path = "../consensus" }
fc-db = { version = "2.0.0-dev", path = "../db" }
fc-rpc-core = { version = "1.1.0-dev", path = "../rpc-core" }
Expand All @@ -36,7 +36,7 @@ sc-network = { git = 'https://github.com/paritytech/substrate', branch = "polkad
pallet-evm = { version = "6.0.0-dev", path = "../../frame/evm" }
fp-evm = { version = "3.0.0-dev", path = "../../primitives/evm" }
pallet-ethereum = { version = "4.0.0-dev", path = "../../frame/ethereum" }
ethereum = { version = "0.10.0", features = ["with-codec"] }
ethereum = { version = "0.11.1", features = ["with-codec"] }
codec = { package = "parity-scale-codec", version = "2.0.0" }
rlp = "0.5"
futures = { version = "0.3.1", features = ["compat"] }
Expand Down
Loading