Skip to content

Commit bcf28bd

Browse files
authored
Merge pull request #776 from opentensor/feat/bump_testnet_total_issuance
hotfix: bumps testnet total issuance
2 parents 460f175 + cf75652 commit bcf28bd

File tree

8 files changed

+79
-51
lines changed

8 files changed

+79
-51
lines changed

Diff for: Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -176,3 +176,4 @@ runtime-benchmarks = [
176176
"node-subtensor-runtime/runtime-benchmarks",
177177
]
178178
metadata-hash = ["node-subtensor-runtime/metadata-hash"]
179+
testnet = []

Diff for: justfile

+4
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,7 @@ lint:
5252
production:
5353
@echo "Running cargo build with metadata-hash generation..."
5454
cargo +{{RUSTV}} build --profile production --features="runtime-benchmarks metadata-hash"
55+
56+
testnet:
57+
@echo "Running cargo build with testnet config..."
58+
cargo +{{RUSTV}} build --profile production --features="runtime-benchmarks metadata-hash testnet"

Diff for: node/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,4 @@ try-runtime = [
107107
]
108108

109109
metadata-hash = ["node-subtensor-runtime/metadata-hash"]
110+
testnet = []

Diff for: pallets/subtensor/Cargo.toml

+6-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ hex = { workspace = true }
4545
pallet-collective = { version = "4.0.0-dev", default-features = false, path = "../collective" }
4646
pallet-membership = { workspace = true }
4747
hex-literal = { workspace = true }
48-
num-traits = { version = "0.2.19", default-features = false, features = ["libm"] }
48+
num-traits = { version = "0.2.19", default-features = false, features = [
49+
"libm",
50+
] }
4951

5052
[dev-dependencies]
5153
pallet-balances = { workspace = true, features = ["std"] }
@@ -89,7 +91,7 @@ std = [
8991
"serde_with/std",
9092
"substrate-fixed/std",
9193
"num-traits/std",
92-
"serde_json/std"
94+
"serde_json/std",
9395
]
9496
runtime-benchmarks = [
9597
"frame-benchmarking/runtime-benchmarks",
@@ -113,6 +115,7 @@ try-runtime = [
113115
"pallet-transaction-payment/try-runtime",
114116
"pallet-utility/try-runtime",
115117
"sp-runtime/try-runtime",
116-
"pallet-collective/try-runtime"
118+
"pallet-collective/try-runtime",
117119
]
118120
pow-faucet = []
121+
testnet = []

Diff for: pallets/subtensor/src/lib.rs

+12-2
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,18 @@ pub mod pallet {
187187
/// ============================
188188
189189
#[pallet::type_value]
190-
/// Total Rao in circulation.
190+
/// Total TAO Cap.
191191
pub fn TotalSupply<T: Config>() -> u64 {
192-
21_000_000_000_000_000
192+
#[cfg(feature = "testnet")]
193+
{
194+
15_000_000_000_000_000_000
195+
}
196+
#[cfg(not(feature = "testnet"))]
197+
{
198+
21_000_000_000_000_000
199+
}
193200
}
201+
194202
#[pallet::type_value]
195203
/// Default Delegate Take.
196204
pub fn DefaultDelegateTake<T: Config>() -> u16 {
@@ -665,6 +673,8 @@ pub mod pallet {
665673
/// separate accounting.
666674
#[pallet::storage] // --- ITEM ( total_issuance )
667675
pub type TotalIssuance<T> = StorageValue<_, u64, ValueQuery, DefaultTotalIssuance<T>>;
676+
#[pallet::storage] // --- ITEM ( total_supply )
677+
pub type TotalTaoSupplyCap<T> = StorageValue<_, u64, ValueQuery, TotalSupply<T>>;
668678
#[pallet::storage] // --- ITEM ( total_stake )
669679
pub type TotalStake<T> = StorageValue<_, u64, ValueQuery>;
670680
#[pallet::storage] // --- ITEM ( default_delegate_take )

Diff for: runtime/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -207,3 +207,4 @@ try-runtime = [
207207
"pallet-registry/try-runtime",
208208
]
209209
metadata-hash = ["substrate-wasm-builder/metadata-hash"]
210+
testnet = []

Diff for: runtime/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
142142
// `spec_version`, and `authoring_version` are the same between Wasm and native.
143143
// This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
144144
// the compatible custom types.
145-
spec_version: 195,
145+
spec_version: 196,
146146
impl_version: 1,
147147
apis: RUNTIME_API_VERSIONS,
148148
transaction_version: 1,

Diff for: scripts/localnet.sh

+53-45
Original file line numberDiff line numberDiff line change
@@ -15,86 +15,94 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
1515
# The base directory of the subtensor project
1616
BASE_DIR="$SCRIPT_DIR/.."
1717

18-
# get parameters
19-
# Get the value of fast_blocks from the first argument
18+
# Get parameters
2019
fast_blocks=${1:-"True"}
20+
testnet=${2:-"Fale"}
21+
22+
# Initialize FEATURES
23+
FEATURES="pow-faucet runtime-benchmarks"
2124

2225
# Check the value of fast_blocks
23-
if [ "$fast_blocks" == "False" ]; then
24-
# Block of code to execute if fast_blocks is False
25-
echo "fast_blocks is Off"
26-
: "${CHAIN:=local}"
27-
: "${BUILD_BINARY:=1}"
28-
: "${FEATURES:="pow-faucet runtime-benchmarks"}"
26+
if [ "$fast_blocks" == "True" ]; then
27+
echo "fast_blocks is On"
28+
FEATURES+=" fast-blocks"
29+
else
30+
echo "fast_blocks is Off"
31+
fi
32+
33+
# Check the value of testnet
34+
if [ "$testnet" == "True" ]; then
35+
echo "testnet is On"
36+
FEATURES+=" testnet"
2937
else
30-
# Block of code to execute if fast_blocks is not False
31-
echo "fast_blocks is On"
32-
: "${CHAIN:=local}"
33-
: "${BUILD_BINARY:=1}"
34-
: "${FEATURES:="pow-faucet runtime-benchmarks fast-blocks"}"
38+
echo "testnet is Off"
3539
fi
3640

41+
: "${CHAIN:=local}"
42+
: "${BUILD_BINARY:=1}"
43+
3744
SPEC_PATH="${SCRIPT_DIR}/specs/"
3845
FULL_PATH="$SPEC_PATH$CHAIN.json"
3946

47+
4048
# Kill any existing nodes which may have not exited correctly after a previous
4149
# run.
4250
pkill -9 'node-subtensor'
4351

4452
if [ ! -d "$SPEC_PATH" ]; then
45-
echo "*** Creating directory ${SPEC_PATH}..."
46-
mkdir $SPEC_PATH
53+
echo "*** Creating directory ${SPEC_PATH}..."
54+
mkdir $SPEC_PATH
4755
fi
4856

4957
if [[ $BUILD_BINARY == "1" ]]; then
50-
echo "*** Building substrate binary..."
51-
cargo build --workspace --profile=release --features "$FEATURES" --manifest-path "$BASE_DIR/Cargo.toml"
52-
echo "*** Binary compiled"
58+
echo "*** Building substrate binary..."
59+
cargo build --workspace --profile=release --features "$FEATURES" --manifest-path "$BASE_DIR/Cargo.toml"
60+
echo "*** Binary compiled"
5361
fi
5462

5563
echo "*** Building chainspec..."
5664
"$BASE_DIR/target/release/node-subtensor" build-spec --disable-default-bootnode --raw --chain $CHAIN >$FULL_PATH
5765
echo "*** Chainspec built and output to file"
5866

5967
if [ $NO_PURGE -eq 1 ]; then
60-
echo "*** Purging previous state skipped..."
68+
echo "*** Purging previous state skipped..."
6169
else
62-
echo "*** Purging previous state..."
63-
"$BASE_DIR/target/release/node-subtensor" purge-chain -y --base-path /tmp/bob --chain="$FULL_PATH" >/dev/null 2>&1
64-
"$BASE_DIR/target/release/node-subtensor" purge-chain -y --base-path /tmp/alice --chain="$FULL_PATH" >/dev/null 2>&1
65-
echo "*** Previous chainstate purged"
70+
echo "*** Purging previous state..."
71+
"$BASE_DIR/target/release/node-subtensor" purge-chain -y --base-path /tmp/bob --chain="$FULL_PATH" >/dev/null 2>&1
72+
"$BASE_DIR/target/release/node-subtensor" purge-chain -y --base-path /tmp/alice --chain="$FULL_PATH" >/dev/null 2>&1
73+
echo "*** Previous chainstate purged"
6674
fi
6775

6876
echo "*** Starting localnet nodes..."
6977
alice_start=(
70-
"$BASE_DIR/target/release/node-subtensor"
71-
--base-path /tmp/alice
72-
--chain="$FULL_PATH"
73-
--alice
74-
--port 30334
75-
--rpc-port 9946
76-
--validator
77-
--rpc-cors=all
78-
--allow-private-ipv4
79-
--discover-local
78+
"$BASE_DIR/target/release/node-subtensor"
79+
--base-path /tmp/alice
80+
--chain="$FULL_PATH"
81+
--alice
82+
--port 30334
83+
--rpc-port 9946
84+
--validator
85+
--rpc-cors=all
86+
--allow-private-ipv4
87+
--discover-local
8088
)
8189

8290
bob_start=(
83-
"$BASE_DIR"/target/release/node-subtensor
84-
--base-path /tmp/bob
85-
--chain="$FULL_PATH"
86-
--bob
87-
--port 30335
88-
--rpc-port 9945
89-
--validator
90-
--allow-private-ipv4
91-
--discover-local
91+
"$BASE_DIR"/target/release/node-subtensor
92+
--base-path /tmp/bob
93+
--chain="$FULL_PATH"
94+
--bob
95+
--port 30335
96+
--rpc-port 9945
97+
--validator
98+
--allow-private-ipv4
99+
--discover-local
92100
)
93101

94102
trap 'pkill -P $$' EXIT SIGINT SIGTERM
95103

96104
(
97-
("${alice_start[@]}" 2>&1) &
98-
("${bob_start[@]}" 2>&1)
99-
wait
105+
("${alice_start[@]}" 2>&1) &
106+
("${bob_start[@]}" 2>&1)
107+
wait
100108
)

0 commit comments

Comments
 (0)