Modify the dependency on path

[bytom/vapor.git] / blockchain / txbuilder / mainchain / signing_instruction.go

diff --git a/blockchain/txbuilder/mainchain/signing_instruction.go b/blockchain/txbuilder/mainchain/signing_instruction.go
index 944b70c..ff81b67 100644 (file)
--- a/blockchain/txbuilder/mainchain/signing_instruction.go
+++ b/blockchain/txbuilder/mainchain/signing_instruction.go
@@ -12,15 +12,11 @@ import (
 // AddWitnessKeys adds a SignatureWitness with the given quorum and
 // list of keys derived by applying the derivation path to each of the
 // xpubs.
-func (si *SigningInstruction) AddWitnessKeys(xpubs []chainkd.XPub, path [][]byte, quorum int) {
-       hexPath := make([]chainjson.HexBytes, 0, len(path))
-       for _, p := range path {
-               hexPath = append(hexPath, p)
-       }
+func (si *SigningInstruction) AddWitnessKeys(xpubs []chainkd.XPub, quorum int) {
 
        keyIDs := make([]keyID, 0, len(xpubs))
        for _, xpub := range xpubs {
-               keyIDs = append(keyIDs, keyID{xpub, hexPath})
+               keyIDs = append(keyIDs, keyID{XPub: xpub})
        }
 
        sw := &SignatureWitness{
@@ -51,6 +47,20 @@ func (si *SigningInstruction) AddRawWitnessKeys(xpubs []chainkd.XPub, path [][]b
        si.WitnessComponents = append(si.WitnessComponents, sw)
 }
 
+func (si *SigningInstruction) AddRawWitnessKeysWithoutPath(xpubs []chainkd.XPub, quorum int) {
+
+       keyIDs := make([]keyID, 0, len(xpubs))
+       for _, xpub := range xpubs {
+               keyIDs = append(keyIDs, keyID{XPub: xpub})
+       }
+
+       sw := &RawTxSigWitness{
+               Quorum: quorum,
+               Keys:   keyIDs,
+       }
+       si.WitnessComponents = append(si.WitnessComponents, sw)
+}
+
 // SigningInstruction gives directions for signing inputs in a TxTemplate.
 type SigningInstruction struct {
        Position          uint32             `json:"position"`