@agoric/orchestration 0.2.0-u21.0.1 → 0.2.0-u22.0

package/src/exos/cosmos-orchestration-account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cosmos-orchestration-account.d.ts","sourceRoot":"","sources":["cosmos-orchestration-account.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"cosmos-orchestration-account.d.ts","sourceRoot":"","sources":["cosmos-orchestration-account.js"],"names":[],"mappings":"AAwOA,wCAAwC;AACxC;;;;;;;;;;;;;;;;;;;;;;;;;;GAUG;AAOH;;;;;;;;;;;GAoBE;AAYK,2DARI,IAAI,gGAEZ;IAAyB,QAAQ,EAAzB,QAAQ;IACgB,eAAe,EAAvC,eAAe;IACc,YAAY,EAAzC,OAAO,YAAY,CAAC;IACH,QAAQ,EAAzB,QAAQ;IACI,GAAG,EAAf,GAAG;CACb;kBAsGc,kBAAkB;kBAClB,eAAe;mBACf,gBAAgB;;aAEhB,UAAU;;;;;;;WAGV,OAAO,YAAY,CAAC;;;QAuC3B,wDAAwD;;;QAYxD;;;WAGG;6BAFQ,SAAS,GACP,IAAI;;;QASjB;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QASpC;;;WAGG;8BAFQ,SAAS,aAAa,CAAC,EAAE,GACvB,wBAAwB;;;QAgBrC;;;WAGG;8BAFQ,SAAS,aAAa,CAAC,EAAE,GACvB,wBAAwB,EAAE;;;QAkBvC;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAYpC;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAapC;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAapC;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAapC;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAYpC;;;WAGG;8BAFQ,SAAS,aAAa,CAAC,EAAE,GACvB,qBAAqB;;;QAoBlC;;WAEG;8BADQ,SAAS,aAAa,CAAC,EAAE;;;QAYpC;;WAEG;4BADQ,MAAM;;IAgBnB;;;OAGG;;QAED,uDAAuD;4BAA3C,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;QAO5C,6BAA6B;4BAAjB,MAAM;;;QAYlB;;;;;;;;;;WAUG;6DATQ,CACV;YAAM,eAAe,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;SAAE,EAC7D,MAAU,CACP,gCACO;YACN,WAAW,EAAE,kBAAkB,CAAC;YAChC,IAAI,CAAC,EAAE,qBAAqB,CAAC;YAC7B,KAAK,EAAE,IAAI,CAAC;SACb;;;QAwBJ;;;WAGG;4BAFQ,sBAAsB,UACtB,SAAS;QAUpB;;;;WAIG;iCAHQ,sBAAsB,gBACtB,sBAAsB,UACtB,SAAS;QAYpB,gDAAgD;kCAApC,sBAAsB;QAQlC;;;;;WAKG;gCAJQ;YACN,MAAM,EAAE,SAAS,CAAC;YAClB,SAAS,EAAE,sBAAsB,CAAC;SACnC,EAAE;;;;uBAyBc,YAAY;oBAAU,SAAS;;;uBAa/B,kBAAkB;qBAAW,SAAS,EAAE;;QAS5D;;;;WAIG;;;oBASc,SAAS;yBACJ,YAAY;mBAClB,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAme5C;AAsBM,wDAbI,IAAI,8DAEZ;IAAyB,QAAQ,EAAzB,QAAQ;IACgB,eAAe,EAAvC,eAAe;IACc,YAAY,EAAzC,OAAO,YAAY,CAAC;IACH,QAAQ,EAAzB,QAAQ;IACI,GAAG,EAAf,GAAG;CACX,GAAU,CACZ,GAAO,IAAI,EAAE,UAAU,CACjB,UAAU,CAAC,OAAO,oCAAoC,CAAC,CACxD,KACE,6BAA6B,CAAC,QAAQ,CAAC,CAc9C;;kBAznCa,kBAAkB;;;;;oBA8BnB;IACR,OAAO,EAAE,UAAU,CAAC;IACpB,YAAY,EAAE,kBAAkB,CAAC;IACjC,aAAa,EAAE,aAAa,GAAG,SAAS,CAAC;IACzC,YAAY,EAAE,eAAe,CAAC;IAC9B,aAAa,EAAE,gBAAgB,CAAC;IAChC,KAAK,EAAE,OAAO,YAAY,CAAC,CAAC;IAC5B,QAAQ,EAAE,YAAY,sCAAsC,CAAC,GAAG,SAAS,CAAC;CAC3E;qDAKS;IACR,YAAY,EAAE,eAAe,CAAC;IAC9B,aAAa,EAAE,gBAAgB,CAAC;CACjC;4CA4iCS,UAAU,CAClB,UAAU,CAAC,OAAO,oCAAoC,CAAC,CACxD;yCA8BU,6BAA6B,CAAC,QAAQ,CAAC;0BAvoC9B,cAAc;8BATsR,aAAa;qCAEzR,6CAA6C;kCAK7D,cAAc;4BAHpB,kBAAkB;8BAIX,aAAa;yBAP0B,aAAa;wCADuO,aAAa;qCAapR,iCAAiC;sCAAjC,iCAAiC;gCAbsO,aAAa;8BAW7S,sBAAsB;mCADjB,+CAA+C;yBAF/C,aAAa;+BAR8Q,aAAa;0BAGjT,kDAAkD;8CAHkP,aAAa;2CAAb,aAAa;uCAAb,aAAa;2CAAb,aAAa;4CAAb,aAAa;gCACjQ,aAAa;kCADuO,aAAa;mCAAb,aAAa;iCAEzR,6CAA6C"}

package/src/exos/cosmos-orchestration-account.js

@@ -1,46 +1,46 @@
 /** @file Use-object for the owner of a staking account */
-import { toRequestQueryJson } from '@agoric/cosmic-proto';
+import { toRequestQueryJson, CodecHelper } from '@agoric/cosmic-proto';
 import {
-  MsgDepositForBurn,
-  MsgDepositForBurnWithCaller,
+  MsgDepositForBurn as MsgDepositForBurnType,
+  MsgDepositForBurnWithCaller as MsgDepositForBurnWithCallerType,
 } from '@agoric/cosmic-proto/circle/cctp/v1/tx.js';
 import {
-  QueryAllBalancesRequest,
-  QueryAllBalancesResponse,
-  QueryBalanceRequest,
-  QueryBalanceResponse,
+  QueryAllBalancesRequest as QueryAllBalancesRequestType,
+  QueryAllBalancesResponse as QueryAllBalancesResponseType,
+  QueryBalanceRequest as QueryBalanceRequestType,
+  QueryBalanceResponse as QueryBalanceResponseType,
 } from '@agoric/cosmic-proto/cosmos/bank/v1beta1/query.js';
-import { MsgSend } from '@agoric/cosmic-proto/cosmos/bank/v1beta1/tx.js';
+import { MsgSend as MsgSendType } from '@agoric/cosmic-proto/cosmos/bank/v1beta1/tx.js';
 import {
-  QueryDelegationRewardsRequest,
-  QueryDelegationRewardsResponse,
-  QueryDelegationTotalRewardsRequest,
-  QueryDelegationTotalRewardsResponse,
+  QueryDelegationRewardsRequest as QueryDelegationRewardsRequestType,
+  QueryDelegationRewardsResponse as QueryDelegationRewardsResponseType,
+  QueryDelegationTotalRewardsRequest as QueryDelegationTotalRewardsRequestType,
+  QueryDelegationTotalRewardsResponse as QueryDelegationTotalRewardsResponseType,
 } from '@agoric/cosmic-proto/cosmos/distribution/v1beta1/query.js';
 import {
-  MsgWithdrawDelegatorReward,
-  MsgWithdrawDelegatorRewardResponse,
+  MsgWithdrawDelegatorReward as MsgWithdrawDelegatorRewardType,
+  MsgWithdrawDelegatorRewardResponse as MsgWithdrawDelegatorRewardResponseType,
 } from '@agoric/cosmic-proto/cosmos/distribution/v1beta1/tx.js';
 import {
-  QueryDelegationRequest,
-  QueryDelegationResponse,
-  QueryDelegatorDelegationsRequest,
-  QueryDelegatorDelegationsResponse,
-  QueryDelegatorUnbondingDelegationsRequest,
-  QueryDelegatorUnbondingDelegationsResponse,
-  QueryRedelegationsRequest,
-  QueryRedelegationsResponse,
-  QueryUnbondingDelegationRequest,
-  QueryUnbondingDelegationResponse,
+  QueryDelegationRequest as QueryDelegationRequestType,
+  QueryDelegationResponse as QueryDelegationResponseType,
+  QueryDelegatorDelegationsRequest as QueryDelegatorDelegationsRequestType,
+  QueryDelegatorDelegationsResponse as QueryDelegatorDelegationsResponseType,
+  QueryDelegatorUnbondingDelegationsRequest as QueryDelegatorUnbondingDelegationsRequestType,
+  QueryDelegatorUnbondingDelegationsResponse as QueryDelegatorUnbondingDelegationsResponseType,
+  QueryRedelegationsRequest as QueryRedelegationsRequestType,
+  QueryRedelegationsResponse as QueryRedelegationsResponseType,
+  QueryUnbondingDelegationRequest as QueryUnbondingDelegationRequestType,
+  QueryUnbondingDelegationResponse as QueryUnbondingDelegationResponseType,
 } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/query.js';
 import {
-  MsgBeginRedelegate,
-  MsgDelegate,
-  MsgUndelegate,
-  MsgUndelegateResponse,
+  MsgBeginRedelegate as MsgBeginRedelegateType,
+  MsgDelegate as MsgDelegateType,
+  MsgUndelegate as MsgUndelegateType,
+  MsgUndelegateResponse as MsgUndelegateResponseType,
 } from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
-import { Any } from '@agoric/cosmic-proto/google/protobuf/any.js';
-import { MsgTransfer } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
+import { Any as AnyType } from '@agoric/cosmic-proto/google/protobuf/any.js';
+import { MsgTransfer as MsgTransferType } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
 import { makeTracer } from '@agoric/internal';
 import { Shape as NetworkShape } from '@agoric/network';
 import { M } from '@agoric/vat-data';
@@ -70,6 +70,60 @@ import { orchestrationAccountMethods } from '../utils/orchestrationAccount.js';
 import { makeTimestampHelper } from '../utils/time.js';
 import { accountIdTo32Bytes, parseAccountId } from '../utils/address.js';
 
+const MsgDepositForBurn = CodecHelper(MsgDepositForBurnType);
+const MsgDepositForBurnWithCaller = CodecHelper(
+  MsgDepositForBurnWithCallerType,
+);
+const QueryAllBalancesRequest = CodecHelper(QueryAllBalancesRequestType);
+const QueryAllBalancesResponse = CodecHelper(QueryAllBalancesResponseType);
+const QueryBalanceRequest = CodecHelper(QueryBalanceRequestType);
+const QueryBalanceResponse = CodecHelper(QueryBalanceResponseType);
+const MsgSend = CodecHelper(MsgSendType);
+const QueryDelegationRewardsRequest = CodecHelper(
+  QueryDelegationRewardsRequestType,
+);
+const QueryDelegationRewardsResponse = CodecHelper(
+  QueryDelegationRewardsResponseType,
+);
+const QueryDelegationTotalRewardsRequest = CodecHelper(
+  QueryDelegationTotalRewardsRequestType,
+);
+const QueryDelegationTotalRewardsResponse = CodecHelper(
+  QueryDelegationTotalRewardsResponseType,
+);
+const MsgWithdrawDelegatorReward = CodecHelper(MsgWithdrawDelegatorRewardType);
+const MsgWithdrawDelegatorRewardResponse = CodecHelper(
+  MsgWithdrawDelegatorRewardResponseType,
+);
+const QueryDelegationRequest = CodecHelper(QueryDelegationRequestType);
+const QueryDelegationResponse = CodecHelper(QueryDelegationResponseType);
+const QueryDelegatorDelegationsRequest = CodecHelper(
+  QueryDelegatorDelegationsRequestType,
+);
+const QueryDelegatorDelegationsResponse = CodecHelper(
+  QueryDelegatorDelegationsResponseType,
+);
+const QueryDelegatorUnbondingDelegationsRequest = CodecHelper(
+  QueryDelegatorUnbondingDelegationsRequestType,
+);
+const QueryDelegatorUnbondingDelegationsResponse = CodecHelper(
+  QueryDelegatorUnbondingDelegationsResponseType,
+);
+const QueryRedelegationsRequest = CodecHelper(QueryRedelegationsRequestType);
+const QueryRedelegationsResponse = CodecHelper(QueryRedelegationsResponseType);
+const QueryUnbondingDelegationRequest = CodecHelper(
+  QueryUnbondingDelegationRequestType,
+);
+const QueryUnbondingDelegationResponse = CodecHelper(
+  QueryUnbondingDelegationResponseType,
+);
+const MsgBeginRedelegate = CodecHelper(MsgBeginRedelegateType);
+const MsgDelegate = CodecHelper(MsgDelegateType);
+const MsgUndelegate = CodecHelper(MsgUndelegateType);
+const MsgUndelegateResponse = CodecHelper(MsgUndelegateResponseType);
+const Any = CodecHelper(AnyType);
+const MsgTransfer = CodecHelper(MsgTransferType);
+
 /**
  * @import {HostOf} from '@agoric/async-flow';
  * @import {AmountArg, IcaAccount, CosmosChainAddress, CosmosValidatorAddress, ICQConnection, StakingAccountActions, StakingAccountQueries, NobleMethods, OrchestrationAccountCommon, CosmosRewardsResponse, IBCConnectionInfo, IBCMsgTransferOptions, ChainHub, CosmosDelegationResponse, CaipChainId, AccountIdArg} from '../types.js';
@@ -611,12 +665,9 @@ export const prepareCosmosOrchestrationAccountKit = (
                 token,
                 sender: this.state.chainAddress.value,
                 receiver: destination.value,
-                timeoutHeight: opts?.timeoutHeight ?? {
-                  revisionHeight: 0n,
-                  revisionNumber: 0n,
-                },
+                timeoutHeight: opts?.timeoutHeight,
                 timeoutTimestamp,
-                memo: opts?.memo ?? '',
+                memo: opts?.memo,
               }),
             ),
           ]);
@@ -1170,7 +1221,7 @@ export const prepareCosmosOrchestrationAccountKit = (
               throw Fail`${q(chainId)} does not have "cctpDestinationDomain" set in ChainInfo`;
             }
 
-            /** @satisfies {MsgDepositForBurn} */
+            /** @satisfies {MsgDepositForBurnType} */
             const depositForBurn = {
               amount: helper.amountToCoin(amount)?.amount,
               from: chainAddress.value,

package/src/exos/local-orchestration-account.d.ts

@@ -145,8 +145,8 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
                 denom: string;
                 value: bigint;
             };
-            fromAccount: import("@agoric/orchestration").AccountId;
-            toAccount: import("@agoric/orchestration").AccountId;
+            fromAccount: string;
+            toAccount: string;
             extra: Record<string, any>;
         };
         /**
@@ -157,8 +157,8 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
          */
         onRejected(reason: unknown, naiveResult: Awaited<ReturnType<LocalAccountMethods["parseInboundTransfer"]>>): {
             amount: DenomAmount;
-            fromAccount: import("@agoric/orchestration").AccountId;
-            toAccount: import("@agoric/orchestration").AccountId;
+            fromAccount: string;
+            toAccount: string;
             extra: Record<string, any>;
         };
     };
@@ -203,8 +203,8 @@ export function prepareLocalOrchestrationAccountKit(zone: Zone, { makeRecorderKi
         transfer(destination: AccountIdArg, amount: AmountArg, opts?: IBCMsgTransferOptions): Vow<any>;
         parseInboundTransfer(packet: Record<string, any>): Vow<{
             amount: DenomAmount;
-            fromAccount: import("@agoric/orchestration").AccountId;
-            toAccount: import("@agoric/orchestration").AccountId;
+            fromAccount: string;
+            toAccount: string;
             extra: Record<string, any>;
         }>;
         transferSteps(amount: AmountArg, msg: import("@agoric/orchestration").TransferMsg): Vow<void>;

package/src/exos/local-orchestration-account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-orchestration-account.d.ts","sourceRoot":"","sources":["local-orchestration-account.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"local-orchestration-account.d.ts","sourceRoot":"","sources":["local-orchestration-account.js"],"names":[],"mappings":"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"}

package/src/exos/local-orchestration-account.js

@@ -1,5 +1,5 @@
 /** @file Use-object for the owner of a localchain account */
-import { typedJson } from '@agoric/cosmic-proto';
+import { CodecHelper } from '@agoric/cosmic-proto';
 import { AmountShape, PaymentShape } from '@agoric/ertp';
 import { makeTracer } from '@agoric/internal';
 import { Shape as NetworkShape } from '@agoric/network';
@@ -8,6 +8,17 @@ import { VowShape } from '@agoric/vow';
 import { E } from '@endo/far';
 import { Fail, q } from '@endo/errors';
 
+import { MsgTransfer as MsgTransferType } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/tx.js';
+import { QueryDenomHashRequest as QueryDenomHashRequestType } from '@agoric/cosmic-proto/ibc/applications/transfer/v1/query.js';
+import {
+  QueryAllBalancesRequest as QueryAllBalancesRequestType,
+  QueryBalanceRequest as QueryBalanceRequestType,
+} from '@agoric/cosmic-proto/cosmos/bank/v1beta1/query.js';
+import {
+  MsgDelegate as MsgDelegateType,
+  MsgUndelegate as MsgUndelegateType,
+} from '@agoric/cosmic-proto/cosmos/staking/v1beta1/tx.js';
+import { MsgSend as MsgSendType } from '@agoric/cosmic-proto/cosmos/bank/v1beta1/tx.js';
 import {
   AmountArgShape,
   AnyNatAmountsRecord,
@@ -25,6 +36,14 @@ import { prepareIBCTools } from './ibc-packet.js';
 import { coerceCoin, coerceDenomAmount } from '../utils/amounts.js';
 import { TransferRouteShape } from './chain-hub.js';
 
+const MsgTransfer = CodecHelper(MsgTransferType);
+const QueryDenomHashRequest = CodecHelper(QueryDenomHashRequestType);
+const QueryAllBalancesRequest = CodecHelper(QueryAllBalancesRequestType);
+const QueryBalanceRequest = CodecHelper(QueryBalanceRequestType);
+const MsgDelegate = CodecHelper(MsgDelegateType);
+const MsgUndelegate = CodecHelper(MsgUndelegateType);
+const MsgSend = CodecHelper(MsgSendType);
+
 /**
  * @import {HostOf} from '@agoric/async-flow';
  * @import {LocalChain, LocalChainAccount} from '@agoric/vats/src/localchain.js';
@@ -33,7 +52,7 @@ import { TransferRouteShape } from './chain-hub.js';
  * @import {IBCEvent} from '@agoric/vats';
  * @import {QueryDenomHashResponse} from '@agoric/cosmic-proto/ibc/applications/transfer/v1/query.js';
  * @import {FungibleTokenPacketData} from '@agoric/cosmic-proto/ibc/applications/transfer/v2/packet.js';
- * @import {RecorderKit, MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js'.
+ * @import {RecorderKit, MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
  * @import {Zone} from '@agoric/zone';
  * @import {Remote} from '@agoric/internal';
  * @import {InvitationMakers} from '@agoric/smart-wallet/src/types.js';
@@ -387,19 +406,13 @@ export const prepareLocalOrchestrationAccountKit = (
               },
             });
           }
-          const transferMsg = typedJson(
-            '/ibc.applications.transfer.v1.MsgTransfer',
-            {
-              ...transferDetails,
-              sender: this.state.address.value,
-              timeoutHeight: opts?.timeoutHeight ?? {
-                revisionHeight: 0n,
-                revisionNumber: 0n,
-              },
-              timeoutTimestamp,
-              memo: memo ?? '',
-            },
-          );
+          const transferMsg = MsgTransfer.typedJson({
+            ...transferDetails,
+            sender: this.state.address.value,
+            timeoutHeight: opts?.timeoutHeight,
+            timeoutTimestamp,
+            memo,
+          });
 
           const { holder } = this.facets;
           const sender = makeIBCTransferSender(
@@ -580,7 +593,7 @@ export const prepareLocalOrchestrationAccountKit = (
 
             return watch(
               E(localchain).query(
-                typedJson('/cosmos.bank.v1beta1.QueryBalanceRequest', {
+                QueryBalanceRequest.typedJson({
                   address: this.state.address.value,
                   denom,
                 }),
@@ -593,7 +606,7 @@ export const prepareLocalOrchestrationAccountKit = (
         getBalances() {
           return watch(
             E(localchain).query(
-              typedJson('/cosmos.bank.v1beta1.QueryAllBalancesRequest', {
+              QueryAllBalancesRequest.typedJson({
                 address: this.state.address.value,
               }),
             ),
@@ -630,7 +643,7 @@ export const prepareLocalOrchestrationAccountKit = (
 
           return watch(
             E(lca).executeTx([
-              typedJson('/cosmos.staking.v1beta1.MsgDelegate', {
+              MsgDelegate.typedJson({
                 amount,
                 validatorAddress,
                 delegatorAddress: this.state.address.value,
@@ -650,7 +663,7 @@ export const prepareLocalOrchestrationAccountKit = (
           const { account: lca } = this.state;
           return watch(
             E(lca).executeTx([
-              typedJson('/cosmos.staking.v1beta1.MsgUndelegate', {
+              MsgUndelegate.typedJson({
                 amount,
                 validatorAddress,
                 delegatorAddress: this.state.address.value,
@@ -697,7 +710,7 @@ export const prepareLocalOrchestrationAccountKit = (
             const { helper } = this.facets;
             return watch(
               E(this.state.account).executeTx([
-                typedJson('/cosmos.bank.v1beta1.MsgSend', {
+                MsgSend.typedJson({
                   amount: [helper.amountToCoin(amount)],
                   toAddress: cosmosDest.value,
                   fromAddress: this.state.address.value,
@@ -718,7 +731,7 @@ export const prepareLocalOrchestrationAccountKit = (
             const { helper } = this.facets;
             return watch(
               E(this.state.account).executeTx([
-                typedJson('/cosmos.bank.v1beta1.MsgSend', {
+                MsgSend.typedJson({
                   amount: amounts.map(a => helper.amountToCoin(a)),
                   toAddress: toAccount.value,
                   fromAddress: this.state.address.value,
@@ -790,14 +803,6 @@ export const prepareLocalOrchestrationAccountKit = (
               amount,
             } = ftPacketData;
 
-            // XXX don't verify it's a real Bech32 because that makes our tests
-            // less legible (preventing readable words on the address string)
-            /**
-             * @param {string} address
-             */
-            const resolveBech32Address = address =>
-              chainHub.resolveAccountId(/** @type {Bech32Address} */ (address));
-
             /**
              * @param {Denom} localDenom
              */
@@ -807,8 +812,8 @@ export const prepareLocalOrchestrationAccountKit = (
                   value: BigInt(amount),
                   denom: localDenom,
                 }),
-                fromAccount: resolveBech32Address(sender),
-                toAccount: resolveBech32Address(receiver),
+                fromAccount: sender,
+                toAccount: receiver,
                 extra: {
                   ...ftPacketData,
                 },
@@ -832,10 +837,9 @@ export const prepareLocalOrchestrationAccountKit = (
             // Find the local denom hash for the transferDenom, if there is one.
             return watch(
               E(localchain).query(
-                typedJson(
-                  '/ibc.applications.transfer.v1.QueryDenomHashRequest',
-                  { trace: denomOrTrace },
-                ),
+                QueryDenomHashRequest.typedJson({
+                  trace: denomOrTrace,
+                }),
               ),
               this.facets.parseInboundTransferWatcher,
               buildReturnValue(denomOrTrace),

package/src/exos/orchestrator.d.ts

@@ -11,7 +11,7 @@ export function prepareOrchestrator(zone: Zone, powers: {
     vowTools: VowTools;
 }): () => import("@endo/exo").Guarded<{
     getChain(chainName: string): Vow<HostInterface<Chain<any> & object>>;
-    getDenomInfo(denom: string, srcChainName: "agoric" | "base" | "solana" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "axelar" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "polygon"): HostInterface<import("../orchestration-api.js").DenomInfo<"agoric" | "base" | "solana" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "axelar" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "polygon", "agoric" | "base" | "solana" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "axelar" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "polygon">>;
+    getDenomInfo(denom: string, srcChainName: "solana" | "agoric" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "axelar" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "base" | "polygon"): HostInterface<import("../orchestration-api.js").DenomInfo<"solana" | "agoric" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "axelar" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "base" | "polygon", "solana" | "agoric" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "axelar" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "base" | "polygon">>;
     /** @type {HostOf<Orchestrator['asAmount']>} */
     asAmount: HostOf<Orchestrator["asAmount"]>;
 }>;
@@ -105,7 +105,7 @@ declare function prepareOrchestratorKit(zone: Zone, { chainHub, makeLocalChainFa
     };
     orchestrator: {
         getChain(chainName: string): Vow<HostInterface<Chain<any> & object>>;
-        getDenomInfo(denom: string, srcChainName: "agoric" | "base" | "solana" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "axelar" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "polygon"): HostInterface<import("../orchestration-api.js").DenomInfo<"agoric" | "base" | "solana" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "axelar" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "polygon", "agoric" | "base" | "solana" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "axelar" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "polygon">>;
+        getDenomInfo(denom: string, srcChainName: "solana" | "agoric" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "axelar" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "base" | "polygon"): HostInterface<import("../orchestration-api.js").DenomInfo<"solana" | "agoric" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "axelar" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "base" | "polygon", "solana" | "agoric" | "celestia" | "cosmoshub" | "juno" | "neutron" | "noble" | "omniflixhub" | "osmosis" | "secretnetwork" | "stargaze" | "stride" | "umee" | "dydx" | "archway" | "axelar" | "evmos" | "haqq" | "kava" | "kujira" | "migaloo" | "nolus" | "persistence" | "pryzm" | "sei" | "shido" | "titan" | "beezee" | "carbon" | "coreum" | "crescent" | "doravota" | "dymension" | "empowerchain" | "injective" | "lava" | "nibiru" | "planq" | "provenance" | "quicksilver" | "sifchain" | "terra2" | "ethereum" | "avalanche" | "optimism" | "arbitrum" | "base" | "polygon">>;
         /** @type {HostOf<Orchestrator['asAmount']>} */
         asAmount: HostOf<Orchestrator["asAmount"]>;
     };

package/src/exos/orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["orchestrator.js"],"names":[],"mappings":"AA4BA,0BAA0B;AAC1B;;;;GAIG;AAqJI,0CARI,IAAI,UACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;;;IAfI,+CAA+C;cAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;GAoBlD;;;;;+BAMY,UAAU,CAClB,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAC1C,CAAC,cAAc,CAAC;0BAvLG,mBAAmB;8BACE,gBAAgB;0CASrB,yBAAyB;2CACxB,0BAA0B;8BARlC,aAAa;2BASoC,aAAa;mCAVtC,oBAAoB;yBAC5C,aAAa;kCASoC,aAAa;4BAVtC,oBAAoB;AAuB5E;;;;;;;;GAQG;AACH,8CARW,IAAI,0FACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;IA4CE,2DAA2D;;QAEzD;;WAEG;qCADQ,gBAAgB,QAAQ,CAAC;;;;;;;;;;;;;;IAQtC;;;OAGG;;QAED;;;;;;WAMG;yEAFQ,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,CAAC,QACzC,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA0DjB,+CAA+C;kBAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;;GAKlD;qCA/J2C,gBAAgB;+BAWqB,aAAa;uCAAb,aAAa"}
+{"version":3,"file":"orchestrator.d.ts","sourceRoot":"","sources":["orchestrator.js"],"names":[],"mappings":"AAuBA,0BAA0B;AAC1B;;;;GAIG;AAqJI,0CARI,IAAI,UACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;;;IAfI,+CAA+C;cAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;GAoBlD;;;;;+BAMY,UAAU,CAClB,UAAU,CAAC,OAAO,sBAAsB,CAAC,CAC1C,CAAC,cAAc,CAAC;0BAlLG,mBAAmB;8BACE,gBAAgB;0CAIrB,yBAAyB;2CACxB,0BAA0B;8BAHlC,aAAa;2BAIoC,aAAa;mCALtC,oBAAoB;yBAC5C,aAAa;kCAIoC,aAAa;4BALtC,oBAAoB;AAkB5E;;;;;;;;GAQG;AACH,8CARW,IAAI,0FACJ;IACN,QAAQ,EAAE,QAAQ,CAAC;IACnB,oBAAoB,EAAE,oBAAoB,CAAC;IAC3C,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C,QAAQ,EAAE,QAAQ,CAAC;CACpB;IA4CE,2DAA2D;;QAEzD;;WAEG;qCADQ,gBAAgB,QAAQ,CAAC;;;;;;;;;;;;;;IAQtC;;;OAGG;;QAED;;;;;;WAMG;yEAFQ,CAAC,SAAS,EAAE,SAAS,EAAE,iBAAiB,CAAC,QACzC,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QA0DjB,+CAA+C;kBAApC,OAAO,YAAY,CAAC,UAAU,CAAC,CAAC;;GAKlD;qCA1J2C,gBAAgB;+BAMqB,aAAa;uCAAb,aAAa"}

package/src/exos/orchestrator.js

@@ -12,12 +12,7 @@ import { DenomInfoShape, DenomAmountShape, DenomShape } from '../typeGuards.js';
  * @import {ActualChainInfo, ChainHub} from './chain-hub.js';
  * @import {AsyncFlowTools, HostInterface, HostOf} from '@agoric/async-flow';
  * @import {Vow, VowTools} from '@agoric/vow';
- * @import {TimerService} from '@agoric/time';
- * @import {LocalChain} from '@agoric/vats/src/localchain.js';
- * @import {RecorderKit, MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js'.
- * @import {Remote} from '@agoric/internal';
- * @import {PickFacet} from '@agoric/swingset-liveslots';
- * @import {CosmosInterchainService} from './exo-interfaces.js';
+ * @import {MapStore, SetStore} from '@agoric/store';
  * @import {MakeLocalChainFacade} from './local-chain-facade.js';
  * @import {MakeRemoteChainFacade} from './remote-chain-facade.js';
  * @import {Chain, ChainInfo, IBCConnectionInfo, KnownChains, Orchestrator} from '../types.js';

package/src/exos/packet-tools.d.ts

@@ -3,7 +3,7 @@ export function preparePacketTools(zone: import("@agoric/base-zone").Zone, vowTo
     getBalance(brand: Brand<"nat">): import("@agoric/vow").PromiseVow<Amount<"nat">>;
     deposit(payment: ERef<Payment<"nat">>, optAmountShape?: Pattern): import("@agoric/vow").PromiseVow<Amount<"nat">>;
     withdraw(amount: Amount<"nat">): import("@agoric/vow").PromiseVow<Payment<"nat">>;
-    executeTx<MT extends import("@agoric/cosmic-proto").TypedJson[]>(messages: MT): PromiseVowOfTupleMappedToGenerics<{ [K in keyof MT]: import("@agoric/cosmic-proto").JsonSafe<import("@agoric/cosmic-proto").ResponseTo<MT[K]>>; }>;
+    executeTx<MT extends import("@agoric/cosmic-proto").TypedJson[]>(messages: MT): PromiseVowOfTupleMappedToGenerics<ResponseToMany<MT>>;
     monitorTransfers(tap: TargetApp): import("@agoric/vow").PromiseVow<TargetRegistration>;
 }>) => import("@endo/exo").Guarded<{
     /**

package/src/fixtures/query-flows.contract.d.ts

@@ -24,7 +24,7 @@ export const start: (zcf: ZCF<Record<string, unknown>>, privateArgs: Orchestrati
 }>;
 export type QueryFlowsSF = typeof start;
 import type { ZCF } from '@agoric/zoe';
-import type { OrchestrationPowers } from '..//utils/start-helper.js';
+import type { OrchestrationPowers } from '../utils/start-helper.js';
 import type { CosmosChainInfo } from '@agoric/orchestration';
 import type { Denom } from '@agoric/orchestration';
 import type { DenomDetail } from '@agoric/orchestration';

package/src/fixtures/query-flows.contract.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-flows.contract.d.ts","sourceRoot":"","sources":["query-flows.contract.js"],"names":[],"mappings":"AAmFA;gBA/DiB,UAAU;gBACV,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;gBAC/B,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE;;;;;;;;;;;;;;;;;;GA6DgB;2BAGjE,OAAO,KAAK;yBA5EJ,aAAa;yCAGG,2BAA2B;qCADX,uBAAuB;2BAAvB,uBAAuB;iCAAvB,uBAAuB"}
+{"version":3,"file":"query-flows.contract.d.ts","sourceRoot":"","sources":["query-flows.contract.js"],"names":[],"mappings":"AAkFA;gBA/DiB,UAAU;gBACV,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC;gBAC/B,CAAC,KAAK,EAAE,WAAW,GAAG;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE;;;;;;;;;;;;;;;;;;GA6DgB;2BAGjE,OAAO,KAAK;yBA3EJ,aAAa;yCAGuB,0BAA0B;qCAD9B,uBAAuB;2BAAvB,uBAAuB;iCAAvB,uBAAuB"}

package/src/fixtures/query-flows.contract.js

@@ -11,8 +11,7 @@ import * as flows from './query-flows.flows.js';
  * @import {ZCF} from '@agoric/zoe';
  * @import {Zone} from '@agoric/zone';
  * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
- * @import {OrchestrationPowers} from '..//utils/start-helper.js';
- * @import {OrchestrationTools} from '../utils/start-helper.js';
+ * @import {OrchestrationPowers, OrchestrationTools} from '../utils/start-helper.js';
  */
 
 /**

package/src/stubs/viem-abi.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @file bundling these functions results in something that
+ * depends on node APIs such as stream and crypto (viem/utils
+ * includes an http client etc.)
+ *
+ * So we use tsup to do dead code elimination, aka tree-shaking,
+ * while preserving type info.
+ */
+export { encodeFunctionData } from 'viem/utils';
+export { decodeAbiParameters } from 'viem/utils';
+export { encodeAbiParameters } from 'viem/utils';
+//# sourceMappingURL=viem-abi.d.ts.map

package/src/stubs/viem-abi.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"viem-abi.d.ts","sourceRoot":"","sources":["viem-abi.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC"}

package/src/stubs/viem-abi.ts

@@ -0,0 +1,11 @@
+/**
+ * @file bundling these functions results in something that
+ * depends on node APIs such as stream and crypto (viem/utils
+ * includes an http client etc.)
+ *
+ * So we use tsup to do dead code elimination, aka tree-shaking,
+ * while preserving type info.
+ */
+export { encodeFunctionData } from 'viem/utils';
+export { decodeAbiParameters } from 'viem/utils';
+export { encodeAbiParameters } from 'viem/utils';

package/src/utils/agd-lib.d.ts

@@ -1,4 +1,3 @@
-export function flags(record: Record<string, unknown>): string[];
 export function makeAgd({ execFileSync, log }: {
     execFileSync: ExecSync;
     log?: typeof console.log;

package/src/utils/agd-lib.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agd-lib.d.ts","sourceRoot":"","sources":["agd-lib.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"agd-lib.d.ts","sourceRoot":"","sources":["agd-lib.js"],"names":[],"mappings":"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"}

package/src/utils/agd-lib.js

@@ -1,22 +1,10 @@
 import assert from 'node:assert';
+import { toCLIOptions } from '@agoric/internal/src/cli-utils.js';
 
 const { freeze } = Object;
 
 const agdBinary = 'agd';
 
-/**
- * @param {Record<string, unknown>} record - e.g. { color: 'blue' }
- * @returns {string[]} - e.g. ['--color', 'blue']
- */
-export const flags = record => {
-  // TODO? support --yes with boolean?
-
-  /** @type {[string, string][]} */
-  // @ts-expect-error undefined is filtered out
-  const skipUndef = Object.entries(record).filter(([_k, v]) => v !== undefined);
-  return skipUndef.map(([k, v]) => [`--${k}`, v]).flat();
-};
-
 /**
  * @callback ExecSync
  * @param {string} file
@@ -37,7 +25,10 @@ export const makeAgd = ({ execFileSync, log = console.log }) => {
    * }} opts
    */
   const make = ({ home, keyringBackend, rpcAddrs } = {}) => {
-    const keyringArgs = flags({ home, 'keyring-backend': keyringBackend });
+    const keyringArgs = toCLIOptions({
+      home,
+      'keyring-backend': keyringBackend,
+    });
     if (rpcAddrs) {
       assert.equal(
         rpcAddrs.length,
@@ -45,7 +36,7 @@ export const makeAgd = ({ execFileSync, log = console.log }) => {
         'XXX rpcAddrs must contain only one entry',
       );
     }
-    const nodeArgs = flags({ node: rpcAddrs && rpcAddrs[0] });
+    const nodeArgs = toCLIOptions({ node: rpcAddrs && rpcAddrs[0] });
 
     /**
      * @param {string[]} args
@@ -54,7 +45,7 @@ export const makeAgd = ({ execFileSync, log = console.log }) => {
     const exec = (args, opts = { encoding: 'utf-8' }) =>
       execFileSync(agdBinary, args, opts);
 
-    const outJson = flags({ output: 'json' });
+    const outJson = toCLIOptions({ output: 'json' });
 
     const ro = freeze({
       status: async () => JSON.parse(exec([...nodeArgs, 'status'])),
@@ -110,8 +101,8 @@ export const makeAgd = ({ execFileSync, log = console.log }) => {
           ...txArgs,
           ...nodeArgs,
           ...keyringArgs,
-          ...flags({ 'chain-id': chainId, from }),
-          ...flags({
+          ...toCLIOptions({ 'chain-id': chainId, from }),
+          ...toCLIOptions({
             'broadcast-mode': 'block',
             gas: 'auto',
             'gas-adjustment': '1.4',