Merge branch 'main' into shigoto/performance-regression-framework

Author: Shigoto-dev19

.github/workflows/checks.yml

@@ -60,7 +60,7 @@ jobs:
           ref: ${{ inputs.target_ref || github.ref }}
           proof_systems_commit: ${{ inputs.proof_systems_commit }}
 
-  Lint-Format-and-TypoCheck:
+  Lint-and-Format:
     strategy:
       matrix:
         node: [20]
@@ -108,16 +108,6 @@ jobs:
       - name: Run Markdown Format Check
         run: npm run format:md:check
 
-      - name: Run codespell
-        if: steps.get_changed_files.outputs.files_changed == 'true' && github.event.pull_request.labels.*.name != 'no-typo-check'
-        uses: codespell-project/actions-codespell@master
-        with:
-          check_filenames: true
-          path: ${{ steps.get_changed_files.outputs.files }}
-          skip: "*.json,./node_modules,./dist,./.husky,./.git,./src/mina/**/*,./src/bindings/compiled/**/*"
-          check_hidden: false
-          ignore_words_list: "tHi,modul,optin,deriver,PRing,toWords,iSelf"
-
   Upload-bindings:
     name: upload bindings artifact
     if: ${{ inputs.proof_systems_commit == '' }}

.github/workflows/pull_requests.yml

@@ -41,7 +41,7 @@ jobs:
           file_pattern: "npmDepsHash"
 
 
-  Lint-Format-and-TypoCheck:
+  Lint-and-Format:
     if: github.event.pull_request.labels.*.name != 'skip-lint'
     runs-on: ubuntu-latest
 
@@ -77,14 +77,4 @@ jobs:
         run: xargs npm run lint:strict < changed_files.txt
 
       - name: Run Markdown Format Check
-        run: npm run format:md:check
-
-      - name: Run codespell
-        if: github.event.pull_request.labels.*.name != 'no-typo-check'
-        uses: codespell-project/actions-codespell@v2
-        with:
-          check_filenames: true
-          path: ${{ steps.changed_files.outputs.files }}
-          skip: "*.json,./node_modules,./dist,./.husky,./.git,./src/mina/**/*,./src/bindings/compiled/**/*"
-          check_hidden: false
-          ignore_words_list: "tHi,modul,optin,deriver,PRing,toWords,iSelf"
+        run: npm run format:md:check

.prettierrc.cjs

@@ -13,4 +13,5 @@ module.exports = {
       },
     },
   ],
+  plugins: [require.resolve('prettier-plugin-organize-imports')],
 };

npmDepsHash

@@ -1 +1 @@
-sha256-hvRlb/ZgfEnSW+OJG4UibamdL5UzygQQthMpUqh2W0w=
+sha256-ww0EdkEWiciR6XLTu2/lfqtDMbvIDBLj+gyPH+lpLTE=

package-lock.json

@@ -108,6 +108,7 @@
     "oxlint": "^1.0.0",
     "pkg-pr-new": "^0.0.9",
     "prettier": "^3.6.2",
+    "prettier-plugin-organize-imports": "^4.3.0",
     "replace-in-file": "^6.3.5",
     "rimraf": "^3.0.2",
     "ts-jest": "^28.0.8",

package.json

@@ -0,0 +1,75 @@
+import { Bytes, Field, Hash, Poseidon, UInt8, ZkProgram, verify } from 'o1js';
+
+const SmallProgram = ZkProgram({
+  name: 'small-program',
+  publicOutput: Field,
+
+  methods: {
+    poseidonHash: {
+      privateInputs: [Field],
+      async method(preimage: Field) {
+        const digest = Poseidon.hash([preimage]);
+
+        return { publicOutput: digest };
+      },
+    },
+  },
+});
+
+class PoseidonProof extends SmallProgram.Proof {}
+class Bytes32 extends Bytes(32) {}
+
+const BigProgram = ZkProgram({
+  name: 'big-program',
+  publicOutput: Bytes32,
+
+  methods: {
+    combinedHash: {
+      privateInputs: [PoseidonProof],
+      async method(poseidonProof: PoseidonProof) {
+        poseidonProof.verify();
+
+        const poseidonOutput = poseidonProof.publicOutput;
+        const outputBits = poseidonOutput.toBits();
+
+        const byteChunks = Array.from({ length: 32 }, (_, i) => outputBits.slice(i * 8, i * 8 + 8));
+        const outputBytes = byteChunks.map((byteChunks) => UInt8.fromBits(byteChunks));
+
+        const hash1 = Hash.SHA2_256.hash(outputBytes);
+        const hash2 = Hash.BLAKE2B.hash(hash1);
+        const hash3 = Hash.SHA3_512.hash(Bytes.from([...hash1.bytes, ...hash2.bytes]));
+        const hash4 = Hash.Keccak256.hash(hash3);
+
+        return { publicOutput: hash4 };
+      },
+    },
+  },
+});
+
+const csSmall = await SmallProgram.analyzeMethods();
+console.log('small program rows: ', csSmall.poseidonHash.rows);
+
+const csBig = await BigProgram.analyzeMethods();
+console.log('big program rows: ', csBig.combinedHash.rows, '\n');
+
+console.time('compile small');
+await SmallProgram.compile();
+console.timeEnd('compile small');
+
+console.time('compile big');
+const { verificationKey: verificationKeyBig } = await BigProgram.compile();
+console.timeEnd('compile big');
+
+console.time('prove small');
+const proofSmall = await SmallProgram.poseidonHash(Field.random());
+console.timeEnd('prove small');
+
+console.time('prove big');
+const { proof: proofBig } = await BigProgram.combinedHash(proofSmall.proof);
+console.timeEnd('prove big');
+
+console.time('verify big');
+await verify(proofBig, verificationKeyBig);
+console.timeEnd('verify big');
+
+console.log('Final Digest: ', proofBig.publicOutput.toHex());

src/examples/zkprogram/program-small-big.ts

@@ -1,66 +1,67 @@
-import { EmptyUndefined, EmptyVoid } from '../../bindings/lib/generic.js';
 import {
   Base64ProofString,
   Base64VerificationKeyString,
+  Gate,
+  Pickles,
   Snarky,
   initializeBindings,
   withThreadPool,
 } from '../../bindings.js';
-import { Pickles, Gate } from '../../bindings.js';
-import { Field } from '../provable/wrapped.js';
-import { FlexibleProvable, InferProvable, ProvablePureExtended } from '../provable/types/struct.js';
-import { InferProvableType } from '../provable/types/provable-derivers.js';
-import { Provable } from '../provable/provable.js';
-import { assert, prettifyStacktracePromise } from '../util/errors.js';
+import { setSrsCache, unsetSrsCache } from '../../bindings/crypto/bindings/srs.js';
+import { prefixes } from '../../bindings/crypto/constants.js';
+import { prefixToField } from '../../bindings/lib/binable.js';
+import { EmptyUndefined, EmptyVoid } from '../../bindings/lib/generic.js';
+import { From, InferValue } from '../../bindings/lib/provable-generic.js';
+import { MlArray, MlBool, MlPair, MlResult } from '../ml/base.js';
+import { MlFieldArray, MlFieldConstArray } from '../ml/fields.js';
+import { FieldConst, FieldVar } from '../provable/core/fieldvar.js';
 import { ConstraintSystemSummary, snarkContext } from '../provable/core/provable-context.js';
 import { hashConstant } from '../provable/crypto/poseidon.js';
-import { MlArray, MlBool, MlResult, MlPair } from '../ml/base.js';
-import { MlFieldArray, MlFieldConstArray } from '../ml/fields.js';
-import { FieldVar, FieldConst } from '../provable/core/fieldvar.js';
-import { Cache, readCache, writeCache } from './cache.js';
-import { decodeProverKey, encodeProverKey, parseHeader } from './prover-keys.js';
-import { setSrsCache, unsetSrsCache } from '../../bindings/crypto/bindings/srs.js';
+import { Provable } from '../provable/provable.js';
+import { InferProvableType } from '../provable/types/provable-derivers.js';
 import { ProvableType, ToProvable } from '../provable/types/provable-intf.js';
-import { prefixToField } from '../../bindings/lib/binable.js';
-import { prefixes } from '../../bindings/crypto/constants.js';
-import { Subclass, Tuple, Get } from '../util/types.js';
+import { FlexibleProvable, InferProvable, ProvablePureExtended } from '../provable/types/struct.js';
+import { emptyWitness } from '../provable/types/util.js';
+import { Field } from '../provable/wrapped.js';
+import { mapObject, mapToObject, zip } from '../util/arrays.js';
+import { assert, prettifyStacktracePromise } from '../util/errors.js';
+import { Get, Subclass, Tuple } from '../util/types.js';
+import { Cache, readCache, writeCache } from './cache.js';
+import { featureFlagsFromGates, featureFlagsToMlOption } from './feature-flags.js';
 import {
-  dummyProof,
   DynamicProof,
-  extractProofs,
-  extractProofTypes,
   Proof,
   ProofBase,
   ProofClass,
   ProofValue,
+  dummyProof,
+  extractProofTypes,
+  extractProofs,
 } from './proof.js';
-import { featureFlagsFromGates, featureFlagsToMlOption } from './feature-flags.js';
-import { emptyWitness } from '../provable/types/util.js';
-import { From, InferValue } from '../../bindings/lib/provable-generic.js';
-import { DeclaredProof, ZkProgramContext } from './zkprogram-context.js';
-import { mapObject, mapToObject, zip } from '../util/arrays.js';
+import { decodeProverKey, encodeProverKey, parseHeader } from './prover-keys.js';
 import { VerificationKey } from './verification-key.js';
+import { DeclaredProof, ZkProgramContext } from './zkprogram-context.js';
 
 // public API
-export { SelfProof, JsonProof, ZkProgram, verify, Empty, Undefined, Void, Method };
+export { Empty, JsonProof, Method, SelfProof, Undefined, Void, ZkProgram, verify };
 
 // internal API
 export {
   CompiledTag,
-  sortMethodArguments,
   MethodInterface,
   MethodReturnType,
-  picklesRuleFromFunction,
-  compileProgram,
-  analyzeMethod,
+  PrivateInput,
+  Proof,
   Prover,
-  dummyBase64Proof,
-  computeMaxProofsVerified,
   RegularProver,
   TupleToInstances,
-  PrivateInput,
-  Proof,
+  analyzeMethod,
+  compileProgram,
+  computeMaxProofsVerified,
+  dummyBase64Proof,
   inCircuitVkHash,
+  picklesRuleFromFunction,
+  sortMethodArguments,
 };
 
 type Undefined = undefined;
@@ -225,7 +226,7 @@ type InferMethodType<Config extends ConfigBaseType> = {
  */
 function ZkProgram<
   Config extends ConfigBaseType,
-  _ extends unknown = unknown // weird hack that makes methods infer correctly when their inputs are not annotated
+  _ extends unknown = unknown, // weird hack that makes methods infer correctly when their inputs are not annotated
 >(
   config: Config & {
     name: string;
@@ -603,7 +604,7 @@ type ZkProgram<
         auxiliaryOutput?: ProvableType;
       };
     };
-  }
+  },
 > = ReturnType<typeof ZkProgram<Config>>;
 
 /**
@@ -1059,7 +1060,7 @@ function toFieldAndAuxConsts<T>(type: Provable<T>, value: T) {
 
 ZkProgram.Proof = function <
   PublicInputType extends FlexibleProvable<any>,
-  PublicOutputType extends FlexibleProvable<any>
+  PublicOutputType extends FlexibleProvable<any>,
 >(program: {
   name: string;
   publicInputType: PublicInputType;
@@ -1111,11 +1112,12 @@ function Prover<ProverData>() {
 
 // helper types
 
-type Infer<T> = T extends Subclass<typeof ProofBase>
-  ? InstanceType<T>
-  : T extends ProvableType
-  ? InferProvableType<T>
-  : never;
+type Infer<T> =
+  T extends Subclass<typeof ProofBase>
+    ? InstanceType<T>
+    : T extends ProvableType
+      ? InferProvableType<T>
+      : never;
 
 type TupleToInstances<T> = {
   [I in keyof T]: Infer<T[I]>;
@@ -1133,21 +1135,21 @@ type MethodReturnType<PublicOutput, AuxiliaryOutput> = PublicOutput extends void
         auxiliaryOutput: AuxiliaryOutput;
       }
   : AuxiliaryOutput extends undefined
-  ? {
-      publicOutput: PublicOutput;
-    }
-  : {
-      publicOutput: PublicOutput;
-      auxiliaryOutput: AuxiliaryOutput;
-    };
+    ? {
+        publicOutput: PublicOutput;
+      }
+    : {
+        publicOutput: PublicOutput;
+        auxiliaryOutput: AuxiliaryOutput;
+      };
 
 type Method<
   PublicInput,
   PublicOutput,
   MethodSignature extends {
     privateInputs: Tuple<PrivateInput>;
     auxiliaryOutput?: ProvableType;
-  }
+  },
 > = PublicInput extends undefined
   ? {
       method(
@@ -1176,7 +1178,7 @@ type RegularProver<
   PublicInputType,
   PublicOutput,
   Args extends Tuple<PrivateInput>,
-  AuxiliaryOutput
+  AuxiliaryOutput,
 > = (
   publicInput: From<PublicInputType>,
   ...args: TupleFrom<Args>
@@ -1190,7 +1192,7 @@ type Prover<
   PublicInputType,
   PublicOutput,
   Args extends Tuple<PrivateInput>,
-  AuxiliaryOutput
+  AuxiliaryOutput,
 > = PublicInput extends undefined
   ? (...args: TupleFrom<Args>) => Promise<{
       proof: Proof<PublicInput, PublicOutput>;
@@ -1210,8 +1212,8 @@ type ProvableOrVoid<A> = A extends undefined ? typeof Void : ToProvable<A>;
 type InferProvableOrUndefined<A> = A extends undefined
   ? undefined
   : A extends ProvableType
-  ? InferProvable<A>
-  : InferProvable<A> | undefined;
+    ? InferProvable<A>
+    : InferProvable<A> | undefined;
 type InferProvableOrVoid<A> = A extends undefined ? void : InferProvable<A>;
 
 type UnwrapPromise<P> = P extends Promise<infer T> ? T : never;