diff --git a/packages/relayer/src/rpc-relayer/relayer.gen.ts b/packages/relayer/src/rpc-relayer/relayer.gen.ts
index 79ca49296..d74de8c0d 100644
--- a/packages/relayer/src/rpc-relayer/relayer.gen.ts
+++ b/packages/relayer/src/rpc-relayer/relayer.gen.ts
@@ -1,76 +1,159 @@
 /* eslint-disable */
-// sequence-relayer v0.4.1 62fe2b49d57c4a0d3960ac1176d48ecfffc7af5a
+// sequence-relayer v0.4.1 db311ae9a6a93829f172c5d6db44955c2f7ba6f0
 // --
-// Code generated by webrpc-gen@v0.26.0 with typescript generator. DO NOT EDIT.
+// Code generated by Webrpc-gen@v0.30.1 with typescript generator. DO NOT EDIT.
 //
-// webrpc-gen -schema=relayer.ridl -target=typescript -client -out=./clients/relayer.gen.ts
+// webrpc-gen -schema=relayer.ridl -target=typescript -client -out=./clients/relayer.gen.ts -compat
 
-export const WebrpcHeader = "Webrpc"
-
-export const WebrpcHeaderValue = "webrpc@v0.26.0;gen-typescript@v0.17.0;sequence-relayer@v0.4.1"
-
-// WebRPC description and code-gen version
-export const WebRPCVersion = "v1"
+// Webrpc description and code-gen version
+export const WebrpcVersion = 'v1'
 
 // Schema version of your RIDL schema
-export const WebRPCSchemaVersion = "v0.4.1"
+export const WebrpcSchemaVersion = 'v0.4.1'
 
 // Schema hash generated from your RIDL schema
-export const WebRPCSchemaHash = "62fe2b49d57c4a0d3960ac1176d48ecfffc7af5a"
+export const WebrpcSchemaHash = 'db311ae9a6a93829f172c5d6db44955c2f7ba6f0'
 
-type WebrpcGenVersions = {
-  webrpcGenVersion: string;
-  codeGenName: string;
-  codeGenVersion: string;
-  schemaName: string;
-  schemaVersion: string;
-};
+//
+// Client interface
+//
 
-export function VersionFromHeader(headers: Headers): WebrpcGenVersions {
-  const headerValue = headers.get(WebrpcHeader);
-  if (!headerValue) {
-    return {
-      webrpcGenVersion: "",
-      codeGenName: "",
-      codeGenVersion: "",
-      schemaName: "",
-      schemaVersion: "",
-    };
-  }
+export interface RelayerClient {
+  ping(headers?: object, signal?: AbortSignal): Promise<PingReturn>
 
-  return parseWebrpcGenVersions(headerValue);
-}
+  version(headers?: object, signal?: AbortSignal): Promise<VersionReturn>
 
-function parseWebrpcGenVersions(header: string): WebrpcGenVersions {
-  const versions = header.split(";");
-  if (versions.length < 3) {
-    return {
-      webrpcGenVersion: "",
-      codeGenName: "",
-      codeGenVersion: "",
-      schemaName: "",
-      schemaVersion: "",
-    };
-  }
+  runtimeStatus(headers?: object, signal?: AbortSignal): Promise<RuntimeStatusReturn>
 
-  const [_, webrpcGenVersion] = versions[0]!.split("@");
-  const [codeGenName, codeGenVersion] = versions[1]!.split("@");
-  const [schemaName, schemaVersion] = versions[2]!.split("@");
+  getSequenceContext(headers?: object, signal?: AbortSignal): Promise<GetSequenceContextReturn>
 
-  return {
-    webrpcGenVersion: webrpcGenVersion ?? "",
-    codeGenName: codeGenName ?? "",
-    codeGenVersion: codeGenVersion ?? "",
-    schemaName: schemaName ?? "",
-    schemaVersion: schemaVersion ?? "",
-  };
+  getChainID(headers?: object, signal?: AbortSignal): Promise<GetChainIDReturn>
+
+  /**
+   *
+   * Transactions
+   *
+   * TODO (future): rename this to just, 'SendTransaction(txn: MetaTransaction)' or 'SendTransaction(txn: SignedTransaction)', or something..
+   * Project ID is only used by service and admin calls. Other clients must have projectID passed via the context
+   * TODO: rename return txnHash: string to metaTxnID: string
+   */
+  sendMetaTxn(req: SendMetaTxnArgs, headers?: object, signal?: AbortSignal): Promise<SendMetaTxnReturn>
+
+  getMetaTxnNonce(req: GetMetaTxnNonceArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTxnNonceReturn>
+
+  /**
+   * TODO: one day, make GetMetaTxnReceipt respond immediately with receipt or not
+   * and add WaitTransactionReceipt method, which will block and wait, similar to how GetMetaTxnReceipt
+   * is implemented now.
+   * For backwards compat, we can leave the current GetMetaTxnReceipt how it is, an deprecate it, and introduce
+   * new, GetTransactionReceipt and WaitTransactionReceipt methods
+   * we can also accept metaTxnId and txnHash .. so can take either or.. I wonder if ERC-4337 has any convention on this?
+   */
+  getMetaTxnReceipt(req: GetMetaTxnReceiptArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTxnReceiptReturn>
+
+  simulate(req: SimulateArgs, headers?: object, signal?: AbortSignal): Promise<SimulateReturn>
+
+  simulateV3(req: SimulateV3Args, headers?: object, signal?: AbortSignal): Promise<SimulateV3Return>
+
+  /**
+   * TODO: deprecated, to be removed by https://github.com/0xsequence/stack/pull/356 at a later date
+   */
+  updateMetaTxnGasLimits(
+    req: UpdateMetaTxnGasLimitsArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<UpdateMetaTxnGasLimitsReturn>
+
+  feeTokens(headers?: object, signal?: AbortSignal): Promise<FeeTokensReturn>
+
+  feeOptions(req: FeeOptionsArgs, headers?: object, signal?: AbortSignal): Promise<FeeOptionsReturn>
+
+  /**
+   * TODO: deprecated, to be removed by https://github.com/0xsequence/stack/pull/356 at a later date
+   */
+  getMetaTxnNetworkFeeOptions(
+    req: GetMetaTxnNetworkFeeOptionsArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<GetMetaTxnNetworkFeeOptionsReturn>
+
+  getMetaTransactions(req: GetMetaTransactionsArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTransactionsReturn>
+
+  getTransactionCost(req: GetTransactionCostArgs, headers?: object, signal?: AbortSignal): Promise<GetTransactionCostReturn>
+
+  /**
+   * Sent transactions from an account. If filter is omitted then it will return all transactions.
+   */
+  sentTransactions(req: SentTransactionsArgs, headers?: object, signal?: AbortSignal): Promise<SentTransactionsReturn>
+
+  /**
+   * Pending transactions waiting to be mined for an account. This endpoint is just a sugar of `SentTransactions`
+   * with the filter set to pending: true.
+   */
+  pendingTransactions(req: PendingTransactionsArgs, headers?: object, signal?: AbortSignal): Promise<PendingTransactionsReturn>
+
+  /**
+   * Legacy Gas Tank
+   */
+  getGasTank(req: GetGasTankArgs, headers?: object, signal?: AbortSignal): Promise<GetGasTankReturn>
+
+  addGasTank(req: AddGasTankArgs, headers?: object, signal?: AbortSignal): Promise<AddGasTankReturn>
+
+  updateGasTank(req: UpdateGasTankArgs, headers?: object, signal?: AbortSignal): Promise<UpdateGasTankReturn>
+
+  /**
+   * Legacy Gas Adjustment
+   */
+  nextGasTankBalanceAdjustmentNonce(
+    req: NextGasTankBalanceAdjustmentNonceArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<NextGasTankBalanceAdjustmentNonceReturn>
+
+  adjustGasTankBalance(req: AdjustGasTankBalanceArgs, headers?: object, signal?: AbortSignal): Promise<AdjustGasTankBalanceReturn>
+
+  getGasTankBalanceAdjustment(
+    req: GetGasTankBalanceAdjustmentArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<GetGasTankBalanceAdjustmentReturn>
+
+  listGasTankBalanceAdjustments(
+    req: ListGasTankBalanceAdjustmentsArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<ListGasTankBalanceAdjustmentsReturn>
+
+  /**
+   * Gas Sponsorship
+   */
+  listGasSponsors(req: ListGasSponsorsArgs, headers?: object, signal?: AbortSignal): Promise<ListGasSponsorsReturn>
+
+  getGasSponsor(req: GetGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<GetGasSponsorReturn>
+
+  addGasSponsor(req: AddGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<AddGasSponsorReturn>
+
+  updateGasSponsor(req: UpdateGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<UpdateGasSponsorReturn>
+
+  removeGasSponsor(req: RemoveGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<RemoveGasSponsorReturn>
+
+  /**
+   * Gas Sponsor Lookup
+   */
+  addressGasSponsors(req: AddressGasSponsorsArgs, headers?: object, signal?: AbortSignal): Promise<AddressGasSponsorsReturn>
+
+  /**
+   * Project Balance
+   */
+  getProjectBalance(req: GetProjectBalanceArgs, headers?: object, signal?: AbortSignal): Promise<GetProjectBalanceReturn>
+
+  adjustProjectBalance(req: AdjustProjectBalanceArgs, headers?: object, signal?: AbortSignal): Promise<AdjustProjectBalanceReturn>
 }
 
 //
-// Types
+// Schema types
 //
 
-
 export enum ETHTxnStatus {
   UNKNOWN = 'UNKNOWN',
   DROPPED = 'DROPPED',
@@ -138,8 +221,7 @@ export interface SenderStatus {
   active: boolean
 }
 
-export interface RuntimeChecks {
-}
+export interface RuntimeChecks {}
 
 export interface SequenceContext {
   factory: string
@@ -215,8 +297,8 @@ export interface MetaTxnLog {
   minedAt: string
   target: string
   input: string
-  txnArgs: {[key: string]: any}
-  txnReceipt?: {[key: string]: any}
+  txnArgs: { [key: string]: any }
+  txnReceipt?: { [key: string]: any }
   walletAddress: string
   metaTxnNonce: string
   gasLimit: number
@@ -346,116 +428,36 @@ export interface SortBy {
   order: SortOrder
 }
 
-export interface Relayer {
-  ping(headers?: object, signal?: AbortSignal): Promise<PingReturn>
-  version(headers?: object, signal?: AbortSignal): Promise<VersionReturn>
-  runtimeStatus(headers?: object, signal?: AbortSignal): Promise<RuntimeStatusReturn>
-  getSequenceContext(headers?: object, signal?: AbortSignal): Promise<GetSequenceContextReturn>
-  getChainID(headers?: object, signal?: AbortSignal): Promise<GetChainIDReturn>
-  /**
-   * 
-   * Transactions
-   * 
-   * TODO (future): rename this to just, 'SendTransaction(txn: MetaTransaction)' or 'SendTransaction(txn: SignedTransaction)', or something..
-   * Project ID is only used by service and admin calls. Other clients must have projectID passed via the context
-   * TODO: rename return txnHash: string to metaTxnID: string
-   */
-  sendMetaTxn(args: SendMetaTxnArgs, headers?: object, signal?: AbortSignal): Promise<SendMetaTxnReturn>
-  getMetaTxnNonce(args: GetMetaTxnNonceArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTxnNonceReturn>
-  /**
-   * TODO: one day, make GetMetaTxnReceipt respond immediately with receipt or not
-   * and add WaitTransactionReceipt method, which will block and wait, similar to how GetMetaTxnReceipt
-   * is implemented now.
-   * For backwards compat, we can leave the current GetMetaTxnReceipt how it is, an deprecate it, and introduce
-   * new, GetTransactionReceipt and WaitTransactionReceipt methods
-   * we can also accept metaTxnId and txnHash .. so can take either or.. I wonder if ERC-4337 has any convention on this?
-   */
-  getMetaTxnReceipt(args: GetMetaTxnReceiptArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTxnReceiptReturn>
-  simulate(args: SimulateArgs, headers?: object, signal?: AbortSignal): Promise<SimulateReturn>
-  simulateV3(args: SimulateV3Args, headers?: object, signal?: AbortSignal): Promise<SimulateV3Return>
-  /**
-   * TODO: deprecated, to be removed by https://github.com/0xsequence/stack/pull/356 at a later date
-   */
-  updateMetaTxnGasLimits(args: UpdateMetaTxnGasLimitsArgs, headers?: object, signal?: AbortSignal): Promise<UpdateMetaTxnGasLimitsReturn>
-  feeTokens(headers?: object, signal?: AbortSignal): Promise<FeeTokensReturn>
-  feeOptions(args: FeeOptionsArgs, headers?: object, signal?: AbortSignal): Promise<FeeOptionsReturn>
-  /**
-   * TODO: deprecated, to be removed by https://github.com/0xsequence/stack/pull/356 at a later date
-   */
-  getMetaTxnNetworkFeeOptions(args: GetMetaTxnNetworkFeeOptionsArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTxnNetworkFeeOptionsReturn>
-  getMetaTransactions(args: GetMetaTransactionsArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTransactionsReturn>
-  getTransactionCost(args: GetTransactionCostArgs, headers?: object, signal?: AbortSignal): Promise<GetTransactionCostReturn>
-  /**
-   * Sent transactions from an account. If filter is omitted then it will return all transactions.
-   */
-  sentTransactions(args: SentTransactionsArgs, headers?: object, signal?: AbortSignal): Promise<SentTransactionsReturn>
-  /**
-   * Pending transactions waiting to be mined for an account. This endpoint is just a sugar of `SentTransactions`
-   * with the filter set to pending: true.
-   */
-  pendingTransactions(args: PendingTransactionsArgs, headers?: object, signal?: AbortSignal): Promise<PendingTransactionsReturn>
-  /**
-   * Legacy Gas Tank
-   */
-  getGasTank(args: GetGasTankArgs, headers?: object, signal?: AbortSignal): Promise<GetGasTankReturn>
-  addGasTank(args: AddGasTankArgs, headers?: object, signal?: AbortSignal): Promise<AddGasTankReturn>
-  updateGasTank(args: UpdateGasTankArgs, headers?: object, signal?: AbortSignal): Promise<UpdateGasTankReturn>
-  /**
-   * Legacy Gas Adjustment
-   */
-  nextGasTankBalanceAdjustmentNonce(args: NextGasTankBalanceAdjustmentNonceArgs, headers?: object, signal?: AbortSignal): Promise<NextGasTankBalanceAdjustmentNonceReturn>
-  adjustGasTankBalance(args: AdjustGasTankBalanceArgs, headers?: object, signal?: AbortSignal): Promise<AdjustGasTankBalanceReturn>
-  getGasTankBalanceAdjustment(args: GetGasTankBalanceAdjustmentArgs, headers?: object, signal?: AbortSignal): Promise<GetGasTankBalanceAdjustmentReturn>
-  listGasTankBalanceAdjustments(args: ListGasTankBalanceAdjustmentsArgs, headers?: object, signal?: AbortSignal): Promise<ListGasTankBalanceAdjustmentsReturn>
-  /**
-   * Gas Sponsorship
-   */
-  listGasSponsors(args: ListGasSponsorsArgs, headers?: object, signal?: AbortSignal): Promise<ListGasSponsorsReturn>
-  getGasSponsor(args: GetGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<GetGasSponsorReturn>
-  addGasSponsor(args: AddGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<AddGasSponsorReturn>
-  updateGasSponsor(args: UpdateGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<UpdateGasSponsorReturn>
-  removeGasSponsor(args: RemoveGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<RemoveGasSponsorReturn>
-  /**
-   * Gas Sponsor Lookup
-   */
-  addressGasSponsors(args: AddressGasSponsorsArgs, headers?: object, signal?: AbortSignal): Promise<AddressGasSponsorsReturn>
-  /**
-   * Project Balance
-   */
-  getProjectBalance(args: GetProjectBalanceArgs, headers?: object, signal?: AbortSignal): Promise<GetProjectBalanceReturn>
-  adjustProjectBalance(args: AdjustProjectBalanceArgs, headers?: object, signal?: AbortSignal): Promise<AdjustProjectBalanceReturn>
-}
-
-export interface PingArgs {
-}
+export interface PingArgs {}
 
 export interface PingReturn {
-  status: boolean  
-}
-export interface VersionArgs {
+  status: boolean
 }
 
+export interface VersionArgs {}
+
 export interface VersionReturn {
-  version: Version  
-}
-export interface RuntimeStatusArgs {
+  version: Version
 }
 
+export interface RuntimeStatusArgs {}
+
 export interface RuntimeStatusReturn {
-  status: RuntimeStatus  
-}
-export interface GetSequenceContextArgs {
+  status: RuntimeStatus
 }
 
+export interface GetSequenceContextArgs {}
+
 export interface GetSequenceContextReturn {
-  data: SequenceContext  
-}
-export interface GetChainIDArgs {
+  data: SequenceContext
 }
 
+export interface GetChainIDArgs {}
+
 export interface GetChainIDReturn {
-  chainID: number  
+  chainID: number
 }
+
 export interface SendMetaTxnArgs {
   call: MetaTxn
   quote?: string
@@ -465,39 +467,44 @@ export interface SendMetaTxnArgs {
 
 export interface SendMetaTxnReturn {
   status: boolean
-  txnHash: string  
+  txnHash: string
 }
+
 export interface GetMetaTxnNonceArgs {
   walletContractAddress: string
   space?: string
 }
 
 export interface GetMetaTxnNonceReturn {
-  nonce: string  
+  nonce: string
 }
+
 export interface GetMetaTxnReceiptArgs {
   metaTxID: string
 }
 
 export interface GetMetaTxnReceiptReturn {
-  receipt: MetaTxnReceipt  
+  receipt: MetaTxnReceipt
 }
+
 export interface SimulateArgs {
   wallet: string
   transactions: string
 }
 
 export interface SimulateReturn {
-  results: Array<SimulateResult>  
+  results: Array<SimulateResult>
 }
+
 export interface SimulateV3Args {
   wallet: string
   calls: string
 }
 
 export interface SimulateV3Return {
-  results: Array<SimulateV3Result>  
+  results: Array<SimulateV3Result>
 }
+
 export interface UpdateMetaTxnGasLimitsArgs {
   walletAddress: string
   walletConfig: any
@@ -505,15 +512,17 @@ export interface UpdateMetaTxnGasLimitsArgs {
 }
 
 export interface UpdateMetaTxnGasLimitsReturn {
-  payload: string  
-}
-export interface FeeTokensArgs {
+  payload: string
 }
 
+export interface FeeTokensArgs {}
+
 export interface FeeTokensReturn {
   isFeeRequired: boolean
-  tokens: Array<FeeToken>  
+  tokens: Array<FeeToken>
+  paymentAddress: string
 }
+
 export interface FeeOptionsArgs {
   wallet: string
   to: string
@@ -524,16 +533,18 @@ export interface FeeOptionsArgs {
 export interface FeeOptionsReturn {
   options: Array<FeeOption>
   sponsored: boolean
-  quote?: string  
+  quote?: string
 }
+
 export interface GetMetaTxnNetworkFeeOptionsArgs {
   walletConfig: any
   payload: string
 }
 
 export interface GetMetaTxnNetworkFeeOptionsReturn {
-  options: Array<FeeOption>  
+  options: Array<FeeOption>
 }
+
 export interface GetMetaTransactionsArgs {
   projectId: number
   page?: Page
@@ -541,8 +552,9 @@ export interface GetMetaTransactionsArgs {
 
 export interface GetMetaTransactionsReturn {
   page: Page
-  transactions: Array<MetaTxnLog>  
+  transactions: Array<MetaTxnLog>
 }
+
 export interface GetTransactionCostArgs {
   projectId: number
   from: string
@@ -550,8 +562,9 @@ export interface GetTransactionCostArgs {
 }
 
 export interface GetTransactionCostReturn {
-  cost: number  
+  cost: number
 }
+
 export interface SentTransactionsArgs {
   filter?: SentTransactionsFilter
   page?: Page
@@ -559,23 +572,26 @@ export interface SentTransactionsArgs {
 
 export interface SentTransactionsReturn {
   page: Page
-  transactions: Array<Transaction>  
+  transactions: Array<Transaction>
 }
+
 export interface PendingTransactionsArgs {
   page?: Page
 }
 
 export interface PendingTransactionsReturn {
   page: Page
-  transactions: Array<Transaction>  
+  transactions: Array<Transaction>
 }
+
 export interface GetGasTankArgs {
   id: number
 }
 
 export interface GetGasTankReturn {
-  gasTank: GasTank  
+  gasTank: GasTank
 }
+
 export interface AddGasTankArgs {
   name: string
   feeMarkupFactor: number
@@ -584,8 +600,9 @@ export interface AddGasTankArgs {
 
 export interface AddGasTankReturn {
   status: boolean
-  gasTank: GasTank  
+  gasTank: GasTank
 }
+
 export interface UpdateGasTankArgs {
   id: number
   name?: string
@@ -595,15 +612,17 @@ export interface UpdateGasTankArgs {
 
 export interface UpdateGasTankReturn {
   status: boolean
-  gasTank: GasTank  
+  gasTank: GasTank
 }
+
 export interface NextGasTankBalanceAdjustmentNonceArgs {
   id: number
 }
 
 export interface NextGasTankBalanceAdjustmentNonceReturn {
-  nonce: number  
+  nonce: number
 }
+
 export interface AdjustGasTankBalanceArgs {
   id: number
   nonce: number
@@ -612,16 +631,18 @@ export interface AdjustGasTankBalanceArgs {
 
 export interface AdjustGasTankBalanceReturn {
   status: boolean
-  adjustment: GasTankBalanceAdjustment  
+  adjustment: GasTankBalanceAdjustment
 }
+
 export interface GetGasTankBalanceAdjustmentArgs {
   id: number
   nonce: number
 }
 
 export interface GetGasTankBalanceAdjustmentReturn {
-  adjustment: GasTankBalanceAdjustment  
+  adjustment: GasTankBalanceAdjustment
 }
+
 export interface ListGasTankBalanceAdjustmentsArgs {
   id: number
   page?: Page
@@ -629,8 +650,9 @@ export interface ListGasTankBalanceAdjustmentsArgs {
 
 export interface ListGasTankBalanceAdjustmentsReturn {
   page: Page
-  adjustments: Array<GasTankBalanceAdjustment>  
+  adjustments: Array<GasTankBalanceAdjustment>
 }
+
 export interface ListGasSponsorsArgs {
   projectId: number
   page?: Page
@@ -638,16 +660,18 @@ export interface ListGasSponsorsArgs {
 
 export interface ListGasSponsorsReturn {
   page: Page
-  gasSponsors: Array<GasSponsor>  
+  gasSponsors: Array<GasSponsor>
 }
+
 export interface GetGasSponsorArgs {
   projectId: number
   id: number
 }
 
 export interface GetGasSponsorReturn {
-  gasSponsor: GasSponsor  
+  gasSponsor: GasSponsor
 }
+
 export interface AddGasSponsorArgs {
   projectId: number
   address: string
@@ -657,8 +681,9 @@ export interface AddGasSponsorArgs {
 
 export interface AddGasSponsorReturn {
   status: boolean
-  gasSponsor: GasSponsor  
+  gasSponsor: GasSponsor
 }
+
 export interface UpdateGasSponsorArgs {
   projectId: number
   id: number
@@ -668,16 +693,18 @@ export interface UpdateGasSponsorArgs {
 
 export interface UpdateGasSponsorReturn {
   status: boolean
-  gasSponsor: GasSponsor  
+  gasSponsor: GasSponsor
 }
+
 export interface RemoveGasSponsorArgs {
   projectId: number
   id: number
 }
 
 export interface RemoveGasSponsorReturn {
-  status: boolean  
+  status: boolean
 }
+
 export interface AddressGasSponsorsArgs {
   address: string
   page?: Page
@@ -685,15 +712,17 @@ export interface AddressGasSponsorsArgs {
 
 export interface AddressGasSponsorsReturn {
   page: Page
-  gasSponsors: Array<GasSponsor>  
+  gasSponsors: Array<GasSponsor>
 }
+
 export interface GetProjectBalanceArgs {
   projectId: number
 }
 
 export interface GetProjectBalanceReturn {
-  balance: number  
+  balance: number
 }
+
 export interface AdjustProjectBalanceArgs {
   projectId: number
   amount: number
@@ -701,15 +730,14 @@ export interface AdjustProjectBalanceArgs {
 }
 
 export interface AdjustProjectBalanceReturn {
-  balance: number  
+  balance: number
 }
 
-
-  
 //
 // Client
 //
-export class Relayer implements Relayer {
+
+export class Relayer implements RelayerClient {
   protected hostname: string
   protected fetch: Fetch
   protected path = '/rpc/Relayer/'
@@ -722,502 +750,578 @@ export class Relayer implements Relayer {
   private url(name: string): string {
     return this.hostname + this.path + name
   }
-  
+
+  queryKey = {
+    ping: () => ['Relayer', 'ping'] as const,
+    version: () => ['Relayer', 'version'] as const,
+    runtimeStatus: () => ['Relayer', 'runtimeStatus'] as const,
+    getSequenceContext: () => ['Relayer', 'getSequenceContext'] as const,
+    getChainID: () => ['Relayer', 'getChainID'] as const,
+    sendMetaTxn: (req: SendMetaTxnArgs) => ['Relayer', 'sendMetaTxn', req] as const,
+    getMetaTxnNonce: (req: GetMetaTxnNonceArgs) => ['Relayer', 'getMetaTxnNonce', req] as const,
+    getMetaTxnReceipt: (req: GetMetaTxnReceiptArgs) => ['Relayer', 'getMetaTxnReceipt', req] as const,
+    simulate: (req: SimulateArgs) => ['Relayer', 'simulate', req] as const,
+    simulateV3: (req: SimulateV3Args) => ['Relayer', 'simulateV3', req] as const,
+    updateMetaTxnGasLimits: (req: UpdateMetaTxnGasLimitsArgs) => ['Relayer', 'updateMetaTxnGasLimits', req] as const,
+    feeTokens: () => ['Relayer', 'feeTokens'] as const,
+    feeOptions: (req: FeeOptionsArgs) => ['Relayer', 'feeOptions', req] as const,
+    getMetaTxnNetworkFeeOptions: (req: GetMetaTxnNetworkFeeOptionsArgs) =>
+      ['Relayer', 'getMetaTxnNetworkFeeOptions', req] as const,
+    getMetaTransactions: (req: GetMetaTransactionsArgs) => ['Relayer', 'getMetaTransactions', req] as const,
+    getTransactionCost: (req: GetTransactionCostArgs) => ['Relayer', 'getTransactionCost', req] as const,
+    sentTransactions: (req: SentTransactionsArgs) => ['Relayer', 'sentTransactions', req] as const,
+    pendingTransactions: (req: PendingTransactionsArgs) => ['Relayer', 'pendingTransactions', req] as const,
+    getGasTank: (req: GetGasTankArgs) => ['Relayer', 'getGasTank', req] as const,
+    addGasTank: (req: AddGasTankArgs) => ['Relayer', 'addGasTank', req] as const,
+    updateGasTank: (req: UpdateGasTankArgs) => ['Relayer', 'updateGasTank', req] as const,
+    nextGasTankBalanceAdjustmentNonce: (req: NextGasTankBalanceAdjustmentNonceArgs) =>
+      ['Relayer', 'nextGasTankBalanceAdjustmentNonce', req] as const,
+    adjustGasTankBalance: (req: AdjustGasTankBalanceArgs) => ['Relayer', 'adjustGasTankBalance', req] as const,
+    getGasTankBalanceAdjustment: (req: GetGasTankBalanceAdjustmentArgs) =>
+      ['Relayer', 'getGasTankBalanceAdjustment', req] as const,
+    listGasTankBalanceAdjustments: (req: ListGasTankBalanceAdjustmentsArgs) =>
+      ['Relayer', 'listGasTankBalanceAdjustments', req] as const,
+    listGasSponsors: (req: ListGasSponsorsArgs) => ['Relayer', 'listGasSponsors', req] as const,
+    getGasSponsor: (req: GetGasSponsorArgs) => ['Relayer', 'getGasSponsor', req] as const,
+    addGasSponsor: (req: AddGasSponsorArgs) => ['Relayer', 'addGasSponsor', req] as const,
+    updateGasSponsor: (req: UpdateGasSponsorArgs) => ['Relayer', 'updateGasSponsor', req] as const,
+    removeGasSponsor: (req: RemoveGasSponsorArgs) => ['Relayer', 'removeGasSponsor', req] as const,
+    addressGasSponsors: (req: AddressGasSponsorsArgs) => ['Relayer', 'addressGasSponsors', req] as const,
+    getProjectBalance: (req: GetProjectBalanceArgs) => ['Relayer', 'getProjectBalance', req] as const,
+    adjustProjectBalance: (req: AdjustProjectBalanceArgs) => ['Relayer', 'adjustProjectBalance', req] as const
+  }
+
   ping = (headers?: object, signal?: AbortSignal): Promise<PingReturn> => {
-    return this.fetch(
-      this.url('Ping'),
-      createHTTPRequest({}, headers, signal)
-      ).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          status: <boolean>(_data.status),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+    return this.fetch(this.url('Ping'), createHttpRequest('{}', headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<PingReturn>(_data, 'PingReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
+
   version = (headers?: object, signal?: AbortSignal): Promise<VersionReturn> => {
-    return this.fetch(
-      this.url('Version'),
-      createHTTPRequest({}, headers, signal)
-      ).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          version: <Version>(_data.version),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+    return this.fetch(this.url('Version'), createHttpRequest('{}', headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<VersionReturn>(_data, 'VersionReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
+
   runtimeStatus = (headers?: object, signal?: AbortSignal): Promise<RuntimeStatusReturn> => {
-    return this.fetch(
-      this.url('RuntimeStatus'),
-      createHTTPRequest({}, headers, signal)
-      ).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          status: <RuntimeStatus>(_data.status),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+    return this.fetch(this.url('RuntimeStatus'), createHttpRequest('{}', headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<RuntimeStatusReturn>(_data, 'RuntimeStatusReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
+
   getSequenceContext = (headers?: object, signal?: AbortSignal): Promise<GetSequenceContextReturn> => {
-    return this.fetch(
-      this.url('GetSequenceContext'),
-      createHTTPRequest({}, headers, signal)
-      ).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          data: <SequenceContext>(_data.data),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+    return this.fetch(this.url('GetSequenceContext'), createHttpRequest('{}', headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<GetSequenceContextReturn>(_data, 'GetSequenceContextReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
+
   getChainID = (headers?: object, signal?: AbortSignal): Promise<GetChainIDReturn> => {
-    return this.fetch(
-      this.url('GetChainID'),
-      createHTTPRequest({}, headers, signal)
-      ).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          chainID: <number>(_data.chainID),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
-  }
-  
-  sendMetaTxn = (args: SendMetaTxnArgs, headers?: object, signal?: AbortSignal): Promise<SendMetaTxnReturn> => {
-    return this.fetch(
-      this.url('SendMetaTxn'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          status: <boolean>(_data.status),
-          txnHash: <string>(_data.txnHash),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+    return this.fetch(this.url('GetChainID'), createHttpRequest('{}', headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<GetChainIDReturn>(_data, 'GetChainIDReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
+  }
+
+  sendMetaTxn = (req: SendMetaTxnArgs, headers?: object, signal?: AbortSignal): Promise<SendMetaTxnReturn> => {
+    return this.fetch(this.url('SendMetaTxn'), createHttpRequest(JsonEncode(req, 'SendMetaTxnArgs'), headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<SendMetaTxnReturn>(_data, 'SendMetaTxnReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  getMetaTxnNonce = (args: GetMetaTxnNonceArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTxnNonceReturn> => {
+
+  getMetaTxnNonce = (req: GetMetaTxnNonceArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTxnNonceReturn> => {
     return this.fetch(
       this.url('GetMetaTxnNonce'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          nonce: <string>(_data.nonce),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'GetMetaTxnNonceArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<GetMetaTxnNonceReturn>(_data, 'GetMetaTxnNonceReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  getMetaTxnReceipt = (args: GetMetaTxnReceiptArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTxnReceiptReturn> => {
+
+  getMetaTxnReceipt = (req: GetMetaTxnReceiptArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTxnReceiptReturn> => {
     return this.fetch(
       this.url('GetMetaTxnReceipt'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          receipt: <MetaTxnReceipt>(_data.receipt),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
-  }
-  
-  simulate = (args: SimulateArgs, headers?: object, signal?: AbortSignal): Promise<SimulateReturn> => {
-    return this.fetch(
-      this.url('Simulate'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          results: <Array<SimulateResult>>(_data.results),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
-  }
-  
-  simulateV3 = (args: SimulateV3Args, headers?: object, signal?: AbortSignal): Promise<SimulateV3Return> => {
-    return this.fetch(
-      this.url('SimulateV3'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          results: <Array<SimulateV3Result>>(_data.results),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'GetMetaTxnReceiptArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<GetMetaTxnReceiptReturn>(_data, 'GetMetaTxnReceiptReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
+  }
+
+  simulate = (req: SimulateArgs, headers?: object, signal?: AbortSignal): Promise<SimulateReturn> => {
+    return this.fetch(this.url('Simulate'), createHttpRequest(JsonEncode(req, 'SimulateArgs'), headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<SimulateReturn>(_data, 'SimulateReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
+  }
+
+  simulateV3 = (req: SimulateV3Args, headers?: object, signal?: AbortSignal): Promise<SimulateV3Return> => {
+    return this.fetch(this.url('SimulateV3'), createHttpRequest(JsonEncode(req, 'SimulateV3Args'), headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<SimulateV3Return>(_data, 'SimulateV3Return')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  updateMetaTxnGasLimits = (args: UpdateMetaTxnGasLimitsArgs, headers?: object, signal?: AbortSignal): Promise<UpdateMetaTxnGasLimitsReturn> => {
+
+  updateMetaTxnGasLimits = (
+    req: UpdateMetaTxnGasLimitsArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<UpdateMetaTxnGasLimitsReturn> => {
     return this.fetch(
       this.url('UpdateMetaTxnGasLimits'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          payload: <string>(_data.payload),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'UpdateMetaTxnGasLimitsArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<UpdateMetaTxnGasLimitsReturn>(_data, 'UpdateMetaTxnGasLimitsReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
+
   feeTokens = (headers?: object, signal?: AbortSignal): Promise<FeeTokensReturn> => {
-    return this.fetch(
-      this.url('FeeTokens'),
-      createHTTPRequest({}, headers, signal)
-      ).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          isFeeRequired: <boolean>(_data.isFeeRequired),
-          tokens: <Array<FeeToken>>(_data.tokens),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
-  }
-  
-  feeOptions = (args: FeeOptionsArgs, headers?: object, signal?: AbortSignal): Promise<FeeOptionsReturn> => {
-    return this.fetch(
-      this.url('FeeOptions'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          options: <Array<FeeOption>>(_data.options),
-          sponsored: <boolean>(_data.sponsored),
-          quote: <string>(_data.quote),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+    return this.fetch(this.url('FeeTokens'), createHttpRequest('{}', headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<FeeTokensReturn>(_data, 'FeeTokensReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
+  }
+
+  feeOptions = (req: FeeOptionsArgs, headers?: object, signal?: AbortSignal): Promise<FeeOptionsReturn> => {
+    return this.fetch(this.url('FeeOptions'), createHttpRequest(JsonEncode(req, 'FeeOptionsArgs'), headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<FeeOptionsReturn>(_data, 'FeeOptionsReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  getMetaTxnNetworkFeeOptions = (args: GetMetaTxnNetworkFeeOptionsArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTxnNetworkFeeOptionsReturn> => {
+
+  getMetaTxnNetworkFeeOptions = (
+    req: GetMetaTxnNetworkFeeOptionsArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<GetMetaTxnNetworkFeeOptionsReturn> => {
     return this.fetch(
       this.url('GetMetaTxnNetworkFeeOptions'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          options: <Array<FeeOption>>(_data.options),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'GetMetaTxnNetworkFeeOptionsArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<GetMetaTxnNetworkFeeOptionsReturn>(_data, 'GetMetaTxnNetworkFeeOptionsReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  getMetaTransactions = (args: GetMetaTransactionsArgs, headers?: object, signal?: AbortSignal): Promise<GetMetaTransactionsReturn> => {
+
+  getMetaTransactions = (
+    req: GetMetaTransactionsArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<GetMetaTransactionsReturn> => {
     return this.fetch(
       this.url('GetMetaTransactions'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          page: <Page>(_data.page),
-          transactions: <Array<MetaTxnLog>>(_data.transactions),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'GetMetaTransactionsArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<GetMetaTransactionsReturn>(_data, 'GetMetaTransactionsReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  getTransactionCost = (args: GetTransactionCostArgs, headers?: object, signal?: AbortSignal): Promise<GetTransactionCostReturn> => {
+
+  getTransactionCost = (
+    req: GetTransactionCostArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<GetTransactionCostReturn> => {
     return this.fetch(
       this.url('GetTransactionCost'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          cost: <number>(_data.cost),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'GetTransactionCostArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<GetTransactionCostReturn>(_data, 'GetTransactionCostReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  sentTransactions = (args: SentTransactionsArgs, headers?: object, signal?: AbortSignal): Promise<SentTransactionsReturn> => {
+
+  sentTransactions = (req: SentTransactionsArgs, headers?: object, signal?: AbortSignal): Promise<SentTransactionsReturn> => {
     return this.fetch(
       this.url('SentTransactions'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          page: <Page>(_data.page),
-          transactions: <Array<Transaction>>(_data.transactions),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'SentTransactionsArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<SentTransactionsReturn>(_data, 'SentTransactionsReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  pendingTransactions = (args: PendingTransactionsArgs, headers?: object, signal?: AbortSignal): Promise<PendingTransactionsReturn> => {
+
+  pendingTransactions = (
+    req: PendingTransactionsArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<PendingTransactionsReturn> => {
     return this.fetch(
       this.url('PendingTransactions'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          page: <Page>(_data.page),
-          transactions: <Array<Transaction>>(_data.transactions),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
-  }
-  
-  getGasTank = (args: GetGasTankArgs, headers?: object, signal?: AbortSignal): Promise<GetGasTankReturn> => {
-    return this.fetch(
-      this.url('GetGasTank'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          gasTank: <GasTank>(_data.gasTank),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
-  }
-  
-  addGasTank = (args: AddGasTankArgs, headers?: object, signal?: AbortSignal): Promise<AddGasTankReturn> => {
-    return this.fetch(
-      this.url('AddGasTank'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          status: <boolean>(_data.status),
-          gasTank: <GasTank>(_data.gasTank),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
-  }
-  
-  updateGasTank = (args: UpdateGasTankArgs, headers?: object, signal?: AbortSignal): Promise<UpdateGasTankReturn> => {
-    return this.fetch(
-      this.url('UpdateGasTank'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          status: <boolean>(_data.status),
-          gasTank: <GasTank>(_data.gasTank),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'PendingTransactionsArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<PendingTransactionsReturn>(_data, 'PendingTransactionsReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
+  }
+
+  getGasTank = (req: GetGasTankArgs, headers?: object, signal?: AbortSignal): Promise<GetGasTankReturn> => {
+    return this.fetch(this.url('GetGasTank'), createHttpRequest(JsonEncode(req, 'GetGasTankArgs'), headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<GetGasTankReturn>(_data, 'GetGasTankReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
+  }
+
+  addGasTank = (req: AddGasTankArgs, headers?: object, signal?: AbortSignal): Promise<AddGasTankReturn> => {
+    return this.fetch(this.url('AddGasTank'), createHttpRequest(JsonEncode(req, 'AddGasTankArgs'), headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<AddGasTankReturn>(_data, 'AddGasTankReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
+  }
+
+  updateGasTank = (req: UpdateGasTankArgs, headers?: object, signal?: AbortSignal): Promise<UpdateGasTankReturn> => {
+    return this.fetch(this.url('UpdateGasTank'), createHttpRequest(JsonEncode(req, 'UpdateGasTankArgs'), headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<UpdateGasTankReturn>(_data, 'UpdateGasTankReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  nextGasTankBalanceAdjustmentNonce = (args: NextGasTankBalanceAdjustmentNonceArgs, headers?: object, signal?: AbortSignal): Promise<NextGasTankBalanceAdjustmentNonceReturn> => {
+
+  nextGasTankBalanceAdjustmentNonce = (
+    req: NextGasTankBalanceAdjustmentNonceArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<NextGasTankBalanceAdjustmentNonceReturn> => {
     return this.fetch(
       this.url('NextGasTankBalanceAdjustmentNonce'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          nonce: <number>(_data.nonce),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'NextGasTankBalanceAdjustmentNonceArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<NextGasTankBalanceAdjustmentNonceReturn>(_data, 'NextGasTankBalanceAdjustmentNonceReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  adjustGasTankBalance = (args: AdjustGasTankBalanceArgs, headers?: object, signal?: AbortSignal): Promise<AdjustGasTankBalanceReturn> => {
+
+  adjustGasTankBalance = (
+    req: AdjustGasTankBalanceArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<AdjustGasTankBalanceReturn> => {
     return this.fetch(
       this.url('AdjustGasTankBalance'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          status: <boolean>(_data.status),
-          adjustment: <GasTankBalanceAdjustment>(_data.adjustment),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'AdjustGasTankBalanceArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<AdjustGasTankBalanceReturn>(_data, 'AdjustGasTankBalanceReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  getGasTankBalanceAdjustment = (args: GetGasTankBalanceAdjustmentArgs, headers?: object, signal?: AbortSignal): Promise<GetGasTankBalanceAdjustmentReturn> => {
+
+  getGasTankBalanceAdjustment = (
+    req: GetGasTankBalanceAdjustmentArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<GetGasTankBalanceAdjustmentReturn> => {
     return this.fetch(
       this.url('GetGasTankBalanceAdjustment'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          adjustment: <GasTankBalanceAdjustment>(_data.adjustment),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'GetGasTankBalanceAdjustmentArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<GetGasTankBalanceAdjustmentReturn>(_data, 'GetGasTankBalanceAdjustmentReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  listGasTankBalanceAdjustments = (args: ListGasTankBalanceAdjustmentsArgs, headers?: object, signal?: AbortSignal): Promise<ListGasTankBalanceAdjustmentsReturn> => {
+
+  listGasTankBalanceAdjustments = (
+    req: ListGasTankBalanceAdjustmentsArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<ListGasTankBalanceAdjustmentsReturn> => {
     return this.fetch(
       this.url('ListGasTankBalanceAdjustments'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          page: <Page>(_data.page),
-          adjustments: <Array<GasTankBalanceAdjustment>>(_data.adjustments),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'ListGasTankBalanceAdjustmentsArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<ListGasTankBalanceAdjustmentsReturn>(_data, 'ListGasTankBalanceAdjustmentsReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  listGasSponsors = (args: ListGasSponsorsArgs, headers?: object, signal?: AbortSignal): Promise<ListGasSponsorsReturn> => {
+
+  listGasSponsors = (req: ListGasSponsorsArgs, headers?: object, signal?: AbortSignal): Promise<ListGasSponsorsReturn> => {
     return this.fetch(
       this.url('ListGasSponsors'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          page: <Page>(_data.page),
-          gasSponsors: <Array<GasSponsor>>(_data.gasSponsors),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
-  }
-  
-  getGasSponsor = (args: GetGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<GetGasSponsorReturn> => {
-    return this.fetch(
-      this.url('GetGasSponsor'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          gasSponsor: <GasSponsor>(_data.gasSponsor),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
-  }
-  
-  addGasSponsor = (args: AddGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<AddGasSponsorReturn> => {
-    return this.fetch(
-      this.url('AddGasSponsor'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          status: <boolean>(_data.status),
-          gasSponsor: <GasSponsor>(_data.gasSponsor),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'ListGasSponsorsArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<ListGasSponsorsReturn>(_data, 'ListGasSponsorsReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
+  }
+
+  getGasSponsor = (req: GetGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<GetGasSponsorReturn> => {
+    return this.fetch(this.url('GetGasSponsor'), createHttpRequest(JsonEncode(req, 'GetGasSponsorArgs'), headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<GetGasSponsorReturn>(_data, 'GetGasSponsorReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
+  }
+
+  addGasSponsor = (req: AddGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<AddGasSponsorReturn> => {
+    return this.fetch(this.url('AddGasSponsor'), createHttpRequest(JsonEncode(req, 'AddGasSponsorArgs'), headers, signal)).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<AddGasSponsorReturn>(_data, 'AddGasSponsorReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  updateGasSponsor = (args: UpdateGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<UpdateGasSponsorReturn> => {
+
+  updateGasSponsor = (req: UpdateGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<UpdateGasSponsorReturn> => {
     return this.fetch(
       this.url('UpdateGasSponsor'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          status: <boolean>(_data.status),
-          gasSponsor: <GasSponsor>(_data.gasSponsor),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'UpdateGasSponsorArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<UpdateGasSponsorReturn>(_data, 'UpdateGasSponsorReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  removeGasSponsor = (args: RemoveGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<RemoveGasSponsorReturn> => {
+
+  removeGasSponsor = (req: RemoveGasSponsorArgs, headers?: object, signal?: AbortSignal): Promise<RemoveGasSponsorReturn> => {
     return this.fetch(
       this.url('RemoveGasSponsor'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          status: <boolean>(_data.status),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'RemoveGasSponsorArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<RemoveGasSponsorReturn>(_data, 'RemoveGasSponsorReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  addressGasSponsors = (args: AddressGasSponsorsArgs, headers?: object, signal?: AbortSignal): Promise<AddressGasSponsorsReturn> => {
+
+  addressGasSponsors = (
+    req: AddressGasSponsorsArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<AddressGasSponsorsReturn> => {
     return this.fetch(
       this.url('AddressGasSponsors'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          page: <Page>(_data.page),
-          gasSponsors: <Array<GasSponsor>>(_data.gasSponsors),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'AddressGasSponsorsArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<AddressGasSponsorsReturn>(_data, 'AddressGasSponsorsReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  getProjectBalance = (args: GetProjectBalanceArgs, headers?: object, signal?: AbortSignal): Promise<GetProjectBalanceReturn> => {
+
+  getProjectBalance = (req: GetProjectBalanceArgs, headers?: object, signal?: AbortSignal): Promise<GetProjectBalanceReturn> => {
     return this.fetch(
       this.url('GetProjectBalance'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          balance: <number>(_data.balance),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'GetProjectBalanceArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<GetProjectBalanceReturn>(_data, 'GetProjectBalanceReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
-  adjustProjectBalance = (args: AdjustProjectBalanceArgs, headers?: object, signal?: AbortSignal): Promise<AdjustProjectBalanceReturn> => {
+
+  adjustProjectBalance = (
+    req: AdjustProjectBalanceArgs,
+    headers?: object,
+    signal?: AbortSignal
+  ): Promise<AdjustProjectBalanceReturn> => {
     return this.fetch(
       this.url('AdjustProjectBalance'),
-      createHTTPRequest(args, headers, signal)).then((res) => {
-      return buildResponse(res).then(_data => {
-        return {
-          balance: <number>(_data.balance),
-        }
-      })
-    }, (error) => {
-      throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-    })
+      createHttpRequest(JsonEncode(req, 'AdjustProjectBalanceArgs'), headers, signal)
+    ).then(
+      res => {
+        return buildResponse(res).then(_data => {
+          return JsonDecode<AdjustProjectBalanceReturn>(_data, 'AdjustProjectBalanceReturn')
+        })
+      },
+      error => {
+        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error instanceof Error ? error.message : String(error)}` })
+      }
+    )
   }
-  
 }
 
-  const createHTTPRequest = (body: object = {}, headers: object = {}, signal: AbortSignal | null = null): object => {
-  const reqHeaders: {[key: string]: string} = { ...headers, 'Content-Type': 'application/json' }
-  reqHeaders[WebrpcHeader] = WebrpcHeaderValue
-
-  return {
-    method: 'POST',
-    headers: reqHeaders,
-    body: JSON.stringify(body || {}),
-    signal
-  }
+const createHttpRequest = (body: string = '{}', headers: object = {}, signal: AbortSignal | null = null): object => {
+  const reqHeaders: { [key: string]: string } = { ...headers, 'Content-Type': 'application/json' }
+  return { method: 'POST', headers: reqHeaders, body, signal }
 }
 
 const buildResponse = (res: Response): Promise<any> => {
@@ -1225,554 +1329,523 @@ const buildResponse = (res: Response): Promise<any> => {
     let data
     try {
       data = JSON.parse(text)
-    } catch(error) {
-      let message = ''
-      if (error instanceof Error)  {
-        message = error.message
-      }
+    } catch (error) {
       throw WebrpcBadResponseError.new({
         status: res.status,
-        cause: `JSON.parse(): ${message}: response text: ${text}`},
-      )
+        cause: `JSON.parse(): ${error instanceof Error ? error.message : String(error)}: response text: ${text}`
+      })
     }
     if (!res.ok) {
-      const code: number = (typeof data.code === 'number') ? data.code : 0
+      const code: number = typeof data.code === 'number' ? data.code : 0
       throw (webrpcErrorByCode[code] || WebrpcError).new(data)
     }
     return data
   })
 }
 
+export type Fetch = (input: RequestInfo, init?: RequestInit) => Promise<Response>
+
+export const JsonEncode = <T = any>(obj: T, _typ: string = ''): string => {
+  return JSON.stringify(obj)
+}
+
+export const JsonDecode = <T = any>(data: string | any, _typ: string = ''): T => {
+  let parsed: any = data
+  if (typeof data === 'string') {
+    try {
+      parsed = JSON.parse(data)
+    } catch (err) {
+      throw WebrpcBadResponseError.new({ cause: `JsonDecode: JSON.parse failed: ${(err as Error).message}` })
+    }
+  }
+  return parsed as T
+}
+
 //
 // Errors
 //
 
+type WebrpcErrorParams = { name?: string; code?: number; message?: string; status?: number; cause?: string }
+
 export class WebrpcError extends Error {
-  name: string
   code: number
-  message: string
   status: number
-  cause?: string
-
-  /** @deprecated Use message instead of msg. Deprecated in webrpc v0.11.0. */
-  msg: string
-
-  constructor(name: string, code: number, message: string, status: number, cause?: string) {
-    super(message)
-    this.name = name || 'WebrpcError'
-    this.code = typeof code === 'number' ? code : 0
-    this.message = message || `endpoint error ${this.code}`
-    this.msg = this.message
-    this.status = typeof status === 'number' ? status : 0
-    this.cause = cause
+
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error.message)
+    this.name = error.name || 'WebrpcEndpointError'
+    this.code = typeof error.code === 'number' ? error.code : 0
+    this.message = error.message || `endpoint error`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, WebrpcError.prototype)
   }
 
   static new(payload: any): WebrpcError {
-    return new this(payload.error, payload.code, payload.message || payload.msg, payload.status, payload.cause)
+    return new this({ message: payload.message, code: payload.code, status: payload.status, cause: payload.cause })
   }
 }
 
-// Webrpc errors
-
 export class WebrpcEndpointError extends WebrpcError {
-  constructor(
-    name: string = 'WebrpcEndpoint',
-    code: number = 0,
-    message: string = `endpoint error`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'WebrpcEndpoint'
+    this.code = typeof error.code === 'number' ? error.code : 0
+    this.message = error.message || `endpoint error`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, WebrpcEndpointError.prototype)
   }
 }
 
 export class WebrpcRequestFailedError extends WebrpcError {
-  constructor(
-    name: string = 'WebrpcRequestFailed',
-    code: number = -1,
-    message: string = `request failed`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'WebrpcRequestFailed'
+    this.code = typeof error.code === 'number' ? error.code : -1
+    this.message = error.message || `request failed`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, WebrpcRequestFailedError.prototype)
   }
 }
 
 export class WebrpcBadRouteError extends WebrpcError {
-  constructor(
-    name: string = 'WebrpcBadRoute',
-    code: number = -2,
-    message: string = `bad route`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'WebrpcBadRoute'
+    this.code = typeof error.code === 'number' ? error.code : -2
+    this.message = error.message || `bad route`
+    this.status = typeof error.status === 'number' ? error.status : 404
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, WebrpcBadRouteError.prototype)
   }
 }
 
 export class WebrpcBadMethodError extends WebrpcError {
-  constructor(
-    name: string = 'WebrpcBadMethod',
-    code: number = -3,
-    message: string = `bad method`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'WebrpcBadMethod'
+    this.code = typeof error.code === 'number' ? error.code : -3
+    this.message = error.message || `bad method`
+    this.status = typeof error.status === 'number' ? error.status : 405
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, WebrpcBadMethodError.prototype)
   }
 }
 
 export class WebrpcBadRequestError extends WebrpcError {
-  constructor(
-    name: string = 'WebrpcBadRequest',
-    code: number = -4,
-    message: string = `bad request`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'WebrpcBadRequest'
+    this.code = typeof error.code === 'number' ? error.code : -4
+    this.message = error.message || `bad request`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, WebrpcBadRequestError.prototype)
   }
 }
 
 export class WebrpcBadResponseError extends WebrpcError {
-  constructor(
-    name: string = 'WebrpcBadResponse',
-    code: number = -5,
-    message: string = `bad response`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'WebrpcBadResponse'
+    this.code = typeof error.code === 'number' ? error.code : -5
+    this.message = error.message || `bad response`
+    this.status = typeof error.status === 'number' ? error.status : 500
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, WebrpcBadResponseError.prototype)
   }
 }
 
 export class WebrpcServerPanicError extends WebrpcError {
-  constructor(
-    name: string = 'WebrpcServerPanic',
-    code: number = -6,
-    message: string = `server panic`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'WebrpcServerPanic'
+    this.code = typeof error.code === 'number' ? error.code : -6
+    this.message = error.message || `server panic`
+    this.status = typeof error.status === 'number' ? error.status : 500
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, WebrpcServerPanicError.prototype)
   }
 }
 
 export class WebrpcInternalErrorError extends WebrpcError {
-  constructor(
-    name: string = 'WebrpcInternalError',
-    code: number = -7,
-    message: string = `internal error`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'WebrpcInternalError'
+    this.code = typeof error.code === 'number' ? error.code : -7
+    this.message = error.message || `internal error`
+    this.status = typeof error.status === 'number' ? error.status : 500
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, WebrpcInternalErrorError.prototype)
   }
 }
 
-export class WebrpcClientDisconnectedError extends WebrpcError {
-  constructor(
-    name: string = 'WebrpcClientDisconnected',
-    code: number = -8,
-    message: string = `client disconnected`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
-    Object.setPrototypeOf(this, WebrpcClientDisconnectedError.prototype)
+export class WebrpcClientAbortedError extends WebrpcError {
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'WebrpcClientAborted'
+    this.code = typeof error.code === 'number' ? error.code : -8
+    this.message = error.message || `request aborted by client`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
+    Object.setPrototypeOf(this, WebrpcClientAbortedError.prototype)
   }
 }
 
 export class WebrpcStreamLostError extends WebrpcError {
-  constructor(
-    name: string = 'WebrpcStreamLost',
-    code: number = -9,
-    message: string = `stream lost`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'WebrpcStreamLost'
+    this.code = typeof error.code === 'number' ? error.code : -9
+    this.message = error.message || `stream lost`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, WebrpcStreamLostError.prototype)
   }
 }
 
 export class WebrpcStreamFinishedError extends WebrpcError {
-  constructor(
-    name: string = 'WebrpcStreamFinished',
-    code: number = -10,
-    message: string = `stream finished`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'WebrpcStreamFinished'
+    this.code = typeof error.code === 'number' ? error.code : -10
+    this.message = error.message || `stream finished`
+    this.status = typeof error.status === 'number' ? error.status : 200
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, WebrpcStreamFinishedError.prototype)
   }
 }
 
-
+//
 // Schema errors
+//
 
 export class UnauthorizedError extends WebrpcError {
-  constructor(
-    name: string = 'Unauthorized',
-    code: number = 1000,
-    message: string = `Unauthorized access`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'Unauthorized'
+    this.code = typeof error.code === 'number' ? error.code : 1000
+    this.message = error.message || `Unauthorized access`
+    this.status = typeof error.status === 'number' ? error.status : 401
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, UnauthorizedError.prototype)
   }
 }
 
 export class PermissionDeniedError extends WebrpcError {
-  constructor(
-    name: string = 'PermissionDenied',
-    code: number = 1001,
-    message: string = `Permission denied`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'PermissionDenied'
+    this.code = typeof error.code === 'number' ? error.code : 1001
+    this.message = error.message || `Permission denied`
+    this.status = typeof error.status === 'number' ? error.status : 403
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, PermissionDeniedError.prototype)
   }
 }
 
 export class SessionExpiredError extends WebrpcError {
-  constructor(
-    name: string = 'SessionExpired',
-    code: number = 1002,
-    message: string = `Session expired`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'SessionExpired'
+    this.code = typeof error.code === 'number' ? error.code : 1002
+    this.message = error.message || `Session expired`
+    this.status = typeof error.status === 'number' ? error.status : 403
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, SessionExpiredError.prototype)
   }
 }
 
 export class MethodNotFoundError extends WebrpcError {
-  constructor(
-    name: string = 'MethodNotFound',
-    code: number = 1003,
-    message: string = `Method not found`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'MethodNotFound'
+    this.code = typeof error.code === 'number' ? error.code : 1003
+    this.message = error.message || `Method not found`
+    this.status = typeof error.status === 'number' ? error.status : 404
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, MethodNotFoundError.prototype)
   }
 }
 
 export class RequestConflictError extends WebrpcError {
-  constructor(
-    name: string = 'RequestConflict',
-    code: number = 1004,
-    message: string = `Conflict with target resource`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'RequestConflict'
+    this.code = typeof error.code === 'number' ? error.code : 1004
+    this.message = error.message || `Conflict with target resource`
+    this.status = typeof error.status === 'number' ? error.status : 409
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, RequestConflictError.prototype)
   }
 }
 
 export class AbortedError extends WebrpcError {
-  constructor(
-    name: string = 'Aborted',
-    code: number = 1005,
-    message: string = `Request aborted`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'Aborted'
+    this.code = typeof error.code === 'number' ? error.code : 1005
+    this.message = error.message || `Request aborted`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, AbortedError.prototype)
   }
 }
 
 export class GeoblockedError extends WebrpcError {
-  constructor(
-    name: string = 'Geoblocked',
-    code: number = 1006,
-    message: string = `Geoblocked region`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'Geoblocked'
+    this.code = typeof error.code === 'number' ? error.code : 1006
+    this.message = error.message || `Geoblocked region`
+    this.status = typeof error.status === 'number' ? error.status : 451
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, GeoblockedError.prototype)
   }
 }
 
 export class RateLimitedError extends WebrpcError {
-  constructor(
-    name: string = 'RateLimited',
-    code: number = 1007,
-    message: string = `Rate-limited. Please slow down.`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'RateLimited'
+    this.code = typeof error.code === 'number' ? error.code : 1007
+    this.message = error.message || `Rate-limited. Please slow down.`
+    this.status = typeof error.status === 'number' ? error.status : 429
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, RateLimitedError.prototype)
   }
 }
 
 export class ProjectNotFoundError extends WebrpcError {
-  constructor(
-    name: string = 'ProjectNotFound',
-    code: number = 1008,
-    message: string = `Project not found`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'ProjectNotFound'
+    this.code = typeof error.code === 'number' ? error.code : 1008
+    this.message = error.message || `Project not found`
+    this.status = typeof error.status === 'number' ? error.status : 401
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, ProjectNotFoundError.prototype)
   }
 }
 
 export class AccessKeyNotFoundError extends WebrpcError {
-  constructor(
-    name: string = 'AccessKeyNotFound',
-    code: number = 1101,
-    message: string = `Access key not found`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'AccessKeyNotFound'
+    this.code = typeof error.code === 'number' ? error.code : 1101
+    this.message = error.message || `Access key not found`
+    this.status = typeof error.status === 'number' ? error.status : 401
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, AccessKeyNotFoundError.prototype)
   }
 }
 
 export class AccessKeyMismatchError extends WebrpcError {
-  constructor(
-    name: string = 'AccessKeyMismatch',
-    code: number = 1102,
-    message: string = `Access key mismatch`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'AccessKeyMismatch'
+    this.code = typeof error.code === 'number' ? error.code : 1102
+    this.message = error.message || `Access key mismatch`
+    this.status = typeof error.status === 'number' ? error.status : 409
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, AccessKeyMismatchError.prototype)
   }
 }
 
 export class InvalidOriginError extends WebrpcError {
-  constructor(
-    name: string = 'InvalidOrigin',
-    code: number = 1103,
-    message: string = `Invalid origin for Access Key`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'InvalidOrigin'
+    this.code = typeof error.code === 'number' ? error.code : 1103
+    this.message = error.message || `Invalid origin for Access Key`
+    this.status = typeof error.status === 'number' ? error.status : 403
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, InvalidOriginError.prototype)
   }
 }
 
 export class InvalidServiceError extends WebrpcError {
-  constructor(
-    name: string = 'InvalidService',
-    code: number = 1104,
-    message: string = `Service not enabled for Access key`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'InvalidService'
+    this.code = typeof error.code === 'number' ? error.code : 1104
+    this.message = error.message || `Service not enabled for Access key`
+    this.status = typeof error.status === 'number' ? error.status : 403
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, InvalidServiceError.prototype)
   }
 }
 
 export class UnauthorizedUserError extends WebrpcError {
-  constructor(
-    name: string = 'UnauthorizedUser',
-    code: number = 1105,
-    message: string = `Unauthorized user`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'UnauthorizedUser'
+    this.code = typeof error.code === 'number' ? error.code : 1105
+    this.message = error.message || `Unauthorized user`
+    this.status = typeof error.status === 'number' ? error.status : 403
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, UnauthorizedUserError.prototype)
   }
 }
 
 export class QuotaExceededError extends WebrpcError {
-  constructor(
-    name: string = 'QuotaExceeded',
-    code: number = 1200,
-    message: string = `Quota request exceeded`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'QuotaExceeded'
+    this.code = typeof error.code === 'number' ? error.code : 1200
+    this.message = error.message || `Quota request exceeded`
+    this.status = typeof error.status === 'number' ? error.status : 429
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, QuotaExceededError.prototype)
   }
 }
 
 export class QuotaRateLimitError extends WebrpcError {
-  constructor(
-    name: string = 'QuotaRateLimit',
-    code: number = 1201,
-    message: string = `Quota rate limit exceeded`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'QuotaRateLimit'
+    this.code = typeof error.code === 'number' ? error.code : 1201
+    this.message = error.message || `Quota rate limit exceeded`
+    this.status = typeof error.status === 'number' ? error.status : 429
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, QuotaRateLimitError.prototype)
   }
 }
 
 export class NoDefaultKeyError extends WebrpcError {
-  constructor(
-    name: string = 'NoDefaultKey',
-    code: number = 1300,
-    message: string = `No default access key found`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'NoDefaultKey'
+    this.code = typeof error.code === 'number' ? error.code : 1300
+    this.message = error.message || `No default access key found`
+    this.status = typeof error.status === 'number' ? error.status : 403
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, NoDefaultKeyError.prototype)
   }
 }
 
 export class MaxAccessKeysError extends WebrpcError {
-  constructor(
-    name: string = 'MaxAccessKeys',
-    code: number = 1301,
-    message: string = `Access keys limit reached`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'MaxAccessKeys'
+    this.code = typeof error.code === 'number' ? error.code : 1301
+    this.message = error.message || `Access keys limit reached`
+    this.status = typeof error.status === 'number' ? error.status : 403
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, MaxAccessKeysError.prototype)
   }
 }
 
 export class AtLeastOneKeyError extends WebrpcError {
-  constructor(
-    name: string = 'AtLeastOneKey',
-    code: number = 1302,
-    message: string = `You need at least one Access Key`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'AtLeastOneKey'
+    this.code = typeof error.code === 'number' ? error.code : 1302
+    this.message = error.message || `You need at least one Access Key`
+    this.status = typeof error.status === 'number' ? error.status : 403
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, AtLeastOneKeyError.prototype)
   }
 }
 
 export class TimeoutError extends WebrpcError {
-  constructor(
-    name: string = 'Timeout',
-    code: number = 1900,
-    message: string = `Request timed out`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'Timeout'
+    this.code = typeof error.code === 'number' ? error.code : 1900
+    this.message = error.message || `Request timed out`
+    this.status = typeof error.status === 'number' ? error.status : 408
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, TimeoutError.prototype)
   }
 }
 
 export class InvalidArgumentError extends WebrpcError {
-  constructor(
-    name: string = 'InvalidArgument',
-    code: number = 2001,
-    message: string = `Invalid argument`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'InvalidArgument'
+    this.code = typeof error.code === 'number' ? error.code : 2001
+    this.message = error.message || `Invalid argument`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, InvalidArgumentError.prototype)
   }
 }
 
 export class UnavailableError extends WebrpcError {
-  constructor(
-    name: string = 'Unavailable',
-    code: number = 2002,
-    message: string = `Unavailable resource`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'Unavailable'
+    this.code = typeof error.code === 'number' ? error.code : 2002
+    this.message = error.message || `Unavailable resource`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, UnavailableError.prototype)
   }
 }
 
 export class QueryFailedError extends WebrpcError {
-  constructor(
-    name: string = 'QueryFailed',
-    code: number = 2003,
-    message: string = `Query failed`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'QueryFailed'
+    this.code = typeof error.code === 'number' ? error.code : 2003
+    this.message = error.message || `Query failed`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, QueryFailedError.prototype)
   }
 }
 
 export class NotFoundError extends WebrpcError {
-  constructor(
-    name: string = 'NotFound',
-    code: number = 3000,
-    message: string = `Resource not found`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'NotFound'
+    this.code = typeof error.code === 'number' ? error.code : 3000
+    this.message = error.message || `Resource not found`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, NotFoundError.prototype)
   }
 }
 
 export class InsufficientFeeError extends WebrpcError {
-  constructor(
-    name: string = 'InsufficientFee',
-    code: number = 3004,
-    message: string = `Insufficient fee`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'InsufficientFee'
+    this.code = typeof error.code === 'number' ? error.code : 3004
+    this.message = error.message || `Insufficient fee`
+    this.status = typeof error.status === 'number' ? error.status : 402
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, InsufficientFeeError.prototype)
   }
 }
 
 export class NotEnoughBalanceError extends WebrpcError {
-  constructor(
-    name: string = 'NotEnoughBalance',
-    code: number = 3005,
-    message: string = `Not enough balance`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'NotEnoughBalance'
+    this.code = typeof error.code === 'number' ? error.code : 3005
+    this.message = error.message || `Not enough balance`
+    this.status = typeof error.status === 'number' ? error.status : 402
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, NotEnoughBalanceError.prototype)
   }
 }
 
 export class SimulationFailedError extends WebrpcError {
-  constructor(
-    name: string = 'SimulationFailed',
-    code: number = 3006,
-    message: string = `Simulation failed`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'SimulationFailed'
+    this.code = typeof error.code === 'number' ? error.code : 3006
+    this.message = error.message || `Simulation failed`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, SimulationFailedError.prototype)
   }
 }
 
-
 export enum errors {
   WebrpcEndpoint = 'WebrpcEndpoint',
   WebrpcRequestFailed = 'WebrpcRequestFailed',
@@ -1782,7 +1855,7 @@ export enum errors {
   WebrpcBadResponse = 'WebrpcBadResponse',
   WebrpcServerPanic = 'WebrpcServerPanic',
   WebrpcInternalError = 'WebrpcInternalError',
-  WebrpcClientDisconnected = 'WebrpcClientDisconnected',
+  WebrpcClientAborted = 'WebrpcClientAborted',
   WebrpcStreamLost = 'WebrpcStreamLost',
   WebrpcStreamFinished = 'WebrpcStreamFinished',
   Unauthorized = 'Unauthorized',
@@ -1811,7 +1884,7 @@ export enum errors {
   NotFound = 'NotFound',
   InsufficientFee = 'InsufficientFee',
   NotEnoughBalance = 'NotEnoughBalance',
-  SimulationFailed = 'SimulationFailed',
+  SimulationFailed = 'SimulationFailed'
 }
 
 export enum WebrpcErrorCodes {
@@ -1823,7 +1896,7 @@ export enum WebrpcErrorCodes {
   WebrpcBadResponse = -5,
   WebrpcServerPanic = -6,
   WebrpcInternalError = -7,
-  WebrpcClientDisconnected = -8,
+  WebrpcClientAborted = -8,
   WebrpcStreamLost = -9,
   WebrpcStreamFinished = -10,
   Unauthorized = 1000,
@@ -1852,7 +1925,7 @@ export enum WebrpcErrorCodes {
   NotFound = 3000,
   InsufficientFee = 3004,
   NotEnoughBalance = 3005,
-  SimulationFailed = 3006,
+  SimulationFailed = 3006
 }
 
 export const webrpcErrorByCode: { [code: number]: any } = {
@@ -1864,7 +1937,7 @@ export const webrpcErrorByCode: { [code: number]: any } = {
   [-5]: WebrpcBadResponseError,
   [-6]: WebrpcServerPanicError,
   [-7]: WebrpcInternalErrorError,
-  [-8]: WebrpcClientDisconnectedError,
+  [-8]: WebrpcClientAbortedError,
   [-9]: WebrpcStreamLostError,
   [-10]: WebrpcStreamFinishedError,
   [1000]: UnauthorizedError,
@@ -1893,8 +1966,61 @@ export const webrpcErrorByCode: { [code: number]: any } = {
   [3000]: NotFoundError,
   [3004]: InsufficientFeeError,
   [3005]: NotEnoughBalanceError,
-  [3006]: SimulationFailedError,
+  [3006]: SimulationFailedError
 }
 
-export type Fetch = (input: RequestInfo, init?: RequestInit) => Promise<Response>
+//
+// Webrpc
+//
+
+export const WebrpcHeader = 'Webrpc'
+
+export const WebrpcHeaderValue = 'webrpc@v0.30.1;gen-typescript@v0.22.0;sequence-relayer@v0.4.1'
 
+type WebrpcGenVersions = {
+  WebrpcGenVersion: string
+  codeGenName: string
+  codeGenVersion: string
+  schemaName: string
+  schemaVersion: string
+}
+
+export function VersionFromHeader(headers: Headers): WebrpcGenVersions {
+  const headerValue = headers.get(WebrpcHeader)
+  if (!headerValue) {
+    return {
+      WebrpcGenVersion: '',
+      codeGenName: '',
+      codeGenVersion: '',
+      schemaName: '',
+      schemaVersion: ''
+    }
+  }
+
+  return parseWebrpcGenVersions(headerValue)
+}
+
+function parseWebrpcGenVersions(header: string): WebrpcGenVersions {
+  const versions = header.split(';')
+  if (versions.length < 3) {
+    return {
+      WebrpcGenVersion: '',
+      codeGenName: '',
+      codeGenVersion: '',
+      schemaName: '',
+      schemaVersion: ''
+    }
+  }
+
+  const [_, WebrpcGenVersion] = versions[0]!.split('@')
+  const [codeGenName, codeGenVersion] = versions[1]!.split('@')
+  const [schemaName, schemaVersion] = versions[2]!.split('@')
+
+  return {
+    WebrpcGenVersion: WebrpcGenVersion ?? '',
+    codeGenName: codeGenName ?? '',
+    codeGenVersion: codeGenVersion ?? '',
+    schemaName: schemaName ?? '',
+    schemaVersion: schemaVersion ?? ''
+  }
+}