diff --git a/Dockerfile.e2e b/Dockerfile.e2e index cac2800..a8ad2af 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -3,7 +3,7 @@ FROM rust:bookworm as builder # A commit hash, tag, or branch -ARG GIT_COMMIT=16bb6887f84a299b5bbbe4c469337169849ce6ed +ARG GIT_COMMIT=390dffc7e3593711c1f55505d3308063a2039df6 ARG BLOCKCHAIN_REPO=https://github.com/stacks-network/stacks-blockchain.git ARG TARGETPLATFORM @@ -41,12 +41,12 @@ RUN < run.sh <<'EOM' STACKS_PID=$! function start_miner() { + DEFAULT_TIMEOUT=$(date -v+30S +%s) while true; do TX=$(bitcoin-cli listtransactions '*' 1 0 true) CONFS=$(echo "$TX" | jq '.[].confirmations') + NOW=$(date +%s) if [ "$CONFS" = "0" ]; then echo "Detected Stacks mining mempool tx, mining btc block..." bitcoin-cli generatetoaddress 1 $BTC_ADDR + DEFAULT_TIMEOUT=$(date -v+30S +%s) + elif [[ $NOW -ge $DEFAULT_TIMEOUT ]]; then + bitcoin-cli generatetoaddress 1 $BTC_ADDR + DEFAULT_TIMEOUT=$(date -v+30S +%s) fi sleep $MINE_INTERVAL done diff --git a/stacks-krypton-miner.toml b/stacks-krypton-miner.toml index 7667611..c715eb1 100644 --- a/stacks-krypton-miner.toml +++ b/stacks-krypton-miner.toml @@ -2,6 +2,8 @@ name = "krypton-node" rpc_bind = "0.0.0.0:20443" p2p_bind = "0.0.0.0:20444" +data_url = "http://127.0.0.1:20443" +p2p_address = "127.0.0.1:20443" working_dir = "$DATA_DIR" seed = "$MINER_SEED" @@ -10,15 +12,20 @@ local_peer_seed = "$MINER_SEED" miner = true use_test_genesis_chainstate = true pox_sync_sample_secs = 0 -wait_time_for_blocks = 0 -wait_time_for_microblocks = 50 +wait_time_for_blocks = 200 +wait_time_for_microblocks = 0 +mine_microblocks = false microblock_frequency = 1000 # mine_microblocks = true # max_microblocks = 10 [miner] -first_attempt_time_ms = 5000 -subsequent_attempt_time_ms = 5000 +min_tx_fee = 1 +first_attempt_time_ms = 180_000 +second_attempt_time_ms = 360_000 +wait_for_block_download = false +microblock_attempt_time_ms = 10 +self_signing_seed = 1 $REWARD_RECIPIENT_CONF [connection_options] @@ -32,10 +39,12 @@ public_ip_address = "1.1.1.1:1234" [burnchain] chain = "bitcoin" -mode = "neon" +mode = "nakamoto-neon" poll_time_secs = 1 -pox_prepare_length = 3 -pox_2_activation = $STACKS_POX2_HEIGHT +magic_bytes = "T3" +pox_prepare_length = 5 +pox_reward_length = 10 +burn_fee_cap = 20_000 ### bitcoind-regtest connection info peer_host = "$BITCOIN_PEER_HOST"