Skip to content

Commit 2016b12

Browse files
committed
Merge branch 'devnet-ready' into fix-return_per_1000
2 parents fcd3220 + 12a0f71 commit 2016b12

File tree

97 files changed

+12151
-10628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+12151
-10628
lines changed

Cargo.lock

Lines changed: 205 additions & 238 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ members = [
2929
"pallets/admin-utils",
3030
"pallets/collective",
3131
"pallets/registry",
32+
"primitives/*",
3233
"runtime",
3334
"support/tools",
3435
"support/macros",
@@ -82,6 +83,7 @@ quote = "1"
8283
proc-macro2 = { version = "1", features = ["span-locations"] }
8384
thiserror = "1.0"
8485
walkdir = "2"
86+
approx = "0.5"
8587

8688
subtensor-macros = { path = "support/macros" }
8789

@@ -138,7 +140,7 @@ sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag
138140
sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
139141
sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409" }
140142
sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
141-
sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409" }
143+
sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
142144
sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
143145
sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
144146
sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
@@ -166,32 +168,32 @@ sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk.git", tag
166168
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2409", default-features = false }
167169

168170
# Frontier
169-
fp-evm = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
170-
fp-rpc = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
171-
fp-self-contained = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false, features = [
171+
fp-evm = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
172+
fp-rpc = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
173+
fp-self-contained = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false, features = [
172174
"serde",
173175
] }
174-
fp-account = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
175-
fc-storage = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
176-
fc-db = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
177-
fc-consensus = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
178-
fp-consensus = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
179-
fp-dynamic-fee = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
180-
fc-api = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
181-
fc-rpc = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
182-
fc-rpc-core = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
183-
fc-mapping-sync = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
176+
fp-account = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
177+
fc-storage = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
178+
fc-db = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
179+
fc-consensus = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
180+
fp-consensus = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
181+
fp-dynamic-fee = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
182+
fc-api = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
183+
fc-rpc = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
184+
fc-rpc-core = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
185+
fc-mapping-sync = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
184186

185187
# Frontier FRAME
186-
pallet-base-fee = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
187-
pallet-dynamic-fee = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
188-
pallet-ethereum = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
189-
pallet-evm = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
190-
pallet-evm-chain-id = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
191-
pallet-evm-precompile-modexp = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
192-
pallet-evm-precompile-sha3fips = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
193-
pallet-evm-precompile-simple = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
194-
pallet-hotfix-sufficients = { git = "https://github.com/gztensor/frontier", rev = "b8e3025", default-features = false }
188+
pallet-base-fee = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
189+
pallet-dynamic-fee = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
190+
pallet-ethereum = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
191+
pallet-evm = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
192+
pallet-evm-chain-id = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
193+
pallet-evm-precompile-modexp = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
194+
pallet-evm-precompile-sha3fips = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
195+
pallet-evm-precompile-simple = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
196+
pallet-hotfix-sufficients = { git = "https://github.com/opentensor/frontier", rev = "635bdac882", default-features = false }
195197

196198
#DRAND
197199
pallet-drand = { path = "pallets/drand", default-features = false }

chainspecs/plain_spec_devnet.json

Lines changed: 2 additions & 7 deletions
Large diffs are not rendered by default.

chainspecs/plain_spec_finney.json

Lines changed: 3 additions & 1 deletion
Large diffs are not rendered by default.

chainspecs/raw_spec_devnet.json

Lines changed: 85 additions & 53 deletions
Large diffs are not rendered by default.

chainspecs/raw_spec_finney.json

Lines changed: 3 additions & 1 deletion
Large diffs are not rendered by default.

nakamoto_gen.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

node/Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ clap = { workspace = true, features = ["derive"] }
2525
futures = { workspace = true, features = ["thread-pool"] }
2626
scale-codec = { workspace = true }
2727
serde = { workspace = true, features = ["derive"] }
28+
hex = { workspace = true }
2829

2930
# Storage import
3031
memmap2 = { workspace = true }
@@ -102,6 +103,7 @@ fp-rpc = { workspace = true }
102103
fc-mapping-sync = { workspace = true }
103104
fp-consensus = { workspace = true }
104105
thiserror = { workspace = true }
106+
num-traits = { version = "0.2", features = ["std"] }
105107

106108
# Local Dependencies
107109
node-subtensor-runtime = { path = "../runtime" }

node/src/chain_spec/code_substitute_2585476.txt

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

node/src/chain_spec/devnet.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,23 @@ pub fn devnet_config() -> Result<ChainSpec, String> {
3030
// Keys for debug
3131
authority_keys_from_ss58(
3232
"5D5ABUyMsdmJdH7xrsz9vREq5eGXr5pXhHxix2dENQR62dEo",
33-
"5DLBJuPvyPYit5h5ZaYiF8NvCweXCozUs6pLx3fng1mdVcbw",
33+
"5H3qMjQjoeZxZ98jzDmoCwbz2sugd5fDN1wrr8Phf49zemKL",
3434
),
3535
authority_keys_from_ss58(
3636
"5GbRc5sNDdhcPAU9suV2g9P5zyK1hjAQ9JHeeadY1mb8kXoM",
37-
"5ELAzpniRUzAtvydVLmfs5ogbjzoBVxfn6XrN91ahBeDukoY",
37+
"5GbkysfaCjK3cprKPhi3CUwaB5xWpBwcfrkzs6FmqHxej8HZ",
3838
),
3939
authority_keys_from_ss58(
4040
"5CoVWwBwXz2ndEChGcS46VfSTb3RMUZzZzAYdBKo263zDhEz",
41-
"5EHVLDoMqjWrBnUrNtj8FAb1sFFg97vydLGydH8vz7BGs9Qf",
41+
"5HTLp4BvPp99iXtd8YTBZA1sMfzo8pd4mZzBJf7HYdCn2boU",
4242
),
4343
authority_keys_from_ss58(
4444
"5EekcbqupwbgWqF8hWGY4Pczsxp9sbarjDehqk7bdyLhDCwC",
45-
"5CdFyer8NZ4m8QXAHkgZ7zQ8oM8U6N5XrMSDzcMWdDjbAwUg",
45+
"5GAemcU4Pzyfe8DwLwDFx3aWzyg3FuqYUCCw2h4sdDZhyFvE",
4646
),
4747
authority_keys_from_ss58(
4848
"5GgdEQyS5DZzUwKuyucEPEZLxFKGmasUFm1mqM3sx1MRC5RV",
49-
"5FYgXyYc59s9c161swNEf4VEGezLd3q5ca6rSYWuJPjbBNKf",
49+
"5EibpMomXmgekxcfs25SzFBpGWUsG9Lc8ALNjXN3TYH5Tube",
5050
),
5151
],
5252
// Sudo account

0 commit comments

Comments
 (0)