Skip to content
This repository has been archived by the owner on Feb 17, 2025. It is now read-only.

Add IP and ZKCounter Validation, Refactor Batch Configs #2298

Merged
merged 8 commits into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixing comments
Signed-off-by: Nikolay Nedkov <[email protected]>
  • Loading branch information
Psykepro committed Jul 27, 2023
commit df000681c3bfa90e1b30bd1e82855b534c97d99e
25 changes: 1 addition & 24 deletions config/environments/local/local.node.config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -140,27 +140,4 @@ Name = "prover_db"
Host = "zkevm-state-db"
Port = "5432"
EnableLog = false
MaxConns = 200

[Batch]
[Batch.Constraints]
MaxTxsPerBatch = 300
MaxBatchBytesSize = 120000
MaxCumulativeGasUsed = 30000000
MaxKeccakHashes = 2145
MaxPoseidonHashes = 252357
MaxPoseidonPaddings = 135191
MaxMemAligns = 236585
MaxArithmetics = 236585
MaxBinaries = 473170
MaxSteps = 7570538
[Batch.ResourceWeights]
WeightBatchBytesSize = 1
WeightCumulativeGasUsed = 1
WeightKeccakHashes = 1
WeightPoseidonHashes = 1
WeightPoseidonPaddings = 1
WeightMemAligns = 1
WeightArithmetics = 1
WeightBinaries = 1
WeightSteps = 1
MaxConns = 200
2 changes: 1 addition & 1 deletion sequencer/efficiencylist.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func (e *efficiencyList) addSort(tx *TxTracker) {
e.sorted = append(e.sorted, nil)
copy(e.sorted[i+1:], e.sorted[i:])
e.sorted[i] = tx
//log.Infof("Added tx(%s) to efficiencyList. With efficiency(%f) at index(%d) from total(%d)", tx.HashStr, tx.Efficiency, i, len(e.sorted))
log.Infof("Added tx(%s) to efficiencyList. With efficiency(%f) at index(%d) from total(%d)", tx.HashStr, tx.Efficiency, i, len(e.sorted))
}

// isGreaterThan returns true if the tx1 has best efficiency than tx2
Expand Down
25 changes: 1 addition & 24 deletions test/config/debug.node.config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -139,27 +139,4 @@ ProfilingEnabled = false
Host = "localhost"
Port = "5435"
EnableLog = false
MaxConns = 200

[Batch]
[Batch.Constraints]
MaxTxsPerBatch = 300
MaxBatchBytesSize = 120000
MaxCumulativeGasUsed = 30000000
MaxKeccakHashes = 2145
MaxPoseidonHashes = 252357
MaxPoseidonPaddings = 135191
MaxMemAligns = 236585
MaxArithmetics = 236585
MaxBinaries = 473170
MaxSteps = 7570538
[Batch.ResourceWeights]
WeightBatchBytesSize = 1
WeightCumulativeGasUsed = 1
WeightKeccakHashes = 1
WeightPoseidonHashes = 1
WeightPoseidonPaddings = 1
WeightMemAligns = 1
WeightArithmetics = 1
WeightBinaries = 1
WeightSteps = 1
MaxConns = 200
23 changes: 0 additions & 23 deletions test/config/test.node.config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -152,26 +152,3 @@ Host = "zkevm-state-db"
Port = "5432"
EnableLog = false
MaxConns = 200

[Batch]
[Batch.Constraints]
MaxTxsPerBatch = 300
MaxBatchBytesSize = 120000
MaxCumulativeGasUsed = 30000000
MaxKeccakHashes = 2145
MaxPoseidonHashes = 252357
MaxPoseidonPaddings = 135191
MaxMemAligns = 236585
MaxArithmetics = 236585
MaxBinaries = 473170
MaxSteps = 7570538
[Batch.ResourceWeights]
WeightBatchBytesSize = 1
WeightCumulativeGasUsed = 1
WeightKeccakHashes = 1
WeightPoseidonHashes = 1
WeightPoseidonPaddings = 1
WeightMemAligns = 1
WeightArithmetics = 1
WeightBinaries = 1
WeightSteps = 1