X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=asset%2Fasset.go;h=12ae60b30f21e1628b7753d15de2669b7430c35e;hb=5d4626d20a2e591b219f2e48b7391e5be1cf88ef;hp=e1de525029ff2f741f4e23edc68948bd9617dc9f;hpb=08281341c2cb02ba11d4218576256688854790fc;p=bytom%2Fvapor.git

diff --git a/asset/asset.go b/asset/asset.go
index e1de5250..12ae60b3 100644
--- a/asset/asset.go
+++ b/asset/asset.go
@@ -7,19 +7,13 @@ import (
 	"sync"
 
 	"github.com/golang/groupcache/lru"
-	dbm "github.com/tendermint/tmlibs/db"
-	"golang.org/x/crypto/sha3"
 
-	"github.com/vapor/blockchain/signers"
-	"github.com/vapor/common"
 	"github.com/vapor/consensus"
-	"github.com/vapor/crypto/ed25519"
-	"github.com/vapor/crypto/ed25519/chainkd"
+	dbm "github.com/vapor/database/leveldb"
 	chainjson "github.com/vapor/encoding/json"
 	"github.com/vapor/errors"
 	"github.com/vapor/protocol"
 	"github.com/vapor/protocol/bc"
-	"github.com/vapor/protocol/vm/vmutil"
 )
 
 // DefaultNativeAsset native BTM asset
@@ -37,12 +31,10 @@ var (
 )
 
 func initNativeAsset() {
-	signer := &signers.Signer{Type: "internal"}
 	alias := consensus.BTMAlias
 
 	definitionBytes, _ := serializeAssetDef(consensus.BTMDefinitionMap)
 	DefaultNativeAsset = &Asset{
-		Signer:            signer,
 		AssetID:           *consensus.BTMAssetID,
 		Alias:             &alias,
 		VMVersion:         1,
@@ -103,81 +95,13 @@ type Registry struct {
 
 //Asset describe asset on bytom chain
 type Asset struct {
-	*signers.Signer
 	AssetID           bc.AssetID             `json:"id"`
 	Alias             *string                `json:"alias"`
 	VMVersion         uint64                 `json:"vm_version"`
-	IssuanceProgram   chainjson.HexBytes     `json:"issue_program"`
 	RawDefinitionByte chainjson.HexBytes     `json:"raw_definition_byte"`
 	DefinitionMap     map[string]interface{} `json:"definition"`
 }
 
-func (reg *Registry) getNextAssetIndex() uint64 {
-	reg.assetIndexMu.Lock()
-	defer reg.assetIndexMu.Unlock()
-
-	nextIndex := uint64(1)
-	if rawIndex := reg.db.Get(assetIndexKey); rawIndex != nil {
-		nextIndex = common.BytesToUnit64(rawIndex) + 1
-	}
-
-	reg.db.Set(assetIndexKey, common.Unit64ToBytes(nextIndex))
-	return nextIndex
-}
-
-// Define defines a new Asset.
-func (reg *Registry) Define(xpubs []chainkd.XPub, quorum int, definition map[string]interface{}, alias string, issuanceProgram chainjson.HexBytes) (*Asset, error) {
-	var err error
-	var assetSigner *signers.Signer
-
-	alias = strings.ToUpper(strings.TrimSpace(alias))
-	if alias == "" {
-		return nil, errors.Wrap(ErrNullAlias)
-	}
-
-	if alias == consensus.BTMAlias {
-		return nil, ErrInternalAsset
-	}
-
-	rawDefinition, err := serializeAssetDef(definition)
-	if err != nil {
-		return nil, ErrSerializing
-	}
-
-	vmver := uint64(1)
-	if len(issuanceProgram) == 0 {
-		if len(xpubs) == 0 {
-			return nil, errors.Wrap(signers.ErrNoXPubs)
-		}
-
-		nextAssetIndex := reg.getNextAssetIndex()
-		assetSigner, err = signers.Create("asset", xpubs, quorum, nextAssetIndex, signers.BIP0032)
-		if err != nil {
-			return nil, err
-		}
-
-		path := signers.GetBip0032Path(assetSigner, signers.AssetKeySpace)
-		derivedXPubs := chainkd.DeriveXPubs(assetSigner.XPubs, path)
-		derivedPKs := chainkd.XPubKeys(derivedXPubs)
-		issuanceProgram, vmver, err = multisigIssuanceProgram(derivedPKs, assetSigner.Quorum)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	defHash := bc.NewHash(sha3.Sum256(rawDefinition))
-	a := &Asset{
-		DefinitionMap:     definition,
-		RawDefinitionByte: rawDefinition,
-		VMVersion:         vmver,
-		IssuanceProgram:   issuanceProgram,
-		AssetID:           bc.ComputeAssetID(issuanceProgram, vmver, &defHash),
-		Signer:            assetSigner,
-		Alias:             &alias,
-	}
-	return a, reg.SaveAsset(a, alias)
-}
-
 // SaveAsset store asset
 func (reg *Registry) SaveAsset(a *Asset, alias string) error {
 	reg.assetMu.Lock()
@@ -363,17 +287,6 @@ func serializeAssetDef(def map[string]interface{}) ([]byte, error) {
 	return json.MarshalIndent(def, "", "  ")
 }
 
-func multisigIssuanceProgram(pubkeys []ed25519.PublicKey, nrequired int) (program []byte, vmversion uint64, err error) {
-	issuanceProg, err := vmutil.P2SPMultiSigProgram(pubkeys, nrequired)
-	if err != nil {
-		return nil, 0, err
-	}
-	builder := vmutil.NewBuilder()
-	builder.AddRawBytes(issuanceProg)
-	prog, err := builder.Build()
-	return prog, 1, err
-}
-
 //UpdateAssetAlias updates asset alias
 func (reg *Registry) UpdateAssetAlias(id, newAlias string) error {
 	oldAlias := reg.GetAliasByID(id)