add insertAccountControlProgram

diff --git a/blockchain/account/accounts.go b/blockchain/account/accounts.go
index 12a0f34..5f677d2 100644 (file)
--- a/blockchain/account/accounts.go
+++ b/blockchain/account/accounts.go
@@ -10,7 +10,7 @@ import (
     "fmt"
 
        "github.com/golang/groupcache/lru"
-       //"github.com/lib/pq"
+       "github.com/lib/pq"
 
 //     "chain/core/pin"
        "github.com/bytom/blockchain/signers"
@@ -97,13 +97,13 @@ func (m *Manager) Create(ctx context.Context, xpubs []chainkd.XPub, quorum int,
        if err != nil {
                return nil, errors.Wrap(err)
        }
-
-       /*tagsParam, err := tagsToNullString(tags)
+/*
+       tagsParam , err := tagsToNullString(tags)
        if err != nil {
                return nil, err
        }
-    */
-    var tagsParam []byte
+*/
+    var tagsPar []byte
 
 /*     aliasSQL := stdsql.NullString{
                String: alias,
@@ -123,7 +123,7 @@ func (m *Manager) Create(ctx context.Context, xpubs []chainkd.XPub, quorum int,
     account_alias := []byte(fmt.Sprintf("account_alias:%v", signer.ID))
     account_tags := []byte(fmt.Sprintf("account_tags:%v", signer.ID))
     m.db.Set(account_alias, []byte(alias))
-    m.db.Set(account_tags, []byte(tagsParam))
+    m.db.Set(account_tags, []byte(tagsPar))
     alias_account := []byte(fmt.Sprintf("alias_account:%v", alias))
     m.db.Set(alias_account, []byte(signer.ID))
 
@@ -147,8 +147,8 @@ func (m *Manager) UpdateTags(ctx context.Context, id, alias *string, tags map[st
        if (id == nil) == (alias == nil) {
                return errors.Wrap(ErrBadIdentifier)
        }
-
-/*     tagsParam, err := tagsToNullString(tags)
+/*
+       tagsParam , err := tagsToNullString(tags)
        if err != nil {
                return errors.Wrap(err, "convert tags")
        }
@@ -289,14 +289,14 @@ func (m *Manager) CreateControlProgram(ctx context.Context, accountID string, ch
        if err != nil {
                return nil, err
        }
-       /*err = m.insertAccountControlProgram(ctx, cp)
+       err = m.insertAccountControlProgram(ctx, cp)
        if err != nil {
                return nil, err
-       }*/
+       }
        return cp.controlProgram, nil
 }
 
-/*
+
 func (m *Manager) insertAccountControlProgram(ctx context.Context, progs ...*controlProgram) error {
        const q = `
                INSERT INTO account_control_programs (signer_id, key_index, control_program, change, expires_at)
@@ -308,23 +308,23 @@ func (m *Manager) insertAccountControlProgram(ctx context.Context, progs ...*con
                keyIndexes   pq.Int64Array
                controlProgs pq.ByteaArray
                change       pq.BoolArray
-               expirations  []stdsql.NullString
+       //      expirations  []stdsql.NullString
        )
        for _, p := range progs {
                accountIDs = append(accountIDs, p.accountID)
                keyIndexes = append(keyIndexes, int64(p.keyIndex))
                controlProgs = append(controlProgs, p.controlProgram)
                change = append(change, p.change)
-               expirations = append(expirations, stdsql.NullString{
+       /*      expirations = append(expirations, stdsql.NullString{
                        String: p.expiresAt.Format(time.RFC3339),
                        Valid:  !p.expiresAt.IsZero(),
-               })
+               })*/
        }
 
-       _, err := m.db.ExecContext(ctx, q, accountIDs, keyIndexes, controlProgs, change, pq.Array(expirations))
-       return errors.Wrap(err)
+//     _, err := m.dbm.ExecContext(ctx, q, accountIDs, keyIndexes, controlProgs, change, pq.Array(expirations))
+       return errors.Wrap(nil)
 }
-*/
+
 
 func (m *Manager) nextIndex(ctx context.Context) (uint64, error) {
        m.acpMu.Lock()