near-api-js 7.0.0-rc.0 → 7.0.0-rc.1

package/lib/accounts/account.js

@@ -40,15 +40,17 @@ export class Account {
      * balance, storage usage, and code hash
      */
     async getState() {
-        const protocolConfig = await this.provider.experimental_protocolConfig({
-            finality: DEFAULT_FINALITY,
-        });
-        const state = await this.provider.viewAccount({
-            accountId: this.accountId,
-            blockQuery: {
+        const [protocolConfig, state] = await Promise.all([
+            this.provider.experimental_protocolConfig({
                 finality: DEFAULT_FINALITY,
-            },
-        });
+            }),
+            this.provider.viewAccount({
+                accountId: this.accountId,
+                blockQuery: {
+                    finality: DEFAULT_FINALITY,
+                },
+            }),
+        ]);
         const costPerByte = BigInt(protocolConfig.runtime_config.storage_amount_per_byte);
         const usedOnStorage = BigInt(state.storage_usage) * costPerByte;
         const locked = BigInt(state.locked);
@@ -125,10 +127,12 @@ export class Account {
         if (!publicKey)
             throw new Error('Please provide a public key');
         const pk = PublicKey.from(publicKey);
-        const accessKey = await this.getAccessKey(pk);
-        const block = await this.provider.viewBlock({
-            finality: DEFAULT_FINALITY,
-        });
+        const [accessKey, block] = await Promise.all([
+            this.getAccessKey(pk),
+            this.provider.viewBlock({
+                finality: DEFAULT_FINALITY,
+            }),
+        ]);
         const recentBlockHash = block.header.hash;
         const nonce = BigInt(accessKey.nonce) + 1n;
         return createTransaction(this.accountId, pk, receiverId, nonce + 1n, actions, baseDecode(recentBlockHash));
@@ -158,12 +162,14 @@ export class Account {
         if (!publicKey)
             throw new Error('Please provide a public key');
         const pk = PublicKey.from(publicKey);
-        const accessKey = await this.getAccessKey(pk);
+        const [accessKey, block] = await Promise.all([
+            this.getAccessKey(pk),
+            this.provider.viewBlock({
+                finality: DEFAULT_FINALITY,
+            }),
+        ]);
         const nonce = BigInt(accessKey.nonce) + 1n;
-        const { header } = await this.provider.viewBlock({
-            finality: DEFAULT_FINALITY,
-        });
-        const maxBlockHeight = BigInt(header.height) + BigInt(blockHeightTtl);
+        const maxBlockHeight = BigInt(block.header.height) + BigInt(blockHeightTtl);
         return buildDelegateAction({
             receiverId,
             senderId: this.accountId,

package/lib/crypto/key_pair_ed25519.js

@@ -1,5 +1,5 @@
-import { ed25519 } from '@noble/curves/ed25519';
-import { randomBytes } from '@noble/hashes/utils';
+import { ed25519 } from '@noble/curves/ed25519.js';
+import { randomBytes } from '@noble/hashes/utils.js';
 import { baseDecode, baseEncode } from '../utils/index.js';
 import { KeySize, KeyType } from './constants.js';
 import { KeyPairBase } from './key_pair_base.js';

package/lib/crypto/key_pair_secp256k1.js

@@ -1,4 +1,4 @@
-import { randomBytes } from '@noble/hashes/utils';
+import { randomBytes } from '@noble/hashes/utils.js';
 import secp256k1 from 'secp256k1';
 import { baseDecode, baseEncode } from '../utils/index.js';
 import { KeySize, KeyType } from './constants.js';

package/lib/crypto/public_key.js

@@ -1,4 +1,4 @@
-import { ed25519 } from '@noble/curves/ed25519';
+import { ed25519 } from '@noble/curves/ed25519.js';
 import secp256k1 from 'secp256k1';
 import { baseDecode, baseEncode } from '../utils/index.js';
 import { KeySize, KeyType } from './constants.js';

package/lib/index.d.ts

@@ -5,4 +5,5 @@ export * from './providers/index.js';
 export * from './signers/index.js';
 export * from './transactions/index.js';
 export * from './types/index.js';
+export { gigaToGas, nearToYocto, teraToGas, yoctoToNear } from './units/index.js';
 export * from './utils/index.js';

package/lib/index.js

@@ -22,6 +22,7 @@ export * from './signers/index.js';
 // ============================================================================
 export * from './transactions/index.js';
 export * from './types/index.js';
+export { gigaToGas, nearToYocto, teraToGas, yoctoToNear } from './units/index.js';
 // ============================================================================
 // Utilities
 // ============================================================================

package/lib/nep413/schema.js

@@ -1,4 +1,4 @@
-import { sha256 } from '@noble/hashes/sha256';
+import { sha256 } from '@noble/hashes/sha2.js';
 import { serialize } from 'borsh';
 export const Nep413MessageSchema = {
     struct: {

package/lib/signers/signer.js

@@ -1,4 +1,4 @@
-import { sha256 } from '@noble/hashes/sha256';
+import { sha256 } from '@noble/hashes/sha2.js';
 import { KeyType } from '../crypto/index.js';
 import { serializeMessage } from '../nep413/schema.js';
 import { encodeDelegateAction, encodeTransaction, Signature, SignedDelegate, SignedTransaction, } from '../transactions/index.js';

package/lib/transactions/action_creators.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import type { PublicKey } from '../crypto/index.js';
 import { AccessKey, Action, type GlobalContractDeployMode, type GlobalContractIdentifier } from './actions.js';
 import type { DelegateAction } from './delegate.js';

package/lib/transactions/schema.d.ts

@@ -9,18 +9,18 @@ import type { Signature } from './signature.js';
  *  signed delegate actions may never be identical to signed transactions with the same fields
  * @param delegateAction Delegate action to be signed by the meta transaction sender
  */
-export declare function encodeDelegateAction(delegateAction: DelegateAction): Uint8Array;
+export declare function encodeDelegateAction(delegateAction: DelegateAction): Uint8Array<ArrayBuffer>;
 /**
  * Borsh-encode a signed delegate for validation and execution by a relayer
  * @param signedDelegate Signed delegate to be executed in a meta transaction
  */
-export declare function encodeSignedDelegate(signedDelegate: SignedDelegate): Uint8Array;
+export declare function encodeSignedDelegate(signedDelegate: SignedDelegate): Uint8Array<ArrayBufferLike>;
 /**
  * Borsh-encode a transaction or signed transaction into a serialized form.
  * @param transaction The transaction or signed transaction object to be encoded.
  * @returns A serialized representation of the input transaction.
  */
-export declare function encodeTransaction(transaction: Transaction | SignedTransaction): Uint8Array;
+export declare function encodeTransaction(transaction: Transaction | SignedTransaction): Uint8Array<ArrayBufferLike>;
 /**
  * Borsh-decode a Transaction instance from a buffer
  * @param bytes Uint8Array data to be decoded

package/lib/units/gas.d.ts

@@ -0,0 +1,3 @@
+import type { NumericString } from './types.js';
+export declare function gigaToGas(giga: NumericString | number): bigint;
+export declare function teraToGas(tera: NumericString | number): bigint;

package/lib/units/gas.js

@@ -0,0 +1,9 @@
+import { toUnits } from './utils.js';
+const GIGA_NOMINATION_EXP = 9;
+const TERA_NOMINATION_EXP = 12;
+export function gigaToGas(giga) {
+    return toUnits(giga, GIGA_NOMINATION_EXP);
+}
+export function teraToGas(tera) {
+    return toUnits(tera, TERA_NOMINATION_EXP);
+}

package/lib/units/index.d.ts

@@ -0,0 +1,2 @@
+export { gigaToGas, teraToGas } from './gas.js';
+export { nearToYocto, yoctoToNear } from './near.js';

package/lib/units/index.js

@@ -0,0 +1,2 @@
+export { gigaToGas, teraToGas } from './gas.js';
+export { nearToYocto, yoctoToNear } from './near.js';

package/lib/units/near.d.ts

@@ -0,0 +1,3 @@
+import type { BigintString, NumericString } from './types.js';
+export declare function nearToYocto(near: number | NumericString): bigint;
+export declare function yoctoToNear(yocto: bigint | BigintString, decimals?: number): NumericString;

package/lib/units/near.js

@@ -0,0 +1,22 @@
+import { toUnits } from './utils.js';
+const NEAR_NOMINATION_EXP = 24;
+export function nearToYocto(near) {
+    return toUnits(near, NEAR_NOMINATION_EXP);
+}
+export function yoctoToNear(yocto, decimals = NEAR_NOMINATION_EXP) {
+    decimals = Math.floor(decimals);
+    if (decimals < 0 || decimals > NEAR_NOMINATION_EXP) {
+        throw new Error(`Decimal places argument must be between 0 and ${NEAR_NOMINATION_EXP}`);
+    }
+    // check if bigint is constructible
+    yocto = `${BigInt(yocto)}`;
+    const wholeStr = yocto.substring(0, yocto.length - NEAR_NOMINATION_EXP) || '0';
+    const fractionStr = yocto
+        .substring(yocto.length - NEAR_NOMINATION_EXP)
+        .padStart(NEAR_NOMINATION_EXP, '0')
+        .substring(0, decimals);
+    return trimTrailingZeroes(`${wholeStr}.${fractionStr}`);
+}
+function trimTrailingZeroes(value) {
+    return value.replace(/\.?0*$/, '');
+}

package/lib/units/types.d.ts

@@ -0,0 +1,2 @@
+export type NumericString = `${number}`;
+export type BigintString = `${bigint}`;

package/lib/units/types.js

@@ -0,0 +1 @@
+export {};

package/lib/units/utils.d.ts

@@ -0,0 +1,2 @@
+import type { NumericString } from './types.js';
+export declare function toUnits(amount: NumericString | number, exponent: number): bigint;

package/lib/units/utils.js

@@ -0,0 +1,23 @@
+export function toUnits(amount, exponent) {
+    const cleanedAmount = cleanupAmount(`${amount}`);
+    if (!cleanedAmount) {
+        throw new Error('Amount cannot be empty');
+    }
+    const split = cleanedAmount.split('.');
+    const wholePart = split[0];
+    const fracPart = split[1] || '';
+    if (split.length > 2 || fracPart.length > exponent) {
+        throw new Error(`Cannot parse '${amount}'`);
+    }
+    return BigInt(trimLeadingZeroes(wholePart + fracPart.padEnd(exponent, '0')));
+}
+function cleanupAmount(amount) {
+    return amount.replace(/,/g, '').trim();
+}
+function trimLeadingZeroes(value) {
+    value = value.replace(/^0+/, '');
+    if (value === '') {
+        return '0';
+    }
+    return value;
+}

package/lib/utils/format.d.ts

@@ -8,6 +8,8 @@ export declare const NEAR_NOMINATION_EXP = 24;
  */
 export declare const NEAR_NOMINATION: bigint;
 /**
+ * @deprecated use {@link yoctoToNear} instead.
+ *
  * Convert account balance value from internal indivisible units to NEAR. 1 NEAR is defined by {@link NEAR_NOMINATION}.
  * Effectively this divides given amount by {@link NEAR_NOMINATION}.
  *
@@ -17,6 +19,8 @@ export declare const NEAR_NOMINATION: bigint;
  */
 export declare function formatNearAmount(balance: string | number | bigint, fracDigits?: number): string;
 /**
+ * @deprecated use {@link nearToYocto} instead.
+ *
  * Convert human readable NEAR amount to internal indivisible units.
  * Effectively this multiplies given amount by {@link NEAR_NOMINATION}.
  *

package/lib/utils/format.js

@@ -14,6 +14,8 @@ for (let i = 0, offset = 5n; i < NEAR_NOMINATION_EXP; i++, offset = offset * BN1
     ROUNDING_OFFSETS[i] = offset;
 }
 /**
+ * @deprecated use {@link yoctoToNear} instead.
+ *
  * Convert account balance value from internal indivisible units to NEAR. 1 NEAR is defined by {@link NEAR_NOMINATION}.
  * Effectively this divides given amount by {@link NEAR_NOMINATION}.
  *
@@ -39,6 +41,8 @@ export function formatNearAmount(balance, fracDigits = NEAR_NOMINATION_EXP) {
     return trimTrailingZeroes(`${formatWithCommas(wholeStr)}.${fractionStr}`);
 }
 /**
+ * @deprecated use {@link nearToYocto} instead.
+ *
  * Convert human readable NEAR amount to internal indivisible units.
  * Effectively this multiplies given amount by {@link NEAR_NOMINATION}.
  *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "near-api-js",
   "description": "JavaScript library to interact with NEAR Protocol via RPC API",
-  "version": "7.0.0-rc.0",
+  "version": "7.0.0-rc.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/near/near-api-js.git"
@@ -35,36 +35,36 @@
     }
   },
   "dependencies": {
-    "@noble/curves": "1.8.1",
-    "@noble/hashes": "1.7.1",
-    "@scure/base": "1.2.4",
-    "borsh": "1.0.0",
+    "@noble/curves": "2.0.1",
+    "@noble/hashes": "2.0.1",
+    "@scure/base": "2.0.0",
+    "borsh": "2.0.0",
     "depd": "2.0.0",
-    "exponential-backoff": "3.1.2",
+    "exponential-backoff": "3.1.3",
     "is-my-json-valid": "2.20.6",
-    "mustache": "4.0.0",
+    "mustache": "4.2.0",
     "secp256k1": "5.0.1"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "0.18.2",
-    "@biomejs/biome": "^2.3.6",
-    "@changesets/changelog-github": "0.5.1",
-    "@changesets/cli": "2.29.7",
-    "@commitlint/cli": "19.3.0",
-    "@commitlint/config-conventional": "19.7.1",
-    "@types/node": "20.0.0",
-    "@vitest/coverage-v8": "4.0.10",
-    "@vitest/ui": "4.0.10",
-    "commitlint": "19.7.1",
+    "@biomejs/biome": "^2.3.8",
+    "@changesets/changelog-github": "0.5.2",
+    "@changesets/cli": "2.29.8",
+    "@commitlint/cli": "20.2.0",
+    "@commitlint/config-conventional": "20.2.0",
+    "@types/node": "24.10.2",
+    "@vitest/coverage-v8": "4.0.15",
+    "@vitest/ui": "4.0.15",
+    "commitlint": "20.2.0",
     "husky": "9.1.7",
     "near-hello": "0.5.1",
     "near-workspaces": "5.0.0",
-    "rimraf": "6.0.1",
-    "semver": "7.7.1",
+    "rimraf": "6.1.2",
+    "semver": "7.7.3",
     "ts-node": "10.9.2",
-    "typedoc": "0.27.9",
-    "typescript": "5.4.5",
-    "vitest": "4.0.10"
+    "typedoc": "0.28.15",
+    "typescript": "5.9.3",
+    "vitest": "4.0.15"
   },
   "keywords": [],
   "license": "(MIT AND Apache-2.0)",