Update FinalExecutionOutCome

near · Dec 20, 2019 · 2dbd5d6 · 2dbd5d6
1 parent 476d416
commit 2dbd5d6
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 265 deletions.
diff --git a/lib/account.js b/lib/account.js
diff --git a/lib/near.js b/lib/near.js
diff --git a/lib/providers/index.d.ts b/lib/providers/index.d.ts
diff --git a/lib/providers/index.js b/lib/providers/index.js
diff --git a/lib/providers/provider.d.ts b/lib/providers/provider.d.ts
diff --git a/lib/providers/provider.js b/lib/providers/provider.js
diff --git a/src.ts/account.ts b/src.ts/account.ts
@@ -114,12 +114,12 @@ export class Account {
             }
         }
 
-        const flatLogs = [result.transaction, ...result.receipts].reduce((acc, it) => acc.concat(it.outcome.logs), []);
+        const flatLogs = [result.transaction_outcome, ...result.receipts_outcome].reduce((acc, it) => acc.concat(it.outcome.logs), []);
         this.printLogs(signedTx.transaction.receiverId, flatLogs);
 
         if (typeof result.status === 'object' && typeof result.status.Failure === 'object') {
             throw new TypedError(
-                `Transaction ${result.transaction.id} failed. ${result.status.Failure.error_message}`,
+                `Transaction ${result.transaction_outcome.id} failed. ${result.status.Failure.error_message}`,
                 result.status.Failure.error_type);
         }
         // TODO: if Tx is Unknown or Started.

diff --git a/src.ts/near.ts b/src.ts/near.ts
@@ -65,7 +65,7 @@ export class Near {
         console.warn('near.sendTokens is deprecated. Use `yourAccount.sendMoney` instead.');
         const account = new Account(this.connection, originator);
         const result = await account.sendMoney(receiver, amount);
-        return result.transaction.id;
+        return result.transaction_outcome.id;
     }
 }
 

diff --git a/src.ts/providers/index.ts b/src.ts/providers/index.ts
@@ -1,5 +1,5 @@
 
-import { Provider, FinalExecutionOutcome, ExecutionOutcomeWithId, getTransactionLastResult, FinalExecutionStatusBasic, adaptTransactionResult } from './provider';
+import { Provider, FinalExecutionOutcome, ExecutionOutcomeWithId, getTransactionLastResult, FinalExecutionStatusBasic } from './provider';
 import { JsonRpcProvider, TypedError } from './json-rpc-provider';
 
 export {
@@ -9,6 +9,5 @@ export {
     ExecutionOutcomeWithId,
     FinalExecutionStatusBasic,
     getTransactionLastResult,
-    adaptTransactionResult,
     TypedError
 };
diff --git a/src.ts/providers/json-rpc-provider.ts b/src.ts/providers/json-rpc-provider.ts
@@ -1,8 +1,8 @@
 'use strict';
 
 import {
-  Provider, FinalExecutionOutcome, NodeStatusResult, BlockId,
-  BlockResult, ChunkId, ChunkResult, adaptTransactionResult
+    Provider, FinalExecutionOutcome, NodeStatusResult, BlockId,
+    BlockResult, ChunkId, ChunkResult, adaptTransactionResult
 } from './provider';
 import { Network } from '../utils/network';
 import { ConnectionInfo, fetchJson } from '../utils/web';