modify input address to xpub

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

diff --git a/account/accounts.go b/account/accounts.go
index 9f87d53..8a3f6c3 100644 (file)
--- a/account/accounts.go
+++ b/account/accounts.go
@@ -39,11 +39,9 @@ var (
 
 // pre-define errors for supporting bytom errorFormatter
 var (
-       ErrDuplicateAlias  = errors.New("duplicate account alias")
-       ErrFindAccount     = errors.New("fail to find account")
-       ErrMarshalAccount  = errors.New("failed marshal account")
-       ErrInvalidAddress  = errors.New("invalid address")
-       ErrFindCtrlProgram = errors.New("fail to find account control program")
+       ErrDuplicateAlias = errors.New("duplicate account alias")
+       ErrFindAccount    = errors.New("fail to find account")
+       ErrMarshalAccount = errors.New("failed marshal account")
 )
 
 func aliasKey(name string) []byte {
@@ -441,49 +439,3 @@ func (m *Manager) ListControlProgram() ([]*CtrlProgram, error) {
 
        return cps, nil
 }
-
-// GetAccountByAddress return account by given address
-func (m *Manager) GetAccountByAddress(address string) (*Account, error) {
-       addr, err := common.DecodeAddress(address, &consensus.ActiveNetParams)
-       if err != nil {
-               return nil, err
-       }
-
-       redeemContract := addr.ScriptAddress()
-       program := []byte{}
-       switch addr.(type) {
-       case *common.AddressWitnessPubKeyHash:
-               program, err = vmutil.P2WPKHProgram(redeemContract)
-       case *common.AddressWitnessScriptHash:
-               program, err = vmutil.P2WSHProgram(redeemContract)
-       default:
-               return nil, ErrInvalidAddress
-       }
-       if err != nil {
-               return nil, err
-       }
-
-       var hash [32]byte
-       cp := CtrlProgram{}
-       sha3pool.Sum256(hash[:], program)
-       rawProgram := m.db.Get(ContractKey(hash))
-       if rawProgram == nil {
-               return nil, ErrFindCtrlProgram
-       }
-
-       if err := json.Unmarshal(rawProgram, &cp); err != nil {
-               return nil, err
-       }
-
-       rawAccount := m.db.Get(Key(cp.AccountID))
-       if rawAccount == nil {
-               return nil, ErrFindAccount
-       }
-
-       account := &Account{}
-       if err := json.Unmarshal(rawAccount, account); err != nil {
-               return nil, err
-       }
-
-       return account, nil
-}