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

fix (libzkp): check tx num when CCC ErrUnknown error occurred #505

Merged
merged 14 commits into from
Sep 8, 2023

Conversation

silathdiir
Copy link

@silathdiir silathdiir commented Sep 7, 2023

1. Purpose or design rationale of this PR

Use CCC function get_tx_num to check tx count when CCC ErrUnknown error occurred.

2. PR title

Your PR title must follow conventional commits (as we are doing squash merge for each PR), so it must start with one of the following types:

  • build: Changes that affect the build system or external dependencies (example scopes: yarn, eslint, typescript)
  • ci: Changes to our CI configuration files and scripts (example scopes: vercel, github, cypress)
  • docs: Documentation-only changes
  • feat: A new feature
  • fix: A bug fix
  • perf: A code change that improves performance
  • refactor: A code change that doesn't fix a bug, or add a feature, or improves performance
  • style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)
  • test: Adding missing tests or correcting existing tests

3. Deployment tag versioning

Has the version in params/version.go been updated?

  • This PR doesn't involve a new deployment, git tag, docker image tag, and it doesn't affect traces
  • Yes

4. Breaking change label

Does this PR have the breaking-change label?

  • This PR is not a breaking change
  • Yes

@silathdiir silathdiir marked this pull request as draft September 7, 2023 07:36
@silathdiir silathdiir changed the title feat (libzkp): check tx num for CCC ErrUnknown error [WIP] feat (libzkp): check tx num for CCC ErrUnknown error Sep 7, 2023
@silathdiir silathdiir marked this pull request as ready for review September 7, 2023 10:13
@silathdiir silathdiir changed the title [WIP] feat (libzkp): check tx num for CCC ErrUnknown error feat (libzkp): check tx num for CCC ErrUnknown error Sep 7, 2023
@silathdiir silathdiir changed the title feat (libzkp): check tx num for CCC ErrUnknown error feat (libzkp): check tx num when CCC ErrUnknown error occurred Sep 7, 2023
@silathdiir silathdiir changed the title feat (libzkp): check tx num when CCC ErrUnknown error occurred fix (libzkp): check tx num when CCC ErrUnknown error occurred Sep 7, 2023
miner/worker.go Outdated Show resolved Hide resolved
miner/worker.go Outdated Show resolved Hide resolved
miner/worker.go Outdated Show resolved Hide resolved
rollup/circuitcapacitychecker/mock.go Outdated Show resolved Hide resolved
rollup/circuitcapacitychecker/impl.go Outdated Show resolved Hide resolved
miner/worker.go Outdated Show resolved Hide resolved
miner/worker.go Outdated Show resolved Hide resolved
@HAOYUatHZ
Copy link
Member

HAOYUatHZ commented Sep 8, 2023

I’ve refactored this PR @georgehao @silathdiir

  1. so that we don’t need to worry about whether checkCurrentTxNumWithCCC will be correct in mock_ccc
  2. I use
func (w *worker) checkCurrentTxNumWithCCC(expected int) {
	match, got, err := w.circuitCapacityChecker.CheckTxNum(expected) 

instead of

func (w *worker) checkCurrentTxNumWithCCC() {
	match, got, err := w.circuitCapacityChecker.CheckTxNum(w.current.tcount)

because not sure in the future whether we will need to check (ccc_tx == (w.current.tcount+1)), for example, in ccc successful cases.

@Thegaram Thegaram merged commit 7d79f27 into develop Sep 8, 2023
5 checks passed
@Thegaram Thegaram deleted the libzkp/get-tx-num branch September 8, 2023 11:17
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.

5 participants