Devnet integration 6

packages/api/package.json

@@ -49,7 +49,7 @@
     "@proto-kit/module": "*",
     "@proto-kit/protocol": "*",
     "@proto-kit/sequencer": "*",
-    "o1js": "2.10.0-dev.6d3a3",
+    "o1js": "2.14.0-dev.e1080",
     "tsyringe": "^4.10.0"
   },
   "devDependencies": {

packages/api/src/metrics/OpenTelemetryServer.ts

@@ -1,8 +1,4 @@
-import {
-  Sequencer,
-  SequencerModule,
-  sequencerModule,
-} from "@proto-kit/sequencer";
+import { SequencerModule, sequencerModule } from "@proto-kit/sequencer";
 import { NodeSDK } from "@opentelemetry/sdk-node";
 import { Resource } from "@opentelemetry/resources";
 import {

packages/cli/package.json

@@ -41,7 +41,7 @@
     "@proto-kit/sequencer": "*",
     "@proto-kit/stack": "*",
     "@proto-kit/indexer": "*",
-    "o1js": "2.10.0-dev.6d3a3",
+    "o1js": "2.14.0-dev.e1080",
     "tsyringe": "^4.10.0"
   },
   "devDependencies": {

packages/common/package.json

@@ -26,7 +26,7 @@
     "typescript-memoize": "^1.1.1"
   },
   "peerDependencies": {
-    "o1js": "2.10.0-dev.6d3a3",
+    "o1js": "2.14.0-dev.e1080",
     "tsyringe": "^4.10.0"
   },
   "devDependencies": {

packages/common/src/utils.ts

@@ -8,6 +8,7 @@ import {
 import _ from "lodash";
 
 import { TypedClass } from "./types";
+import { log } from "./log";
 
 export function requireTrue(
   condition: boolean,
@@ -318,3 +319,35 @@ export function takeFirst<T>(arr: T[]): T {
   }
   return arr[0];
 }
+
+export async function tryNTimes<T>(
+  f: () => Promise<T>,
+  times: number,
+  delay?: number
+) {
+  let lastError;
+
+  for (let i = 0; i < times; i++) {
+    try {
+      // eslint-disable-next-line no-await-in-loop
+      return await f();
+    } catch (e: unknown) {
+      lastError = e;
+      log.warn(`Attempt ${i + 1} failed. Retrying...`);
+
+      if (delay !== undefined) {
+        // eslint-disable-next-line no-await-in-loop
+        await sleep(delay);
+      }
+    }
+  }
+
+  if (lastError instanceof Error) {
+    lastError.message = `Function failed after ${times} tries. Last error: ${lastError.message}`;
+    throw lastError;
+  } else {
+    throw new Error(
+      `Function failed after ${times} tries. Last error: ${lastError}`
+    );
+  }
+}

packages/common/src/zkProgrammable/FeatureFlagsExtension.ts

@@ -1,7 +1,10 @@
 import { FeatureFlags } from "o1js";
 
 function combineFeatureFlag(a: boolean | undefined, b: boolean | undefined) {
-  if (a === true || b === true) {
+  // If both are true => true
+  // If one or both are undefined (maybe) => maybe
+  // If both are none => none
+  if (a === true && b === true) {
     return true;
   } else if (a === undefined || b === undefined) {
     return undefined;