Merge pull request #168 from dogechain-lab/hotfix/hardfork-on-bridging

[HardFork] portland hardfork on fixing bridge withdrawn issue

blockchain/blockchain.go

@@ -10,11 +10,11 @@ import (
 	"github.com/dogechain-lab/dogechain/blockchain/storage"
 	"github.com/dogechain-lab/dogechain/blockchain/storage/memory"
 	"github.com/dogechain-lab/dogechain/chain"
+	"github.com/dogechain-lab/dogechain/contracts/upgrader"
 	"github.com/dogechain-lab/dogechain/helper/common"
 	"github.com/dogechain-lab/dogechain/state"
 	"github.com/dogechain-lab/dogechain/types"
 	"github.com/dogechain-lab/dogechain/types/buildroot"
-
 	"github.com/hashicorp/go-hclog"
 	lru "github.com/hashicorp/golang-lru"
 )
@@ -853,6 +853,15 @@ func (b *Blockchain) executeBlockTransactions(block *types.Block) (*BlockResult,
 		return nil, err
 	}
 
+	// upgrade system if needed
+	upgrader.UpgradeSystem(
+		b.Config().ChainID,
+		b.Config().Forks,
+		block.Number(),
+		txn.Txn(),
+		b.logger,
+	)
+
 	_, root := txn.Commit()
 
 	// Append the receipts to the receipts cache

chain/params.go

@@ -10,6 +10,7 @@ type Params struct {
 	ChainID        int                    `json:"chainID"`
 	Engine         map[string]interface{} `json:"engine"`
 	BlockGasTarget uint64                 `json:"blockGasTarget"`
+	BlackList      []string               `json:"blackList,omitempty"`
 }
 
 func (p *Params) GetEngine() string {
@@ -31,6 +32,15 @@ type Forks struct {
 	EIP150         *Fork `json:"EIP150,omitempty"`
 	EIP158         *Fork `json:"EIP158,omitempty"`
 	EIP155         *Fork `json:"EIP155,omitempty"`
+	Portland       *Fork `json:"portland,omitempty"`
+}
+
+func (f *Forks) on(ff *Fork, block uint64) bool {
+	if ff == nil {
+		return false
+	}
+
+	return ff.On(block)
 }
 
 func (f *Forks) active(ff *Fork, block uint64) bool {
@@ -69,6 +79,10 @@ func (f *Forks) IsEIP155(block uint64) bool {
 	return f.active(f.EIP155, block)
 }
 
+func (f *Forks) IsPortland(block uint64) bool {
+	return f.active(f.Portland, block)
+}
+
 func (f *Forks) At(block uint64) ForksInTime {
 	return ForksInTime{
 		Homestead:      f.active(f.Homestead, block),
@@ -79,9 +93,14 @@ func (f *Forks) At(block uint64) ForksInTime {
 		EIP150:         f.active(f.EIP150, block),
 		EIP158:         f.active(f.EIP158, block),
 		EIP155:         f.active(f.EIP155, block),
+		Portland:       f.active(f.Portland, block),
 	}
 }
 
+func (f *Forks) IsOnPortland(block uint64) bool {
+	return f.on(f.Portland, block)
+}
+
 type Fork uint64
 
 func NewFork(n uint64) *Fork {
@@ -90,6 +109,10 @@ func NewFork(n uint64) *Fork {
 	return &f
 }
 
+func (f Fork) On(block uint64) bool {
+	return block == uint64(f)
+}
+
 func (f Fork) Active(block uint64) bool {
 	return block >= uint64(f)
 }
@@ -106,7 +129,8 @@ type ForksInTime struct {
 	Istanbul,
 	EIP150,
 	EIP158,
-	EIP155 bool
+	EIP155,
+	Portland bool
 }
 
 var AllForksEnabled = &Forks{
@@ -118,4 +142,5 @@ var AllForksEnabled = &Forks{
 	Constantinople: NewFork(0),
 	Petersburg:     NewFork(0),
 	Istanbul:       NewFork(0),
+	Portland:       NewFork(10222),
 }

consensus/dev/dev.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/dogechain-lab/dogechain/blockchain"
 	"github.com/dogechain-lab/dogechain/consensus"
+	"github.com/dogechain-lab/dogechain/contracts/upgrader"
 	"github.com/dogechain-lab/dogechain/helper/progress"
 	"github.com/dogechain-lab/dogechain/state"
 	"github.com/dogechain-lab/dogechain/txpool"
@@ -185,6 +186,15 @@ func (d *Dev) writeNewBlock(parent *types.Header) error {
 
 	txns := d.writeTransactions(gasLimit, transition)
 
+	// upgrade system if needed
+	upgrader.UpgradeSystem(
+		d.blockchain.Config().ChainID,
+		d.blockchain.Config().Forks,
+		header.Number,
+		transition.Txn(),
+		d.logger,
+	)
+
 	// Commit the changes
 	_, root := transition.Commit()
 

consensus/ibft/ibft.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/dogechain-lab/dogechain/consensus"
 	"github.com/dogechain-lab/dogechain/consensus/ibft/proto"
+	"github.com/dogechain-lab/dogechain/contracts/upgrader"
 	"github.com/dogechain-lab/dogechain/crypto"
 	"github.com/dogechain-lab/dogechain/helper/common"
 	"github.com/dogechain-lab/dogechain/helper/hex"
@@ -626,6 +627,15 @@ func (i *Ibft) buildBlock(snap *Snapshot, parent *types.Header) (*types.Block, e
 		return nil, err
 	}
 
+	// upgrade system if needed
+	upgrader.UpgradeSystem(
+		i.config.Params.ChainID,
+		i.config.Params.Forks,
+		header.Number,
+		transition.Txn(),
+		i.logger,
+	)
+
 	_, root := transition.Commit()
 	header.StateRoot = root
 	header.GasUsed = transition.TotalGas()

contracts/abis/json.go

@@ -470,6 +470,26 @@ const BridgeJSONABI = `[
         "stateMutability": "nonpayable",
         "type": "constructor"
     },
+    {
+        "anonymous": false,
+        "inputs":
+        [
+            {
+                "indexed": true,
+                "internalType": "address",
+                "name": "sender",
+                "type": "address"
+            },
+            {
+                "indexed": true,
+                "internalType": "uint256",
+                "name": "amount",
+                "type": "uint256"
+            }
+        ],
+        "name": "Burned",
+        "type": "event"
+    },
     {
         "anonymous": false,
         "inputs":
@@ -646,6 +666,21 @@ const BridgeJSONABI = `[
         "name": "Withdrawn",
         "type": "event"
     },
+    {
+        "inputs":
+        [
+            {
+                "internalType": "uint256",
+                "name": "amount",
+                "type": "uint256"
+            }
+        ],
+        "name": "addBalance",
+        "outputs":
+        [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
     {
         "inputs":
         [
@@ -661,6 +696,26 @@ const BridgeJSONABI = `[
         "stateMutability": "nonpayable",
         "type": "function"
     },
+    {
+        "inputs":
+        [
+            {
+                "internalType": "address",
+                "name": "account",
+                "type": "address"
+            },
+            {
+                "internalType": "uint256",
+                "name": "amount",
+                "type": "uint256"
+            }
+        ],
+        "name": "burn",
+        "outputs":
+        [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
     {
         "inputs":
         [
@@ -862,6 +917,21 @@ const BridgeJSONABI = `[
         "stateMutability": "view",
         "type": "function"
     },
+    {
+        "inputs":
+        [
+            {
+                "internalType": "uint256",
+                "name": "amount",
+                "type": "uint256"
+            }
+        ],
+        "name": "subBalance",
+        "outputs":
+        [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    },
     {
         "inputs":
         [],

contracts/bridge/events.go

@@ -13,10 +13,12 @@ import (
 const (
 	EventDeposited = "Deposited"
 	EventWithdrawn = "Withdrawn"
+	EventBurned    = "Burned"
 
 	fieldReceiver = "receiver"
 	fieldAmount   = "amount"
 	fieldFee      = "fee"
+	fieldSender   = "sender"
 )
 
 // Frequently used methods. Must exist.
@@ -25,6 +27,8 @@ var (
 	BridgeDepositedEventID = types.Hash(BridgeDepositedEvent.ID())
 	BridgeWithdrawnEvent   = abis.BridgeABI.Events[EventWithdrawn]
 	BridgeWithdrawnEventID = types.Hash(BridgeWithdrawnEvent.ID())
+	BridgeEventBurnedEvent = abis.BridgeABI.Events[EventBurned]
+	BridgeBurnedEventID    = types.Hash(BridgeEventBurnedEvent.ID())
 )
 
 type DepositedLog struct {
@@ -125,3 +129,44 @@ func getBigIntFromWithdrawnLog(log map[string]interface{}, key string) (*big.Int
 
 	return bigVal, nil
 }
+
+type BurnedLog struct {
+	Sender types.Address
+	Amount *big.Int
+}
+
+func ParseBridgeBurnedLog(log *types.Log) (*BurnedLog, error) {
+	topics := make([]web3.Hash, 0, len(log.Topics))
+	for _, topic := range log.Topics {
+		topics = append(topics, web3.Hash(topic))
+	}
+
+	w3Log, err := BridgeEventBurnedEvent.ParseLog(&web3.Log{
+		Address: web3.Address(log.Address),
+		Topics:  topics,
+		Data:    log.Data,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	sender, ok := w3Log[fieldSender]
+	if !ok {
+		return nil, errors.New("address not exists in Burned event")
+	}
+
+	account, ok := sender.(web3.Address)
+	if !ok {
+		return nil, errors.New("address downcast failed")
+	}
+
+	amount, err := getBigIntFromWithdrawnLog(w3Log, fieldAmount)
+	if err != nil {
+		return nil, err
+	}
+
+	return &BurnedLog{
+		Sender: types.Address(account),
+		Amount: amount,
+	}, nil
+}

server/server.go

@@ -230,6 +230,12 @@ func NewServer(config *Config) (*Server, error) {
 			state:      m.state,
 			Blockchain: m.blockchain,
 		}
+
+		blackList := make([]types.Address, len(m.config.Chain.Params.BlackList))
+		for i, a := range m.config.Chain.Params.BlackList {
+			blackList[i] = types.StringToAddress(a)
+		}
+
 		// start transaction pool
 		m.txpool, err = txpool.NewTxPool(
 			logger,
@@ -245,6 +251,7 @@ func NewServer(config *Config) (*Server, error) {
 				MaxAccountDemotions:   m.config.MaxAccountDemotions,
 				PruneTickSeconds:      m.config.PruneTickSeconds,
 				PromoteOutdateSeconds: m.config.PromoteOutdateSeconds,
+				BlackList:             blackList,
 			},
 		)
 		if err != nil {

state/executor.go

@@ -339,6 +339,16 @@ func (t *Transition) handleBridgeLogs(msg *types.Transaction, logs []*types.Log)
 
 			// the fee goes to system Vault contract
 			t.state.AddBalance(systemcontracts.AddrVaultContract, parsedLog.Fee)
+		case bridge.BridgeBurnedEventID:
+			parsedLog, err := bridge.ParseBridgeBurnedLog(log)
+			if err != nil {
+				return err
+			}
+
+			// burn
+			if err := t.state.SubBalance(parsedLog.Sender, parsedLog.Amount); err != nil {
+				return err
+			}
 		}
 	}