Merge branch 'master' into multi-contract-keystore

.changeset/funny-jars-camp.md

@@ -0,0 +1,8 @@
+---
+"@near-js/accounts": patch
+"near-api-js": patch
+"@near-js/providers": patch
+"@near-js/utils": patch
+---
+
+add check for global 'process' object

.changeset/nice-worms-arrive.md

@@ -0,0 +1,5 @@
+---
+"@near-js/biometric-ed25519": minor
+---
+
+Handing null response on create key flow

.changeset/spicy-tomatoes-talk.md

@@ -0,0 +1,10 @@
+---
+"near-api-js": major
+"@near-js/accounts": major
+"@near-js/biometric-ed25519": major
+"@near-js/crypto": major
+"@near-js/transactions": major
+"@near-js/wallet-account": major
+---
+
+feat: updated borsh-js to v1.0.1

.changeset/wet-jars-attend.md

@@ -0,0 +1,6 @@
+---
+"near-api-js": patch
+"@near-js/providers": patch
+---
+
+fixes override of global fetch property

packages/accounts/package.json

@@ -25,7 +25,7 @@
     "ajv": "^8.11.2",
     "ajv-formats": "^2.1.1",
     "bn.js": "5.2.1",
-    "borsh": "^0.7.0",
+    "borsh": "1.0.0",
     "depd": "^2.0.0",
     "near-abi": "0.1.1"
   },

packages/accounts/src/account.ts

@@ -26,14 +26,15 @@ import {
     BlockReference,
 } from '@near-js/types';
 import {
+    baseDecode,
+    baseEncode,
     logWarning,
     parseResultError,
     DEFAULT_FUNCTION_CALL_GAS,
     printTxOutcomeLogs,
     printTxOutcomeLogsAndFailures,
 } from '@near-js/utils';
 import BN from 'bn.js';
-import { baseDecode, baseEncode } from 'borsh';
 
 import { Connection } from './connection';
 
@@ -363,7 +364,7 @@ export class Account {
      * @param beneficiaryId The NEAR account that will receive the remaining Ⓝ balance from the account being deleted
      */
     async deleteAccount(beneficiaryId: string) {
-        if (!process.env['NEAR_NO_LOGS']) {
+        if (!(typeof process === 'object' && process.env['NEAR_NO_LOGS'])) {
             console.log('Deleting an account does not automatically transfer NFTs and FTs to the beneficiary address. Ensure to transfer assets before deleting.');
         }
         return this.signAndSendTransaction({

packages/accounts/test/providers.test.js

@@ -69,9 +69,8 @@ test('json rpc query view_state', withProvider(async (provider) => {
             block_height: expect.any(Number),
             block_hash: expect.any(String),
             values: [
-                { key: 'bmFtZQ==', value: 'aGVsbG8=', proof: [] }
-            ],
-            proof: []
+                { key: 'bmFtZQ==', value: 'aGVsbG8=' }
+            ]
         });
     });
 }));

packages/biometric-ed25519/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@near-js/biometric-ed25519",
   "description": "JavaScript library to handle webauthn and biometric keys",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
@@ -16,9 +16,10 @@
     "@aws-crypto/sha256-js": "^4.0.0",
     "@hexagon/base64": "^1.1.26",
     "@near-js/crypto": "workspace:*",
+    "@near-js/utils": "workspace:*",
     "asn1-parser": "^1.1.8",
     "bn.js": "5.2.1",
-    "borsh": "^0.7.0",
+    "borsh": "1.0.0",
     "buffer": "^6.0.3",
     "elliptic": "^6.5.4",
     "fido2-lib": "3.4.1"

packages/biometric-ed25519/src/index.ts

@@ -4,7 +4,7 @@ import { Sha256 } from '@aws-crypto/sha256-js';
 import { Buffer } from 'buffer';
 import asn1 from 'asn1-parser';
 import { KeyPair } from '@near-js/crypto';
-import { baseEncode } from 'borsh';
+import { baseEncode } from '@near-js/utils';
 import {
     validateUsername,
     preformatMakeCredReq,
@@ -34,6 +34,13 @@ function setBufferIfUndefined() {
     }
 }
 
+export class PasskeyProcessCanceled extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'PasskeyProcessCanceled';
+    }
+}
+
 export const createKey = async (username: string): Promise<KeyPair> => {
     const cleanUserName = validateUsername(username);
     if (!f2l.f2l) {
@@ -51,6 +58,10 @@ export const createKey = async (username: string): Promise<KeyPair> => {
     setBufferIfUndefined();
     return navigator.credentials.create({ publicKey })
         .then(async (res) => {
+            if (!res) {
+                throw new PasskeyProcessCanceled('Failed to retrieve response from navigator.credentials.create');
+            }
+
             const result = await f2l.attestation({
                 clientAttestationResponse: res,
                 origin,

packages/crypto/package.json

@@ -17,8 +17,9 @@
   "license": "ISC",
   "dependencies": {
     "@near-js/types": "workspace:*",
+    "@near-js/utils": "workspace:*",
     "bn.js": "5.2.1",
-    "borsh": "^0.7.0",
+    "borsh": "1.0.0",
     "tweetnacl": "^1.0.1"
   },
   "devDependencies": {

packages/crypto/src/key_pair_ed25519.ts

@@ -1,4 +1,4 @@
-import { baseEncode, baseDecode } from 'borsh';
+import { baseEncode, baseDecode } from '@near-js/utils';
 import nacl from 'tweetnacl';
 
 import { KeyType } from './constants';

packages/crypto/src/public_key.ts

@@ -1,5 +1,5 @@
 import { Assignable } from '@near-js/types';
-import { baseEncode, baseDecode } from 'borsh';
+import { baseEncode, baseDecode } from '@near-js/utils';
 import nacl from 'tweetnacl';
 
 import { KeyType } from './constants';

packages/crypto/test/key_pair.test.js

@@ -1,4 +1,4 @@
-const { baseEncode } = require('borsh');
+const { baseEncode } = require('@near-js/utils');
 const { sha256 } = require('js-sha256');
 
 const { KeyPair, KeyPairEd25519, PublicKey } = require('../lib');

packages/near-api-js/package.json

@@ -25,7 +25,7 @@
         "ajv": "^8.11.2",
         "ajv-formats": "^2.1.1",
         "bn.js": "5.2.1",
-        "borsh": "^0.7.0",
+        "borsh": "1.0.0",
         "depd": "^2.0.0",
         "error-polyfill": "^0.1.3",
         "http-errors": "^1.7.2",

packages/near-api-js/src/connect.ts

@@ -25,11 +25,8 @@
 import { readKeyFile } from './key_stores/unencrypted_file_system_keystore';
 import { InMemoryKeyStore, MergeKeyStore } from './key_stores';
 import { Near, NearConfig } from './near';
-import fetch from './utils/setup-node-fetch';
 import { logWarning } from './utils';
 
-global.fetch = fetch;
-
 export interface ConnectConfig extends NearConfig {
     /**
      * Initialize an {@link key_stores/in_memory_key_store!InMemoryKeyStore} by reading the file at keyPath.
@@ -57,7 +54,7 @@ export async function connect(config: ConnectConfig): Promise<Near> {
                     keyPathStore,
                     config.keyStore || config.deps?.keyStore
                 ], { writeKeyStoreIndex: 1 });
-                if (!process.env['NEAR_NO_LOGS']) {
+                if (!(typeof process === 'object' && process.env['NEAR_NO_LOGS'])) {
                     console.log(`Loaded master account ${accountKeyFile[0]} key from ${config.keyPath} with public key = ${keyPair.getPublicKey()}`);
                 }
             }

packages/near-api-js/src/utils/serialize.ts

@@ -1,10 +1,10 @@
 export {
-    baseEncode as base_encode,
-    baseDecode as base_decode,
     serialize,
     deserialize,
     Schema,
-    BorshError,
-    BinaryWriter,
-    BinaryReader,
-} from 'borsh';
+} from 'borsh';
+
+export {
+    baseEncode as base_encode,
+    baseDecode as base_decode,
+} from '@near-js/utils';

packages/providers/package.json

@@ -20,7 +20,7 @@
     "@near-js/types": "workspace:*",
     "@near-js/utils": "workspace:*",
     "bn.js": "5.2.1",
-    "borsh": "^0.7.0",
+    "borsh": "1.0.0",
     "http-errors": "^1.7.2"
   },
   "devDependencies": {

packages/providers/src/fetch_json.ts

@@ -16,7 +16,7 @@ export interface ConnectionInfo {
     headers?: { [key: string]: string | number };
 }
 
-const logWarning = (...args) => !process.env['NEAR_NO_LOGS'] && console.warn(...args);
+const logWarning = (...args) => !(typeof process === 'object' && process.env['NEAR_NO_LOGS']) && console.warn(...args);
 
 export async function fetchJson(connectionInfoOrUrl: string | ConnectionInfo, json?: string): Promise<any> {
     let connectionInfo: ConnectionInfo = { url: null };
@@ -28,11 +28,8 @@ export async function fetchJson(connectionInfoOrUrl: string | ConnectionInfo, js
 
     const response = await exponentialBackoff(START_WAIT_TIME_MS, RETRY_NUMBER, BACKOFF_MULTIPLIER, async () => {
         try {
-            if (!global.fetch) {
-                global.fetch = (await import('./fetch')).default;
-            }
 
-            const response = await global.fetch(connectionInfo.url, {
+            const response = await (global.fetch ?? (await import('./fetch')).default)(connectionInfo.url, {
                 method: json ? 'POST' : 'GET',
                 body: json ? json : undefined,
                 headers: { ...connectionInfo.headers, 'Content-Type': 'application/json' }

packages/providers/src/json-rpc-provider.ts

@@ -6,6 +6,7 @@
  * @see {@link providers/provider | providers} for a list of request and response types
  */
 import {
+    baseEncode,
     getErrorTypeFromErrorMessage,
     parseRpcError,
 } from '@near-js/utils';
@@ -34,7 +35,6 @@ import {
     encodeTransaction,
     SignedTransaction,
 } from '@near-js/transactions';
-import { baseEncode } from 'borsh';
 
 import { exponentialBackoff } from './exponential-backoff';
 import { Provider } from './provider';
@@ -372,7 +372,7 @@ export class JsonRpcProvider extends Provider {
                 return response;
             } catch (error) {
                 if (error.type === 'TimeoutError') {
-                    if (!process.env['NEAR_NO_LOGS']) {
+                    if (!(typeof process === 'object' && process.env['NEAR_NO_LOGS'])) {
                         console.warn(`Retrying request to ${method} as it has timed out`, params);
                     }
                     return null;

packages/transactions/package.json

@@ -21,7 +21,7 @@
     "@near-js/types": "workspace:*",
     "@near-js/utils": "workspace:*",
     "bn.js": "5.2.1",
-    "borsh": "^0.7.0",
+    "borsh": "1.0.0",
     "js-sha256": "^0.9.0"
   },
   "devDependencies": {

packages/transactions/src/action_creators.ts

@@ -22,6 +22,7 @@ import { Signature } from './signature';
 
 function fullAccessKey(): AccessKey {
     return new AccessKey({
+        nonce: 0,
         permission: new AccessKeyPermission({
             fullAccess: new FullAccessPermission({}),
         })
@@ -30,6 +31,7 @@ function fullAccessKey(): AccessKey {
 
 function functionCallAccessKey(receiverId: string, methodNames: string[], allowance?: BN): AccessKey {
     return new AccessKey({
+        nonce: 0,
         permission: new AccessKeyPermission({
             functionCall: new FunctionCallPermission({ receiverId, allowance, methodNames }),
         })
@@ -60,7 +62,7 @@ export function stringifyJsonOrBytes(args: any): Buffer {
  * @param stringify Convert input arguments into bytes array.
  * @param jsContract  Is contract from JS SDK, skips stringification of arguments.
  */
-function functionCall(methodName: string, args: Uint8Array | object, gas: BN, deposit: BN, stringify = stringifyJsonOrBytes, jsContract = false): Action {
+function functionCall(methodName: string, args: Uint8Array | object, gas: BN = new BN(0), deposit: BN = new BN(0), stringify = stringifyJsonOrBytes, jsContract = false): Action {
     if(jsContract){
         return new Action({ functionCall: new FunctionCall({ methodName, args, gas, deposit }) });
     }
@@ -75,11 +77,11 @@ function functionCall(methodName: string, args: Uint8Array | object, gas: BN, de
     });
 }
 
-function transfer(deposit: BN): Action {
+function transfer(deposit: BN = new BN(0)): Action {
     return new Action({ transfer: new Transfer({ deposit }) });
 }
 
-function stake(stake: BN, publicKey: PublicKey): Action {
+function stake(stake: BN = new BN(0), publicKey: PublicKey): Action {
     return new Action({ stake: new Stake({ stake, publicKey }) });
 }
 

packages/transactions/src/actions.ts

@@ -33,6 +33,7 @@ export class AccessKeyPermission extends Enum {
 }
 
 export class AccessKey extends Assignable {
+    nonce: BN;
     permission: AccessKeyPermission;
 }
 

packages/transactions/src/create_transaction.ts

@@ -5,5 +5,5 @@ import { Action } from './actions';
 import { Transaction } from './schema';
 
 export function createTransaction(signerId: string, publicKey: PublicKey, receiverId: string, nonce: BN | string | number, actions: Action[], blockHash: Uint8Array): Transaction {
-    return new Transaction({ signerId, publicKey, nonce, receiverId, actions, blockHash });
+    return new Transaction({ signerId, publicKey, nonce: new BN(nonce), receiverId, actions, blockHash });
 }