near-api-ts 0.7.1 → 0.9.0

package/README.md

@@ -10,7 +10,7 @@ TypeScript library for interactions with Near Protocol in the browser or Node.js
 pnpm add near-api-ts
 ```
 
-**Node.js (esm, 24+) / Browser**
+**Node.js (esm, 25+) / Browser**
 
 ```ts
 import {

package/browser/src/idbKeyService/idbKeyService.ts

@@ -1,10 +1,11 @@
 // import * as z from 'zod/mini';
-import { asThrowable } from '@universal/src/_common/utils/asThrowable';
-import { result } from '@universal/src/_common/utils/result';
-import { wrapInternalError } from '@universal/src/_common/utils/wrapInternalError';
-import type { Result } from '@universal/types/_common/common';
-import type { PublicKey } from '@universal/types/_common/crypto';
-import type { KeyPair } from '@universal/types/_common/keyPair/keyPair';
+
+import type { PublicKey } from '../../../universal';
+import { asThrowable } from '../../../universal/src/_common/utils/asThrowable';
+import { result } from '../../../universal/src/_common/utils/result';
+import { wrapInternalError } from '../../../universal/src/_common/utils/wrapInternalError';
+import type { Result } from '../../../universal/types/_common/common';
+import type { KeyPair } from '../../../universal/types/_common/keyPair/keyPair';
 import { createGetKeyPair } from './private/getKeyPair';
 import { openIdbConnection } from './private/openIdbConnection';
 import { createSafeAddKey } from './public/addKey';
@@ -56,6 +57,4 @@ export const safeCreateIdbKeyService: any = wrapInternalError(
   },
 );
 
-export const throwableCreateIdbKeyService: any = asThrowable(
-  safeCreateIdbKeyService,
-);
+export const throwableCreateIdbKeyService: any = asThrowable(safeCreateIdbKeyService);

package/browser/src/idbKeyService/private/getKeyPair.ts

@@ -1,13 +1,12 @@
-import { safeKeyPair } from '@universal/index';
-import { result } from '@universal/src/_common/utils/result';
+import { safeKeyPair } from '../../../../universal';
+import { result } from '../../../../universal/src/_common/utils/result';
 import type { IdbKeyServiceContext } from '../idbKeyService';
 
 export const createGetKeyPair =
   (context: IdbKeyServiceContext) =>
   async (publicKey: any): Promise<any> => {
     // 1. If the key pair is already in the cache, return it
-    if (context.keyPairs.has(publicKey))
-      return result.ok(context.keyPairs.get(publicKey));
+    if (context.keyPairs.has(publicKey)) return result.ok(context.keyPairs.get(publicKey));
 
     if (!context.idb) return result.err(false); // TODO wait until idb is ready
 

package/browser/src/idbKeyService/public/addKey.ts

@@ -1,32 +1,31 @@
-import { keyPair } from '@universal/index';
-import { result } from '@universal/src/_common/utils/result';
+import { keyPair } from '../../../../universal/index';
+import { result } from '../../../../universal/src/_common/utils/result';
 import type { IdbKeyServiceContext } from '../idbKeyService';
 
-export const createSafeAddKey =
-  (context: IdbKeyServiceContext) => async (args: any) => {
-    if (!context.idb) return result.err(false); // TODO wait until idb is ready
+export const createSafeAddKey = (context: IdbKeyServiceContext) => async (args: any) => {
+  if (!context.idb) return result.err(false); // TODO wait until idb is ready
 
-    const kp = keyPair(args.privateKey);
+  const kp = keyPair(args.privateKey);
 
-    // 2. Put the private key to the Idb
-    const request = context.idb
-      .transaction(['keyPairs'], 'readwrite')
-      .objectStore('keyPairs')
-      .put(kp.privateKey, kp.publicKey);
+  // 2. Put the private key to the Idb
+  const request = context.idb
+    .transaction(['keyPairs'], 'readwrite')
+    .objectStore('keyPairs')
+    .put(kp.privateKey, kp.publicKey);
 
-    await new Promise((resolve, reject) => {
-      request.onsuccess = () => {
-        console.log('Key added', request.result);
-        context.keyPairs.set(kp.publicKey, kp);
+  await new Promise((resolve, reject) => {
+    request.onsuccess = () => {
+      console.log('Key added', request.result);
+      context.keyPairs.set(kp.publicKey, kp);
 
-        resolve(result.ok(request.result));
-      };
+      resolve(result.ok(request.result));
+    };
 
-      request.onerror = () => {
-        console.log('Error while adding key', request.error);
-        reject(request.error);
-      };
-    });
+    request.onerror = () => {
+      console.log('Error while adding key', request.error);
+      reject(request.error);
+    };
+  });
 
-    return result.ok(kp);
-  };
+  return result.ok(kp);
+};

package/browser/src/idbKeyService/public/clear.ts

@@ -1,4 +1,4 @@
-import { result } from '@universal/src/_common/utils/result';
+import { result } from '../../../../universal/src/_common/utils/result';
 import type { IdbKeyServiceContext } from '../idbKeyService';
 
 export const createSafeClear = (context: IdbKeyServiceContext) => async () => {

package/browser/src/idbKeyService/public/hasKey.ts

@@ -1,9 +1,8 @@
-import { result } from '@universal/src/_common/utils/result';
+import { result } from '../../../../universal/src/_common/utils/result';
 import type { IdbKeyServiceContext } from '../idbKeyService';
 
-export const createSafeHasKey =
-  (context: IdbKeyServiceContext) => async (args: any) => {
-    const keyPair = await context.getKeyPair(args.publicKey);
-    /// TODO rework
-    return result.ok(keyPair.ok);
-  };
+export const createSafeHasKey = (context: IdbKeyServiceContext) => async (args: any) => {
+  const keyPair = await context.getKeyPair(args.publicKey);
+  /// TODO rework
+  return result.ok(keyPair.ok);
+};

package/browser/src/idbKeyService/public/removeKey.ts

@@ -1,4 +1,4 @@
-import { result } from '@universal/src/_common/utils/result';
+import { result } from '../../../../universal/src/_common/utils/result';
 import type { IdbKeyServiceContext } from '../idbKeyService';
 
 export const createSafeRemoveKey =

package/browser/src/idbKeyService/public/signTransaction.ts

@@ -1,9 +1,9 @@
-import { createNatError } from '@universal/src/_common/natError';
-import { TransactionSchema } from '@universal/src/_common/schemas/zod/transaction/transaction';
-import { getTransactionHash } from '@universal/src/_common/utils/getTransactionHash';
-import { result } from '@universal/src/_common/utils/result';
-import { wrapInternalError } from '@universal/src/_common/utils/wrapInternalError';
 import * as z from 'zod/mini';
+import { createNatError } from '../../../../universal/src/_common/natError';
+import { TransactionSchema } from '../../../../universal/src/_common/schemas/zod/transaction/transaction';
+import { getTransactionHash } from '../../../../universal/src/_common/utils/getTransactionHash';
+import { result } from '../../../../universal/src/_common/utils/result';
+import { wrapInternalError } from '../../../../universal/src/_common/utils/wrapInternalError';
 import type { IdbKeyServiceContext } from '../idbKeyService';
 
 const SignTransactionArgsSchema = z.object({
@@ -11,49 +11,43 @@ const SignTransactionArgsSchema = z.object({
 });
 
 export const createSafeSignTransaction: any = (context: IdbKeyServiceContext) =>
-  wrapInternalError(
-    `IdbKeyService.SignTransaction.Internal`,
-    async (args: any) => {
-      const validArgs = SignTransactionArgsSchema.safeParse(args);
-
-      if (!validArgs.success)
-        return result.err(
-          createNatError({
-            kind: `IdbKeyService.SignTransaction.Args.InvalidSchema`,
-            context: { zodError: validArgs.error },
-          }),
-        );
-
-      const { transaction: innerTransaction } = validArgs.data;
-
-      const keyPair = await context.getKeyPair(
-        innerTransaction.signerPublicKey.publicKey,
+  wrapInternalError(`IdbKeyService.SignTransaction.Internal`, async (args: any) => {
+    const validArgs = SignTransactionArgsSchema.safeParse(args);
+
+    if (!validArgs.success)
+      return result.err(
+        createNatError({
+          kind: `IdbKeyService.SignTransaction.Args.InvalidSchema`,
+          context: { zodError: validArgs.error },
+        }),
       );
 
-      // TODO Think if it's possible to wrap into some helper function
-      if (!keyPair.ok) {
-        // if (keyPair.error.kind === 'MemoryKeyService.FindKeyPair.NotFound')
-        //   return result.err(
-        //     createNatError({
-        //       kind: 'MemoryKeyService.SignTransaction.SigningKeyPair.NotFound',
-        //       context: {
-        //         signerPublicKey: innerTransaction.signerPublicKey.publicKey,
-        //       },
-        //     }),
-        //   );
-        console.log(keyPair);
-        throw keyPair.error;
-      }
-
-      const { transactionHash, u8TransactionHash } =
-        getTransactionHash(innerTransaction);
-
-      const { signature } = keyPair.value.sign(u8TransactionHash); // todo make async?
-
-      return result.ok({
-        transaction: args.transaction,
-        transactionHash,
-        signature,
-      });
-    },
-  );
+    const { transaction: innerTransaction } = validArgs.data;
+
+    const keyPair = await context.getKeyPair(innerTransaction.signerPublicKey.publicKey);
+
+    // TODO Think if it's possible to wrap into some helper function
+    if (!keyPair.ok) {
+      // if (keyPair.error.kind === 'MemoryKeyService.FindKeyPair.NotFound')
+      //   return result.err(
+      //     createNatError({
+      //       kind: 'MemoryKeyService.SignTransaction.SigningKeyPair.NotFound',
+      //       context: {
+      //         signerPublicKey: innerTransaction.signerPublicKey.publicKey,
+      //       },
+      //     }),
+      //   );
+      console.log(keyPair);
+      throw keyPair.error;
+    }
+
+    const { transactionHash, u8TransactionHash } = getTransactionHash(innerTransaction);
+
+    const { signature } = keyPair.value.sign(u8TransactionHash); // todo make async?
+
+    return result.ok({
+      transaction: args.transaction,
+      transactionHash,
+      signature,
+    });
+  });

package/browser/types/idbKeyService/idbKeyService.ts

@@ -1,4 +1,7 @@
-import type { InternalErrorContext, InvalidSchemaErrorContext } from '@universal/types/natError';
+import type {
+  InternalErrorContext,
+  InvalidSchemaErrorContext,
+} from '../../../universal/types/_common/natError';
 
 export interface IdbKeyServicePublicErrorRegister {
   'CreateIdbKeyService.Internal': InternalErrorContext;

package/browser/types/natError.ts

@@ -1,5 +1,5 @@
 import type { IdbKeyServicePublicErrorRegister } from './idbKeyService/idbKeyService';
 
-declare module '@universal/types/natError' {
+declare module '../../universal/types/_common/natError' {
   interface NatPublicErrorRegistry extends IdbKeyServicePublicErrorRegister {}
 }