X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=blockchain%2Ftxbuilder%2Factions.go;h=1b72c7d88ec5c148fe7e9f06b547d8f6e9d453cd;hp=e7320f5c3a00ea90117c6d912ca0c67a8da115ce;hb=5d074a5954520a5d385683a1fc254df70fa9d25c;hpb=0af46f9b56a27c0c440c28291059c073dc7f3f4a diff --git a/blockchain/txbuilder/actions.go b/blockchain/txbuilder/actions.go index e7320f5c..1b72c7d8 100644 --- a/blockchain/txbuilder/actions.go +++ b/blockchain/txbuilder/actions.go @@ -8,7 +8,7 @@ import ( "golang.org/x/crypto/sha3" "github.com/vapor/common" - "github.com/vapor/config" + cfg "github.com/vapor/config" "github.com/vapor/consensus" "github.com/vapor/encoding/json" "github.com/vapor/protocol/bc" @@ -292,8 +292,9 @@ func (a *crossInAction) Build(ctx context.Context, builder *TemplateBuilder) err // arguments will be set when materializeWitnesses txin := types.NewCrossChainInput(nil, a.SourceID, *a.AssetId, a.Amount, a.SourcePos, a.VMVersion, a.RawDefinitionByte, a.IssuanceProgram) tplIn := &SigningInstruction{} - fed := config.CommonConfig.Federation + fed := cfg.CommonConfig.Federation tplIn.AddRawWitnessKeys(fed.Xpubs, nil, fed.Quorum) + tplIn.AddDataWitness(cfg.FederationPMultiSigScript(cfg.CommonConfig)) return builder.AddInput(txin, tplIn) }