decentralcardgame-cardchain-client-ts 0.0.26-rc1 → 0.0.27

package/client.ts

@@ -1,182 +1,169 @@
 /// <reference path="./types.d.ts" />
 import {
-    GeneratedType,
-    OfflineSigner,
-    EncodeObject,
-    Registry,
+  GeneratedType,
+  OfflineSigner,
+  EncodeObject,
+  Registry,
 } from "@cosmjs/proto-signing";
-import {StdFee} from "@cosmjs/amino";
-import {AminoTypes, SigningStargateClient} from "@cosmjs/stargate";
-import {Env} from "./env";
-import {UnionToIntersection, Return, Constructor} from "./helpers";
-import {Module} from "./modules";
-import {EventEmitter} from "events";
-import {ChainInfo} from "@keplr-wallet/types";
-import {
-    createDecentralCardgameAminoConverters
-} from "./DecentralCardGame.cardchain.cardchain/types/cardchain/cardchain/aminomessages";
+import { StdFee } from "@cosmjs/amino";
+import { SigningStargateClient } from "@cosmjs/stargate";
+import { Env } from "./env";
+import { UnionToIntersection, Return, Constructor } from "./helpers";
+import { Module } from "./modules";
+import { EventEmitter } from "events";
+import { ChainInfo } from "@keplr-wallet/types";
 
 const defaultFee = {
-    amount: [],
-    gas: "200000",
+  amount: [],
+  gas: "200000",
 };
 
 export class IgniteClient extends EventEmitter {
-    static plugins: Module[] = [];
-    env: Env;
-    signer?: OfflineSigner;
-    registry: Array<[string, GeneratedType]> = [];
-    aminoTypes?: AminoTypes
-
-    static plugin<T extends Module | Module[]>(plugin: T) {
-        const currentPlugins = this.plugins;
-
-        class AugmentedClient extends this {
-            static plugins = currentPlugins.concat(plugin);
-        }
-
-        if (Array.isArray(plugin)) {
-            type Extension = UnionToIntersection<Return<T>['module']>
-            return AugmentedClient as typeof IgniteClient & Constructor<Extension>;
-        }
-
-        type Extension = Return<T>['module']
-        return AugmentedClient as typeof IgniteClient & Constructor<Extension>;
-    }
-
-    async signAndBroadcast(msgs: EncodeObject[], fee: StdFee, memo: string) {
-        if (this.signer) {
-            const {address} = (await this.signer.getAccounts())[0];
-            const signingClient = await SigningStargateClient.connectWithSigner(this.env.rpcURL, this.signer, {
-                aminoTypes: this.aminoTypes,
-                registry: new Registry(this.registry),
-                prefix: this.env.prefix
-            });
-            return await signingClient.signAndBroadcast(address, msgs, fee ? fee : defaultFee, memo)
-        } else {
-            throw new Error(" Signer is not present.");
-        }
-    }
-
-    constructor(env: Env, signer?: OfflineSigner) {
-        super();
-        this.env = env;
-        this.setMaxListeners(0);
-        this.signer = signer;
-        this.aminoTypes = new AminoTypes({additions: createDecentralCardgameAminoConverters(), prefix:"cc"})
-        const classConstructor = this.constructor as typeof IgniteClient;
-        classConstructor.plugins.forEach(plugin => {
-            const pluginInstance = plugin(this);
-            Object.assign(this, pluginInstance.module)
-            if (this.registry) {
-                this.registry = this.registry.concat(pluginInstance.registry)
-            }
-        });
+	static plugins: Module[] = [];
+  env: Env;
+  signer?: OfflineSigner;
+  registry: Array<[string, GeneratedType]> = [];
+  static plugin<T extends Module | Module[]>(plugin: T) {
+    const currentPlugins = this.plugins;
+
+    class AugmentedClient extends this {
+      static plugins = currentPlugins.concat(plugin);
     }
 
-    useSigner(signer: OfflineSigner) {
-        this.signer = signer;
-        this.emit("signer-changed", this.signer);
+    if (Array.isArray(plugin)) {
+      type Extension = UnionToIntersection<Return<T>['module']>
+      return AugmentedClient as typeof IgniteClient & Constructor<Extension>;
     }
 
-    removeSigner() {
-        this.signer = undefined;
-        this.emit("signer-changed", this.signer);
+    type Extension = Return<T>['module']
+    return AugmentedClient as typeof IgniteClient & Constructor<Extension>;
+  }
+
+  async signAndBroadcast(msgs: EncodeObject[], fee: StdFee, memo: string) {
+    if (this.signer) {
+      const { address } = (await this.signer.getAccounts())[0];
+      const signingClient = await SigningStargateClient.connectWithSigner(this.env.rpcURL, this.signer, { registry: new Registry(this.registry), prefix: this.env.prefix });
+      return await signingClient.signAndBroadcast(address, msgs, fee ? fee : defaultFee, memo)
+    } else {
+      throw new Error(" Signer is not present.");
     }
-
-    async useKeplr(keplrChainInfo: Partial<ChainInfo> = {}) {
-        // Using queryClients directly because BaseClient has no knowledge of the modules at this stage
-        try {
-            const queryClient = (
-                await import("./cosmos.base.tendermint.v1beta1/module")
-            ).queryClient;
-            const stakingQueryClient = (
-                await import("./cosmos.staking.v1beta1/module")
-            ).queryClient;
-            const bankQueryClient = (await import("./cosmos.bank.v1beta1/module"))
-                .queryClient;
-
-            const stakingqc = stakingQueryClient({addr: this.env.apiURL});
-            const qc = queryClient({addr: this.env.apiURL});
-            const node_info = await (await qc.serviceGetNodeInfo()).data;
-            const chainId = node_info.default_node_info?.network ?? "";
-            const chainName = chainId?.toUpperCase() + " Network";
-            const staking = await (await stakingqc.queryParams()).data;
-            const bankqc = bankQueryClient({addr: this.env.apiURL});
-            const tokens = await (await bankqc.queryTotalSupply()).data;
-            const addrPrefix = this.env.prefix ?? "cosmos";
-            const rpc = this.env.rpcURL;
-            const rest = this.env.apiURL;
-            let stakeCurrency = {
-                coinDenom: staking.params?.bond_denom?.toUpperCase() ?? "",
-                coinMinimalDenom: staking.params?.bond_denom ?? "",
-                coinDecimals: 0,
-            };
-
-            let bip44 = {
-                coinType: 118,
-            };
-
-            let bech32Config = {
-                bech32PrefixAccAddr: addrPrefix,
-                bech32PrefixAccPub: addrPrefix + "pub",
-                bech32PrefixValAddr: addrPrefix + "valoper",
-                bech32PrefixValPub: addrPrefix + "valoperpub",
-                bech32PrefixConsAddr: addrPrefix + "valcons",
-                bech32PrefixConsPub: addrPrefix + "valconspub",
-            };
-
-            let currencies =
-                tokens.supply?.map((x) => {
-                    const y = {
-                        coinDenom: x.denom?.toUpperCase() ?? "",
-                        coinMinimalDenom: x.denom ?? "",
-                        coinDecimals: 0,
-                    };
-                    return y;
-                }) ?? [];
-
-            let feeCurrencies =
-                tokens.supply?.map((x) => {
-                    const y = {
-                        coinDenom: x.denom?.toUpperCase() ?? "",
-                        coinMinimalDenom: x.denom ?? "",
-                        coinDecimals: 0,
-                    };
-                    return y;
-                }) ?? [];
-
-            let coinType = 118;
-
-            if (chainId) {
-                const suggestOptions: ChainInfo = {
-                    chainId,
-                    chainName,
-                    rpc,
-                    rest,
-                    stakeCurrency,
-                    bip44,
-                    bech32Config,
-                    currencies,
-                    feeCurrencies,
-                    ...keplrChainInfo,
-                };
-                await window.keplr.experimentalSuggestChain(suggestOptions);
-
-                window.keplr.defaultOptions = {
-                    sign: {
-                        preferNoSetFee: true,
-                        preferNoSetMemo: true,
-                    },
-                };
-            }
-            await window.keplr.enable(chainId);
-            this.signer = window.keplr.getOfflineSignerOnlyAmino(chainId)  //.getOfflineSignerAuto(chainId);
-            this.emit("signer-changed", this.signer);
-        } catch (e) {
-            throw new Error(
-                "Could not load tendermint, staking and bank modules. Please ensure your client loads them to use useKeplr()"
-            );
-        }
+  }
+
+  constructor(env: Env, signer?: OfflineSigner) {
+    super();
+    this.env = env;
+    this.setMaxListeners(0);
+    this.signer = signer;
+    const classConstructor = this.constructor as typeof IgniteClient;
+    classConstructor.plugins.forEach(plugin => {
+      const pluginInstance = plugin(this);
+      Object.assign(this, pluginInstance.module)
+      if (this.registry) {
+        this.registry = this.registry.concat(pluginInstance.registry)
+      }
+		});
+  }
+  useSigner(signer: OfflineSigner) {
+      this.signer = signer;
+      this.emit("signer-changed", this.signer);
+  }
+  removeSigner() {
+      this.signer = undefined;
+      this.emit("signer-changed", this.signer);
+  }
+  async useKeplr(keplrChainInfo: Partial<ChainInfo> = {}) {
+    // Using queryClients directly because BaseClient has no knowledge of the modules at this stage
+    try {
+      const queryClient = (
+        await import("./cosmos.base.tendermint.v1beta1/module")
+      ).queryClient;
+      const stakingQueryClient = (
+        await import("./cosmos.staking.v1beta1/module")
+      ).queryClient;
+      const bankQueryClient = (await import("./cosmos.bank.v1beta1/module"))
+        .queryClient;
+
+      const stakingqc = stakingQueryClient({ addr: this.env.apiURL });
+      const qc = queryClient({ addr: this.env.apiURL });
+      const node_info = await (await qc.serviceGetNodeInfo()).data;
+      const chainId = node_info.default_node_info?.network ?? "";
+      const chainName = chainId?.toUpperCase() + " Network";
+      const staking = await (await stakingqc.queryParams()).data;
+      const bankqc = bankQueryClient({ addr: this.env.apiURL });
+      const tokens = await (await bankqc.queryTotalSupply()).data;
+      const addrPrefix = this.env.prefix ?? "cosmos";
+      const rpc = this.env.rpcURL;
+      const rest = this.env.apiURL;
+      let stakeCurrency = {
+        coinDenom: staking.params?.bond_denom?.toUpperCase() ?? "",
+        coinMinimalDenom: staking.params?.bond_denom ?? "",
+        coinDecimals: 0,
+      };
+
+      let bip44 = {
+        coinType: 118,
+      };
+
+      let bech32Config = {
+        bech32PrefixAccAddr: addrPrefix,
+        bech32PrefixAccPub: addrPrefix + "pub",
+        bech32PrefixValAddr: addrPrefix + "valoper",
+        bech32PrefixValPub: addrPrefix + "valoperpub",
+        bech32PrefixConsAddr: addrPrefix + "valcons",
+        bech32PrefixConsPub: addrPrefix + "valconspub",
+      };
+
+      let currencies =
+        tokens.supply?.map((x) => {
+          const y = {
+            coinDenom: x.denom?.toUpperCase() ?? "",
+            coinMinimalDenom: x.denom ?? "",
+            coinDecimals: 0,
+          };
+          return y;
+        }) ?? [];
+
+      let feeCurrencies =
+        tokens.supply?.map((x) => {
+          const y = {
+            coinDenom: x.denom?.toUpperCase() ?? "",
+            coinMinimalDenom: x.denom ?? "",
+            coinDecimals: 0,
+          };
+          return y;
+        }) ?? [];
+
+      let coinType = 118;
+
+      if (chainId) {
+        const suggestOptions: ChainInfo = {
+          chainId,
+          chainName,
+          rpc,
+          rest,
+          stakeCurrency,
+          bip44,
+          bech32Config,
+          currencies,
+          feeCurrencies,
+          ...keplrChainInfo,
+        };
+        await window.keplr.experimentalSuggestChain(suggestOptions);
+
+        window.keplr.defaultOptions = {
+          sign: {
+            preferNoSetFee: true,
+            preferNoSetMemo: true,
+          },
+        };
+      }
+      await window.keplr.enable(chainId);
+      this.signer = window.keplr.getOfflineSigner(chainId);
+      this.emit("signer-changed", this.signer);
+    } catch (e) {
+      throw new Error(
+        "Could not load tendermint, staking and bank modules. Please ensure your client loads them to use useKeplr()"
+      );
     }
+  }
 }

package/cosmos.auth.v1beta1/module.js

@@ -18,7 +18,10 @@ const defaultFee = {
     amount: [],
     gas: "200000",
 };
-export const txClient = ({ signer, prefix, addr } = { addr: "http://localhost:26657", prefix: "cosmos" }) => {
+export const txClient = ({ signer, prefix, addr } = {
+    addr: "http://localhost:26657",
+    prefix: "cosmos"
+}) => {
     return {};
 };
 export const queryClient = ({ addr: addr } = { addr: "http://localhost:1317" }) => {

package/cosmos.auth.v1beta1/module.ts

@@ -1,102 +1,104 @@
 // Generated by Ignite ignite.com/cli
 
-import { StdFee } from "@cosmjs/amino";
-import { SigningStargateClient, DeliverTxResponse } from "@cosmjs/stargate";
-import { EncodeObject, GeneratedType, OfflineSigner, Registry } from "@cosmjs/proto-signing";
-import { msgTypes } from './registry';
-import { IgniteClient } from "../client"
-import { MissingWalletError } from "../helpers"
-import { Api } from "./rest";
+import {StdFee} from "@cosmjs/amino";
+import {SigningStargateClient, DeliverTxResponse} from "@cosmjs/stargate";
+import {EncodeObject, GeneratedType, OfflineSigner, Registry} from "@cosmjs/proto-signing";
+import {msgTypes} from './registry';
+import {IgniteClient} from "../client"
+import {MissingWalletError} from "../helpers"
+import {Api} from "./rest";
 
-import { BaseAccount as typeBaseAccount} from "./types"
-import { ModuleAccount as typeModuleAccount} from "./types"
-import { Params as typeParams} from "./types"
-
-export {  };
+import {BaseAccount as typeBaseAccount} from "./types"
+import {ModuleAccount as typeModuleAccount} from "./types"
+import {Params as typeParams} from "./types"
 
+export {};
 
 
 export const registry = new Registry(msgTypes);
 
 type Field = {
-	name: string;
-	type: unknown;
+    name: string;
+    type: unknown;
 }
+
 function getStructure(template) {
-	const structure: {fields: Field[]} = { fields: [] }
-	for (let [key, value] of Object.entries(template)) {
-		let field = { name: key, type: typeof value }
-		structure.fields.push(field)
-	}
-	return structure
+    const structure: { fields: Field[] } = {fields: []}
+    for (let [key, value] of Object.entries(template)) {
+        let field = {name: key, type: typeof value}
+        structure.fields.push(field)
+    }
+    return structure
 }
+
 const defaultFee = {
-  amount: [],
-  gas: "200000",
+    amount: [],
+    gas: "200000",
 };
 
 interface TxClientOptions {
-  addr: string
-	prefix: string
-	signer?: OfflineSigner
+    addr: string
+    prefix: string
+    signer?: OfflineSigner
 }
 
-export const txClient = ({ signer, prefix, addr }: TxClientOptions = { addr: "http://localhost:26657", prefix: "cosmos" }) => {
+export const txClient = ({signer, prefix, addr}: TxClientOptions = {
+    addr: "http://localhost:26657",
+    prefix: "cosmos"
+}) => {
 
-  return {
-		
-		
-	}
+    return {}
 };
 
 interface QueryClientOptions {
-  addr: string
+    addr: string
 }
 
-export const queryClient = ({ addr: addr }: QueryClientOptions = { addr: "http://localhost:1317" }) => {
-  return new Api({ baseURL: addr });
+export const queryClient = ({addr: addr}: QueryClientOptions = {addr: "http://localhost:1317"}) => {
+    return new Api({baseURL: addr});
 };
 
 class SDKModule {
-	public query: ReturnType<typeof queryClient>;
-	public tx: ReturnType<typeof txClient>;
-	public structure: Record<string,unknown>;
-	public registry: Array<[string, GeneratedType]> = [];
-
-	constructor(client: IgniteClient) {		
-	
-		this.query = queryClient({ addr: client.env.apiURL });		
-		this.updateTX(client);
-		this.structure =  {
-						BaseAccount: getStructure(typeBaseAccount.fromPartial({})),
-						ModuleAccount: getStructure(typeModuleAccount.fromPartial({})),
-						Params: getStructure(typeParams.fromPartial({})),
-						
-		};
-		client.on('signer-changed',(signer) => {			
-		 this.updateTX(client);
-		})
-	}
-	updateTX(client: IgniteClient) {
-    const methods = txClient({
-        signer: client.signer,
-        addr: client.env.rpcURL,
-        prefix: client.env.prefix ?? "cosmos",
-    })
-	
-    this.tx = methods;
-    for (let m in methods) {
-        this.tx[m] = methods[m].bind(this.tx);
+    public query: ReturnType<typeof queryClient>;
+    public tx: ReturnType<typeof txClient>;
+    public structure: Record<string, unknown>;
+    public registry: Array<[string, GeneratedType]> = [];
+
+    constructor(client: IgniteClient) {
+
+        this.query = queryClient({addr: client.env.apiURL});
+        this.updateTX(client);
+        this.structure = {
+            BaseAccount: getStructure(typeBaseAccount.fromPartial({})),
+            ModuleAccount: getStructure(typeModuleAccount.fromPartial({})),
+            Params: getStructure(typeParams.fromPartial({})),
+
+        };
+        client.on('signer-changed', (signer) => {
+            this.updateTX(client);
+        })
+    }
+
+    updateTX(client: IgniteClient) {
+        const methods = txClient({
+            signer: client.signer,
+            addr: client.env.rpcURL,
+            prefix: client.env.prefix ?? "cosmos",
+        })
+
+        this.tx = methods;
+        for (let m in methods) {
+            this.tx[m] = methods[m].bind(this.tx);
+        }
     }
-	}
 };
 
 const Module = (test: IgniteClient) => {
-	return {
-		module: {
-			CosmosAuthV1Beta1: new SDKModule(test)
-		},
-		registry: msgTypes
-  }
+    return {
+        module: {
+            CosmosAuthV1Beta1: new SDKModule(test)
+        },
+        registry: msgTypes
+    }
 }
 export default Module;

package/cosmos.auth.v1beta1/rest.ts

@@ -9,6 +9,26 @@
  * ---------------------------------------------------------------
  */
 
+/**
+ * Params defines the parameters for the auth module.
+ */
+export interface Authv1Beta1Params {
+  /** @format uint64 */
+  max_memo_characters?: string;
+
+  /** @format uint64 */
+  tx_sig_limit?: string;
+
+  /** @format uint64 */
+  tx_size_cost_per_byte?: string;
+
+  /** @format uint64 */
+  sig_verify_cost_ed25519?: string;
+
+  /** @format uint64 */
+  sig_verify_cost_secp256k1?: string;
+}
+
 /**
 * `Any` contains an arbitrary serialized protocol buffer message along with a
 URL that describes the type of the serialized message.
@@ -230,26 +250,6 @@ export interface V1Beta1PageResponse {
   total?: string;
 }
 
-/**
- * Params defines the parameters for the auth module.
- */
-export interface V1Beta1Params {
-  /** @format uint64 */
-  max_memo_characters?: string;
-
-  /** @format uint64 */
-  tx_sig_limit?: string;
-
-  /** @format uint64 */
-  tx_size_cost_per_byte?: string;
-
-  /** @format uint64 */
-  sig_verify_cost_ed25519?: string;
-
-  /** @format uint64 */
-  sig_verify_cost_secp256k1?: string;
-}
-
 /**
  * Since: cosmos-sdk 0.46.2
  */
@@ -357,7 +357,7 @@ export interface V1Beta1QueryModuleAccountsResponse {
  */
 export interface V1Beta1QueryParamsResponse {
   /** params defines the parameters of the module. */
-  params?: V1Beta1Params;
+  params?: Authv1Beta1Params;
 }
 
 import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse, ResponseType } from "axios";