From b6e6e3bf5dc12238b4fe8efcbec9bab2175b25eb Mon Sep 17 00:00:00 2001 From: Alec Savvy Date: Wed, 12 Mar 2025 10:58:36 -0600 Subject: [PATCH] adjust relay to work in non dev without acdc --- .../pedalboard/apps/relay/src/config/config.ts | 6 ++++++ .../plugins/pedalboard/apps/relay/src/index.ts | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/config/config.ts b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/config/config.ts index d8ef0bc72a3..0a8ea1b1a69 100644 --- a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/config/config.ts +++ b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/config/config.ts @@ -43,6 +43,12 @@ const defaultCoreEndpoint = (env: string): string => { return 'http://core:50051' } +export const chainId = (config: Config): string => { + if (config.environment == "stage") return "1056801" + if (config.environment == "dev") return "1337" + return "31524" +} + export const readConfig = (): Config => { if (config !== null) { return config diff --git a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/index.ts b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/index.ts index 345de68d5ca..36c67192c2b 100644 --- a/packages/discovery-provider/plugins/pedalboard/apps/relay/src/index.ts +++ b/packages/discovery-provider/plugins/pedalboard/apps/relay/src/index.ts @@ -1,4 +1,4 @@ -import { Config, readConfig } from './config/config' +import { chainId, Config, readConfig } from './config/config' import { ethers, providers } from 'ethers' import { WalletManager } from './walletManager' import { logger } from './logger' @@ -26,16 +26,17 @@ export let web3: providers.JsonRpcProvider export let wallets: WalletManager const main = async () => { - if (config.environment !== "dev") { + try { // async config const connectedWeb3 = await connectWeb3(config) web3 = connectedWeb3.web3 config.acdcChainId = connectedWeb3.chainId.toString() wallets = new WalletManager(web3) - } else { - // needs to stay so decoding can happen correctly - config.acdcChainId = "1337" + } catch (e) { + logger.warn("web3 not configured for relay, acdc not reachable") } + // needs to stay so decoding can happen correctly + config.acdcChainId = chainId(config) // start webserver after async config const { serverHost, serverPort } = config