Skip to content

Commit d666996

Browse files
committed
Merge branch 'devnet-ready' into feat/solidity-get-stake
2 parents 51c47b4 + 12a0f71 commit d666996

Some content is hidden

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

78 files changed

+9468
-10181
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 24 additions & 22 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

@@ -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 = "b9c606f9", default-features = false }
170-
fp-rpc = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
171-
fp-self-contained = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", 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 = "b9c606f9", default-features = false }
175-
fc-storage = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
176-
fc-db = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
177-
fc-consensus = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
178-
fp-consensus = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
179-
fp-dynamic-fee = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
180-
fc-api = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
181-
fc-rpc = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
182-
fc-rpc-core = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
183-
fc-mapping-sync = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", 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 = "b9c606f9", default-features = false }
187-
pallet-dynamic-fee = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
188-
pallet-ethereum = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
189-
pallet-evm = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
190-
pallet-evm-chain-id = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
191-
pallet-evm-precompile-modexp = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
192-
pallet-evm-precompile-sha3fips = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
193-
pallet-evm-precompile-simple = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", default-features = false }
194-
pallet-hotfix-sufficients = { git = "https://github.com/gztensor/frontier", rev = "b9c606f9", 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 }

node/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ fp-rpc = { workspace = true }
103103
fc-mapping-sync = { workspace = true }
104104
fp-consensus = { workspace = true }
105105
thiserror = { workspace = true }
106+
num-traits = { version = "0.2", features = ["std"] }
106107

107108
# Local Dependencies
108109
node-subtensor-runtime = { path = "../runtime" }

node/src/chain_spec/localnet.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,5 +120,8 @@ fn localnet_genesis(
120120
"senateMembers": {
121121
"members": senate_members,
122122
},
123+
"evmChainId": {
124+
"chainId": 42,
125+
},
123126
})
124127
}

pallets/admin-utils/src/benchmarking.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -264,17 +264,6 @@ mod benchmarks {
264264
_(RawOrigin::Root, 1u16/*netuid*/, true/*enabled*/)/*set_commit_reveal_weights_enabled*/;
265265
}
266266

267-
#[benchmark]
268-
fn sudo_set_hotkey_emission_tempo() {
269-
pallet_subtensor::Pallet::<T>::init_new_network(
270-
1u16, /*netuid*/
271-
1u16, /*sudo_tempo*/
272-
);
273-
274-
#[extrinsic_call]
275-
_(RawOrigin::Root, 1u64/*emission_tempo*/)/*set_hotkey_emission_tempo*/;
276-
}
277-
278267
#[benchmark]
279268
fn sudo_set_network_max_stake() {
280269
pallet_subtensor::Pallet::<T>::init_new_network(1u16 /*netuid*/, 1u16 /*tempo*/);

0 commit comments

Comments
 (0)