Merge pull request #2134 from o1-labs/v2/fix-au-tests

Fix V2 `AccountUpdate` conversion tests

Author: Trivo25

CHANGELOG.md

@@ -17,13 +17,17 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased](https://github.com/o1-labs/o1js/compare/6ff7f8470a...HEAD)
 
+### Fixed
+
+- Correct handling of actions and events lists as well as internal `AccountUpdate` consistency tests for the new V2 API. https://github.com/o1-labs/o1js/pull/2134
+
 ### Added
 
 - [PR !2076](https://github.com/o1-labs/o1js/pull/2076)
-    - o1js-bindings is no longer a submodule (same directory structure)
-    - compiled artifacts are now gitignored
-    - `npm run build:bindings-download` downloads compiled artifacts from github
-    - `npm run build:bindings-remote` triggers a github workflow to build the compiled artifacts then downloads them
+  - o1js-bindings is no longer a submodule (same directory structure)
+  - compiled artifacts are now gitignored
+  - `npm run build:bindings-download` downloads compiled artifacts from github
+  - `npm run build:bindings-remote` triggers a github workflow to build the compiled artifacts then downloads them
 
 ### Changed
 

src/examples/v2/mina-program.ts

@@ -39,6 +39,10 @@ const TestProgram = V2.MinaProgram({
             x: V2.Update.from(value, Field(0)) as never,
             address: V2.Update.from(env.accountId.publicKey, PublicKey.empty()) as never,
           },
+          pushActions: [
+            [Field(1), Field(2)],
+            [Field(3), Field(4)],
+          ],
         };
       },
     },

src/index.ts

@@ -156,6 +156,7 @@ namespace Experimental {
       Action,
       MethodPrivateInputs extends { [key: string]: V2_.ProvableTuple }
     > = V2_.MinaProgram<State, Event, Action, MethodPrivateInputs>;
+    export type DynamicProvable<P> = V2_.DynamicProvable<P>;
   }
 
   export let memoizeWitness = Experimental_.memoizeWitness;

src/lib/mina/v2/account-update.ts

@@ -36,8 +36,6 @@ import { NetworkId } from '../../../mina-signer/src/types.js';
 import { Struct } from '../../provable/types/struct.js';
 import { VerificationKey } from '../../../lib/proof-system/verification-key.js';
 
-// TODO: make private abstractions over many fields (eg new apis for Update and Constraint.*)
-// TODO: replay checks
 // TODO: make private abstractions over many fields (eg new apis for Update and Constraint.*)
 // TODO: replay checks
 export {
@@ -50,6 +48,9 @@ export {
   ContextFreeAccountUpdate,
   DynamicProvable,
   AccountUpdateCommitment,
+  CommittedList,
+  EventsHashConfig,
+  ActionsHashConfig,
 };
 class AccountUpdateCommitment extends Struct({
   accountUpdateCommitment: Field,
@@ -79,7 +80,8 @@ const GenericData: DynamicProvable<Field[]> = {
   },
 
   fromFieldsDynamic(fields: Field[], aux: any[]): { value: Field[]; fieldsConsumed: number } {
-    const [len] = aux;
+    const [_len] = aux;
+    let len = _len ?? fields.length;
     return { value: fields.slice(0, len), fieldsConsumed: len };
   },
 };
@@ -185,7 +187,6 @@ class CommittedList<Item> {
           return result;
         });
       }
-
       //hash = value.hash;
     }
 
@@ -813,8 +814,8 @@ class AccountUpdate<
     return Bindings.Layout.AccountUpdateBody.toFields(x.toInternalRepr(0));
   }
 
-  static toAuxiliary(x?: AccountUpdate): any[] {
-    return Bindings.Layout.AccountUpdateBody.toAuxiliary(x?.toInternalRepr(0));
+  static toAuxiliary(x?: AccountUpdate, callDepth?: number): any[] {
+    return Bindings.Layout.AccountUpdateBody.toAuxiliary(x?.toInternalRepr(callDepth ?? 0));
   }
 
   static fromFields(fields: Field[], aux: any[]): AccountUpdate {
@@ -1011,9 +1012,10 @@ class Authorized<State extends StateLayout = 'GenericState', Event = Field[], Ac
   }
 
   static toAuxiliary<State extends StateLayout = 'GenericState', Event = Field[], Action = Field[]>(
-    x?: Authorized<State, Event, Action>
+    x?: Authorized<State, Event, Action>,
+    callDepth?: number
   ): any[] {
-    return Bindings.Layout.ZkappAccountUpdate.toAuxiliary(x?.toInternalRepr(0));
+    return Bindings.Layout.ZkappAccountUpdate.toAuxiliary(x?.toInternalRepr(callDepth ?? 0));
   }
 
   static fromFields(fields: Field[], aux: any[]): Authorized {

src/lib/mina/v2/account-update.unit-test.ts

@@ -9,7 +9,7 @@ import { VerificationKey } from '../../proof-system/verification-key.js';
 import { Bool } from '../../provable/bool.js';
 import { Field } from '../../provable/field.js';
 import { UInt32, UInt64, Int64, Sign } from '../../provable/int.js';
-import { PublicKey, PrivateKey } from '../../provable/crypto/signature.js';
+import { PrivateKey } from '../../provable/crypto/signature.js';
 import {
   Actions as V1Actions,
   Events as V1Events,
@@ -24,6 +24,19 @@ import { jsLayout as layoutV1 } from '../../../bindings/mina-transaction/gen/v1/
 import { expect } from 'expect';
 
 import { ZkappConstants } from '../v1/constants.js';
+import {
+  testV1V2ClassEquivalence,
+  testV1V2ValueEquivalence,
+  testV2Encoding,
+} from './test/utils.js';
+import {
+  Signature,
+  signFieldElement,
+  zkAppBodyPrefix,
+} from '../../../mina-signer/src/signature.js';
+
+import { Types } from '../../../bindings/mina-transaction/v1/types.js';
+import { packToFields, hashWithPrefix } from '../../../lib/provable/crypto/poseidon.js';
 
 function testHashEquality(v1: TypesV1.AccountUpdate, v2: Authorized) {
   expect(TypesV1.AccountUpdate.toInput(v1)).toEqual(v2.toInput());
@@ -425,54 +438,39 @@ const v2AccountUpdate: Authorized = new Authorized(
 {
   // TODO: the fact that all these extra type-annotation are required means we didn't encode this
   //       type well for typescript's poor type inference
-  //testV2Encoding<Authorized>(Authorized, v2AccountUpdate);
-  /*
+  testV2Encoding<Authorized>(Authorized, v2AccountUpdate);
+
   testV1V2ClassEquivalence<number, TypesV1.AccountUpdate, Authorized>(
     V1AccountUpdate,
     Authorized,
     0
   );
-  */
-  testHashEquality(V1AccountUpdate.empty(), Authorized.empty());
 
-  /*
+  testHashEquality(V1AccountUpdate.empty(), Authorized.empty());
   testV1V2ValueEquivalence<number, TypesV1.AccountUpdate, Authorized>(
     V1AccountUpdate,
     Authorized,
     v1AccountUpdate,
     v2AccountUpdate,
     2
   );
-  */
+
   testHashEquality(v1AccountUpdate, v2AccountUpdate);
 }
 
 // signature test
 {
-  const v2Update = v2AccountUpdate.toAccountUpdate();
-
-  const v2UpdateSigned = await v2Update.authorize({
-    networkId: 'testnet',
-    async getPrivateKey(pk: PublicKey): Promise<PrivateKey> {
-      if (pk !== publicKey) throw new Error();
-      return privateKey;
-    },
-    accountUpdateForestCommitment: BigInt(0),
-    fullTransactionCommitment: BigInt(0),
-  });
-
-  // TODO: We need to actually ensure the signatures match the old implementation, but the old
-  //       interface makes this test annoying to implement, so skipping for right now.
-  console.log(`signature = ${JSON.stringify(v2UpdateSigned.authorization.signature)}`);
+  let v1Hash = hashWithPrefix(
+    zkAppBodyPrefix('testnet'),
+    packToFields(Types.AccountUpdate.toInput(v1AccountUpdate))
+  );
+  let v1Signature = signFieldElement(v1Hash.toBigInt(), privateKey.toBigInt(), 'testnet');
 
-  /*
-  // HACK
-  const v1Update = {...v2AccountUpdate} as unknown as V1AccountUpdateImpl;
-  Object.setPrototypeOf(v1Update, V1AccountUpdateImpl.prototype);
+  const v2Update = v2AccountUpdate.toAccountUpdate();
+  let v2Hash = v2Update.commit('testnet').accountUpdateCommitment.toBigInt();
+  let v2Signature = signFieldElement(v2Hash, privateKey.toBigInt(), 'testnet');
 
-  expect(v2UpdateSigned.authorization.signature)
-    .toEqual(v1Update.authorization.signature);
-  */
+  expect(Signature.toBase58(v1Signature)).toEqual(Signature.toBase58(v2Signature));
 }
 
 console.log('\n:)');

src/lib/mina/v2/test/utils.ts

@@ -57,6 +57,7 @@ export type V1Type<T> = ProvableTypeDef<T> & {
 export type V2Type<InternalReprArg, V1, V2 extends V2Value<any, V1>> = ProvableTypeDef<V2> & {
   fromInternalRepr(x: V1): V2;
   toJSON(x: V2, arg: InternalReprArg): any;
+  toAuxiliary(x: V2, arg?: InternalReprArg): any;
 };
 
 export interface V2Value<InternalReprArg, V1> {
@@ -111,13 +112,15 @@ export function testV1V2ValueEquivalence<
   expect(v2Value.toFields()).toEqual(V1Type.toFields(v1Value));
 
   // auxiliary equality
-  expect(V2Type.toAuxiliary(v2Value)).toEqual(V1Type.toAuxiliary(v1Value));
+  expect(V2Type.toAuxiliary(v2Value, v2InternalReprArg)).toEqual(V1Type.toAuxiliary(v1Value));
 
   // v1 -> v2 via fields
   expect(V2Type.fromFields(V1Type.toFields(v1Value), V1Type.toAuxiliary(v1Value))).toEqual(v2Value);
 
   // v1 -> v2 via fields
-  expect(V1Type.fromFields(V2Type.toFields(v2Value), V2Type.toAuxiliary(v2Value))).toEqual(v1Value);
+  expect(
+    V1Type.fromFields(V2Type.toFields(v2Value), V2Type.toAuxiliary(v2Value, v2InternalReprArg))
+  ).toEqual(v1Value);
 
   // input equality
   expect(V1Type.toInput(v1Value)).toEqual(V2Type.toInput(v2Value));