Merge branch 'dev' into cross-builds

ava-labs · Sep 29, 2020 · 30d0850 · 30d0850
2 parents 8316464 + 7aedeb9
commit 30d0850
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/api/keystore/service.go b/api/keystore/service.go
@@ -30,6 +30,9 @@ import (
 const (
 	// maxUserLen is the maximum allowed length of a username
 	maxUserLen = 1024
+
+	maxPackerSize  = 1 << 30 // max size, in bytes, of something being marshalled by Marshal()
+	maxSliceLength = 1 << 18
 )
 
 var (
@@ -75,7 +78,7 @@ type Keystore struct {
 // Initialize the keystore
 func (ks *Keystore) Initialize(log logging.Logger, db database.Database) {
 	ks.log = log
-	ks.codec = codec.NewDefault()
+	ks.codec = codec.New(maxPackerSize, maxSliceLength)
 	ks.users = make(map[string]*password.Hash)
 	ks.userDB = prefixdb.New([]byte("users"), db)
 	ks.bcDB = prefixdb.New([]byte("bcs"), db)

diff --git a/node/node.go b/node/node.go
@@ -64,7 +64,7 @@ var (
 	genesisHashKey = []byte("genesisID")
 
 	// Version is the version of this code
-	Version       = version.NewDefaultVersion(constants.PlatformName, 1, 0, 0)
+	Version       = version.NewDefaultVersion(constants.PlatformName, 1, 0, 1)
 	versionParser = version.NewDefaultParser()
 )