Merge pull request #2688 from blockstack/feat/update-develop

Update develop with latest master

Author: lgalabru

README.md

@@ -129,7 +129,7 @@ cargo run --bin blockstack-cli generate-sk --testnet
 #  stacksAddress: "ST2ZRX0K27GW0SP3GJCEMHD95TQGJMKB7G9Y0X1MH"
 # }
 ```
-This keypair is already registered in the `Stacks.toml` file, so it can be used as presented here. 
+This keypair is already registered in the `testnet-follower-conf.toml` file, so it can be used as presented here. 
 
 We will interact with the following simple contract `kv-store`. In our examples, we will assume this contract is saved to `./kv-store.clar`:
 
@@ -178,10 +178,10 @@ cargo run --bin blockstack-cli publish b8d99fd45da58038d630d9855d3ca2466e8e0f89d
 You can observe the state machine in action locally by running:
 
 ```bash
-cargo testnet start --config=./testnet/stacks-node/Stacks.toml
+cargo testnet start --config=./testnet/stacks-node/conf/testnet-follower-conf.toml
 ```
 
-`Stacks.toml` is a configuration file that you can use for setting genesis balances or configuring Event observers.  You can grant an address an initial account balance by adding the following entries:
+`testnet-follower-conf.toml` is a configuration file that you can use for setting genesis balances or configuring Event observers.  You can grant an address an initial account balance by adding the following entries:
 
 ```
 [[ustx_balance]]

src/main.rs

@@ -716,7 +716,7 @@ simulating a miner.
             StacksChainState::open(false, 0x80000000, old_chainstate_path).unwrap();
         let old_sortition_db = SortitionDB::open(old_sort_path, true).unwrap();
 
-        // initial argon balances -- see testnet/stacks-node/conf/argon-follower-conf.toml
+        // initial argon balances -- see testnet/stacks-node/conf/testnet-follower-conf.toml
         let initial_balances = vec![
             (
                 StacksAddress::from_string("STB44HYPYAT2BB2QE513NSP81HTMYWBJP02HPGK6")

testnet/stacks-node/conf/argon-follower-conf.toml

@@ -2,16 +2,21 @@
 rpc_bind = "127.0.0.1:30443"
 p2p_bind = "127.0.0.1:30444"
 bootstrap_node = "04ee0b1602eb18fef7986887a7e8769a30c9df981d33c8380d255edef003abdcd243a0eb74afdf6740e6c423e62aec631519a24cf5b1d62bf8a3e06ddc695dcb77@127.0.0.1:20444"
-miner = false
 pox_sync_sample_secs = 10
+wait_time_for_microblocks = 0
 
 [burnchain]
 chain = "bitcoin"
 mode = "krypton"
 peer_host = "127.0.0.1"
-rpc_port = 28443
+rpc_port = 18443
 peer_port = 18444
-poll_time_secs = 5
+
+# Used for sending events to a local stacks-blockchain-api service
+# [[events_observer]]
+# endpoint = "localhost:3700"
+# retry_count = 255
+# events_keys = ["*"]
 
 [[ustx_balance]]
 # "mnemonic": "point approve language letter cargo rough similar wrap focus edge polar task olympic tobacco cinnamon drop lawn boring sort trade senior screen tiger climb",
@@ -40,7 +45,3 @@ amount = 100000000000000
 # "btcAddress": "mkEDDqbELrKYGUmUbTAyQnmBAEz4V1MAro",
 address = "STSTW15D618BSZQB85R058DS46THH86YQQY6XCB7"
 amount = 100000000000000
-
-# [[events_observer]]
-# endpoint = "http://127.0.0.1:8080"
-# events_keys = ["*"]

testnet/stacks-node/conf/local-follower-conf.toml

@@ -4,7 +4,6 @@ p2p_bind = "127.0.0.1:20444"
 seed = "0000000000000000000000000000000000000000000000000000000000000000"
 local_peer_seed = "0000000000000000000000000000000000000000000000000000000000000000"
 miner = true
-mine_microblocks = false
 prometheus_bind = "127.0.0.1:4000"
 pox_sync_sample_secs = 10
 wait_time_for_microblocks = 0
@@ -13,9 +12,8 @@ wait_time_for_microblocks = 0
 chain = "bitcoin"
 mode = "krypton"
 peer_host = "127.0.0.1"
-rpc_port = 28443
+rpc_port = 18443
 peer_port = 18444
-poll_time_secs = 5
 
 [[ustx_balance]]
 # "mnemonic": "point approve language letter cargo rough similar wrap focus edge polar task olympic tobacco cinnamon drop lawn boring sort trade senior screen tiger climb",
@@ -44,8 +42,3 @@ amount = 100000000000000
 # "btcAddress": "mkEDDqbELrKYGUmUbTAyQnmBAEz4V1MAro",
 address = "STSTW15D618BSZQB85R058DS46THH86YQQY6XCB7"
 amount = 100000000000000
-
-
-# [[events_observer]]
-# endpoint = "http://127.0.0.1:8080"
-# events_keys = ["*"]

testnet/stacks-node/conf/local-leader-conf.toml

@@ -0,0 +1,20 @@
+[node]
+# working_dir = "/dir/to/save/chainstate"
+rpc_bind = "0.0.0.0:20443"
+p2p_bind = "0.0.0.0:20444"
+bootstrap_node = "02da7a464ac770ae8337a343670778b93410f2f3fef6bea98dd1c3e9224459d36b@seed-0.mainnet.stacks.co:20444,02afeae522aab5f8c99a00ddf75fbcb4a641e052dd48836408d9cf437344b63516@seed-1.mainnet.stacks.co:20444,03652212ea76be0ed4cd83a25c06e57819993029a7b9999f7d63c36340b34a4e62@seed-2.mainnet.stacks.co:20444"
+
+[burnchain]
+chain = "bitcoin"
+mode = "mainnet"
+peer_host = "bitcoind.stacks.co"
+username = "blockstack"
+password = "blockstacksystem"
+rpc_port = 8332
+peer_port = 8333
+
+# Used for sending events to a local stacks-blockchain-api service
+# [[events_observer]]
+# endpoint = "localhost:3700"
+# retry_count = 255
+# events_keys = ["*"]

testnet/stacks-node/conf/local-second-miner.toml

@@ -1,4 +1,5 @@
 [node]
+# working_dir = "/dir/to/save/chainstate"
 rpc_bind = "0.0.0.0:20443"
 p2p_bind = "0.0.0.0:20444"
 seed = "<YOUR_SEED>"
@@ -10,9 +11,9 @@ bootstrap_node = "02da7a464ac770ae8337a343670778b93410f2f3fef6bea98dd1c3e9224459
 chain = "bitcoin"
 mode = "mainnet"
 peer_host = "127.0.0.1"
-rpc_port = 8332
-peer_port = 8333
 username = "<USERNAME>"
 password = "<PASSWORD>"
+rpc_port = 8332
+peer_port = 8333
 satoshis_per_byte = 100
 burn_fee_cap = 20000

testnet/stacks-node/conf/mainnet-follower-conf.toml

@@ -0,0 +1,33 @@
+[node]
+# working_dir = "/dir/to/save/chainstate"
+rpc_bind = "0.0.0.0:20443"
+p2p_bind = "0.0.0.0:20444"
+bootstrap_node = "04ee0b1602eb18fef7986887a7e8769a30c9df981d33c8380d255edef003abdcd243a0eb74afdf6740e6c423e62aec631519a24cf5b1d62bf8a3e06ddc695dcb77@127.0.0.1:20444"
+wait_time_for_microblocks = 10000
+use_test_genesis_chainstate = true
+
+[burnchain]
+chain = "bitcoin"
+mode = "mocknet"
+
+# Used for sending events to a local stacks-blockchain-api service
+# [[events_observer]]
+# endpoint = "localhost:3700"
+# retry_count = 255
+# events_keys = ["*"]
+
+[[ustx_balance]]
+address = "ST3EQ88S02BXXD0T5ZVT3KW947CRMQ1C6DMQY8H19"
+amount = 100000000000000
+
+[[ustx_balance]]
+address = "ST3KCNDSWZSFZCC6BE4VA9AXWXC9KEB16FBTRK36T"
+amount = 100000000000000
+
+[[ustx_balance]]
+address = "STB2BWB0K5XZGS3FXVTG3TKS46CQVV66NAK3YVN8"
+amount = 100000000000000
+
+[[ustx_balance]]
+address = "STSTW15D618BSZQB85R058DS46THH86YQQY6XCB7"
+amount = 100000000000000

testnet/stacks-node/conf/mainnet-miner-conf.toml

@@ -0,0 +1,29 @@
+[node]
+# working_dir = "/dir/to/save/chainstate"
+rpc_bind = "0.0.0.0:20443"
+p2p_bind = "0.0.0.0:20444"
+seed = "0000000000000000000000000000000000000000000000000000000000000000"
+local_peer_seed = "0000000000000000000000000000000000000000000000000000000000000000"
+miner = true
+wait_time_for_microblocks = 10000
+use_test_genesis_chainstate = true
+
+[burnchain]
+chain = "bitcoin"
+mode = "mocknet"
+
+[[ustx_balance]]
+address = "ST3EQ88S02BXXD0T5ZVT3KW947CRMQ1C6DMQY8H19"
+amount = 100000000000000
+
+[[ustx_balance]]
+address = "ST3KCNDSWZSFZCC6BE4VA9AXWXC9KEB16FBTRK36T"
+amount = 100000000000000
+
+[[ustx_balance]]
+address = "STB2BWB0K5XZGS3FXVTG3TKS46CQVV66NAK3YVN8"
+amount = 100000000000000
+
+[[ustx_balance]]
+address = "STSTW15D618BSZQB85R058DS46THH86YQQY6XCB7"
+amount = 100000000000000