Merge branch 'master' into changeset-release/master

near · May 31, 2024 · d7d6a62 · d7d6a62
2 parents 1d19de9 + ccf50b2
commit d7d6a62
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/.changeset/khaki-paws-bow.md b/.changeset/khaki-paws-bow.md
@@ -0,0 +1,6 @@
+---
+"@near-js/providers": patch
+"@near-js/types": patch
+---
+
+Fix TxExecutionStatus import.
diff --git a/packages/providers/src/failover-rpc-provider.ts b/packages/providers/src/failover-rpc-provider.ts
@@ -30,7 +30,7 @@ import {
 } from '@near-js/types';
 import { SignedTransaction } from '@near-js/transactions';
 import { Provider } from './provider';
-import { TxExecutionStatus } from '@near-js/types/src/provider/protocol';
+import { TxExecutionStatus } from '@near-js/types';
 
 /**
  * Client class to interact with the [NEAR RPC API](https://docs.near.org/api/rpc/introduction).

diff --git a/packages/providers/src/json-rpc-provider.ts b/packages/providers/src/json-rpc-provider.ts
@@ -42,7 +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';
+import { TxExecutionStatus } from '@near-js/types';
 
 /** @hidden */
 // Default number of retries before giving up on a request.

diff --git a/packages/providers/src/provider.ts b/packages/providers/src/provider.ts
@@ -25,7 +25,7 @@ import {
     RpcQueryRequest,
     EpochValidatorInfo,
 } from '@near-js/types';
-import { TxExecutionStatus } from '@near-js/types/src/provider/protocol';
+import { TxExecutionStatus } from '@near-js/types';
 
 /** @hidden */
 export abstract class Provider {

diff --git a/packages/types/src/provider/index.ts b/packages/types/src/provider/index.ts
@@ -36,6 +36,7 @@ export {
     SyncInfo,
     TotalWeight,
     Transaction as ProviderTransaction,
+    TxExecutionStatus
 } from './protocol';
 export {
     CallFunctionRequest,