merge main

hoangdv2429 · Jun 23, 2023 · 0084177 · 0084177
2 parents 97d3060 + 0c17199
commit 0084177
Show file tree

Hide file tree

Showing 17 changed files with 102 additions and 70 deletions.
diff --git a/__fixtures__/v-next/outputosmojs/ibc/lightclients/tendermint/v1/tendermint.ts b/__fixtures__/v-next/outputosmojs/ibc/lightclients/tendermint/v1/tendermint.ts
@@ -518,8 +518,8 @@ export const Misbehaviour = {
   fromSDK(object: MisbehaviourSDKType): Misbehaviour {
     return {
       clientId: object?.client_id,
-      header_1: object.header_1 ? Header.fromSDK(object.header_1) : undefined,
-      header_2: object.header_2 ? Header.fromSDK(object.header_2) : undefined
+      header1: object.header_1 ? Header.fromSDK(object.header_1) : undefined,
+      header2: object.header_2 ? Header.fromSDK(object.header_2) : undefined
     };
   },
   fromSDKJSON(object: any): MisbehaviourSDKType {
@@ -532,8 +532,8 @@ export const Misbehaviour = {
   toSDK(message: Misbehaviour): MisbehaviourSDKType {
     const obj: any = {};
     obj.client_id = message.clientId;
-    message.header_1 !== undefined && (obj.header_1 = message.header_1 ? Header.toSDK(message.header_1) : undefined);
-    message.header_2 !== undefined && (obj.header_2 = message.header_2 ? Header.toSDK(message.header_2) : undefined);
+    message.header1 !== undefined && (obj.header_1 = message.header1 ? Header.toSDK(message.header1) : undefined);
+    message.header2 !== undefined && (obj.header_2 = message.header2 ? Header.toSDK(message.header2) : undefined);
     return obj;
   }
 };

diff --git a/__fixtures__/v-next/outputv2/ibc/lightclients/tendermint/v1/tendermint.ts b/__fixtures__/v-next/outputv2/ibc/lightclients/tendermint/v1/tendermint.ts
@@ -727,29 +727,29 @@ export const Misbehaviour = {
   fromSDK(object: MisbehaviourSDKType): Misbehaviour {
     return {
       clientId: object?.client_id,
-      header_1: object.header_1 ? Header.fromSDK(object.header_1) : undefined,
-      header_2: object.header_2 ? Header.fromSDK(object.header_2) : undefined
+      header1: object.header_1 ? Header.fromSDK(object.header_1) : undefined,
+      header2: object.header_2 ? Header.fromSDK(object.header_2) : undefined
     };
   },
   toSDK(message: Misbehaviour): MisbehaviourSDKType {
     const obj: any = {};
     obj.client_id = message.clientId;
-    message.header_1 !== undefined && (obj.header_1 = message.header_1 ? Header.toSDK(message.header_1) : undefined);
-    message.header_2 !== undefined && (obj.header_2 = message.header_2 ? Header.toSDK(message.header_2) : undefined);
+    message.header1 !== undefined && (obj.header_1 = message.header1 ? Header.toSDK(message.header1) : undefined);
+    message.header2 !== undefined && (obj.header_2 = message.header2 ? Header.toSDK(message.header2) : undefined);
     return obj;
   },
   fromAmino(object: MisbehaviourAmino): Misbehaviour {
     return {
       clientId: object.client_id,
-      header_1: object?.header_1 ? Header.fromAmino(object.header_1) : undefined,
-      header_2: object?.header_2 ? Header.fromAmino(object.header_2) : undefined
+      header1: object?.header_1 ? Header.fromAmino(object.header_1) : undefined,
+      header2: object?.header_2 ? Header.fromAmino(object.header_2) : undefined
     };
   },
   toAmino(message: Misbehaviour): MisbehaviourAmino {
     const obj: any = {};
     obj.client_id = message.clientId;
-    obj.header_1 = message.header_1 ? Header.toAmino(message.header_1) : undefined;
-    obj.header_2 = message.header_2 ? Header.toAmino(message.header_2) : undefined;
+    obj.header_1 = message.header1 ? Header.toAmino(message.header1) : undefined;
+    obj.header_2 = message.header2 ? Header.toAmino(message.header2) : undefined;
     return obj;
   },
   fromAminoMsg(object: MisbehaviourAminoMsg): Misbehaviour {

diff --git a/__fixtures__/v-next/outputv3/ibc/lightclients/tendermint/v1/tendermint.ts b/__fixtures__/v-next/outputv3/ibc/lightclients/tendermint/v1/tendermint.ts
@@ -727,29 +727,29 @@ export const Misbehaviour = {
   fromSDK(object: MisbehaviourSDKType): Misbehaviour {
     return {
       clientId: object?.client_id,
-      header_1: object.header_1 ? Header.fromSDK(object.header_1) : undefined,
-      header_2: object.header_2 ? Header.fromSDK(object.header_2) : undefined
+      header1: object.header_1 ? Header.fromSDK(object.header_1) : undefined,
+      header2: object.header_2 ? Header.fromSDK(object.header_2) : undefined
     };
   },
   toSDK(message: Misbehaviour): MisbehaviourSDKType {
     const obj: any = {};
     obj.client_id = message.clientId;
-    message.header_1 !== undefined && (obj.header_1 = message.header_1 ? Header.toSDK(message.header_1) : undefined);
-    message.header_2 !== undefined && (obj.header_2 = message.header_2 ? Header.toSDK(message.header_2) : undefined);
+    message.header1 !== undefined && (obj.header_1 = message.header1 ? Header.toSDK(message.header1) : undefined);
+    message.header2 !== undefined && (obj.header_2 = message.header2 ? Header.toSDK(message.header2) : undefined);
     return obj;
   },
   fromAmino(object: MisbehaviourAmino): Misbehaviour {
     return {
       clientId: object.client_id,
-      header_1: object?.header_1 ? Header.fromAmino(object.header_1) : undefined,
-      header_2: object?.header_2 ? Header.fromAmino(object.header_2) : undefined
+      header1: object?.header_1 ? Header.fromAmino(object.header_1) : undefined,
+      header2: object?.header_2 ? Header.fromAmino(object.header_2) : undefined
     };
   },
   toAmino(message: Misbehaviour): MisbehaviourAmino {
     const obj: any = {};
     obj.client_id = message.clientId;
-    obj.header_1 = message.header_1 ? Header.toAmino(message.header_1) : undefined;
-    obj.header_2 = message.header_2 ? Header.toAmino(message.header_2) : undefined;
+    obj.header_1 = message.header1 ? Header.toAmino(message.header1) : undefined;
+    obj.header_2 = message.header2 ? Header.toAmino(message.header2) : undefined;
     return obj;
   },
   fromAminoMsg(object: MisbehaviourAminoMsg): Misbehaviour {

diff --git a/__fixtures__/v-next/outputv4/ibc/lightclients/tendermint/v1/tendermint.ts b/__fixtures__/v-next/outputv4/ibc/lightclients/tendermint/v1/tendermint.ts
@@ -518,8 +518,8 @@ export const Misbehaviour = {
   fromSDK(object: MisbehaviourSDKType): Misbehaviour {
     return {
       clientId: object?.client_id,
-      header_1: object.header_1 ? Header.fromSDK(object.header_1) : undefined,
-      header_2: object.header_2 ? Header.fromSDK(object.header_2) : undefined
+      header1: object.header_1 ? Header.fromSDK(object.header_1) : undefined,
+      header2: object.header_2 ? Header.fromSDK(object.header_2) : undefined
     };
   },
   fromSDKJSON(object: any): MisbehaviourSDKType {
@@ -532,8 +532,8 @@ export const Misbehaviour = {
   toSDK(message: Misbehaviour): MisbehaviourSDKType {
     const obj: any = {};
     obj.client_id = message.clientId;
-    message.header_1 !== undefined && (obj.header_1 = message.header_1 ? Header.toSDK(message.header_1) : undefined);
-    message.header_2 !== undefined && (obj.header_2 = message.header_2 ? Header.toSDK(message.header_2) : undefined);
+    message.header1 !== undefined && (obj.header_1 = message.header1 ? Header.toSDK(message.header1) : undefined);
+    message.header2 !== undefined && (obj.header_2 = message.header2 ? Header.toSDK(message.header2) : undefined);
     return obj;
   }
 };

diff --git a/packages/ast/CHANGELOG.md b/packages/ast/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.84.0](https://github.com/osmosis-labs/telescope/compare/@osmonauts/[email protected]...@osmonauts/[email protected]) (2023-06-21)
+
+**Note:** Version bump only for package @osmonauts/ast
+
+
+
+
+
 # [0.83.0](https://github.com/osmosis-labs/telescope/compare/@osmonauts/[email protected]...@osmonauts/[email protected]) (2023-06-07)
 
 **Note:** Version bump only for package @osmonauts/ast

diff --git a/packages/ast/package.json b/packages/ast/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@osmonauts/ast",
-  "version": "0.83.0",
+  "version": "0.84.0",
   "description": "Cosmos TypeScript AST generation",
   "author": "Dan Lynch <[email protected]>",
   "homepage": "https://github.com/osmosis-labs/telescope/tree/master/packages/ast#readme",
@@ -90,7 +90,7 @@
     "@babel/parser": "^7.21.4",
     "@babel/runtime": "^7.21.0",
     "@babel/types": "7.21.4",
-    "@osmonauts/proto-parser": "^0.43.0",
+    "@osmonauts/proto-parser": "^0.44.0",
     "@osmonauts/types": "^0.35.0",
     "@osmonauts/utils": "^0.11.1",
     "case": "1.6.3",

diff --git a/packages/parser/CHANGELOG.md b/packages/parser/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.44.0](https://github.com/osmosis-labs/telescope/compare/@osmonauts/[email protected]...@osmonauts/[email protected]) (2023-06-21)
+
+**Note:** Version bump only for package @osmonauts/proto-parser
+
+
+
+
+
 # [0.43.0](https://github.com/osmosis-labs/telescope/compare/@osmonauts/[email protected]...@osmonauts/[email protected]) (2023-05-23)
 
 **Note:** Version bump only for package @osmonauts/proto-parser

diff --git a/packages/parser/package.json b/packages/parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@osmonauts/proto-parser",
-  "version": "0.43.0",
+  "version": "0.44.0",
   "description": "A Parser for Cosmos Protobufs",
   "author": "Dan Lynch <[email protected]>",
   "homepage": "https://github.com/osmosis-labs/telescope/tree/master/packages/parser#readme",
@@ -70,8 +70,8 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.21.0",
+    "@cosmology/protobufjs": "6.11.6",
     "@osmonauts/types": "^0.35.0",
-    "@pyramation/protobufjs": "6.11.5",
     "dotty": "0.1.2",
     "glob": "8.0.3",
     "minimatch": "5.1.0",

diff --git a/packages/parser/src/store.ts b/packages/parser/src/store.ts
@@ -1,5 +1,5 @@
 import { sync as glob } from 'glob';
-import { parse } from '@pyramation/protobufjs';
+import { parse } from '@cosmology/protobufjs';
 import { readFileSync } from 'fs';
 import { join, resolve as pathResolve } from 'path';
 import { ALLOWED_RPC_SERVICES, ProtoDep, ProtoField, ProtoRef, ProtoServiceMethod, ProtoType, TelescopeOptions } from '@osmonauts/types';
@@ -144,7 +144,7 @@ export class ProtoStore {
 
                     // NOT FOUND
                     const filler = GOOGLE_PROTOS.find(([f, v]) => { return f === goog });
-                    if (!filler) return; // technically an error should be thrown 
+                    if (!filler) return; // technically an error should be thrown
 
                     // we have the filler
                     if (!neededFromGoogle.find(file => file.filename === goog)) {

diff --git a/packages/parser/src/traverse.ts b/packages/parser/src/traverse.ts
@@ -19,7 +19,7 @@ import {
     getPluginValue
 } from '@osmonauts/ast';
 
-import { Service, Type, Field, Enum, Root, Namespace } from '@pyramation/protobufjs';
+import { Service, Type, Field, Enum, Root, Namespace } from '@cosmology/protobufjs';
 import { importLookup, lookup, lookupAny, lookupNested, protoScopeImportLookup } from './lookup';
 import { parseService } from './services';
 import { ProtoStore } from './store';

diff --git a/packages/parser/src/utils.ts b/packages/parser/src/utils.ts
@@ -1,5 +1,5 @@
 import dotty from 'dotty';
-import { Service, Type, Enum, Root, Namespace } from '@pyramation/protobufjs';
+import { Service, Type, Enum, Root, Namespace } from '@cosmology/protobufjs';
 import { InterfaceTypeUrlMap, ProtoRef, ProtoRoot, ProtoType } from '@osmonauts/types';
 import { ProtoStore } from './store';
 import { GenericParseContext, getTypeUrl, getAminoTypeName, getPluginValue } from '@osmonauts/ast';

diff --git a/packages/parser/types/store.d.ts b/packages/parser/types/store.d.ts
@@ -5,7 +5,7 @@ interface ParseProtoOptions {
     alternateCommentMode?: boolean;
     preferTrailingComment?: boolean;
 }
-export declare const parseProto: (content: any, options?: ParseProtoOptions) => import("@pyramation/protobufjs").IParserResult;
+export declare const parseProto: (content: any, options?: ParseProtoOptions) => import("@cosmology/protobufjs").IParserResult;
 export declare class ProtoStore {
     files: string[];
     protoDirs: string[];
@@ -30,7 +30,7 @@ export declare class ProtoStore {
     }[]): {
         absolute: string;
         filename: string;
-        proto: import("@pyramation/protobufjs").IParserResult;
+        proto: import("@cosmology/protobufjs").IParserResult;
     }[];
     getProtos(): ProtoRef[];
     getPackages(): string[];

diff --git a/packages/telescope/CHANGELOG.md b/packages/telescope/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.98.0](https://github.com/osmosis-labs/telescope/compare/@osmonauts/[email protected]...@osmonauts/[email protected]) (2023-06-21)
+
+**Note:** Version bump only for package @osmonauts/telescope
+
+
+
+
+
 # [0.97.0](https://github.com/osmosis-labs/telescope/compare/@osmonauts/[email protected]...@osmonauts/[email protected]) (2023-06-07)
 
 **Note:** Version bump only for package @osmonauts/telescope

diff --git a/packages/telescope/package.json b/packages/telescope/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@osmonauts/telescope",
-  "version": "0.97.0",
+  "version": "0.98.0",
   "description": "A TypeScript Transpiler for Cosmos Protobufs",
   "author": "Dan Lynch <[email protected]>",
   "homepage": "https://github.com/osmosis-labs/telescope/tree/master/packages/telescope#readme",
@@ -84,8 +84,8 @@
     "@babel/traverse": "7.21.4",
     "@babel/types": "7.21.4",
     "@cosmwasm/ts-codegen": "0.30.1",
-    "@osmonauts/ast": "^0.83.0",
-    "@osmonauts/proto-parser": "^0.43.0",
+    "@osmonauts/ast": "^0.84.0",
+    "@osmonauts/proto-parser": "^0.44.0",
     "@osmonauts/types": "^0.35.0",
     "@osmonauts/utils": "^0.11.1",
     "@types/parse-package-name": "0.1.0",

diff --git a/packages/test/CHANGELOG.md b/packages/test/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.93.0](https://github.com/osmosis-labs/osmojs/compare/@osmonauts/[email protected]...@osmonauts/[email protected]) (2023-06-21)
+
+**Note:** Version bump only for package @osmonauts/test-example
+
+
+
+
+
 # [0.92.0](https://github.com/osmosis-labs/osmojs/compare/@osmonauts/[email protected]...@osmonauts/[email protected]) (2023-06-07)
 
 **Note:** Version bump only for package @osmonauts/test-example

diff --git a/packages/test/package.json b/packages/test/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@osmonauts/test-example",
   "private": true,
-  "version": "0.92.0",
+  "version": "0.93.0",
   "description": "Typescript Protobuf Messages for Osmosis",
   "author": "Dan Lynch <[email protected]>",
   "homepage": "https://github.com/osmosis-labs/osmojs/tree/master/packages/osmojs#readme",
@@ -62,7 +62,7 @@
     "@babel/preset-typescript": "^7.21.4",
     "@babel/traverse": "7.21.4",
     "@babel/types": "7.21.4",
-    "@osmonauts/telescope": "^0.97.0",
+    "@osmonauts/telescope": "^0.98.0",
     "@protobufs/cosmos": "^0.0.11",
     "@protobufs/cosmwasm": "^0.0.11",
     "@protobufs/ibc": "^0.0.11",