Skip to content

Commit

Permalink
Increase protocol and net version
Browse files Browse the repository at this point in the history
Signed-off-by: Yilun <[email protected]>
  • Loading branch information
yilunzhang committed Jul 9, 2019
1 parent d97c52c commit c69df04
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ build_local: ## Build local binaries without providing specific GOOS/GOARCH
$(GC) $(BUILD_NKNC_PARAM) nknc.go
## the following parts will be removed after the transition period from testnet to mainnet
[ -s "wallet.dat" ] && [ -s "wallet.pswd" ] && ! [ -s "wallet.json" ] && cat wallet.pswd wallet.pswd | ./nknc wallet -c || :
grep -qE "022d52b07dff29ae6ee22295da2dc315fef1e2337de7ab6e51539d379aa35b9503|0149c42944eea91f094c16538eff0449d4d1e236f31c8c706b2e40e98402984c" config.json && ! [ -s "config.json.bk" ] && mv config.json config.json.bk && cp config.mainnet.json config.json || :
[ -s "config.json" ] && ! [ -s "config.json.bk" ] && grep -qE "022d52b07dff29ae6ee22295da2dc315fef1e2337de7ab6e51539d379aa35b9503|0149c42944eea91f094c16538eff0449d4d1e236f31c8c706b2e40e98402984c" config.json && mv config.json config.json.bk && cp config.mainnet.json config.json || :
rm -f Chain/*.ldb

.PHONY: build_local_with_proxy
Expand Down
2 changes: 1 addition & 1 deletion nknd.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
)

const (
NetVersionNum = 1 // This is temporary and will be removed soon after mainnet is stabilized
NetVersionNum = 2 // This is temporary and will be removed soon after mainnet is stabilized
)

var (
Expand Down
4 changes: 2 additions & 2 deletions node/neighbor.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
)

const (
maxNumRandomNeighbors = 16
randomNeighborConnectInterval = config.ConsensusTimeout
maxNumRandomNeighbors = 8
randomNeighborConnectInterval = 5 * config.ConsensusTimeout
)

// The neighbor node list
Expand Down
6 changes: 3 additions & 3 deletions util/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ const (
GenerateIDBlockDelay = 8
RandomBeaconUniqueLength = vrf.Size
RandomBeaconLength = vrf.Size + vrf.ProofSize
ProtocolVersion = 10
MinCompatibleProtocolVersion = 10
MaxCompatibleProtocolVersion = 19
ProtocolVersion = 20
MinCompatibleProtocolVersion = 20
MaxCompatibleProtocolVersion = 29
DefaultTxPoolCap = 32
ShortHashSize = uint32(8)
MaxAssetPrecision = uint32(8)
Expand Down

0 comments on commit c69df04

Please sign in to comment.