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

Update nock Anoma stdlib #3271

Merged
merged 4 commits into from
Jan 8, 2025
Merged

Update nock Anoma stdlib #3271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4603321
Update Anoma ref to latest integration branch
paulcadman Jan 8, 2025
de9fa53
Update instructions for obtaining the anoma lib
paulcadman Jan 8, 2025
d68d0f5
Update anomalib file to version from anoma 7fdd77377
paulcadman Jan 8, 2025
36d2762
Fix type of `data` field in RM test
paulcadman Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
RISC0_VM_VERSION: v1.0.1
# This is the top commit hash in the branch lukasz/juvix-integration-tracking
# of the anoma repository.
ANOMA_VERSION: 81601ab7ee8e7ceade7e7cb00bdcc5b65aef77c9
ANOMA_VERSION: 7fdd77377317ff0e29676a403b384cb1f2dc4729
JUST_ARGS: runtimeCcArg=$CC runtimeLibtoolArg=$LIBTOOL
STACK_BUILD_ARGS: --pedantic -j4 --ghc-options=-j

Expand Down
2 changes: 1 addition & 1 deletion runtime/nockma/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ shell in the root of the Anoma clone:

```sh
iex -S mix
iex(1)> File.write("./anomalib.nockma", Nock.rm_core |> Noun.Format.print)
iex(1)> File.write("./anomalib.nockma", Nock.Lib.rm_core |> Noun.Format.print)
```
2 changes: 1 addition & 1 deletion runtime/nockma/anomalib.nockma
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/Anoma/Compilation/positive/test085/client/ResourceMachine.juvix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module Resource;
logic : Resource-Logic;
ephemeral : Bool;
quantity : Nat;
data : Pair Nat Nat;
data : Nat;
--- 256 bits
nullifier-key : Nat;
--- nonce for commitments 256 bits
Expand Down
5 changes: 3 additions & 2 deletions tests/Anoma/Compilation/positive/test085/delta.juvix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ main : Delta :=
logic := \{_ _ := true};
ephemeral := true;
quantity := 55;
data := 0, 0;
data := 0;
nullifier-key := 0;
nonce := 0;
rseed := 0;
Expand All @@ -28,7 +28,8 @@ main : Delta :=
resNullifier : Nat := nullifier resource;
in -- Most of these call return large nouns that are not appropritate for testing.
-- This test checks that these functions do not crash.
kind resource
kind
resource
>-> addDelta (resource-delta resource) (resource-delta resource)
>-> addDelta (resource-delta resource) (resource-delta resource)
>-> proveDelta zeroDelta
Expand Down
Loading