Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add gp adjust #17

Merged
merged 9 commits into from
Oct 12, 2023
Merged

add gp adjust #17

merged 9 commits into from
Oct 12, 2023

Conversation

lyh169
Copy link

@lyh169 lyh169 commented Oct 8, 2023

Closes #.

What does this PR do?

Reviewers

Main reviewers:

Codeowner reviewers:

  • @-Alice
  • @-Bob

@lyh169 lyh169 changed the title Lyh/add gp adjust u add gp adjust Oct 8, 2023
gasprice/kafka_proc.go Show resolved Hide resolved
gasprice/config.go Outdated Show resolved Hide resolved
gasprice/config.go Show resolved Hide resolved
gasprice/fixed_test.go Show resolved Hide resolved
@lyh169 lyh169 changed the base branch from release/v0.3.0 to release/v0.1.0 October 11, 2023 11:24
)

// aliyun root ca
var rootCA = `-----BEGIN CERTIFICATE-----
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this open source?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed it from file

@KamiD KamiD merged commit c9c53c6 into release/v0.1.0 Oct 12, 2023
0 of 14 checks passed
scf0220 pushed a commit that referenced this pull request Nov 26, 2023
* add the fixed type for gp adjust

* add ut and adjust the code about kafka

* add fixed config to the local.node.config.toml

* fix lint error

* fix lint error

* read rootca from path

* fix conflict

* fix kafka lint
scf0220 added a commit that referenced this pull request Dec 15, 2023
* fix null effective_percentage

* fix forkID calculation

* fix script

* generate json-schema + docs for node config file and network_custom

* fix unittest

* Hotfixv0.1.4 to v0.2.0 (0xPolygonHermez#2255)

* Hotfix v0.1.4 to main (0xPolygonHermez#2250)

* fix concurrent web socket writes

* fix eth_syncing

* fix custom trace internal tx call error handling and update prover

* add test to custom tracer depth issue; fix internal call error and gas used

* fix custom tracer for internal tx with error and no more steps after it

* remove debug code

* Make max grpc message size configurable  (0xPolygonHermez#2179)

* make max grpc message size configurable

* fix state tests

* fix tests

* fix tests

* get SequencerNodeURI from SC if empty and not IsTrustedSequencer

* Optimize trace (0xPolygonHermez#2183)

* optimize trace

* fix memory reading

* update docker image

* update prover image

* fix converter

* fix memory

* fix step memory

* fix structlogs

* fix structlogs

* fix structlogs

* fix structlogs

* fix structlogs

* fix structlogs

* fix structlogs

* fix structlogs

* update prover image

* fix struclogs

* fix memory size

* fix memory size

* fix memory size

* refactor memory resize

* refactor memory resize

* move log for the best fitting tx (0xPolygonHermez#2192)

* fix load zkCounters from pool

* remove unnecessary log.info

* add custom tracer support to CREATES opcode without depth increase (0xPolygonHermez#2213)

* logs

* fix getting stateroot from previous batch (GetWIPBatch)

* logs

* Fix GetWipBatch when previous last batch is a forced batch

* fix forcedBatch trusted state

* Revert "fix getting stateroot from previous batch (GetWIPBatch)"

This reverts commit 860f0e7.

* force GHA

* add pool limits (0xPolygonHermez#2189)

* Hotfix/batch l2 data (0xPolygonHermez#2223)

* Fix BatchL2Data

* Force GHA

* remove failed txs from the pool limit check (0xPolygonHermez#2233)

* debug trace by batch number via external rpc requests (0xPolygonHermez#2235)

* fix trace batch remote requests in parallel limitation (0xPolygonHermez#2244)

* Added RPC.TraceBatchUseHTTPS config parameter

* fix executor version

---------

Co-authored-by: tclemos <[email protected]>
Co-authored-by: tclemos <[email protected]>
Co-authored-by: Toni Ramírez <[email protected]>
Co-authored-by: agnusmor <[email protected]>
Co-authored-by: agnusmor <[email protected]>
Co-authored-by: Thiago Coimbra Lemos <[email protected]>

* fix test

* fix test

---------

Co-authored-by: tclemos <[email protected]>
Co-authored-by: tclemos <[email protected]>
Co-authored-by: Toni Ramírez <[email protected]>
Co-authored-by: agnusmor <[email protected]>
Co-authored-by: agnusmor <[email protected]>
Co-authored-by: Thiago Coimbra Lemos <[email protected]>

* Effective GasPrice refactor+fixes (0xPolygonHermez#2247)

* effective GasPrice refactor

* bugs fixes and finalizer tests fixes

* fix typo

* fix calculate effective gasprice percentage

* fix test gas price

* Fix/0xPolygonHermez#2257 effective gas price receipt (0xPolygonHermez#2258)

* effective gas price returned by the rpc in the receipt

* linter

* bugfix: fixing l2blocks timestamp for the fist batch (0xPolygonHermez#2260)

* bugfix: fixing l2blocks timestamp for the fist batch

Signed-off-by: Nikolay Nedkov <[email protected]>

* fix finalizer unit test

---------

Signed-off-by: Nikolay Nedkov <[email protected]>

* add more comments, and removed fields PrivateKeyPath and PrivateKeyPassword from etherman.Config that are not in use

* add info to git action

* add info to git action

* fix github action

* updated comments

* updated comments

* Fix/0xPolygonHermez#2263 gas used (0xPolygonHermez#2264)

* fix fea2scalar and gas used

* suggestion

* fix fea2scalar

* suggestion

* Fix pending tx when duplicate nonce (0xPolygonHermez#2270)

* fix pending tx when duplicate nonce

* set pool.transaction.failed_reason to NULL when updating an existing tx

* add more log details when adding tx to AddrQueue

* fix query to add tx to the pool. Fix lint errors

* change failed_reason for tx discarded due duplicate nonce

* Only return a tx from the pool if tx is in pending status (0xPolygonHermez#2273)

* Return a tx from the pool only if it is

* fix TestGetTransactionByHash

---------

Co-authored-by: agnusmor <[email protected]>

* fix documentation with  config file

* improve: adding check to skip appending effectivePercentage if current forkId is under 5.

Signed-off-by: Nikolay Nedkov <[email protected]>

* Fiex effectiveGasprice unsigned txs with forkId lower than 5 (0xPolygonHermez#2278)

* feat: adding functionality to stop sequencer on specific batch num from config param.

Signed-off-by: Nikolay Nedkov <[email protected]>

* patch: adding print for X-Real-IP in JSON-RPC

Signed-off-by: Nikolay Nedkov <[email protected]>

* Fix checkIfSynced (0xPolygonHermez#2289)

* [Rehashing] Check logs order and fix blockhash and blockNumber in the log conversion (0xPolygonHermez#2280)

* fix and check order

* linter

* flushID synchronizer (0xPolygonHermez#2287)

* FlushID in synchronizer

* linter

* fix logs

* commnets

* executor error refactor (0xPolygonHermez#2299)

* handle invalid rlp ROM error (0xPolygonHermez#2297)

* add maxL2GasPrice (0xPolygonHermez#2294)

* add maxL2GasPrice

* fix

* fix

* add test

* document parameter

* update description

* Error refactor (0xPolygonHermez#2302)

* error refactor

* refactor

* Fix replaced tx as failed when duplicated nonce (0xPolygonHermez#2308)

* Fix UpdateTxStatus for replacedTx

* Fix adding tx with same nonce on AddrQueue

* log reprocess need (0xPolygonHermez#2309)

* log reprocess need

* Update finalizer.go

* Feature/2300 synchronizer detect if executor restart (0xPolygonHermez#2306)

* detect if executor restarts and stop synchonizer

* Update prover images (0xPolygonHermez#2311)

* update prover image

* update prover images

* change executor param

* Update testnet.prover.config.json

* Update test.permissionless.prover.config.json

* Update test.prover.config.json

* Update public.prover.config.json

* prover params

* prover params

* prover params

* update prover images

* add doc, and fix dockers to be able to use snap/restore feature (0xPolygonHermez#2315)

* add doc, and fix dockers to be able to use snap/restore feature

* add doc for snap/restore feature

---------

Co-authored-by: Toni Ramírez <[email protected]>

* Update docker-compose.yml

* Update docker-compose.yml

* do not add tx to the pool in case err != nil

* do not add tx into the pool if a fatal error in the executor happens during pre execution

* fix dbMultiWriteSinglePosition config value

* workarround for the error error closing batch

* workarround for the error error closing batch

* workarround for the error error closing batch

* workaround for the error of closing batch, another case

* `Worker`'s `AddTxTracker` Bug Fix (0xPolygonHermez#2343)

* bugfix: Resolve  Function Bug in Worker Module

Signed-off-by: Nikolay Nedkov <[email protected]>

* improve: improving the wait for pending txs to be for only the txs for the current address.

Signed-off-by: Nikolay Nedkov <[email protected]>

---------

Signed-off-by: Nikolay Nedkov <[email protected]>

* rename config files (0xPolygonHermez#2349)

* fix closing batch + logs (0xPolygonHermez#2348)

* fix closing batch + logs

* fix

* log description

* typo errors

* fix error: failed to store transactions for batch due to duplicate key

* test

* typo

* Update README.md

* Update release.yml

* bugfix: fixing place where we need to increment the wg per address for pending txs

Signed-off-by: Nikolay Nedkov <[email protected]>

* Store batchL2Data when the batch is opened (0xPolygonHermez#2358)

* add GasPriceMarginFactor and MaxGasPrice to eth-tx-manager (0xPolygonHermez#2360)

* add GasPriceMarginFactor and MaxGasPrice to eth-tx-manager

* add logs, fix config

* update config file documentation

---------

Co-authored-by: joanestebanr <[email protected]>

* bugfix: attaching missing TxTracker.From to pending txs to store for forced batches. (0xPolygonHermez#2365)

Signed-off-by: Nikolay Nedkov <[email protected]>

* Update README.md

* improve: adding logs (0xPolygonHermez#2373)

* improve: adding logs

Signed-off-by: Nikolay Nedkov <[email protected]>

* adding more logs

Signed-off-by: Nikolay Nedkov <[email protected]>

* adding more logs #2

Signed-off-by: Nikolay Nedkov <[email protected]>

---------

Signed-off-by: Nikolay Nedkov <[email protected]>

* bugfix: fixing finalizer's  handling. (0xPolygonHermez#2375)

Signed-off-by: Nikolay Nedkov <[email protected]>

* Update README.md

* change hashdb go package

* new hashdb interface

* aggregator pb refactor

* new prover image

* change prover config

* update prover image

* update to latest proto and prover image

* Refactor nonce calculation for addQueue (0xPolygonHermez#2382)

* refactor nonce

* fix

* fix

* fix script

* check to avoid data inconsistencies (0xPolygonHermez#2387)

* check to avoid data inconsistencies

* check batchL2Data

* names in the logs

* Refactor: avoid delete addrQueue if it has pending txs to store (0xPolygonHermez#2391)

* refactor delete addrQueue only if not pending txs to store

* fix finalizer test

* fix olsStateRoot in handleForcedTxsProcessResp

* Update sequencer/addrqueue.go

Co-authored-by: Alonso Rodriguez <[email protected]>

---------

Co-authored-by: Toni Ramírez <[email protected]>
Co-authored-by: Alonso Rodriguez <[email protected]>

* Sort txs in worker by gasPrice (remove efficiency sort) (0xPolygonHermez#2392)

* Sort txs in worker by GasPrice (remove efficiency sort)

* update config docs

---------

Co-authored-by: Toni Ramírez <[email protected]>

* use useMainExecGenerated (0xPolygonHermez#2393)

* Fix store forced batch tx (0xPolygonHermez#2394)

* l2coinbase (0xPolygonHermez#2400)

* l2coinbase

* add default config

* add support  config fields that are common.Address

* docs

* prover image

---------

Co-authored-by: joanestebanr <[email protected]>

* Check flushID != 0 (0xPolygonHermez#2406)

* Show tx.GasPrice in the worker logs (instead of tx.Cost) (0xPolygonHermez#2416)

* Check flushID != 0 in Sequencer (0xPolygonHermez#2415)

* check flushid != 0 in sequencer

* Use f.halt instead of log.Fatal to report that flushid is 0

Co-authored-by: Toni Ramírez <[email protected]>

* fix lint

---------

Co-authored-by: Toni Ramírez <[email protected]>

* update config params for Prover v2.1.0 (0xPolygonHermez#2418)

* cherry-pick 0xPolygonHermez#2385 and 0xPolygonHermez#2396 from develop into v0.2.6 (0xPolygonHermez#2412)

* fix http request instance null for websocket requests (0xPolygonHermez#2385)

* fix ws subscribe to get filtered log notifications (0xPolygonHermez#2396)

* new block endpoints and improvements to batch endpoint (0xPolygonHermez#2411)

* Add forced batches tx to addrQueue (0xPolygonHermez#2398)

* add forced batches tx to addrQueue

* fix test

* fix test

* fix test

* fix test

* fix test

* fix test

* fix test

* fix test

* fix test

* refactor

* fix test

* fix test

* fix test

* fix test

* fix test

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* fixes

* fixe hash and from

* fixe hash and from

* fixe hash and from

* fixe hash and from

* fix test

* fix test

* fix test

* fix test

* fix test

* fix test

* fix test

* improve tests

* improve tests

* improve tests

* improve tests

* improve tests

* refactor

* refactor

* improve logs

* bugifx: adding missing tx.BreakEvenGasPrice nil check

Signed-off-by: Nikolay Nedkov <[email protected]>

* Sync halt (0xPolygonHermez#2428)

* cherry-pick 0xPolygonHermez#2245 and 0xPolygonHermez#2424 from develop into v0.2.6 (0xPolygonHermez#2447)

* fix safe and finalized l2 block to consider l1 safe and finalized blocks respectively (0xPolygonHermez#2245)

* fix and add tests for safe and finalized l2 blocks (0xPolygonHermez#2424)

* New executor errors refactor (0xPolygonHermez#2438)

* wip

* new errors

* retry on executor db error

* new prover images

* fix comment

* update hasdh proto and prover images

* handle excutor db error

* update test

* update test

* update test

* update test

* refactor error check in unsigned tx

* Reprocess full batch in parallel (sanity check) (0xPolygonHermez#2425)

* reprocess full batch in parallel (sanity check)

* update doc

* update reprocessFullBatch logs

* Speed up deleting batches from stateDB creating an index for state.receipt.block_num (0xPolygonHermez#2457)

* receipt deletion index

* receipt deletion index

* Feature/0xPolygonHermez#2429 fork id improvement (0xPolygonHermez#2450)

* db table + tests

* GetForks func modified to get them by range

* Sync forkID

* forkIDIntervals and forkID genesis

* linter

* docs

* Avoid resetForkID in trustedNode

* fix test group 9

* suggestions

* doc and mocks

* fix check storedFlushID (0xPolygonHermez#2458)

* remove stored flush id 0 (0xPolygonHermez#2459)

* Feature/0xPolygonHermez#2403 snap (0xPolygonHermez#2404)

* Path snapshot command

* restore

* readme

* options used by dbeaver

* #2429_forkID_improvement: #2429_forkID_improvement:

* fix

* fix postgres version to v15

* fix permissionless init script

* bugfix: removing measuring of metrics from async batch reprocessing f… (0xPolygonHermez#2461)

* bugfix: removing measuring of metrics from async batch reprocessing for executor.

Signed-off-by: Nikolay Nedkov <[email protected]>

* fixing unit tests

Signed-off-by: Nikolay Nedkov <[email protected]>

---------

Signed-off-by: Nikolay Nedkov <[email protected]>

* update prover images (0xPolygonHermez#2473)

* Update production-setup.md

* init

* update

* update

* update

* update

* update

* Add logs for sequencer (#14)

* add log statistics

* add reset and batch number

* total duration with milliseconds

* add batch gas used statistics

* support innertx (#16)

* add switch for pending transaction filter (#18)

* suport free gas to claim asset (#22)

* add gp adjust (#17)

* add the fixed type for gp adjust

* add ut and adjust the code about kafka

* add fixed config to the local.node.config.toml

* fix lint error

* fix lint error

* read rootca from path

* fix conflict

* fix kafka lint

* rebranding (#23)

* rebrand

* update

* fix license

* fix build docker

* rename to xgon (#24)

* validium/rollup switch (#26)

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update abi

* update go mod file

* add wait tick

* fix config name

* fix logs

* modify is zero byte array function

* support nacos (#27)

* support nacos

* reorgnize nacos configuration

* modify the nacos configure name

* add example configure file

* sync fix ws debug (#28)

* sync the code and fix the ws bug for the rpc method

* adaptive the err judge

* fix ut and e2e test  (#29)

* fix ut

* update image

* bridgel2

* update doc

* Support websocket to register nacos (#33)

* add nacos support for websocket

* lint code

* support flatCallTracer  and result limit for trace transaction (#40)

* support flatCallTracer

* trace result limit

* rebranding to X1 (#36)

* update name

* rename

* renmae

* fix e2e

* fix e2e

* fix e2e

* fix e2e

* fix e2e

* fix e2e

* fix e2e

* fix e2e

* update e2e image

* update mod file

* update e2e image

* fix make deploy-sc error (#38)

* update

* update

* update

* add gas price dynamic adjust in follower mode (#34)

* add dynamic adjust for follower

* modify the config

* fix lint and schema

* modify the comment

* modify the comment

* make doc

* first commit

* Update db.go

* Update datacommittee_test.go

* format

* fmt

* goimport

* 1

* 1

* fix

* Update start.go

* 1

* a

* 1

* a

* Update Makefile

* fix test

* Update setup.go

* a

* update makefile

* update makefile

* fix ut

* update

* update

* update

* disabel

* udpate

* update

* update

* fix e2e

* update permissionless-node

---------

Signed-off-by: Nikolay Nedkov <[email protected]>
Co-authored-by: Toni Ramírez <[email protected]>
Co-authored-by: joanestebanr <[email protected]>
Co-authored-by: Alonso Rodriguez <[email protected]>
Co-authored-by: tclemos <[email protected]>
Co-authored-by: tclemos <[email protected]>
Co-authored-by: Toni Ramírez <[email protected]>
Co-authored-by: agnusmor <[email protected]>
Co-authored-by: agnusmor <[email protected]>
Co-authored-by: Thiago Coimbra Lemos <[email protected]>
Co-authored-by: joanestebanr <[email protected]>
Co-authored-by: Nikolay Nedkov <[email protected]>
Co-authored-by: jianguo <[email protected]>
Co-authored-by: KamiD <[email protected]>
Co-authored-by: zhangkai <[email protected]>
Co-authored-by: lyh169 <[email protected]>
Co-authored-by: chengzhinei <[email protected]>
Co-authored-by: ylsGit <[email protected]>
Co-authored-by: root <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants