Merge pull request #25 from phoreproject/BIP44_key_generation

Bip44 key generation
phoreproject · Jun 27, 2019 · 24a870e · 24a870e
2 parents 9bbd2e7 + f7ecd6d
commit 24a870e
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/api/jsonapi_data_test.go b/api/jsonapi_data_test.go
@@ -302,7 +302,7 @@ const moderatorValidJSON = `{
 
 const walletMneumonicJSONResponse = `{"mnemonic": "pulp open fabric travel possible slogan sense piano fog knock weird merge"}`
 
-const walletAddressJSONResponse = `{"address": "PCNz5VN3ddp4EdfdiZBZhhxFRazuGwT3Wg"}`
+const walletAddressJSONResponse = `{"address": "PUne5vo5PuMujpV6usfbJ7QSeKKUJaZ3g2"}`
 
 //const walletBalanceJSONResponse = `{"confirmed": 0, "unconfirmed": 0, "height": 0}`
 

diff --git a/api/notifier.go b/api/notifier.go
@@ -85,7 +85,7 @@ func (notifier *smtpNotifier) notify(n repo.Notifier) error {
  "To: %s",
  "MIME-Version: 1.0",
  "Content-Type: text/html; charset=UTF-8",
- "Subject: [OpenBazaar] %s\r\n",
+ "Subject: [Phore Marketplace] %s\r\n",
  "%s\r\n",
  }, "\r\n")
  head, body, ok := n.GetSMTPTitleAndBody()

diff --git a/bitcoin/phored/wallet.go b/bitcoin/phored/wallet.go
@@ -62,7 +62,7 @@ type RPCWallet struct {
 // NewRPCWallet creates a new wallet given
 func NewRPCWallet(mnemonic string, params *chaincfg.Params, repoPath string, DB wallet.Datastore, host string) (*RPCWallet, error) {
  if mnemonic == "" {
- ent, _ := b39.NewEntropy(128)
+ ent, _ := b39.NewEntropy(256)
  mnemonic, _ = b39.NewMnemonic(ent)
  }
 
@@ -88,7 +88,7 @@ func NewRPCWallet(mnemonic string, params *chaincfg.Params, repoPath string, DB
  return nil, err
  }
 
- keyManager, err := spvwallet.NewKeyManager(DB.Keys(), params, mPrivKey)
+ keyManager, err := spvwallet.NewKeyManager(DB.Keys(), params, mPrivKey, wallet.Phore)
  if err != nil {
  return nil, err
  }

diff --git a/core/core.go b/core/core.go
@@ -29,7 +29,7 @@ import (
 )
 
 var (
- VERSION = "1.3.4"
+ VERSION = "2.0.0"
  USERAGENT = "/Phore-Marketplace-go:" + VERSION + "/"
 )
 

diff --git a/repo/init.go b/repo/init.go
@@ -273,7 +273,7 @@ func addConfigExtensions(repoRoot string) error {
 }
 
 func createMnemonic(newEntropy func(int) ([]byte, error), newMnemonic func([]byte) (string, error)) (string, error) {
- entropy, err := newEntropy(128)
+ entropy, err := newEntropy(256)
  if err != nil {
  return "", err
  }

diff --git a/schema/manager.go b/schema/manager.go
@@ -450,7 +450,7 @@ func CreateIdentityKey(mnemonic string) ([]byte, error) {
 
 // NewMnemonic will return a randomly-generated BIP-39 compliant mnemonic
 func NewMnemonic() (string, error) {
- entropy, err := bip39.NewEntropy(128)
+ entropy, err := bip39.NewEntropy(256)
  if err != nil {
  return "", fmt.Errorf("creating entropy: %s", err.Error())
  }

diff --git a/vendor/github.com/phoreproject/spvwallet/keys.go b/vendor/github.com/phoreproject/spvwallet/keys.go
diff --git a/vendor/github.com/phoreproject/spvwallet/wallet.go b/vendor/github.com/phoreproject/spvwallet/wallet.go
diff --git a/vendor/github.com/phoreproject/wallet-interface/datastore.go b/vendor/github.com/phoreproject/wallet-interface/datastore.go