optimise

diff --git a/consensus/segwit/segwit.go b/consensus/segwit/segwit.go
index 0f6b08e..3717961 100644 (file)
--- a/consensus/segwit/segwit.go
+++ b/consensus/segwit/segwit.go
@@ -94,7 +94,7 @@ func ConvertP2DCProgram(prog []byte, lockedAssetID bc.AssetID) ([]byte, error) {
                return nil, err
        }
 
-       if insts[0].Op == vm.OP_0 {
+       if len(insts) == 6 && insts[0].Op == vm.OP_0 {
                dexContractArgs := vmutil.DexContractArgs{}
                var requestedAsset [32]byte
                copy(requestedAsset[:], insts[1].Data)

diff --git a/protocol/validation/vmcontext.go b/protocol/validation/vmcontext.go
index 507b2ef..fd84da4 100644 (file)
--- a/protocol/validation/vmcontext.go
+++ b/protocol/validation/vmcontext.go
@@ -18,7 +18,8 @@ func NewTxVMContext(vs *validationState, entry bc.Entry, prog *bc.Program, args
                numResults  = uint64(len(tx.ResultIds))
                entryID     = bc.EntryID(entry) // TODO(bobg): pass this in, don't recompute it
 
-               assetID       *[]byte
+               assetID       *bc.AssetID
+               assetIDBytes  *[]byte
                amount        *uint64
                destPos       *uint64
                spentOutputID *[]byte
@@ -27,8 +28,9 @@ func NewTxVMContext(vs *validationState, entry bc.Entry, prog *bc.Program, args
        switch e := entry.(type) {
        case *bc.CrossChainInput:
                mainchainOutput := tx.Entries[*e.MainchainOutputId].(*bc.IntraChainOutput)
-               a1 := mainchainOutput.Source.Value.AssetId.Bytes()
-               assetID = &a1
+               assetID = mainchainOutput.Source.Value.AssetId
+               a1 := assetID.Bytes()
+               assetIDBytes = &a1
                amount = &mainchainOutput.Source.Value.Amount
                destPos = &e.WitnessDestination.Position
                s := e.MainchainOutputId.Bytes()
@@ -36,8 +38,9 @@ func NewTxVMContext(vs *validationState, entry bc.Entry, prog *bc.Program, args
 
        case *bc.Spend:
                spentOutput := tx.Entries[*e.SpentOutputId].(*bc.IntraChainOutput)
-               a1 := spentOutput.Source.Value.AssetId.Bytes()
-               assetID = &a1
+               assetID = spentOutput.Source.Value.AssetId
+               a1 := assetID.Bytes()
+               assetIDBytes = &a1
                amount = &spentOutput.Source.Value.Amount
                destPos = &e.WitnessDestination.Position
                s := e.SpentOutputId.Bytes()
@@ -45,8 +48,9 @@ func NewTxVMContext(vs *validationState, entry bc.Entry, prog *bc.Program, args
 
        case *bc.VetoInput:
                voteOutput := tx.Entries[*e.SpentOutputId].(*bc.VoteOutput)
-               a1 := voteOutput.Source.Value.AssetId.Bytes()
-               assetID = &a1
+               assetID = voteOutput.Source.Value.AssetId
+               a1 := assetID.Bytes()
+               assetIDBytes = &a1
                amount = &voteOutput.Source.Value.Amount
                destPos = &e.WitnessDestination.Position
                s := e.SpentOutputId.Bytes()
@@ -75,11 +79,9 @@ func NewTxVMContext(vs *validationState, entry bc.Entry, prog *bc.Program, args
                entries: tx.Entries,
        }
 
-       AssetIDBytes := [32]byte{}
-       copy(AssetIDBytes[:], (*assetID)[:])
        result := &vm.Context{
                VMVersion: prog.VmVersion,
-               Code:      witnessProgram(prog.Code, bc.NewAssetID(AssetIDBytes)),
+               Code:      witnessProgram(prog.Code, *assetID),
                Arguments: args,
 
                EntryID: entryID.Bytes(),
@@ -89,7 +91,7 @@ func NewTxVMContext(vs *validationState, entry bc.Entry, prog *bc.Program, args
 
                TxSigHash:     txSigHashFn,
                NumResults:    &numResults,
-               AssetID:       assetID,
+               AssetID:       assetIDBytes,
                Amount:        amount,
                DestPos:       destPos,
                SpentOutputID: spentOutputID,
@@ -99,7 +101,7 @@ func NewTxVMContext(vs *validationState, entry bc.Entry, prog *bc.Program, args
        return result
 }
 
-func witnessProgram(prog []byte, assetID bc.AssetID) []byte {
+func witnessProgram(prog []byte, lockedAssetID bc.AssetID) []byte {
        if segwit.IsP2WPKHScript(prog) {
                if witnessProg, err := segwit.ConvertP2PKHSigProgram(prog); err == nil {
                        return witnessProg
@@ -109,7 +111,7 @@ func witnessProgram(prog []byte, assetID bc.AssetID) []byte {
                        return witnessProg
                }
        } else if segwit.IsP2WDCScript(prog) {
-               if witnessProg, err := segwit.ConvertP2DCProgram(prog, assetID); err == nil {
+               if witnessProg, err := segwit.ConvertP2DCProgram(prog, lockedAssetID); err == nil {
                        return witnessProg
                }
        }

diff --git a/protocol/vm/vmutil/script.go b/protocol/vm/vmutil/script.go
index a15f5de..ac067e7 100644 (file)
--- a/protocol/vm/vmutil/script.go
+++ b/protocol/vm/vmutil/script.go
@@ -147,7 +147,7 @@ type DexContractArgs struct {
 }
 
 // P2WDCProgram return the segwit pay to dex contract
-func P2WDCProgram(dexContractArgs DexContractArgs, lockedAssetID bc.AssetID) ([]byte, error) {
+func P2WDCProgram(dexContractArgs DexContractArgs) ([]byte, error) {
        builder := NewBuilder()
        builder.AddInt64(0)
        builder.AddData(dexContractArgs.RequestedAsset.Bytes())
@@ -160,7 +160,7 @@ func P2WDCProgram(dexContractArgs DexContractArgs, lockedAssetID bc.AssetID) ([]
 
 // P2DCProgram generates the script for control with dex contract
 func P2DCProgram(dexContractArgs DexContractArgs, lockedAssetID bc.AssetID) ([]byte, error) {
-       standardProgram, err := P2WDCProgram(dexContractArgs, lockedAssetID)
+       standardProgram, err := P2WDCProgram(dexContractArgs)
        if err != nil {
                return nil, err
        }