From 5622336d3fc34c3aa26b3064898a25c22874fcf5 Mon Sep 17 00:00:00 2001 From: Uncle Stinky Date: Sun, 1 Nov 2026 18:59:48 +0300 Subject: [PATCH] move back to the weav prefix Signed-off-by: Uncle Stinky --- Cargo.lock | 2 +- pallets/weaver/src/lib.rs | 2 +- pallets/weaver/src/tests.rs | 4 ++-- runtime/casper/Cargo.toml | 2 +- runtime/casper/src/lib.rs | 2 +- scripts/starter.sh | 14 +++++++------- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b544348..6339a55 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1195,7 +1195,7 @@ dependencies = [ [[package]] name = "casper-runtime" -version = "4.0.18" +version = "4.0.19" dependencies = [ "casper-runtime-constants", "frame-benchmarking", diff --git a/pallets/weaver/src/lib.rs b/pallets/weaver/src/lib.rs index c3cb54d..c5c5c50 100644 --- a/pallets/weaver/src/lib.rs +++ b/pallets/weaver/src/lib.rs @@ -66,7 +66,7 @@ pub use pallet::*; pub mod sr25519 { mod app_sr25519 { use sp_application_crypto::{app_crypto, sr25519, KeyTypeId}; - const WEAVER: KeyTypeId = KeyTypeId(*b"wevr"); + const WEAVER: KeyTypeId = KeyTypeId(*b"weav"); app_crypto!(sr25519, WEAVER); } diff --git a/pallets/weaver/src/tests.rs b/pallets/weaver/src/tests.rs index 072ad75..57b7386 100644 --- a/pallets/weaver/src/tests.rs +++ b/pallets/weaver/src/tests.rs @@ -284,7 +284,7 @@ fn offchain_worker_should_fetch_block_and_submit_unsigned_tx() { ); sp_io::crypto::sr25519_generate( - sp_core::crypto::KeyTypeId(*b"wevr"), + sp_core::crypto::KeyTypeId(*b"weav"), Some(b"//Alice".to_vec()), ); }); @@ -465,7 +465,7 @@ fn offchain_worker_should_fetch_hash_and_submit_unsigned_tx() { ); sp_io::crypto::sr25519_generate( - sp_core::crypto::KeyTypeId(*b"wevr"), + sp_core::crypto::KeyTypeId(*b"weav"), Some(b"//Alice".to_vec()), ); }); diff --git a/runtime/casper/Cargo.toml b/runtime/casper/Cargo.toml index f59e2d6..e7ee7eb 100644 --- a/runtime/casper/Cargo.toml +++ b/runtime/casper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "casper-runtime" -version = "4.0.18" +version = "4.0.19" build = "build.rs" description = "Runtime of the Casper Network" edition.workspace = true diff --git a/runtime/casper/src/lib.rs b/runtime/casper/src/lib.rs index 93086ce..5112ad5 100644 --- a/runtime/casper/src/lib.rs +++ b/runtime/casper/src/lib.rs @@ -124,7 +124,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("casper"), impl_name: create_runtime_str!("casper-svengali"), authoring_version: 0, - spec_version: 12, + spec_version: 13, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, diff --git a/scripts/starter.sh b/scripts/starter.sh index 177f99a..e6a66bd 100755 --- a/scripts/starter.sh +++ b/scripts/starter.sh @@ -122,7 +122,7 @@ help() { echo -e "-c, --specification-path\n\tPath to specification ('/etc/ghost' is default)." echo -e "-n, --specification-name\n\tSpecification name to be used ('casper' is default)." echo -e "--generate-genesis\n\tGenerate keys to participate in the genesis file." - echo -e "--fix-weaver-keystore\n\tFix keystore prefixes (weav -> wevr) to ensure the offchain worker can find the key." + echo -e "--fix-weaver-keystore\n\tFix keystore prefixes (wevr -> weav) to ensure the offchain worker can find the key." echo -e "--hard-reset-i-know-what-im-doing\n\tWill completely remove ledger along with associated session keys." echo -e "-h, --help\n\tPrints help information." } @@ -465,7 +465,7 @@ if [ $CHECK_KEYS = true ]; then rpc_endpoint="${rpc_endpoint:-localhost:9945}" fi - for type in $(echo audi babe gran wevr exds); do + for type in $(echo audi babe gran weav exds); do echo "[+] parsing session key for [$type]" scheme="sr25519" if [ $type = "gran" ]; then @@ -534,7 +534,7 @@ if [ $UNIT_FILE = true ]; then fi if [ $FIX_WEAVER_KEYSTORE = true ]; then - echo "[+] Starting keystore prefix fix (weav -> wevr)..." + echo "[+] Starting keystore prefix fix (wevr -> weav)..." KEYSTORE_DIR="${BASE_PATH%/}/chains/${SPECIFICATION_NAME}_staging_testnet/keystore" @@ -547,8 +547,8 @@ if [ $FIX_WEAVER_KEYSTORE = true ]; then exit 1 fi - WRONG_PREFIX="77656176" # "weav" - CORRECT_PREFIX="77657672" # "wevr" + WRONG_PREFIX="77657672" # "wevr" + CORRECT_PREFIX="77656176" # "weav" CHANGES_MADE=0 while IFS= read -r file; do @@ -611,7 +611,7 @@ if [ "$GENERATE_GENESIS" = true ]; then BABE_HEX=$(ghost key inspect --scheme=sr25519 "$SESSION_SEED//babe" | grep "Public key (hex)" | awk '{print $4}' | sed 's/^0x//') GRAN_HEX=$(ghost key inspect --scheme=ed25519 "$SESSION_SEED//gran" | grep "Public key (hex)" | awk '{print $4}' | sed 's/^0x//') AUDI_HEX=$(ghost key inspect --scheme=sr25519 "$SESSION_SEED//audi" | grep "Public key (hex)" | awk '{print $4}' | sed 's/^0x//') - WEVR_HEX=$(ghost key inspect --scheme=sr25519 "$SESSION_SEED//wevr" | grep "Public key (hex)" | awk '{print $4}' | sed 's/^0x//') + WEAV_HEX=$(ghost key inspect --scheme=sr25519 "$SESSION_SEED//weav" | grep "Public key (hex)" | awk '{print $4}' | sed 's/^0x//') EXDS_HEX=$(ghost key inspect --scheme=sr25519 "$SESSION_SEED//exds" | grep "Public key (hex)" | awk '{print $4}' | sed 's/^0x//') STASH_SS58=$(ghost key inspect --scheme=sr25519 "$STASH_SEED" | grep "SS58 Address" | awk '{print $3}') @@ -625,7 +625,7 @@ if [ "$GENERATE_GENESIS" = true ]; then echo " .with_babe_id(BabeId::unchecked_from(hex!(\"$BABE_HEX\")))" echo " .with_grandpa_id(GrandpaId::unchecked_from(hex!(\"$GRAN_HEX\")))" echo " .with_authority_id(AuthorityDiscoveryId::unchecked_from(hex!(\"$AUDI_HEX\")))" - echo " .with_weaver_id(WeaverId::unchecked_from(hex!(\"$WEVR_HEX\")))" + echo " .with_weaver_id(WeaverId::unchecked_from(hex!(\"$WEAV_HEX\")))" echo " .with_exodus_id(ExodusId::unchecked_from(hex!(\"$EXDS_HEX\")))" echo " .build()," echo ""