X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=blobdiff_plain;f=asset%2Fannotate.go;h=41562026bb0c376b0d395a4f737ec338f1369f44;hp=514166eb9fb680e7cac5ecc274b70da2ad116aba;hb=089cb9074ed375e28850d2ff8b5e91164a04046d;hpb=53784d9c76f1056423b57915f7e064a6f551100c;ds=sidebyside diff --git a/asset/annotate.go b/asset/annotate.go index 514166eb..41562026 100644 --- a/asset/annotate.go +++ b/asset/annotate.go @@ -4,8 +4,6 @@ import ( "encoding/json" "github.com/vapor/blockchain/query" - chainjson "github.com/vapor/encoding/json" - "github.com/vapor/protocol/vm/vmutil" ) func isValidJSON(b []byte) bool { @@ -30,18 +28,7 @@ func Annotated(a *Asset) (*query.AnnotatedAsset, error) { VMVersion: a.VMVersion, RawDefinitionByte: a.RawDefinitionByte, Definition: &jsonDefinition, - IssuanceProgram: chainjson.HexBytes(a.IssuanceProgram), } - annotatedAsset.LimitHeight = vmutil.GetIssuanceProgramRestrictHeight(a.IssuanceProgram) - if a.Signer != nil { - annotatedAsset.AnnotatedSigner = query.AnnotatedSigner{ - Type: a.Signer.Type, - XPubs: a.Signer.XPubs, - Quorum: a.Signer.Quorum, - KeyIndex: a.Signer.KeyIndex, - DeriveRule: a.Signer.DeriveRule, - } - } return annotatedAsset, nil }