Skip to content

Commit

Permalink
update to v0.9.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@ramseykes
ramseykes committed Jul 7, 2021
1 parent eb240bc commit a2fca8d
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 33 deletions.
22 changes: 11 additions & 11 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,21 @@ hedgeware-rpc-primitives-debug = { path = "./rpc-primitives/debug" }
hedgeware-rpc-trace = { path = "./client/rpc/trace" }

# Frontier
ethereum = { package = "pallet-ethereum", git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
ethereum = { package = "pallet-ethereum", git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
ethereum-primitives = { package = "ethereum", version = "0.7.1", default-features = false, features = ["with-codec"] }
fc-consensus = { default-features = false, git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fp-consensus = { default-features = false, git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-rpc = { default-features = false, git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7", features = ["rpc_binary_search_estimate"] }
fp-rpc = { default-features = false, git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-rpc-core = { default-features = false, git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-db = { default-features = false, git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-mapping-sync = { default-features = false, git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-consensus = { default-features = false, git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
fp-consensus = { default-features = false, git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
fc-rpc = { default-features = false, git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7", features = ["rpc_binary_search_estimate"] }
fp-rpc = { default-features = false, git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
fc-rpc-core = { default-features = false, git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
fc-db = { default-features = false, git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
fc-mapping-sync = { default-features = false, git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }


# Webb
webb-currencies = { git = "https://github.com/webb-tools/anon", branch = "polkadot-v0.9.7" }
webb-tokens = { git = "https://github.com/webb-tools/anon", branch = "polkadot-v0.9.7" }
webb-traits = { git = "https://github.com/webb-tools/anon", branch = "polkadot-v0.9.7" }
webb-currencies = { git = "https://github.com/edgeware-network/anon", branch = "polkadot-v0.9.7" }
webb-tokens = { git = "https://github.com/edgeware-network/anon", branch = "polkadot-v0.9.7" }
webb-traits = { git = "https://github.com/edgeware-network/anon", branch = "polkadot-v0.9.7" }

# Quadratic drop
quaddrop = { path = "./quaddrop" }
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ In order to update to something like `polkadot-v0.9.8` and `releaes-v0.9.8` the
## Dealing with Frontier
One of the first errors you will encounter is Frontier. We aim to cover this topic below.

Frontier EVM and its relevant RPCs are still quite far behind in Substrate. They are currently pegged to a branch called `frontier` that last saw an update in March. Therefore, any parachain node needs to use a fork of this and update that Frontier repo to the respective `0.9.X`. Today, we are using the fork in @webb-tools. It has some features also not merged into Frontier, mainly updating the `dynamic-fee-pallet` to the Substrate 3.0 macro structure. This causes noticeable changes to the service file of this node and should be dealt with with care. Any fork can suffice.
1. Create a fork of Frontier or use [@webb-tools/frontier](https://github.com/webb-tools/frontier) as a starting point.
Frontier EVM and its relevant RPCs are still quite far behind in Substrate. They are currently pegged to a branch called `frontier` that last saw an update in March. Therefore, any parachain node needs to use a fork of this and update that Frontier repo to the respective `0.9.X`. Today, we are using the fork in @edgeware-network. It has some features also not merged into Frontier, mainly updating the `dynamic-fee-pallet` to the Substrate 3.0 macro structure. This causes noticeable changes to the service file of this node and should be dealt with with care. Any fork can suffice.
1. Create a fork of Frontier or use [@edgeware-network/frontier](https://github.com/edgeware-network/frontier) as a starting point.
2. Update the references to the relevant `polkadot-v0.9.X` of Substrate (note here we only need to update Substrate branches).
3. Push the fork.
4. Update the Hedgeware Frontier dependencies to the right fork.
Expand Down
2 changes: 1 addition & 1 deletion client/rpc-core/txpool/Cargo.toml
View file
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/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-rpc-core = { git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
8 changes: 4 additions & 4 deletions client/rpc/debug/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sp-utils = { git = "https://github.com/paritytech/substrate", branch = "polkadot

hedgeware-rpc-core-debug = { path = "../../rpc-core/debug" }
hedgeware-rpc-primitives-debug = { path = "../../../rpc-primitives/debug" }
fc-consensus = { git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-db = { git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-rpc = { git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fp-rpc = { git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-consensus = { git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
fc-db = { git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
fc-rpc = { git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
fp-rpc = { git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
8 changes: 4 additions & 4 deletions client/rpc/trace/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ sp-std = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0
sp-blockchain = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.7" }
sp-transaction-pool = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.7" }
sp-block-builder = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.7" }
fp-rpc = { git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fp-rpc = { git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
hedgeware-rpc-primitives-debug = { path = "../../../rpc-primitives/debug" }

# Client and RPC
jsonrpc-core = "15.0.0"
sc-client-api = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.7" }
sc-network = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.7" }
sc-transaction-graph = {git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.7" }
fc-rpc = { git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-consensus = { git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-rpc-core = { git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-rpc = { git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
fc-consensus = { git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
fc-rpc-core = { git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
hedgeware-rpc-core-trace = { path = "../../rpc-core/trace" }
2 changes: 1 addition & 1 deletion client/rpc/txpool/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ frame-system = { git = "https://github.com/paritytech/substrate", branch = "polk
serde = { version = "1.0", features = ["derive"] }

hedgeware-rpc-primitives-txpool = { path = "../../../rpc-primitives/txpool" }
fc-rpc = { git = "https://github.com/webb-tools/frontier", branch = "polkadot-v0.9.7" }
fc-rpc = { git = "https://github.com/edgeware-network/frontier", branch = "polkadot-v0.9.7" }
4 changes: 2 additions & 2 deletions evm_tracer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ license = 'GPL-3.0-only'
repository = 'https://github.com/PureStake/moonbeam/'

[dependencies]
fp-evm = { git = "https://github.com/webb-tools/frontier", default-features = false, branch = "polkadot-v0.9.7" }
pallet-evm = { git = "https://github.com/webb-tools/frontier", default-features = false, branch = "polkadot-v0.9.7" }
fp-evm = { git = "https://github.com/edgeware-network/frontier", default-features = false, branch = "polkadot-v0.9.7" }
pallet-evm = { git = "https://github.com/edgeware-network/frontier", default-features = false, branch = "polkadot-v0.9.7" }
evm = { version = "0.27.0", default-features = false, features = ["with-codec", "tracing"] }
evm-runtime = { version = "0.27.0", default-features = false, features = ["tracing"] }
evm-gasometer = { version = "0.27.0", default-features = false, features = ["tracing"] }
Expand Down
16 changes: 8 additions & 8 deletions runtime/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate"
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.7" }

# Webb
webb-currencies = { default-features = false, git = "https://github.com/webb-tools/anon", branch = "polkadot-v0.9.7" }
webb-tokens = { default-features = false, git = "https://github.com/webb-tools/anon", branch = "polkadot-v0.9.7" }
webb-traits = { default-features = false, git = "https://github.com/webb-tools/anon", branch = "polkadot-v0.9.7" }
webb-currencies = { default-features = false, git = "https://github.com/edgeware-network/anon", branch = "polkadot-v0.9.7" }
webb-tokens = { default-features = false, git = "https://github.com/edgeware-network/anon", branch = "polkadot-v0.9.7" }
webb-traits = { default-features = false, git = "https://github.com/edgeware-network/anon", branch = "polkadot-v0.9.7" }

# Hedgeware
hedgeware-evm-tracer = { path = "../evm_tracer", default-features = false }
Expand All @@ -87,11 +87,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature
pallet-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.7" }

# Ethereum dependencies
pallet-ethereum = { git = "https://github.com/webb-tools/frontier", default-features = false, branch = "polkadot-v0.9.7" }
pallet-evm = { git = "https://github.com/webb-tools/frontier", default-features = false, branch = "polkadot-v0.9.7" }
pallet-evm-precompile-simple = { git = "https://github.com/webb-tools/frontier", default-features = false, branch = "polkadot-v0.9.7" }
pallet-evm-precompile-sha3fips = { git = "https://github.com/webb-tools/frontier", default-features = false, branch = "polkadot-v0.9.7" }
fp-rpc = { git = "https://github.com/webb-tools/frontier", default-features = false, branch = "polkadot-v0.9.7" }
pallet-ethereum = { git = "https://github.com/edgeware-network/frontier", default-features = false, branch = "polkadot-v0.9.7" }
pallet-evm = { git = "https://github.com/edgeware-network/frontier", default-features = false, branch = "polkadot-v0.9.7" }
pallet-evm-precompile-simple = { git = "https://github.com/edgeware-network/frontier", default-features = false, branch = "polkadot-v0.9.7" }
pallet-evm-precompile-sha3fips = { git = "https://github.com/edgeware-network/frontier", default-features = false, branch = "polkadot-v0.9.7" }
fp-rpc = { git = "https://github.com/edgeware-network/frontier", default-features = false, branch = "polkadot-v0.9.7" }

static_assertions = "1.1.0"

Expand Down

0 comments on commit a2fca8d

Please sign in to comment.