LFM Phase-1

.gitignore

@@ -4,13 +4,17 @@
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile ~/.gitignore_global
 
+mainnet/
+node_1/
+node_2/
 /tmp
 */**/*un~
 */**/*.test
 *un~
 .DS_Store
 */**/.DS_Store
 .ethtest
+password.txt
 */**/*tx_database*
 */**/*dapps*
 build/_vendor/pkg

accounts/abi/bind/base.go

@@ -344,6 +344,7 @@ func (c *BoundContract) estimateGasLimit(opts *TransactOpts, contract *common.Ad
 		Value:     value,
 		Data:      input,
 	}
+	//@lfm: no need for price adjustment here as only invoked via contract-invoked txs
 	return c.transactor.EstimateGas(ensureContext(opts.Context), msg)
 }
 

consensus/satoshi/satoshi.go

@@ -269,7 +269,6 @@ func New(
 		candidateHubABI: cABI,
 		signer:          types.NewEIP155Signer(chainConfig.ChainID),
 	}
-
 	return c
 }
 

core/blockchain.go

@@ -1459,8 +1459,8 @@ func (bc *BlockChain) writeKnownBlock(block *types.Block) error {
 	return nil
 }
 
-// writeBlockWithState writes block, metadata and corresponding state data to the
-// database.
+// writeBlockWithState writes block, metadata and corresponding state data to the database
+// @lfm commit a new block
 func (bc *BlockChain) writeBlockWithState(block *types.Block, receipts []*types.Receipt, logs []*types.Log, state *state.StateDB) error {
 	// Calculate the total difficulty of the block
 	ptd := bc.GetTd(block.ParentHash(), block.NumberU64()-1)
@@ -1599,7 +1599,7 @@ func (bc *BlockChain) WriteBlockAndSetHead(block *types.Block, receipts []*types
 	return bc.writeBlockAndSetHead(block, receipts, logs, state, emitHeadEvent)
 }
 
-// writeBlockAndSetHead writes the block and all associated state to the database,
+// writeBlockAndSetHead writes the block and all associated state to the database,  @lfm
 // and also it applies the given block as the new chain head. This function expects
 // the chain mutex to be held.
 func (bc *BlockChain) writeBlockAndSetHead(block *types.Block, receipts []*types.Receipt, logs []*types.Log, state *state.StateDB, emitHeadEvent bool) (status WriteStatus, err error) {

core/types/access_list_tx.go

@@ -100,6 +100,7 @@ func (tx *AccessListTx) accessList() AccessList { return tx.AccessList }
 func (tx *AccessListTx) data() []byte           { return tx.Data }
 func (tx *AccessListTx) gas() uint64            { return tx.Gas }
 func (tx *AccessListTx) gasPrice() *big.Int     { return tx.GasPrice }
+func (tx *AccessListTx) origGasPrice() *big.Int { return nil }
 func (tx *AccessListTx) gasTipCap() *big.Int    { return tx.GasPrice }
 func (tx *AccessListTx) gasFeeCap() *big.Int    { return tx.GasPrice }
 func (tx *AccessListTx) value() *big.Int        { return tx.Value }

core/types/dynamic_fee_tx.go

@@ -90,6 +90,7 @@ func (tx *DynamicFeeTx) gas() uint64            { return tx.Gas }
 func (tx *DynamicFeeTx) gasFeeCap() *big.Int    { return tx.GasFeeCap }
 func (tx *DynamicFeeTx) gasTipCap() *big.Int    { return tx.GasTipCap }
 func (tx *DynamicFeeTx) gasPrice() *big.Int     { return tx.GasFeeCap }
+func (tx *DynamicFeeTx) origGasPrice() *big.Int { return nil }
 func (tx *DynamicFeeTx) value() *big.Int        { return tx.Value }
 func (tx *DynamicFeeTx) nonce() uint64          { return tx.Nonce }
 func (tx *DynamicFeeTx) to() *common.Address    { return tx.To }

core/types/legacy_tx.go

@@ -24,13 +24,14 @@
 
 // LegacyTx is the transaction data of regular Ethereum transactions.
 type LegacyTx struct {
 	Nonce    uint64          // nonce of sender account
 	GasPrice *big.Int        // wei per gas
 	Gas      uint64          // gas limit
 	To       *common.Address `rlp:"nil"` // nil means contract creation
 	Value    *big.Int        // wei amount
 	Data     []byte          // contract invocation input data
 	V, R, S  *big.Int        // signature values
+	OrigGasPrice *big.Int    `rlp:"optional"` //@lfm
 }
 
 // NewTransaction creates an unsigned legacy transaction.
@@ -71,6 +72,7 @@
 		V:        new(big.Int),
 		R:        new(big.Int),
 		S:        new(big.Int),
+		OrigGasPrice: tx.OrigGasPrice,
 	}
 	if tx.Value != nil {
 		cpy.Value.Set(tx.Value)
@@ -97,6 +99,7 @@
 func (tx *LegacyTx) data() []byte           { return tx.Data }
 func (tx *LegacyTx) gas() uint64            { return tx.Gas }
 func (tx *LegacyTx) gasPrice() *big.Int     { return tx.GasPrice }
+func (tx *LegacyTx) origGasPrice() *big.Int { return tx.OrigGasPrice }
 func (tx *LegacyTx) gasTipCap() *big.Int    { return tx.GasPrice }
 func (tx *LegacyTx) gasFeeCap() *big.Int    { return tx.GasPrice }
 func (tx *LegacyTx) value() *big.Int        { return tx.Value }

core/types/transaction.go

@@ -28,6 +28,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/eth/gasprice/lfm"
 	"github.com/ethereum/go-ethereum/rlp"
 )
 
@@ -77,6 +78,7 @@ type TxData interface {
 	data() []byte
 	gas() uint64
 	gasPrice() *big.Int
+	origGasPrice() *big.Int
 	gasTipCap() *big.Int
 	gasFeeCap() *big.Int
 	value() *big.Int
@@ -165,6 +167,11 @@ func (tx *Transaction) UnmarshalBinary(b []byte) error {
 		if err != nil {
 			return err
 		}
+		//@lfm RPC invocation route: adjust tx gas price
+		if data.OrigGasPrice == nil {
+			data.OrigGasPrice = data.GasPrice
+			data.GasPrice = lfm.AdjustGasPrice(data.Gas, data.Value, data.To, data.Data, data.OrigGasPrice)
+		}
 		tx.setDecoded(&data, len(b))
 		return nil
 	}
@@ -274,6 +281,14 @@ func (tx *Transaction) Gas() uint64 { return tx.inner.gas() }
 // GasPrice returns the gas price of the transaction.
 func (tx *Transaction) GasPrice() *big.Int { return new(big.Int).Set(tx.inner.gasPrice()) }
 
+func (tx *Transaction) OrigGasPrice() *big.Int {
+	orig := tx.inner.origGasPrice()
+	if orig == nil {
+		return nil
+	}
+	return new(big.Int).Set(orig)
+}
+
 // GasTipCap returns the gasTipCap per gas of the transaction.
 func (tx *Transaction) GasTipCap() *big.Int { return new(big.Int).Set(tx.inner.gasTipCap()) }
 
@@ -332,6 +347,10 @@ func (tx *Transaction) GasTipCapCmp(other *Transaction) int {
 
 // GasTipCapIntCmp compares the gasTipCap of the transaction against the given gasTipCap.
 func (tx *Transaction) GasTipCapIntCmp(other *big.Int) int {
+	legacyTx, isLegacy := tx.inner.(*LegacyTx) //@lfm
+	if isLegacy && legacyTx.origGasPrice() != nil {
+		return legacyTx.origGasPrice().Cmp(other) // tx gas price might have been reduced by the lfm module
+	}
 	return tx.inner.gasTipCap().Cmp(other)
 }
 

core/types/transaction_marshalling.go

@@ -47,7 +47,8 @@
 	AccessList *AccessList  `json:"accessList,omitempty"`
 
 	// Only used for encoding:
 	Hash common.Hash `json:"hash"`
+	OrigGasPrice *hexutil.Big `json:"origGasPrice" rlp:"optional"`
 }
 
 // MarshalJSON marshals as JSON with a hash.
@@ -63,6 +64,7 @@
 		enc.Nonce = (*hexutil.Uint64)(&tx.Nonce)
 		enc.Gas = (*hexutil.Uint64)(&tx.Gas)
 		enc.GasPrice = (*hexutil.Big)(tx.GasPrice)
+		enc.OrigGasPrice = (*hexutil.Big)(tx.OrigGasPrice)
 		enc.Value = (*hexutil.Big)(tx.Value)
 		enc.Data = (*hexutil.Bytes)(&tx.Data)
 		enc.To = t.To()
@@ -122,6 +124,7 @@
 			return errors.New("missing required field 'gasPrice' in transaction")
 		}
 		itx.GasPrice = (*big.Int)(dec.GasPrice)
+		itx.OrigGasPrice = (*big.Int)(dec.OrigGasPrice)
 		if dec.Gas == nil {
 			return errors.New("missing required field 'gas' in transaction")
 		}

core/types/transaction_signing.go

@@ -369,7 +369,15 @@ func (s EIP155Signer) Sender(tx *Transaction) (common.Address, error) {
 	V, R, S := tx.RawSignatureValues()
 	V = new(big.Int).Sub(V, s.chainIdMul)
 	V.Sub(V, big8)
-	return recoverPlain(s.Hash(tx), R, S, V, true)
+	//@lfm: crypto calc to obtain via tx hash the sender address
+	var sighash common.Hash
+	legacyTx, isLegacy := tx.inner.(*LegacyTx)
+	if isLegacy && legacyTx.origGasPrice() != nil {
+		sighash = s.RecoveryHash(tx, legacyTx.origGasPrice())
+	} else {
+		sighash = s.Hash(tx)
+	}
+	return recoverPlain(sighash, R, S, V, true)
 }
 
 // SignatureValues returns signature values. This signature
@@ -386,12 +394,20 @@ func (s EIP155Signer) SignatureValues(tx *Transaction, sig []byte) (R, S, V *big
 	return R, S, V, nil
 }
 
+func (s EIP155Signer) RecoveryHash(tx *Transaction, origGasPrice *big.Int) common.Hash { //@lfm
+	return s.hashImpl(tx, origGasPrice)
+}
+
+func (s EIP155Signer) Hash(tx *Transaction) common.Hash {
+	return s.hashImpl(tx, tx.GasPrice())
+}
+
 // Hash returns the hash to be signed by the sender.
 // It does not uniquely identify the transaction.
-func (s EIP155Signer) Hash(tx *Transaction) common.Hash {
+func (s EIP155Signer) hashImpl(tx *Transaction, gasPrice *big.Int) common.Hash {
 	return rlpHash([]interface{}{
 		tx.Nonce(),
-		tx.GasPrice(),
+		gasPrice,
 		tx.Gas(),
 		tx.To(),
 		tx.Value(),

debug_build.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+go build -o ./build/bin/geth   -gcflags=all='-N -l' -v ./cmd/geth