Merge branch 'fix/uint-3' into fix/test-cleanup-mar-23

Author: rpanic

packages/api/src/graphql/modules/QueryGraphqlModule.ts

@@ -48,6 +48,7 @@ import {
   log,
   ModuleContainer,
   ModulesRecord,
+  NonMethods,
   range,
 } from "@proto-kit/common";
 import { ObjMap } from "graphql/jsutils/ObjMap";
@@ -61,11 +62,6 @@ interface ProvableExtension<T, TJson = any> {
   fromJSON: (x: TJson) => T;
 }
 
-type NonMethodKeys<Type> = {
-  [Key in keyof Type]: Type[Key] extends Function ? never : Key;
-}[keyof Type];
-type NonMethods<Type> = Pick<Type, NonMethodKeys<Type>>;
-
 interface AnyJson {
   [key: string]: any;
 }

packages/common/src/utils.ts

@@ -86,12 +86,20 @@ export function prefixToField(prefix: string): Field {
 }
 
 export function hashWithPrefix(prefix: string, input: Field[]) {
-  const salt = Poseidon.update([Field(0), Field(0), Field(0)], [prefixToField(prefix)])
-  return Poseidon.update(salt as [Field, Field, Field], input)[0]
+  const salt = Poseidon.update(
+    [Field(0), Field(0), Field(0)],
+    [prefixToField(prefix)]
+  );
+  return Poseidon.update(salt as [Field, Field, Field], input)[0];
 }
 
 // end copy
 
 export function expectDefined<T>(value: T | undefined): asserts value is T {
   expect(value).toBeDefined();
-}
+}
+
+type NonMethodKeys<Type> = {
+  [Key in keyof Type]: Type[Key] extends Function ? never : Key;
+}[keyof Type];
+export type NonMethods<Type> = Pick<Type, NonMethodKeys<Type>>;

packages/library/src/hooks/TransactionFeeHook.ts

@@ -102,7 +102,7 @@ export class TransactionFeeHook extends ProvableTransactionHook<TransactionFeeHo
       new TokenId(this.config.tokenId),
       from.value,
       PublicKey.fromBase58(this.config.feeRecipient),
-      Balance.from(fee.value)
+      Balance.Unsafe.fromField(fee.value)
     );
   }
 
@@ -136,12 +136,12 @@ export class TransactionFeeHook extends ProvableTransactionHook<TransactionFeeHo
       errors.invalidFeeConfigMethodId()
     );
 
-    const fee = UInt64.from(feeConfig.baseFee.value).add(
-      UInt64.from(feeConfig.weight.value).mul(
-        UInt64.from(feeConfig.perWeightUnitFee.value)
+    const fee = UInt64.Unsafe.fromField(feeConfig.baseFee.value).add(
+      UInt64.Unsafe.fromField(feeConfig.weight.value).mul(
+        UInt64.Unsafe.fromField(feeConfig.perWeightUnitFee.value)
       )
     );
 
-    this.transferFee(executionData.transaction.sender, UInt64.from(fee.value));
+    this.transferFee(executionData.transaction.sender, UInt64.Unsafe.fromField(fee.value));
   }
 }

packages/library/src/index.ts

@@ -3,7 +3,6 @@ export * from "./math/UInt32";
 export * from "./math/UInt64";
 export * from "./math/UInt112";
 export * from "./math/UInt224";
-export * from "./math/PrecisionHelper";
 export * from "./protocol/VanillaProtocolModules";
 export * from "./runtime/Balances";
 export * from "./runtime/VanillaRuntimeModules";

packages/library/src/math/PrecisionHelper.ts

@@ -0,0 +1,27 @@
+import { UInt } from "./UInt";
+
+type AvailableBitLengths = 32 | 64 | 112 | 224;
+
+type NextLowest<Input extends AvailableBitLengths> = Input extends 224
+  ? 112
+  : Input extends 112
+  ? 64
+  : Input extends 64
+  ? 32
+  : never;
+
+type RecursiveSmaller<Input extends AvailableBitLengths> =
+  | Input
+  | (NextLowest<Input> extends never
+      ? never
+      : RecursiveSmaller<NextLowest<Input>>);
+
+/**
+ * Type to determine all possible bitlengths of UInts that would fit into
+ * a given bitlength without doing additional rangechecks.
+ * I.e. FittingUInt<112> = UIntX<32 | 64 | 112>
+ */
+export type FittingUInt<Input extends number> =
+  Input extends AvailableBitLengths
+    ? UInt<RecursiveSmaller<Input>>
+    : UInt<Input>;