fix: Added pre-install hook

cheqd · Feb 4, 2025 · 623ee5b · 623ee5b
1 parent 8dbfaee
commit 623ee5b
Show file tree

Hide file tree

Showing 20 changed files with 1,387 additions and 357 deletions.
diff --git a/cjs/package.json b/cjs/package.json
@@ -26,7 +26,7 @@
 		"format": "prettier --write '**/*.{js,ts,cjs,mjs,json}'"
 	},
 	"dependencies": {
-		"@cheqd/ts-proto": "^2.4.0",
+		"@cheqd/ts-proto": "~2.4.0",
 		"@cosmjs/amino": "~0.30.1",
 		"@cosmjs/crypto": "~0.30.1",
 		"@cosmjs/encoding": "~0.30.1",

diff --git a/cjs/src/index.ts b/cjs/src/index.ts
@@ -1,4 +1,4 @@
-import { OfflineSigner, Registry } from '@cosmjs/proto-signing';
+import { OfflineSigner, Registry } from '@cosmjs/proto-signing-cjs';
 import { DIDModule, MinimalImportableDIDModule, DidExtension } from './modules/did';
 import { MinimalImportableResourceModule, ResourceModule, ResourceExtension } from './modules/resource';
 import {
@@ -11,9 +11,9 @@ import {
 import { createDefaultCheqdRegistry } from './registry';
 import { CheqdSigningStargateClient } from './signer';
 import { CheqdNetwork, IContext, IModuleMethodMap } from './types';
-import { GasPrice, QueryClient } from '@cosmjs/stargate';
+import { GasPrice, QueryClient } from '@cosmjs/stargate-cjs';
 import { CheqdQuerier } from './querier';
-import { Tendermint37Client } from '@cosmjs/tendermint-rpc';
+import { Tendermint37Client } from '@cosmjs/tendermint-rpc-cjs';
 import {
 	defaultGasPriceTiers,
 	FeemarketExtension,

diff --git a/cjs/src/modules/_.ts b/cjs/src/modules/_.ts
@@ -1,5 +1,5 @@
-import { GeneratedType } from '@cosmjs/proto-signing';
-import { QueryClient } from '@cosmjs/stargate';
+import { GeneratedType } from '@cosmjs/proto-signing-cjs';
+import { QueryClient } from '@cosmjs/stargate-cjs';
 import { CheqdSigningStargateClient } from '../signer';
 import { IModuleMethodMap, QueryExtensionSetup } from '../types';
 import { CheqdQuerier } from '../querier';

diff --git a/cjs/src/modules/did.ts b/cjs/src/modules/did.ts
@@ -1,4 +1,4 @@
-import { createPagination, createProtobufRpcClient, DeliverTxResponse, QueryClient } from '@cosmjs/stargate';
+import { createPagination, createProtobufRpcClient, DeliverTxResponse, QueryClient } from '@cosmjs/stargate-cjs';
 import { AbstractCheqdSDKModule, MinimalImportableCheqdSDKModule } from './_';
 import { CheqdSigningStargateClient } from '../signer';
 import {
@@ -31,13 +31,13 @@ import {
 	DidDocWithMetadata,
 	DidDoc,
 	Metadata,
-} from '@cheqd/ts-proto/cheqd/did/v2/index';
-import { EncodeObject, GeneratedType } from '@cosmjs/proto-signing';
+} from '@cheqd/ts-proto-cjs/cheqd/did/v2/index';
+import { EncodeObject, GeneratedType } from '@cosmjs/proto-signing-cjs';
 import { v4 } from 'uuid';
-import { assert } from '@cosmjs/utils';
-import { PageRequest } from '@cheqd/ts-proto/cosmos/base/query/v1beta1/pagination';
+import { assert } from '@cosmjs/utils-cjs';
+import { PageRequest } from '@cheqd/ts-proto-cjs/cosmos/base/query/v1beta1/pagination';
 import { CheqdQuerier } from '../querier';
-import { DIDDocumentMetadata } from 'did-resolver';
+import { DIDDocumentMetadata } from 'did-resolver-cjs';
 
 export const defaultDidExtensionKey = 'did' as const;
 

diff --git a/cjs/src/modules/feemarket.ts b/cjs/src/modules/feemarket.ts
@@ -4,15 +4,15 @@ import {
 	ParamsResponse,
 	QueryClientImpl,
 	protobufPackage,
-} from '@cheqd/ts-proto/feemarket/feemarket/v1/index.js';
-import { EncodeObject, GeneratedType } from '@cosmjs/proto-signing';
-import { createProtobufRpcClient, GasPrice, QueryClient } from '@cosmjs/stargate';
+} from '@cheqd/ts-proto-cjs/feemarket/feemarket/v1/index.js';
+import { EncodeObject, GeneratedType } from '@cosmjs/proto-signing-cjs';
+import { createProtobufRpcClient, GasPrice, QueryClient } from '@cosmjs/stargate-cjs';
 import { AbstractCheqdSDKModule, MinimalImportableCheqdSDKModule } from './_';
 import { IContext, QueryExtensionSetup } from '../types';
 import { CheqdQuerier } from '../querier';
 import { CheqdSigningStargateClient } from '../signer';
 import { DefaultBackoffOptions, retry } from '../utils';
-import { Decimal, Uint32 } from '@cosmjs/math';
+import { Decimal, Uint32 } from '@cosmjs/math-cjs';
 
 export const defaultFeemarketExtensionKey = 'feemarket' as const;
 

diff --git a/cjs/src/modules/resource.ts b/cjs/src/modules/resource.ts
@@ -1,6 +1,6 @@
 import { AbstractCheqdSDKModule, MinimalImportableCheqdSDKModule } from './_';
 import { CheqdSigningStargateClient } from '../signer';
-import { EncodeObject, GeneratedType } from '@cosmjs/proto-signing';
+import { EncodeObject, GeneratedType } from '@cosmjs/proto-signing-cjs';
 import { DidStdFee, IContext, ISignInputs, QueryExtensionSetup } from '../types';
 import {
 	Metadata,
@@ -11,13 +11,13 @@ import {
 	QueryCollectionResourcesResponse,
 	ResourceWithMetadata,
 	protobufPackage,
-} from '@cheqd/ts-proto/cheqd/resource/v2';
-import { DeliverTxResponse, QueryClient, createPagination, createProtobufRpcClient } from '@cosmjs/stargate';
+} from '@cheqd/ts-proto-cjs/cheqd/resource/v2';
+import { DeliverTxResponse, QueryClient, createPagination, createProtobufRpcClient } from '@cosmjs/stargate-cjs';
 import { toString } from 'uint8arrays';
-import { fromBuffer } from 'file-type/browser';
-import { SignInfo } from '@cheqd/ts-proto/cheqd/did/v2/index';
-import { assert } from '@cosmjs/utils';
-import { PageRequest } from '@cheqd/ts-proto/cosmos/base/query/v1beta1/pagination';
+import { fromBuffer } from 'file-type-cjs/browser';
+import { SignInfo } from '@cheqd/ts-proto-cjs/cheqd/did/v2/index';
+import { assert } from '@cosmjs/utils-cjs';
+import { PageRequest } from '@cheqd/ts-proto-cjs/cosmos/base/query/v1beta1/pagination';
 import { CheqdQuerier } from '../querier';
 import { isJSON } from '../utils';
 

diff --git a/cjs/src/querier.ts b/cjs/src/querier.ts
@@ -1,6 +1,6 @@
-import { QueryClient } from '@cosmjs/stargate';
-import { Tendermint34Client, Tendermint37Client } from '@cosmjs/tendermint-rpc';
-import { QueryExtensionSetup, CheqdExtensions, CheqdNetwork } from './types';
+import { QueryClient } from '@cosmjs/stargate-cjs';
+import { Tendermint34Client, Tendermint37Client } from '@cosmjs/tendermint-rpc-cjs';
+import { QueryExtensionSetup, CheqdExtensions } from './types';
 
 export class CheqdQuerier extends QueryClient {
 	constructor(tmClient: Tendermint37Client | Tendermint34Client) {

diff --git a/cjs/src/registry.ts b/cjs/src/registry.ts
@@ -1,6 +1,6 @@
-import { Registry, GeneratedType } from '@cosmjs/proto-signing';
+import { Registry, GeneratedType } from '@cosmjs/proto-signing-cjs';
 
-import { defaultRegistryTypes } from '@cosmjs/stargate';
+import { defaultRegistryTypes } from '@cosmjs/stargate-cjs';
 
 export function createDefaultCheqdRegistry(customTypes?: Iterable<[string, GeneratedType]>): Registry {
 	if (!customTypes) customTypes = [];

diff --git a/cjs/src/signer.ts b/cjs/src/signer.ts
@@ -5,7 +5,7 @@ import {
 	encodePubkey,
 	TxBodyEncodeObject,
 	makeSignDoc,
-} from '@cosmjs/proto-signing';
+} from '@cosmjs/proto-signing-cjs';
 import {
 	DeliverTxResponse,
 	GasPrice,
@@ -14,26 +14,26 @@ import {
 	SigningStargateClientOptions,
 	calculateFee,
 	SignerData,
-} from '@cosmjs/stargate';
-import { Tendermint37Client } from '@cosmjs/tendermint-rpc';
+} from '@cosmjs/stargate-cjs';
+import { Tendermint37Client } from '@cosmjs/tendermint-rpc-cjs';
 import { createDefaultCheqdRegistry } from './registry';
 import {
 	MsgCreateDidDocPayload,
 	SignInfo,
 	MsgUpdateDidDocPayload,
 	MsgDeactivateDidDocPayload,
 	VerificationMethod,
-} from '@cheqd/ts-proto/cheqd/did/v2';
+} from '@cheqd/ts-proto-cjs/cheqd/did/v2';
 import { DidStdFee, ISignInputs, TSignerAlgo, VerificationMethods } from './types';
-import { base64ToBytes, EdDSASigner, hexToBytes, Signer, ES256Signer, ES256KSigner } from 'did-jwt';
-import { assert, assertDefined } from '@cosmjs/utils';
-import { encodeSecp256k1Pubkey } from '@cosmjs/amino';
-import { Int53 } from '@cosmjs/math';
-import { fromBase64 } from '@cosmjs/encoding';
-import { AuthInfo, SignerInfo, TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx';
-import { SignMode } from 'cosmjs-types/cosmos/tx/signing/v1beta1/signing';
-import { Any } from 'cosmjs-types/google/protobuf/any';
-import { Coin } from 'cosmjs-types/cosmos/base/v1beta1/coin';
+import { base64ToBytes, EdDSASigner, hexToBytes, Signer, ES256Signer, ES256KSigner } from 'did-jwt-cjs';
+import { assert, assertDefined } from '@cosmjs/utils-cjs';
+import { encodeSecp256k1Pubkey } from '@cosmjs/amino-cjs';
+import { Int53 } from '@cosmjs/math-cjs';
+import { fromBase64 } from '@cosmjs/encoding-cjs';
+import { AuthInfo, SignerInfo, TxRaw } from 'cosmjs-types-cjs/cosmos/tx/v1beta1/tx';
+import { SignMode } from 'cosmjs-types-cjs/cosmos/tx/signing/v1beta1/signing';
+import { Any } from 'cosmjs-types-cjs/google/protobuf/any';
+import { Coin } from 'cosmjs-types-cjs/cosmos/base/v1beta1/coin';
 import Long from 'long';
 
 export function calculateDidFee(gasLimit: number, gasPrice: string | GasPrice): DidStdFee {

diff --git a/cjs/src/types.ts b/cjs/src/types.ts
@@ -1,16 +1,16 @@
 import {
 	Service as ProtobufService,
 	VerificationMethod as ProtobufVerificationMethod,
-} from '@cheqd/ts-proto/cheqd/did/v2';
+} from '@cheqd/ts-proto-cjs/cheqd/did/v2';
 import { CheqdSDK } from './index';
-import { Coin } from '@cosmjs/proto-signing';
-import { Signer } from 'did-jwt';
-import { QueryClient } from '@cosmjs/stargate';
-import { DIDResolutionResult } from 'did-resolver';
+import { Coin } from '@cosmjs/proto-signing-cjs';
+import { Signer } from 'did-jwt-cjs';
+import { QueryClient } from '@cosmjs/stargate-cjs';
+import { DIDResolutionResult } from 'did-resolver-cjs';
 import { DidExtension } from './modules/did';
 import { ResourceExtension } from './modules/resource';
 import { FeemarketExtension } from './modules/feemarket';
-export { DIDDocument, VerificationMethod, Service, ServiceEndpoint, JsonWebKey } from 'did-resolver';
+export { DIDDocument, VerificationMethod, Service, ServiceEndpoint, JsonWebKey } from 'did-resolver-cjs';
 
 export enum CheqdNetwork {
 	Mainnet = 'mainnet',

diff --git a/cjs/src/utils.ts b/cjs/src/utils.ts
@@ -15,26 +15,26 @@ import {
 	JsonWebKey,
 } from './types';
 import { fromString, toString } from 'uint8arrays';
-import { bases } from 'multiformats/basics';
-import { base64ToBytes } from 'did-jwt';
-import { generateKeyPair, generateKeyPairFromSeed, KeyPair } from '@stablelib/ed25519';
-import { DirectSecp256k1HdWallet, DirectSecp256k1Wallet } from '@cosmjs/proto-signing';
-import { EnglishMnemonic as _, sha256 } from '@cosmjs/crypto';
-import { rawSecp256k1PubkeyToRawAddress } from '@cosmjs/amino';
-import pkg from 'secp256k1';
+import { bases } from 'multiformats-cjs/basics';
+import { base64ToBytes } from 'did-jwt-cjs';
+import { generateKeyPair, generateKeyPairFromSeed, KeyPair } from '@stablelib/ed25519-cjs';
+import { DirectSecp256k1HdWallet, DirectSecp256k1Wallet } from '@cosmjs/proto-signing-cjs';
+import { EnglishMnemonic as _, sha256 } from '@cosmjs/crypto-cjs';
+import { rawSecp256k1PubkeyToRawAddress } from '@cosmjs/amino-cjs';
+import pkg from 'secp256k1-cjs';
 import { v4 } from 'uuid';
 import {
 	VerificationMethod as ProtoVerificationMethod,
 	Service as ProtoService,
 	MsgCreateDidDocPayload,
 	MsgDeactivateDidDocPayload,
-} from '@cheqd/ts-proto/cheqd/did/v2';
+} from '@cheqd/ts-proto-cjs/cheqd/did/v2';
 import { DIDModule } from './modules/did';
-import { MsgCreateResourcePayload } from '@cheqd/ts-proto/cheqd/resource/v2';
-import { toBech32 } from '@cosmjs/encoding';
-import { StargateClient } from '@cosmjs/stargate';
-import { Coin } from 'cosmjs-types/cosmos/base/v1beta1/coin';
-import { backOff, BackoffOptions } from 'exponential-backoff';
+import { MsgCreateResourcePayload } from '@cheqd/ts-proto-cjs/cheqd/resource/v2';
+import { toBech32 } from '@cosmjs/encoding-cjs';
+import { StargateClient } from '@cosmjs/stargate-cjs';
+import { Coin } from 'cosmjs-types-cjs/cosmos/base/v1beta1/coin';
+import { backOff, BackoffOptions } from 'exponential-backoff-cjs';
 
 export type TImportableEd25519Key = {
 	publicKeyHex: string;

diff --git a/cjs/tests/index.test.ts b/cjs/tests/index.test.ts
@@ -1,4 +1,4 @@
-import { DirectSecp256k1HdWallet, GeneratedType } from '@cosmjs/proto-signing';
+import { DirectSecp256k1HdWallet, GeneratedType } from '@cosmjs/proto-signing-cjs';
 import { createCheqdSDK, DIDModule, ICheqdSDKOptions, ResourceModule } from '../src/index';
 import { localnet, faucet } from './testutils.test';
 import { AbstractCheqdSDKModule } from '../src/modules/_';

diff --git a/cjs/tests/modules/did.test.ts b/cjs/tests/modules/did.test.ts
@@ -1,5 +1,5 @@
-import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
-import { DeliverTxResponse } from '@cosmjs/stargate';
+import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing-cjs';
+import { DeliverTxResponse } from '@cosmjs/stargate-cjs';
 import { fromString, toString } from 'uint8arrays';
 import { DIDModule } from '../../src';
 import { createDefaultCheqdRegistry } from '../../src/registry';

diff --git a/cjs/tests/modules/feemarket.test.ts b/cjs/tests/modules/feemarket.test.ts
@@ -1,4 +1,4 @@
-import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
+import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing-cjs';
 import { faucet, localnet } from '../testutils.test';
 import { CheqdQuerier, CheqdSigningStargateClient, DIDModule } from '../../src';
 import { FeemarketExtension, FeemarketModule, setupFeemarketExtension } from '../../src/modules/feemarket';
@@ -11,33 +11,41 @@ const defaultAsyncTxTimeout = 30000;
 
 describe('FeemarketModule', () => {
 	describe('constructor', () => {
-		it('should instantiate standalone module', async () => {
-			const wallet = await DirectSecp256k1HdWallet.fromMnemonic(faucet.mnemonic);
-			const signer = await CheqdSigningStargateClient.connectWithSigner(localnet.rpcUrl, wallet);
-			const querier = (await CheqdQuerier.connectWithExtension(
-				localnet.rpcUrl,
-				setupFeemarketExtension
-			)) as CheqdQuerier & FeemarketExtension;
-			const feemarketModule = new FeemarketModule(signer, querier);
-			expect(feemarketModule).toBeInstanceOf(FeemarketModule);
-		});
+		it(
+			'should instantiate standalone module',
+			async () => {
+				const wallet = await DirectSecp256k1HdWallet.fromMnemonic(faucet.mnemonic);
+				const signer = await CheqdSigningStargateClient.connectWithSigner(localnet.rpcUrl, wallet);
+				const querier = (await CheqdQuerier.connectWithExtension(
+					localnet.rpcUrl,
+					setupFeemarketExtension
+				)) as CheqdQuerier & FeemarketExtension;
+				const feemarketModule = new FeemarketModule(signer, querier);
+				expect(feemarketModule).toBeInstanceOf(FeemarketModule);
+			},
+			defaultAsyncTxTimeout
+		);
 	});
 
 	describe('queryGasPrice', () => {
-		it('should query gas price', async () => {
-			const wallet = await DirectSecp256k1HdWallet.fromMnemonic(faucet.mnemonic);
-			const signer = await CheqdSigningStargateClient.connectWithSigner(localnet.rpcUrl, wallet);
-			const querier = (await CheqdQuerier.connectWithExtension(
-				localnet.rpcUrl,
-				setupFeemarketExtension
-			)) as CheqdQuerier & FeemarketExtension;
-			const feemarketModule = new FeemarketModule(signer, querier);
-			const gasPrice = await feemarketModule.queryGasPrice('ncheq');
+		it(
+			'should query gas price',
+			async () => {
+				const wallet = await DirectSecp256k1HdWallet.fromMnemonic(faucet.mnemonic);
+				const signer = await CheqdSigningStargateClient.connectWithSigner(localnet.rpcUrl, wallet);
+				const querier = (await CheqdQuerier.connectWithExtension(
+					localnet.rpcUrl,
+					setupFeemarketExtension
+				)) as CheqdQuerier & FeemarketExtension;
+				const feemarketModule = new FeemarketModule(signer, querier);
+				const gasPrice = await feemarketModule.queryGasPrice('ncheq');
 
-			expect(gasPrice).toBeDefined();
-			expect(gasPrice.price).toBeDefined();
-			expect(gasPrice.price!.denom).toEqual(DIDModule.baseMinimalDenom);
-			expect(Number(gasPrice.price!.amount)).toBeGreaterThan(0);
-		});
+				expect(gasPrice).toBeDefined();
+				expect(gasPrice.price).toBeDefined();
+				expect(gasPrice.price!.denom).toEqual(DIDModule.baseMinimalDenom);
+				expect(Number(gasPrice.price!.amount)).toBeGreaterThan(0);
+			},
+			defaultAsyncTxTimeout
+		);
 	});
 });
diff --git a/cjs/tests/modules/resource.test.ts b/cjs/tests/modules/resource.test.ts
@@ -1,5 +1,5 @@
-import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing';
-import { DeliverTxResponse } from '@cosmjs/stargate';
+import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing-cjs';
+import { DeliverTxResponse } from '@cosmjs/stargate-cjs';
 import { fromString, toString } from 'uint8arrays';
 import { DIDModule, ResourceModule } from '../../src';
 import { createDefaultCheqdRegistry } from '../../src/registry';

diff --git a/cjs/tests/signer.test.ts b/cjs/tests/signer.test.ts
@@ -1,6 +1,6 @@
-import { MsgCreateDidDoc, MsgCreateDidDocPayload, VerificationMethod } from '@cheqd/ts-proto/cheqd/did/v2';
-import { DirectSecp256k1HdWallet, Registry } from '@cosmjs/proto-signing';
-import { EdDSASigner } from 'did-jwt';
+import { MsgCreateDidDoc, MsgCreateDidDocPayload, VerificationMethod } from '@cheqd/ts-proto-cjs/cheqd/did/v2';
+import { DirectSecp256k1HdWallet, Registry } from '@cosmjs/proto-signing-cjs';
+import { EdDSASigner } from 'did-jwt-cjs';
 import { typeUrlMsgCreateDidDoc } from '../src/modules/did';
 import { CheqdSigningStargateClient } from '../src/signer';
 import { ISignInputs, MethodSpecificIdAlgo, VerificationMethods } from '../src/types';
@@ -13,7 +13,7 @@ import {
 	validateSpecCompliantPayload,
 } from '../src/utils';
 import { localnet, faucet } from './testutils.test';
-import { verify } from '@stablelib/ed25519';
+import { verify } from '@stablelib/ed25519-cjs';
 import { v4 } from 'uuid';
 
 const nonExistingDid = 'did:cHeQd:fantasticnet:123';

diff --git a/cjs/tests/testutils.test.ts b/cjs/tests/testutils.test.ts
@@ -1,4 +1,4 @@
-import { GasPrice } from '@cosmjs/stargate';
+import { GasPrice } from '@cosmjs/stargate-cjs';
 import { CheqdNetwork } from '../src/types';
 
 export const faucet = {