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

Ensure safe Uint64/32 instanciations, with new Unsafe.fromField() #1438

Merged
merged 13 commits into from
Mar 7, 2024
Merged

Ensure safe Uint64/32 instanciations, with new Unsafe.fromField() #1438

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ed623bf
Move `Uint.from(Field)` to `Uint.Unsafe.fromField(Field)`
julio4 Feb 16, 2024
37d619e
Update tests to create Uint from number only
julio4 Feb 16, 2024
b3ad149
Fix: sha256 unsafe Uint
julio4 Feb 16, 2024
d80929b
Merge branch 'main' of github.com:o1-labs/o1js into feat/safe-int
julio4 Feb 27, 2024
cebbe41
Update src/lib/int.ts
mitschabaude Feb 28, 2024
4ea799d
Update src/lib/int.ts
mitschabaude Feb 28, 2024
e7b1906
fix uint construction and remove some code duplication
mitschabaude Mar 7, 2024
533fd60
Merge remote-tracking branch 'upstream/main' into feat/safe-int
mitschabaude Mar 7, 2024
c697f18
fixup unit test
mitschabaude Mar 7, 2024
99e8ccc
fix clamped uint64 -> uint64
mitschabaude Mar 7, 2024
9eb9d7c
fixup int test
mitschabaude Mar 7, 2024
0fee0fe
changelog
mitschabaude Mar 7, 2024
80a5e3e
tweak changelog
mitschabaude Mar 7, 2024
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 src/lib/circuit-value.unit-test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ expect(() =>
uint: [
UInt32.zero,
// invalid Uint32
new UInt32(Field(-1)),
new UInt32(-1),
],
}));
})
Expand Down
14 changes: 7 additions & 7 deletions src/lib/gadgets/sha256.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function padding(data: FlexibleBytes): UInt32[][] {
// chunk 4 bytes into one UInt32, as expected by SHA256
// bytesToWord expects little endian, so we reverse the bytes
chunks.push(
UInt32.from(bytesToWord(paddedMessage.slice(i, i + 4).reverse()))
UInt32.Unsafe.fromField(bytesToWord(paddedMessage.slice(i, i + 4).reverse()))
);
}

Expand Down Expand Up @@ -104,7 +104,7 @@ const SHA256 = {
.add(DeltaZero(W[t - 15]).value.add(W[t - 16].value));

// mod 32bit the unreduced field element
W[t] = UInt32.from(divMod32(unreduced, 16).remainder);
W[t] = UInt32.Unsafe.fromField(divMod32(unreduced, 16).remainder);
}

// initialize working variables
Expand Down Expand Up @@ -133,11 +133,11 @@ const SHA256 = {
h = g;
g = f;
f = e;
e = UInt32.from(divMod32(d.value.add(unreducedT1), 16).remainder); // mod 32bit the unreduced field element
e = UInt32.Unsafe.fromField(divMod32(d.value.add(unreducedT1), 16).remainder); // mod 32bit the unreduced field element
d = c;
c = b;
b = a;
a = UInt32.from(divMod32(unreducedT2.add(unreducedT1), 16).remainder); // mod 32bit
a = UInt32.Unsafe.fromField(divMod32(unreducedT2.add(unreducedT1), 16).remainder); // mod 32bit
}

// new intermediate hash value
Expand All @@ -163,7 +163,7 @@ function Ch(x: UInt32, y: UInt32, z: UInt32) {
let xAndY = x.and(y).value;
let xNotAndZ = x.not().and(z).value;
let ch = xAndY.add(xNotAndZ).seal();
return UInt32.from(ch);
return UInt32.Unsafe.fromField(ch);
}

function Maj(x: UInt32, y: UInt32, z: UInt32) {
Expand All @@ -172,7 +172,7 @@ function Maj(x: UInt32, y: UInt32, z: UInt32) {
let sum = x.value.add(y.value).add(z.value).seal();
let xor = x.xor(y).xor(z).value;
let maj = sum.sub(xor).div(2).seal();
return UInt32.from(maj);
return UInt32.Unsafe.fromField(maj);
}

function SigmaZero(x: UInt32) {
Expand Down Expand Up @@ -276,5 +276,5 @@ function sigma(u: UInt32, bits: TupleN<number, 3>, firstShifted = false) {

// since xor() is implicitly range-checking both of its inputs, this provides the missing
// proof that xRotR0, xRotR1, xRotR2 < 2^32, which implies x0 < 2^d0, x1 < 2^d1, x2 < 2^d2
return UInt32.from(xRotR0).xor(new UInt32(xRotR1)).xor(new UInt32(xRotR2));
return UInt32.Unsafe.fromField(xRotR0).xor(UInt32.Unsafe.fromField(xRotR1)).xor(UInt32.Unsafe.fromField(xRotR2));
}
Loading
Loading