Merge pull request #462 from casper-ecosystem/feat-checksum-keys-and-…

…fixes

Feat checksum keys and fixes

README.md

@@ -176,12 +176,14 @@ const transactionPayload = TransactionV1Payload.build({
   pricingMode
 });
 
-const transaction = TransactionV1.makeTransactionV1(
+const transactionV1 = TransactionV1.makeTransactionV1(
   transactionPayload
 );
-await transaction.sign(privateKey);
+await transactionV1.sign(privateKey);
 
-const result = await rpcClient.putTransactionV1(transaction);
+const tx = Transaction.fromTransactionV1(transactionV1);
+
+const result = await rpcClient.putTransaction(tx);
 
 console.log(`Transaction Hash: ${result.transactionHash}`);
 ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "casper-js-sdk",
-  "version": "5.0.0-rc6",
+  "version": "5.0.0-rc7",
   "license": "Apache 2.0",
   "description": "SDK to interact with the Casper blockchain",
   "homepage": "https://github.com/casper-ecosystem/casper-js-sdk#README.md",
@@ -120,6 +120,7 @@
     "@scure/bip32": "^1.1.5",
     "@scure/bip39": "^1.2.0",
     "@types/ws": "^8.2.2",
+    "axios": "^1.7.9",
     "eventsource": "^2.0.2",
     "glob": "^7.1.6",
     "humanize-duration": "^3.24.0",

src/rpc/client.ts

@@ -35,7 +35,7 @@ import {
   PurseIdentifier,
   RpcRequest
 } from './request';
-import { TransactionV1, Deploy, PublicKey } from '../types';
+import { Deploy, PublicKey, Transaction } from '../types';
 
 export interface ClientPOS {
   getLatestAuctionInfo(): Promise<StateGetAuctionInfoResult>;
@@ -226,7 +226,7 @@ export interface ClientInformational {
 
 export interface ClientTransactional {
   putDeploy(deploy: Deploy): Promise<PutDeployResult>;
-  putTransactionV1(transaction: TransactionV1): Promise<PutTransactionResult>;
+  putTransaction(transaction: Transaction): Promise<PutTransactionResult>;
 }
 
 export interface IClient

src/rpc/error.ts

@@ -20,24 +20,30 @@ export class RpcError extends Error {
 }
 
 @jsonObject
-export class HttpError extends Error {
+export class HttpError<T extends Error = Error> extends Error {
   @jsonMember({ constructor: Error })
-  sourceErr: Error;
+  sourceErr: T;
 
   @jsonMember({ constructor: Number })
   statusCode: number;
 
-  constructor(statusCode = 0, sourceErr: Error = new Error()) {
+  constructor(statusCode = 0, sourceErr: T) {
     super(`Code: ${statusCode}, err: ${sourceErr.message}`);
     this.sourceErr = sourceErr;
     this.statusCode = statusCode;
   }
 
-  unwrap(): Error {
+  unwrap(): T {
     return this.sourceErr;
   }
 
   isNotFound(): boolean {
     return this.statusCode === 404;
   }
+
+  static isHttpError<E extends Error = Error>(
+    err: any | HttpError<E>
+  ): err is HttpError<E> {
+    return err?.statusCode && err.sourceErr;
+  }
 }

src/rpc/http_handler.ts

@@ -56,7 +56,7 @@ export class HttpHandler implements IHandler {
     };
 
     try {
-      const response = await this.httpClient.request(config);
+      const response = await this.httpClient.request<RpcResponse>(config);
 
       if (response.status < 200 || response.status >= 300) {
         throw new HttpError(response.status, new Error(response.statusText));

src/rpc/request.ts

@@ -384,7 +384,10 @@ export class PutDeployRequest {
 
 @jsonObject
 export class PutTransactionRequest {
-  @jsonMember({ constructor: TransactionWrapper })
+  @jsonMember({
+    constructor: TransactionWrapper,
+    serializer: val => TransactionWrapper.toJSON(val)
+  })
   transaction: TransactionWrapper;
 
   constructor(transaction: TransactionWrapper) {

src/rpc/rpc_client.ts

@@ -58,12 +58,12 @@ import {
 import { IDValue } from './id_value';
 import {
   TransactionHash,
-  TransactionV1,
-  TransactionWrapper,
   Deploy,
   PublicKey,
-  Hash
+  Hash,
+  Transaction
 } from '../types';
+import { HttpError } from './error';
 
 export class RpcClient implements IClient {
   private handler: IHandler;
@@ -903,12 +903,12 @@ export class RpcClient implements IClient {
     return result;
   }
 
-  async putTransactionV1(
-    transaction: TransactionV1
+  async putTransaction(
+    transaction: Transaction
   ): Promise<PutTransactionResult> {
     const serializer = new TypedJSON(PutTransactionRequest);
     const transactionRequestParam = new PutTransactionRequest(
-      new TransactionWrapper(undefined, transaction)
+      transaction.getTransactionWrapper()
     );
 
     const resp = await this.processRequest<PutTransactionRequest>(
@@ -1284,13 +1284,9 @@ export class RpcClient implements IClient {
     const resp = await this.handler.processCall(request);
 
     if (resp.error) {
-      throw new Error(`RPC call failed, details: ${resp.error.message}`);
+      throw new HttpError(resp.error.code, resp.error);
     }
 
-    try {
-      return resp;
-    } catch (err) {
-      throw new Error(`Error parsing result: ${err.message}`);
-    }
+    return resp;
   }
 }

src/sse/event.ts

@@ -2,7 +2,6 @@ import { jsonObject, jsonMember, jsonArrayMember, TypedJSON } from 'typedjson';
 
 import {
   Effect,
-  Effects,
   ExecutionResult,
   ExecutionResultV1,
   Deploy,
@@ -17,7 +16,8 @@ import {
   HexBytes,
   Timestamp,
   PublicKey,
-  Hash
+  Hash,
+  Transform
 } from '../types';
 
 export enum EventType {
@@ -758,8 +758,8 @@ export class StepPayload {
   @jsonMember({ name: 'execution_effect', constructor: Effect })
   executionEffect: Effect;
 
-  @jsonMember({ name: 'execution_effects', constructor: Effects })
-  executionEffects: Effects;
+  @jsonArrayMember(() => Transform, { name: 'execution_effects' })
+  executionEffects: Transform[];
 }
 
 @jsonObject