Merge branch 'develop'

Author: pablomendezroyo

packages/admin-ui/package.json

@@ -24,7 +24,7 @@
     "@dappnode/common": "^0.1.0",
     "@dappnode/dappmanager": "^0.1.0",
     "@dappnode/eventbus": "^0.1.0",
-    "@dappnode/types": "^0.1.28",
+    "@dappnode/types": "^0.1.29",
     "@reduxjs/toolkit": "^1.3.5",
     "@types/clipboard": "^2.0.7",
     "@types/node": "^18.11.18",

packages/admin-ui/src/__mock-backend__/index.ts

@@ -283,7 +283,7 @@ export const otherCalls: Omit<Routes, keyof typeof namedSpacedCalls> = {
         isSelected: true,
         enableHistorical: true
       },
-      /*{
+      {
         status: "ok",
         dnpName: "op-erigon.dnp.dappnode.eth",
         avatarUrl: "",
@@ -310,7 +310,7 @@ export const otherCalls: Omit<Routes, keyof typeof namedSpacedCalls> = {
         },
         isSelected: false,
         enableHistorical: false
-      }*/
+      }
     ],
     rollup: {
       status: "ok",

packages/common/package.json

@@ -19,7 +19,7 @@
     "lint": "eslint . --ext .ts --fix src"
   },
   "dependencies": {
-    "@dappnode/types": "^0.1.28",
+    "@dappnode/types": "^0.1.29",
     "@types/node": "^18.11.18",
     "lodash-es": "^4.17.21"
   },

packages/dappmanager/package.json

@@ -27,7 +27,7 @@
     "@dappnode/params": "^0.1.0",
     "@dappnode/schemas": "^0.1.7",
     "@dappnode/toolkit": "^0.1.19",
-    "@dappnode/types": "^0.1.28",
+    "@dappnode/types": "^0.1.29",
     "@dappnode/utils": "^0.1.0",
     "@ipld/car": "^3.1.16",
     "@types/async": "^3.0.1",

packages/dappmanager/src/modules/optimism/getOptimismConfig.ts

@@ -14,7 +14,7 @@ import {
   getIsUpdated
 } from "../../calls/fetchDnpRequest.js";
 import { fileToGatewayUrl } from "../../utils/distributedFile.js";
-import { getOptimismNodeRpcUrl } from "./getOptimismNodeRpcUrl.js";
+import { getOptimismNodeRpcUrlIfExists } from "./getOptimismNodeRpcUrlIfExists.js";
 
 export async function getOptimismConfig(): Promise<OptimismConfigGet> {
   try {
@@ -61,7 +61,7 @@ export async function getOptimismConfig(): Promise<OptimismConfigGet> {
               throw Error(`Repository ${optimismNode} does not exist`);
 
             const pkgData = await getPkgData(releaseFetcher, optimismNode);
-            const mainnetRpcUrl = getOptimismNodeRpcUrl();
+            const mainnetRpcUrl = getOptimismNodeRpcUrlIfExists();
             const isRunning = getIsRunning(pkgData, dnpList);
             resolve({
               status: "ok",

…odules/optimism/getOptimismNodeRpcUrl.ts …ptimism/getOptimismNodeRpcUrlIfExists.tspackages/dappmanager/src/modules/optimism/getOptimismNodeRpcUrl.ts renamed to packages/dappmanager/src/modules/optimism/getOptimismNodeRpcUrlIfExists.ts packages/dappmanager/src/modules/optimism/getOptimismNodeRpcUrl.ts renamed to packages/dappmanager/src/modules/optimism/getOptimismNodeRpcUrlIfExists.ts

@@ -2,11 +2,11 @@ import { optimismNode } from "@dappnode/types";
 import { ComposeFileEditor } from "../compose/editor.js";
 import { opNodeRpcUrlEnvName, opNodeServiceName } from "./params.js";
 
-export function getOptimismNodeRpcUrl(): string {
-  const userSettings = new ComposeFileEditor(
+export function getOptimismNodeRpcUrlIfExists(): string {
+  const userSettings = ComposeFileEditor.getUserSettingsIfExist(
     optimismNode,
     false
-  ).getUserSettings();
+  );
   return userSettings.environment
     ? userSettings.environment[opNodeServiceName][opNodeRpcUrlEnvName]
     : "";

packages/dappmanager/src/modules/optimism/params.ts

@@ -8,5 +8,5 @@ export const historicalRpcUrl = "http://op-l2geth.dappnode:8545";
 
 export const opClientToServiceMap: Record<ExecutionClientOptimism, string> = {
     "op-geth.dnp.dappnode.eth": "geth",
-    //"op-erigon.dnp.dappnode.eth": "erigon"
+    "op-erigon.dnp.dappnode.eth": "erigon"
 };

packages/eventBus/package.json

@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@dappnode/params": "^0.1.0",
-    "@dappnode/types": "^0.1.28",
+    "@dappnode/types": "^0.1.29",
     "lodash-es": "^4.17.21"
   },
   "devDependencies": {

packages/utils/package.json

@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@dappnode/params": "^0.1.0",
-    "@dappnode/types": "^0.1.28",
+    "@dappnode/types": "^0.1.29",
     "lodash-es": "^4.17.21"
   },
   "devDependencies": {

yarn.lock

@@ -1344,10 +1344,10 @@
   resolved "https://registry.yarnpkg.com/@dappnode/types/-/types-0.1.23.tgz#e349661f40402b31fa3cd8651f16aed0ca927a79"
   integrity sha512-24O6fVfKqQHuHOgaNHvA7sbEZzYjCWxyIpFXaxnJxl4da6NRAEd+wZgzNzRQsqC5lLIQkNEc4uS+V+utgSGJuw==
 
-"@dappnode/types@^0.1.28":
-  version "0.1.28"
-  resolved "https://registry.yarnpkg.com/@dappnode/types/-/types-0.1.28.tgz#46a2e1531789701b292e7deb1ae13b6c70e0f45b"
-  integrity sha512-bN1IpOeujGxtNWJhdSCa4FWUuuO7a1QXF9m4BJfAuUHjnftT5LDRanejHXqwE0VmbcJ4k4TwrYaWpr0m+KjNJw==
+"@dappnode/types@^0.1.29":
+  version "0.1.29"
+  resolved "https://registry.yarnpkg.com/@dappnode/types/-/types-0.1.29.tgz#832675d0463abe3299ff8e59feb199f7cab0c292"
+  integrity sha512-zjv75AuBJePI9cI7kh/+3FgTSDTGvkQcPy60jzhbe9N0JoFX7iYtVCxc0Kqfh11BP4ecFXAJBrjXnVAt6VaLDg==
 
 "@emotion/is-prop-valid@^0.8.1":
   version "0.8.8"