Merge branch 'main' into feature/ffmul

Author: mitschabaude

CHANGELOG.md

@@ -32,7 +32,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ### Changed
 
+- `Lightnet` namespace API updates with added `listAcquiredKeyPairs()` method https://github.com/o1-labs/o1js/pull/1256
 - Expose raw provable methods of a `ZkProgram` on `zkProgram.rawMethods` https://github.com/o1-labs/o1js/pull/1241
+- Reduce number of constraints needed by `rotate()`, `leftShift()` and, `rightShift()` gadgets https://github.com/o1-labs/o1js/pull/1201
+
+### Fixed
+
+- Add a parameter to `checkZkappTransaction` for block length to check for transaction inclusion. This fixes a case where `Transaction.wait()` only checked the latest block, which led to an error once the transaction was included in a block that was not the latest. https://github.com/o1-labs/o1js/pull/1239
 
 ## [0.14.1](https://github.com/o1-labs/o1js/compare/e8e7510e1...26363465d)
 
@@ -56,7 +62,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ### Added
 
-- `Lightnet` namespace to interact with the account manager provided by the [lightnet Mina network](https://hub.docker.com/r/o1labs/mina-local-network). https://github.com/o1-labs/o1js/pull/1167
+- `Lightnet` namespace to interact with the account manager provided by the [lightnet Mina network](https://hub.docker.com/r/o1labs/mina-local-network) https://github.com/o1-labs/o1js/pull/1167
 - Internal support for several custom gates (range check, bitwise operations, foreign field operations) and lookup tables https://github.com/o1-labs/o1js/pull/1176
 - `Gadgets.rangeCheck64()`, new provable method to do efficient 64-bit range checks using lookup tables https://github.com/o1-labs/o1js/pull/1181
 - `Gadgets.rotate()`, new provable method to support bitwise rotation for native field elements. https://github.com/o1-labs/o1js/pull/1182

src/lib/fetch.ts

@@ -481,8 +481,8 @@ type LastBlockQueryFailureCheckResponse = {
   }[];
 };
 
-const lastBlockQueryFailureCheck = `{
-  bestChain(maxLength: 1) {
+const lastBlockQueryFailureCheck = (length: number) => `{
+  bestChain(maxLength: ${length}) {
     transactions {
       zkappCommands {
         hash
@@ -496,10 +496,11 @@ const lastBlockQueryFailureCheck = `{
 }`;
 
 async function fetchLatestBlockZkappStatus(
+  blockLength: number,
   graphqlEndpoint = networkConfig.minaEndpoint
 ) {
   let [resp, error] = await makeGraphqlRequest(
-    lastBlockQueryFailureCheck,
+    lastBlockQueryFailureCheck(blockLength),
     graphqlEndpoint,
     networkConfig.minaFallbackEndpoints
   );
@@ -513,9 +514,8 @@ async function fetchLatestBlockZkappStatus(
   return bestChain;
 }
 
-async function checkZkappTransaction(txnId: string) {
-  let bestChainBlocks = await fetchLatestBlockZkappStatus();
-
+async function checkZkappTransaction(txnId: string, blockLength = 20) {
+  let bestChainBlocks = await fetchLatestBlockZkappStatus(blockLength);
   for (let block of bestChainBlocks.bestChain) {
     for (let zkappCommand of block.transactions.zkappCommands) {
       if (zkappCommand.hash === txnId) {
@@ -1019,7 +1019,7 @@ namespace Lightnet {
    * If an error is returned by the specified endpoint, an error is thrown. Otherwise,
    * the data is returned.
    *
-   * @param options.isRegularAccount Whether to acquire regular or zkApp account (one with already configured verification key)
+   * @param options.isRegularAccount Whether to acquire key pair of regular or zkApp account (one with already configured verification key)
    * @param options.lightnetAccountManagerEndpoint Account manager endpoint to fetch from
    * @returns Key pair
    */
@@ -1096,6 +1096,44 @@ namespace Lightnet {
 
     return null;
   }
+
+  /**
+   * Gets previously acquired key pairs list.
+   *
+   * @param options.lightnetAccountManagerEndpoint Account manager endpoint to fetch from
+   * @returns Key pairs list or null if the request failed
+   */
+  export async function listAcquiredKeyPairs(options: {
+    lightnetAccountManagerEndpoint?: string;
+  }): Promise<Array<{
+    publicKey: PublicKey;
+    privateKey: PrivateKey;
+  }> | null> {
+    const {
+      lightnetAccountManagerEndpoint = networkConfig.lightnetAccountManagerEndpoint,
+    } = options;
+    const response = await fetch(
+      `${lightnetAccountManagerEndpoint}/list-acquired-accounts`,
+      {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      }
+    );
+
+    if (response.ok) {
+      const data = await response.json();
+      if (data) {
+        return data.map((account: any) => ({
+          publicKey: PublicKey.fromBase58(account.pk),
+          privateKey: PrivateKey.fromBase58(account.sk),
+        }));
+      }
+    }
+
+    return null;
+  }
 }
 
 function updateActionState(actions: string[][], actionState: Field) {

src/lib/gadgets/bitwise.ts

@@ -276,8 +276,10 @@ function rot(
   );
   // Compute next row
   rangeCheck64(shifted);
-  // Compute following row
-  rangeCheck64(excess);
+  // note: range-checking `shifted` and `field` is enough.
+  // * excess < 2^rot follows from the bound check and the rotation equation in the gate
+  // * rotated < 2^64 follows from rotated = excess + shifted (because shifted has to be a multiple of 2^rot)
+  // for a proof, see https://github.com/o1-labs/o1js/pull/1201
   return [rotated, excess, shifted];
 }
 

src/lib/gadgets/bitwise.unit-test.ts

@@ -1,6 +1,6 @@
 import { ZkProgram } from '../proof_system.js';
 import {
-  equivalent,
+  equivalentProvable as equivalent,
   equivalentAsync,
   field,
   fieldWithRng,
@@ -224,7 +224,7 @@ constraintSystem.fromZkProgram(
   ifNotAllConstant(contains(xorChain(64)))
 );
 
-let rotChain: GateType[] = ['Rot64', 'RangeCheck0', 'RangeCheck0'];
+let rotChain: GateType[] = ['Rot64', 'RangeCheck0'];
 let isJustRotate = ifNotAllConstant(
   and(contains(rotChain), withoutGenerics(equals(rotChain)))
 );

src/lib/gadgets/foreign-field.ts

@@ -81,8 +81,8 @@ function singleAdd(x: Field3, y: Field3, sign: Sign, f: bigint) {
   let f_ = split(f);
 
   let [r0, r1, r2, overflow, carry] = exists(5, () => {
-    let x_ = bigint3(x);
-    let y_ = bigint3(y);
+    let x_ = toBigint3(x);
+    let y_ = toBigint3(y);
 
     // figure out if there's overflow
     let r = collapse(x_) + sign * collapse(y_);
@@ -228,9 +228,9 @@ function multiplyNoRangeCheck(a: Field3, b: Field3, f: bigint) {
   let f2Bound = (1n << l) - f2 - 1n;
 
   let witnesses = exists(21, () => {
-    // split inputs into 3 limbs
-    let [a0, a1, a2] = bigint3(a);
-    let [b0, b1, b2] = bigint3(b);
+    // convert inputs to bigints
+    let [a0, a1, a2] = toBigint3(a);
+    let [b0, b1, b2] = toBigint3(b);
 
     // compute q and r such that a*b = q*f + r
     let ab = collapse([a0, a1, a2]) * collapse([b0, b1, b2]);
@@ -337,7 +337,7 @@ const Field3 = {
    * Turn a 3-tuple of Fields into a bigint
    */
   toBigint(x: Field3): bigint {
-    return collapse(bigint3(x));
+    return collapse(toBigint3(x));
   },
 
   /**
@@ -356,7 +356,7 @@ const Field2 = {
   },
 };
 
-function bigint3(x: Field3): bigint3 {
+function toBigint3(x: Field3): bigint3 {
   return Tuple.map(x, (x) => x.toBigInt());
 }
 

tests/vk-regression/plain-constraint-system.ts

@@ -36,6 +36,7 @@ const GroupCS = constraintSystem('Group Primitive', {
 const BitwiseCS = constraintSystem('Bitwise Primitive', {
   rot() {
     let a = Provable.witness(Field, () => new Field(12));
+    Gadgets.rangeCheck64(a); // `rotate()` doesn't do this
     Gadgets.rotate(a, 2, 'left');
     Gadgets.rotate(a, 2, 'right');
     Gadgets.rotate(a, 4, 'left');

tests/vk-regression/vk-regression.json

@@ -169,8 +169,8 @@
     "digest": "Bitwise Primitive",
     "methods": {
       "rot": {
-        "rows": 13,
-        "digest": "2c0dadbba96fd7ddb9adb7d643425ce3"
+        "rows": 10,
+        "digest": "c38703de755b10edf77bf24269089274"
       },
       "xor": {
         "rows": 15,
@@ -185,12 +185,12 @@
         "digest": "b12ad7e8a3fd28b765e059357dbe9e44"
       },
       "leftShift": {
-        "rows": 7,
-        "digest": "66de39ad3dd5807f760341ec85a6cc41"
+        "rows": 5,
+        "digest": "451f550bf73fecf53c9be82367572cb8"
       },
       "rightShift": {
-        "rows": 7,
-        "digest": "a32264f2d4c3092f30d600fa9506385b"
+        "rows": 5,
+        "digest": "d0793d4a326d480eaa015902dc34bc39"
       },
       "and": {
         "rows": 19,