feat: Example card game by sirasistant · Pull Request #2135 · AztecProtocol/aztec-packages

sirasistant · 2023-09-08T13:28:00Z

Resolves #1463

Checklist:

Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge.

If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag.
I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code.
Every change is related to the PR description.
I have linked this pull request to relevant issues (if any exist).

…es into arv/card_game

ludamad · 2023-09-08T14:45:25Z

yarn-project/noir-contracts/src/contracts/card_game_contract/src/main.nr

+    }
+
+    #[aztec(private)]
+    fn joinGame(


We should avoid camelCase

…es into arv/card_game

ludamad · 2023-09-08T15:03:03Z

It's a 7 minute test - probably OK for now, but at some point we might want to figure out how if we can get this down / what we keep long term
it'd be good to have a negative test for people using cards they dont own

ludamad · 2023-09-08T14:55:57Z

yarn-project/end-to-end/src/e2e_card_game.test.ts

+      ]);
+
+      expect((await contract.methods.view_game(GAME_ID).view({ from: firstPlayer })) as Game).toMatchObject({
+        players: [


:D nice technique

ludamad · 2023-09-08T15:04:19Z

Honourary CGAM member

yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml

ludamad · 2023-09-08T15:55:42Z

yarn-project/noir-contracts/src/contracts/card_game_contract/src/cards.nr

+}
+
+fn compute_deck_strength<N>(cards: [Card; N]) -> Field {
+    cards.fold(0, |acc, card: Card| {


"Come to noir we have for loops"
we write this

dan-aztec · 2023-09-08T16:01:07Z

yarn-project/end-to-end/src/e2e_card_game.test.ts

+}
+
+const cardToField = (card: Card): bigint => {
+  return card.strength + card.points * 65536n;


side q:
longer term, is this something that should be handled by a generated typescript class?

also i think there is prover system abstraction leaking through (modulus/overflow is proving system dependent?)

Nah this is only because our macros dont' support arrays of structs yet as arguments to contract functions, when that's updated we don't need to pack the card into a field, we can just pass a card struct

What do you mean about the modulus/overflow? the fact that we can pack the card (32 bits) into a single field? For aztec we can safely assume that we'll always have bn254 I think 🤔

ahh OK got it!

ohh right for modulus I forgot aztec has the pinned backend vs "regular" noir. i was thinking if points got really big we could maybe have overflow (in some setting besides the test)

dan-aztec

wow a lot more complex than the private token contract!

🤖 I have created a release *beep* *boop* --- <details><summary>aztec-packages: 0.5.2</summary> ## [0.5.2](aztec-packages-v0.5.2...aztec-packages-v0.5.2) (2023-09-08) ### Features * Example card game ([#2135](#2135)) ([9084b89](9084b89)) ### Bug Fixes * **tests:** Increase test timeout ([#2144](#2144)) ([7da9615](7da9615)) ### Miscellaneous * **build:** Updated release please config ([#2142](#2142)) ([e119c4f](e119c4f)) * Release 0.5.2 ([f76b53c](f76b53c)) </details> <details><summary>barretenberg.js: 0.5.2</summary> ## [0.5.2](barretenberg.js-v0.5.2...barretenberg.js-v0.5.2) (2023-09-08) ### Miscellaneous * Release 0.5.2 ([f76b53c](f76b53c)) </details> <details><summary>barretenberg: 0.5.2</summary> ## [0.5.2](barretenberg-v0.5.2...barretenberg-v0.5.2) (2023-09-08) ### Miscellaneous * Release 0.5.2 ([f76b53c](f76b53c)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

🤖 I have created a release *beep* *boop* --- <details><summary>aztec-packages: 0.5.2</summary> ## [0.5.2](AztecProtocol/aztec-packages@aztec-packages-v0.5.2...aztec-packages-v0.5.2) (2023-09-08) ### Features * Example card game ([#2135](AztecProtocol/aztec-packages#2135)) ([9084b89](AztecProtocol/aztec-packages@9084b89)) ### Bug Fixes * **tests:** Increase test timeout ([#2144](AztecProtocol/aztec-packages#2144)) ([7da9615](AztecProtocol/aztec-packages@7da9615)) ### Miscellaneous * **build:** Updated release please config ([#2142](AztecProtocol/aztec-packages#2142)) ([e119c4f](AztecProtocol/aztec-packages@e119c4f)) * Release 0.5.2 ([f76b53c](AztecProtocol/aztec-packages@f76b53c)) </details> <details><summary>barretenberg.js: 0.5.2</summary> ## [0.5.2](AztecProtocol/aztec-packages@barretenberg.js-v0.5.2...barretenberg.js-v0.5.2) (2023-09-08) ### Miscellaneous * Release 0.5.2 ([f76b53c](AztecProtocol/aztec-packages@f76b53c)) </details> <details><summary>barretenberg: 0.5.2</summary> ## [0.5.2](AztecProtocol/aztec-packages@barretenberg-v0.5.2...barretenberg-v0.5.2) (2023-09-08) ### Miscellaneous * Release 0.5.2 ([f76b53c](AztecProtocol/aztec-packages@f76b53c)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

🤖 I have created a release *beep* *boop* --- <details><summary>aztec-packages: 0.6.1</summary> ## [0.6.1](aztec-packages-v0.5.2...aztec-packages-v0.6.1) (2023-09-08) ### Features * Example card game ([#2135](#2135)) ([9084b89](9084b89)) ### Bug Fixes * **tests:** Increase test timeout ([#2144](#2144)) ([7da9615](7da9615)) * Work around intermittent wasm webkit issue ([#2140](#2140)) ([a9b0934](a9b0934)) ### Miscellaneous * **build:** Updated release please config ([#2142](#2142)) ([e119c4f](e119c4f)) * **build:** Updated version check ([#2145](#2145)) ([4ed5f05](4ed5f05)) * **master:** Release 0.5.2 ([#2141](#2141)) ([451aad6](451aad6)) * Release 0.5.2 ([f76b53c](f76b53c)) * Release 0.6.1 ([1bd1a79](1bd1a79)) </details> <details><summary>barretenberg.js: 0.6.1</summary> ## [0.6.1](barretenberg.js-v0.5.2...barretenberg.js-v0.6.1) (2023-09-08) ### Miscellaneous * **master:** Release 0.5.2 ([#2141](#2141)) ([451aad6](451aad6)) * Release 0.5.2 ([f76b53c](f76b53c)) * Release 0.6.1 ([1bd1a79](1bd1a79)) </details> <details><summary>barretenberg: 0.6.1</summary> ## [0.6.1](barretenberg-v0.5.2...barretenberg-v0.6.1) (2023-09-08) ### Bug Fixes * Work around intermittent wasm webkit issue ([#2140](#2140)) ([a9b0934](a9b0934)) ### Miscellaneous * **master:** Release 0.5.2 ([#2141](#2141)) ([451aad6](451aad6)) * Release 0.5.2 ([f76b53c](f76b53c)) * Release 0.6.1 ([1bd1a79](1bd1a79)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

🤖 I have created a release *beep* *boop* --- <details><summary>aztec-packages: 0.6.1</summary> ## [0.6.1](AztecProtocol/aztec-packages@aztec-packages-v0.5.2...aztec-packages-v0.6.1) (2023-09-08) ### Features * Example card game ([#2135](AztecProtocol/aztec-packages#2135)) ([9084b89](AztecProtocol/aztec-packages@9084b89)) ### Bug Fixes * **tests:** Increase test timeout ([#2144](AztecProtocol/aztec-packages#2144)) ([7da9615](AztecProtocol/aztec-packages@7da9615)) * Work around intermittent wasm webkit issue ([#2140](AztecProtocol/aztec-packages#2140)) ([a9b0934](AztecProtocol/aztec-packages@a9b0934)) ### Miscellaneous * **build:** Updated release please config ([#2142](AztecProtocol/aztec-packages#2142)) ([e119c4f](AztecProtocol/aztec-packages@e119c4f)) * **build:** Updated version check ([#2145](AztecProtocol/aztec-packages#2145)) ([4ed5f05](AztecProtocol/aztec-packages@4ed5f05)) * **master:** Release 0.5.2 ([#2141](AztecProtocol/aztec-packages#2141)) ([451aad6](AztecProtocol/aztec-packages@451aad6)) * Release 0.5.2 ([f76b53c](AztecProtocol/aztec-packages@f76b53c)) * Release 0.6.1 ([1bd1a79](AztecProtocol/aztec-packages@1bd1a79)) </details> <details><summary>barretenberg.js: 0.6.1</summary> ## [0.6.1](AztecProtocol/aztec-packages@barretenberg.js-v0.5.2...barretenberg.js-v0.6.1) (2023-09-08) ### Miscellaneous * **master:** Release 0.5.2 ([#2141](AztecProtocol/aztec-packages#2141)) ([451aad6](AztecProtocol/aztec-packages@451aad6)) * Release 0.5.2 ([f76b53c](AztecProtocol/aztec-packages@f76b53c)) * Release 0.6.1 ([1bd1a79](AztecProtocol/aztec-packages@1bd1a79)) </details> <details><summary>barretenberg: 0.6.1</summary> ## [0.6.1](AztecProtocol/aztec-packages@barretenberg-v0.5.2...barretenberg-v0.6.1) (2023-09-08) ### Bug Fixes * Work around intermittent wasm webkit issue ([#2140](AztecProtocol/aztec-packages#2140)) ([a9b0934](AztecProtocol/aztec-packages@a9b0934)) ### Miscellaneous * **master:** Release 0.5.2 ([#2141](AztecProtocol/aztec-packages#2141)) ([451aad6](AztecProtocol/aztec-packages@451aad6)) * Release 0.5.2 ([f76b53c](AztecProtocol/aztec-packages@f76b53c)) * Release 0.6.1 ([1bd1a79](AztecProtocol/aztec-packages@1bd1a79)) </details> --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

sirasistant added 4 commits September 7, 2023 15:28

feat: buy packs

2336fb1

feat: first e2e version of card game

2995f9e

refactor: pass hash of cards

e5daa40

Merge branch 'master' into arv/card_game

ec709d9

sirasistant changed the title ~~Arv/card game~~ feat: Example card game Sep 8, 2023

sirasistant added 5 commits September 8, 2023 13:39

test: improve e2e test

8c751c9

Merge branch 'arv/card_game' of github.com:AztecProtocol/aztec-packag…

402e5c7

…es into arv/card_game

test: remove only

6a9c6d7

chore: add test

e897416

refactor: don't use zeroed

d3a58fc

sirasistant requested review from LeilaWang, dan-aztec and ludamad September 8, 2023 14:00

sirasistant marked this pull request as ready for review September 8, 2023 14:00

sirasistant added 3 commits September 8, 2023 14:26

refactor: hide card note to the game

04f7a0f

refactor: separate get from remove in deck

782c070

fix: missing flag

9e75638

ludamad reviewed Sep 8, 2023

View reviewed changes

sirasistant added 3 commits September 8, 2023 16:47

Merge branch 'master' into arv/card_game

f068f96

refactor: methods to snake_case

c6b749f

Merge branch 'arv/card_game' of github.com:AztecProtocol/aztec-packag…

1c91789

…es into arv/card_game

ludamad approved these changes Sep 8, 2023

View reviewed changes

dan-aztec reviewed Sep 8, 2023

View reviewed changes

yarn-project/noir-contracts/src/contracts/card_game_contract/Nargo.toml Outdated Show resolved Hide resolved

sirasistant added 3 commits September 8, 2023 15:40

test: improve e2e card game test

8c72869

chore: remove unnecessary dep

5519740

test: add some parallel txs to speedup test

048cd5b

sirasistant enabled auto-merge (squash) September 8, 2023 15:55

ludamad reviewed Sep 8, 2023

View reviewed changes

dan-aztec reviewed Sep 8, 2023

View reviewed changes

dan-aztec approved these changes Sep 8, 2023

View reviewed changes

Merge branch 'master' into arv/card_game

e05c9d3

sirasistant merged commit 9084b89 into master Sep 8, 2023

sirasistant deleted the arv/card_game branch September 8, 2023 16:29

github-actions bot mentioned this pull request Sep 8, 2023

chore(master): Release 0.5.2 #2141

Merged

github-actions bot mentioned this pull request Sep 8, 2023

chore(master): Release 0.6.1 #2146

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Example card game#2135

feat: Example card game#2135
sirasistant merged 19 commits intomasterfrom
arv/card_game

sirasistant commented Sep 8, 2023

Uh oh!

ludamad Sep 8, 2023

Uh oh!

sirasistant Sep 8, 2023

Uh oh!

ludamad commented Sep 8, 2023

Uh oh!

ludamad Sep 8, 2023

Uh oh!

ludamad commented Sep 8, 2023

Uh oh!

Uh oh!

ludamad Sep 8, 2023

Uh oh!

dan-aztec Sep 8, 2023

Uh oh!

sirasistant Sep 8, 2023

Uh oh!

dan-aztec Sep 8, 2023

Uh oh!

dan-aztec left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

sirasistant commented Sep 8, 2023

Checklist:

Uh oh!

ludamad Sep 8, 2023

Choose a reason for hiding this comment

Uh oh!

sirasistant Sep 8, 2023

Choose a reason for hiding this comment

Uh oh!

ludamad commented Sep 8, 2023

Uh oh!

ludamad Sep 8, 2023

Choose a reason for hiding this comment

Uh oh!

ludamad commented Sep 8, 2023

Uh oh!

Uh oh!

ludamad Sep 8, 2023

Choose a reason for hiding this comment

Uh oh!

dan-aztec Sep 8, 2023

Choose a reason for hiding this comment

Uh oh!

sirasistant Sep 8, 2023

Choose a reason for hiding this comment

Uh oh!

dan-aztec Sep 8, 2023

Choose a reason for hiding this comment

Uh oh!

dan-aztec left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants