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

Migrate to frontier Extrinsics #871

Merged
merged 19 commits into from
Oct 18, 2021
Merged

Migrate to frontier Extrinsics #871

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5243b03
Migrate to frontier Extrinsics
librelois Sep 30, 2021
fbfefb8
Merge branch 'master'
librelois Sep 30, 2021
2b2aa41
Use pallet_ethereum origin
librelois Oct 1, 2021
ab45be1
fix rust tests
librelois Oct 4, 2021
c6696a0
Merge branch 'master' into elois-frontier-signed
librelois Oct 4, 2021
fc4c928
add feature runtime-benchmarks
librelois Oct 4, 2021
0ae66ab
refactor(runtimes): move SelfContainedCall impl in a common macro
librelois Oct 4, 2021
0feb3b2
rename frontier branch
librelois Oct 4, 2021
0c0be60
Execute all SignedExtra checks for unsigned extrinsics
librelois Oct 4, 2021
64b20bf
do same priority computation as before
librelois Oct 4, 2021
c48820e
Merge branch 'master' into elois-frontier-signed
librelois Oct 4, 2021
92054af
editorconfig
librelois Oct 4, 2021
8451498
fix recursive call
librelois Oct 4, 2021
4f04020
wip
librelois Oct 5, 2021
33e4814
Merge branch 'master' into elois-frontier-signed
librelois Oct 13, 2021
b73e3b9
update frontier
librelois Oct 13, 2021
6fa4fb5
update frontier
librelois Oct 13, 2021
03604bb
Merge branch 'master'
librelois Oct 13, 2021
74a2828
Merge branch 'master' into elois-frontier-signed
librelois Oct 18, 2021
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
87 changes: 68 additions & 19 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/txpool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jsonrpc-derive = "14.0.3"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"

fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
8 changes: 4 additions & 4 deletions client/rpc/debug/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ moonbeam-rpc-core-debug = { path = "../../rpc-core/debug" }
moonbeam-rpc-core-types = { path = "../../rpc-core/types" }
moonbeam-client-evm-tracing = { path = "../../evm-tracing" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10", features = ["rpc_binary_search_estimate"] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics", features = ["rpc_binary_search_estimate"] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
8 changes: 4 additions & 4 deletions client/rpc/trace/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,16 @@ sp-std = { git = "https://github.com/purestake/substrate", branch = "moonbeam-po
sp-blockchain = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.10" }
sp-transaction-pool = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.10" }
sp-block-builder = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.10" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
moonbeam-rpc-primitives-debug = { path = "../../../primitives/rpc/debug" }

# Client and RPC
jsonrpc-core = "15.0.0"
sc-client-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.10" }
sc-network = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.10" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10", features = ["rpc_binary_search_estimate"] }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics", features = ["rpc_binary_search_estimate"] }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
moonbeam-rpc-core-trace = { path = "../../rpc-core/trace" }
moonbeam-rpc-core-types = { path = "../../rpc-core/types" }
moonbeam-client-evm-tracing = { path = "../../evm-tracing" }
2 changes: 1 addition & 1 deletion client/rpc/txpool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ frame-system = { git = "https://github.com/purestake/substrate", branch = "moonb
serde = { version = "1.0", features = ["derive"] }

moonbeam-rpc-primitives-txpool = { path = "../../../primitives/rpc/txpool" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10", features = ["rpc_binary_search_estimate"] }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics", features = ["rpc_binary_search_estimate"] }
2 changes: 2 additions & 0 deletions core-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ repository = 'https://github.com/PureStake/moonbeam/'
version = '0.1.1'

[dependencies]
fp-self-contained = { git = "https://github.com/purestake/frontier", default-features = false, branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
sp-core = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.10", default-features = false }
sp-runtime = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.10", default-features = false }
account = { path = "../primitives/account", default-features = false }

[features]
default = [ "std" ]
std = [
"fp-self-contained/std",
"sp-core/std",
"sp-runtime/std",
"account/std",
Expand Down
4 changes: 2 additions & 2 deletions core-primitives/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

use account::EthereumSignature;
use sp_runtime::traits::BlakeTwo256;
pub use sp_runtime::OpaqueExtrinsic as UncheckedExtrinsic;
pub use sp_runtime::OpaqueExtrinsic;
use sp_runtime::{
generic,
traits::{IdentifyAccount, Verify},
};

pub type Block = generic::Block<Header, UncheckedExtrinsic>;
pub type Block = generic::Block<Header, OpaqueExtrinsic>;
/// Alias to 512-bit hash when used in the context of a transaction signature on the chain.
pub type Signature = EthereumSignature;
/// Some way of identifying an account on the chain. We intentionally make it equivalent
Expand Down
21 changes: 11 additions & 10 deletions node/service/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,17 @@ sc-consensus-manual-seal = { git = "https://github.com/purestake/substrate", bra
frame-system-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.10" }
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/purestake/substrate", branch = "moonbeam-polkadot-v0.9.10" }

evm = { package = "pallet-evm", git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
ethereum = { package = "pallet-ethereum", git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
evm = { package = "pallet-evm", git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
ethereum = { package = "pallet-ethereum", git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
ethereum-primitives = { package = "ethereum", version = "0.9.0", default-features = false, features = ["with-codec"] }

fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fp-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10", features = ["rpc_binary_search_estimate"] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fc-mapping-sync = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10" }
fc-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
fp-consensus = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
fc-rpc-core = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
fc-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics", features = ["rpc_binary_search_estimate"] }
fp-rpc = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
fc-db = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }
fc-mapping-sync = { git = "https://github.com/purestake/frontier", branch = "moonbeam-polkadot-v0.9.10-frontier-extrinsics" }

# Cumulus dependencies
cumulus-client-cli = { git = "https://github.com/purestake/cumulus", branch = "moonbeam-polkadot-v0.9.10" }
Expand Down Expand Up @@ -165,7 +165,8 @@ runtime-benchmarks = [
"moonriver-native",
"moonriver-runtime/runtime-benchmarks",
"moonbeam-native",
"moonbeam-runtime/runtime-benchmarks"
"moonbeam-runtime/runtime-benchmarks",
"ethereum/runtime-benchmarks"
]
try-runtime = [
"moonbase-runtime", "moonbase-runtime/try-runtime",
Expand Down
Loading