decentralcardgame-cardchain-client-ts 0.0.18 → 0.0.20

package/DecentralCardGame.cardchain.cardchain/types/cardchain/cardchain/aminomessages.js

@@ -0,0 +1,23 @@
+export function isAminoMsgTransferCard(msg) {
+    return msg.type === "decentral-cardgame/MsgTransferCard";
+}
+export function isAminoMsgRegisterForCouncil(msg) {
+    return msg.type === "decentral-cardgame/MsgRegisterForCouncil";
+}
+export function createDecentralCardgameAminoConverters() {
+    return {
+        "/DecentralCardGame.cardchain.cardchain.MsgTransferCard": {
+            aminoType: "decentral-cardgame/MsgTransferCard",
+            toAmino: (msg) => (msg),
+            fromAmino: (msg) => (msg),
+        },
+        "/DecentralCardGame.cardchain.cardchain.MsgRegisterForCouncil": {
+            aminoType: "decentral-cardgame/MsgRegisterForCouncil",
+            toAmino: (msg) => {
+                console.log("Hier hier, was da los?", msg);
+                return msg;
+            },
+            fromAmino: (msg) => (msg),
+        },
+    };
+}

package/DecentralCardGame.cardchain.cardchain/types/cardchain/cardchain/aminomessages.ts

@@ -0,0 +1,52 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+import { AminoMsg } from "@cosmjs/amino";
+
+// eslint-disable-next-line import/no-cycle
+import { AminoConverter } from "@cosmjs/stargate";
+import {MsgRegisterForCouncil, MsgTransferCard } from "./tx";
+
+type AminoConverters = Record<string, AminoConverter>;
+
+/** A high level transaction of the coin module */
+export interface AminoMsgTransferCard extends AminoMsg {
+  readonly type: "decentral-cardgame/MsgTransferCard";
+  readonly value: {
+    readonly creator: string;
+    readonly cardId: number;
+    readonly receiver: string;
+  };
+}
+
+export interface AminoMsgRegisterForCouncil extends AminoMsg {
+  readonly type: "decentral-cardgame/MsgRegisterForCouncil";
+  readonly value: {
+    readonly creator: string;
+  };
+}
+
+export function isAminoMsgTransferCard(msg: AminoMsg): msg is AminoMsgTransferCard {
+  return msg.type === "decentral-cardgame/MsgTransferCard";
+}
+
+export function isAminoMsgRegisterForCouncil(msg: AminoMsg): msg is AminoMsgRegisterForCouncil {
+  return msg.type === "decentral-cardgame/MsgRegisterForCouncil";
+}
+
+
+export function createDecentralCardgameAminoConverters(): AminoConverters {
+  return {
+    "/DecentralCardGame.cardchain.cardchain.MsgTransferCard": {
+      aminoType: "decentral-cardgame/MsgTransferCard",
+      toAmino: (msg: MsgTransferCard): AminoMsgTransferCard["value"] => (msg),
+      fromAmino: (msg: AminoMsgTransferCard["value"]): MsgTransferCard => (msg),
+    },
+    "/DecentralCardGame.cardchain.cardchain.MsgRegisterForCouncil": {
+      aminoType: "decentral-cardgame/MsgRegisterForCouncil",
+      toAmino: (msg: MsgRegisterForCouncil): AminoMsgRegisterForCouncil["value"] => {
+          console.log("Hier hier, was da los?", msg)
+          return msg
+        },
+      fromAmino: (msg: AminoMsgRegisterForCouncil["value"]): MsgRegisterForCouncil => (msg),
+    },
+  };
+}

package/client.js

@@ -1,7 +1,8 @@
 /// <reference path="./types.d.ts" />
 import { Registry, } from "@cosmjs/proto-signing";
-import { SigningStargateClient } from "@cosmjs/stargate";
+import { AminoTypes, SigningStargateClient } from "@cosmjs/stargate";
 import { EventEmitter } from "events";
+import { createDecentralCardgameAminoConverters } from "./DecentralCardGame.cardchain.cardchain/types/cardchain/cardchain/aminomessages";
 const defaultFee = {
     amount: [],
     gas: "200000",
@@ -20,7 +21,11 @@ export class IgniteClient extends EventEmitter {
     async signAndBroadcast(msgs, fee, memo) {
         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 });
+            const signingClient = await SigningStargateClient.connectWithSigner(this.env.rpcURL, this.signer, {
+                aminoTypes: new AminoTypes({ ...createDecentralCardgameAminoConverters() }),
+                registry: new Registry(this.registry),
+                prefix: this.env.prefix
+            });
             return await signingClient.signAndBroadcast(address, msgs, fee ? fee : defaultFee, memo);
         }
         else {

package/client.ts

@@ -1,169 +1,180 @@
 /// <reference path="./types.d.ts" />
 import {
-  GeneratedType,
-  OfflineSigner,
-  EncodeObject,
-  Registry,
+    GeneratedType,
+    OfflineSigner,
+    EncodeObject,
+    Registry,
 } from "@cosmjs/proto-signing";
-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";
+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";
 
 const defaultFee = {
-  amount: [],
-  gas: "200000",
+    amount: [],
+    gas: "200000",
 };
 
 export class IgniteClient extends EventEmitter {
-	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);
+    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);
+        }
+
+        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: new AminoTypes({...createDecentralCardgameAminoConverters()}),
+                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;
+        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)
+            }
+        });
     }
 
-    if (Array.isArray(plugin)) {
-      type Extension = UnionToIntersection<Return<T>['module']>
-      return AugmentedClient as typeof IgniteClient & Constructor<Extension>;  
+    useSigner(signer: OfflineSigner) {
+        this.signer = signer;
+        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.");
+    removeSigner() {
+        this.signer = undefined;
+        this.emit("signer-changed", this.signer);
     }
-  }
-
-  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 = await window.keplr.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()"
-      );
+
+    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 = await window.keplr.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()"
+            );
+        }
     }
-  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "decentralcardgame-cardchain-client-ts",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "Autogenerated Typescript Client for crowdcontrol cardchain",
   "author": "Lxgr <lxgr@protonmail.com>",
   "license": "GPL-v3",