diff --git a/docker-compose-follower.yml b/docker-compose-follower.yml index 6e74233..73be466 100644 --- a/docker-compose-follower.yml +++ b/docker-compose-follower.yml @@ -19,7 +19,10 @@ x-common-vars: - &STACKS_31_HEIGHT ${STACKS_31_HEIGHT:-132} - &STACKS_32_HEIGHT ${STACKS_32_HEIGHT:-133} - &STACKS_33_HEIGHT ${STACKS_33_HEIGHT:-134} - - &STACKS_CHAIN_ID ${STACKS_CHAIN_ID:-0x80000000} + - &POX_PREPARE_LENGTH ${POX_PREPARE_LENGTH:-5} + - &POX_REWARD_LENGTH ${POX_REWARD_LENGTH:-20} + - &STACKS_CHAIN_ID ${STACKS_CHAIN_ID:-0x80000100} + - &LOCAL_PEER_SEED ${LOCAL_PEER_SEED:-d302a8e65ac96752b5a9564d99615c3318dbc50305c1d3cf48b647d7232e3702} services: stacks-node-follower: @@ -60,7 +63,10 @@ services: STACKS_31_HEIGHT: *STACKS_31_HEIGHT STACKS_32_HEIGHT: *STACKS_32_HEIGHT STACKS_33_HEIGHT: *STACKS_33_HEIGHT + POX_PREPARE_LENGTH: *POX_PREPARE_LENGTH + POX_REWARD_LENGTH: *POX_REWARD_LENGTH STACKS_CHAIN_ID: *STACKS_CHAIN_ID + LOCAL_PEER_SEED: *LOCAL_PEER_SEED entrypoint: - /bin/bash - -c diff --git a/docker-compose.yml b/docker-compose.yml index 6b262cc..6943652 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,9 +30,7 @@ x-common-vars: - &POX_REWARD_LENGTH ${POX_REWARD_LENGTH:-20} - &REWARD_RECIPIENT ${REWARD_RECIPIENT:-STQM73RQC4EX0A07KWG1J5ECZJYBZS4SJ4ERC6WN} # priv: 6ad9cadb42d4edbfbe0c5bfb3b8a4125ddced021c4174f829b714ccbf527f02001 - &EXIT_FROM_MONITOR 1 # set to "1" to automatically shut down via monitor.ts - # Choose one to override the default - - &STACKS_CHAIN_ID ${STACKS_CHAIN_ID:-0x80000000} - # - &STACKS_CHAIN_ID ${STACKS_CHAIN_ID:-0x80000100} + - &STACKS_CHAIN_ID ${STACKS_CHAIN_ID:-0x80000100} - &CUSTOM_CHAIN_IDS ${CUSTOM_CHAIN_IDS:-testnet=0x55005500,mainnet=12345678,mainnet=0xdeadbeaf,testnet=0x80000100} services: @@ -218,7 +216,8 @@ services: stacks-node: networks: - - stacks + stacks: + ipv4_address: 10.0.0.20 build: context: . dockerfile: Dockerfile.stacks-node @@ -485,5 +484,8 @@ services: networks: stacks: + ipam: + config: + - subnet: "10.0.0.0/24" volumes: chainstate: diff --git a/stacks-krypton-follower.toml b/stacks-krypton-follower.toml index 6a89a8c..6019848 100644 --- a/stacks-krypton-follower.toml +++ b/stacks-krypton-follower.toml @@ -5,22 +5,19 @@ p2p_bind = "0.0.0.0:20444" bootstrap_node = "$MINER_PUB_KEY@stacks-node:20444" working_dir = "$DATA_DIR" -# local_peer_seed = "$LOCAL_PEER_SEED" +local_peer_seed = "$LOCAL_PEER_SEED" miner = false use_test_genesis_chainstate = true pox_sync_sample_secs = 0 wait_time_for_blocks = 0 -wait_time_for_microblocks = 50 +wait_time_for_microblocks = 0 microblock_frequency = 1000 # mine_microblocks = true # max_microblocks = 10 -[miner] -first_attempt_time_ms = 5000 -subsequent_attempt_time_ms = 5000 - [connection_options] +private_neighbors = true inv_sync_interval = 10 download_interval = 10 walk_interval = 10 @@ -32,9 +29,11 @@ disable_inbound_walks = false chain = "bitcoin" mode = "krypton" poll_time_secs = 1 -pox_2_activation = $STACKS_POX2_HEIGHT +magic_bytes = "T3" +pox_prepare_length = $POX_PREPARE_LENGTH +pox_reward_length = $POX_REWARD_LENGTH +burn_fee_cap = 20_000 chain_id = $STACKS_CHAIN_ID - ### bitcoind-regtest connection info peer_host = "$BITCOIN_PEER_HOST" peer_port = $BITCOIN_PEER_PORT @@ -92,6 +91,7 @@ start_height = $STACKS_32_HEIGHT epoch_name = "3.3" start_height = $STACKS_33_HEIGHT + [[ustx_balance]] address = "STB44HYPYAT2BB2QE513NSP81HTMYWBJP02HPGK6" amount = 10000000000000000 @@ -162,4 +162,4 @@ amount = 10000000000000000 address = "STT8DSJTWAW9TVJ1B17SD3S6F7SYH4TXG7TWS7Q9" amount = 10000000000000000 # privateKey = 16226f674796712dfbd53bf402304579b8b6d04d4bed4d466bf84ce6db973d4401 -# mnemonic = "essay grief twin tube concert idea prosper good alarm goddess shell glare hurt belt endless patch lumber wrap labor body erupt brown style test" \ No newline at end of file +# mnemonic = "essay grief twin tube concert idea prosper good alarm goddess shell glare hurt belt endless patch lumber wrap labor body erupt brown style test" diff --git a/stacks-krypton-miner.toml b/stacks-krypton-miner.toml index 772d200..3b28e94 100644 --- a/stacks-krypton-miner.toml +++ b/stacks-krypton-miner.toml @@ -31,10 +31,11 @@ $REWARD_RECIPIENT_CONF # inv_sync_interval = 10 # download_interval = 10 # walk_interval = 10 -disable_block_download = true +disable_block_download = false disable_inbound_handshakes = false disable_inbound_walks = false -public_ip_address = "1.1.1.1:1234" +public_ip_address = "10.0.0.20:20444" +private_neighbors = true auth_token = "12345" # Add stacks-api as an event observer