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.

Sign up for GitHub

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

Jump to bottom

merge main updates not included in develop #48

Merged
merged 26 commits into from
Jan 23, 2023
Merged

merge main updates not included in develop #48

merged 26 commits into from
Jan 23, 2023
+61,220 −192

Conversation

zkronos73
Copy link
Contributor

No description provided.

zkronos73 and others added 26 commits December 1, 2022 11:40
@zkronos73
Merge pull request #38 from 0xPolygonHermez/develop

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
35bc0ae 
develop
@zkronos73
build zkasm
e638dea
@zkronos73
Merge pull request #39 from 0xPolygonHermez/build-zkasm
440fdcb 
build zkasm
@fractasy
Repeat instruction RCX
e75ac46
@fractasy
Merge remote-tracking branch 'origin/develop' into fractasy/merge_lat…
1ed1472 
…est_pil_changes
@fractasy
Merge remote-tracking branch 'origin/main' into fractasy/merge_latest…
0bdb90c 
…_pil_changes
@fractasy
Fix typpo
7690ab7
@fractasy
Move counters checks to the end of the loop
0f5fe04
@zkronos73
Merge pull request #41 from 0xPolygonHermez/fractasy/merge_latest_pil…
37323b4 
…_changes

Fractasy/merge latest pil changes
@fractasy
Complete binary SM 2x changes. Performance improvements
f733e32
@zkronos73
Merge pull request #42 from 0xPolygonHermez/fractasy/eval_command_imp…
7bea6ae 
…rovements

Complete binary SM 2x changes.  Performance improvements
@zkronos73
feature to generate cpp code from zkasm.json directly
2bb50f3
@zkronos73
update feature to generate cpp code from zkasm.json
4e556f7
@zkronos73
Merge pull request #43 from 0xPolygonHermez/json2c
05a02ef 
Json2c
@zkronos73
fix error on zkasm
99693f3
@zkronos73
Merge pull request #44 from 0xPolygonHermez/fix-json2c
bd2b8d7 
fix error on zkasm
@zkronos73
add JMPZ, JMPNZ, JMPNC, HASHP1, HASHK1 instructions
c469abe
@zkronos73
Merge pull request #45 from 0xPolygonHermez/jmp-static-addr
a624bd3 
add JMPZ, JMPNZ, JMPNC, HASHP1, HASHK1 instructions
@zkronos73
fix and update version
9898d7f
@zkronos73
add useElseAddr flag
1c00579
@zkronos73
update generate files
b0e3dca
@zkronos73
Merge pull request #46 from 0xPolygonHermez/fix-jmp-static
bf6ffed 
fix and update version
@zkronos73
fix bug on jmpnz and jmpnc
55448e1
@zkronos73
update build
30064b4
@zkronos73
Merge branch 'main' into fix-jmpnx
08b53a1
@zkronos73
Merge pull request #47 from 0xPolygonHermez/fix-jmpnx
59deb58 
fix bug on jmpnz and jmpnc
@cla-bot cla-bot bot added the cla-signed label Jan 23, 2023
@zkronos73 zkronos73 requested a review from fractasy January 23, 2023 08:27
krlosMata
krlosMata approved these changes Jan 23, 2023
View reviewed changes
Copy link
Contributor

@krlosMata krlosMata left a comment

Choose a reason for hiding this comment

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

😸

@zkronos73 zkronos73 merged commit 9f783f7 into develop Jan 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@krlosMata krlosMata

@fractasy fractasy

@jbaylina jbaylina

@eduadiez eduadiez

Assignees
No one assigned
Labels
cla-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@zkronos73 @krlosMata @fractasy