fix votetx for validation (#75)

diff --git a/api/block_retrieve.go b/api/block_retrieve.go
index 4b85fde..27897ff 100644 (file)
--- a/api/block_retrieve.go
+++ b/api/block_retrieve.go
@@ -93,10 +93,14 @@ func (a *API) getBlock(ins BlockReq) Response {
                }
 
                resOutID := orig.ResultIds[0]
                }
 
                resOutID := orig.ResultIds[0]

-               resOut, ok := orig.Entries[*resOutID].(*bc.IntraChainOutput)
-               if ok {
+               switch resOut := orig.Entries[*resOutID].(type) {
+               case *bc.IntraChainOutput:

                        tx.MuxID = *resOut.Source.Ref
                        tx.MuxID = *resOut.Source.Ref

-               } else {
+               case *bc.CrossChainOutput:
+                       tx.MuxID = *resOut.Source.Ref
+               case *bc.VoteOutput:
+                       tx.MuxID = *resOut.Source.Ref
+               case *bc.Retirement:

                        resRetire, _ := orig.Entries[*resOutID].(*bc.Retirement)
                        tx.MuxID = *resRetire.Source.Ref
                }
                        resRetire, _ := orig.Entries[*resOutID].(*bc.Retirement)
                        tx.MuxID = *resRetire.Source.Ref
                }

diff --git a/api/query.go b/api/query.go
index 369443d..a3e927b 100644 (file)
--- a/api/query.go
+++ b/api/query.go
@@ -203,6 +203,8 @@ func (a *API) getUnconfirmedTx(ctx context.Context, filter struct {
        switch out := resOut.(type) {
        case *bc.IntraChainOutput:
                tx.MuxID = *out.Source.Ref
        switch out := resOut.(type) {
        case *bc.IntraChainOutput:
                tx.MuxID = *out.Source.Ref

+       case *bc.VoteOutput:
+               tx.MuxID = *out.Source.Ref

        case *bc.Retirement:
                tx.MuxID = *out.Source.Ref
        }
        case *bc.Retirement:
                tx.MuxID = *out.Source.Ref
        }

diff --git a/protocol/validation/block.go b/protocol/validation/block.go
index 3ded430..8b63df0 100644 (file)
--- a/protocol/validation/block.go
+++ b/protocol/validation/block.go
@@ -46,12 +46,17 @@ func checkCoinbaseAmount(b *bc.Block, amount uint64) error {
                return errors.Wrap(ErrWrongCoinbaseTransaction, "have more than 1 output")
        }
 
                return errors.Wrap(ErrWrongCoinbaseTransaction, "have more than 1 output")
        }
 

-       output, err := tx.IntraChainOutput(*tx.TxHeader.ResultIds[0])
-       if err != nil {
-               return err
+       var SourceAmount uint64
+       switch output := tx.Entries[*tx.TxHeader.ResultIds[0]].(type) {
+       case *bc.IntraChainOutput:
+               SourceAmount = output.Source.Value.Amount
+       case *bc.VoteOutput:
+               SourceAmount = output.Source.Value.Amount
+       default:
+               return errors.Wrapf(bc.ErrEntryType, "entry %x has unexpected type %T", tx.TxHeader.ResultIds[0].Bytes(), output)

        }
 
        }
 

-       if output.Source.Value.Amount != amount {
+       if SourceAmount != amount {

                return errors.Wrap(ErrWrongCoinbaseTransaction, "dismatch output amount")
        }
        return nil
                return errors.Wrap(ErrWrongCoinbaseTransaction, "dismatch output amount")
        }
        return nil

diff --git a/protocol/validation/vmcontext.go b/protocol/validation/vmcontext.go
index f7b62bc..610a8eb 100644 (file)
--- a/protocol/validation/vmcontext.go
+++ b/protocol/validation/vmcontext.go
@@ -25,15 +25,23 @@ func NewTxVMContext(vs *validationState, entry bc.Entry, prog *bc.Program, args
        )
 
        switch e := entry.(type) {
        )
 
        switch e := entry.(type) {

-

        case *bc.Spend:
        case *bc.Spend:

-               spentOutput := tx.Entries[*e.SpentOutputId].(*bc.IntraChainOutput)
-               a1 := spentOutput.Source.Value.AssetId.Bytes()
-               assetID = &a1
-               amount = &spentOutput.Source.Value.Amount
-               destPos = &e.WitnessDestination.Position
-               s := e.SpentOutputId.Bytes()
-               spentOutputID = &s
+               switch spentOutput := tx.Entries[*e.SpentOutputId].(type) {
+               case *bc.IntraChainOutput:
+                       a1 := spentOutput.Source.Value.AssetId.Bytes()
+                       assetID = &a1
+                       amount = &spentOutput.Source.Value.Amount
+                       destPos = &e.WitnessDestination.Position
+                       s := e.SpentOutputId.Bytes()
+                       spentOutputID = &s
+               case *bc.VoteOutput:
+                       a1 := spentOutput.Source.Value.AssetId.Bytes()
+                       assetID = &a1
+                       amount = &spentOutput.Source.Value.Amount
+                       destPos = &e.WitnessDestination.Position
+                       s := e.SpentOutputId.Bytes()
+                       spentOutputID = &s
+               }

        }
 
        var txSigHash *[]byte
        }
 
        var txSigHash *[]byte


@@ -111,6 +119,9 @@ func (ec *entryContext) checkOutput(index uint64, amount uint64, assetID []byte,
                case *bc.IntraChainOutput:
                        return check(e.ControlProgram, e.Source.Value), nil
 
                case *bc.IntraChainOutput:
                        return check(e.ControlProgram, e.Source.Value), nil
 

+               case *bc.VoteOutput:
+                       return check(e.ControlProgram, e.Source.Value), nil
+

                case *bc.Retirement:
                        var prog bc.Program
                        if expansion {
                case *bc.Retirement:
                        var prog bc.Program
                        if expansion {

diff --git a/wallet/utxo.go b/wallet/utxo.go
index 20775fd..c5d106c 100644 (file)
--- a/wallet/utxo.go
+++ b/wallet/utxo.go
@@ -79,12 +79,17 @@ func (w *Wallet) detachUtxos(batch dbm.Batch, b *types.Block, txStatus *bc.Trans
        for txIndex := len(b.Transactions) - 1; txIndex >= 0; txIndex-- {
                tx := b.Transactions[txIndex]
                for j := range tx.Outputs {
        for txIndex := len(b.Transactions) - 1; txIndex >= 0; txIndex-- {
                tx := b.Transactions[txIndex]
                for j := range tx.Outputs {

-                       resOut, err := tx.IntraChainOutput(*tx.ResultIds[j])
-                       if err != nil {
+                       code := []byte{}
+                       switch resOut := tx.Entries[*tx.ResultIds[j]].(type) {
+                       case *bc.IntraChainOutput:
+                               code = resOut.ControlProgram.Code
+                       case *bc.VoteOutput:
+                               code = resOut.ControlProgram.Code
+                       default:

                                continue
                        }
 
                                continue
                        }
 

-                       if segwit.IsP2WScript(resOut.ControlProgram.Code) {
+                       if segwit.IsP2WScript(code) {

                                batch.Delete(account.StandardUTXOKey(*tx.ResultIds[j]))
                        } else {
                                batch.Delete(account.ContractUTXOKey(*tx.ResultIds[j]))
                                batch.Delete(account.StandardUTXOKey(*tx.ResultIds[j]))
                        } else {
                                batch.Delete(account.ContractUTXOKey(*tx.ResultIds[j]))