Skip to content

Commit

Permalink
bump multichain helm chart to latest (#9697)
Browse files Browse the repository at this point in the history
## Description
- Upgrade starship to latest helm chart:  cosmology-tech/starship@devnet-0.2.2...devnet-0.2.10
- enabled e2e tests for cosmoshub staking flows
- enable starship faucet for agoric

### Security Considerations
none

### Scaling Considerations
none

### Documentation Considerations
none

### Testing Considerations
CI

### Upgrade Considerations
none
  • Loading branch information
mergify[bot] committed Jul 29, 2024
2 parents 30eddae + 2968d3c commit 4696a6a
Show file tree
Hide file tree
Showing 14 changed files with 36 additions and 81 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/multichain-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
# uses ghcr.io/agoric/agoric-sdk:dev image (latest master)
values: ./agoric-sdk/multichain-testing/config.yaml
port-forward: true
version: 0.2.2
version: 0.2.10
timeout: 30m
namespace: agoric-multichain

Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FILE = config.yaml

HELM_REPO = starship
HELM_CHART = devnet
HELM_VERSION = v0.2.2
HELM_VERSION = v0.2.10

###############################################################################
### All commands ###
Expand Down
1 change: 1 addition & 0 deletions multichain-testing/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ chains:
allow_messages: ['*']
faucet:
enabled: true
type: starship
ports:
rest: 1314
rpc: 26654
Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"execa": "^9.2.0",
"fs-extra": "^11.2.0",
"patch-package": "^8.0.0",
"starshipjs": "2.0.0",
"starshipjs": "2.4.0",
"tsimp": "^2.0.10",
"tsx": "^4.15.6",
"typescript": "^5.3.3"
Expand Down
35 changes: 0 additions & 35 deletions multichain-testing/patches/starshipjs+2.0.0.patch

This file was deleted.

15 changes: 0 additions & 15 deletions multichain-testing/scripts/fetch-starship-chain-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,6 @@ const ibc: {
data: IBCInfo[];
} = await fetch(`${BASE_URL}ibc`).then(r => r.json());

// UNTIL https://github.com/cosmology-tech/starship/issues/494
const backmap = {
agoriclocal: 'agoric',
osmosislocal: 'osmosis',
gaialocal: 'cosmoshub',
};
for (const ibcInfo of ibc.data) {
ibcInfo.chain_1.chain_name = backmap[ibcInfo.chain_1.chain_name];
ibcInfo.chain_2.chain_name = backmap[ibcInfo.chain_2.chain_name];
for (const c of ibcInfo.channels) {
// @ts-expect-error XXX bad typedef
c.tags.preferred = c.tags.perferred;
}
}

const chainInfo = await convertChainInfo({
chains,
ibcData: ibc.data,
Expand Down
5 changes: 2 additions & 3 deletions multichain-testing/scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ NAMESPACE=""
HELM_REPO="starship"
HELM_CHART="starship/devnet"
HELM_REPO_URL="https://cosmology-tech.github.io/starship/"
HELM_CHART_VERSION="0.2.2"
HELM_CHART_VERSION="0.2.8"
HELM_NAME="agoric-multichain-testing"

# check_helm function verifies the helm binary is installed
Expand Down Expand Up @@ -62,7 +62,6 @@ function set_helm_args() {
return 0
fi
for i in $(seq 0 $num_chains); do
chain=$(yq -r ".chains[$i].name" ${CONFIGFILE})
scripts=$(yq -r ".chains[$i].scripts" ${CONFIGFILE})
if [[ "$scripts" == "null" ]]; then
return 0
Expand Down Expand Up @@ -114,7 +113,7 @@ while [ $# -gt 0 ]; do
DRY_RUN=1
shift # past argument
;;
-* | --*)
-)
echo "Unknown option $1"
exit 1
;;
Expand Down
8 changes: 2 additions & 6 deletions multichain-testing/test/auto-stake-it.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const autoStakeItScenario = test.macro({
const { portId, channelId } =
agoricConns[remoteChainInfo.chainId].transferChannel;
const agoricQueryClient = makeQueryClient(
useChain('agoric').getRestEndpoint(),
await useChain('agoric').getRestEndpoint(),
);
const stakingDenom = remoteChainInfo?.stakingTokens?.[0].denom;
if (!stakingDenom) throw Error(`staking denom found for ${chainName}`);
Expand All @@ -131,7 +131,7 @@ const autoStakeItScenario = test.macro({

// 3. Find a remoteChain validator to delegate to
const remoteQueryClient = makeQueryClient(
useChain(chainName).getRestEndpoint(),
await useChain(chainName).getRestEndpoint(),
);
const { validators } = await remoteQueryClient.queryValidators();
const validatorAddress = validators[0]?.operator_address;
Expand Down Expand Up @@ -208,10 +208,6 @@ const autoStakeItScenario = test.macro({
await fundAndTransfer(chainName, lcaAddress, transferAmount);

// 7. verify the COA has active delegations
if (chainName === 'cosmoshub') {
// FIXME: delegations are not visible on cosmoshub
return t.pass('skipping verifying delegations on cosmoshub');
}
const { delegation_responses } = await retryUntilCondition(
() => remoteQueryClient.queryDelegations(icaAddress),
({ delegation_responses }) => !!delegation_responses.length,
Expand Down
4 changes: 3 additions & 1 deletion multichain-testing/test/smart-wallet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ test('provision smart wallet', async t => {
);
t.like(walletCurrent, { liveOffers: [], offerToPublicSubscriberPaths: [] });

const agQueryClient = makeQueryClient(useChain('agoric').getRestEndpoint());
const agQueryClient = makeQueryClient(
await useChain('agoric').getRestEndpoint(),
);
const { balances } = await agQueryClient.queryBalances(wallets.user1);
t.deepEqual(
balances,
Expand Down
9 changes: 1 addition & 8 deletions multichain-testing/test/stake-ica.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,8 @@ const stakeScenario = test.macro(async (t, scenario: StakeIcaScenario) => {
`address for ${scenario.chain} is valid`,
);

if (scenario.chain === 'cosmoshub') {
// see https://github.com/cosmos/cosmjs/pull/1593 for upstream fix
t.pass(
`SKIP ${scenario.chain}. @cosmjs/faucet does not support ICA address length.`,
);
return;
}
const { creditFromFaucet, getRestEndpoint } = useChain(scenario.chain);
const queryClient = makeQueryClient(getRestEndpoint());
const queryClient = makeQueryClient(await getRestEndpoint());

t.log(`Requesting faucet funds for ${address}`);
// XXX fails intermittently until https://github.com/cosmology-tech/starship/issues/417
Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/test/tools/wallet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const walletScenario = test.macro(async (t, scenario: string) => {
t.regex(addr, new RegExp(`^${prefix}1`));
t.log('Made temp wallet:', addr);

const apiUrl = useChain(scenario).getRestEndpoint();
const apiUrl = await useChain(scenario).getRestEndpoint();
const queryClient = makeQueryClient(apiUrl);
t.log('Made query client');

Expand Down
2 changes: 1 addition & 1 deletion multichain-testing/tools/ibc-transfer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export const createFundedWalletAndClient = async (
// TODO use telescope generated rpc client from @agoric/cosmic-proto
// https://github.com/Agoric/agoric-sdk/issues/9200
const client = await SigningStargateClient.connectWithSigner(
getRpcEndpoint(),
await getRpcEndpoint(),
wallet,
);
return { client, wallet, address };
Expand Down
8 changes: 6 additions & 2 deletions multichain-testing/tools/registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export const makeGetFile =
type GetFilePathFn = ReturnType<typeof makeGetFile>;

export const makeSetupRegistry = (getFile: GetFilePathFn) => {
let initialized = false;
/**
* @param {Object} opts
* @param {string} [opts.config='../config.yaml'] - The path to the starship configuration file.
Expand All @@ -20,8 +21,11 @@ export const makeSetupRegistry = (getFile: GetFilePathFn) => {
* ```
*/
const setupRegistry = async ({ config = '../config.yaml' } = {}) => {
ConfigContext.setConfigFile(getFile(config));
ConfigContext.setRegistry(await useRegistry(ConfigContext.configFile!));
if (initialized) return { useChain };
const configFile = getFile(config);
const fetcher = await useRegistry(configFile);
await ConfigContext.init(configFile, fetcher);
initialized = true;
return { useChain };
};

Expand Down
22 changes: 16 additions & 6 deletions multichain-testing/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ __metadata:
languageName: node
linkType: hard

"@noble/hashes@npm:^1, @noble/hashes@npm:^1.0.0":
"@noble/hashes@npm:^1, @noble/hashes@npm:^1.0.0, @noble/hashes@npm:^1.2.0":
version: 1.4.0
resolution: "@noble/hashes@npm:1.4.0"
checksum: 10c0/8c3f005ee72e7b8f9cff756dfae1241485187254e3f743873e22073d63906863df5d4f13d441b7530ea614b7a093f0d889309f28b59850f33b66cb26a779a4a5
Expand Down Expand Up @@ -1319,6 +1319,15 @@ __metadata:
languageName: node
linkType: hard

"bip39@npm:^3.1.0":
version: 3.1.0
resolution: "bip39@npm:3.1.0"
dependencies:
"@noble/hashes": "npm:^1.2.0"
checksum: 10c0/68f9673a0d6a851e9635f3af8a85f2a1ecef9066c76d77e6f0d58d274b5bf22a67f429da3997e07c0d2cf153a4d7321f9273e656cac0526f667575ddee28ef71
languageName: node
linkType: hard

"blueimp-md5@npm:^2.10.0":
version: 2.19.0
resolution: "blueimp-md5@npm:2.19.0"
Expand Down Expand Up @@ -3843,7 +3852,7 @@ __metadata:
execa: "npm:^9.2.0"
fs-extra: "npm:^11.2.0"
patch-package: "npm:^8.0.0"
starshipjs: "npm:2.0.0"
starshipjs: "npm:2.4.0"
tsimp: "npm:^2.0.10"
tsx: "npm:^4.15.6"
typescript: "npm:^5.3.3"
Expand Down Expand Up @@ -4081,14 +4090,15 @@ __metadata:
languageName: node
linkType: hard

"starshipjs@npm:2.0.0":
version: 2.0.0
resolution: "starshipjs@npm:2.0.0"
"starshipjs@npm:2.4.0":
version: 2.4.0
resolution: "starshipjs@npm:2.4.0"
dependencies:
"@chain-registry/client": "npm:1.18.1"
bip39: "npm:^3.1.0"
js-yaml: "npm:^4.1.0"
node-fetch: "npm:^2.6.9"
checksum: 10c0/8091142dac71b0f0544db87f0f6d101c4fa26792adda05f629dfb3c2f6d087233ede3672fa41ada2cd92d42ad07bbb17481049c491a2adba4a3114f363299121
checksum: 10c0/e62cc540bc9e8700d3bdb61ac1261b71417f0e687c98a0e3733317d363e425c7188a205d9af70f5218e87f99195fbfb5b759b4f3f9d87823989ef6b4d90442d6
languageName: node
linkType: hard

Expand Down

0 comments on commit 4696a6a

Please sign in to comment.