diff --git a/__fixtures__/v-next/outputicjs/cosmos/staking/v1beta1/staking.ts b/__fixtures__/v-next/outputicjs/cosmos/staking/v1beta1/staking.ts index dfb5305a9..80be8c429 100644 --- a/__fixtures__/v-next/outputicjs/cosmos/staking/v1beta1/staking.ts +++ b/__fixtures__/v-next/outputicjs/cosmos/staking/v1beta1/staking.ts @@ -5,7 +5,7 @@ import { Duration, DurationAmino } from "../../../google/protobuf/duration"; import { Coin, CoinAmino } from "../../base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, toTimestamp, fromTimestamp } from "../../../helpers"; -import { encodePubkey, decodePubkey } from "@cosmjs/proto-signing"; +import { encodePubkey, decodePubkey } from "@interchainjs/pubkey"; import { Pubkey } from "@cosmjs/amino"; /** BondStatus is the status of a validator. */ export enum BondStatus { diff --git a/__fixtures__/v-next/outputicjs/cosmos/staking/v1beta1/tx.ts b/__fixtures__/v-next/outputicjs/cosmos/staking/v1beta1/tx.ts index dc0e2fa40..acbf3a059 100644 --- a/__fixtures__/v-next/outputicjs/cosmos/staking/v1beta1/tx.ts +++ b/__fixtures__/v-next/outputicjs/cosmos/staking/v1beta1/tx.ts @@ -4,7 +4,7 @@ import { Coin, CoinAmino } from "../../base/v1beta1/coin"; import { Timestamp } from "../../../google/protobuf/timestamp"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, toTimestamp, fromTimestamp } from "../../../helpers"; -import { encodePubkey, decodePubkey } from "@cosmjs/proto-signing"; +import { encodePubkey, decodePubkey } from "@interchainjs/pubkey"; import { Pubkey } from "@cosmjs/amino"; /** MsgCreateValidator defines a SDK message for creating a new validator. */ export interface MsgCreateValidator { diff --git a/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/proposal.ts b/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/proposal.ts index 957e1f12f..6c96e872f 100644 --- a/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/proposal.ts +++ b/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/proposal.ts @@ -2,7 +2,7 @@ import { AccessConfig, AccessConfigAmino } from "./types"; import { Coin, CoinAmino } from "../../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial } from "../../../helpers"; -import { fromBase64, toBase64, toUtf8, fromUtf8 } from "@cosmjs/encoding"; +import { fromBase64, toBase64, toUtf8, fromUtf8 } from "@interchainjs/encoding"; /** StoreCodeProposal gov proposal content type to submit WASM code to the system */ export interface StoreCodeProposal { /** Title is a short summary */ diff --git a/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/query.ts b/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/query.ts index 25c80ef63..9556636da 100644 --- a/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/query.ts +++ b/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/query.ts @@ -2,7 +2,7 @@ import { PageRequest, PageRequestAmino, PageResponse, PageResponseAmino } from " import { ContractInfo, ContractInfoAmino, ContractCodeHistoryEntry, ContractCodeHistoryEntryAmino, Model, ModelAmino } from "./types"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; -import { toUtf8, fromUtf8 } from "@cosmjs/encoding"; +import { toUtf8, fromUtf8 } from "@interchainjs/encoding"; /** * QueryContractInfoRequest is the request type for the Query/ContractInfo RPC * method diff --git a/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/tx.ts b/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/tx.ts index e0e244e11..950d3141d 100644 --- a/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/tx.ts +++ b/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/tx.ts @@ -2,7 +2,7 @@ import { AccessConfig, AccessConfigAmino } from "./types"; import { Coin, CoinAmino } from "../../../cosmos/base/v1beta1/coin"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; -import { fromBase64, toBase64, toUtf8, fromUtf8 } from "@cosmjs/encoding"; +import { fromBase64, toBase64, toUtf8, fromUtf8 } from "@interchainjs/encoding"; /** MsgStoreCode submit Wasm code to the system */ export interface MsgStoreCode { /** Sender is the that actor that signed the messages */ diff --git a/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/types.ts b/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/types.ts index d7015f6c4..5821d2fdc 100644 --- a/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/types.ts +++ b/__fixtures__/v-next/outputicjs/cosmwasm/wasm/v1/types.ts @@ -1,7 +1,7 @@ import { Any, AnyProtoMsg, AnyAmino } from "../../../google/protobuf/any"; import { BinaryReader, BinaryWriter } from "../../../binary"; import { DeepPartial, bytesFromBase64, base64FromBytes } from "../../../helpers"; -import { toUtf8, fromUtf8 } from "@cosmjs/encoding"; +import { toUtf8, fromUtf8 } from "@interchainjs/encoding"; /** AccessType permission types */ export enum AccessType { /** ACCESS_TYPE_UNSPECIFIED - AccessTypeUnspecified placeholder for empty value */ diff --git a/packages/telescope/src/generators/customize-utils.ts b/packages/telescope/src/generators/customize-utils.ts index fae6e1886..50bb0dbb1 100644 --- a/packages/telescope/src/generators/customize-utils.ts +++ b/packages/telescope/src/generators/customize-utils.ts @@ -2,6 +2,18 @@ import { TelescopeBuilder } from '../builder'; import { UTILS } from '../utils'; export const plugin = (builder: TelescopeBuilder) => { + if(builder.options.useInterchainJs) { + UTILS.encodePubkey = '@interchainjs/pubkey'; + UTILS.decodePubkey = '@interchainjs/pubkey'; + + UTILS.fromBase64 = '@interchainjs/encoding'; + UTILS.fromBech32 = '@interchainjs/encoding'; + UTILS.fromHex = '@interchainjs/encoding'; + UTILS.fromUtf8 = '@interchainjs/encoding'; + UTILS.toBase64 = '@interchainjs/encoding'; + UTILS.toUtf8 = '@interchainjs/encoding'; + } + if ( builder.options.prototypes.typingsFormat.customTypes.useEnhancedDecimal === true