X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=blockchain%2Ftxbuilder%2Factions.go;h=c41d7dc9391acf03c02e4508ffb7b223310137e9;hb=78ef45d4238457b2ad498d738db5a7a7a30df167;hp=1ca9379bd55d3522a53926969ca7dd79be283c7a;hpb=d50bd47d5cd113453e4a65037e604864673f9da8;p=bytom%2Fvapor.git

diff --git a/blockchain/txbuilder/actions.go b/blockchain/txbuilder/actions.go
index 1ca9379b..c41d7dc9 100644
--- a/blockchain/txbuilder/actions.go
+++ b/blockchain/txbuilder/actions.go
@@ -7,13 +7,13 @@ import (
 
 	"golang.org/x/crypto/sha3"
 
-	"github.com/vapor/common"
-	"github.com/vapor/config"
-	"github.com/vapor/consensus"
-	"github.com/vapor/encoding/json"
-	"github.com/vapor/protocol/bc"
-	"github.com/vapor/protocol/bc/types"
-	"github.com/vapor/protocol/vm/vmutil"
+	"github.com/bytom/vapor/common"
+	cfg "github.com/bytom/vapor/config"
+	"github.com/bytom/vapor/consensus"
+	"github.com/bytom/vapor/encoding/json"
+	"github.com/bytom/vapor/protocol/bc"
+	"github.com/bytom/vapor/protocol/bc/types"
+	"github.com/bytom/vapor/protocol/vm/vmutil"
 )
 
 // DecodeControlAddressAction convert input data to action struct
@@ -150,13 +150,14 @@ func DecodeCrossOutAction(data []byte) (Action, error) {
 
 type crossOutAction struct {
 	bc.AssetAmount
-	Address string `json:"address"`
+	Address string        `json:"address"`
+	Program json.HexBytes `json:"control_program"`
 }
 
 func (a *crossOutAction) Build(ctx context.Context, b *TemplateBuilder) error {
 	var missing []string
-	if a.Address == "" {
-		missing = append(missing, "address")
+	if a.Address == "" && len(a.Program) == 0 {
+		missing = append(missing, "address or program")
 	}
 	if a.AssetId.IsZero() {
 		missing = append(missing, "asset_id")
@@ -168,23 +169,25 @@ func (a *crossOutAction) Build(ctx context.Context, b *TemplateBuilder) error {
 		return MissingFieldsError(missing...)
 	}
 
-	address, err := common.DecodeAddress(a.Address, &consensus.MainNetParams)
-	if err != nil {
-		return err
-	}
+	program := a.Program
+	if a.Address != "" {
+		address, err := common.DecodeAddress(a.Address, consensus.BytomMainNetParams(&consensus.ActiveNetParams))
+		if err != nil {
+			return err
+		}
 
-	redeemContract := address.ScriptAddress()
-	program := []byte{}
-	switch address.(type) {
-	case *common.AddressWitnessPubKeyHash:
-		program, err = vmutil.P2WPKHProgram(redeemContract)
-	case *common.AddressWitnessScriptHash:
-		program, err = vmutil.P2WSHProgram(redeemContract)
-	default:
-		return errors.New("unsupport address type")
-	}
-	if err != nil {
-		return err
+		redeemContract := address.ScriptAddress()
+		switch address.(type) {
+		case *common.AddressWitnessPubKeyHash:
+			program, err = vmutil.P2WPKHProgram(redeemContract)
+		case *common.AddressWitnessScriptHash:
+			program, err = vmutil.P2WSHProgram(redeemContract)
+		default:
+			return errors.New("unsupport address type")
+		}
+		if err != nil {
+			return err
+		}
 	}
 
 	out := types.NewCrossChainOutput(*a.AssetId, a.Amount, program)
@@ -262,22 +265,22 @@ func DecodeCrossInAction(data []byte) (Action, error) {
 
 type crossInAction struct {
 	bc.AssetAmount
-	SourceID          bc.Hash `json:"source_id"`
-	SourcePos         uint64  `json:"source_pos"`
-	VMVersion         uint64  `json:"vm_version"`
-	RawDefinitionByte []byte  `json:"raw_definition_byte"`
-	IssuanceProgram   []byte  `json:"issuance_program"`
+	SourceID          bc.Hash       `json:"source_id"`
+	SourcePos         uint64        `json:"source_pos"`
+	VMVersion         uint64        `json:"vm_version"`
+	RawDefinitionByte json.HexBytes `json:"raw_definition_byte"`
+	IssuanceProgram   json.HexBytes `json:"issuance_program"`
 }
 
-func (a *crossInAction) Build(ctx context.Context, builder *TemplateBuilder) error {
+func (c *crossInAction) Build(ctx context.Context, builder *TemplateBuilder) error {
 	var missing []string
-	if a.SourceID.IsZero() {
+	if c.SourceID.IsZero() {
 		missing = append(missing, "source_id")
 	}
-	if a.AssetId.IsZero() {
+	if c.AssetId.IsZero() {
 		missing = append(missing, "asset_id")
 	}
-	if a.Amount == 0 {
+	if c.Amount == 0 {
 		missing = append(missing, "amount")
 	}
 
@@ -285,19 +288,24 @@ func (a *crossInAction) Build(ctx context.Context, builder *TemplateBuilder) err
 		return MissingFieldsError(missing...)
 	}
 
-	if err := a.checkAssetID(); err != nil {
+	if err := c.checkAssetID(); err != nil {
 		return 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)
+	txin := types.NewCrossChainInput(nil, c.SourceID, *c.AssetId, c.Amount, c.SourcePos, c.VMVersion, c.RawDefinitionByte, c.IssuanceProgram)
 	tplIn := &SigningInstruction{}
-	fed := config.CommonConfig.Federation
-	tplIn.AddRawWitnessKeys(fed.Xpubs, nil, fed.Quorum)
+	fed := cfg.CommonConfig.Federation
+
+	if !common.IsOpenFederationIssueAsset(c.RawDefinitionByte) {
+		tplIn.AddRawWitnessKeys(fed.Xpubs, cfg.FedAddressPath, fed.Quorum)
+		tplIn.AddDataWitness(cfg.FederationPMultiSigScript(cfg.CommonConfig))
+	}
+
 	return builder.AddInput(txin, tplIn)
 }
 
-func (a *crossInAction) ActionType() string {
+func (c *crossInAction) ActionType() string {
 	return "cross_chain_in"
 }