update

[bytom/vapor.git] / asset / builder.go

diff --git a/asset/builder.go b/asset/builder.go
index fd4a042..c142074 100644 (file)
--- a/asset/builder.go
+++ b/asset/builder.go
@@ -4,19 +4,14 @@ import (
        "context"
        stdjson "encoding/json"
        "fmt"
-       "time"
 
        log "github.com/sirupsen/logrus"
 
-       "github.com/vapor/blockchain/signers"
        "github.com/vapor/blockchain/txbuilder"
-       "github.com/vapor/crypto/ed25519"
-       "github.com/vapor/crypto/ed25519/chainkd"
-       chainjson "github.com/vapor/encoding/json"
+       "github.com/vapor/consensus/federation"
        "github.com/vapor/errors"
        "github.com/vapor/protocol/bc"
        "github.com/vapor/protocol/bc/types"
-       "github.com/vapor/protocol/vm/vmutil"
 )
 
 // DecodeCrossInAction convert input data to action struct
@@ -29,23 +24,14 @@ func (r *Registry) DecodeCrossInAction(data []byte) (txbuilder.Action, error) {
 type crossInAction struct {
        reg *Registry
        bc.AssetAmount
-       SourceID        string                 `json:"source_id"`
+       SourceID        bc.Hash                `json:"source_id"`
        SourcePos       uint64                 `json:"source_pos"`
-       FedXPubs        []chainkd.XPub         `json:"fed_xpubs"`
-       Quorum          int                    `json:"fed_quorum"`
        AssetDefinition map[string]interface{} `json:"asset_definition"`
 }
 
-// TODO: also need to hard-code mapTx
 func (a *crossInAction) Build(ctx context.Context, builder *txbuilder.TemplateBuilder) error {
        var missing []string
-       if len(a.FedXPubs) <= 1 {
-               missing = append(missing, "fed_xpubs")
-       }
-       if a.Quorum == 0 {
-               missing = append(missing, "fed_quorum")
-       }
-       if a.SourceID == "" {
+       if a.SourceID.IsZero() {
                missing = append(missing, "source_id")
        }
        if a.AssetId.IsZero() {
@@ -65,52 +51,18 @@ func (a *crossInAction) Build(ctx context.Context, builder *txbuilder.TemplateBu
                return errors.New("mainchain output double spent")
        }
 
-       var err error
-       asset := &Asset{}
-       if preAsset, _ := a.reg.GetAsset(a.AssetId.String()); preAsset != nil {
-               asset = preAsset
-       } else {
-               asset.RawDefinitionByte, err = serializeAssetDef(a.AssetDefinition)
-               if err != nil {
-                       return ErrSerializing
-               }
-
-               if !chainjson.IsValidJSON(asset.RawDefinitionByte) {
-                       return errors.New("asset definition is not in valid json format")
-               }
-
-               asset.DefinitionMap = a.AssetDefinition
-               asset.VMVersion = 1
-               asset.AssetID = *a.AssetId
-               extAlias := a.AssetId.String()
-               asset.Alias = &(extAlias)
-               a.reg.SaveExtAsset(asset, extAlias)
-       }
-
-       assetSigner, err := signers.Create("asset", a.FedXPubs, a.Quorum, 1, signers.BIP0032)
+       rawDefinitionByte, err := serializeAssetDef(a.AssetDefinition)
        if err != nil {
-               return err
+               return ErrSerializing
        }
 
-       path := signers.GetBip0032Path(assetSigner, signers.AssetKeySpace)
-       derivedXPubs := chainkd.DeriveXPubs(assetSigner.XPubs, path)
-       derivedPKs := chainkd.XPubKeys(derivedXPubs)
-       pegInScript, err := buildPegInScript(derivedPKs, assetSigner.Quorum)
-       if err != nil {
-               return err
-       }
-
-       var sourceID bc.Hash
-       if err := sourceID.UnmarshalText([]byte(a.SourceID)); err != nil {
-               return errors.New("invalid sourceID format")
-       }
-
-       // arguments will be set when materializeWitnesses
-       txin := types.NewCrossChainInput(nil, sourceID, *a.AssetId, a.Amount, a.SourcePos, pegInScript, asset.RawDefinitionByte)
+       // 1. arguments will be set when materializeWitnesses
+       // 2. need to fill in issuance program here
+       txin := types.NewCrossChainInput(nil, a.SourceID, *a.AssetId, a.Amount, a.SourcePos, nil, rawDefinitionByte)
        log.Info("cross-chain input action built")
-       builder.RestrictMinTime(time.Now())
        tplIn := &txbuilder.SigningInstruction{}
-       tplIn.AddRawWitnessKeys(assetSigner.XPubs, path, assetSigner.Quorum)
+       fed := federation.GetFederation()
+       tplIn.AddRawWitnessKeys(fed.XPubs, fed.Path(), fed.Quorum)
        a.reg.db.Set(sourceKey, []byte("true"))
        return builder.AddInput(txin, tplIn)
 }
@@ -118,14 +70,3 @@ func (a *crossInAction) Build(ctx context.Context, builder *txbuilder.TemplateBu
 func (a *crossInAction) ActionType() string {
        return "cross_chain_in"
 }
-
-func buildPegInScript(pubkeys []ed25519.PublicKey, nrequired int) (program []byte, err error) {
-       controlProg, err := vmutil.P2SPMultiSigProgram(pubkeys, nrequired)
-       if err != nil {
-               return nil, err
-       }
-       builder := vmutil.NewBuilder()
-       builder.AddRawBytes(controlProg)
-       prog, err := builder.Build()
-       return prog, err
-}