Skip to content
This repository has been archived by the owner on Mar 30, 2023. It is now read-only.

Commit

Permalink
Frontier upgrade (#196)
Browse files Browse the repository at this point in the history 
* Delete BaseFee

* Fix todo
  • Loading branch information
@boundless-forest
boundless-forest authored Jan 11, 2023
1 parent d00ef46 commit a2aa89a
Show file tree
Hide file tree
Showing 16 changed files with 4 additions and 191 deletions.
18 changes: 0 additions & 18 deletions Cargo.lock
View file

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

2 changes: 0 additions & 2 deletions node/src/chain_spec/crab.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ pub fn genesis_config() -> ChainSpec {
// EVM stuff.
ethereum: Default::default(),
evm: Default::default(),
base_fee: Default::default(),

// S2S stuff.
bridge_polkadot_grandpa: Default::default(),
Expand Down Expand Up @@ -332,7 +331,6 @@ fn testnet_genesis(
)
},
},
base_fee: Default::default(),

// S2S stuff.
bridge_polkadot_grandpa: Default::default(),
Expand Down
2 changes: 0 additions & 2 deletions node/src/chain_spec/darwinia.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ pub fn genesis_config() -> ChainSpec {
// EVM stuff.
ethereum: Default::default(),
evm: Default::default(),
base_fee: Default::default(),

// S2S stuff.
bridge_kusama_grandpa: Default::default(),
Expand Down Expand Up @@ -332,7 +331,6 @@ fn testnet_genesis(
)
},
},
base_fee: Default::default(),

// S2S stuff.
bridge_kusama_grandpa: Default::default(),
Expand Down
2 changes: 0 additions & 2 deletions node/src/chain_spec/pangolin.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@ pub fn genesis_config() -> ChainSpec {
// EVM stuff.
ethereum: Default::default(),
evm: Default::default(),
base_fee: Default::default(),
}
},
Vec::new(),
Expand Down Expand Up @@ -326,6 +325,5 @@ fn testnet_genesis(
)
},
},
base_fee: Default::default(),
}
}
3 changes: 0 additions & 3 deletions runtime/crab/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ pallet-fee-market = { default-features = false, git = "https://github.com
# frontier
fp-rpc = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
fp-self-contained = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
pallet-base-fee = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
pallet-ethereum = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
pallet-evm = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
Expand Down Expand Up @@ -175,7 +174,6 @@ std = [
# frontier
"fp-rpc/std",
"fp-self-contained/std",
"pallet-base-fee/std",
"pallet-ethereum/std",
"pallet-evm/std",
"pallet-evm-precompile-blake2/std",
Expand Down Expand Up @@ -310,7 +308,6 @@ try-runtime = [
"parachain-info/try-runtime",

# frontier
"pallet-base-fee/try-runtime",
"pallet-ethereum/try-runtime",
"pallet-evm/try-runtime",

Expand Down
7 changes: 2 additions & 5 deletions runtime/crab/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ frame_support::construct_runtime! {
// EVM stuff.
Ethereum: pallet_ethereum = 31,
Evm: pallet_evm = 32,
BaseFee: pallet_base_fee = 33,
MessageTransact: darwinia_message_transact = 39,

// S2S stuff.
Expand Down Expand Up @@ -618,12 +617,10 @@ sp_api::impl_runtime_apis! {
}

fn elasticity() -> Option<Permill> {
Some(BaseFee::elasticity())
None
}

fn gas_limit_multiplier_support() {
todo!()
}
fn gas_limit_multiplier_support() {}
}

impl fp_rpc::ConvertTransactionRuntimeApi<Block> for Runtime {
Expand Down
47 changes: 0 additions & 47 deletions runtime/crab/src/pallets/base_fee.rs
View file

This file was deleted.

2 changes: 0 additions & 2 deletions runtime/crab/src/pallets/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ mod ethereum;
mod evm;
pub use evm::*;

mod base_fee;

mod message_transact;

// S2S stuff.
Expand Down
3 changes: 0 additions & 3 deletions runtime/darwinia/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ pallet-fee-market = { default-features = false, git = "https://github.com
# frontier
fp-rpc = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
fp-self-contained = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
pallet-base-fee = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
pallet-ethereum = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
pallet-evm = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
Expand Down Expand Up @@ -175,7 +174,6 @@ std = [
# frontier
"fp-rpc/std",
"fp-self-contained/std",
"pallet-base-fee/std",
"pallet-ethereum/std",
"pallet-evm/std",
"pallet-evm-precompile-blake2/std",
Expand Down Expand Up @@ -310,7 +308,6 @@ try-runtime = [
"parachain-info/try-runtime",

# frontier
"pallet-base-fee/try-runtime",
"pallet-ethereum/try-runtime",
"pallet-evm/try-runtime",

Expand Down
4 changes: 1 addition & 3 deletions runtime/darwinia/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ frame_support::construct_runtime! {
// EVM stuff.
Ethereum: pallet_ethereum = 31,
Evm: pallet_evm = 32,
BaseFee: pallet_base_fee = 33,
MessageTransact: darwinia_message_transact = 39,

// S2S stuff.
Expand Down Expand Up @@ -618,11 +617,10 @@ sp_api::impl_runtime_apis! {
}

fn elasticity() -> Option<Permill> {
Some(BaseFee::elasticity())
None
}

fn gas_limit_multiplier_support() {
todo!()
}
}

Expand Down
47 changes: 0 additions & 47 deletions runtime/darwinia/src/pallets/base_fee.rs
View file

This file was deleted.

2 changes: 0 additions & 2 deletions runtime/darwinia/src/pallets/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,6 @@ mod ethereum;
mod evm;
pub use evm::*;

mod base_fee;

mod message_transact;

// S2S stuff.
Expand Down
3 changes: 0 additions & 3 deletions runtime/pangolin/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ pallet-fee-market = { default-features = false, git = "https://github.com/d
# frontier
fp-rpc = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
fp-self-contained = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
pallet-base-fee = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
pallet-ethereum = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
pallet-evm = { default-features = false, features = ["forbid-evm-reentrancy"], git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
pallet-evm-precompile-blake2 = { default-features = false, git = "https://github.com/darwinia-network/frontier", branch = "prepare-polkadot-v0.9.33" }
Expand Down Expand Up @@ -173,7 +172,6 @@ std = [
# frontier
"fp-rpc/std",
"fp-self-contained/std",
"pallet-base-fee/std",
"pallet-ethereum/std",
"pallet-evm/std",
"pallet-evm-precompile-blake2/std",
Expand Down Expand Up @@ -307,7 +305,6 @@ try-runtime = [
"parachain-info/try-runtime",

# frontier
"pallet-base-fee/try-runtime",
"pallet-ethereum/try-runtime",
"pallet-evm/try-runtime",

Expand Down
4 changes: 1 addition & 3 deletions runtime/pangolin/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ frame_support::construct_runtime! {
// EVM stuff.
Ethereum: pallet_ethereum = 31,
Evm: pallet_evm = 32,
BaseFee: pallet_base_fee = 33,
MessageTransact: darwinia_message_transact = 39,
}
}
Expand Down Expand Up @@ -608,11 +607,10 @@ sp_api::impl_runtime_apis! {
}

fn elasticity() -> Option<Permill> {
Some(BaseFee::elasticity())
None
}

fn gas_limit_multiplier_support() {
todo!()
}
}

Expand Down
47 changes: 0 additions & 47 deletions runtime/pangolin/src/pallets/base_fee.rs
View file

This file was deleted.

2 changes: 0 additions & 2 deletions runtime/pangolin/src/pallets/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,4 @@ mod ethereum;
mod evm;
pub use evm::*;

mod base_fee;

mod message_transact;

0 comments on commit a2aa89a

Please sign in to comment.