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 to develop #1455

Merged
merged 602 commits into from
Feb 21, 2024
Merged

Merge main to develop #1455

merged 602 commits into from
Feb 21, 2024

Conversation

mitschabaude
Copy link
Collaborator

@mitschabaude mitschabaude commented Feb 21, 2024 •
edited
Loading

bindings: o1-labs/o1js-bindings#249
checks out mina at latest develop

mitschabaude and others added 30 commits February 1, 2024 12:46
@mitschabaude
Merge pull request #1377 from o1-labs/feature/hashed-provable
d99fceb 
Hashed provable type
@mitschabaude
revert rename which became unnecessary
687891a
@mitschabaude
bindings
1a4bd8a
@mitschabaude
more renaming
cfc8172
@mitschabaude
add popIf and doccomments
d1f87be
@mitschabaude
improve clarity of forest iteration logic
c8d6bfc
@mitschabaude
Merge branch 'feature/call-forest-iterator' into tmp
a104c8e
@mitschabaude
update to new names, dump new vks
085f7ab
@mitschabaude
normalize comments
0f38354
@mitschabaude
remove unused code
1435bb5
@mitschabaude
remove deployZkapp
943d871
@mitschabaude
revisit erc20 example and tweak base token contract to be more simila…
25718e0 
…r to erc20
@mitschabaude
revert renaming towards erc20
c23b64a
@mitschabaude
minor
09960d1
@mitschabaude
remove debug stuff
1f46370
@mitschabaude
remove debug stuff
08f99b5
@mitschabaude
minor stuff
c171442
@mitschabaude
fix edge case in ecdsa unit test
97cdacf
@mitschabaude
restructure code to fix import cycles in account_update.ts
c5c4c35
@mitschabaude
merge fixups
9c74795
@mitschabaude
build fixup
b7c9fd9
@mitschabaude
fixup
83e0b96
@mitschabaude
fix import cycle mina.ts <-> zkapp.ts
b7188f4
@mitschabaude
normalize comment
bc68700
@mitschabaude
Merge pull request #1399 from o1-labs/fix/ecdsa-test
fea4239 
Fix edge case in ECDSA unit test
@Trivo25
Merge pull request #1397 from cristiantroy/main
4368e89 
Fix typos
@mitschabaude
use erc20 example for dex with actions
97709a6
@mitschabaude
allow skipping dummies
b593927
@mitschabaude
support skipping dummies
4a9c05c
@mitschabaude
improve name and clean up code
e6b2a4a
Trivo25 and others added 25 commits February 20, 2024 09:02
@Trivo25
revert sig type
cd43ef7
@Trivo25
revert sig type
1a60fd1
@Trivo25
fix build
3c799af
@Trivo25
add NetworkID.toString
d311e92
@Trivo25
simplify
1685902
@Trivo25
cleanup
ecf67e5
@Trivo25
fix tests
5840e76
@Trivo25
add check against different network hash
5b9bdcf
@mitschabaude
method to generate random keypair
be96191
@mitschabaude
fix token contract test
1b89d81
@mitschabaude
fix dex deploy scripts to respect isNew precondition
358aa27
@mitschabaude
changelog
8e9a616
@mitschabaude
dump vks
71087ac
@mitschabaude
remove obsolete example
a6a06e4
@mitschabaude
fixup upgradability test
40ebf95
@mitschabaude
another fix
6be807b
@Trivo25
Merge pull request #1444 from o1-labs/custom-network
b0fb1c8 
Enable custom network signing
@shimkiv
Export Mina-Signer types.
a5332b1
@mitschabaude
document token contract deploy
88d9a70
@mitschabaude
minor
d8079fd
@mitschabaude
link in comment
01614a5
@mitschabaude
Merge branch 'main' into feature/move-token-helpers
41ba6e4
@shimkiv
Merge pull request #1453 from o1-labs/signer-export-types
376fe57 
Export Mina-Signer types.
@mitschabaude
Merge pull request #1446 from o1-labs/feature/move-token-helpers
236b810 
Replace `this.token` with methods on `TokenContract`
@mitschabaude
Merge branch 'main' into merge/main-develop-feb-24
b8f3039
@mitschabaude mitschabaude requested a review from a team as a code owner February 21, 2024 11:37
@mitschabaude mitschabaude mentioned this pull request Feb 21, 2024
Merged
@mitschabaude mitschabaude merged commit 565260f into develop Feb 21, 2024
13 checks passed
@mitschabaude mitschabaude deleted the merge/main-develop-feb-24 branch February 21, 2024 12:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@volhovm volhovm volhovm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@mitschabaude @volhovm @Trivo25 @MartinMinkov @robrobbins @shimkiv