Skip to content
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

Jump to bottom

feat(cosmwasm): support for deploying the axelarnet-gateway contract #348

Merged
merged 4 commits into from
Aug 27, 2024
Merged

feat(cosmwasm): support for deploying the axelarnet-gateway contract #348

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
00a3fa6
add support for deploying the axelarnet-gateway contract
Aug 27, 2024
bfe2157
cleanup
Aug 27, 2024
23f1025
refactor
Aug 27, 2024
f126969
fix
jcs47 Aug 27, 2024
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
11 changes: 8 additions & 3 deletions common/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,16 @@ function printLog(log) {
console.log(JSON.stringify({ log }, null, 2));
}

const isString = (arg) => {
return typeof arg === 'string';
};

const isNonEmptyString = (arg) => {
return typeof arg === 'string' && arg !== '';
return isString(arg) && arg !== '';
};

const isString = (arg) => {
return typeof arg === 'string';
const isStringLowercase = (arg) => {
return isString(arg) && arg === arg.toLowerCase();
jcs47 marked this conversation as resolved.
Show resolved Hide resolved
};

const isStringArray = (arr) => Array.isArray(arr) && arr.every(isString);
Expand Down Expand Up @@ -440,6 +444,7 @@ module.exports = {
isNonEmptyString,
isString,
isStringArray,
isStringLowercase,
isNumber,
isValidNumber,
isValidDecimal,
Expand Down
97 changes: 68 additions & 29 deletions cosmwasm/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const { AccessType } = require('cosmjs-types/cosmwasm/wasm/v1/types');
const {
isString,
isStringArray,
isStringLowercase,
isKeccak256Hash,
isNumber,
toBigNumberString,
Expand Down Expand Up @@ -215,10 +216,10 @@ const makeNexusGatewayInstantiateMsg = ({ nexus }, { Router: { address: router }
const makeVotingVerifierInstantiateMsg = (
contractConfig,
{ ServiceRegistry: { address: serviceRegistryAddress }, Rewards: { address: rewardsAddress } },
{ axelarId: chainId },
{ axelarId },
) => {
const {
[chainId]: {
[axelarId]: {
governanceAddress,
serviceName,
sourceGatewayAddress,
Expand All @@ -230,6 +231,10 @@ const makeVotingVerifierInstantiateMsg = (
},
} = contractConfig;

if (!isStringLowercase(axelarId)) {
throw new Error('Missing or invalid axelar ID');
}

if (!validateAddress(serviceRegistryAddress)) {
throw new Error('Missing or invalid ServiceRegistry.address in axelar info');
}
Expand All @@ -239,35 +244,35 @@ const makeVotingVerifierInstantiateMsg = (
}

if (!validateAddress(governanceAddress)) {
throw new Error(`Missing or invalid VotingVerifier[${chainId}].governanceAddress in axelar info`);
throw new Error(`Missing or invalid VotingVerifier[${axelarId}].governanceAddress in axelar info`);
}

if (!isString(serviceName)) {
throw new Error(`Missing or invalid VotingVerifier[${chainId}].serviceName in axelar info`);
throw new Error(`Missing or invalid VotingVerifier[${axelarId}].serviceName in axelar info`);
}

if (!isString(sourceGatewayAddress)) {
throw new Error(`Missing or invalid VotingVerifier[${chainId}].sourceGatewayAddress in axelar info`);
throw new Error(`Missing or invalid VotingVerifier[${axelarId}].sourceGatewayAddress in axelar info`);
}

if (!isStringArray(votingThreshold)) {
throw new Error(`Missing or invalid VotingVerifier[${chainId}].votingThreshold in axelar info`);
throw new Error(`Missing or invalid VotingVerifier[${axelarId}].votingThreshold in axelar info`);
}

if (!isNumber(blockExpiry)) {
throw new Error(`Missing or invalid VotingVerifier[${chainId}].blockExpiry in axelar info`);
throw new Error(`Missing or invalid VotingVerifier[${axelarId}].blockExpiry in axelar info`);
}

if (!isNumber(confirmationHeight)) {
throw new Error(`Missing or invalid VotingVerifier[${chainId}].confirmationHeight in axelar info`);
throw new Error(`Missing or invalid VotingVerifier[${axelarId}].confirmationHeight in axelar info`);
}

if (!isString(msgIdFormat)) {
throw new Error(`Missing or invalid VotingVerifier[${chainId}].msgIdFormat in axelar info`);
throw new Error(`Missing or invalid VotingVerifier[${axelarId}].msgIdFormat in axelar info`);
}

if (!isString(addressFormat)) {
throw new Error(`Missing or invalid VotingVerifier[${chainId}].addressFormat in axelar info`);
throw new Error(`Missing or invalid VotingVerifier[${axelarId}].addressFormat in axelar info`);
}

return {
Expand All @@ -279,7 +284,7 @@ const makeVotingVerifierInstantiateMsg = (
voting_threshold: votingThreshold,
block_expiry: toBigNumberString(blockExpiry),
confirmation_height: confirmationHeight,
source_chain: chainId,
source_chain: axelarId,
msg_id_format: msgIdFormat,
address_format: addressFormat,
};
Expand Down Expand Up @@ -307,23 +312,23 @@ const makeMultisigProverInstantiateMsg = (config, chainName) => {
} = config;
const chainConfig = getChainConfig(config, chainName);

const { axelarId: chainId } = chainConfig;
const { axelarId } = chainConfig;

const {
Router: { address: routerAddress },
Coordinator: { address: coordinatorAddress },
Multisig: { address: multisigAddress },
ServiceRegistry: { address: serviceRegistryAddress },
VotingVerifier: {
[chainId]: { address: verifierAddress },
[axelarId]: { address: verifierAddress },
},
Gateway: {
[chainId]: { address: gatewayAddress },
[axelarId]: { address: gatewayAddress },
},
MultisigProver: contractConfig,
} = contracts;
const {
[chainId]: {
[axelarId]: {
adminAddress,
governanceAddress,
domainSeparator,
Expand All @@ -335,7 +340,7 @@ const makeMultisigProverInstantiateMsg = (config, chainName) => {
},
} = contractConfig;

if (!isString(chainId)) {
if (!isStringLowercase(axelarId)) {
throw new Error(`Missing or invalid axelar ID for chain ${chainName}`);
}

Expand All @@ -347,19 +352,19 @@ const makeMultisigProverInstantiateMsg = (config, chainName) => {
throw new Error(`Missing or invalid chain ID`);
}

const separator = domainSeparator || calculateDomainSeparator(chainId, routerAddress, axelarChainId);
contractConfig[chainId].domainSeparator = separator;
const separator = domainSeparator || calculateDomainSeparator(axelarId, routerAddress, axelarChainId);
contractConfig[axelarId].domainSeparator = separator;

if (!validateAddress(adminAddress)) {
throw new Error(`Missing or invalid MultisigProver[${chainId}].adminAddress in axelar info`);
throw new Error(`Missing or invalid MultisigProver[${axelarId}].adminAddress in axelar info`);
}

if (!validateAddress(governanceAddress)) {
throw new Error(`Missing or invalid MultisigProver[${chainId}].governanceAddress in axelar info`);
throw new Error(`Missing or invalid MultisigProver[${axelarId}].governanceAddress in axelar info`);
}

if (!validateAddress(gatewayAddress)) {
throw new Error(`Missing or invalid Gateway[${chainId}].address in axelar info`);
throw new Error(`Missing or invalid Gateway[${axelarId}].address in axelar info`);
}

if (!validateAddress(coordinatorAddress)) {
Expand All @@ -375,31 +380,31 @@ const makeMultisigProverInstantiateMsg = (config, chainName) => {
}

if (!validateAddress(verifierAddress)) {
throw new Error(`Missing or invalid VotingVerifier[${chainId}].address in axelar info`);
throw new Error(`Missing or invalid VotingVerifier[${axelarId}].address in axelar info`);
}

if (!isKeccak256Hash(separator)) {
throw new Error(`Invalid MultisigProver[${chainId}].domainSeparator in axelar info`);
throw new Error(`Invalid MultisigProver[${axelarId}].domainSeparator in axelar info`);
}

if (!isStringArray(signingThreshold)) {
throw new Error(`Missing or invalid MultisigProver[${chainId}].signingThreshold in axelar info`);
throw new Error(`Missing or invalid MultisigProver[${axelarId}].signingThreshold in axelar info`);
}

if (!isString(serviceName)) {
throw new Error(`Missing or invalid MultisigProver[${chainId}].serviceName in axelar info`);
throw new Error(`Missing or invalid MultisigProver[${axelarId}].serviceName in axelar info`);
}

if (!isNumber(verifierSetDiffThreshold)) {
throw new Error(`Missing or invalid MultisigProver[${chainId}].verifierSetDiffThreshold in axelar info`);
throw new Error(`Missing or invalid MultisigProver[${axelarId}].verifierSetDiffThreshold in axelar info`);
}

if (!isString(encoder)) {
throw new Error(`Missing or invalid MultisigProver[${chainId}].encoder in axelar info`);
throw new Error(`Missing or invalid MultisigProver[${axelarId}].encoder in axelar info`);
}

if (!isString(keyType)) {
throw new Error(`Missing or invalid MultisigProver[${chainId}].keyType in axelar info`);
throw new Error(`Missing or invalid MultisigProver[${axelarId}].keyType in axelar info`);
}

return {
Expand All @@ -413,13 +418,39 @@ const makeMultisigProverInstantiateMsg = (config, chainName) => {
domain_separator: separator.replace('0x', ''),
signing_threshold: signingThreshold,
service_name: serviceName,
chain_name: chainId,
chain_name: axelarId,
verifier_set_diff_threshold: verifierSetDiffThreshold,
encoder,
key_type: keyType,
};
};

const makeAxelarnetGatewayInstantiateMsg = (config, chainName) => {
const {
axelar: { contracts },
} = config;
const chainConfig = getChainConfig(config, chainName);

const { axelarId } = chainConfig;

const {
Router: { address: routerAddress },
} = contracts;

if (!isString(axelarId)) {
throw new Error(`Missing or invalid axelar ID for chain ${chainName}`);
}

if (!validateAddress(routerAddress)) {
throw new Error('Missing or invalid Router.address in axelar info');
}

return {
router_address: routerAddress,
chain_name: axelarId.toLowerCase(),
};
};

const makeInstantiateMsg = (contractName, chainName, config) => {
const {
axelar: { contracts },
Expand Down Expand Up @@ -500,6 +531,14 @@ const makeInstantiateMsg = (contractName, chainName, config) => {

return makeMultisigProverInstantiateMsg(config, chainName);
}

case 'AxelarnetGateway': {
if (!chainConfig) {
throw new Error('AxelarnetGateway requires chainNames option');
}

return makeAxelarnetGatewayInstantiateMsg(config, chainName);
}
}

throw new Error(`${contractName} is not supported.`);
Expand Down
Loading