feat: add support for nearcore 1.37 changes

.changeset/slimy-brooms-refuse.md

@@ -0,0 +1,6 @@
+---
+"@near-js/accounts": minor
+"@near-js/types": minor
+---
+
+Add support for nearcore 1.37 changes

package.json

@@ -31,5 +31,9 @@
     "turbo": "1.4.5",
     "typedoc": "0.25.3",
     "typescript": "4.9.4"
+  },
+  "resolutions": {
+    "near-sandbox": "0.0.18",
+    "near-api-js": "4.0.0"
   }
 }

packages/accounts/package.json

@@ -34,11 +34,15 @@
         "bs58": "4.0.0",
         "jest": "26.0.1",
         "near-hello": "0.5.1",
-        "near-workspaces": "3.4.0",
+        "near-workspaces": "3.5.0",
         "ts-jest": "26.5.6",
         "typescript": "4.9.4"
     },
     "files": [
         "lib"
-    ]
+    ],
+    "resolutions": {
+        "near-sandbox": "0.0.18",
+        "near-api-js": "4.0.0"
+    }
 }

packages/near-api-js/package.json

@@ -46,7 +46,7 @@
         "semver": "7.1.1",
         "ts-jest": "26.5.6",
         "uglifyify": "5.0.1",
-        "near-workspaces": "3.4.0"
+        "near-workspaces": "3.5.0"
     },
     "keywords": [],
     "license": "(MIT AND Apache-2.0)",

packages/providers/package.json

@@ -18,14 +18,14 @@
   "dependencies": {
     "@near-js/transactions": "workspace:*",
     "@near-js/types": "workspace:*",
-    "@near-js/utils": "workspace:*",
+    "@near-js/utils": "workspace:*", 
     "borsh": "1.0.0",
     "http-errors": "1.7.2"
   },
   "devDependencies": {
     "@types/node": "18.11.18",
     "jest": "26.0.1",
-    "near-workspaces": "3.4.0",
+    "near-workspaces": "3.5.0",
     "ts-jest": "26.5.6",
     "typescript": "4.9.4"
   },
@@ -34,5 +34,9 @@
   },
   "files": [
     "lib"
-  ]
+  ],
+  "resolutions": {
+    "near-sandbox": "0.0.18",
+    "near-api-js": "4.0.0"
+  }
 }

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

@@ -42,6 +42,7 @@ import {
 import { exponentialBackoff } from './exponential-backoff';
 import { Provider } from './provider';
 import { ConnectionInfo, fetchJson } from './fetch_json';
+import { TxExecutionStatus } from '@near-js/types/src/provider/protocol';
 
 /** @hidden */
 // Default number of retries before giving up on a request.
@@ -104,15 +105,25 @@ export class JsonRpcProvider extends Provider {
         return this.sendJsonRpc('status', []);
     }
 
+    /**
+     * Sends a signed transaction to the RPC
+     *
+     * @param signedTransaction The signed transaction being sent
+     * @param waitUntil
+     */
+    async sendTransactionUntil(signedTransaction: SignedTransaction, waitUntil: TxExecutionStatus): Promise<FinalExecutionOutcome> {
+        const bytes = encodeTransaction(signedTransaction);
+        return this.sendJsonRpc('send_tx', { signed_tx_base64: Buffer.from(bytes).toString('base64'), wait_until: waitUntil });
+    }
+
     /**
      * Sends a signed transaction to the RPC and waits until transaction is fully complete
      * @see [https://docs.near.org/docs/develop/front-end/rpc#send-transaction-await](https://docs.near.org/docs/develop/front-end/rpc#general-validator-status)
      *
      * @param signedTransaction The signed transaction being sent
      */
     async sendTransaction(signedTransaction: SignedTransaction): Promise<FinalExecutionOutcome> {
-        const bytes = encodeTransaction(signedTransaction);
-        return this.sendJsonRpc('broadcast_tx_commit', [Buffer.from(bytes).toString('base64')]);
+        return this.sendTransactionUntil(signedTransaction, 'FINAL');
     }
 
     /**
@@ -122,8 +133,7 @@ export class JsonRpcProvider extends Provider {
      * @returns {Promise<FinalExecutionOutcome>}
      */
     async sendTransactionAsync(signedTransaction: SignedTransaction): Promise<FinalExecutionOutcome> {
-        const bytes = encodeTransaction(signedTransaction);
-        return this.sendJsonRpc('broadcast_tx_async', [Buffer.from(bytes).toString('base64')]);
+        return this.sendTransactionUntil(signedTransaction, 'NONE');
     }
 
     /**
@@ -132,36 +142,38 @@ export class JsonRpcProvider extends Provider {
      *
      * @param txHash A transaction hash as either a Uint8Array or a base58 encoded string
      * @param accountId The NEAR account that signed the transaction
+     * @param waitUntil
      */
-    async txStatus(txHash: Uint8Array | string, accountId: string): Promise<FinalExecutionOutcome> {
+    async txStatus(txHash: Uint8Array | string, accountId: string, waitUntil: TxExecutionStatus = 'FINAL'): Promise<FinalExecutionOutcome> {
         if (typeof txHash === 'string') {
-            return this.txStatusString(txHash, accountId);
+            return this.txStatusString(txHash, accountId, waitUntil);
         } else {
-            return this.txStatusUint8Array(txHash, accountId);
+            return this.txStatusUint8Array(txHash, accountId, waitUntil);
         }
     }
 
-    private async txStatusUint8Array(txHash: Uint8Array, accountId: string): Promise<FinalExecutionOutcome> {
-        return this.sendJsonRpc('tx', [baseEncode(txHash), accountId]);
+    private async txStatusUint8Array(txHash: Uint8Array, accountId: string, waitUntil: TxExecutionStatus): Promise<FinalExecutionOutcome> {
+        return this.sendJsonRpc('tx', { tx_hash: baseEncode(txHash), sender_account_id: accountId, wait_until: waitUntil });
     }
 
-    private async txStatusString(txHash: string, accountId: string): Promise<FinalExecutionOutcome> {
-        return this.sendJsonRpc('tx', [txHash, accountId]);
+    private async txStatusString(txHash: string, accountId: string, waitUntil: string): Promise<FinalExecutionOutcome> {
+        return this.sendJsonRpc('tx', { tx_hash: txHash, sender_account_id: accountId, wait_until: waitUntil });
     }
 
     /**
      * Gets a transaction's status from the RPC with receipts
      * See [docs for more info](https://docs.near.org/docs/develop/front-end/rpc#transaction-status-with-receipts)
      * @param txHash The hash of the transaction
      * @param accountId The NEAR account that signed the transaction
+     * @param waitUntil
      * @returns {Promise<FinalExecutionOutcome>}
      */
-    async txStatusReceipts(txHash: Uint8Array | string, accountId: string): Promise<FinalExecutionOutcome> {
+    async txStatusReceipts(txHash: Uint8Array | string, accountId: string, waitUntil: TxExecutionStatus = 'FINAL'): Promise<FinalExecutionOutcome> {
         if (typeof txHash === 'string') {
-            return this.sendJsonRpc('EXPERIMENTAL_tx_status', [txHash, accountId]);
+            return this.sendJsonRpc('EXPERIMENTAL_tx_status', { tx_hash: txHash, sender_account_id: accountId, wait_until: waitUntil });
         }
         else {
-            return this.sendJsonRpc('EXPERIMENTAL_tx_status', [baseEncode(txHash), accountId]);
+            return this.sendJsonRpc('EXPERIMENTAL_tx_status', { tx_hash: baseEncode(txHash), sender_account_id: accountId, wait_until: waitUntil });
         }
     }
 

packages/types/src/provider/protocol.ts

@@ -30,6 +30,8 @@ export type BlockId = BlockHash | BlockHeight;
 
 export type Finality = 'optimistic' | 'near-final' | 'final'
 
+export type TxExecutionStatus = 'NONE' | 'INCLUDED' | 'INCLUDED_FINAL' | 'EXECUTED' | 'FINAL';
+
 export type BlockReference = { blockId: BlockId } | { finality: Finality } | { sync_checkpoint: 'genesis' | 'earliest_available' }
 
 export interface TotalWeight {

packages/types/src/provider/response.ts

@@ -2,8 +2,7 @@
  * NEAR RPC API request types and responses
  * @module
  */
-
-import { BlockHash, BlockHeight, MerklePath } from './protocol';
+import { BlockHash, BlockHeight, MerklePath, TxExecutionStatus } from './protocol';
 
 export enum ExecutionStatusBasic {
     Unknown = 'Unknown',
@@ -55,6 +54,7 @@ export interface ExecutionOutcomeWithIdView {
 }
 
 export interface FinalExecutionOutcome {
+    final_execution_status: TxExecutionStatus;
     status: FinalExecutionStatus | FinalExecutionStatusBasic;
     transaction: any;
     transaction_outcome: ExecutionOutcomeWithId;