@proto-kit/module 0.1.1-develop.257 → 0.1.1-develop.261

package/dist/method/runtimeMethod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtimeMethod.d.ts","sourceRoot":"","sources":["../../src/method/runtimeMethod.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAGf,kBAAkB,EAEnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAIL,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAoBjE,wBAAgB,sBAAsB,CAEpC,gBAAgB,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,mDAczC;AAGD,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,kBAAkB,CAAC;AAEvE,wBAAgB,eAAe,CAC7B,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,EAC5B,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,EAC7C,eAAe,EAAE,WAAW,EAAE,iBA0E/B;AAED,wBAAgB,iBAAiB,CAC/B,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,MAAM,UAGnB;AAED,eAAO,MAAM,wBAAwB,eAAe,CAAC;AACrD,eAAO,MAAM,6BAA6B,8BAA8B,CAAC;AAEzE;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,EAC9B,WAAW,EAAE,MAAM,WAKpB;AAED,wBAAgB,aAAa,aAEjB,cAAc,OAAO,CAAC,cAClB,MAAM,cACN,kBAAkB,UAwFjC"}
+{"version":3,"file":"runtimeMethod.d.ts","sourceRoot":"","sources":["../../src/method/runtimeMethod.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,eAAe,EAGf,kBAAkB,EAEnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAIL,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAE3B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAoBjE,wBAAgB,sBAAsB,CAEpC,gBAAgB,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,mDAczC;AAGD,MAAM,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,kBAAkB,CAAC;AAEvE,wBAAgB,eAAe,CAC7B,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,EAC5B,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,EAC7C,eAAe,EAAE,WAAW,EAAE,iBAoF/B;AAED,wBAAgB,iBAAiB,CAC/B,iBAAiB,EAAE,MAAM,EACzB,UAAU,EAAE,MAAM,UAGnB;AAED,eAAO,MAAM,wBAAwB,eAAe,CAAC;AACrD,eAAO,MAAM,6BAA6B,8BAA8B,CAAC;AAEzE;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,EAC9B,WAAW,EAAE,MAAM,WAKpB;AAED,wBAAgB,aAAa,aAEjB,cAAc,OAAO,CAAC,cAClB,MAAM,cACN,kBAAkB,UAwFjC"}

package/dist/method/runtimeMethod.js

@@ -40,13 +40,17 @@ export function toWrappedMethod(methodName, moduleMethod, methodArguments) {
             throw errors.fieldNotConstant("methodId");
         }
         input.transaction.methodId.assertEquals(thisMethodId, "Runtimemethod called with wrong methodId on the transaction object");
+        const paramTypes = Reflect.getMetadata("design:paramtypes", this, methodName);
+        /**
+         * Use the type info obtained previously to convert
+         * the args passed to fields
+         */
+        const argsFields = args.flatMap((arg, index) => paramTypes[index].toFields(arg));
         // Assert that the argsHash that has been signed matches the given arguments
         // We can use js-if here, because methodArguments is statically sizes
         // 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(methodArguments.flatMap((argument) => argument.toFields()))
-            : Field(0);
+        const argsHash = methodArguments.length > 0 ? Poseidon.hash(argsFields) : Field(0);
         input.transaction.argsHash.assertEquals(argsHash, "argsHash and therefore arguments of transaction and runtime call does not match");
         const transactionHash = input.transaction.hash();
         const networkStateHash = input.networkState.hash();

package/dist/runtime/MethodIdResolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MethodIdResolver.d.ts","sourceRoot":"","sources":["../../src/runtime/MethodIdResolver.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAM/D;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAIzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJ1B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAiC;gBAGzC,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,EACtC,OAAO,EAAE,oBAAoB;IAmBzC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;IAsBnE,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;CAQnE"}
+{"version":3,"file":"MethodIdResolver.d.ts","sourceRoot":"","sources":["../../src/runtime/MethodIdResolver.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAM/D;;;;;;;GAOG;AACH,qBAAa,gBAAgB;IAMzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAN1B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAEpB;gBAGY,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,EACtC,OAAO,EAAE,oBAAoB;IAkBzC,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS;IAcnE,WAAW,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;CAQnE"}

package/dist/runtime/MethodIdResolver.js

@@ -1,4 +1,5 @@
-import { singleFieldToString, stringToField } from "@proto-kit/protocol";
+import { stringToField } from "@proto-kit/protocol";
+import { Poseidon } from "snarkyjs";
 const offset = 128n;
 // eslint-disable-next-line @typescript-eslint/no-magic-numbers
 const modulus = 2n ** (offset - 1n);
@@ -17,34 +18,30 @@ export class MethodIdResolver {
         this.dictionary = {};
         this.dictionary = runtime.runtimeModuleNames.reduce((dict, moduleName) => {
             this.runtime.assertIsValidModuleName(modules, moduleName);
-            dict[(stringToField(moduleName).toBigInt() % modulus).toString()] =
-                moduleName;
             runtime.resolve(moduleName).runtimeMethodNames.forEach((methodName) => {
-                dict[(stringToField(methodName).toBigInt() % modulus).toString()] =
-                    methodName;
+                dict[this.getMethodId(moduleName, methodName).toString()] = {
+                    moduleName,
+                    methodName,
+                };
             });
             return dict;
         }, {});
     }
     getMethodNameFromId(methodId) {
-        const moduleNameHash = singleFieldToString(methodId >> offset);
-        const methodNameHash = singleFieldToString(methodId % modulus);
-        const moduleName = this.dictionary[moduleNameHash];
+        const { moduleName, methodName } = this.dictionary[methodId.toString()];
         // eslint-disable-next-line no-warning-comments
         // TODO Replace by throwing exception?
-        if (moduleName === undefined) {
+        if (moduleName === undefined || methodName === undefined) {
             return undefined;
         }
         this.runtime.assertIsValidModuleName(this.modules, moduleName);
-        const methodName = this.dictionary[methodNameHash];
-        if (methodName === undefined) {
-            return undefined;
-        }
         return [moduleName, methodName];
     }
     getMethodId(moduleName, methodName) {
         this.runtime.assertIsValidModuleName(this.modules, moduleName);
-        return ((stringToField(moduleName).toBigInt() % modulus << offset) +
-            (stringToField(methodName).toBigInt() % modulus));
+        return Poseidon.hash([
+            stringToField(moduleName),
+            stringToField(methodName),
+        ]).toBigInt();
     }
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@proto-kit/module",
   "license": "MIT",
   "private": false,
-  "version": "0.1.1-develop.257+3c175a2",
+  "version": "0.1.1-develop.261+8731dfa",
   "type": "module",
   "scripts": {
     "build": "tsc -p tsconfig.json",
@@ -31,5 +31,5 @@
     "snarkyjs": "0.12.0",
     "tsyringe": "^4.7.0"
   },
-  "gitHead": "3c175a2ca24b9c437dce98f11114942dec306df8"
+  "gitHead": "8731dfa8f5df502eadf6266a7216617737985146"
 }

package/src/method/runtimeMethod.ts

@@ -1,4 +1,4 @@
-import { Field, Poseidon } from "snarkyjs";
+import { Field, FlexibleProvable, Poseidon } from "snarkyjs";
 import { container } from "tsyringe";
 import {
   StateTransition,
@@ -100,16 +100,26 @@ export function toWrappedMethod(
       "Runtimemethod called with wrong methodId on the transaction object"
     );
 
+    const paramTypes: FlexibleProvable<unknown>[] = Reflect.getMetadata(
+      "design:paramtypes",
+      this,
+      methodName
+    );
+
+    /**
+     * Use the type info obtained previously to convert
+     * the args passed to fields
+     */
+    const argsFields = args.flatMap((arg, index) =>
+      paramTypes[index].toFields(arg as any)
+    );
+
     // Assert that the argsHash that has been signed matches the given arguments
     // We can use js-if here, because methodArguments is statically sizes
     // 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(
-            methodArguments.flatMap((argument) => argument.toFields())
-          )
-        : Field(0);
+      methodArguments.length > 0 ? Poseidon.hash(argsFields) : Field(0);
 
     input.transaction.argsHash.assertEquals(
       argsHash,

package/src/runtime/MethodIdResolver.ts

@@ -1,11 +1,8 @@
-import { singleFieldToString, stringToField } from "@proto-kit/protocol";
+import { stringToField } from "@proto-kit/protocol";
+import { Poseidon } from "snarkyjs";
 
 import type { Runtime, RuntimeModulesRecord } from "./Runtime";
 
-const offset = 128n;
-// eslint-disable-next-line @typescript-eslint/no-magic-numbers
-const modulus = 2n ** (offset - 1n);
-
 /**
  * How do we encode MethodIds
  * A MethodId is defined as the following in little-endian
@@ -15,47 +12,40 @@ const modulus = 2n ** (offset - 1n);
  * ]
  */
 export class MethodIdResolver {
-  private readonly dictionary: { [key: string]: string } = {};
+  private readonly dictionary: {
+    [key: string]: { moduleName: string; methodName: string };
+  } = {};
 
   public constructor(
     private readonly runtime: Runtime<RuntimeModulesRecord>,
     private readonly modules: RuntimeModulesRecord
   ) {
-    this.dictionary = runtime.runtimeModuleNames.reduce<Record<string, string>>(
-      (dict, moduleName) => {
-        this.runtime.assertIsValidModuleName(modules, moduleName);
-
-        dict[(stringToField(moduleName).toBigInt() % modulus).toString()] =
-          moduleName;
-
-        runtime.resolve(moduleName).runtimeMethodNames.forEach((methodName) => {
-          dict[(stringToField(methodName).toBigInt() % modulus).toString()] =
-            methodName;
-        });
-        return dict;
-      },
-      {}
-    );
+    this.dictionary = runtime.runtimeModuleNames.reduce<
+      Record<string, { moduleName: string; methodName: string }>
+    >((dict, moduleName) => {
+      this.runtime.assertIsValidModuleName(modules, moduleName);
+
+      runtime.resolve(moduleName).runtimeMethodNames.forEach((methodName) => {
+        dict[this.getMethodId(moduleName, methodName).toString()] = {
+          moduleName,
+          methodName,
+        };
+      });
+
+      return dict;
+    }, {});
   }
 
   public getMethodNameFromId(methodId: bigint): [string, string] | undefined {
-    const moduleNameHash = singleFieldToString(methodId >> offset);
-    const methodNameHash = singleFieldToString(methodId % modulus);
-
-    const moduleName: string | undefined = this.dictionary[moduleNameHash];
+    const { moduleName, methodName } = this.dictionary[methodId.toString()];
 
     // eslint-disable-next-line no-warning-comments
     // TODO Replace by throwing exception?
-    if (moduleName === undefined) {
+    if (moduleName === undefined || methodName === undefined) {
       return undefined;
     }
-    this.runtime.assertIsValidModuleName(this.modules, moduleName);
 
-    const methodName: string | undefined = this.dictionary[methodNameHash];
-
-    if (methodName === undefined) {
-      return undefined;
-    }
+    this.runtime.assertIsValidModuleName(this.modules, moduleName);
 
     return [moduleName, methodName];
   }
@@ -63,9 +53,9 @@ export class MethodIdResolver {
   public getMethodId(moduleName: string, methodName: string): bigint {
     this.runtime.assertIsValidModuleName(this.modules, moduleName);
 
-    return (
-      (stringToField(moduleName).toBigInt() % modulus << offset) +
-      (stringToField(methodName).toBigInt() % modulus)
-    );
+    return Poseidon.hash([
+      stringToField(moduleName),
+      stringToField(methodName),
+    ]).toBigInt();
   }
 }