mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-06 20:13:47 +00:00
* add proof for predeployed storages * reverse inneeded code * update for mainbranch merging * add pertx storage trace * dummy tx proof * add txstorage trace * add coinbase storage as trace * enable (sync) tracing by default * basic * init cgo framework * fix break loop * integrate the right zkevm version (#323) * finish rust codes * use dylib (#325) * flip * ? * use cdylib * revert * fix * apply_tx * rename * fixing types fixing types fixing types * clean up * ExecutionResults (#328) * filling * filling * more * clean up * filling * coinbase * add * MPTWitness * ExecutionResults WIP * L1fee L1fee * sender * to * Failed & ReturnValue * createdAcc & after * remove MPTWitness * txStorageTrace * add FeeRecipient * add StorageTrace * fix FFI types * better logger * cargo fmt * fix * add build tags * update Makefile * fix library * improve ld path * correctly deal with circuit_capacity_checker returned result * fix return value * update cargo (#333) * update cargo * update * update go * refactor * raname `circuits capacity checker` to `circuit capacity checker` * some refactorings * [Fix] storage proof generation in capacity checker (#348) * make per-tx storage and deletion proof work * format * fix misplaced markdeletion --------- Co-authored-by: HAOYUatHZ <haoyu@protonmail.com> * docker (#363) * update Dockerfile * build: update go version to 1.19 * update * fix * fix * try * simplify * revert go version update l2geth Dockerfiles * fix * fix coinbase * fix (#369) * format * Update version.go * address comments * Capacity refactor (#374) * init * id * support multiple instances * fix id * fix conflicts * refactor to use same codes (#379) * re-init * WIP * WIP * refactor * go * minor * fix storage proof of l1gas price oracle * move 1 * move 2 * move 3 * move 4 * move 5 move 5 * move 6 move 6 * move 7 * move 8 * move 9 * move 10 * clean up clean up --------- Co-authored-by: Ho Vei <noelwei@gmail.com> * finish basic * minor * config capacity check in block_validator (#380) * init * done ref * fix tests fix tests fix tests fix tests * add more comments * apply_block * improve logs * cargo fmt * Capacity big refactor (#383) * CreateTraceEnv * WIP * draft more fix * for test * fortet * clean up * add more comments * goimports -local github.com/scroll-tech/go-ethereum -w . * fix typos * attempt 1 * attempt 2 * attempt 3 * gogogo * clean up * fix * fix * rename * minor * fix * minor * minor * improve doc * use dedicated `checkCircuitCapacity` flag (#394) * refactor * fix * add lock * [feat] capacity checking: upgrade libzkp (#395) * upgrade * upgrade libzkp * write RowConsumption (#396) * write RowConsumption * name alignments * revert some formatting * add lock to CircuitCapacityChecker in BlockValidator * remove mutex pointer * improve github workflow * improve * store row consumption in mining (#397) * prepare * finish * add more logs * mark `ApplyBlock` as ready * update libzkp (#401) * fix * Capacity detail (#402) * fix(block-validation): consider skipping in ValidateL1Messages (#405) * fix(block-validation): consider skipping in ValidateL1Messages * fix(block): consider skipping in L1MessageCount * fix l1 validation tests * fix NumL1Messages * fix impl.go return types fix * better error handling (#407) * add add * add * add * add * add * cargo fmt * add * update * add * WIP * minor * gogogo * gogogo * fix * fix * fix * cargo clippy * improve * improve * creation lock (#408) * creation lock * update * Debug log (#409) * add more logs * more * more * fix * improve * Update cmd/utils/flags.go Co-authored-by: Péter Garamvölgyi <peter@scroll.io> * refactor worker.commit() * avoid re-calculate * txpool ccc err handling (#411) * more explicit error comments * add more logs * fix unnecessary commit * add more logs * fix `ineffassign` * add more comments * log id for `NewCircuitCapacityChecker` (#414) add log to `NewCircuitCapacityChecker` * Persist skip info for block where all L1 msgs are skipped (#415) persist skip info for block where all L1 msgs are skipped * Update version.go --------- Co-authored-by: Ho Vei <noelwei@gmail.com> Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com> Co-authored-by: Péter Garamvölgyi <peter@scroll.io>
141 lines
4.8 KiB
Go
141 lines
4.8 KiB
Go
//go:build circuit_capacity_checker
|
|
|
|
package circuitcapacitychecker
|
|
|
|
/*
|
|
#cgo LDFLAGS: -lm -ldl -lzkp -lzktrie
|
|
#include <stdlib.h>
|
|
#include "./libzkp/libzkp.h"
|
|
*/
|
|
import "C" //nolint:typecheck
|
|
|
|
import (
|
|
"encoding/json"
|
|
"sync"
|
|
"unsafe"
|
|
|
|
"github.com/scroll-tech/go-ethereum/core/types"
|
|
"github.com/scroll-tech/go-ethereum/log"
|
|
)
|
|
|
|
// mutex for concurrent CircuitCapacityChecker creations
|
|
var creationMu sync.Mutex
|
|
|
|
func init() {
|
|
C.init()
|
|
}
|
|
|
|
type CircuitCapacityChecker struct {
|
|
// mutex for each CircuitCapacityChecker itself
|
|
sync.Mutex
|
|
ID uint64
|
|
}
|
|
|
|
func NewCircuitCapacityChecker() *CircuitCapacityChecker {
|
|
creationMu.Lock()
|
|
defer creationMu.Unlock()
|
|
|
|
id := C.new_circuit_capacity_checker()
|
|
return &CircuitCapacityChecker{ID: uint64(id)}
|
|
}
|
|
|
|
func (ccc *CircuitCapacityChecker) Reset() {
|
|
ccc.Lock()
|
|
defer ccc.Unlock()
|
|
|
|
C.reset_circuit_capacity_checker(C.uint64_t(ccc.ID))
|
|
}
|
|
|
|
func (ccc *CircuitCapacityChecker) ApplyTransaction(traces *types.BlockTrace) (*types.RowConsumption, error) {
|
|
ccc.Lock()
|
|
defer ccc.Unlock()
|
|
|
|
if len(traces.Transactions) != 1 || len(traces.ExecutionResults) != 1 || len(traces.TxStorageTraces) != 1 {
|
|
log.Error("malformatted BlockTrace in ApplyTransaction", "id", ccc.ID,
|
|
"len(traces.Transactions)", len(traces.Transactions),
|
|
"len(traces.ExecutionResults)", len(traces.ExecutionResults),
|
|
"len(traces.TxStorageTraces)", len(traces.TxStorageTraces),
|
|
"err", "length of Transactions, or ExecutionResults, or TxStorageTraces, is not equal to 1")
|
|
return nil, ErrUnknown
|
|
}
|
|
|
|
tracesByt, err := json.Marshal(traces)
|
|
if err != nil {
|
|
log.Error("fail to json marshal traces in ApplyTransaction", "id", ccc.ID, "TxHash", traces.Transactions[0].TxHash, "err", err)
|
|
return nil, ErrUnknown
|
|
}
|
|
|
|
tracesStr := C.CString(string(tracesByt))
|
|
defer func() {
|
|
C.free(unsafe.Pointer(tracesStr))
|
|
}()
|
|
|
|
log.Debug("start to check circuit capacity for tx", "id", ccc.ID, "TxHash", traces.Transactions[0].TxHash)
|
|
rawResult := C.apply_tx(C.uint64_t(ccc.ID), tracesStr)
|
|
log.Debug("check circuit capacity for tx done", "id", ccc.ID, "TxHash", traces.Transactions[0].TxHash)
|
|
|
|
result := &WrappedRowUsage{}
|
|
if err = json.Unmarshal([]byte(C.GoString(rawResult)), result); err != nil {
|
|
log.Error("fail to json unmarshal apply_tx result", "id", ccc.ID, "TxHash", traces.Transactions[0].TxHash, "err", err)
|
|
return nil, ErrUnknown
|
|
}
|
|
|
|
if result.Error != "" {
|
|
log.Error("fail to apply_tx in CircuitCapacityChecker", "id", ccc.ID, "TxHash", traces.Transactions[0].TxHash, "err", result.Error)
|
|
return nil, ErrUnknown
|
|
}
|
|
if result.TxRowUsage == nil || result.AccRowUsage == nil {
|
|
log.Error("fail to apply_tx in CircuitCapacityChecker",
|
|
"id", ccc.ID, "TxHash", traces.Transactions[0].TxHash,
|
|
"len(result.TxRowUsage)", len(result.TxRowUsage),
|
|
"len(result.AccRowUsage)", len(result.AccRowUsage),
|
|
"err", "TxRowUsage or AccRowUsage is empty unexpectedly")
|
|
return nil, ErrUnknown
|
|
}
|
|
if !result.TxRowUsage.IsOk {
|
|
return nil, ErrTxRowConsumptionOverflow
|
|
}
|
|
if !result.AccRowUsage.IsOk {
|
|
return nil, ErrBlockRowConsumptionOverflow
|
|
}
|
|
return (*types.RowConsumption)(&result.AccRowUsage.RowUsageDetails), nil
|
|
}
|
|
|
|
func (ccc *CircuitCapacityChecker) ApplyBlock(traces *types.BlockTrace) (*types.RowConsumption, error) {
|
|
ccc.Lock()
|
|
defer ccc.Unlock()
|
|
|
|
tracesByt, err := json.Marshal(traces)
|
|
if err != nil {
|
|
log.Error("fail to json marshal traces in ApplyBlock", "id", ccc.ID, "blockNumber", traces.Header.Number, "blockHash", traces.Header.Hash(), "err", err)
|
|
return nil, ErrUnknown
|
|
}
|
|
|
|
tracesStr := C.CString(string(tracesByt))
|
|
defer func() {
|
|
C.free(unsafe.Pointer(tracesStr))
|
|
}()
|
|
|
|
log.Debug("start to check circuit capacity for block", "id", ccc.ID, "blockNumber", traces.Header.Number, "blockHash", traces.Header.Hash())
|
|
rawResult := C.apply_block(C.uint64_t(ccc.ID), tracesStr)
|
|
log.Debug("check circuit capacity for block done", "id", ccc.ID, "blockNumber", traces.Header.Number, "blockHash", traces.Header.Hash())
|
|
|
|
result := &WrappedRowUsage{}
|
|
if err = json.Unmarshal([]byte(C.GoString(rawResult)), result); err != nil {
|
|
log.Error("fail to json unmarshal apply_block result", "id", ccc.ID, "blockNumber", traces.Header.Number, "blockHash", traces.Header.Hash(), "err", err)
|
|
return nil, ErrUnknown
|
|
}
|
|
|
|
if result.Error != "" {
|
|
log.Error("fail to apply_block in CircuitCapacityChecker", "id", ccc.ID, "blockNumber", traces.Header.Number, "blockHash", traces.Header.Hash(), "err", result.Error)
|
|
return nil, ErrUnknown
|
|
}
|
|
if result.AccRowUsage == nil {
|
|
log.Error("fail to apply_block in CircuitCapacityChecker", "id", ccc.ID, "blockNumber", traces.Header.Number, "blockHash", traces.Header.Hash(), "err", "AccRowUsage is empty unexpectedly")
|
|
return nil, ErrUnknown
|
|
}
|
|
if !result.AccRowUsage.IsOk {
|
|
return nil, ErrBlockRowConsumptionOverflow
|
|
}
|
|
return (*types.RowConsumption)(&result.AccRowUsage.RowUsageDetails), nil
|
|
}
|