Merge branch 'devnet-ready' into clean-up-subnet-identities-storage

Author: cuteolaf

evm-tests/run-ci.sh

@@ -19,7 +19,7 @@ if [ "$i" -eq 1000 ]; then
     exit 1
 fi
 
-sleep 5
+sleep 10
 
 if ! nc -z localhost 9944; then
     echo "node subtensor exit, port not available"

node/src/chain_spec/localnet.rs

@@ -34,11 +34,11 @@ pub fn localnet_config(single_authority: bool) -> Result<ChainSpec, String> {
         // aura | grandpa
         if single_authority {
             // single authority allows you to run the network using a single node
-            vec![authority_keys_from_seed("Alice")]
+            vec![authority_keys_from_seed("One")]
         } else {
             vec![
-                authority_keys_from_seed("Alice"),
-                authority_keys_from_seed("Bob"),
+                authority_keys_from_seed("One"),
+                authority_keys_from_seed("Two"),
             ]
         },
         // Pre-funded accounts
@@ -77,6 +77,14 @@ fn localnet_genesis(
             get_account_id_from_seed::<sr25519::Public>("Ferdie"),
             2000000000000u128,
         ),
+        (
+            get_account_id_from_seed::<sr25519::Public>("One"),
+            2000000000000u128,
+        ),
+        (
+            get_account_id_from_seed::<sr25519::Public>("Two"),
+            2000000000000u128,
+        ),
         // ETH
         (
             // Alith - 0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac

runtime/src/lib.rs

@@ -1614,22 +1614,12 @@ pub type TransactionExtensions = (
     frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
 
-parameter_types! {
-    pub const TriumviratePalletStr: &'static str = "Triumvirate";
-    pub const TriumvirateMembersPalletStr: &'static str = "TriumvirateMembers";
-    pub const SenateMembersPalletStr: &'static str = "SenateMembers";
-}
-
 type Migrations = (
     // Leave this migration in the runtime, so every runtime upgrade tiny rounding errors (fractions of fractions
     // of a cent) are cleaned up. These tiny rounding errors occur due to floating point coversion.
     pallet_subtensor::migrations::migrate_init_total_issuance::initialise_total_issuance::Migration<
         Runtime,
     >,
-    // Remove storage from removed governance pallets
-    frame_support::migrations::RemovePallet<TriumviratePalletStr, RocksDbWeight>,
-    frame_support::migrations::RemovePallet<TriumvirateMembersPalletStr, RocksDbWeight>,
-    frame_support::migrations::RemovePallet<SenateMembersPalletStr, RocksDbWeight>,
 );
 
 // Unchecked extrinsic type as expected by this runtime.

scripts/localnet.sh

@@ -87,26 +87,26 @@ echo "*** Building chainspec..."
 echo "*** Chainspec built and output to file"
 
 # Generate node keys
-"$BUILD_DIR/release/node-subtensor" key generate-node-key --chain="$FULL_PATH" --base-path /tmp/alice
-"$BUILD_DIR/release/node-subtensor" key generate-node-key --chain="$FULL_PATH" --base-path /tmp/bob
+"$BUILD_DIR/release/node-subtensor" key generate-node-key --chain="$FULL_PATH" --base-path /tmp/one
+"$BUILD_DIR/release/node-subtensor" key generate-node-key --chain="$FULL_PATH" --base-path /tmp/two
 
 if [ $NO_PURGE -eq 1 ]; then
   echo "*** Purging previous state skipped..."
 else
   echo "*** Purging previous state..."
-  "$BUILD_DIR/release/node-subtensor" purge-chain -y --base-path /tmp/bob --chain="$FULL_PATH" >/dev/null 2>&1
-  "$BUILD_DIR/release/node-subtensor" purge-chain -y --base-path /tmp/alice --chain="$FULL_PATH" >/dev/null 2>&1
+  "$BUILD_DIR/release/node-subtensor" purge-chain -y --base-path /tmp/two --chain="$FULL_PATH" >/dev/null 2>&1
+  "$BUILD_DIR/release/node-subtensor" purge-chain -y --base-path /tmp/one --chain="$FULL_PATH" >/dev/null 2>&1
   echo "*** Previous chainstate purged"
 fi
 
 if [ $BUILD_ONLY -eq 0 ]; then
   echo "*** Starting localnet nodes..."
 
-  alice_start=(
+  one_start=(
     "$BUILD_DIR/release/node-subtensor"
-    --base-path /tmp/alice
+    --base-path /tmp/one
     --chain="$FULL_PATH"
-    --alice
+    --one
     --port 30334
     --rpc-port 9944
     --validator
@@ -116,11 +116,11 @@ if [ $BUILD_ONLY -eq 0 ]; then
     --unsafe-force-node-key-generation
   )
 
-  bob_start=(
+  two_start=(
     "$BUILD_DIR/release/node-subtensor"
-    --base-path /tmp/bob
+    --base-path /tmp/two
     --chain="$FULL_PATH"
-    --bob
+    --two
     --port 30335
     --rpc-port 9945
     --validator
@@ -132,15 +132,15 @@ if [ $BUILD_ONLY -eq 0 ]; then
 
   # Provide RUN_IN_DOCKER local environment variable if run script in the docker image
   if [ "${RUN_IN_DOCKER}" == "1" ]; then
-    alice_start+=(--unsafe-rpc-external)
-    bob_start+=(--unsafe-rpc-external)
+    one_start+=(--unsafe-rpc-external)
+    two_start+=(--unsafe-rpc-external)
   fi
 
   trap 'pkill -P $$' EXIT SIGINT SIGTERM
 
   (
-    ("${alice_start[@]}" 2>&1) &
-    ("${bob_start[@]}" 2>&1)
+    ("${one_start[@]}" 2>&1) &
+    ("${two_start[@]}" 2>&1)
     wait
   )
 fi