diff --git a/.github/workflows/chain-spec-snapshot-build.yml b/.github/workflows/chain-spec-snapshot-build.yml index 1f5e65fcf8..fefa1651b8 100644 --- a/.github/workflows/chain-spec-snapshot-build.yml +++ b/.github/workflows/chain-spec-snapshot-build.yml @@ -28,16 +28,16 @@ jobs: - name: Generate testnet chain specifications run: | - docker run --rm -u root ${{ steps.build.outputs.digest }} build-spec --chain gemini-3f-compiled --disable-default-bootnode > chain-spec-gemini-3f.json - docker run --rm -u root ${{ steps.build.outputs.digest }} build-spec --chain gemini-3f-compiled --disable-default-bootnode --raw > chain-spec-raw-gemini-3f.json + docker run --rm -u root ${{ steps.build.outputs.digest }} build-spec --chain gemini-3g-compiled --disable-default-bootnode > chain-spec-gemini-3g.json + docker run --rm -u root ${{ steps.build.outputs.digest }} build-spec --chain gemini-3g-compiled --disable-default-bootnode --raw > chain-spec-raw-gemini-3g.json - name: Upload chain specifications to artifacts uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # @v3.1.1 with: name: chain-specifications path: | - chain-spec-gemini-3f.json - chain-spec-raw-gemini-3f.json + chain-spec-gemini-3g.json + chain-spec-raw-gemini-3g.json if-no-files-found: error - name: Upload chain specifications to assets @@ -45,4 +45,4 @@ jobs: env: GITHUB_TOKEN: ${{ github.token }} with: - asset_paths: '["chain-spec-gemini-3f.json", "chain-spec-raw-gemini-3f.json"]' + asset_paths: '["chain-spec-gemini-3g.json", "chain-spec-raw-gemini-3g.json"]' diff --git a/crates/subspace-node/src/chain_spec.rs b/crates/subspace-node/src/chain_spec.rs index caf8ff26cf..6ca2d563f0 100644 --- a/crates/subspace-node/src/chain_spec.rs +++ b/crates/subspace-node/src/chain_spec.rs @@ -91,13 +91,13 @@ struct GenesisParams { confirmation_depth_k: u32, } -pub fn gemini_3f_compiled() -> Result, String> { +pub fn gemini_3g_compiled() -> Result, String> { Ok(ConsensusChainSpec::from_genesis( // Name - "Subspace Gemini 3f", + "Subspace Gemini 3g", // ID - "subspace_gemini_3f", - ChainType::Custom("Subspace Gemini 3f".to_string()), + "subspace_gemini_3g", + ChainType::Custom("Subspace Gemini 3g".to_string()), || { let sudo_account = AccountId::from_ss58check("5DNwQTHfARgKoa2NdiUM51ZUow7ve5xG9S2yYdSbVQcnYxBA") @@ -171,7 +171,7 @@ pub fn gemini_3f_compiled() -> Result, .map_err(|error| error.to_string())?, ), // Protocol ID - Some("subspace-gemini-3f"), + Some("subspace-gemini-3g"), None, // Properties Some({ @@ -187,8 +187,8 @@ pub fn gemini_3f_compiled() -> Result, )) } -pub fn gemini_3f_config() -> Result, String> { - unimplemented!("Please use release prefixed with Gemini-3f.") +pub fn gemini_3g_config() -> Result, String> { + unimplemented!("Please use release prefixed with Gemini-3g.") } pub fn devnet_config() -> Result, String> { diff --git a/crates/subspace-node/src/domain/cli.rs b/crates/subspace-node/src/domain/cli.rs index 1f7b279229..0a43b12836 100644 --- a/crates/subspace-node/src/domain/cli.rs +++ b/crates/subspace-node/src/domain/cli.rs @@ -292,13 +292,13 @@ impl BuildGenesisStorageCmd { let is_dev = self.shared_params.is_dev(); let chain_id = self.shared_params.chain_id(is_dev); let domain_genesis_config = match chain_id.as_str() { - "gemini-3f" => evm_chain_spec::get_testnet_genesis_by_spec_id(SpecId::Gemini).0, + "gemini-3g" => evm_chain_spec::get_testnet_genesis_by_spec_id(SpecId::Gemini).0, "devnet" => evm_chain_spec::get_testnet_genesis_by_spec_id(SpecId::DevNet).0, "dev" => evm_chain_spec::get_testnet_genesis_by_spec_id(SpecId::Dev).0, "" | "local" => evm_chain_spec::get_testnet_genesis_by_spec_id(SpecId::Local).0, unknown_id => { eprintln!( - "unknown chain {unknown_id:?}, expected gemini-3f, devnet, dev, or local", + "unknown chain {unknown_id:?}, expected gemini-3g, devnet, dev, or local", ); return Ok(()); } diff --git a/crates/subspace-node/src/domain/evm_chain_spec.rs b/crates/subspace-node/src/domain/evm_chain_spec.rs index 70c51ef44c..8c76bbc022 100644 --- a/crates/subspace-node/src/domain/evm_chain_spec.rs +++ b/crates/subspace-node/src/domain/evm_chain_spec.rs @@ -89,14 +89,14 @@ pub fn local_testnet_config RuntimeGenesisConfig + 'static + Send + S ) } -pub fn gemini_3f_config RuntimeGenesisConfig + 'static + Send + Sync>( +pub fn gemini_3g_config RuntimeGenesisConfig + 'static + Send + Sync>( constructor: F, ) -> ExecutionChainSpec { ExecutionChainSpec::from_genesis( // Name - "Subspace Gemini 3f EVM Domain", + "Subspace Gemini 3g EVM Domain", // ID - "subspace_gemini_3f_evm_domain", + "subspace_gemini_3g_evm_domain", ChainType::Live, constructor, // Bootnodes @@ -104,7 +104,7 @@ pub fn gemini_3f_config RuntimeGenesisConfig + 'static + Send + Sync> // Telemetry None, // Protocol ID - Some("subspace-gemini-3f-evm-domain"), + Some("subspace-gemini-3g-evm-domain"), None, // Properties Some(chain_spec_properties()), @@ -143,7 +143,7 @@ pub fn load_chain_spec(spec_id: &str) -> Result, Stri let chain_spec = match spec_id { "dev" => development_config(move || constructor(SpecId::Dev)), - "gemini-3f" => gemini_3f_config(move || constructor(SpecId::Gemini)), + "gemini-3g" => gemini_3g_config(move || constructor(SpecId::Gemini)), "devnet" => devnet_config(move || constructor(SpecId::DevNet)), "" | "local" => local_testnet_config(move || constructor(SpecId::Local)), path => ChainSpec::from_json_file(std::path::PathBuf::from(path))?, @@ -243,7 +243,7 @@ pub fn create_domain_spec( let constructor = RuntimeGenesisConfig::default; let mut chain_spec = match chain_id { "dev" => development_config(constructor), - "gemini-3f" => gemini_3f_config(constructor), + "gemini-3g" => gemini_3g_config(constructor), "devnet" => devnet_config(constructor), "" | "local" => local_testnet_config(constructor), path => ChainSpec::from_json_file(std::path::PathBuf::from(path))?, diff --git a/crates/subspace-node/src/lib.rs b/crates/subspace-node/src/lib.rs index 8fcbbe1ec7..eac10b0085 100644 --- a/crates/subspace-node/src/lib.rs +++ b/crates/subspace-node/src/lib.rs @@ -350,8 +350,8 @@ impl SubstrateCli for Cli { fn load_spec(&self, id: &str) -> Result, String> { let mut chain_spec = match id { - "gemini-3f-compiled" => chain_spec::gemini_3f_compiled()?, - "gemini-3f" => chain_spec::gemini_3f_config()?, + "gemini-3g-compiled" => chain_spec::gemini_3g_compiled()?, + "gemini-3g" => chain_spec::gemini_3g_config()?, "devnet" => chain_spec::devnet_config()?, "devnet-compiled" => chain_spec::devnet_config_compiled()?, "dev" => chain_spec::dev_config()?, diff --git a/docs/farming.md b/docs/farming.md index d2d6b610b7..99be6a280f 100644 --- a/docs/farming.md +++ b/docs/farming.md @@ -44,9 +44,9 @@ If you're connected directly without any router, then again nothing needs to be # Replace `INSERT_YOUR_ID` with a nickname you choose # Copy all of the lines below, they are all part of the same command .\NODE_FILE_NAME.exe ` ---chain gemini-3f ` +--chain gemini-3g ` --blocks-pruning 256 ` ---state-pruning archive ` +--state-pruning archive-canonical ` --no-private-ipv4 ` --validator ` --name "INSERT_YOUR_ID" @@ -95,9 +95,9 @@ If you're connected directly without any router, then again nothing needs to be # Replace `INSERT_YOUR_ID` with a nickname you choose # Copy all of the lines below, they are all part of the same command ./NODE_FILE_NAME \ - --chain gemini-3f \ + --chain gemini-3g \ --blocks-pruning 256 \ - --state-pruning archive \ + --state-pruning archive-canonical \ --no-private-ipv4 \ --validator \ --name "INSERT_YOUR_ID" @@ -149,9 +149,9 @@ After this, simply repeat the step you prompted for (step 4 or 6). This time, cl # Replace `INSERT_YOUR_ID` with a nickname you choose # Copy all of the lines below, they are all part of the same command ./NODE_FILE_NAME \ - --chain gemini-3f \ + --chain gemini-3g \ --blocks-pruning 256 \ - --state-pruning archive \ + --state-pruning archive-canonical \ --no-private-ipv4 \ --validator \ --name "INSERT_YOUR_ID" @@ -213,10 +213,10 @@ services: - "0.0.0.0:30433:30433/udp" restart: unless-stopped command: [ - "--chain", "gemini-3f", + "--chain", "gemini-3g", "--base-path", "/var/subspace", "--blocks-pruning", "256", - "--state-pruning", "archive", + "--state-pruning", "archive-canonical", "--port", "30333", "--dsn-listen-on", "/ip4/0.0.0.0/udp/30433/quic-v1", "--dsn-listen-on", "/ip4/0.0.0.0/tcp/30433", @@ -284,7 +284,7 @@ You can read logs with `docker-compose logs --tail=1000 -f`, for the rest read [ ## Checking results and interacting with the network -Visit [Polkadot.js explorer](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Feu-0.gemini-3f.subspace.network%2Fws#/explorer), from there you can interact with Subspace Network as any Substrate-based blockchain. +Visit [Polkadot.js explorer](https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Feu-0.gemini-3g.subspace.network%2Fws#/explorer), from there you can interact with Subspace Network as any Substrate-based blockchain. ## Switching from older/different versions of Subspace @@ -295,7 +295,7 @@ If you were running a node previously, and want to switch to a new snapshot, ple # Replace `FARMER_FILE_NAME` with the name of the node file you downloaded from releases ./FARMER_FILE_NAME wipe PATH_TO_FARM # Replace `NODE_FILE_NAME` with the name of the node file you downloaded from releases -./NODE_FILE_NAME purge-chain --chain gemini-3f +./NODE_FILE_NAME purge-chain --chain gemini-3g ``` Does not matter if the node/farmer executable is the previous one or from the new snapshot, both will work :) The reason we require this is, with every snapshot change, the network might get partitioned, and you may be on a different genesis than the current one. @@ -319,8 +319,8 @@ Below are some helpful samples: - `./FARMER_FILE_NAME info PATH_TO_FARM`: show information about the farm at `PATH_TO_FARM` - `./FARMER_FILE_NAME scrub PATH_TO_FARM`: Scrub the farm to find and fix farm at `PATH_TO_FARM` corruption - `./FARMER_FILE_NAME wipe PATH_TO_FARM`: erases everything related to farmer if data were stored in `PATH_TO_FARM` -- `./NODE_FILE_NAME --base-path NODE_DATA_PATH --chain gemini-3f ...`: start node and store data in `NODE_DATA_PATH` instead of default location -- `./NODE_FILE_NAME purge-chain --base-path NODE_DATA_PATH --chain gemini-3f`: erases data related to the node if data were stored in `NODE_DATA_PATH` +- `./NODE_FILE_NAME --base-path NODE_DATA_PATH --chain gemini-3g ...`: start node and store data in `NODE_DATA_PATH` instead of default location +- `./NODE_FILE_NAME purge-chain --base-path NODE_DATA_PATH --chain gemini-3g`: erases data related to the node if data were stored in `NODE_DATA_PATH` Examples: ```bash