fix(deps): Downgraded uint8arrays due to export config clash

cheqd · Oct 27, 2022 · 2e30906 · 2e30906
1 parent bea288d
commit 2e30906
Show file tree

Hide file tree

Showing 10 changed files with 6,229 additions and 2,948 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {
-    "test": "jest --passWithNoTests --maxWorkers 1 --detectOpenHandles",
+    "test": "jest --passWithNoTests --maxWorkers 1 --maxConcurrency 1",
     "test:watch": "jest --passWithNoTests --watch",
     "build": "tsc"
   },
@@ -36,10 +36,11 @@
     "@types/node": "^18.11.5",
     "@types/uuid": "^8.3.4",
     "conventional-changelog-conventionalcommits": "^5.0.0",
-    "jest": "^28.1.3",
-    "ts-jest": "^28.0.8",
+    "jest": "^29.2.2",
+    "ts-jest": "^29.0.3",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.4"
+    "typescript": "^4.8.4",
+    "uint8arrays": "^3.1.1"
   },
   "dependencies": {
     "@cheqd/ts-proto": "^1.0.14",
@@ -54,7 +55,6 @@
     "cosmjs-types": "^0.5.2",
     "did-jwt": "^6.9.0",
     "multiformats": "^9.9.0",
-    "uint8arrays": "^4.0.2",
     "uuid": "^9.0.0"
   },
   "publishConfig": {

diff --git a/src/signer.ts b/src/signer.ts
@@ -7,7 +7,7 @@ import { MsgCreateDidPayload, SignInfo, MsgUpdateDidPayload } from '@cheqd/ts-pr
 import { DidStdFee, ISignInputs, TSignerAlgo, VerificationMethods } from './types';
 import { VerificationMethod } from '@cheqd/ts-proto/cheqd/v1/did'
 import { base64ToBytes, EdDSASigner, hexToBytes, Signer, ES256Signer, ES256KSigner } from 'did-jwt';
-import { toString } from 'uint8arrays/to-string'
+import { toString } from 'uint8arrays'
 import { assert, assertDefined } from '@cosmjs/utils'
 import { encodeSecp256k1Pubkey } from '@cosmjs/amino'
 import { Int53 } from '@cosmjs/math'

diff --git a/src/utils.ts b/src/utils.ts
@@ -11,8 +11,7 @@ import {
     CheqdNetwork, 
     IVerificationKeys 
 } from "./types"
-import { fromString } from 'uint8arrays/from-string'
-import { toString } from 'uint8arrays/to-string'
+import { fromString, toString } from 'uint8arrays'
 import { bases } from "multiformats/basics"
 import { base64ToBytes } from "did-jwt"
 import { generateKeyPair, KeyPair } from '@stablelib/ed25519'

diff --git a/tests/modules/did.test.ts b/tests/modules/did.test.ts
@@ -1,15 +1,14 @@
 import { MsgUpdateDidPayload } from "@cheqd/ts-proto/cheqd/v1/tx"
 import { DirectSecp256k1HdWallet } from "@cosmjs/proto-signing"
 import { DeliverTxResponse } from "@cosmjs/stargate"
-import { fromString } from 'uint8arrays/from-string'
-import { toString } from 'uint8arrays/to-string'
+import { fromString, toString } from 'uint8arrays'
 import { DIDModule } from "../../src"
 import { createDefaultCheqdRegistry } from "../../src/registry"
 import { CheqdSigningStargateClient } from "../../src/signer"
 import { DidStdFee, ISignInputs, MethodSpecificIdAlgo, VerificationMethods } from "../../src/types"
 import { createDidPayload, createDidVerificationMethod, createKeyPairBase64, createVerificationKeys, exampleCheqdNetwork, faucet } from "../testutils.test"
 
-const defaultAsyncTxTimeout = 20000
+const defaultAsyncTxTimeout = 30000
 
 describe('DIDModule', () => {
     describe('constructor', () => {

diff --git a/tests/modules/resource.test.ts b/tests/modules/resource.test.ts
@@ -1,7 +1,6 @@
 import { DirectSecp256k1HdWallet, GeneratedType } from "@cosmjs/proto-signing"
 import { DeliverTxResponse } from "@cosmjs/stargate"
-import { fromString } from 'uint8arrays/from-string'
-import { toString } from 'uint8arrays/to-string'
+import { fromString, toString } from 'uint8arrays'
 import { DIDModule, ResourceModule } from "../../src"
 import { createDefaultCheqdRegistry } from "../../src/registry"
 import { CheqdSigningStargateClient } from "../../src/signer"
@@ -10,7 +9,7 @@ import { createDidPayload, createDidVerificationMethod, createKeyPairBase64, cre
 import { MsgCreateResourcePayload } from '@cheqd/ts-proto/resource/v1/tx';
 import { randomUUID } from "crypto"
 
-const defaultAsyncTxTimeout = 20000
+const defaultAsyncTxTimeout = 30000
 
 describe('ResourceModule', () => {
     describe('constructor', () => {

diff --git a/tests/signer.test.ts b/tests/signer.test.ts
@@ -5,8 +5,7 @@ import { base64ToBytes, EdDSASigner } from "did-jwt"
 import { typeUrlMsgCreateDid } from '../src/modules/did'
 import { CheqdSigningStargateClient } from "../src/signer"
 import { ISignInputs, MethodSpecificIdAlgo, VerificationMethods } from "../src/types"
-import { fromString } from 'uint8arrays/from-string'
-import { toString } from 'uint8arrays/to-string'
+import { fromString, toString } from 'uint8arrays'
 import { createDidPayload, createDidVerificationMethod, createKeyPairBase64, createVerificationKeys, exampleCheqdNetwork, faucet } from "./testutils.test"
 import { verify } from "@stablelib/ed25519"
 

diff --git a/tests/testutils.test.ts b/tests/testutils.test.ts
@@ -2,8 +2,7 @@ import { MsgCreateDidPayload } from "@cheqd/ts-proto/cheqd/v1/tx"
 import { CheqdNetwork, IKeyPair, IVerificationKeys, MethodSpecificIdAlgo, TMethodSpecificId, TVerificationKey, TVerificationKeyPrefix, VerificationMethods } from "../src/types"
 import { bases } from 'multiformats/basics'
 import { base64ToBytes } from "did-jwt"
-import { fromString } from 'uint8arrays/from-string'
-import { toString } from 'uint8arrays/to-string'
+import { fromString, toString } from 'uint8arrays'
 import { generateKeyPair, KeyPair } from '@stablelib/ed25519'
 import { GasPrice } from "@cosmjs/stargate"
 import { v4 } from 'uuid'

diff --git a/tests/utils.test.ts b/tests/utils.test.ts
@@ -1,6 +1,6 @@
 import { TImportableEd25519Key, createSignInputsFromImportableEd25519Key } from '../src/utils'
 import { createDidVerificationMethod, createVerificationKeys, createKeyPairRaw } from './testutils.test'
-import { toString } from 'uint8arrays/to-string'
+import { toString } from 'uint8arrays'
 import { IKeyPair, MethodSpecificIdAlgo, VerificationMethods } from '../src/types'
 
 describe('createSignInputsFromImportableEd25519Key', () => {

diff --git a/tsconfig.json b/tsconfig.json
@@ -42,7 +42,7 @@
     // "noUncheckedIndexedAccess": true,      /* Include 'undefined' in index signature results */
 
     /* Module Resolution Options */
-    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
     // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */