fix_open_federation_issue_asset (#478)

* fix_open_federation_issue_asset

* opt code

diff --git a/protocol/validation/tx.go b/protocol/validation/tx.go
index 2185eee..ae2ef67 100644 (file)
--- a/protocol/validation/tx.go
+++ b/protocol/validation/tx.go
@@ -275,7 +275,7 @@ func checkValid(vs *validationState, e bc.Entry) (err error) {
                        return errors.New("incorrect asset_id while checking CrossChainInput")
                }
 
-               prog := e.ControlProgram
+               prog := e.AssetDefinition.IssuanceProgram
 
                if !common.IsOpenFederationIssueAsset(e.RawDefinitionByte) {
                        prog.Code = config.FederationWScript(config.CommonConfig)

diff --git a/protocol/validation/tx_test.go b/protocol/validation/tx_test.go
index 9908db9..d71f233 100644 (file)
--- a/protocol/validation/tx_test.go
+++ b/protocol/validation/tx_test.go
@@ -7,6 +7,7 @@ import (
        "github.com/davecgh/go-spew/spew"
 
        "github.com/bytom/vapor/consensus"
+       "github.com/bytom/vapor/crypto/ed25519/chainkd"
        "github.com/bytom/vapor/crypto/sha3pool"
        "github.com/bytom/vapor/errors"
        "github.com/bytom/vapor/protocol/bc"
@@ -1156,6 +1157,50 @@ func TestRingMagneticContractTx(t *testing.T) {
        }
 }
 
+func TestValidateOpenFederationIssueAsset(t *testing.T) {
+       tx := &types.Tx{TxData: types.TxData{Version: 1}}
+       tx.Inputs = append(tx.Inputs, types.NewCrossChainInput(nil,
+               testutil.MustDecodeHash("449143cb95389d19a1939879681168f78cc62614f4e0fb41f17b3232528a709d"),
+               testutil.MustDecodeAsset("ed9d55880b4c88d8579e6c542b0e714eb8c05226ae84b6794a18aad2e1124f70"),
+               100000000,
+               0,
+               1,
+               testutil.MustDecodeHexString("7b0a202022646563696d616c73223a20382c0a2020226465736372697074696f6e223a207b0a202020202269737375655f61737365745f616374696f6e223a202263726f73735f636861696e220a20207d2c0a2020226e616d65223a2022454f53222c0a20202271756f72756d223a20312c0a20202272656973737565223a202274727565222c0a20202273796d626f6c223a2022454f53220a7d"),
+               testutil.MustDecodeHexString("ae20d827c281d47f5de93f98544b20468feaac046bf8b89bd51102f6e971f09d215920be43bb856fe337b37f5f09040c2b6cdbe23eaf5aa4770b16ea51fdfc45514c295152ad"),
+       ))
+
+       tx.Outputs = append(tx.Outputs, types.NewIntraChainOutput(
+               testutil.MustDecodeAsset("ed9d55880b4c88d8579e6c542b0e714eb8c05226ae84b6794a18aad2e1124f70"),
+               100000000,
+               testutil.MustDecodeHexString("0014d8dd58f374f58cffb1b1a7cc1e18a712b4fe67b5"),
+       ))
+
+       byteData, err := tx.MarshalText()
+       if err != nil {
+               t.Fatal(err)
+       }
+
+       tx.SerializedSize = uint64(len(byteData))
+       tx = types.NewTx(tx.TxData)
+
+       xPrv := chainkd.XPrv(toByte64("f0293101b509a0e919b4775d849372f97c688af8bd85a9d369fc1a4528baa94c0d74dd09aa6eaeed582df47d391c816b916a0537302291b09743903b730333f9"))
+       signature := xPrv.Sign(tx.SigHash(0).Bytes())
+       tx.Inputs[0].SetArguments([][]byte{signature})
+       tx = types.NewTx(tx.TxData)
+
+       if _, err := ValidateTx(tx.Tx, &bc.Block{BlockHeader: &bc.BlockHeader{Version: 1}}); err != nil {
+               t.Fatal(err)
+       }
+}
+
+func toByte64(str string) [64]byte{
+       var result [64]byte
+       bytes := testutil.MustDecodeHexString(str)
+       for i := range bytes {
+               result[i] = bytes[i]
+       }
+       return result
+}
 // A txFixture is returned by sample (below) to produce a sample
 // transaction, which takes a separate, optional _input_ txFixture to
 // affect the transaction that's built. The components of the