gas upgrade and testnet v2 switch block correction

XDCxlending/lendingstate/common.go

@@ -2,16 +2,15 @@ package lendingstate
 
 import (
 	"encoding/json"
-	"github.com/XinFinOrg/XDPoSChain/crypto"
 	"math/big"
 	"time"
 
 	"github.com/XinFinOrg/XDPoSChain/common"
+	"github.com/XinFinOrg/XDPoSChain/crypto"
 )
 
 var (
-	EmptyAddress = "xdc0000000000000000000000000000000000000000"
-	EmptyRoot    = common.HexToHash("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
+	EmptyRoot = common.HexToHash("56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421")
 )
 
 var EmptyHash = common.Hash{}

XDCxlending/lendingstate/lendingitem.go

@@ -2,14 +2,15 @@ package lendingstate
 
 import (
 	"fmt"
+	"math/big"
+	"strconv"
+	"time"
+
 	"github.com/XinFinOrg/XDPoSChain/common"
 	"github.com/XinFinOrg/XDPoSChain/core/state"
 	"github.com/XinFinOrg/XDPoSChain/core/types"
 	"github.com/XinFinOrg/XDPoSChain/crypto/sha3"
 	"github.com/globalsign/mgo/bson"
-	"math/big"
-	"strconv"
-	"time"
 )
 
 const (
@@ -243,7 +244,7 @@ func (l *LendingItem) VerifyLendingSide() error {
 }
 
 func (l *LendingItem) VerifyCollateral(state *state.StateDB) error {
-	if l.CollateralToken.String() == EmptyAddress || l.CollateralToken.String() == l.LendingToken.String() {
+	if l.CollateralToken.IsZero() || l.CollateralToken == l.LendingToken {
 		return fmt.Errorf("invalid collateral %s", l.CollateralToken.Hex())
 	}
 	validCollateral := false
@@ -329,7 +330,7 @@ func (l *LendingItem) EncodedSide() *big.Int {
 	return big.NewInt(1)
 }
 
-//verify signatures
+// verify signatures
 func (l *LendingItem) VerifyLendingSignature() error {
 	V := big.NewInt(int64(l.Signature.V))
 	R := l.Signature.R.Big()

XDCxlending/order_processor.go

@@ -3,14 +3,15 @@ package XDCxlending
 import (
 	"encoding/json"
 	"fmt"
+	"math/big"
+
 	"github.com/XinFinOrg/XDPoSChain/XDCx/tradingstate"
 	"github.com/XinFinOrg/XDPoSChain/XDCxlending/lendingstate"
 	"github.com/XinFinOrg/XDPoSChain/common"
 	"github.com/XinFinOrg/XDPoSChain/consensus"
 	"github.com/XinFinOrg/XDPoSChain/core/state"
 	"github.com/XinFinOrg/XDPoSChain/core/types"
 	"github.com/XinFinOrg/XDPoSChain/log"
-	"math/big"
 )
 
 func (l *Lending) CommitOrder(header *types.Header, coinbase common.Address, chain consensus.ChainContext, statedb *state.StateDB, lendingStateDB *lendingstate.LendingStateDB, tradingStateDb *tradingstate.TradingStateDB, lendingOrderBook common.Hash, order *lendingstate.LendingItem) ([]*lendingstate.LendingTrade, []*lendingstate.LendingItem, error) {
@@ -262,10 +263,9 @@ func (l *Lending) processOrderList(header *types.Header, coinbase common.Address
 			collateralToken = oldestOrder.CollateralToken
 			borrowFee = lendingstate.GetFee(statedb, oldestOrder.Relayer)
 		}
-		if collateralToken.String() == lendingstate.EmptyAddress {
+		if collateralToken.IsZero() {
 			return nil, nil, nil, fmt.Errorf("empty collateral")
 		}
-		collateralPrice := common.BasePrice
 		depositRate, liquidationRate, recallRate := lendingstate.GetCollateralDetail(statedb, collateralToken)
 		if depositRate == nil || depositRate.Sign() <= 0 {
 			return nil, nil, nil, fmt.Errorf("invalid depositRate %v", depositRate)
@@ -953,11 +953,11 @@ func (l *Lending) GetMediumTradePriceBeforeEpoch(chain consensus.ChainContext, s
 	return nil, nil
 }
 
-//LendToken and CollateralToken must meet at least one of following conditions
-//- Have direct pair in XDCX: lendToken/CollateralToken or CollateralToken/LendToken
-//- Have pairs with XDC:
-//-  lendToken/XDC and CollateralToken/XDC
-//-  XDC/lendToken and XDC/CollateralToken
+// LendToken and CollateralToken must meet at least one of following conditions
+// - Have direct pair in XDCX: lendToken/CollateralToken or CollateralToken/LendToken
+// - Have pairs with XDC:
+// -  lendToken/XDC and CollateralToken/XDC
+// -  XDC/lendToken and XDC/CollateralToken
 func (l *Lending) GetCollateralPrices(header *types.Header, chain consensus.ChainContext, statedb *state.StateDB, tradingStateDb *tradingstate.TradingStateDB, collateralToken common.Address, lendingToken common.Address) (*big.Int, *big.Int, error) {
 	// lendTokenXDCPrice: price of ticker lendToken/XDC
 	// collateralXDCPrice: price of ticker collateralToken/XDC

accounts/abi/bind/base.go

@@ -128,7 +128,7 @@ func (c *BoundContract) Call(opts *CallOpts, result interface{}, method string,
 		return err
 	}
 	var (
-		msg    = XDPoSChain.CallMsg{From: opts.From, To: &c.address, Data: input, GasPrice: common.MinGasPrice, Gas: uint64(4200000)}
+		msg    = XDPoSChain.CallMsg{From: opts.From, To: &c.address, Data: input, GasPrice: common.MinGasPrice50x, Gas: uint64(4200000)}
 		ctx    = ensureContext(opts.Context)
 		code   []byte
 		output []byte

cmd/XDC/config.go

@@ -185,6 +185,7 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, XDCConfig) {
 			common.MinGasPrice = big.NewInt(gasPrice)
 		}
 	}
+	common.MinGasPrice50x = common.MinGasPrice50x.Mul(common.MinGasPrice, big.NewInt(50))
 
 	// read passwords from environment
 	passwords := []string{}

cmd/puppeth/wizard_genesis.go

@@ -77,7 +77,7 @@ func (w *wizard) makeGenesis() {
 		genesis.Difficulty = big.NewInt(1)
 		genesis.Config.Clique = &params.CliqueConfig{
 			Period: 15,
-			Epoch:  30000,
+			Epoch:  900,
 		}
 		fmt.Println()
 		fmt.Println("How many seconds should blocks take? (default = 15)")
@@ -114,7 +114,7 @@ func (w *wizard) makeGenesis() {
 		genesis.Difficulty = big.NewInt(1)
 		genesis.Config.XDPoS = &params.XDPoSConfig{
 			Period: 15,
-			Epoch:  30000,
+			Epoch:  900,
 			Reward: 0,
 			V2: &params.V2{
 				SwitchBlock:   big.NewInt(0),

common/constants.go

@@ -36,7 +36,7 @@ var TIP2019Block = big.NewInt(1)
 var TIPSigning = big.NewInt(3000000)
 var TIPRandomize = big.NewInt(3464000)
 
-var TIPV2SwitchBlock = big.NewInt(99999999999)
+var TIPV2SwitchBlock = big.NewInt(99999999900)
 
 var TIPIncreaseMasternodes = big.NewInt(5000000) // Upgrade MN Count at Block.
 var TIPNoHalvingMNReward = big.NewInt(38383838)  // hardfork no halving masternodes reward
@@ -77,6 +77,7 @@ var BaseTopUp = big.NewInt(100)
 var BaseRecall = big.NewInt(100)
 var TIPTRC21Fee = big.NewInt(38383838)
 var TIPTRC21FeeTestnet = big.NewInt(38383838)
+var BlockNumberGas50x = big.NewInt(TIPTRC21Fee.Int64() + 40000000)
 var LimitTimeFinality = uint64(30) // limit in 30 block
 
 var IgnoreSignerCheckBlockArray = map[uint64]bool{

common/constants/constants.go.devnet

@@ -77,6 +77,7 @@ var BaseTopUp = big.NewInt(100)
 var BaseRecall = big.NewInt(100)
 var TIPTRC21Fee = big.NewInt(13523400)
 var TIPTRC21FeeTestnet = big.NewInt(225000)
+var BlockNumberGas50x = big.NewInt(11818181)
 var LimitTimeFinality = uint64(30) // limit in 30 block
 
 var IgnoreSignerCheckBlockArray = map[uint64]bool{

common/constants/constants.go.testnet

@@ -36,7 +36,7 @@ var TIP2019Block = big.NewInt(1)
 var TIPSigning = big.NewInt(3000000)
 var TIPRandomize = big.NewInt(3464000)
 
-var TIPV2SwitchBlock = big.NewInt(56000000)
+var TIPV2SwitchBlock = big.NewInt(56828700) // Target 13rd Nov 2023
 
 var TIPIncreaseMasternodes = big.NewInt(5000000) // Upgrade MN Count at Block.
 var TIPNoHalvingMNReward = big.NewInt(23779191)  // hardfork no halving masternodes reward
@@ -77,6 +77,7 @@ var BaseTopUp = big.NewInt(100)
 var BaseRecall = big.NewInt(100)
 var TIPTRC21Fee = big.NewInt(23779191)
 var TIPTRC21FeeTestnet = big.NewInt(23779191)
+var BlockNumberGas50x = big.NewInt(TIPTRC21Fee.Int64() + 40000000)
 var LimitTimeFinality = uint64(30) // limit in 30 block
 
 var IgnoreSignerCheckBlockArray = map[uint64]bool{

common/gas.go

@@ -0,0 +1,34 @@
+package common
+
+import "math/big"
+
+var MinGasPrice50x = big.NewInt(12500000000)
+var GasPrice50x = big.NewInt(12500000000)
+
+func GetGasFee(blockNumber, gas uint64) *big.Int {
+	fee := new(big.Int).SetUint64(gas)
+
+	if blockNumber >= BlockNumberGas50x.Uint64() {
+		fee = fee.Mul(fee, GasPrice50x)
+	} else if blockNumber > TIPTRC21Fee.Uint64() {
+		fee = fee.Mul(fee, TRC21GasPrice)
+	}
+
+	return fee
+}
+
+func GetGasPrice(number *big.Int) *big.Int {
+	if number == nil || number.Cmp(BlockNumberGas50x) < 0 {
+		return new(big.Int).Set(TRC21GasPrice)
+	} else {
+		return new(big.Int).Set(GasPrice50x)
+	}
+}
+
+func GetMinGasPrice(number *big.Int) *big.Int {
+	if number == nil || number.Cmp(BlockNumberGas50x) < 0 {
+		return new(big.Int).Set(MinGasPrice)
+	} else {
+		return new(big.Int).Set(MinGasPrice50x)
+	}
+}

common/types.go

@@ -73,6 +73,9 @@ func BigToHash(b *big.Int) Hash  { return BytesToHash(b.Bytes()) }
 func Uint64ToHash(b uint64) Hash { return BytesToHash(new(big.Int).SetUint64(b).Bytes()) }
 func HexToHash(s string) Hash    { return BytesToHash(FromHex(s)) }
 
+// IsZero returns if a Hash is empty
+func (h Hash) IsZero() bool { return h == Hash{} }
+
 // Get the string representation of the underlying hash
 func (h Hash) Str() string   { return string(h[:]) }
 func (h Hash) Bytes() []byte { return h[:] }
@@ -190,6 +193,9 @@ func IsHexAddress(s string) bool {
 	return len(s) == 2*AddressLength && isHex(s)
 }
 
+// IsZero returns if a address is empty
+func (a Address) IsZero() bool { return a == Address{} }
+
 // Get the string representation of the underlying address
 func (a Address) Str() string   { return string(a[:]) }
 func (a Address) Bytes() []byte { return a[:] }

consensus/XDPoS/XDPoS.go

@@ -17,6 +17,7 @@
 package XDPoS
 
 import (
+	"fmt"
 	"math/big"
 
 	"github.com/XinFinOrg/XDPoSChain/common"
@@ -95,7 +96,11 @@ func New(chainConfig *params.ChainConfig, db ethdb.Database) *XDPoS {
 		}
 	}
 
-	log.Info("xdc config loading", "config", config)
+	if config.V2.SwitchBlock.Uint64()%config.Epoch != 0 {
+		panic(fmt.Sprintf("v2 switch number is not epoch switch block %d, epoch %d", config.V2.SwitchBlock.Uint64(), config.Epoch))
+	}
+
+	log.Info("xdc config loading", "v2 config", config.V2)
 
 	minePeriodCh := make(chan int)
 

consensus/XDPoS/engines/engine_v2/engine.go

@@ -164,7 +164,7 @@ func (x *XDPoS_v2) Initial(chain consensus.ChainReader, header *types.Header) er
 }
 
 func (x *XDPoS_v2) initial(chain consensus.ChainReader, header *types.Header) error {
-	log.Info("[initial] initial v2 related parameters")
+	log.Warn("[initial] initial v2 related parameters")
 
 	if x.highestQuorumCert.ProposedBlockInfo.Hash != (common.Hash{}) { // already initialized
 		log.Info("[initial] Already initialized", "x.highestQuorumCert.ProposedBlockInfo.Hash", x.highestQuorumCert.ProposedBlockInfo.Hash)
@@ -219,6 +219,12 @@ func (x *XDPoS_v2) initial(chain consensus.ChainReader, header *types.Header) er
 			log.Error("[initial] Error while get masternodes", "error", err)
 			return err
 		}
+
+		if len(masternodes) == 0 {
+			log.Error("[initial] masternodes are empty", "v2switch", x.config.V2.SwitchBlock.Uint64())
+			return fmt.Errorf("masternodes are empty v2 switch number: %d", x.config.V2.SwitchBlock.Uint64())
+		}
+
 		snap := newSnapshot(lastGapNum, lastGapHeader.Hash(), masternodes)
 		x.snapshots.Add(snap.Hash, snap)
 		err = storeSnapshot(snap, x.db)
@@ -229,7 +235,7 @@ func (x *XDPoS_v2) initial(chain consensus.ChainReader, header *types.Header) er
 	}
 
 	// Initial timeout
-	log.Info("[initial] miner wait period", "period", x.config.V2.CurrentConfig.MinePeriod)
+	log.Warn("[initial] miner wait period", "period", x.config.V2.CurrentConfig.MinePeriod)
 	// avoid deadlock
 	go func() {
 		x.minePeriodCh <- x.config.V2.CurrentConfig.MinePeriod
@@ -239,7 +245,7 @@ func (x *XDPoS_v2) initial(chain consensus.ChainReader, header *types.Header) er
 	x.timeoutWorker.Reset(chain)
 	x.isInitilised = true
 
-	log.Info("[initial] finish initialisation")
+	log.Warn("[initial] finish initialisation")
 
 	return nil
 }

consensus/tests/engine_v2_tests/initial_test.go

@@ -1,6 +1,7 @@
 package engine_v2_tests
 
 import (
+	"encoding/json"
 	"math/big"
 	"testing"
 
@@ -124,3 +125,21 @@ func TestSnapshotShouldAlreadyCreatedByUpdateM1(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, uint64(1350), snap.Number)
 }
+
+func TestInitialWithWrongSwitchNumber(t *testing.T) {
+	b, err := json.Marshal(params.TestXDPoSMockChainConfig)
+	assert.Nil(t, err)
+	configString := string(b)
+
+	var config params.ChainConfig
+	err = json.Unmarshal([]byte(configString), &config)
+	assert.Nil(t, err)
+
+	blockchain, _, currentBlock, _, _, _ := PrepareXDCTestBlockChainForV2Engine(t, 800, &config, nil)
+	adaptor := blockchain.Engine().(*XDPoS.XDPoS)
+	header := currentBlock.Header()
+	config.XDPoS.V2.SwitchBlock = big.NewInt(800) // not epoch number
+
+	err = adaptor.EngineV2.Initial(blockchain, header)
+	assert.NotNil(t, err)
+}

contracts/trc21issuer/simulation/test/main.go

@@ -4,15 +4,16 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"log"
+	"math/big"
+	"time"
+
 	"github.com/XinFinOrg/XDPoSChain/accounts/abi/bind"
 	"github.com/XinFinOrg/XDPoSChain/common"
 	"github.com/XinFinOrg/XDPoSChain/common/hexutil"
 	"github.com/XinFinOrg/XDPoSChain/contracts/trc21issuer"
 	"github.com/XinFinOrg/XDPoSChain/contracts/trc21issuer/simulation"
 	"github.com/XinFinOrg/XDPoSChain/ethclient"
-	"log"
-	"math/big"
-	"time"
 )
 
 var (
@@ -48,11 +49,10 @@ func airDropTokenToAccountNoXDC() {
 	if err != nil {
 		log.Fatal("can't transaction's receipt ", err, "hash", tx.Hash().Hex())
 	}
-	fee := big.NewInt(0).SetUint64(hexutil.MustDecodeUint64(receipt["gasUsed"].(string)))
-	if hexutil.MustDecodeUint64(receipt["blockNumber"].(string)) > common.TIPTRC21Fee.Uint64() {
-		fee = fee.Mul(fee, common.TRC21GasPrice)
-	}
-	fmt.Println("fee", fee.Uint64(), "number", hexutil.MustDecodeUint64(receipt["blockNumber"].(string)))
+	gasUsed := hexutil.MustDecodeUint64(receipt["gasUsed"].(string))
+	blockNumber := hexutil.MustDecodeUint64(receipt["blockNumber"].(string))
+	fee := common.GetGasFee(blockNumber, gasUsed)
+	fmt.Println("fee", fee.Uint64(), "number", blockNumber)
 	remainFee = big.NewInt(0).Sub(remainFee, fee)
 	//check balance fee
 	balanceIssuerFee, err := trc21IssuerInstance.GetTokenCapacity(trc21TokenAddr)
@@ -111,11 +111,10 @@ func testTransferTRC21TokenWithAccountNoXDC() {
 	if err != nil {
 		log.Fatal("can't transaction's receipt ", err, "hash", tx.Hash().Hex())
 	}
-	fee := big.NewInt(0).SetUint64(hexutil.MustDecodeUint64(receipt["gasUsed"].(string)))
-	if hexutil.MustDecodeUint64(receipt["blockNumber"].(string)) > common.TIPTRC21Fee.Uint64() {
-		fee = fee.Mul(fee, common.TRC21GasPrice)
-	}
-	fmt.Println("fee", fee.Uint64(), "number", hexutil.MustDecodeUint64(receipt["blockNumber"].(string)))
+	gasUsed := hexutil.MustDecodeUint64(receipt["gasUsed"].(string))
+	blockNumber := hexutil.MustDecodeUint64(receipt["blockNumber"].(string))
+	fee := common.GetGasFee(blockNumber, gasUsed)
+	fmt.Println("fee", fee.Uint64(), "number", blockNumber)
 	remainFee = big.NewInt(0).Sub(remainFee, fee)
 	//check balance fee
 	balanceIssuerFee, err := trc21IssuerInstance.GetTokenCapacity(trc21TokenAddr)
@@ -178,11 +177,10 @@ func testTransferTrc21Fail() {
 	if err != nil {
 		log.Fatal("can't transaction's receipt ", err, "hash", tx.Hash().Hex())
 	}
-	fee := big.NewInt(0).SetUint64(hexutil.MustDecodeUint64(receipt["gasUsed"].(string)))
-	if hexutil.MustDecodeUint64(receipt["blockNumber"].(string)) > common.TIPTRC21Fee.Uint64() {
-		fee = fee.Mul(fee, common.TRC21GasPrice)
-	}
-	fmt.Println("fee", fee.Uint64(), "number", hexutil.MustDecodeUint64(receipt["blockNumber"].(string)))
+	gasUsed := hexutil.MustDecodeUint64(receipt["gasUsed"].(string))
+	blockNumber := hexutil.MustDecodeUint64(receipt["blockNumber"].(string))
+	fee := common.GetGasFee(blockNumber, gasUsed)
+	fmt.Println("fee", fee.Uint64(), "number", blockNumber)
 	remainFee = big.NewInt(0).Sub(remainFee, fee)
 	//check balance fee
 	balanceIssuerFee, err = trc21IssuerInstance.GetTokenCapacity(trc21TokenAddr)