dappnode · pablomendezroyo · Jan 25, 2024 · Jan 24, 2024 · Jan 25, 2024 · Jan 25, 2024
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       packageName:
-        description: "Package Name (schemas, common, toolkit)"
+        description: "Package Name (schemas, types, toolkit)"
         required: true
       version:
         description: "Version to publish (e.g., 1.0.0)"
@@ -20,7 +20,7 @@ jobs:
 
       - name: Validate package name
         run: |
-          if [[ ${{ github.event.inputs.packageName }} != "schemas" && ${{ github.event.inputs.packageName }} != "common" && ${{ github.event.inputs.packageName }} != "toolkit" ]]; then
+          if [[ ${{ github.event.inputs.packageName }} != "schemas" && ${{ github.event.inputs.packageName }} != "types" && ${{ github.event.inputs.packageName }} != "toolkit" ]]; then
             echo "Error: Invalid package name"
             exit 1
           fi

@@ -21,6 +21,7 @@
     "dev": "nodemon --ignore \"*.json\" -e ts,tsx --watch src/ --exec \"yarn build\""
   },
   "dependencies": {
+    "@dappnode/types": "^0.1.0",
     "@dappnode/common": "^0.1.0",
     "@dappnode/dappmanager": "^0.1.0",
     "@dappnode/eventbus": "^0.1.0",

@@ -1,10 +1,9 @@
 import path from "path";
 import { calls } from "../src/__mock-backend__";
 import { startHttpApi } from "@dappnode/dappmanager/src/api/startHttpApi";
-import { LoggerMiddleware } from "@dappnode/common";
+import { LoggerMiddleware } from "@dappnode/types";
 import { eventBus } from "./eventBus";
 import { AdminPasswordDb } from "@dappnode/dappmanager/src/api/auth/adminPasswordDb";
-import { DeviceCalls } from "@dappnode/dappmanager/src/calls/device/index.js";
 
 const testFileDir = "test_files";
 

@@ -1,4 +1,4 @@
-import { VpnDevice, PackageVersionData } from "@dappnode/common";
+import { VpnDevice, PackageVersionData } from "@dappnode/types";
 import { VpnApiClient } from "@dappnode/dappmanager/src/api/vpnApiClient";
 
 const url = "link-to-otp/?id=617824#hdfuisf";

@@ -1,4 +1,4 @@
-import { AutoUpdateDataView, Routes } from "@dappnode/common";
+import { AutoUpdateDataView, Routes } from "@dappnode/types";
 import { pause } from "./utils/pause";
 
 export const autoUpdate: Pick<

@@ -1,6 +1,6 @@
 import { MockDnp } from "./dnps/types";
 import { mockDnps } from "./dnps";
-import { DirectoryItem, DirectoryItemOk } from "@dappnode/common";
+import { DirectoryItem, DirectoryItemOk } from "@dappnode/types";
 
 function getDirectoryDnp(dnp: MockDnp, index: number): DirectoryItemOk {
   return {

@@ -1,4 +1,4 @@
-import { InstalledPackageDetailData, PackageContainer } from "@dappnode/common";
+import { InstalledPackageDetailData, PackageContainer } from "@dappnode/types";
 import { sampleContainer, sampleDnp } from "./sample";
 import { MockDnp } from "./dnps/types";
 import { mockDnps } from "./dnps";

@@ -4,7 +4,7 @@ import {
   UserSettingsAllDnps,
   SetupWizardAllDnps,
   CompatibleDnps
-} from "@dappnode/common";
+} from "@dappnode/types";
 import { sampleRequestState } from "./sample";
 import { MockDnp } from "./dnps/types";
 import { mockDnps } from "./dnps";

@@ -1,4 +1,4 @@
-import { PortProtocol } from "@dappnode/common";
+import { PortProtocol } from "@dappnode/types";
 import { bitcoin } from "./bitcoin";
 import { MockDnp } from "./types";
 

@@ -1,4 +1,4 @@
-import { PortProtocol } from "@dappnode/common";
+import { PortProtocol } from "@dappnode/types";
 import { MockDnp } from "./types";
 
 const dnpName = "multi-service.dnp.dappnode.eth";

@@ -1,4 +1,4 @@
-import { PortProtocol } from "@dappnode/common";
+import { PortProtocol } from "@dappnode/types";
 import { MockDnp } from "./types";
 
 const dnpName = "open-ethereum.dnp.dappnode.eth";

@@ -3,10 +3,9 @@ import {
   SpecialPermission,
   InstalledPackageDetailData,
   PackageContainer,
-  RequestedDnp,
-  Manifest,
-  SetupWizard
-} from "@dappnode/common";
+  RequestedDnp
+} from "@dappnode/types";
+import { Manifest, SetupWizard } from "@dappnode/types";
 
 export interface MockDnp {
   manifest: Manifest;

@@ -1,4 +1,4 @@
-import { DirectoryItem } from "@dappnode/common";
+import { DirectoryItem } from "@dappnode/types";
 
 // Packages from ENS public.dappnode.eth
 // From block 8905883 to ~ 13000000

@@ -1,4 +1,4 @@
-import { DirectoryItem } from "@dappnode/common";
+import { DirectoryItem } from "@dappnode/types";
 import { mockPublicDnps } from "./publicDnps";
 
 export const registry: DirectoryItem[] = [

@@ -3,7 +3,7 @@ import {
   RequestedDnp,
   InstalledPackageDetailData,
   PackageContainer
-} from "@dappnode/common";
+} from "@dappnode/types";
 
 const dnpName = "test.dnp.dappnode.eth";
 export const sampleRequestState: RequestedDnp = {

@@ -1,4 +1,4 @@
-import { Routes, VpnDevice } from "@dappnode/common";
+import { Routes, VpnDevice } from "@dappnode/types";
 
 const url = "link-to-otp/?id=617824#hdfuisf";
 const password = "SAMPLETEMPPASSWORD";

@@ -1,4 +1,4 @@
-import { CoreUpdateDataAvailable, Routes } from "@dappnode/common";
+import { CoreUpdateDataAvailable, Routes } from "@dappnode/types";
 import { directory, registry, dnpRequests } from "./data";
 
 export const fetchPkgsData: Pick<

@@ -2,7 +2,7 @@ import {
   ExposableServiceInfo,
   HttpsPortalMapping,
   Routes
-} from "@dappnode/common";
+} from "@dappnode/types";
 
 const mappings = new Map<string, HttpsPortalMapping>();
 

@@ -1,4 +1,4 @@
-import { IpfsClientTarget, PortProtocol, Routes } from "@dappnode/common";
+import { IpfsClientTarget, PortProtocol, Routes } from "@dappnode/types";
 import { autoUpdate } from "./autoUpdate";
 import { devices } from "./devices";
 import { fetchPkgsData } from "./fetchPkgsData";

@@ -1,4 +1,4 @@
-import { LocalProxyingStatus, Routes } from "@dappnode/common";
+import { LocalProxyingStatus, Routes } from "@dappnode/types";
 import { pause } from "./utils/pause";
 
 const localProxyingStatusON: LocalProxyingStatus = "running";

@@ -1,4 +1,4 @@
-import { PackageNotificationDb, Routes } from "@dappnode/common";
+import { PackageNotificationDb, Routes } from "@dappnode/types";
 
 export const notifications: Pick<
   Routes,

@@ -1,4 +1,4 @@
-import { InstalledPackageDetailData, Routes } from "@dappnode/common";
+import { InstalledPackageDetailData, Routes } from "@dappnode/types";
 import { dnpInstalled } from "./data";
 import { sampleContainer, sampleDnp } from "./data/sample";
 import { pause } from "./utils/pause";

@@ -1,4 +1,4 @@
-import { Routes } from "@dappnode/common";
+import { Routes } from "@dappnode/types";
 
 let hostPasswordIsSecureState = false;
 

@@ -1,4 +1,4 @@
-import { Routes, TrustedReleaseKey } from "@dappnode/common";
+import { Routes, TrustedReleaseKey } from "@dappnode/types";
 
 const initialTrustedKey: TrustedReleaseKey = {
   name: "DAppNode Association",

@@ -1,4 +1,4 @@
-import { Routes } from "@dappnode/common";
+import { Routes } from "@dappnode/types";
 
 let sshPort = 22;
 let sshStatus: "enabled" | "disabled" = "enabled";

@@ -5,7 +5,7 @@ import {
   Routes,
   Signer,
   Network
-} from "@dappnode/common";
+} from "@dappnode/types";
 
 export const stakerConfig: Pick<
   Routes,

@@ -1,4 +1,4 @@
-import { Routes } from "@dappnode/common";
+import { Routes } from "@dappnode/types";
 
 let isEnabled = false;
 let token: string | null = null;

@@ -1,4 +1,4 @@
-import { Routes, UserActionLog } from "@dappnode/common";
+import { Routes, UserActionLog } from "@dappnode/types";
 
 const userActionLogsState: UserActionLog[] = [];
 

@@ -1,6 +1,6 @@
 import { pause } from "./utils/pause";
 import { dnpInstalled } from "./data";
-import { VolumeData, Routes } from "@dappnode/common";
+import { VolumeData, Routes } from "@dappnode/types";
 
 const volumesState = new Map<string, VolumeData>(
   getInitialVolumes().map(vol => [vol.name, vol])

@@ -1,4 +1,4 @@
-import { Routes } from "@dappnode/common";
+import { Routes } from "@dappnode/types";
 
 export const wifi: Pick<Routes, "wifiCredentialsGet" | "wifiReportGet"> = {
   wifiCredentialsGet: async () => {

@@ -1,4 +1,4 @@
-import { Routes } from "@dappnode/common";
+import { Routes } from "@dappnode/types";
 
 const initialDevices = [
   "dappnode_admin",

@@ -1,5 +1,5 @@
 import filterDirectory from "pages/installer/helpers/filterDirectory";
-import { DirectoryItem } from "@dappnode/common";
+import { DirectoryItem } from "@dappnode/types";
 import { SelectedCategories } from "pages/installer/types";
 
 const sampleDirectoryState: DirectoryItem = {

@@ -3,7 +3,7 @@ import {
   userSettingsToFormData
 } from "pages/installer/parsers/formDataParser";
 import { SetupWizardFormDataReturn } from "pages/installer/types";
-import { UserSettingsAllDnps } from "@dappnode/common";
+import { UserSettingsAllDnps } from "@dappnode/types";
 import deepmerge from "deepmerge";
 import { SetupTargetAllDnps } from "types";
 

@@ -1,4 +1,4 @@
-import { UserSettingsAllDnps } from "@dappnode/common";
+import { UserSettingsAllDnps } from "@dappnode/types";
 import deepmerge from "deepmerge";
 import { difference, isDeepEmpty } from "utils/lodashExtended";
 

@@ -1,4 +1,4 @@
-import { LoginStatusReturn } from "@dappnode/common";
+import { LoginStatusReturn } from "@dappnode/types";
 import {
   apiTestMode,
   apiUrls,

@@ -9,10 +9,9 @@ import {
   SubscriptionsTypes,
   Routes,
   routesData,
-  ResolvedType,
-  parseRpcResponse,
-  subscriptionsFactory
-} from "@dappnode/common";
+  ResolvedType
+} from "@dappnode/types";
+import { parseRpcResponse, subscriptionsFactory } from "@dappnode/common";
 // Internal
 import { mapSubscriptionsToRedux } from "./subscriptions";
 import { initialCallsOnOpen } from "./initialCalls";

@@ -1,5 +1,5 @@
 import { Emitter } from "mitt";
-import { RpcPayload, RpcResponse } from "@dappnode/common";
+import { RpcPayload, RpcResponse } from "@dappnode/types";
 
 export type LoginStatus =
   | { status: "logged-in"; username: string }

@@ -1,4 +1,4 @@
-import { RpcPayload, RpcResponse } from "@dappnode/common";
+import { RpcPayload, RpcResponse } from "@dappnode/types";
 import { calls } from "../../__mock-backend__";
 import { IApiRpc } from "../interface";
 

@@ -1,9 +1,9 @@
 import io, { Socket } from "socket.io-client";
 import { Emitter } from "mitt";
-import { Args, RpcPayload, RpcResponse } from "@dappnode/common";
+import { Args, RpcPayload, RpcResponse } from "@dappnode/types";
 import { IApiRpc } from "./interface";
 import { socketIoUrl } from "params";
-import { subscriptionsData } from "@dappnode/common";
+import { subscriptionsData } from "@dappnode/types";
 
 let socketGlobal: Socket | null = null;
 let apiStarted = false;

@@ -9,7 +9,7 @@ import { updateVolumes, setSystemInfo } from "services/dappnodeStatus/actions";
 import { setDnpInstalled } from "services/dnpInstalled/actions";
 import { updateDnpDirectory } from "services/dnpDirectory/actions";
 import { updateDnpRegistry } from "services/dnpRegistry/actions";
-import { Subscriptions } from "@dappnode/common";
+import { Subscriptions } from "@dappnode/types";
 
 export function mapSubscriptionsToRedux(subscriptions: Subscriptions): void {
   subscriptions.directory.on(directoryDnps => {

@@ -1,5 +1,5 @@
 import { dappmanagerDnpName, coreDnpName } from "params";
-import { Args } from "@dappnode/common";
+import { Args } from "@dappnode/types";
 
 /**
  * Restarting the DAPPMANAGER will cause this error

@@ -12,7 +12,7 @@ import {
   ConsensusClientMainnet,
   executionClientsMainnet,
   consensusClientsMainnet
-} from "@dappnode/common";
+} from "@dappnode/types";
 import { AiFillSafetyCertificate, AiFillClockCircle } from "react-icons/ai";
 import { FaDatabase } from "react-icons/fa";
 import Switch from "./Switch";

@@ -1,6 +1,6 @@
 import React from "react";
 import "./multiClient.scss";
-import { IpfsClientTarget } from "@dappnode/common";
+import { IpfsClientTarget } from "@dappnode/types";
 import Card from "components/Card";
 import { joinCssClass } from "utils/css";
 import Input from "./Input";

@@ -2,7 +2,7 @@ import React from "react";
 import { orderBy, isEmpty } from "lodash-es";
 // Components
 import Input from "components/Input";
-import { UserSettingsAllDnps } from "@dappnode/common";
+import { UserSettingsAllDnps } from "@dappnode/types";
 import { prettyDnpName } from "utils/format";
 import "./editorAdvanced.scss";
 

@@ -1,6 +1,6 @@
 import React from "react";
 // Components
-import { SetupWizardAllDnps } from "@dappnode/common";
+import { SetupWizardAllDnps } from "@dappnode/types";
 import { prettyDnpName } from "utils/format";
 import RenderMarkdown from "components/RenderMarkdown";
 import InputField from "./InputField";

@@ -1,5 +1,5 @@
 import React from "react";
-import { SetupWizardField } from "@dappnode/common";
+import { SetupWizardField } from "@dappnode/types";
 import Input from "components/Input";
 import InputFieldSelect from "./InputFieldSelect";
 import InputFieldFile from "./InputFieldFile";

@@ -9,7 +9,7 @@ import { joinCssClass } from "utils/css";
 import newTabProps from "utils/newTabProps";
 import { troubleShootMountpointsGuideUrl } from "params";
 import "./selectMountpoint.scss";
-import { MountpointData } from "@dappnode/common";
+import { MountpointData } from "@dappnode/types";
 
 function renderMountpointDataSummary({
   mountpoint,

@@ -4,7 +4,7 @@ import { isEqual } from "lodash-es";
 // Components
 import Card from "components/Card";
 import Alert from "react-bootstrap/Alert";
-import { UserSettingsAllDnps, SetupWizardAllDnps } from "@dappnode/common";
+import { UserSettingsAllDnps, SetupWizardAllDnps } from "@dappnode/types";
 import { prettyDnpName } from "utils/format";
 import { EditorAdvanced } from "./EditorAdvanced";
 import { EditorV2 } from "./EditorV2";

@@ -13,7 +13,7 @@ import RepositoryFallback from "./features/RepositoryFallback";
 import EnableEthicalMetrics from "./features/EnableEthicalMetrics";
 // Utils
 import { isEqual } from "lodash-es";
-import { NewFeatureId } from "@dappnode/common";
+import { NewFeatureId } from "@dappnode/types";
 // styles
 import "./welcome.scss";
 

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react";
 import { useSelector } from "react-redux";
 import { EthMultiClientsAndFallback } from "components/EthMultiClient";
-import { EthClientFallback, Eth2ClientTarget } from "@dappnode/common";
+import { EthClientFallback, Eth2ClientTarget } from "@dappnode/types";
 import { getEthClientTarget } from "services/dappnodeStatus/selectors";
 import BottomButtons from "../BottomButtons";
 import { api } from "api";

@@ -3,7 +3,7 @@ import {
   fallbackToBoolean,
   booleanToFallback
 } from "components/EthMultiClient";
-import { EthClientFallback } from "@dappnode/common";
+import { EthClientFallback } from "@dappnode/types";
 import BottomButtons from "../BottomButtons";
 import { api } from "api";
 import Alert from "react-bootstrap/Alert";
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import { @@
       Routes,
       Signer,
       Network
-    } from "@dappnode/common";
+    } from "@dappnode/types";
     export const stakerConfig: Pick<
       Routes,
@@ Expand Down @@