ethwallet: switch package level var to func

Author: pkieltyka

ethwallet/ethwallet.go

@@ -44,7 +44,7 @@ func NewWalletFromPrivateKey(key string) (*Wallet, error) {
 
 func NewWalletFromHDNode(hdnode *HDNode, optPath ...accounts.DerivationPath) (*Wallet, error) {
 	var err error
-	derivationPath := DefaultBaseDerivationPath
+	derivationPath := DefaultBaseDerivationPath()
 	if len(optPath) > 0 {
 		derivationPath = optPath[0]
 	}
@@ -82,7 +82,7 @@ func NewWalletFromRandomEntropy(options ...WalletOptions) (*Wallet, error) {
 
 func NewWalletFromMnemonic(mnemonic string, optPath ...string) (*Wallet, error) {
 	var err error
-	derivationPath := DefaultBaseDerivationPath
+	derivationPath := DefaultBaseDerivationPath()
 	if len(optPath) > 0 {
 		derivationPath, err = ParseDerivationPath(optPath[0])
 		if err != nil {

ethwallet/hdnode.go

@@ -14,17 +14,23 @@ import (
 	"github.com/tyler-smith/go-bip39"
 )
 
-// DefaultBaseDerivationPath is the base path from which custom derivation endpoints
-// are incremented. As such, the first account will be at m/44'/60'/0'/0/0, the second
-// at m/44'/60'/0'/0/1, etc.
-var DefaultBaseDerivationPath = accounts.DefaultBaseDerivationPath
-
 // Entropy bit size constants for 12 and 24 word mnemonics
 const (
 	EntropyBitSize12WordMnemonic = 128
 	EntropyBitSize24WordMnemonic = 256
 )
 
+// DefaultBaseDerivationPath is the base path from which custom derivation endpoints
+// are incremented. As such, the first account will be at m/44'/60'/0'/0/0, the second
+// at m/44'/60'/0'/0/1, etc.
+var defaultBaseDerivationPath = accounts.DefaultBaseDerivationPath
+
+func DefaultBaseDerivationPath() accounts.DerivationPath {
+	derivationPath := make(accounts.DerivationPath, len(defaultBaseDerivationPath))
+	copy(derivationPath, defaultBaseDerivationPath)
+	return derivationPath
+}
+
 type HDNode struct {
 	masterKey  *hdkeychain.ExtendedKey
 	privateKey *ecdsa.PrivateKey
@@ -82,7 +88,7 @@ func NewHDNodeFromEntropy(entropy []byte, path *accounts.DerivationPath) (*HDNod
 
 	var derivationPath accounts.DerivationPath
 	if path == nil {
-		derivationPath = DefaultBaseDerivationPath
+		derivationPath = DefaultBaseDerivationPath()
 	} else {
 		derivationPath = *path
 	}