Skip to content

Commit 0412774

Browse files
committed
review feedback for rebase over kiln
1 parent b9adceb commit 0412774

File tree

4 files changed

+1
-23
lines changed

4 files changed

+1
-23
lines changed

core/blockchain.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1594,12 +1594,7 @@ func (bc *BlockChain) insertChain(chain types.Blocks, verifySeals, setHead bool)
15941594

15951595
// Process block using the parent state as reference point
15961596
substart := time.Now()
1597-
var (
1598-
usedGas uint64
1599-
receipts types.Receipts
1600-
logs []*types.Log
1601-
)
1602-
receipts, logs, usedGas, err = bc.processor.Process(block, statedb, bc.vmConfig)
1597+
receipts, logs, usedGas, err := bc.processor.Process(block, statedb, bc.vmConfig)
16031598
if err != nil {
16041599
bc.reportBlock(block, receipts, err)
16051600
atomic.StoreUint32(&followupInterrupt, 1)

core/state/state_object.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -612,25 +612,10 @@ func (s *stateObject) Balance() *big.Int {
612612
return s.data.Balance
613613
}
614614

615-
func (s *stateObject) BalanceLE() []byte {
616-
var out [32]byte
617-
for i, b := range s.data.Balance.Bytes() {
618-
out[len(s.data.Balance.Bytes())-1-i] = b
619-
}
620-
621-
return out[:]
622-
}
623-
624615
func (s *stateObject) Nonce() uint64 {
625616
return s.data.Nonce
626617
}
627618

628-
func (s *stateObject) NonceLE() []byte {
629-
var out [32]byte
630-
binary.LittleEndian.PutUint64(out[:8], s.data.Nonce)
631-
return out[:]
632-
}
633-
634619
// Never called, but must be present to allow stateObject to be used
635620
// as a vm.Account interface that also satisfies the vm.ContractRef
636621
// interface. Interfaces are awesome.

core/types/access_witness.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ const (
3939

4040
// AccessWitness lists the locations of the state that are being accessed
4141
// during the production of a block.
42-
// TODO(@gballet) this doesn't fully support deletions
4342
type AccessWitness struct {
4443
// Branches flags if a given branch has been loaded
4544
Branches map[VerkleStem]Mode

core/vm/interpreter.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
197197
contract.Gas -= touchEachChunksOnReadAndChargeGas(pc, 1, contract.Address().Bytes()[:], contract.Code, contract, in.evm.TxContext.Accesses, contract.IsDeployment)
198198
}
199199

200-
// TODO how can we tell if we are in stateless mode here and need to get the op from the witness
201200
// If we are in witness mode, then raise an error
202201
op = contract.GetOp(pc)
203202

0 commit comments

Comments
 (0)