fix: Added distinct versioning for ambiguous dependency paths

cjs/package.json

@@ -48,6 +48,7 @@
 		"uuid": "^10.0.0"
 	},
 	"devDependencies": {
+		"@types/long": "^4.0.0",
 		"@types/node": "^18.19.47",
 		"@types/uuid": "^10.0.0",
 		"uint8arrays": "^3.1.1"

cjs/src/modules/did.ts

@@ -33,7 +33,7 @@ import {
 	Metadata,
 } from '@cheqd/ts-proto-cjs/cheqd/did/v2/index';
 import { EncodeObject, GeneratedType } from '@cosmjs/proto-signing-cjs';
-import { v4 } from 'uuid';
+import { v4 } from 'uuid-cjs';
 import { assert } from '@cosmjs/utils-cjs';
 import { PageRequest } from '@cheqd/ts-proto-cjs/cosmos/base/query/v1beta1/pagination';
 import { CheqdQuerier } from '../querier';

cjs/src/modules/resource.ts

@@ -13,7 +13,7 @@ import {
 	protobufPackage,
 } from '@cheqd/ts-proto-cjs/cheqd/resource/v2';
 import { DeliverTxResponse, QueryClient, createPagination, createProtobufRpcClient } from '@cosmjs/stargate-cjs';
-import { toString } from 'uint8arrays';
+import { toString } from 'uint8arrays-cjs';
 import { fromBuffer } from 'file-type-cjs/browser';
 import { SignInfo } from '@cheqd/ts-proto-cjs/cheqd/did/v2/index';
 import { assert } from '@cosmjs/utils-cjs';

cjs/src/signer.ts

@@ -34,7 +34,7 @@ import { AuthInfo, SignerInfo, TxRaw } from 'cosmjs-types-cjs/cosmos/tx/v1beta1/
 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';
+import Long from 'long-cjs';
 
 export function calculateDidFee(gasLimit: number, gasPrice: string | GasPrice): DidStdFee {
 	return calculateFee(gasLimit, gasPrice);

cjs/src/utils.ts

@@ -22,7 +22,7 @@ import { DirectSecp256k1HdWallet, DirectSecp256k1Wallet } from '@cosmjs/proto-si
 import { EnglishMnemonic as _, sha256 } from '@cosmjs/crypto-cjs';
 import { rawSecp256k1PubkeyToRawAddress } from '@cosmjs/amino-cjs';
 import pkg from 'secp256k1-cjs';
-import { v4 } from 'uuid';
+import { v4 } from 'uuid-cjs';
 import {
 	VerificationMethod as ProtoVerificationMethod,
 	Service as ProtoService,

cjs/tests/modules/did.test.ts

@@ -1,6 +1,6 @@
 import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing-cjs';
 import { DeliverTxResponse } from '@cosmjs/stargate-cjs';
-import { fromString, toString } from 'uint8arrays';
+import { fromString, toString } from 'uint8arrays-cjs';
 import { DIDModule } from '../../src';
 import { createDefaultCheqdRegistry } from '../../src/registry';
 import { CheqdSigningStargateClient } from '../../src/signer';
@@ -14,7 +14,7 @@ import {
 import { localnet, faucet, containsAll } from '../testutils.test';
 import { CheqdQuerier } from '../../src/querier';
 import { setupDidExtension, DidExtension } from '../../src/modules/did';
-import { v4 } from 'uuid';
+import { v4 } from 'uuid-cjs';
 
 const defaultAsyncTxTimeout = 30000;
 

cjs/tests/modules/resource.test.ts

@@ -1,6 +1,6 @@
 import { DirectSecp256k1HdWallet } from '@cosmjs/proto-signing-cjs';
 import { DeliverTxResponse } from '@cosmjs/stargate-cjs';
-import { fromString, toString } from 'uint8arrays';
+import { fromString, toString } from 'uint8arrays-cjs';
 import { DIDModule, ResourceModule } from '../../src';
 import { createDefaultCheqdRegistry } from '../../src/registry';
 import { CheqdSigningStargateClient } from '../../src/signer';
@@ -25,12 +25,12 @@ import {
 	json_content,
 	containsAllButOmittedFields,
 } from '../testutils.test';
-import { AlternativeUri, Metadata, MsgCreateResourcePayload } from '@cheqd/ts-proto/cheqd/resource/v2';
-import { v4 } from 'uuid';
+import { AlternativeUri, Metadata, MsgCreateResourcePayload } from '@cheqd/ts-proto-cjs/cheqd/resource/v2';
+import { v4 } from 'uuid-cjs';
 import { CheqdQuerier } from '../../src/querier';
 import { setupResourceExtension, ResourceExtension } from '../../src/modules/resource';
 import { DidExtension, setupDidExtension } from '../../src/modules/did';
-import { sha256 } from '@cosmjs/crypto';
+import { sha256 } from '@cosmjs/crypto-cjs';
 
 const defaultAsyncTxTimeout = 30000;
 

cjs/tests/signer.test.ts

@@ -4,7 +4,7 @@ import { EdDSASigner } from 'did-jwt-cjs';
 import { typeUrlMsgCreateDidDoc } from '../src/modules/did';
 import { CheqdSigningStargateClient } from '../src/signer';
 import { ISignInputs, MethodSpecificIdAlgo, VerificationMethods } from '../src/types';
-import { fromString, toString } from 'uint8arrays';
+import { fromString, toString } from 'uint8arrays-cjs';
 import {
 	createDidPayload,
 	createDidVerificationMethod,
@@ -14,7 +14,7 @@ import {
 } from '../src/utils';
 import { localnet, faucet } from './testutils.test';
 import { verify } from '@stablelib/ed25519-cjs';
-import { v4 } from 'uuid';
+import { v4 } from 'uuid-cjs';
 
 const nonExistingDid = 'did:cHeQd:fantasticnet:123';
 const nonExistingKeyId = 'did:cHeQd:fantasticnet:123#key-678';

cjs/tests/utils.test.ts

@@ -8,7 +8,7 @@ import {
 	createKeyPairRaw,
 	getCosmosAccount,
 } from '../src/utils';
-import { toString } from 'uint8arrays/to-string';
+import { toString } from 'uint8arrays-cjs/to-string';
 import { IKeyPair, MethodSpecificIdAlgo, VerificationMethods } from '../src/types';
 import { faucet_address, pubkey_hex, testnet_rpc } from './testutils.test';
 

package.json

@@ -77,7 +77,8 @@
         "uint8arrays": "^5.1.0",
         "@types/node-cjs": "npm:@types/node@^18.19.47",
         "@types/uuid-cjs": "npm:@types/uuid@^10.0.0",
-        "uint8arrays-cjs": "npm:uint8arrays@^3.1.1"
+        "uint8arrays-cjs": "npm:uint8arrays@^3.1.1",
+        "@types/long-cjs": "npm:@types/long@^4.0.0"
     },
     "publishConfig": {
         "registry": "https://registry.npmjs.org/",
@@ -124,4 +125,4 @@
         "uuid": "^10.0.0",
         "uuid-cjs": "npm:uuid@^10.0.0"
     }
-}
+}