Merge Rampup into Main

CHANGELOG.md

@@ -15,9 +15,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
     _Security_ in case of vulnerabilities.
  -->
 
-## [Unreleased](https://github.com/o1-labs/o1js/compare/fbd4b2717...HEAD)
+## [0.12.3](https://github.com/o1-labs/o1js/compare/fbd4b2717...c2f392fe5)
 
-> No unreleased changes yet
+### Breaking changes
+
+- Changes to verification keys caused by updates to the proof system. This breaks all deployed contracts https://github.com/o1-labs/o1js/pull/1016 
 
 ## [0.12.2](https://github.com/o1-labs/o1js/compare/b1d8d5910...fbd4b2717)
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "o1js",
   "description": "TypeScript framework for zk-SNARKs and zkApps",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "license": "Apache-2.0",
   "homepage": "https://github.com/o1-labs/o1js/",
   "keywords": [

src/lib/account_update.unit-test.ts

@@ -1,3 +1,4 @@
+import { mocks } from '../bindings/crypto/constants.js';
 import {
   AccountUpdate,
   PrivateKey,
@@ -102,7 +103,7 @@ function createAccountUpdate() {
   let accountUpdate = createAccountUpdate();
   expect(
     accountUpdate.body.authorizationKind.verificationKeyHash.toString()
-  ).toEqual('0');
+  ).toEqual(mocks.dummyVerificationKeyHash);
 }
 
 // does not throw an error if private key is missing unless if .send is executed

src/lib/proof_system.ts

@@ -204,6 +204,7 @@ function ZkProgram<
         Types[I]
       >;
     };
+    overrideWrapDomain?: 0 | 1 | 2;
   }
 ): {
   name: string;
@@ -246,10 +247,7 @@ function ZkProgram<
     sortMethodArguments('program', key, methods[key].privateInputs, SelfProof)
   );
   let methodFunctions = keys.map((key) => methods[key].method);
-  let maxProofsVerified = methodIntfs.reduce(
-    (acc, { proofArgs }) => Math.max(acc, proofArgs.length),
-    0
-  ) as any as 0 | 1 | 2;
+  let maxProofsVerified = getMaxProofsVerified(methodIntfs);
 
   let compileOutput:
     | {
@@ -267,7 +265,8 @@ function ZkProgram<
       publicOutputType,
       methodIntfs,
       methodFunctions,
-      selfTag
+      selfTag,
+      config.overrideWrapDomain
     );
     compileOutput = { provers, verify };
     return { verificationKey: verificationKey.data };
@@ -498,12 +497,16 @@ type MethodInterface = {
   returnType?: Provable<any>;
 };
 
+// reasonable default choice for `overrideWrapDomain`
+const maxProofsToWrapDomain = { 0: 0, 1: 1, 2: 1 } as const;
+
 async function compileProgram(
   publicInputType: ProvablePure<any>,
   publicOutputType: ProvablePure<any>,
   methodIntfs: MethodInterface[],
   methods: ((...args: any) => void)[],
-  proofSystemTag: { name: string }
+  proofSystemTag: { name: string },
+  overrideWrapDomain?: 0 | 1 | 2
 ) {
   let rules = methodIntfs.map((methodEntry, i) =>
     picklesRuleFromFunction(
@@ -514,6 +517,9 @@ async function compileProgram(
       methodEntry
     )
   );
+  let maxProofs = getMaxProofsVerified(methodIntfs);
+  overrideWrapDomain ??= maxProofsToWrapDomain[maxProofs];
+
   let { verificationKey, provers, verify, tag } =
     await prettifyStacktracePromise(
       withThreadPool(async () => {
@@ -523,6 +529,7 @@ async function compileProgram(
           result = Pickles.compile(MlArray.to(rules), {
             publicInputSize: publicInputType.sizeInFields(),
             publicOutputSize: publicOutputType.sizeInFields(),
+            overrideWrapDomain,
           });
         } finally {
           snarkContext.leave(id);
@@ -773,6 +780,13 @@ function getStatementType<
   };
 }
 
+function getMaxProofsVerified(methodIntfs: MethodInterface[]) {
+  return methodIntfs.reduce(
+    (acc, { proofArgs }) => Math.max(acc, proofArgs.length),
+    0
+  ) as any as 0 | 1 | 2;
+}
+
 function fromFieldVars<T>(type: ProvablePure<T>, fields: MlFieldArray) {
   return type.fromFields(MlFieldArray.from(fields));
 }

src/lib/proof_system.unit-test.ts

@@ -46,9 +46,4 @@ const CounterProgram = ZkProgram({
 });
 
 const incrementMethodMetadata = CounterProgram.analyzeMethods()[0];
-expect(incrementMethodMetadata).toEqual(
-  expect.objectContaining({
-    rows: 18,
-    digest: '62d893f727b12d540bdc483427cbd70b',
-  })
-);
+expect(incrementMethodMetadata).toEqual(expect.objectContaining({ rows: 18 }));

src/lib/state.ts

@@ -256,18 +256,23 @@ function createState<T>(): InternalStateType<T> {
             contract.instance.address,
             contract.instance.self.body.tokenId
           );
-        } catch (err) {
+        } catch (err: any) {
           // TODO: there should also be a reasonable error here
           if (inProver_) {
             throw err;
           }
-          throw Error(
+          let message =
             `${contract.key}.get() failed, either:\n` +
-              `1. We can't find this zkapp account in the ledger\n` +
-              `2. Because the zkapp account was not found in the cache. ` +
-              `Try calling \`await fetchAccount(zkappAddress)\` first.\n` +
-              `If none of these are the case, then please reach out on Discord at #zkapp-developers and/or open an issue to tell us!`
-          );
+            `1. We can't find this zkapp account in the ledger\n` +
+            `2. Because the zkapp account was not found in the cache. ` +
+            `Try calling \`await fetchAccount(zkappAddress)\` first.\n` +
+            `If none of these are the case, then please reach out on Discord at #zkapp-developers and/or open an issue to tell us!`;
+          if (err.message) {
+            err.message = message + `\n\n${err.message}`;
+            throw err;
+          } else {
+            throw Error(message);
+          }
         }
         if (account.zkapp?.appState === undefined) {
           // if the account is not a zkapp account, let the default state be all zeroes

src/mina-signer/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mina-signer",
   "description": "Node API for signing transactions on various networks for Mina Protocol",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "type": "module",
   "scripts": {
     "build": "tsc -p ../../tsconfig.mina-signer.json",

src/snarky.d.ts

@@ -537,7 +537,11 @@ declare const Pickles: {
    */
   compile: (
     rules: MlArray<Pickles.Rule>,
-    signature: { publicInputSize: number; publicOutputSize: number }
+    signature: {
+      publicInputSize: number;
+      publicOutputSize: number;
+      overrideWrapDomain?: 0 | 1 | 2;
+    }
   ) => {
     provers: MlArray<Pickles.Prover>;
     verify: (