merge with dev

[bytom/bytom.git] / account / accounts.go

diff --git a/account/accounts.go b/account/accounts.go
index fc404b0..81f1f3a 100644 (file)
--- a/account/accounts.go
+++ b/account/accounts.go
@@ -3,9 +3,7 @@ package account
 
 import (
        "context"
-       "encoding/binary"
        "encoding/json"
-       "sort"
        "strings"
        "sync"
        "time"
@@ -27,14 +25,17 @@ import (
 )
 
 const (
-       maxAccountCache = 1000
-       aliasPrefix     = "ALI:"
-       accountPrefix   = "ACC:"
-       accountCPPrefix = "ACP:"
-       indexPrefix     = "ACIDX:"
+       maxAccountCache     = 1000
+       aliasPrefix         = "ALI:"
+       accountCPPrefix     = "ACP:"
+       contractIndexPrefix = "ACPI:"
 )
 
-var miningAddressKey = []byte("miningAddress")
+var (
+       miningAddressKey = []byte("miningAddress")
+       accountIndexKey  = []byte("accountIndex")
+       accountPrefix    = []byte("ACC:")
+)
 
 // pre-define errors for supporting bytom errorFormatter
 var (
@@ -47,20 +48,9 @@ func aliasKey(name string) []byte {
        return []byte(aliasPrefix + name)
 }
 
-func indexKeys(xpubs []chainkd.XPub) []byte {
-       xpubStrings := make([]string, len(xpubs))
-       for i, xpub := range xpubs {
-               xpubStrings[i] = xpub.String()
-       }
-       sort.Strings(xpubStrings)
-       suffix := strings.Join(xpubStrings, "")
-
-       return []byte(indexPrefix + suffix)
-}
-
 //Key account store prefix
 func Key(name string) []byte {
-       return []byte(accountPrefix + name)
+       return append(accountPrefix, []byte(name)...)
 }
 
 //CPKey account control promgram store prefix
@@ -68,15 +58,8 @@ func CPKey(hash common.Hash) []byte {
        return append([]byte(accountCPPrefix), hash[:]...)
 }
 
-func convertUnit64ToBytes(nextIndex uint64) []byte {
-       buf := make([]byte, 8)
-       binary.PutUvarint(buf, nextIndex)
-       return buf
-}
-
-func convertBytesToUint64(rawIndex []byte) uint64 {
-       result, _ := binary.Uvarint(rawIndex)
-       return result
+func contractIndexKey(accountID string) []byte {
+       return append([]byte(contractIndexPrefix), []byte(accountID)...)
 }
 
 // NewManager creates a new account manager
@@ -132,17 +115,29 @@ type Account struct {
        Alias string
 }
 
-func (m *Manager) getNextXpubsIndex(xpubs []chainkd.XPub) uint64 {
+func (m *Manager) getNextAccountIndex() uint64 {
        m.accIndexMu.Lock()
        defer m.accIndexMu.Unlock()
 
        var nextIndex uint64 = 1
-       if rawIndexBytes := m.db.Get(indexKeys(xpubs)); rawIndexBytes != nil {
-               nextIndex = convertBytesToUint64(rawIndexBytes) + 1
+       if rawIndexBytes := m.db.Get(accountIndexKey); rawIndexBytes != nil {
+               nextIndex = common.BytesToUnit64(rawIndexBytes) + 1
        }
 
-       m.db.Set(indexKeys(xpubs), convertUnit64ToBytes(nextIndex))
+       m.db.Set(accountIndexKey, common.Unit64ToBytes(nextIndex))
+       return nextIndex
+}
+
+func (m *Manager) getNextContractIndex(accountID string) uint64 {
+       m.accIndexMu.Lock()
+       defer m.accIndexMu.Unlock()
+
+       nextIndex := uint64(1)
+       if rawIndexBytes := m.db.Get(contractIndexKey(accountID)); rawIndexBytes != nil {
+               nextIndex = common.BytesToUnit64(rawIndexBytes) + 1
+       }
 
+       m.db.Set(contractIndexKey(accountID), common.Unit64ToBytes(nextIndex))
        return nextIndex
 }
 
@@ -153,7 +148,7 @@ func (m *Manager) Create(ctx context.Context, xpubs []chainkd.XPub, quorum int,
                return nil, ErrDuplicateAlias
        }
 
-       signer, err := signers.Create("account", xpubs, quorum, m.getNextXpubsIndex(xpubs))
+       signer, err := signers.Create("account", xpubs, quorum, m.getNextAccountIndex())
        id := signers.IDGenerate()
        if err != nil {
                return nil, errors.Wrap(err)
@@ -286,7 +281,7 @@ func (m *Manager) ListCtrlProgramsByAccountId(ctx context.Context, accountId str
 }
 
 func (m *Manager) createP2PKH(ctx context.Context, account *Account, change bool) (*CtrlProgram, error) {
-       idx := m.getNextXpubsIndex(account.Signer.XPubs)
+       idx := m.getNextContractIndex(account.ID)
        path := signers.Path(account.Signer, signers.AccountKeySpace, idx)
        derivedXPubs := chainkd.DeriveXPubs(account.XPubs, path)
        derivedPK := derivedXPubs[0].PublicKey()
@@ -313,7 +308,7 @@ func (m *Manager) createP2PKH(ctx context.Context, account *Account, change bool
 }
 
 func (m *Manager) createP2SH(ctx context.Context, account *Account, change bool) (*CtrlProgram, error) {
-       idx := m.getNextXpubsIndex(account.Signer.XPubs)
+       idx := m.getNextContractIndex(account.ID)
        path := signers.Path(account.Signer, signers.AccountKeySpace, idx)
        derivedXPubs := chainkd.DeriveXPubs(account.XPubs, path)
        derivedPKs := chainkd.XPubKeys(derivedXPubs)
@@ -441,9 +436,9 @@ func (m *Manager) DeleteAccount(aliasOrId string) (err error) {
 }
 
 // ListAccounts will return the accounts in the db
-func (m *Manager) ListAccounts(id string) ([]*Account, error) {
+func (m *Manager) ListAccounts() ([]*Account, error) {
        accounts := []*Account{}
-       accountIter := m.db.IteratorPrefix([]byte(accountPrefix + id))
+       accountIter := m.db.IteratorPrefix(accountPrefix)
        defer accountIter.Release()
 
        for accountIter.Next() {