feat: extend makeInteractiveSigner and make it exportable

- adds fifth optional argument `opts` to `makeInteractiveSigner`
- allows additional Registry types to be sent in `opts.registryTypes`
- allows additonal amino converters to be sent in `opts.converters`
- allows initial client gas price to be set with `opts.gasPrice`
- exposes `signAndBroadcast` method, that takes any EncodeObject as an argument
- exposes `makeInteractiveSigner` externally to consumers

Author: 0xpatrickdev

packages/web-components/index.js

@@ -2,6 +2,7 @@
 
 export { makeAgoricKeplrConnection } from './src/keplr-connection/KeplrConnection.js';
 export { makeAgoricWalletConnection } from './src/wallet-connection/walletConnection.js';
+export { makeInteractiveSigner } from './src/wallet-connection/makeInteractiveSigner.js';
 export { suggestChain } from './src/wallet-connection/suggestChain.js';
 export { Errors as AgoricKeplrConnectionErrors } from './src/errors.js';
 export {

packages/web-components/src/wallet-connection/makeInteractiveSigner.js

@@ -55,13 +55,6 @@ const SwingsetMsgs = {
 
 /** @typedef {{owner: string, spendAction: string}} WalletSpendAction */
 
-const SwingsetRegistry = new Registry([
-  ...defaultRegistryTypes,
-  // XXX should this list be "upstreamed" to @agoric/cosmic-proto?
-  [SwingsetMsgs.MsgWalletSpendAction.typeUrl, MsgWalletSpendAction],
-  [SwingsetMsgs.MsgProvision.typeUrl, MsgProvision],
-]);
-
 /**
  * @returns {StdFee}
  */
@@ -127,19 +120,28 @@ const SwingsetConverters = {
   },
 };
 
+/**
+ * @typedef {object} MakeInteractiveSignerOpts
+ * @property {Array<[string, import('@cosmjs/proto-signing').GeneratedType]>} registryTypes
+ * @property {import('@cosmjs/stargate').SigningStargateClientOptions['gasPrice']} gasPrice
+ * @property {AminoConverters} converters
+ */
+
 /**
  * Use Keplr to sign offers and delegate object messaging to local storage key.
  * @param {string} chainId
  * @param {string} rpc
  * @param {Keplr} keplr
  * @param {typeof import('@cosmjs/stargate').SigningStargateClient.connectWithSigner} connectWithSigner
+ * @param {MakeInteractiveSignerOpts} [opts]
  * Ref: https://docs.keplr.app/api/
  */
 export const makeInteractiveSigner = async (
   chainId,
   rpc,
   keplr,
   connectWithSigner,
+  opts,
 ) => {
   await null;
   try {
@@ -163,10 +165,19 @@ export const makeInteractiveSigner = async (
     ...SwingsetConverters,
     ...createBankAminoConverters(),
     ...createAuthzAminoConverters(),
+    ...(opts?.converters || {}),
   };
+  const SwingsetRegistry = new Registry([
+    ...defaultRegistryTypes,
+    // XXX should this list be "upstreamed" to @agoric/cosmic-proto?
+    [SwingsetMsgs.MsgWalletSpendAction.typeUrl, MsgWalletSpendAction],
+    [SwingsetMsgs.MsgProvision.typeUrl, MsgProvision],
+    ...(opts?.registryTypes || []),
+  ]);
   const signingClient = await connectWithSigner(rpc, offlineSigner, {
     aminoTypes: new AminoTypes(converters),
     registry: SwingsetRegistry,
+    ...(opts?.gasPrice ? { gasPrice: opts.gasPrice } : {}),
   });
   console.debug('InteractiveSigner', { signingClient });
 
@@ -240,6 +251,29 @@ export const makeInteractiveSigner = async (
       console.debug('spend action result tx', tx);
       assertIsDeliverTxSuccess(tx);
 
+      return tx;
+    },
+    /**
+     * Sign and broadcast any Action
+     *
+     * @param {import('@cosmjs/proto-signing').EncodeObject} msg encoded msg
+     * @throws if account does not exist on chain, user cancels,
+     *         RPC connection fails, RPC service fails to broadcast (
+     *         for example, if signature verification fails)
+     */
+    signAndBroadcast: async msg => {
+      const { accountNumber, sequence } = await signingClient.getSequence(
+        address,
+      );
+      console.debug({ accountNumber, sequence });
+
+      const msgs = [msg];
+      console.debug('sign msg', { address, msgs, fee });
+
+      const tx = await signingClient.signAndBroadcast(address, msgs, fee);
+      console.debug('msg result tx', tx);
+      assertIsDeliverTxSuccess(tx);
+
       return tx;
     },
   });