diff --git a/build/avatar.png b/build/avatar.png index 60a9106..dfc8041 100644 Binary files a/build/avatar.png and b/build/avatar.png differ diff --git a/build/docker-compose-gnosis.yml b/build/docker-compose-gnosis.yml index 0e3d82d..4de52e9 100644 --- a/build/docker-compose-gnosis.yml +++ b/build/docker-compose-gnosis.yml @@ -1,11 +1,11 @@ version: '3.4' services: lighthouse-gnosis.avado.dnp.dappnode.eth: - image: 'lighthouse-gnosis.avado.dnp.dappnode.eth:0.0.1' + image: 'lighthouse-gnosis.avado.dnp.dappnode.eth:0.0.2' build: context: ./build args: - VERSION: v4.6.0 + VERSION: v5.0.0 NETWORK: gnosis volumes: - 'data:/data' diff --git a/build/docker-compose-holesky.yml b/build/docker-compose-holesky.yml index eec1396..64bfe72 100644 --- a/build/docker-compose-holesky.yml +++ b/build/docker-compose-holesky.yml @@ -1,11 +1,11 @@ version: '3.4' services: lighthouse-holesky.avado.dnp.dappnode.eth: - image: 'lighthouse-holesky.avado.dnp.dappnode.eth:0.0.1' + image: 'lighthouse-holesky.avado.dnp.dappnode.eth:0.0.3' build: context: ./build args: - VERSION: v4.6.0 + VERSION: v5.0.0 NETWORK: holesky volumes: - 'data:/data' diff --git a/build/docker-compose-prater.yml b/build/docker-compose-prater.yml index 7f47c5d..3a28cb3 100644 --- a/build/docker-compose-prater.yml +++ b/build/docker-compose-prater.yml @@ -5,7 +5,7 @@ services: build: context: ./build args: - VERSION: v4.6.0 + VERSION: v5.0.0 NETWORK: prater volumes: - 'data:/data' diff --git a/build/docker-compose.yml b/build/docker-compose.yml index adb21cb..4de52e9 100644 --- a/build/docker-compose.yml +++ b/build/docker-compose.yml @@ -1,12 +1,12 @@ version: '3.4' services: - lighthouse-holesky.avado.dnp.dappnode.eth: - image: 'lighthouse-holesky.avado.dnp.dappnode.eth:0.0.2' + lighthouse-gnosis.avado.dnp.dappnode.eth: + image: 'lighthouse-gnosis.avado.dnp.dappnode.eth:0.0.2' build: context: ./build args: - VERSION: v4.6.0 - NETWORK: holesky + VERSION: v5.0.0 + NETWORK: gnosis volumes: - 'data:/data' environment: diff --git a/build/server/server.ts b/build/server/server.ts index 209ddde..314c51a 100644 --- a/build/server/server.ts +++ b/build/server/server.ts @@ -3,9 +3,36 @@ import { Status } from "https://deno.land/x/oak_commons@0.5.0/status.ts"; import { oakCors } from "https://deno.land/x/cors/mod.ts"; import { server_config } from "./server_config.ts"; -import { defaultsettings, read_settings, write_settings } from "./settings.ts"; import { SupervisorCtl } from "./supervisorctl.ts"; +import defaultsettings_gnosis from "./settings/defaultsettings-gnosis.json" with { type: "json" }; +import defaultsettings_holesky from "./settings/defaultsettings-holesky.json" with { type: "json" }; +import defaultsettings_mainnet from "./settings/defaultsettings-mainnet.json" with { type: "json" }; +import defaultsettings_prater from "./settings/defaultsettings-prater.json" with { type: "json" }; + +const settings_file_path = '/data/settings.json'; + +export const defaultsettings = () => { + switch (server_config.network) { + case "gnosis": return defaultsettings_gnosis; + case "holesky": return defaultsettings_holesky; + case "prater": return defaultsettings_prater; + default: return defaultsettings_mainnet; + } +}; + +export const read_settings = async () => { + const text = await Deno.readTextFile(settings_file_path); + return JSON.parse(text); +} + +export const write_settings = async (settings: any) => { + console.log(settings); + console.dir(settings); + const text = JSON.stringify(settings, null, 4); + await Deno.writeTextFile(settings_file_path, text); +} + const router = new Router(); router.get('/ping', (context) => { diff --git a/build/server/server_config.json b/build/server/server_config.json index d051bdf..25f2bd5 100644 --- a/build/server/server_config.json +++ b/build/server/server_config.json @@ -1,8 +1,8 @@ { - "network": "holesky", + "network": "gnosis", "name": "lighthouse", "supervisord_programs": [ "lighthouse-bn", "lighthouse-vc" ] -} \ No newline at end of file +} diff --git a/build/server/settings.ts b/build/server/settings.ts deleted file mode 100644 index 3c149fb..0000000 --- a/build/server/settings.ts +++ /dev/null @@ -1,29 +0,0 @@ -import defaultsettings_gnosis from "./settings/defaultsettings-gnosis.json" with { type: "json" }; -import defaultsettings_holesky from "./settings/defaultsettings-holesky.json" with { type: "json" }; -import defaultsettings_mainnet from "./settings/defaultsettings-mainnet.json" with { type: "json" }; -import defaultsettings_prater from "./settings/defaultsettings-prater.json" with { type: "json" }; - -import { server_config } from "./server_config.ts"; - -const settings_file_path = '/data/settings.json'; - -export const defaultsettings = () => { - switch (server_config.network) { - case "gnosis": return defaultsettings_gnosis; - case "holesky": return defaultsettings_holesky; - case "prater": return defaultsettings_prater; - default: return defaultsettings_mainnet; - } -}; - -export const read_settings = async () => { - const text = await Deno.readTextFile(settings_file_path); - return JSON.parse(text); -} - -export const write_settings = async (settings: any) => { - console.log(settings); - console.dir(settings); - const text = JSON.stringify(settings, null, 4); - await Deno.writeTextFile(settings_file_path, text); -} \ No newline at end of file diff --git a/build/wizard/src/server_config.json b/build/wizard/src/server_config.json index 26f6377..503786c 100644 --- a/build/wizard/src/server_config.json +++ b/build/wizard/src/server_config.json @@ -1,4 +1,4 @@ { - "network": "holesky", + "network": "gnosis", "name": "lighthouse" } diff --git a/dappnode_package-gnosis.json b/dappnode_package-gnosis.json index c819eb3..b8e0a90 100644 --- a/dappnode_package-gnosis.json +++ b/dappnode_package-gnosis.json @@ -1,7 +1,7 @@ { "name": "lighthouse-gnosis.avado.dnp.dappnode.eth", - "version": "0.0.1", - "upstream": "v4.6.0", + "version": "0.0.2", + "upstream": "v5.0.0", "title": "Lighthouse-Gnosis", "description": "An open-source Ethereum consensus client, written in Rust and maintained by Sigma Prime.", "avatar": "/ipfs/QmXimBvXWsL8xzuNoift9ygFdCHAMoj2e8vDeeMbgpX8gC", diff --git a/dappnode_package-holesky.json b/dappnode_package-holesky.json index dbdb6ad..4679aff 100644 --- a/dappnode_package-holesky.json +++ b/dappnode_package-holesky.json @@ -1,7 +1,7 @@ { "name": "lighthouse-holesky.avado.dnp.dappnode.eth", - "version": "0.0.1", - "upstream": "v4.6.0", + "version": "0.0.3", + "upstream": "v5.0.0", "title": "Lighthouse Holesky Testnet", "description": "An open-source Ethereum consensus client, written in Rust and maintained by Sigma Prime.", "avatar": "/ipfs/QmTfWJzXCZF9x9sWkok55JMci9mBBfQambku8bvh6Lnwrh", diff --git a/dappnode_package-prater.json b/dappnode_package-prater.json index 34960dd..66b9586 100644 --- a/dappnode_package-prater.json +++ b/dappnode_package-prater.json @@ -1,7 +1,7 @@ { "name": "lighthouse-prater.avado.dnp.dappnode.eth", "version": "0.0.1", - "upstream": "v4.6.0", + "upstream": "v5.0.0", "title": "Lighthouse Goerli/Prater Testnet", "description": "An open-source Ethereum consensus client, written in Rust and maintained by Sigma Prime.", "avatar": "/ipfs/QmNkSDpE6ZspaSamcrnsKnvmR3bbQeWQWTUjcbKwUm4AiT", diff --git a/dappnode_package.json b/dappnode_package.json index ef6a2bf..b8e0a90 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -1,10 +1,10 @@ { - "name": "lighthouse-holesky.avado.dnp.dappnode.eth", + "name": "lighthouse-gnosis.avado.dnp.dappnode.eth", "version": "0.0.2", - "upstream": "v4.6.0", - "title": "Lighthouse Holesky Testnet", + "upstream": "v5.0.0", + "title": "Lighthouse-Gnosis", "description": "An open-source Ethereum consensus client, written in Rust and maintained by Sigma Prime.", - "avatar": "/ipfs/QmTfWJzXCZF9x9sWkok55JMci9mBBfQambku8bvh6Lnwrh", + "avatar": "/ipfs/QmXimBvXWsL8xzuNoift9ygFdCHAMoj2e8vDeeMbgpX8gC", "type": "service", "autoupdate": true, "image": { @@ -12,8 +12,8 @@ "data:/data" ], "ports": [ - "9003:9003/udp", - "9003:9003" + "9011:9011/udp", + "9011:9011" ], "environment": [ "EXTRA_OPTS_BEACON_NODE=", @@ -26,12 +26,12 @@ "dependencies": {}, "ui": { "OnboardingWizard": { - "url": "http://lighthouse-holesky.my.ava.do", + "url": "http://lighthouse-gnosis.my.ava.do", "external": true } }, "links": { - "OnboardingWizard": "http://lighthouse-holesky.my.ava.do", + "OnboardingWizard": "http://lighthouse-gnosis.my.ava.do", "HomePage": "https://lighthouse-book.sigmaprime.io/" } } \ No newline at end of file