Merge pull request osmosis-labs#83 from osmosis-labs/fix-build

Fix import cosmos from osmojs issue

packages/osmo-query/.gitignore

@@ -10,9 +10,6 @@ pids
 
 # dist
 dist
-mjs
-main
-module
 
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov

packages/osmo-query/package.json

@@ -1,12 +1,11 @@
 {
   "name": "osmo-query",
-  "version": "16.8.3",
+  "version": "16.8.5",
   "description": "Typescript Protobuf Messages for Osmosis with react-query",
   "author": "Dan Lynch <[email protected]>",
   "homepage": "https://github.com/osmosis-labs/osmojs/tree/master/packages/osmojs#readme",
   "license": "SEE LICENSE IN LICENSE",
   "main": "dist/index.js",
-  "module": "dist/index.mjs",
   "typings": "dist/index.d.ts",
   "directories": {
     "lib": "src",
@@ -18,12 +17,9 @@
   ],
   "scripts": {
     "build:cjs": "yarn tsc -p tsconfig.json --outDir dist --module commonjs || true",
-    "build:mjs": "yarn tsc -p tsconfig.json --outDir mjs --module es2022 --declaration false || true",
-    "clean:mjs": "rimraf mjs",
     "clean:dist": "rimraf dist",
-    "clean": "npm run clean:mjs && npm run clean:dist",
-    "build:rename": "publish-scripts --cmd rename --srcDir mjs --outDir dist --findExt js --replaceExt mjs --no-rmDir",
-    "build": "npm run clean && npm run build:cjs && npm run build:mjs && npm run build:rename",
+    "clean": "npm run clean:dist",
+    "build": "npm run clean && npm run build:cjs",
     "codegen": "cross-env NODE_ENV=development babel-node scripts/codegen.js",
     "prepare": "npm run build",
     "lint": "eslint .",

packages/osmo-query/src/codegen/binary.ts

@@ -1,5 +1,5 @@
 /**
-* This file and any referenced files were automatically generated by @cosmology/[email protected].3
+* This file and any referenced files were automatically generated by @cosmology/[email protected].6
 * DO NOT MODIFY BY HAND. Instead, download the latest proto files for your chain
 * and run the transpile command or yarn proto command to regenerate this bundle.
 */

packages/osmo-query/src/codegen/cosmos/auth/module/v1/module.ts

@@ -0,0 +1,244 @@
+import { BinaryReader, BinaryWriter } from "../../../../binary";
+/** Module is the config object for the auth module. */
+export interface Module {
+  /** bech32_prefix is the bech32 account prefix for the app. */
+  bech32Prefix: string;
+  /** module_account_permissions are module account permissions. */
+  moduleAccountPermissions: ModuleAccountPermission[];
+  /** authority defines the custom module authority. If not set, defaults to the governance module. */
+  authority: string;
+}
+export interface ModuleProtoMsg {
+  typeUrl: "/cosmos.auth.module.v1.Module";
+  value: Uint8Array;
+}
+/** Module is the config object for the auth module. */
+export interface ModuleAmino {
+  /** bech32_prefix is the bech32 account prefix for the app. */
+  bech32_prefix?: string;
+  /** module_account_permissions are module account permissions. */
+  module_account_permissions?: ModuleAccountPermissionAmino[];
+  /** authority defines the custom module authority. If not set, defaults to the governance module. */
+  authority?: string;
+}
+export interface ModuleAminoMsg {
+  type: "cosmos-sdk/Module";
+  value: ModuleAmino;
+}
+/** Module is the config object for the auth module. */
+export interface ModuleSDKType {
+  bech32_prefix: string;
+  module_account_permissions: ModuleAccountPermissionSDKType[];
+  authority: string;
+}
+/** ModuleAccountPermission represents permissions for a module account. */
+export interface ModuleAccountPermission {
+  /** account is the name of the module. */
+  account: string;
+  /**
+   * permissions are the permissions this module has. Currently recognized
+   * values are minter, burner and staking.
+   */
+  permissions: string[];
+}
+export interface ModuleAccountPermissionProtoMsg {
+  typeUrl: "/cosmos.auth.module.v1.ModuleAccountPermission";
+  value: Uint8Array;
+}
+/** ModuleAccountPermission represents permissions for a module account. */
+export interface ModuleAccountPermissionAmino {
+  /** account is the name of the module. */
+  account?: string;
+  /**
+   * permissions are the permissions this module has. Currently recognized
+   * values are minter, burner and staking.
+   */
+  permissions?: string[];
+}
+export interface ModuleAccountPermissionAminoMsg {
+  type: "cosmos-sdk/ModuleAccountPermission";
+  value: ModuleAccountPermissionAmino;
+}
+/** ModuleAccountPermission represents permissions for a module account. */
+export interface ModuleAccountPermissionSDKType {
+  account: string;
+  permissions: string[];
+}
+function createBaseModule(): Module {
+  return {
+    bech32Prefix: "",
+    moduleAccountPermissions: [],
+    authority: ""
+  };
+}
+export const Module = {
+  typeUrl: "/cosmos.auth.module.v1.Module",
+  encode(message: Module, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter {
+    if (message.bech32Prefix !== "") {
+      writer.uint32(10).string(message.bech32Prefix);
+    }
+    for (const v of message.moduleAccountPermissions) {
+      ModuleAccountPermission.encode(v!, writer.uint32(18).fork()).ldelim();
+    }
+    if (message.authority !== "") {
+      writer.uint32(26).string(message.authority);
+    }
+    return writer;
+  },
+  decode(input: BinaryReader | Uint8Array, length?: number): Module {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseModule();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          message.bech32Prefix = reader.string();
+          break;
+        case 2:
+          message.moduleAccountPermissions.push(ModuleAccountPermission.decode(reader, reader.uint32()));
+          break;
+        case 3:
+          message.authority = reader.string();
+          break;
+        default:
+          reader.skipType(tag & 7);
+          break;
+      }
+    }
+    return message;
+  },
+  fromPartial(object: Partial<Module>): Module {
+    const message = createBaseModule();
+    message.bech32Prefix = object.bech32Prefix ?? "";
+    message.moduleAccountPermissions = object.moduleAccountPermissions?.map(e => ModuleAccountPermission.fromPartial(e)) || [];
+    message.authority = object.authority ?? "";
+    return message;
+  },
+  fromAmino(object: ModuleAmino): Module {
+    const message = createBaseModule();
+    if (object.bech32_prefix !== undefined && object.bech32_prefix !== null) {
+      message.bech32Prefix = object.bech32_prefix;
+    }
+    message.moduleAccountPermissions = object.module_account_permissions?.map(e => ModuleAccountPermission.fromAmino(e)) || [];
+    if (object.authority !== undefined && object.authority !== null) {
+      message.authority = object.authority;
+    }
+    return message;
+  },
+  toAmino(message: Module): ModuleAmino {
+    const obj: any = {};
+    obj.bech32_prefix = message.bech32Prefix;
+    if (message.moduleAccountPermissions) {
+      obj.module_account_permissions = message.moduleAccountPermissions.map(e => e ? ModuleAccountPermission.toAmino(e) : undefined);
+    } else {
+      obj.module_account_permissions = [];
+    }
+    obj.authority = message.authority;
+    return obj;
+  },
+  fromAminoMsg(object: ModuleAminoMsg): Module {
+    return Module.fromAmino(object.value);
+  },
+  toAminoMsg(message: Module): ModuleAminoMsg {
+    return {
+      type: "cosmos-sdk/Module",
+      value: Module.toAmino(message)
+    };
+  },
+  fromProtoMsg(message: ModuleProtoMsg): Module {
+    return Module.decode(message.value);
+  },
+  toProto(message: Module): Uint8Array {
+    return Module.encode(message).finish();
+  },
+  toProtoMsg(message: Module): ModuleProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.module.v1.Module",
+      value: Module.encode(message).finish()
+    };
+  }
+};
+function createBaseModuleAccountPermission(): ModuleAccountPermission {
+  return {
+    account: "",
+    permissions: []
+  };
+}
+export const ModuleAccountPermission = {
+  typeUrl: "/cosmos.auth.module.v1.ModuleAccountPermission",
+  encode(message: ModuleAccountPermission, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter {
+    if (message.account !== "") {
+      writer.uint32(10).string(message.account);
+    }
+    for (const v of message.permissions) {
+      writer.uint32(18).string(v!);
+    }
+    return writer;
+  },
+  decode(input: BinaryReader | Uint8Array, length?: number): ModuleAccountPermission {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseModuleAccountPermission();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        case 1:
+          message.account = reader.string();
+          break;
+        case 2:
+          message.permissions.push(reader.string());
+          break;
+        default:
+          reader.skipType(tag & 7);
+          break;
+      }
+    }
+    return message;
+  },
+  fromPartial(object: Partial<ModuleAccountPermission>): ModuleAccountPermission {
+    const message = createBaseModuleAccountPermission();
+    message.account = object.account ?? "";
+    message.permissions = object.permissions?.map(e => e) || [];
+    return message;
+  },
+  fromAmino(object: ModuleAccountPermissionAmino): ModuleAccountPermission {
+    const message = createBaseModuleAccountPermission();
+    if (object.account !== undefined && object.account !== null) {
+      message.account = object.account;
+    }
+    message.permissions = object.permissions?.map(e => e) || [];
+    return message;
+  },
+  toAmino(message: ModuleAccountPermission): ModuleAccountPermissionAmino {
+    const obj: any = {};
+    obj.account = message.account;
+    if (message.permissions) {
+      obj.permissions = message.permissions.map(e => e);
+    } else {
+      obj.permissions = [];
+    }
+    return obj;
+  },
+  fromAminoMsg(object: ModuleAccountPermissionAminoMsg): ModuleAccountPermission {
+    return ModuleAccountPermission.fromAmino(object.value);
+  },
+  toAminoMsg(message: ModuleAccountPermission): ModuleAccountPermissionAminoMsg {
+    return {
+      type: "cosmos-sdk/ModuleAccountPermission",
+      value: ModuleAccountPermission.toAmino(message)
+    };
+  },
+  fromProtoMsg(message: ModuleAccountPermissionProtoMsg): ModuleAccountPermission {
+    return ModuleAccountPermission.decode(message.value);
+  },
+  toProto(message: ModuleAccountPermission): Uint8Array {
+    return ModuleAccountPermission.encode(message).finish();
+  },
+  toProtoMsg(message: ModuleAccountPermission): ModuleAccountPermissionProtoMsg {
+    return {
+      typeUrl: "/cosmos.auth.module.v1.ModuleAccountPermission",
+      value: ModuleAccountPermission.encode(message).finish()
+    };
+  }
+};

packages/osmo-query/src/codegen/cosmos/authz/module/v1/module.ts

@@ -0,0 +1,71 @@
+import { BinaryReader, BinaryWriter } from "../../../../binary";
+/** Module is the config object of the authz module. */
+export interface Module {}
+export interface ModuleProtoMsg {
+  typeUrl: "/cosmos.authz.module.v1.Module";
+  value: Uint8Array;
+}
+/** Module is the config object of the authz module. */
+export interface ModuleAmino {}
+export interface ModuleAminoMsg {
+  type: "cosmos-sdk/Module";
+  value: ModuleAmino;
+}
+/** Module is the config object of the authz module. */
+export interface ModuleSDKType {}
+function createBaseModule(): Module {
+  return {};
+}
+export const Module = {
+  typeUrl: "/cosmos.authz.module.v1.Module",
+  encode(_: Module, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter {
+    return writer;
+  },
+  decode(input: BinaryReader | Uint8Array, length?: number): Module {
+    const reader = input instanceof BinaryReader ? input : new BinaryReader(input);
+    let end = length === undefined ? reader.len : reader.pos + length;
+    const message = createBaseModule();
+    while (reader.pos < end) {
+      const tag = reader.uint32();
+      switch (tag >>> 3) {
+        default:
+          reader.skipType(tag & 7);
+          break;
+      }
+    }
+    return message;
+  },
+  fromPartial(_: Partial<Module>): Module {
+    const message = createBaseModule();
+    return message;
+  },
+  fromAmino(_: ModuleAmino): Module {
+    const message = createBaseModule();
+    return message;
+  },
+  toAmino(_: Module): ModuleAmino {
+    const obj: any = {};
+    return obj;
+  },
+  fromAminoMsg(object: ModuleAminoMsg): Module {
+    return Module.fromAmino(object.value);
+  },
+  toAminoMsg(message: Module): ModuleAminoMsg {
+    return {
+      type: "cosmos-sdk/Module",
+      value: Module.toAmino(message)
+    };
+  },
+  fromProtoMsg(message: ModuleProtoMsg): Module {
+    return Module.decode(message.value);
+  },
+  toProto(message: Module): Uint8Array {
+    return Module.encode(message).finish();
+  },
+  toProtoMsg(message: Module): ModuleProtoMsg {
+    return {
+      typeUrl: "/cosmos.authz.module.v1.Module",
+      value: Module.encode(message).finish()
+    };
+  }
+};