modify config (#265)

[bytom/vapor.git] / federation / synchron / mainchain_keeper.go

diff --git a/federation/synchron/mainchain_keeper.go b/federation/synchron/mainchain_keeper.go
index 0c1612c..0875fe3 100644 (file)
--- a/federation/synchron/mainchain_keeper.go
+++ b/federation/synchron/mainchain_keeper.go
@@ -138,11 +138,18 @@ func (m *mainchainKeeper) processBlock(chain *orm.Chain, block *types.Block, txS
 }
 
 func (m *mainchainKeeper) isDepositTx(tx *types.Tx) bool {
+       for _, input := range tx.Inputs {
+               if bytes.Equal(input.ControlProgram(), m.fedProg) {
+                       return false
+               }
+       }
+
        for _, output := range tx.Outputs {
                if bytes.Equal(output.OutputCommitment.ControlProgram, m.fedProg) {
                        return true
                }
        }
+
        return false
 }
 
@@ -217,13 +224,13 @@ func (m *mainchainKeeper) getCrossChainReqs(crossTransactionID uint64, tx *types
        switch {
        case segwit.IsP2WPKHScript(prog):
                if pubHash, err := segwit.GetHashFromStandardProg(prog); err == nil {
-                       fromAddress = wallet.BuildP2PKHAddress(pubHash, &vaporConsensus.MainNetParams)
-                       toAddress = wallet.BuildP2PKHAddress(pubHash, &vaporConsensus.VaporNetParams)
+                       fromAddress = wallet.BuildP2PKHAddress(pubHash, &vaporConsensus.BytomMainNetParams)
+                       toAddress = wallet.BuildP2PKHAddress(pubHash, &vaporConsensus.MainNetParams)
                }
        case segwit.IsP2WSHScript(prog):
                if scriptHash, err := segwit.GetHashFromStandardProg(prog); err == nil {
-                       fromAddress = wallet.BuildP2SHAddress(scriptHash, &vaporConsensus.MainNetParams)
-                       toAddress = wallet.BuildP2SHAddress(scriptHash, &vaporConsensus.VaporNetParams)
+                       fromAddress = wallet.BuildP2SHAddress(scriptHash, &vaporConsensus.BytomMainNetParams)
+                       toAddress = wallet.BuildP2SHAddress(scriptHash, &vaporConsensus.MainNetParams)
                }
        }
 
@@ -307,10 +314,10 @@ func (m *mainchainKeeper) processIssuing(txs []*types.Tx) error {
                                }
 
                                m.assetStore.Add(&orm.Asset{
-                                       AssetID:           assetID.String(),
-                                       IssuanceProgram:   hex.EncodeToString(inp.IssuanceProgram),
-                                       VMVersion:         inp.VMVersion,
-                                       RawDefinitionByte: hex.EncodeToString(inp.AssetDefinition),
+                                       AssetID:         assetID.String(),
+                                       IssuanceProgram: hex.EncodeToString(inp.IssuanceProgram),
+                                       VMVersion:       inp.VMVersion,
+                                       Definition:      string(inp.AssetDefinition),
                                })
                        }
                }