decentralcardgame-cardchain-client-ts 0.0.17 → 0.0.19

package/DecentralCardGame.cardchain.cardchain/types/cardchain/cardchain/voting.ts

@@ -4,6 +4,51 @@ import _m0 from "protobufjs/minimal";
 
 export const protobufPackage = "DecentralCardGame.cardchain.cardchain";
 
+export enum VoteType {
+  fairEnough = 0,
+  inappropriate = 1,
+  overpowered = 2,
+  underpowered = 3,
+  UNRECOGNIZED = -1,
+}
+
+export function voteTypeFromJSON(object: any): VoteType {
+  switch (object) {
+    case 0:
+    case "fairEnough":
+      return VoteType.fairEnough;
+    case 1:
+    case "inappropriate":
+      return VoteType.inappropriate;
+    case 2:
+    case "overpowered":
+      return VoteType.overpowered;
+    case 3:
+    case "underpowered":
+      return VoteType.underpowered;
+    case -1:
+    case "UNRECOGNIZED":
+    default:
+      return VoteType.UNRECOGNIZED;
+  }
+}
+
+export function voteTypeToJSON(object: VoteType): string {
+  switch (object) {
+    case VoteType.fairEnough:
+      return "fairEnough";
+    case VoteType.inappropriate:
+      return "inappropriate";
+    case VoteType.overpowered:
+      return "overpowered";
+    case VoteType.underpowered:
+      return "underpowered";
+    case VoteType.UNRECOGNIZED:
+    default:
+      return "UNRECOGNIZED";
+  }
+}
+
 export interface VotingResults {
   totalVotes: number;
   totalFairEnoughVotes: number;
@@ -25,12 +70,7 @@ export interface VotingResult {
 
 export interface SingleVote {
   cardId: number;
-  voteType: string;
-}
-
-export interface VoteRight {
-  cardId: number;
-  expireBlock: number;
+  voteType: VoteType;
 }
 
 function createBaseVotingResults(): VotingResults {
@@ -255,7 +295,7 @@ export const VotingResult = {
 };
 
 function createBaseSingleVote(): SingleVote {
-  return { cardId: 0, voteType: "" };
+  return { cardId: 0, voteType: 0 };
 }
 
 export const SingleVote = {
@@ -263,8 +303,8 @@ export const SingleVote = {
     if (message.cardId !== 0) {
       writer.uint32(8).uint64(message.cardId);
     }
-    if (message.voteType !== "") {
-      writer.uint32(18).string(message.voteType);
+    if (message.voteType !== 0) {
+      writer.uint32(16).int32(message.voteType);
     }
     return writer;
   },
@@ -280,7 +320,7 @@ export const SingleVote = {
           message.cardId = longToNumber(reader.uint64() as Long);
           break;
         case 2:
-          message.voteType = reader.string();
+          message.voteType = reader.int32() as any;
           break;
         default:
           reader.skipType(tag & 7);
@@ -293,79 +333,21 @@ export const SingleVote = {
   fromJSON(object: any): SingleVote {
     return {
       cardId: isSet(object.cardId) ? Number(object.cardId) : 0,
-      voteType: isSet(object.voteType) ? String(object.voteType) : "",
+      voteType: isSet(object.voteType) ? voteTypeFromJSON(object.voteType) : 0,
     };
   },
 
   toJSON(message: SingleVote): unknown {
     const obj: any = {};
     message.cardId !== undefined && (obj.cardId = Math.round(message.cardId));
-    message.voteType !== undefined && (obj.voteType = message.voteType);
+    message.voteType !== undefined && (obj.voteType = voteTypeToJSON(message.voteType));
     return obj;
   },
 
   fromPartial<I extends Exact<DeepPartial<SingleVote>, I>>(object: I): SingleVote {
     const message = createBaseSingleVote();
     message.cardId = object.cardId ?? 0;
-    message.voteType = object.voteType ?? "";
-    return message;
-  },
-};
-
-function createBaseVoteRight(): VoteRight {
-  return { cardId: 0, expireBlock: 0 };
-}
-
-export const VoteRight = {
-  encode(message: VoteRight, writer: _m0.Writer = _m0.Writer.create()): _m0.Writer {
-    if (message.cardId !== 0) {
-      writer.uint32(8).uint64(message.cardId);
-    }
-    if (message.expireBlock !== 0) {
-      writer.uint32(16).int64(message.expireBlock);
-    }
-    return writer;
-  },
-
-  decode(input: _m0.Reader | Uint8Array, length?: number): VoteRight {
-    const reader = input instanceof _m0.Reader ? input : new _m0.Reader(input);
-    let end = length === undefined ? reader.len : reader.pos + length;
-    const message = createBaseVoteRight();
-    while (reader.pos < end) {
-      const tag = reader.uint32();
-      switch (tag >>> 3) {
-        case 1:
-          message.cardId = longToNumber(reader.uint64() as Long);
-          break;
-        case 2:
-          message.expireBlock = longToNumber(reader.int64() as Long);
-          break;
-        default:
-          reader.skipType(tag & 7);
-          break;
-      }
-    }
-    return message;
-  },
-
-  fromJSON(object: any): VoteRight {
-    return {
-      cardId: isSet(object.cardId) ? Number(object.cardId) : 0,
-      expireBlock: isSet(object.expireBlock) ? Number(object.expireBlock) : 0,
-    };
-  },
-
-  toJSON(message: VoteRight): unknown {
-    const obj: any = {};
-    message.cardId !== undefined && (obj.cardId = Math.round(message.cardId));
-    message.expireBlock !== undefined && (obj.expireBlock = Math.round(message.expireBlock));
-    return obj;
-  },
-
-  fromPartial<I extends Exact<DeepPartial<VoteRight>, I>>(object: I): VoteRight {
-    const message = createBaseVoteRight();
-    message.cardId = object.cardId ?? 0;
-    message.expireBlock = object.expireBlock ?? 0;
+    message.voteType = object.voteType ?? 0;
     return message;
   },
 };

package/DecentralCardGame.cardchain.cardchain/types.js

@@ -11,15 +11,12 @@ import { Params } from "./types/cardchain/cardchain/params";
 import { IgnoreMatches } from "./types/cardchain/cardchain/query";
 import { IgnoreSellOffers } from "./types/cardchain/cardchain/query";
 import { QueryQServerResponse } from "./types/cardchain/cardchain/query";
-import { IgnoreCouncils } from "./types/cardchain/cardchain/query";
 import { RunningAverage } from "./types/cardchain/cardchain/running_average";
 import { Set } from "./types/cardchain/cardchain/set";
 import { SetProposal } from "./types/cardchain/cardchain/set_proposal";
-import { CouncilParticipation } from "./types/cardchain/cardchain/user";
 import { BoosterPack } from "./types/cardchain/cardchain/user";
 import { AirDrops } from "./types/cardchain/cardchain/user";
 import { VotingResults } from "./types/cardchain/cardchain/voting";
 import { VotingResult } from "./types/cardchain/cardchain/voting";
 import { SingleVote } from "./types/cardchain/cardchain/voting";
-import { VoteRight } from "./types/cardchain/cardchain/voting";
-export { Card, TimeStamp, CopyrightProposal, WrapClearResponse, WrapHashResponse, Image, MatchPlayer, MatchReporterProposal, Num, Params, IgnoreMatches, IgnoreSellOffers, QueryQServerResponse, IgnoreCouncils, RunningAverage, Set, SetProposal, CouncilParticipation, BoosterPack, AirDrops, VotingResults, VotingResult, SingleVote, VoteRight, };
+export { Card, TimeStamp, CopyrightProposal, WrapClearResponse, WrapHashResponse, Image, MatchPlayer, MatchReporterProposal, Num, Params, IgnoreMatches, IgnoreSellOffers, QueryQServerResponse, RunningAverage, Set, SetProposal, BoosterPack, AirDrops, VotingResults, VotingResult, SingleVote, };

package/DecentralCardGame.cardchain.cardchain/types.ts

@@ -11,17 +11,14 @@ import { Params } from "./types/cardchain/cardchain/params"
 import { IgnoreMatches } from "./types/cardchain/cardchain/query"
 import { IgnoreSellOffers } from "./types/cardchain/cardchain/query"
 import { QueryQServerResponse } from "./types/cardchain/cardchain/query"
-import { IgnoreCouncils } from "./types/cardchain/cardchain/query"
 import { RunningAverage } from "./types/cardchain/cardchain/running_average"
 import { Set } from "./types/cardchain/cardchain/set"
 import { SetProposal } from "./types/cardchain/cardchain/set_proposal"
-import { CouncilParticipation } from "./types/cardchain/cardchain/user"
 import { BoosterPack } from "./types/cardchain/cardchain/user"
 import { AirDrops } from "./types/cardchain/cardchain/user"
 import { VotingResults } from "./types/cardchain/cardchain/voting"
 import { VotingResult } from "./types/cardchain/cardchain/voting"
 import { SingleVote } from "./types/cardchain/cardchain/voting"
-import { VoteRight } from "./types/cardchain/cardchain/voting"
 
 
 export {     
@@ -38,16 +35,13 @@ export {
     IgnoreMatches,
     IgnoreSellOffers,
     QueryQServerResponse,
-    IgnoreCouncils,
     RunningAverage,
     Set,
     SetProposal,
-    CouncilParticipation,
     BoosterPack,
     AirDrops,
     VotingResults,
     VotingResult,
     SingleVote,
-    VoteRight,
     
  }

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.17",
+  "version": "0.0.19",
   "description": "Autogenerated Typescript Client for crowdcontrol cardchain",
   "author": "Lxgr <lxgr@protonmail.com>",
   "license": "GPL-v3",