Merge pull request #2 from node-real/netmarble_v2.0_dev

Fncy2 demand development

Author: xuan-io

consensus/parlia/abi.go

@@ -1054,6 +1054,9 @@ func (p *Parlia) getCurrentValidators(blockHash common.Hash) ([]common.Address,
 }
 func (p *Parlia) BlockRewards(blockNumber *big.Int) *big.Int {
 	if rules := p.chainConfig.Rules(blockNumber); rules.HasBlockRewards {
+		if p.chainConfig.Parlia.StopMintBlock != nil && p.chainConfig.Parlia.StopMintBlock.Cmp(blockNumber) <= 0 {
+			return nil
+		}
 		blockRewards := p.chainConfig.Parlia.BlockRewards
 		if blockRewards != nil && blockRewards.Cmp(common.Big0) > 0 {
 			return blockRewards
@@ -1070,17 +1073,20 @@ func (p *Parlia) distributeIncoming(val common.Address, state *state.StateDB, he
 	state.SetBalance(consensus.SystemAddress, big.NewInt(0))
 	state.AddBalance(coinbase, balance)
 	rewards := big.NewInt(0).Abs(balance)
-	if rules := p.chainConfig.Rules(header.Number); rules.HasBlockRewards {
-		blockRewards := p.chainConfig.Parlia.BlockRewards
-		// if we have enabled block rewards and rewards are greater than 0 then
-		if blockRewards != nil && blockRewards.Cmp(common.Big0) > 0 {
-			state.AddBalance(coinbase, blockRewards)
-			rewards = rewards.Add(rewards, blockRewards)
-		}
+	blockRewards := p.BlockRewards(header.Number)
+	if blockRewards != nil {
+		rewards = rewards.Add(rewards, blockRewards)
+		state.AddBalance(coinbase, blockRewards)
 	}
 	if rewards.Cmp(common.Big0) <= 0 {
 		return nil
 	}
+	if p.chainConfig.IsFncy2(header.Number) {
+		if blockRewards == nil {
+			blockRewards = big.NewInt(0)
+		}
+		return p.distributeRewards(rewards, blockRewards, balance, val, state, header, chain, txs, receipts, receivedTxs, usedGas, mining)
+	}
 	// remove 1/16 reward according to netmarble
 	//doDistributeSysReward := state.GetBalance(common.HexToAddress(systemcontract.SystemRewardContract)).Cmp(maxSystemBalance) < 0
 	//if doDistributeSysReward {
@@ -1160,6 +1166,27 @@ func (p *Parlia) distributeToSystem(amount *big.Int, state *state.StateDB, heade
 	return p.applyTransaction(msg, state, header, chain, txs, receipts, receivedTxs, usedGas, mining)
 }
 
+// slash spoiled validators
+func (p *Parlia) distributeRewards(amount *big.Int, blockRewards *big.Int, gasFee *big.Int, validator common.Address,
+	state *state.StateDB, header *types.Header, chain core.ChainContext,
+	txs *[]*types.Transaction, receipts *[]*types.Receipt, receivedTxs *[]*types.Transaction, usedGas *uint64, mining bool) error {
+	// method
+	method := "distributeRewards"
+
+	// get packed data
+	data, err := p.validatorSetABI.Pack(method,
+		validator, blockRewards, gasFee,
+	)
+	if err != nil {
+		log.Error("Unable to pack tx for distributeRewards", "error", err)
+		return err
+	}
+	// get system message
+	msg := p.getSystemMessage(header.Coinbase, common.HexToAddress(systemcontract.ValidatorContract), data, amount)
+	// apply message
+	return p.applyTransaction(msg, state, header, chain, txs, receipts, receivedTxs, usedGas, mining)
+}
+
 // slash spoiled validators
 func (p *Parlia) distributeToValidator(amount *big.Int, validator common.Address,
 	state *state.StateDB, header *types.Header, chain core.ChainContext,

consensus/parlia/parlia.go

@@ -253,6 +253,7 @@ type TxPool struct {
 
 	gasFreeAddressMap     map[common.Address]uint                            // from address that can join tx_pool for free
 	gasFreeAddressMapFunc func(common.Hash) (map[common.Address]uint, error) // add func to get gasFreeAddressMap
+	gasPriceFunc          func(common.Hash) (*big.Int, error)                // add func to get gas price, do nothing when return 0
 
 	pending map[common.Address]*txList   // All currently processable transactions
 	queue   map[common.Address]*txList   // Queued but non-processable transactions
@@ -283,11 +284,17 @@ func getNoGasFreeAddressMapFunc() func(common.Hash) (map[common.Address]uint, er
 		return gasFreeToAddressMap, nil
 	}
 }
+func getGasPriceFunc() func(common.Hash) (*big.Int, error) {
+	return func(blockHash common.Hash) (*big.Int, error) {
+		return big.NewInt(0), nil
+	}
+}
+
 func NewTxPool(config TxPoolConfig, chainconfig *params.ChainConfig, chain blockChain) *TxPool {
 
-	return NewEnhanceTxPool(config, chainconfig, chain, getNoGasFreeAddressMapFunc())
+	return NewEnhanceTxPool(config, chainconfig, chain, getNoGasFreeAddressMapFunc(), getGasPriceFunc())
 }
-func NewEnhanceTxPool(config TxPoolConfig, chainconfig *params.ChainConfig, chain blockChain, gasFreeAddressMapFunc func(common.Hash) (map[common.Address]uint, error)) *TxPool {
+func NewEnhanceTxPool(config TxPoolConfig, chainconfig *params.ChainConfig, chain blockChain, gasFreeAddressMapFunc func(common.Hash) (map[common.Address]uint, error), gasPriceFunc func(common.Hash) (*big.Int, error)) *TxPool {
 	// Sanitize the input to ensure no vulnerable gas prices are set
 	config = (&config).sanitize()
 	// Create the transaction pool with its initial settings
@@ -309,6 +316,7 @@ func NewEnhanceTxPool(config TxPoolConfig, chainconfig *params.ChainConfig, chai
 		gasPrice:              new(big.Int).SetUint64(config.PriceLimit),
 		gasFreeAddressMap:     make(map[common.Address]uint),
 		gasFreeAddressMapFunc: gasFreeAddressMapFunc,
+		gasPriceFunc:          gasPriceFunc,
 	}
 	pool.locals = newAccountSet(pool.signer)
 	for _, addr := range config.Locals {
@@ -479,10 +487,19 @@ func (pool *TxPool) SubscribeReannoTxsEvent(ch chan<- ReannoTxsEvent) event.Subs
 func (pool *TxPool) GasPrice() *big.Int {
 	pool.mu.RLock()
 	defer pool.mu.RUnlock()
+	return new(big.Int).Set(pool.gasPrice)
+}
 
+//Fncy2 Update
+func (pool *TxPool) GasPriceWithoutLock() *big.Int {
 	return new(big.Int).Set(pool.gasPrice)
 }
 
+func (pool *TxPool) SetGasPriceWithoutLock(price *big.Int) {
+	pool.gasPrice = price
+	log.Info("Transaction pool price threshold updated", "price", price)
+}
+
 // SetGasPrice updates the minimum price required by the transaction pool for a
 // new transaction, and drops all transactions below this threshold.
 func (pool *TxPool) SetGasPrice(price *big.Int) {
@@ -551,7 +568,6 @@ func (pool *TxPool) Content() (map[common.Address]types.Transactions, map[common
 func (pool *TxPool) Pending() (map[common.Address]types.Transactions, error) {
 	pool.mu.Lock()
 	defer pool.mu.Unlock()
-
 	pending := make(map[common.Address]types.Transactions)
 	for addr, list := range pool.pending {
 		pending[addr] = list.Flatten()
@@ -1293,6 +1309,21 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) {
 	next := new(big.Int).Add(newHead.Number, big.NewInt(1))
 	pool.istanbul = pool.chainconfig.IsIstanbul(next)
 	pool.eip2718 = pool.chainconfig.IsBerlin(next)
+	//fncy2 update
+	if pool.chainconfig.IsFncy2(next) {
+		gasPrice, err := pool.gasPriceFunc(pool.chain.CurrentBlock().Hash())
+		if err != nil {
+			log.Warn("Failed to get gasPrice", "err", err)
+		} else {
+			if gasPrice != nil && gasPrice.Cmp(common.Big0) > 0 {
+				if pool.gasPrice.Cmp(gasPrice) != 0 {
+					log.Debug("Set gasPrice ", " old gasPrice", pool.gasPrice, " new gasPrice", gasPrice)
+					pool.SetGasPriceWithoutLock(gasPrice)
+				}
+			}
+		}
+	}
+
 }
 
 // promoteExecutables moves transactions that have become processable from the

core/tx_pool.go

@@ -515,7 +515,11 @@ func (evm *EVM) create(caller ContractRef, codeAndHash *codeAndHash, gas uint64,
 	ret, err := run(evm, contract, nil, false)
 
 	// Check whether the max code size has been exceeded, assign err if the case.
-	if err == nil && evm.chainRules.IsEIP158 && len(ret) > params.MaxCodeSize {
+	maxCodeSize := params.MaxCodeSize
+	if evm.chainRules.IsContract48kBlock {
+		maxCodeSize = params.MaxCodeSize * 2
+	}
+	if err == nil && evm.chainRules.IsEIP158 && len(ret) > maxCodeSize {
 		err = ErrMaxCodeSizeExceeded
 	}
 

core/vm/evm.go

@@ -21,6 +21,25 @@ const chainConfigABI = `
     "name": "ActiveValidatorsLengthChanged",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint16",
+        "name": "share",
+        "type": "uint16"
+      }
+    ],
+    "name": "DistributeRewardsShareChanged",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -78,6 +97,25 @@ const chainConfigABI = `
     "name": "FelonyThresholdChanged",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "preValue",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "newValue",
+        "type": "address"
+      }
+    ],
+    "name": "FoundationAddressChanged",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -142,6 +180,25 @@ const chainConfigABI = `
     "name": "FreeGasAddressSizeChanged",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "preValue",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "newValue",
+        "type": "uint256"
+      }
+    ],
+    "name": "GasPriceChanged",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -250,6 +307,19 @@ const chainConfigABI = `
     "name": "ValidatorJailEpochLengthChanged",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint16",
+        "name": "share",
+        "type": "uint16"
+      }
+    ],
+    "name": "ValidatorRewardsShareChanged",
+    "type": "event"
+  },
   {
     "inputs": [],
     "name": "freeGasAddressAdmin",
@@ -711,6 +781,111 @@ const chainConfigABI = `
     "outputs": [],
     "stateMutability": "nonpayable",
     "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "newValue",
+        "type": "uint256"
+      }
+    ],
+    "name": "setGasPrice",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getGasPrice",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getDistributeRewardsShares",
+    "outputs": [
+      {
+        "internalType": "uint16",
+        "name": "",
+        "type": "uint16"
+      },
+      {
+        "components": [
+          {
+            "internalType": "address",
+            "name": "account",
+            "type": "address"
+          },
+          {
+            "internalType": "uint16",
+            "name": "share",
+            "type": "uint16"
+          }
+        ],
+        "internalType": "struct IChainConfig.DistributeRewardsShare[]",
+        "name": "",
+        "type": "tuple[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint16",
+        "name": "validatorShare",
+        "type": "uint16"
+      },
+      {
+        "internalType": "address[]",
+        "name": "accounts",
+        "type": "address[]"
+      },
+      {
+        "internalType": "uint16[]",
+        "name": "shares",
+        "type": "uint16[]"
+      }
+    ],
+    "name": "updateDistributeRewardsShares",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "newValue",
+        "type": "address"
+      }
+    ],
+    "name": "setFoundationAddress",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getFoundationAddress",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
   }
 ]
 `

eth/abi.go

@@ -276,6 +276,16 @@ func (b *EthAPIBackend) Downloader() *downloader.Downloader {
 }
 
 func (b *EthAPIBackend) SuggestPrice(ctx context.Context) (*big.Int, error) {
+	//Fncy2 Update
+	if b.ChainConfig().IsFncy2(b.Chain().CurrentBlock().Header().Number) {
+		suggestPrice, err := b.gpo.SuggestPrice(ctx)
+		if err != nil {
+			gasprice := b.eth.TxPool().GasPriceWithoutLock()
+			if suggestPrice.Cmp(gasprice) < 0 {
+				return gasprice, nil
+			}
+		}
+	}
 	return b.gpo.SuggestPrice(ctx)
 }