Propagate tx info into ServerErrors

src/account.ts

@@ -8,7 +8,7 @@ import { Connection } from './connection';
 import {base_decode, base_encode} from './utils/serialize';
 import { PublicKey } from './utils/key_pair';
 import { PositionalArgsError } from './utils/errors';
-import { parseRpcError } from './utils/rpc_errors';
+import { parseRpcError, parseResultError } from './utils/rpc_errors';
 import { ServerError } from './generated/rpc_error_types';
 
 import exponentialBackoff from './utils/exponential-backoff';
@@ -182,7 +182,7 @@ export class Account {
                     `Transaction ${result.transaction_outcome.id} failed. ${result.status.Failure.error_message}`,
                     result.status.Failure.error_type);
             } else {
-                throw parseRpcError(result.status.Failure);
+                throw parseResultError(result);
             }
         }
         // TODO: if Tx is Unknown or Started.

src/transaction.ts

@@ -34,14 +34,14 @@ export function functionCallAccessKey(receiverId: string, methodNames: String[],
 
 export class IAction extends Assignable {}
 
-class CreateAccount extends IAction {}
-class DeployContract extends IAction { code: Uint8Array; }
-class FunctionCall extends IAction { methodName: string; args: Uint8Array; gas: BN; deposit: BN; }
-class Transfer extends IAction { deposit: BN; }
-class Stake extends IAction { stake: BN; publicKey: PublicKey; }
-class AddKey extends IAction { publicKey: PublicKey; accessKey: AccessKey; }
-class DeleteKey extends IAction { publicKey: PublicKey; }
-class DeleteAccount extends IAction { beneficiaryId: string; }
+export class CreateAccount extends IAction {}
+export class DeployContract extends IAction { code: Uint8Array; }
+export class FunctionCall extends IAction { methodName: string; args: Uint8Array; gas: BN; deposit: BN; }
+export class Transfer extends IAction { deposit: BN; }
+export class Stake extends IAction { stake: BN; publicKey: PublicKey; }
+export class AddKey extends IAction { publicKey: PublicKey; accessKey: AccessKey; }
+export class DeleteKey extends IAction { publicKey: PublicKey; }
+export class DeleteAccount extends IAction { beneficiaryId: string; }
 
 export function createAccount(): Action {
     return new Action({createAccount: new CreateAccount({}) });

src/utils/rpc_errors.ts

@@ -7,6 +7,10 @@ import { ServerError } from '../generated/rpc_error_types';
 
 export * from '../generated/rpc_error_types';
 
+class ServerTransactionError extends ServerError {
+    public transaction_outcome: any;
+}
+
 export function parseRpcError(errorObj: Record<string, any>): ServerError {
     const result = {};
     const errorClassName = walkSubtype(errorObj, schema.schema, result, '');
@@ -16,6 +20,14 @@ export function parseRpcError(errorObj: Record<string, any>): ServerError {
     return error;
 }
 
+export function parseResultError(result: any): ServerTransactionError {
+    const server_error = parseRpcError(result.status.Failure);
+    const server_tx_error = new ServerTransactionError();
+    Object.assign(server_tx_error, server_error);
+    server_tx_error.transaction_outcome = result.transaction_outcome;
+    return server_tx_error;
+}
+
 export function formatError(errorClassName: string, errorData): string {
     if (typeof messages[errorClassName] === 'string') {
         return Mustache.render(messages[errorClassName], errorData);
@@ -57,6 +69,8 @@ function walkSubtype(errorObj, schema, result, typeName) {
         }
         return walkSubtype(error, schema, result, errorTypeName);
     } else {
+        // TODO: is this the right thing to do?
+        result.kind = errorObj;
         return typeName;
     }
 }