make tests great again

Author: maht0rz

packages/common/src/zkProgrammable/provableMethod.ts

@@ -5,7 +5,8 @@ import { ProvableMethodExecutionContext } from "./ProvableMethodExecutionContext
 import type { WithZkProgrammable, ZkProgrammable } from "./ZkProgrammable";
 import { ToFieldable } from "../utils";
 
-export type O1JSPrimitive = InferProvable<ProvableExtended<unknown>> & ToFieldable;
+export type O1JSPrimitive = InferProvable<ProvableExtended<unknown>> &
+  ToFieldable;
 export type ArgumentTypes = (O1JSPrimitive | Proof<unknown, unknown>)[];
 
 // eslint-disable-next-line etc/prefer-interface

packages/module/src/method/MethodParameterEncoder.ts

@@ -1,5 +1,11 @@
 /* eslint-disable no-underscore-dangle */
-import { Field, FlexibleProvable, Proof, ProvableExtended } from "o1js";
+import {
+  Field,
+  FlexibleProvable,
+  Proof,
+  Provable,
+  ProvableExtended,
+} from "o1js";
 import {
   ArgumentTypes,
   ProofTypes,
@@ -118,13 +124,16 @@ export class MethodParameterEncoder {
       return argumentType.toFields(argument);
     });
 
-    const argsJSON = args.map((argument, index) => {
-      if (argument instanceof Proof) {
-        return JSON.stringify(argument.toJSON());
-      }
+    let argsJSON: string[] = [];
+    Provable.asProver(() => {
+      argsJSON = args.map((argument, index) => {
+        if (argument instanceof Proof) {
+          return JSON.stringify(argument.toJSON());
+        }
 
-      const argumentType = this.types[index] as ToJSONableStatic;
-      return JSON.stringify(argumentType.toJSON(argument));
+        const argumentType = this.types[index] as ToJSONableStatic;
+        return JSON.stringify(argumentType.toJSON(argument));
+      });
     });
 
     return {

packages/module/src/method/runtimeMethod.ts

@@ -69,7 +69,6 @@ export function toWrappedMethod(
   this: RuntimeModule<unknown>,
   methodName: string,
   moduleMethod: (...args: ArgumentTypes) => unknown,
-  methodArguments: ArgumentTypes,
   options: {
     invocationType: RuntimeMethodInvocationType;
   }
@@ -121,11 +120,11 @@ export function toWrappedMethod(
     ).encode(args);
 
     // Assert that the argsHash that has been signed matches the given arguments
-    // We can use js-if here, because methodArguments is statically sizes
+    // We can use js-if here, because args are statically sized
     // i.e. the result of the if-statement will be the same for all executions
     // of this method
     const argsHash =
-      (methodArguments ?? []).length > 0 ? Poseidon.hash(argsFields) : Field(0);
+      (args ?? []).length > 0 ? Poseidon.hash(argsFields) : Field(0);
 
     transaction.argsHash.assertEquals(
       argsHash,
@@ -237,7 +236,6 @@ function runtimeMethodInternal(options: {
       const simulatedWrappedMethod = Reflect.apply(toWrappedMethod, this, [
         methodName,
         simulatedMethod,
-        args,
         options,
       ]);
 

packages/module/src/runtime/Runtime.ts

@@ -22,6 +22,7 @@ import {
 import {
   combineMethodName,
   isRuntimeMethod,
+  runtimeMethodTypeMetadataKey,
   toWrappedMethod,
   WrappedMethod,
 } from "../method/runtimeMethod";
@@ -128,10 +129,16 @@ export class RuntimeZkProgrammable<
                 methodName
               );
               const method = modulePrototype[methodName];
+              const invocationType = Reflect.getMetadata(
+                runtimeMethodTypeMetadataKey,
+                runtimeModule,
+                methodName
+              );
+
               const wrappedMethod = Reflect.apply(
                 toWrappedMethod,
                 runtimeModule,
-                [methodName, method]
+                [methodName, method, { invocationType }]
               );
 
               // eslint-disable-next-line no-warning-comments

packages/sdk/src/appChain/TestingAppChain.ts

@@ -149,9 +149,4 @@ export class TestingAppChain<
 
     return await blockTrigger.produceUnproven();
   }
-
-  public async start() {
-    log.setLevel("ERROR");
-    super.start();
-  }
 }

packages/sdk/test/TestingAppChain.test.ts

@@ -1,6 +1,6 @@
 /* eslint-disable max-statements */
 import "reflect-metadata";
-import { PrivateKey, PublicKey, UInt64 } from "o1js";
+import { PrivateKey, Provable, PublicKey, UInt64 } from "o1js";
 import {
   runtimeMethod,
   RuntimeModule,
@@ -17,6 +17,7 @@ import {
   TokenId,
   VanillaRuntimeModules,
 } from "@proto-kit/library";
+import { log } from "@proto-kit/common";
 
 export interface AdminConfig {
   admin: PublicKey;
@@ -125,6 +126,8 @@ describe("testing app chain", () => {
     // start the chain, sequencer is now accepting transactions
     await appChain.start();
 
+    log.setLevel("INFO");
+
     /**
      *  Setup the transaction signer / sender
      */
@@ -148,9 +151,9 @@ describe("testing app chain", () => {
      */
     const block = await appChain.produceBlock();
 
-    expect(block?.transactions[0].status.toBoolean()).toBe(true);
+    Provable.log("block", block);
 
-    appChain.query.runtime.Balances;
+    expect(block?.transactions[0].status.toBoolean()).toBe(true);
 
     /**
      * Observe new state after the block has been produced

packages/sdk/test/blockProof/blockProof.test.ts

@@ -1,4 +1,4 @@
-import { Bool, PrivateKey, UInt64 } from "o1js";
+import { Bool, PrivateKey, Provable, UInt64 } from "o1js";
 import {
   PublicKeyOption,
   RuntimeMethodExecutionContext,

packages/sdk/test/fees.test.ts

@@ -27,7 +27,7 @@ class Faucet extends RuntimeModule<unknown> {
   public drip() {
     this.balances.mint(
       new TokenId(0),
-      this.transaction.sender,
+      this.transaction.sender.value,
       UInt64.from(1000)
     );
   }
@@ -41,7 +41,7 @@ class Pit extends RuntimeModule<unknown> {
 
   @runtimeMethod()
   public burn(amount: UInt64) {
-    this.balances.burn(new TokenId(0), this.transaction.sender, amount);
+    this.balances.burn(new TokenId(0), this.transaction.sender.value, amount);
   }
 }
 

packages/sdk/test/modularization.test.ts

@@ -11,6 +11,7 @@ import { AppChain, AppChainModule } from "../src";
 import { Protocol, ProtocolModule } from "@proto-kit/protocol";
 import { VanillaProtocolModules } from "@proto-kit/library";
 import { Sequencer, SequencerModule } from "@proto-kit/sequencer";
+import { PrivateKey } from "o1js";
 
 class TestRuntimeModule extends RuntimeModule<object> {
   public initialized = false;
@@ -80,12 +81,19 @@ describe("modularization", () => {
         TestRuntimeModule: {},
       },
       Protocol: {
-        TestProtocolModule: {},
+        AccountState: {},
         BlockProver: {},
         StateTransitionProver: {},
-        AccountState: {},
         BlockHeight: {},
-        TransactionFee: {} as any,
+        LastStateRoot: {},
+        TransactionFee: {
+          tokenId: 0n,
+          feeRecipient: PrivateKey.random().toPublicKey().toBase58(),
+          baseFee: 0n,
+          perWeightUnitFee: 0n,
+          methods: {},
+        },
+        TestProtocolModule: {},
       },
       Sequencer: {
         TestSequencerModule: {},

packages/sequencer/src/protocol/production/unproven/TransactionExecutionService.ts

@@ -271,7 +271,7 @@ export class TransactionExecutionService {
         }
       } catch (error) {
         if (error instanceof Error) {
-          log.info("Error in inclusion of tx, skipping", error);
+          log.error("Error in inclusion of tx, skipping", error);
         }
       }
     }