make life easier

diff --git a/federation/synchron/attach_block_processor.go b/federation/synchron/attach_block_processor.go
index c6c624c..8cc7014 100644 (file)
--- a/federation/synchron/attach_block_processor.go
+++ b/federation/synchron/attach_block_processor.go
@@ -32,6 +32,10 @@ func (p *attachBlockProcessor) getCfg() *config.Chain {
        return p.cfg
 }
 
+func (p *attachBlockProcessor) getBlock() interface{} {
+       return p.block
+}
+
 func (p *attachBlockProcessor) processIssuing(db *gorm.DB, txs []*btmTypes.Tx) error {
        return addIssueAssets(db, txs)
 }

diff --git a/federation/synchron/block_processor.go b/federation/synchron/block_processor.go
index da9f9ff..4522689 100644 (file)
--- a/federation/synchron/block_processor.go
+++ b/federation/synchron/block_processor.go
@@ -10,13 +10,15 @@ import (
        // "github.com/bytom/consensus"
        // "github.com/bytom/consensus/segwit"
        // "github.com/bytom/protocol/bc"
-       btmTypes "github.com/bytom/protocol/bc/types"
        // "github.com/bytom/protocol/vm/vmutil"
-       "github.com/jinzhu/gorm"
-       // log "github.com/sirupsen/logrus"
        // "github.com/blockcenter/coin/btm"
        // "github.com/blockcenter/config"
        // "github.com/blockcenter/types"
+       btmTypes "github.com/bytom/protocol/bc/types"
+       "github.com/jinzhu/gorm"
+       log "github.com/sirupsen/logrus"
+
+       vaporTypes "github.com/bytom/protocol/bc/types"
        "github.com/vapor/errors"
        "github.com/vapor/federation/config"
        "github.com/vapor/federation/database/orm"
@@ -26,9 +28,9 @@ var ErrInconsistentDB = errors.New("inconsistent db status")
 
 type blockProcessor interface {
        getCfg() *config.Chain
+       getBlock() interface{}
        processIssuing(db *gorm.DB, txs []*btmTypes.Tx) error
        processChainInfo() error
-       // getBlock() *btmTypes.Block
        // getCoin() *orm.Coin
        // getTxStatus() *bc.TransactionStatus
        // processAddressTransaction(mappings []*addressTxMapping) error
@@ -73,13 +75,29 @@ func addIssueAssets(db *gorm.DB, txs []*btmTypes.Tx) error {
 }
 
 func updateBlock(db *gorm.DB, bp blockProcessor) error {
-       // txs := bp.getBlock().Transactions
-       if bp.getCfg().IsMainchain {
-               // if err := bp.processIssuing(db, txs); err != nil {
-               //      return err
-               // }
+       switch {
+       case bp.getCfg().IsMainchain:
+               // Issuance can only happen on mainchain
+               block := bp.getBlock().(*btmTypes.Block)
+               txs := block.Transactions
+               if err := bp.processIssuing(db, txs); err != nil {
+                       return err
+               }
+
+               depositTxs := filterDepositFromMainchain(block)
+               log.Info(depositTxs)
+               withdrawalTxs := filterWithdrawalToMainchain(block)
+               log.Info(withdrawalTxs)
+
+       default:
+               block := bp.getBlock().(*vaporTypes.Block)
+               depositTxs := filterDepositToSidechain(block)
+               log.Info(depositTxs)
+               withdrawalTxs := filterWithdrawalFromSidechain(block)
+               log.Info(withdrawalTxs)
        }
 
+       // txs := bp.getBlock().Transactions
        // addressTxMappings, err := GetAddressTxMappings(cfg, txs, bp.getTxStatus(), db)
        // if err != nil {
        //      return err
@@ -100,6 +118,11 @@ func updateBlock(db *gorm.DB, bp blockProcessor) error {
        return bp.processChainInfo()
 }
 
+func filterDepositFromMainchain(block *btmTypes.Block) error      { return nil }
+func filterWithdrawalToMainchain(block *btmTypes.Block) error     { return nil }
+func filterDepositToSidechain(block *vaporTypes.Block) error      { return nil }
+func filterWithdrawalFromSidechain(block *vaporTypes.Block) error { return nil }
+
 // An expired unconfirmed transaction will be marked as deleted, but the latter transaction was packaged into block,
 // the deleted_at flag must be removed. In addition, the gorm can't support update deleted_at field directly, can only use raw sql.
 func updateDeletedTransaction(db *gorm.DB) error {

diff --git a/federation/synchron/detach_block_processor.go b/federation/synchron/detach_block_processor.go
index fd5e5f2..451e5af 100644 (file)
--- a/federation/synchron/detach_block_processor.go
+++ b/federation/synchron/detach_block_processor.go
@@ -23,6 +23,10 @@ func (p *detachBlockProcessor) getCfg() *config.Chain {
        return p.cfg
 }
 
+func (p *detachBlockProcessor) getBlock() interface{} {
+       return p.block
+}
+
 func (p *detachBlockProcessor) processIssuing(db *gorm.DB, txs []*btmTypes.Tx) error {
        return nil
 }