Skip to content

fix(cosmwasm,coordinator): coordinator v2 api #1060

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 3, 2025
Merged

fix(cosmwasm,coordinator): coordinator v2 api #1060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5b2e020
refactoring: treat ConfigManager as FullConfig to enable full API
kulikthebird Sep 30, 2025
2423ca4
fix: chain instantiate message creating
kulikthebird Sep 30, 2025
aae8756
Merge branch 'main' into fix/coordinator_v2_api
kulikthebird Sep 30, 2025
1c54616
fix: bugbot detected bugs
kulikthebird Sep 30, 2025
d4c6f58
fix: bugbot fixes
kulikthebird Sep 30, 2025
a7f880a
chore: update after review
kulikthebird Oct 1, 2025
ed79c7a
fix: check for chain specific config existence
kulikthebird Oct 1, 2025
1c0eba4
fix: cursor found a missing function
kulikthebird Oct 1, 2025
63fbfc5
fix: chain config validation
kulikthebird Oct 1, 2025
fa6ecf7
Merge branch 'main' into fix/coordinator_v2_api
kulikthebird Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 78 additions & 31 deletions common/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@ import { GasPrice, StdFee, calculateFee } from '@cosmjs/stargate';
import { loadConfig, printWarn, saveConfig } from './utils';

export interface FullConfig {
axelar: {
contracts: Record<string, AxelarContractConfig>;
rpc: string;
gasPrice: string;
gasLimit: string | number;
govProposalInstantiateAddresses: string[];
govProposalDepositAmount: string;
};
axelar: AxelarConfig;
chains: Record<string, ChainConfig>;
}

export interface AxelarConfig {
contracts: Record<string, AxelarContractConfig>;
rpc: string;
gasPrice: string;
gasLimit: string | number;
govProposalInstantiateAddresses: string[];
govProposalDepositAmount: string;
chainId: string;
}

export interface NonEVMChainConfig {
name: string;
axelarId: string;
Expand Down Expand Up @@ -54,23 +57,26 @@ export interface AxelarContractConfig extends ContractConfig {
[chainName: string]: unknown;
}

export class ConfigManager {
export class ConfigManager implements FullConfig {
private environment: string;
private fullConfig: FullConfig;

public axelar: AxelarConfig;
public chains: Record<string, ChainConfig>;

constructor(environment: string, fullConfig?: FullConfig) {
this.environment = environment;

if (fullConfig) {
this.fullConfig = fullConfig;
} else {
if (!fullConfig) {
const loadedConfig = loadConfig(this.environment);
if (!loadedConfig) {
throw new Error(`Failed to load configuration for environment: ${this.environment}`);
}
this.fullConfig = loadedConfig;
fullConfig = loadedConfig;
}

this.axelar = fullConfig.axelar;
this.chains = fullConfig.chains;

this.validateConfig();
}

Expand All @@ -84,7 +90,7 @@ export class ConfigManager {

private validateBasicStructure(): string[] {
const errors: string[] = [];
const { axelar, chains } = this.fullConfig;
const { axelar, chains } = this;

if (!axelar) errors.push(`Missing 'axelar' section in ${this.environment} config`);
if (!chains)
Expand All @@ -97,10 +103,18 @@ export class ConfigManager {

private validateAxelarConfig(): string[] {
const errors: string[] = [];
const { axelar } = this.fullConfig;
const { axelar } = this;
if (!axelar) return errors;

const requiredFields = ['contracts', 'rpc', 'gasPrice', 'gasLimit', 'govProposalInstantiateAddresses', 'govProposalDepositAmount'];
const requiredFields = [
'contracts',
'rpc',
'gasPrice',
'gasLimit',
'govProposalInstantiateAddresses',
'govProposalDepositAmount',
'chainId',
];
requiredFields.forEach((field) => {
if (axelar[field] === undefined || axelar[field] === null) {
errors.push(`Missing 'axelar.${field}' in ${this.environment} config`);
Expand All @@ -124,6 +138,10 @@ export class ConfigManager {
condition: !axelar.govProposalInstantiateAddresses || !Array.isArray(axelar.govProposalInstantiateAddresses),
message: `Invalid 'axelar.govProposalInstantiateAddresses' in ${this.environment} config`,
},
{
condition: !axelar.chainId || typeof axelar.chainId !== 'string' || axelar.chainId.trim() === '',
message: `Invalid 'axelar.chainId' format: ${axelar.chainId} - must be a non-empty string`,
},
];

validations.forEach(({ condition, message }) => condition && errors.push(message));
Expand All @@ -132,9 +150,9 @@ export class ConfigManager {

private validateChainConfigs(): string[] {
const errors: string[] = [];
if (!this.fullConfig.chains) return errors;
if (!this.chains) return errors;

Object.entries(this.fullConfig.chains).forEach(([chainName, chainConfig]) => {
Object.entries(this.chains).forEach(([chainName, chainConfig]) => {
errors.push(...this.validateSingleChain(chainName, chainConfig));
});

Expand Down Expand Up @@ -265,35 +283,64 @@ export class ConfigManager {
}

public initContractConfig(contractName: string, chainName: string) {
if (!this.fullConfig.axelar.contracts[contractName]) {
this.fullConfig.axelar.contracts[contractName] = {};
if (!contractName) {
return;
}

if (!this.axelar.contracts[contractName]) {
this.axelar.contracts[contractName] = {};
}

if (chainName) {
if (!this.fullConfig.axelar.contracts[contractName][chainName]) {
this.fullConfig.axelar.contracts[contractName][chainName] = {};
if (!this.axelar.contracts[contractName][chainName]) {
this.axelar.contracts[contractName][chainName] = {};
}
}
}

public saveConfig(): void {
saveConfig(this.fullConfig, this.environment);
}

public getFullConfig(): FullConfig {
return this.fullConfig;
saveConfig({ axelar: this.axelar, chains: this.chains }, this.environment);
}

public getProposalInstantiateAddresses(): string[] {
return this.fullConfig.axelar.govProposalInstantiateAddresses;
return this.axelar.govProposalInstantiateAddresses;
}

public getProposalDepositAmount(): string {
return this.fullConfig.axelar.govProposalDepositAmount;
return this.axelar.govProposalDepositAmount;
}

public getChainConfig(chainName: string): ChainConfig {
const chainConfig = this.chains[chainName];
if (!chainConfig) {
throw new Error(`Chain '${chainName}' not found in ${this.environment} config`);
}
return chainConfig;
}

public getContractConfig(configContractName: string): ContractConfig {
const axelarContracts = this.axelar.contracts;
if (!axelarContracts) {
throw new Error(`Axelar contracts section not found in config for environment ${this.environment}`);
}

if (!axelarContracts[configContractName]) {
axelarContracts[configContractName] = {};
}

return axelarContracts[configContractName];
}

public getContractConfigByChain(configContractName: string, chainName: string): ContractConfig {
const contractConfig = this.getContractConfig(configContractName);
if (!contractConfig[chainName]) {
contractConfig[chainName] = {};
}
return contractConfig[chainName];
}

public getFee(): string | StdFee {
const { gasPrice, gasLimit } = this.fullConfig.axelar;
const { gasPrice, gasLimit } = this.axelar;

if (gasLimit === 'auto') {
return 'auto';
Expand Down
Loading