From 1ae0327fd0233d4c9ec8404b521f316a018b6152 Mon Sep 17 00:00:00 2001 From: Turadg Aleahmad Date: Mon, 10 Jun 2024 16:12:17 -0700 Subject: [PATCH] chore: pare CosmosChainInfo to essentials --- packages/orchestration/src/chain-info.js | 20 -------------------- packages/orchestration/src/cosmos-api.ts | 4 ---- packages/orchestration/src/facade.js | 5 ----- packages/orchestration/src/typeGuards.js | 5 ----- packages/orchestration/src/utils/chainHub.js | 13 +++++++++---- 5 files changed, 9 insertions(+), 38 deletions(-) diff --git a/packages/orchestration/src/chain-info.js b/packages/orchestration/src/chain-info.js index 46347636c2cb..97bc3eb2f641 100644 --- a/packages/orchestration/src/chain-info.js +++ b/packages/orchestration/src/chain-info.js @@ -15,42 +15,22 @@ export const wellKnownChainInfo = harden({ agoric: { chainId: 'agoriclocal', - ibcHooksEnabled: true, - icaEnabled: true, - icqEnabled: true, - pfmEnabled: true, }, // https://github.com/cosmos/chain-registry/blob/master/stride/chain.json stride: { chainId: 'stride-1', - icaEnabled: true, - icqEnabled: true, - pfmEnabled: true, - ibcHooksEnabled: true, stakingTokens: [{ denom: 'ustride' }], }, cosmos: { chainId: 'cosmoslocal', - icaEnabled: true, - icqEnabled: true, - pfmEnabled: true, - ibcHooksEnabled: true, stakingTokens: [{ denom: 'uatom' }], }, celestia: { chainId: 'celestia', - icaEnabled: true, - icqEnabled: true, - pfmEnabled: true, - ibcHooksEnabled: true, stakingTokens: [{ denom: 'utia' }], }, osmosis: { chainId: 'osmosislocal', - icaEnabled: true, - icqEnabled: true, - pfmEnabled: true, - ibcHooksEnabled: true, stakingTokens: [{ denom: 'uosmo' }], }, }) diff --git a/packages/orchestration/src/cosmos-api.ts b/packages/orchestration/src/cosmos-api.ts index e0023c67974d..4461de32a009 100644 --- a/packages/orchestration/src/cosmos-api.ts +++ b/packages/orchestration/src/cosmos-api.ts @@ -67,10 +67,6 @@ export type IBCConnectionInfo = { */ export type CosmosChainInfo = { chainId: string; - icaEnabled: boolean; - icqEnabled: boolean; - pfmEnabled: boolean; - ibcHooksEnabled: boolean; /** * cf https://github.com/cosmos/chain-registry/blob/master/chain.schema.json#L117 diff --git a/packages/orchestration/src/facade.js b/packages/orchestration/src/facade.js index 7ea851128c65..25c5b75074d3 100644 --- a/packages/orchestration/src/facade.js +++ b/packages/orchestration/src/facade.js @@ -20,11 +20,6 @@ const anyVal = null; const mockLocalChainInfo = { allegedName: 'agoric', chainId: 'agoriclocal', - connections: anyVal, - ibcHooksEnabled: true, - icaEnabled: true, - icqEnabled: true, - pfmEnabled: true, }; /** diff --git a/packages/orchestration/src/typeGuards.js b/packages/orchestration/src/typeGuards.js index d55a60230a93..0dcd3774f218 100644 --- a/packages/orchestration/src/typeGuards.js +++ b/packages/orchestration/src/typeGuards.js @@ -75,13 +75,8 @@ export const IBCConnectionInfoShape = M.splitRecord({ export const CosmosChainInfoShape = M.splitRecord( { chainId: M.string(), - connections: M.record(), }, { stakingTokens: M.arrayOf({ denom: M.string() }), - icaEnabled: M.boolean(), - icqEnabled: M.boolean(), - pfmEnabled: M.boolean(), - ibcHooksEnabled: M.boolean(), }, ); diff --git a/packages/orchestration/src/utils/chainHub.js b/packages/orchestration/src/utils/chainHub.js index fda7a005254d..cf20131f007a 100644 --- a/packages/orchestration/src/utils/chainHub.js +++ b/packages/orchestration/src/utils/chainHub.js @@ -117,8 +117,15 @@ export const makeChainHub = (agoricNames, zone = makeHeapZone()) => { * @param {ERef} agoricNamesAdmin * @param {string} name * @param {CosmosChainInfo} chainInfo + * @param {any} connections */ -export const registerChain = async (agoricNamesAdmin, name, chainInfo) => { +export const registerChain = async ( + agoricNamesAdmin, + name, + chainInfo, + // FIXME get real data + connections = [], +) => { const { nameAdmin } = await E(agoricNamesAdmin).provideChild('chain'); const { nameAdmin: connAdmin } = await E(agoricNamesAdmin).provideChild('chainConnection'); @@ -127,9 +134,7 @@ export const registerChain = async (agoricNamesAdmin, name, chainInfo) => { // XXX chainInfo.connections is redundant here. await E(nameAdmin).update(name, chainInfo); - for await (const [destChainId, connInfo] of Object.entries( - chainInfo.connections, - )) { + for await (const [destChainId, connInfo] of Object.entries(connections)) { const key = connectionKey(chainInfo.chainId, destChainId); await E(connAdmin).update(key, connInfo); }