resolve conflicts

Author: wileyj

Makefile

@@ -2,13 +2,14 @@ COMMANDS := sudo tar zstd getent stress
 $(foreach bin,$(COMMANDS),\
 	$(if $(shell command -v $(bin) 2> /dev/null),$(info),$(error Missing required dependency: `$(bin)`)))
 
-# ifeq (log,$(firstword $(MAKECMDGOALS)))
 TARGET := $(firstword $(MAKECMDGOALS))
 PARAMS := $(filter-out $(TARGET),$(MAKECMDGOALS))
-ifeq (up-genesis,$(firstword $(MAKECMDGOALS)))
+# ifeq (up-genesis,$(firstword $(MAKECMDGOALS)))
+ifeq ($(TARGET),up-genesis)
 	export CHAINSTATE_DIR := $(PWD)/docker/chainstate/genesis
 endif
-ifeq (genesis,$(firstword $(MAKECMDGOALS)))
+# ifeq (genesis,$(firstword $(MAKECMDGOALS)))
+ifeq ($(TARGET),genesis)
 	export CHAINSTATE_DIR := $(PWD)/docker/chainstate/genesis
 endif
 
@@ -33,28 +34,25 @@ $(CHAINSTATE_DIR): /usr/bin/tar /usr/bin/zstd
 	@mkdir -p $@
 	if [ -f "$(CHAINSTATE_ARCHIVE)" -a "$(MAKECMDGOALS)" = "up" ]; then
 		sudo tar --same-owner -xf $(CHAINSTATE_ARCHIVE) -C $(CHAINSTATE_DIR) || false
-		sudo rm -rf $(CHAINSTATE_DIR)/stacks-signer*
 	fi
 
 # Boot the network from the local chainstate archive
-up: check-network-running | $(CHAINSTATE_DIR)
-# up: check-network-running | build $(CHAINSTATE_DIR)
+up: check-not-running | build $(CHAINSTATE_DIR)
 	@echo "Starting $(PROJECT) network from archive at Epoch 3.2"
 	@echo "  Chainstate Dir: $(CHAINSTATE_DIR)"
 	@echo "  Chainstate Archive: $(CHAINSTATE_ARCHIVE)"
 	echo "$(CHAINSTATE_DIR)" > .current-chainstate-dir
 	docker compose -f docker/docker-compose.yml --profile default -p $(PROJECT) up -d
 
-
 # Run the network from genesis
-genesis: check-network-running | $(CHAINSTATE_DIR) /usr/bin/sudo
-# # genesis: check-network-running | build $(CHAINSTATE_DIR) /usr/bin/sudo
+genesis: check-not-running | build $(CHAINSTATE_DIR) /usr/bin/sudo
 	@echo "Starting $(PROJECT) network from genesis"
-	@if [ -d $(PWD)/docker/chainstate/genesis ]; then \
+	@if  [ -d "$(CHAINSTATE_DIR)/logs" ]; then \
 		echo "    Removing existing genesis chainstate dir: $(CHAINSTATE_DIR)"; \
-		sudo rm -rf $(PWD)/docker/chainstate/genesis; \
+		rm -rf $(CHAINSTATE_DIR)/logs; \
 	fi
-	mkdir -p $(PWD)/docker/chainstate/genesis
+	@echo "  Chainstate Dir: $(CHAINSTATE_DIR)"
+	mkdir -p "$(CHAINSTATE_DIR)"
 	echo "$(CHAINSTATE_DIR)" > .current-chainstate-dir
 	docker compose -f docker/docker-compose.yml --profile default -p $(PROJECT) up -d
 
@@ -63,8 +61,7 @@ up-genesis: genesis
 # secondary name to bring down genesis network
 down-genesis: down
 
-# Shut down the netork (chainstate and logs will be preserved, but not logs)
-# todo: we can capture logs. will need to remove them for things like snapshot
+# Shut down the network (chainstate and logs will be preserved, but not logs)
 down: backup-logs current-chainstate-dir
 	@echo "Shutting down $(PROJECT) network"
 	docker compose -f docker/docker-compose.yml --profile default -p $(PROJECT) down
@@ -107,7 +104,6 @@ backup-logs: /usr/bin/sudo
 			exit 1; \
 		fi; \
 		if  [ ! -d "$(ACTIVE_CHAINSTATE_DIR)/logs" ]; then \
-			echo "Chainstate not found $(ACTIVE_CHAINSTATE_DIR)/logs";\
 			mkdir -p $(ACTIVE_CHAINSTATE_DIR)/logs;\
 		fi; \
 		echo "Backing up logs to $(ACTIVE_CHAINSTATE_DIR)/logs"; \
@@ -177,7 +173,7 @@ monitor:
 	./docker/tests/chain-monitor.sh
 
 # if the network is already running, we need to exit (ex: trying to start the network when it's already running)
-check-network-running:
+check-not-running:
 	@if test `docker compose ls --filter name=$(PROJECT) -q`; then \
 		echo ""; \
 		echo "WARNING: Network appears to be running or was not properly shut down."; \
@@ -203,10 +199,10 @@ check-params: | check-running
 		exit 1; \
 	fi
 
-# remove any existing chainstates (leave all docker images/layers)
+# force stop and remove any existing chainstates (leaving all docker images/layers)
 clean: down-force
 	sudo rm -rf ./docker/chainstate/*
 
 
-.PHONY: up genesis up-genesis down-genesis down down-force build build-no-cache log log-all backup-logs current-chainstate-dir snapshot pause unpause stop start restart stress test monitor check-network-running check-running check-params clean
+.PHONY: up genesis up-genesis down-genesis down down-force build build-no-cache log log-all backup-logs current-chainstate-dir snapshot pause unpause stop start restart stress test monitor check-not-running check-running check-params clean
 .ONESHELL: all-in-one-shell

README.md

@@ -111,7 +111,7 @@ This will first bring down the network, then replace the existing `./docker/chai
 ## Containers
 
 - **bitcoin**: Runs a bitcoin regtest node
-- **bitcoin-miner**: creates 5 bitcoin regtest wallets and mines regtest blocks at a configurable cadence
+- **bitcoin-miner**: creates 3 bitcoin regtest wallets and mines regtest blocks at a configurable cadence
 - **stacks-miner-1**: mines stacks blocks and sends events to stacks-signer-1
 - **stacks-miner-2**: mines stacks blocks and sends events to stacks-signer-2
 - **stacks-miner-3**: mines stacks blocks and sends events to stacks-signer-3

docker/stacks/stacks-follower.toml

@@ -1,33 +1,40 @@
+# stacks-node devnet follower confifg
 [node]
-working_dir = "/data/chainstate"
+name = "$MINER_NAME"
 rpc_bind = "0.0.0.0:20443"
 p2p_bind = "0.0.0.0:20444"
+prometheus_bind = "0.0.0.0:9153"
+working_dir = "/data/chainstate"
 bootstrap_node = "$BOOTSTRAP_NODE"
-name = "follower"
-
-use_test_genesis_chainstate = true
-pox_sync_sample_secs = 0
-wait_time_for_blocks = 0
 wait_time_for_microblocks = 0
 mine_microblocks = false
+use_test_genesis_chainstate = true
+pox_sync_sample_secs = 0
+wait_time_for_blocks = 200
 microblock_frequency = 1000
 
+fault_injection_block_push_fail_probability = $BLOCK_PUSH_FAIL_PROBABILITY
+
 [connection_options]
-auth_token = "12345"
+timeout = 15
+connect_timeout = 15
+handshake_timeout = 15
+idle_timeout = 15
+dns_timeout = 15
 private_neighbors = true
 
 [burnchain]
+rpc_port = $BITCOIN_RPC_PORT
+peer_port = $BITCOIN_PEER_PORT
 pox_prepare_length = $POX_PREPARE_LENGTH
 pox_reward_length = $POX_REWARD_LENGTH
-peer_port = $BITCOIN_PEER_PORT
-rpc_port = $BITCOIN_RPC_PORT
 chain = "bitcoin"
 mode = "nakamoto-neon"
 poll_time_secs = 1
 magic_bytes = "T3"
-### bitcoind-regtest connection info
 peer_host = "$BITCOIN_PEER_HOST"
-timeout = 30
+username = "$BITCOIN_RPC_USER"
+password = "$BITCOIN_RPC_PASS"
 
 [[burnchain.epochs]]
 epoch_name = "1.0"
@@ -77,6 +84,12 @@ epoch_name = "3.2"
 address = "ST2SBXRBJJTH7GV5J93HJ62W2NRRQ46XYBK92Y039" # Deployer Account
 amount = 10000000000000000
 
+[[ustx_balance]]
+# This is a 2-3 multi-sig address controlled using the above three
+# addresses. The resulting multi-sig address below was created using the SignerWallet struct.
+address = "SN3R84XZYA63QS28932XQF3G1J8R9PC3W76P9CSQS"
+amount = 10000000000000000
+
 [[ustx_balance]]
 address = "ST24VB7FBXCBV6P0SRDSPSW0Y2J9XHDXNHW9Q8S7H" # Signer 1 Account
 amount = 10000000000000000
@@ -102,11 +115,13 @@ address = "ST1MDWBDVDGAANEH9001HGXQA6XRNK7PX7A7X8M6R" # Stacker 3
 amount = 10000000000000000
 
 [[ustx_balance]]
-# This is a 2-3 multi-sig address controlled using the above three
-# addresses. The resulting multi-sig address below was created using the SignerWallet struct.
-address = "SN3R84XZYA63QS28932XQF3G1J8R9PC3W76P9CSQS"
+address = "ST332DWHNM323264X869MKXFZABSE5WZ60EA07TJ1" # Tester 1
+amount = 10000000000000000
+
+[[ustx_balance]]
+address = "ST2FY5WGSFA209NFHDT08NCB8Y9J3P1H19YR2D674" # Tester 2
 amount = 10000000000000000
 
 [[ustx_balance]]
-address = "ST3497E9JFQ7KB9VEHAZRWYKF3296WQZEXBPXG193" # Demo principal
+address = "ST3SW0AXHXFDHGQY2XMMDHN6T7VPY395WS7ZRGQCD" # Tester 3
 amount = 10000000000000000

docker/stacks/stacks-miner_signer.toml

@@ -1,3 +1,6 @@
+# stacks-node devnet miner config
+# event observers:
+#   - stacks-signer
 [node]
 name = "$MINER_NAME"
 rpc_bind = "0.0.0.0:20443"

docker/stacks/stacks-miner_signer_api.toml

@@ -1,3 +1,7 @@
+# stacks-node devnet miner config
+# event observers:
+#   - stacks-blockchain-api
+#   - stacks-signer
 [node]
 name = "$MINER_NAME"
 rpc_bind = "0.0.0.0:20443"

docker/stacks/stacks-signer.toml

@@ -1,8 +1,8 @@
+# stacks-signer devnet config
 stacks_private_key = "$SIGNER_PRIVATE_KEY"
-node_host = "$STACKS_NODE_HOST"            # eg "127.0.0.1:20443"
-# must be added as event_observer in node config:
-endpoint = "$STACKS_SIGNER_ENDPOINT"          # e.g 127.0.0.1:30000
+node_host = "$STACKS_NODE_HOST"
+endpoint = "$STACKS_SIGNER_ENDPOINT"
 network = "testnet"
 auth_password = "12345"
 db_path = "/data/signer/stacks-signer.sqlite"
-metrics_endpoint = "0.0.0.0:9153"             # expose metrics for external collection
+metrics_endpoint = "0.0.0.0:9153"