Merge pull request #770 from silasdavis/develop

Update bos dependency and expose persistent peers

consensus/tendermint/config.go

@@ -8,10 +8,13 @@ import (
 // are applicable, we may not allow some values to specified, or we may not allow some to be set independently.
 // So this serves as a layer of indirection over Tendermint's real config that we derive from ours.
 type BurrowTendermintConfig struct {
-	Seeds          string
-	ListenAddress  string
-	Moniker        string
-	TendermintRoot string
+	// Initial peers we connect to for peer exchange
+	Seeds string
+	// Peers to which we automatically connect
+	PersistentPeers string
+	ListenAddress   string
+	Moniker         string
+	TendermintRoot  string
 }
 
 func DefaultBurrowTendermintConfig() *BurrowTendermintConfig {
@@ -32,6 +35,7 @@ func (btc *BurrowTendermintConfig) TendermintConfig() *tm_config.Config {
 		conf.Mempool.RootDir = btc.TendermintRoot
 		conf.P2P.RootDir = btc.TendermintRoot
 		conf.P2P.Seeds = btc.Seeds
+		conf.P2P.PersistentPeers = btc.PersistentPeers
 		conf.P2P.ListenAddress = btc.ListenAddress
 		conf.P2P.AuthEnc = false
 		conf.Moniker = btc.Moniker

scripts/deps/bos.sh

 #!/usr/bin/env bash
 
 # The git revision of Bosmarmot/bos we will build and install into ./bin/ for integration tests
-echo "b830643520b03e27365b5b0eb0230b919917ed73"
\ No newline at end of file
+echo "29cf8c75cb5cbfe068468736eecd1c391f8b6c44"
\ No newline at end of file