@0xsequence/metadata 2.3.35 → 3.0.0-beta.2

package/src/metadata.gen.ts

@@ -1,73 +1,357 @@
 /* eslint-disable */
-// sequence-metadata v0.4.0 5cb74ff169ce80c2e42e65d6bbc98b1daaa0945f
+// sequence-metadata v0.4.0 673a5fa528008c7f9558810fbb24aad978ed7a84
 // --
-// Code generated by webrpc-gen@v0.25.3 with typescript generator. DO NOT EDIT.
+// Code generated by Webrpc-gen@v0.31.0 with typescript generator. DO NOT EDIT.
 //
-// webrpc-gen -schema=metadata.ridl -target=typescript -client -ignore=@deprecated -out=./clients/metadata.gen.ts
+// webrpc-gen -schema=metadata.ridl -target=typescript -client -ignore=@deprecated -compat -out=./clients/metadata.gen.ts
 
-export const WebrpcHeader = 'Webrpc'
-
-export const WebrpcHeaderValue = 'webrpc@v0.25.3;gen-typescript@v0.17.0;sequence-metadata@v0.4.0'
-
-// 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.0'
+export const WebrpcSchemaVersion = 'v0.4.0'
 
 // Schema hash generated from your RIDL schema
-export const WebRPCSchemaHash = '5cb74ff169ce80c2e42e65d6bbc98b1daaa0945f'
+export const WebrpcSchemaHash = '673a5fa528008c7f9558810fbb24aad978ed7a84'
 
-type WebrpcGenVersions = {
-  webrpcGenVersion: string
-  codeGenName: string
-  codeGenVersion: string
-  schemaName: string
-  schemaVersion: string
+//
+// Client interface
+//
+
+export interface MetadataClient {
+  ping(headers?: object, signal?: AbortSignal): Promise<PingReturn>
+
+  version(headers?: object, signal?: AbortSignal): Promise<VersionReturn>
+
+  runtimeStatus(headers?: object, signal?: AbortSignal): Promise<RuntimeStatusReturn>
+
+  getTask(req: GetTaskArgs, headers?: object, signal?: AbortSignal): Promise<GetTaskReturn>
+
+  getTaskStatus(req: GetTaskStatusArgs, headers?: object, signal?: AbortSignal): Promise<GetTaskStatusReturn>
+
+  /**
+   * Contract Info -- returns contract meta-info for contracts found in registered chain's token-lists
+   */
+  getContractInfo(req: GetContractInfoArgs, headers?: object, signal?: AbortSignal): Promise<GetContractInfoReturn>
+
+  getContractInfoBatch(
+    req: GetContractInfoBatchArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetContractInfoBatchReturn>
+
+  /**
+   * Find Contract Info across all chains token-lists. Similar to GetContractInfo above,
+   * but it will traverse all chains and results from all.
+   */
+  findContractInfo(req: FindContractInfoArgs, headers?: object, signal?: AbortSignal): Promise<FindContractInfoReturn>
+
+  /**
+   * map of contractAddress :: []ContractInfo
+   */
+  findContractInfoBatch(
+    req: FindContractInfoBatchArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<FindContractInfoBatchReturn>
+
+  /**
+   * Refresh Contract Info -- refresh contract meta-info
+   */
+  refreshContractInfo(
+    req: RefreshContractInfoArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<RefreshContractInfoReturn>
+
+  refreshContractInfoBatch(
+    req: RefreshContractInfoBatchArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<RefreshContractInfoBatchReturn>
+
+  /**
+   * Search for contract infos using a query string
+   */
+  searchContractsByQuery(
+    req: SearchContractsByQueryArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<SearchContractsByQueryReturn>
+
+  /**
+   * GetTokenMetadata - fetch token metadata for a particular contract and respective tokenIDs
+   */
+  getTokenMetadata(req: GetTokenMetadataArgs, headers?: object, signal?: AbortSignal): Promise<GetTokenMetadataReturn>
+
+  /**
+   * GetTokenMetadataBatch allows you to query the token metadata of a batch of contracts and respective tokenIDs
+   * where map is contractAddress::[]tokenID => contractAddress::[]TokenMetadata
+   *
+   * Note, we limit each request to 50 contracts max and 50 tokens max per contract.
+   */
+  getTokenMetadataBatch(
+    req: GetTokenMetadataBatchArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetTokenMetadataBatchReturn>
+
+  /**
+   * RefreshTokenMetadata allows you to refresh a contract metadata for contract-level and token-level metadata.
+   */
+  refreshTokenMetadata(
+    req: RefreshTokenMetadataArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<RefreshTokenMetadataReturn>
+
+  /**
+   * Search ERC721 & ERC1155 token metadata by query string 'q'
+   */
+  searchTokenMetadataByQuery(
+    req: SearchTokenMetadataByQueryArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<SearchTokenMetadataByQueryReturn>
+
+  /**
+   * Search ERC721 & ERC1155 token metadata by filter object 'filter'
+   * which allows to search by text or properties.
+   */
+  searchTokenMetadata(
+    req: SearchTokenMetadataArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<SearchTokenMetadataReturn>
+
+  /**
+   * Search ERC721 & ERC1155 for token IDs by filter object 'filter'
+   * which allows to search by text or properties.
+   */
+  searchTokenMetadataTokenIDs(
+    req: SearchTokenMetadataTokenIDsArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<SearchTokenMetadataTokenIDsReturn>
+
+  /**
+   * Get token metadata property filters for a contract address
+   */
+  getTokenMetadataPropertyFilters(
+    req: GetTokenMetadataPropertyFiltersArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetTokenMetadataPropertyFiltersReturn>
+
+  /**
+   * Gets Token Directory supported networks
+   */
+  getTokenDirectoryNetworks(
+    req: GetTokenDirectoryNetworksArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetTokenDirectoryNetworksReturn>
+
+  /**
+   * Gets Token Directory entries
+   */
+  getTokenDirectory(
+    req: GetTokenDirectoryArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetTokenDirectoryReturn>
+
+  /**
+   * Search in Token Directory
+   */
+  searchTokenDirectory(
+    req: SearchTokenDirectoryArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<SearchTokenDirectoryReturn>
+
+  /**
+   * Niftyswap querying data
+   */
+  getNiftyswapTokenQuantity(
+    req: GetNiftyswapTokenQuantityArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetNiftyswapTokenQuantityReturn>
+
+  /**
+   * map of tokenID :: quantity
+   */
+  getNiftyswapUnitPrices(
+    req: GetNiftyswapUnitPricesArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetNiftyswapUnitPricesReturn>
+
+  /**
+   * map of tokenID :: price
+   */
+  getNiftyswapUnitPricesWithQuantities(
+    req: GetNiftyswapUnitPricesWithQuantitiesArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetNiftyswapUnitPricesWithQuantitiesReturn>
 }
+export interface CollectionsClient {
+  createCollection(req: CreateCollectionArgs, headers?: object, signal?: AbortSignal): Promise<CreateCollectionReturn>
 
-export function VersionFromHeader(headers: Headers): WebrpcGenVersions {
-  const headerValue = headers.get(WebrpcHeader)
-  if (!headerValue) {
-    return {
-      webrpcGenVersion: '',
-      codeGenName: '',
-      codeGenVersion: '',
-      schemaName: '',
-      schemaVersion: ''
-    }
-  }
+  getCollection(req: GetCollectionArgs, headers?: object, signal?: AbortSignal): Promise<GetCollectionReturn>
 
-  return parseWebrpcGenVersions(headerValue)
+  listCollections(req: ListCollectionsArgs, headers?: object, signal?: AbortSignal): Promise<ListCollectionsReturn>
+
+  updateCollection(req: UpdateCollectionArgs, headers?: object, signal?: AbortSignal): Promise<UpdateCollectionReturn>
+
+  deleteCollection(req: DeleteCollectionArgs, headers?: object, signal?: AbortSignal): Promise<DeleteCollectionReturn>
+
+  publishCollection(
+    req: PublishCollectionArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<PublishCollectionReturn>
+
+  unpublishCollection(
+    req: UnpublishCollectionArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<UnpublishCollectionReturn>
+
+  createContractCollection(
+    req: CreateContractCollectionArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<CreateContractCollectionReturn>
+
+  getContractCollection(
+    req: GetContractCollectionArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetContractCollectionReturn>
+
+  listContractCollections(
+    req: ListContractCollectionsArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<ListContractCollectionsReturn>
+
+  updateContractCollection(
+    req: UpdateContractCollectionArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<UpdateContractCollectionReturn>
+
+  deleteContractCollection(
+    req: DeleteContractCollectionArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<DeleteContractCollectionReturn>
+
+  createToken(req: CreateTokenArgs, headers?: object, signal?: AbortSignal): Promise<CreateTokenReturn>
+
+  getToken(req: GetTokenArgs, headers?: object, signal?: AbortSignal): Promise<GetTokenReturn>
+
+  listTokens(req: ListTokensArgs, headers?: object, signal?: AbortSignal): Promise<ListTokensReturn>
+
+  updateToken(req: UpdateTokenArgs, headers?: object, signal?: AbortSignal): Promise<UpdateTokenReturn>
+
+  deleteToken(req: DeleteTokenArgs, headers?: object, signal?: AbortSignal): Promise<DeleteTokenReturn>
+
+  createAsset(req: CreateAssetArgs, headers?: object, signal?: AbortSignal): Promise<CreateAssetReturn>
+
+  getAsset(req: GetAssetArgs, headers?: object, signal?: AbortSignal): Promise<GetAssetReturn>
+
+  updateAsset(req: UpdateAssetArgs, headers?: object, signal?: AbortSignal): Promise<UpdateAssetReturn>
+
+  deleteAsset(req: DeleteAssetArgs, headers?: object, signal?: AbortSignal): Promise<DeleteAssetReturn>
 }
+export interface AdminClient {
+  /**
+   * ContractInfo
+   */
+  refreshContractInfoUpdatedBefore(
+    req: RefreshContractInfoUpdatedBeforeArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<RefreshContractInfoUpdatedBeforeReturn>
 
-function parseWebrpcGenVersions(header: string): WebrpcGenVersions {
-  const versions = header.split(';')
-  if (versions.length < 3) {
-    return {
-      webrpcGenVersion: '',
-      codeGenName: '',
-      codeGenVersion: '',
-      schemaName: '',
-      schemaVersion: ''
-    }
-  }
+  /**
+   * TokenMetadata
+   */
+  refreshTokenMetadataUpdatedBefore(
+    req: RefreshTokenMetadataUpdatedBeforeArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<RefreshTokenMetadataUpdatedBeforeReturn>
 
-  const [_, webrpcGenVersion] = versions[0]!.split('@')
-  const [codeGenName, codeGenVersion] = versions[1]!.split('@')
-  const [schemaName, schemaVersion] = versions[2]!.split('@')
+  /**
+   * Contract Info Overrides
+   */
+  getContractInfoOverride(
+    req: GetContractInfoOverrideArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetContractInfoOverrideReturn>
 
-  return {
-    webrpcGenVersion: webrpcGenVersion ?? '',
-    codeGenName: codeGenName ?? '',
-    codeGenVersion: codeGenVersion ?? '',
-    schemaName: schemaName ?? '',
-    schemaVersion: schemaVersion ?? ''
-  }
+  getContractInfoOverrides(
+    req: GetContractInfoOverridesArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetContractInfoOverridesReturn>
+
+  addContractInfoOverride(
+    req: AddContractInfoOverrideArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<AddContractInfoOverrideReturn>
+
+  updateContractInfoOverride(
+    req: UpdateContractInfoOverrideArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<UpdateContractInfoOverrideReturn>
+
+  removeContractInfoOverride(
+    req: RemoveContractInfoOverrideArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<RemoveContractInfoOverrideReturn>
+
+  /**
+   * Token Directory
+   */
+  isInTokenDirectory(
+    req: IsInTokenDirectoryArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<IsInTokenDirectoryReturn>
+
+  setTokenDirectoryFeatureIndex(
+    req: SetTokenDirectoryFeatureIndexArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<SetTokenDirectoryFeatureIndexReturn>
+
+  addContractToTokenDirectory(
+    req: AddContractToTokenDirectoryArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<AddContractToTokenDirectoryReturn>
+
+  removeContractFromTokenDirectory(
+    req: RemoveContractFromTokenDirectoryArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<RemoveContractFromTokenDirectoryReturn>
+
+  refreshTokenDirectory(headers?: object, signal?: AbortSignal): Promise<RefreshTokenDirectoryReturn>
 }
 
 //
-// Types
+// Schema types
 //
 
 export enum ContractType {
@@ -76,7 +360,7 @@ export enum ContractType {
   ERC721 = 'ERC721',
   ERC1155 = 'ERC1155',
   ERC6909 = 'ERC6909',
-  MISC = 'MISC'
+  MISC = 'MISC',
 }
 
 export enum Source {
@@ -96,33 +380,33 @@ export enum Source {
   SEQUENCE_BUILDER = 'SEQUENCE_BUILDER',
   SEQUENCE_BUILDER_DEPLOYED = 'SEQUENCE_BUILDER_DEPLOYED',
   SEQUENCE_BUILDER_COLLECTIONS = 'SEQUENCE_BUILDER_COLLECTIONS',
-  SEQUENCE_BUILDER_ADMIN = 'SEQUENCE_BUILDER_ADMIN'
+  SEQUENCE_BUILDER_ADMIN = 'SEQUENCE_BUILDER_ADMIN',
 }
 
 export enum ResourceStatus {
   NOT_AVAILABLE = 'NOT_AVAILABLE',
   REFRESHING = 'REFRESHING',
-  AVAILABLE = 'AVAILABLE'
+  AVAILABLE = 'AVAILABLE',
 }
 
 export enum PropertyType {
   INT = 'INT',
   STRING = 'STRING',
   ARRAY = 'ARRAY',
-  GENERIC = 'GENERIC'
+  GENERIC = 'GENERIC',
 }
 
 export enum SwapType {
   UNKNOWN = 'UNKNOWN',
   BUY = 'BUY',
-  SELL = 'SELL'
+  SELL = 'SELL',
 }
 
 export enum TaskStatus {
   QUEUED = 'QUEUED',
   PAUSED = 'PAUSED',
   FAILED = 'FAILED',
-  DONE = 'DONE'
+  DONE = 'DONE',
 }
 
 export interface Version {
@@ -366,165 +650,24 @@ export interface Task {
   result: Array<string>
 }
 
-export interface Metadata {
-  ping(headers?: object, signal?: AbortSignal): Promise<PingReturn>
-  version(headers?: object, signal?: AbortSignal): Promise<VersionReturn>
-  runtimeStatus(headers?: object, signal?: AbortSignal): Promise<RuntimeStatusReturn>
-  getTask(args: GetTaskArgs, headers?: object, signal?: AbortSignal): Promise<GetTaskReturn>
-  getTaskStatus(args: GetTaskStatusArgs, headers?: object, signal?: AbortSignal): Promise<GetTaskStatusReturn>
-  /**
-   * Contract Info -- returns contract meta-info for contracts found in registered chain's token-lists
-   */
-  getContractInfo(args: GetContractInfoArgs, headers?: object, signal?: AbortSignal): Promise<GetContractInfoReturn>
-  getContractInfoBatch(
-    args: GetContractInfoBatchArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<GetContractInfoBatchReturn>
-  /**
-   * Find Contract Info across all chains token-lists. Similar to GetContractInfo above,
-   * but it will traverse all chains and results from all.
-   */
-  findContractInfo(args: FindContractInfoArgs, headers?: object, signal?: AbortSignal): Promise<FindContractInfoReturn>
-  /**
-   * map of contractAddress :: []ContractInfo
-   */
-  findContractInfoBatch(
-    args: FindContractInfoBatchArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<FindContractInfoBatchReturn>
-  /**
-   * Refresh Contract Info -- refresh contract meta-info
-   */
-  refreshContractInfo(args: RefreshContractInfoArgs, headers?: object, signal?: AbortSignal): Promise<RefreshContractInfoReturn>
-  refreshContractInfoBatch(
-    args: RefreshContractInfoBatchArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<RefreshContractInfoBatchReturn>
-  /**
-   * Search for contract infos using a query string
-   */
-  searchContractsByQuery(
-    args: SearchContractsByQueryArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<SearchContractsByQueryReturn>
-  /**
-   * GetTokenMetadata - fetch token metadata for a particular contract and respective tokenIDs
-   */
-  getTokenMetadata(args: GetTokenMetadataArgs, headers?: object, signal?: AbortSignal): Promise<GetTokenMetadataReturn>
-  /**
-   * GetTokenMetadataBatch allows you to query the token metadata of a batch of contracts and respective tokenIDs
-   * where map is contractAddress::[]tokenID => contractAddress::[]TokenMetadata
-   *
-   * Note, we limit each request to 50 contracts max and 50 tokens max per contract.
-   */
-  getTokenMetadataBatch(
-    args: GetTokenMetadataBatchArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<GetTokenMetadataBatchReturn>
-  /**
-   * RefreshTokenMetadata allows you to refresh a contract metadata for contract-level and token-level metadata.
-   */
-  refreshTokenMetadata(
-    args: RefreshTokenMetadataArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<RefreshTokenMetadataReturn>
-  /**
-   * Search ERC721 & ERC1155 token metadata by query string 'q'
-   */
-  searchTokenMetadataByQuery(
-    args: SearchTokenMetadataByQueryArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<SearchTokenMetadataByQueryReturn>
-  /**
-   * Search ERC721 & ERC1155 token metadata by filter object 'filter'
-   * which allows to search by text or properties.
-   */
-  searchTokenMetadata(args: SearchTokenMetadataArgs, headers?: object, signal?: AbortSignal): Promise<SearchTokenMetadataReturn>
-  /**
-   * Search ERC721 & ERC1155 for token IDs by filter object 'filter'
-   * which allows to search by text or properties.
-   */
-  searchTokenMetadataTokenIDs(
-    args: SearchTokenMetadataTokenIDsArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<SearchTokenMetadataTokenIDsReturn>
-  /**
-   * Get token metadata property filters for a contract address
-   */
-  getTokenMetadataPropertyFilters(
-    args: GetTokenMetadataPropertyFiltersArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<GetTokenMetadataPropertyFiltersReturn>
-  /**
-   * Gets Token Directory supported networks
-   */
-  getTokenDirectoryNetworks(
-    args: GetTokenDirectoryNetworksArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<GetTokenDirectoryNetworksReturn>
-  /**
-   * Gets Token Directory entries
-   */
-  getTokenDirectory(args: GetTokenDirectoryArgs, headers?: object, signal?: AbortSignal): Promise<GetTokenDirectoryReturn>
-  /**
-   * Search in Token Directory
-   */
-  searchTokenDirectory(
-    args: SearchTokenDirectoryArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<SearchTokenDirectoryReturn>
-  /**
-   * Niftyswap querying data
-   */
-  getNiftyswapTokenQuantity(
-    args: GetNiftyswapTokenQuantityArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<GetNiftyswapTokenQuantityReturn>
-  /**
-   * map of tokenID :: quantity
-   */
-  getNiftyswapUnitPrices(
-    args: GetNiftyswapUnitPricesArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<GetNiftyswapUnitPricesReturn>
-  /**
-   * map of tokenID :: price
-   */
-  getNiftyswapUnitPricesWithQuantities(
-    args: GetNiftyswapUnitPricesWithQuantitiesArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<GetNiftyswapUnitPricesWithQuantitiesReturn>
-}
-
 export interface PingArgs {}
 
 export interface PingReturn {
   status: boolean
 }
+
 export interface VersionArgs {}
 
 export interface VersionReturn {
   version: Version
 }
+
 export interface RuntimeStatusArgs {}
 
 export interface RuntimeStatusReturn {
   status: RuntimeStatus
 }
+
 export interface GetTaskArgs {
   taskId: number
 }
@@ -532,6 +675,7 @@ export interface GetTaskArgs {
 export interface GetTaskReturn {
   task: Task
 }
+
 export interface GetTaskStatusArgs {
   taskId: number
 }
@@ -539,6 +683,7 @@ export interface GetTaskStatusArgs {
 export interface GetTaskStatusReturn {
   status?: TaskStatus
 }
+
 export interface GetContractInfoArgs {
   chainID: string
   contractAddress: string
@@ -548,6 +693,7 @@ export interface GetContractInfoReturn {
   contractInfo: ContractInfo
   taskID?: number
 }
+
 export interface GetContractInfoBatchArgs {
   chainID: string
   contractAddresses: Array<string>
@@ -557,6 +703,7 @@ export interface GetContractInfoBatchReturn {
   contractInfoMap: { [key: string]: ContractInfo }
   taskID?: number
 }
+
 export interface FindContractInfoArgs {
   contractAddress: string
 }
@@ -564,6 +711,7 @@ export interface FindContractInfoArgs {
 export interface FindContractInfoReturn {
   contractInfoList: Array<ContractInfo>
 }
+
 export interface FindContractInfoBatchArgs {
   contractAddresses: Array<string>
 }
@@ -571,6 +719,7 @@ export interface FindContractInfoBatchArgs {
 export interface FindContractInfoBatchReturn {
   contractInfoByChain: { [key: string]: Array<ContractInfo> }
 }
+
 export interface RefreshContractInfoArgs {
   chainID: string
   contractAddress: string
@@ -579,6 +728,7 @@ export interface RefreshContractInfoArgs {
 export interface RefreshContractInfoReturn {
   taskID?: number
 }
+
 export interface RefreshContractInfoBatchArgs {
   chainID: string
   contractAddresses: Array<string>
@@ -587,6 +737,7 @@ export interface RefreshContractInfoBatchArgs {
 export interface RefreshContractInfoBatchReturn {
   taskID?: number
 }
+
 export interface SearchContractsByQueryArgs {
   q: string
   chainID?: string
@@ -599,6 +750,7 @@ export interface SearchContractsByQueryReturn {
   contractInfo: Array<ContractInfo>
   nextPage: Page
 }
+
 export interface GetTokenMetadataArgs {
   chainID: string
   contractAddress: string
@@ -609,6 +761,7 @@ export interface GetTokenMetadataReturn {
   tokenMetadata: Array<TokenMetadata>
   taskID?: number
 }
+
 export interface GetTokenMetadataBatchArgs {
   chainID: string
   contractTokenMap: { [key: string]: Array<string> }
@@ -618,16 +771,18 @@ export interface GetTokenMetadataBatchReturn {
   contractTokenMetadata: { [key: string]: Array<TokenMetadata> }
   taskID?: number
 }
+
 export interface RefreshTokenMetadataArgs {
   chainID: string
   contractAddress: string
   tokenIDs?: Array<string>
-  refreshAll?: boolean
+  newMints?: boolean
 }
 
 export interface RefreshTokenMetadataReturn {
   taskID: number
 }
+
 export interface SearchTokenMetadataByQueryArgs {
   q: string
   chainID?: string
@@ -639,6 +794,7 @@ export interface SearchTokenMetadataByQueryReturn {
   tokenMetadata: Array<TokenMetadata>
   nextPage: Page
 }
+
 export interface SearchTokenMetadataArgs {
   chainID: string
   contractAddress: string
@@ -650,6 +806,7 @@ export interface SearchTokenMetadataReturn {
   page: Page
   tokenMetadata: Array<TokenMetadata>
 }
+
 export interface SearchTokenMetadataTokenIDsArgs {
   chainID: string
   contractAddress: string
@@ -661,6 +818,7 @@ export interface SearchTokenMetadataTokenIDsReturn {
   page: Page
   tokenIDs: Array<string>
 }
+
 export interface GetTokenMetadataPropertyFiltersArgs {
   chainID: string
   contractAddress: string
@@ -671,6 +829,7 @@ export interface GetTokenMetadataPropertyFiltersArgs {
 export interface GetTokenMetadataPropertyFiltersReturn {
   filters: Array<PropertyFilter>
 }
+
 export interface GetTokenDirectoryNetworksArgs {
   includeTestnets?: boolean
   onlyFeatured?: boolean
@@ -680,6 +839,7 @@ export interface GetTokenDirectoryNetworksReturn {
   chainIDs: Array<number>
   networks: Array<string>
 }
+
 export interface GetTokenDirectoryArgs {
   chainID?: string
   includeTestnets?: boolean
@@ -691,6 +851,7 @@ export interface GetTokenDirectoryReturn {
   contracts: Array<ContractInfo>
   page: Page
 }
+
 export interface SearchTokenDirectoryArgs {
   query: string
   chainID?: number
@@ -703,6 +864,7 @@ export interface SearchTokenDirectoryReturn {
   contracts: Array<ContractInfo>
   page: Page
 }
+
 export interface GetNiftyswapTokenQuantityArgs {
   chainID: string
   contractAddress: string
@@ -712,6 +874,7 @@ export interface GetNiftyswapTokenQuantityArgs {
 export interface GetNiftyswapTokenQuantityReturn {
   quantity: { [key: string]: string }
 }
+
 export interface GetNiftyswapUnitPricesArgs {
   chainID: string
   contractAddress: string
@@ -722,6 +885,7 @@ export interface GetNiftyswapUnitPricesArgs {
 export interface GetNiftyswapUnitPricesReturn {
   prices: { [key: string]: string }
 }
+
 export interface GetNiftyswapUnitPricesWithQuantitiesArgs {
   chainID: string
   contractAddress: string
@@ -733,50 +897,6 @@ export interface GetNiftyswapUnitPricesWithQuantitiesReturn {
   prices: { [key: string]: GetNiftyswapUnitPricesResponse }
 }
 
-export interface Collections {
-  createCollection(args: CreateCollectionArgs, headers?: object, signal?: AbortSignal): Promise<CreateCollectionReturn>
-  getCollection(args: GetCollectionArgs, headers?: object, signal?: AbortSignal): Promise<GetCollectionReturn>
-  listCollections(args: ListCollectionsArgs, headers?: object, signal?: AbortSignal): Promise<ListCollectionsReturn>
-  updateCollection(args: UpdateCollectionArgs, headers?: object, signal?: AbortSignal): Promise<UpdateCollectionReturn>
-  deleteCollection(args: DeleteCollectionArgs, headers?: object, signal?: AbortSignal): Promise<DeleteCollectionReturn>
-  publishCollection(args: PublishCollectionArgs, headers?: object, signal?: AbortSignal): Promise<PublishCollectionReturn>
-  unpublishCollection(args: UnpublishCollectionArgs, headers?: object, signal?: AbortSignal): Promise<UnpublishCollectionReturn>
-  createContractCollection(
-    args: CreateContractCollectionArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<CreateContractCollectionReturn>
-  getContractCollection(
-    args: GetContractCollectionArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<GetContractCollectionReturn>
-  listContractCollections(
-    args: ListContractCollectionsArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<ListContractCollectionsReturn>
-  updateContractCollection(
-    args: UpdateContractCollectionArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<UpdateContractCollectionReturn>
-  deleteContractCollection(
-    args: DeleteContractCollectionArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<DeleteContractCollectionReturn>
-  createToken(args: CreateTokenArgs, headers?: object, signal?: AbortSignal): Promise<CreateTokenReturn>
-  getToken(args: GetTokenArgs, headers?: object, signal?: AbortSignal): Promise<GetTokenReturn>
-  listTokens(args: ListTokensArgs, headers?: object, signal?: AbortSignal): Promise<ListTokensReturn>
-  updateToken(args: UpdateTokenArgs, headers?: object, signal?: AbortSignal): Promise<UpdateTokenReturn>
-  deleteToken(args: DeleteTokenArgs, headers?: object, signal?: AbortSignal): Promise<DeleteTokenReturn>
-  createAsset(args: CreateAssetArgs, headers?: object, signal?: AbortSignal): Promise<CreateAssetReturn>
-  getAsset(args: GetAssetArgs, headers?: object, signal?: AbortSignal): Promise<GetAssetReturn>
-  updateAsset(args: UpdateAssetArgs, headers?: object, signal?: AbortSignal): Promise<UpdateAssetReturn>
-  deleteAsset(args: DeleteAssetArgs, headers?: object, signal?: AbortSignal): Promise<DeleteAssetReturn>
-}
-
 export interface CreateCollectionArgs {
   projectId?: number
   collection: Collection
@@ -785,6 +905,7 @@ export interface CreateCollectionArgs {
 export interface CreateCollectionReturn {
   collection: Collection
 }
+
 export interface GetCollectionArgs {
   projectId?: number
   collectionId: number
@@ -793,6 +914,7 @@ export interface GetCollectionArgs {
 export interface GetCollectionReturn {
   collection: Collection
 }
+
 export interface ListCollectionsArgs {
   projectId?: number
   page?: Page
@@ -802,6 +924,7 @@ export interface ListCollectionsReturn {
   page: Page
   collections: Array<Collection>
 }
+
 export interface UpdateCollectionArgs {
   projectId?: number
   collection: Collection
@@ -810,6 +933,7 @@ export interface UpdateCollectionArgs {
 export interface UpdateCollectionReturn {
   collection: Collection
 }
+
 export interface DeleteCollectionArgs {
   projectId?: number
   collectionId: number
@@ -818,6 +942,7 @@ export interface DeleteCollectionArgs {
 export interface DeleteCollectionReturn {
   status: boolean
 }
+
 export interface PublishCollectionArgs {
   projectId?: number
   collectionId: number
@@ -827,6 +952,7 @@ export interface PublishCollectionArgs {
 export interface PublishCollectionReturn {
   collection: Collection
 }
+
 export interface UnpublishCollectionArgs {
   projectId?: number
   collectionId: number
@@ -835,6 +961,7 @@ export interface UnpublishCollectionArgs {
 export interface UnpublishCollectionReturn {
   collection: Collection
 }
+
 export interface CreateContractCollectionArgs {
   projectId: number
   contractCollection: ContractCollection
@@ -843,6 +970,7 @@ export interface CreateContractCollectionArgs {
 export interface CreateContractCollectionReturn {
   contractCollection: ContractCollection
 }
+
 export interface GetContractCollectionArgs {
   projectId: number
   chainId: number
@@ -852,6 +980,7 @@ export interface GetContractCollectionArgs {
 export interface GetContractCollectionReturn {
   contractCollection: ContractCollection
 }
+
 export interface ListContractCollectionsArgs {
   projectId: number
   collectionId?: number
@@ -863,6 +992,7 @@ export interface ListContractCollectionsReturn {
   collections: Array<Collection>
   page: Page
 }
+
 export interface UpdateContractCollectionArgs {
   projectId: number
   contractCollection: ContractCollection
@@ -871,6 +1001,7 @@ export interface UpdateContractCollectionArgs {
 export interface UpdateContractCollectionReturn {
   ok: boolean
 }
+
 export interface DeleteContractCollectionArgs {
   projectId: number
   chainId: number
@@ -880,6 +1011,7 @@ export interface DeleteContractCollectionArgs {
 export interface DeleteContractCollectionReturn {
   ok: boolean
 }
+
 export interface CreateTokenArgs {
   projectId?: number
   collectionId: number
@@ -891,6 +1023,7 @@ export interface CreateTokenReturn {
   token: TokenMetadata
   assets: Array<Asset>
 }
+
 export interface GetTokenArgs {
   projectId?: number
   collectionId: number
@@ -901,6 +1034,7 @@ export interface GetTokenReturn {
   token: TokenMetadata
   assets: Array<Asset>
 }
+
 export interface ListTokensArgs {
   projectId?: number
   collectionId: number
@@ -911,6 +1045,7 @@ export interface ListTokensReturn {
   page: Page
   tokens: Array<TokenMetadata>
 }
+
 export interface UpdateTokenArgs {
   projectId?: number
   collectionId: number
@@ -922,6 +1057,7 @@ export interface UpdateTokenArgs {
 export interface UpdateTokenReturn {
   token: TokenMetadata
 }
+
 export interface DeleteTokenArgs {
   projectId?: number
   collectionId: number
@@ -931,104 +1067,41 @@ export interface DeleteTokenArgs {
 export interface DeleteTokenReturn {
   status: boolean
 }
-export interface CreateAssetArgs {
-  projectId?: number
-  asset: Asset
-}
-
-export interface CreateAssetReturn {
-  asset: Asset
-}
-export interface GetAssetArgs {
-  projectId?: number
-  assetId: number
-}
 
-export interface GetAssetReturn {
-  asset: Asset
-}
-export interface UpdateAssetArgs {
+export interface CreateAssetArgs {
   projectId?: number
   asset: Asset
 }
-
-export interface UpdateAssetReturn {
-  asset: Asset
-}
-export interface DeleteAssetArgs {
-  projectId?: number
-  assetId: number
-}
-
-export interface DeleteAssetReturn {
-  status: boolean
-}
-
-export interface Admin {
-  /**
-   * ContractInfo
-   */
-  refreshContractInfoUpdatedBefore(
-    args: RefreshContractInfoUpdatedBeforeArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<RefreshContractInfoUpdatedBeforeReturn>
-  /**
-   * TokenMetadata
-   */
-  refreshTokenMetadataUpdatedBefore(
-    args: RefreshTokenMetadataUpdatedBeforeArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<RefreshTokenMetadataUpdatedBeforeReturn>
-  /**
-   * Contract Info Overrides
-   */
-  getContractInfoOverride(
-    args: GetContractInfoOverrideArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<GetContractInfoOverrideReturn>
-  getContractInfoOverrides(
-    args: GetContractInfoOverridesArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<GetContractInfoOverridesReturn>
-  addContractInfoOverride(
-    args: AddContractInfoOverrideArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<AddContractInfoOverrideReturn>
-  updateContractInfoOverride(
-    args: UpdateContractInfoOverrideArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<UpdateContractInfoOverrideReturn>
-  removeContractInfoOverride(
-    args: RemoveContractInfoOverrideArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<RemoveContractInfoOverrideReturn>
-  /**
-   * Token Directory
-   */
-  isInTokenDirectory(args: IsInTokenDirectoryArgs, headers?: object, signal?: AbortSignal): Promise<IsInTokenDirectoryReturn>
-  setTokenDirectoryFeatureIndex(
-    args: SetTokenDirectoryFeatureIndexArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<SetTokenDirectoryFeatureIndexReturn>
-  addContractToTokenDirectory(
-    args: AddContractToTokenDirectoryArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<AddContractToTokenDirectoryReturn>
-  removeContractFromTokenDirectory(
-    args: RemoveContractFromTokenDirectoryArgs,
-    headers?: object,
-    signal?: AbortSignal
-  ): Promise<RemoveContractFromTokenDirectoryReturn>
-  refreshTokenDirectory(headers?: object, signal?: AbortSignal): Promise<RefreshTokenDirectoryReturn>
+
+export interface CreateAssetReturn {
+  asset: Asset
+}
+
+export interface GetAssetArgs {
+  projectId?: number
+  assetId: number
+}
+
+export interface GetAssetReturn {
+  asset: Asset
+}
+
+export interface UpdateAssetArgs {
+  projectId?: number
+  asset: Asset
+}
+
+export interface UpdateAssetReturn {
+  asset: Asset
+}
+
+export interface DeleteAssetArgs {
+  projectId?: number
+  assetId: number
+}
+
+export interface DeleteAssetReturn {
+  status: boolean
 }
 
 export interface RefreshContractInfoUpdatedBeforeArgs {
@@ -1039,6 +1112,7 @@ export interface RefreshContractInfoUpdatedBeforeArgs {
 export interface RefreshContractInfoUpdatedBeforeReturn {
   taskIDs: Array<number>
 }
+
 export interface RefreshTokenMetadataUpdatedBeforeArgs {
   before: string
   maxTokenNumber: number
@@ -1047,6 +1121,7 @@ export interface RefreshTokenMetadataUpdatedBeforeArgs {
 export interface RefreshTokenMetadataUpdatedBeforeReturn {
   taskIDs: Array<number>
 }
+
 export interface GetContractInfoOverrideArgs {
   chainID: string
   contractAddress: string
@@ -1055,6 +1130,7 @@ export interface GetContractInfoOverrideArgs {
 export interface GetContractInfoOverrideReturn {
   contractInfoOverride: ContractInfoOverride
 }
+
 export interface GetContractInfoOverridesArgs {
   chainID?: string
   page?: Page
@@ -1064,6 +1140,7 @@ export interface GetContractInfoOverridesReturn {
   contractInfoOverrides: Array<ContractInfoOverride>
   page: Page
 }
+
 export interface AddContractInfoOverrideArgs {
   chainID: string
   contractAddress: string
@@ -1073,6 +1150,7 @@ export interface AddContractInfoOverrideArgs {
 export interface AddContractInfoOverrideReturn {
   ok: boolean
 }
+
 export interface UpdateContractInfoOverrideArgs {
   chainID: string
   contractAddress: string
@@ -1082,6 +1160,7 @@ export interface UpdateContractInfoOverrideArgs {
 export interface UpdateContractInfoOverrideReturn {
   ok: boolean
 }
+
 export interface RemoveContractInfoOverrideArgs {
   chainID: string
   contractAddress: string
@@ -1090,6 +1169,7 @@ export interface RemoveContractInfoOverrideArgs {
 export interface RemoveContractInfoOverrideReturn {
   ok: boolean
 }
+
 export interface IsInTokenDirectoryArgs {
   chainID: string
   contractAddress: string
@@ -1099,6 +1179,7 @@ export interface IsInTokenDirectoryReturn {
   ok: boolean
   featureIndex: number
 }
+
 export interface SetTokenDirectoryFeatureIndexArgs {
   chainID: string
   contractAddress: string
@@ -1108,6 +1189,7 @@ export interface SetTokenDirectoryFeatureIndexArgs {
 export interface SetTokenDirectoryFeatureIndexReturn {
   ok: boolean
 }
+
 export interface AddContractToTokenDirectoryArgs {
   chainID: string
   contractAddress: string
@@ -1116,6 +1198,7 @@ export interface AddContractToTokenDirectoryArgs {
 export interface AddContractToTokenDirectoryReturn {
   ok: boolean
 }
+
 export interface RemoveContractFromTokenDirectoryArgs {
   chainID: string
   contractAddress: string
@@ -1124,6 +1207,7 @@ export interface RemoveContractFromTokenDirectoryArgs {
 export interface RemoveContractFromTokenDirectoryReturn {
   ok: boolean
 }
+
 export interface RefreshTokenDirectoryArgs {}
 
 export interface RefreshTokenDirectoryReturn {
@@ -1133,7 +1217,8 @@ export interface RefreshTokenDirectoryReturn {
 //
 // Client
 //
-export class Metadata implements Metadata {
+
+export class Metadata implements MetadataClient {
   protected hostname: string
   protected fetch: Fetch
   protected path = '/rpc/Metadata/'
@@ -1147,457 +1232,563 @@ export class Metadata implements Metadata {
     return this.hostname + this.path + name
   }
 
+  queryKey = {
+    ping: () => ['Metadata', 'ping'] as const,
+    version: () => ['Metadata', 'version'] as const,
+    runtimeStatus: () => ['Metadata', 'runtimeStatus'] as const,
+    getTask: (req: GetTaskArgs) => ['Metadata', 'getTask', req] as const,
+    getTaskStatus: (req: GetTaskStatusArgs) => ['Metadata', 'getTaskStatus', req] as const,
+    getContractInfo: (req: GetContractInfoArgs) => ['Metadata', 'getContractInfo', req] as const,
+    getContractInfoBatch: (req: GetContractInfoBatchArgs) => ['Metadata', 'getContractInfoBatch', req] as const,
+    findContractInfo: (req: FindContractInfoArgs) => ['Metadata', 'findContractInfo', req] as const,
+    findContractInfoBatch: (req: FindContractInfoBatchArgs) => ['Metadata', 'findContractInfoBatch', req] as const,
+    refreshContractInfo: (req: RefreshContractInfoArgs) => ['Metadata', 'refreshContractInfo', req] as const,
+    refreshContractInfoBatch: (req: RefreshContractInfoBatchArgs) =>
+      ['Metadata', 'refreshContractInfoBatch', req] as const,
+    searchContractsByQuery: (req: SearchContractsByQueryArgs) => ['Metadata', 'searchContractsByQuery', req] as const,
+    getTokenMetadata: (req: GetTokenMetadataArgs) => ['Metadata', 'getTokenMetadata', req] as const,
+    getTokenMetadataBatch: (req: GetTokenMetadataBatchArgs) => ['Metadata', 'getTokenMetadataBatch', req] as const,
+    refreshTokenMetadata: (req: RefreshTokenMetadataArgs) => ['Metadata', 'refreshTokenMetadata', req] as const,
+    searchTokenMetadataByQuery: (req: SearchTokenMetadataByQueryArgs) =>
+      ['Metadata', 'searchTokenMetadataByQuery', req] as const,
+    searchTokenMetadata: (req: SearchTokenMetadataArgs) => ['Metadata', 'searchTokenMetadata', req] as const,
+    searchTokenMetadataTokenIDs: (req: SearchTokenMetadataTokenIDsArgs) =>
+      ['Metadata', 'searchTokenMetadataTokenIDs', req] as const,
+    getTokenMetadataPropertyFilters: (req: GetTokenMetadataPropertyFiltersArgs) =>
+      ['Metadata', 'getTokenMetadataPropertyFilters', req] as const,
+    getTokenDirectoryNetworks: (req: GetTokenDirectoryNetworksArgs) =>
+      ['Metadata', 'getTokenDirectoryNetworks', req] as const,
+    getTokenDirectory: (req: GetTokenDirectoryArgs) => ['Metadata', 'getTokenDirectory', req] as const,
+    searchTokenDirectory: (req: SearchTokenDirectoryArgs) => ['Metadata', 'searchTokenDirectory', req] as const,
+    getNiftyswapTokenQuantity: (req: GetNiftyswapTokenQuantityArgs) =>
+      ['Metadata', 'getNiftyswapTokenQuantity', req] as const,
+    getNiftyswapUnitPrices: (req: GetNiftyswapUnitPricesArgs) => ['Metadata', 'getNiftyswapUnitPrices', req] as const,
+    getNiftyswapUnitPricesWithQuantities: (req: GetNiftyswapUnitPricesWithQuantitiesArgs) =>
+      ['Metadata', 'getNiftyswapUnitPricesWithQuantities', 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
-          }
+    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)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   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
-          }
+    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)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   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
-          }
+    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)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  getTask = (args: GetTaskArgs, headers?: object, signal?: AbortSignal): Promise<GetTaskReturn> => {
-    return this.fetch(this.url('GetTask'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            task: <Task>_data.task
-          }
+  getTask = (req: GetTaskArgs, headers?: object, signal?: AbortSignal): Promise<GetTaskReturn> => {
+    return this.fetch(this.url('GetTask'), createHttpRequest(JsonEncode(req, 'GetTaskArgs'), headers, signal)).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetTaskReturn>(_data, 'GetTaskReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  getTaskStatus = (args: GetTaskStatusArgs, headers?: object, signal?: AbortSignal): Promise<GetTaskStatusReturn> => {
-    return this.fetch(this.url('GetTaskStatus'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            status: <TaskStatus>_data.status
-          }
+  getTaskStatus = (req: GetTaskStatusArgs, headers?: object, signal?: AbortSignal): Promise<GetTaskStatusReturn> => {
+    return this.fetch(
+      this.url('GetTaskStatus'),
+      createHttpRequest(JsonEncode(req, 'GetTaskStatusArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetTaskStatusReturn>(_data, 'GetTaskStatusReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  getContractInfo = (args: GetContractInfoArgs, headers?: object, signal?: AbortSignal): Promise<GetContractInfoReturn> => {
-    return this.fetch(this.url('GetContractInfo'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contractInfo: <ContractInfo>_data.contractInfo,
-            taskID: <number>_data.taskID
-          }
+  getContractInfo = (
+    req: GetContractInfoArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetContractInfoReturn> => {
+    return this.fetch(
+      this.url('GetContractInfo'),
+      createHttpRequest(JsonEncode(req, 'GetContractInfoArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetContractInfoReturn>(_data, 'GetContractInfoReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   getContractInfoBatch = (
-    args: GetContractInfoBatchArgs,
+    req: GetContractInfoBatchArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<GetContractInfoBatchReturn> => {
-    return this.fetch(this.url('GetContractInfoBatch'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contractInfoMap: <{ [key: string]: ContractInfo }>_data.contractInfoMap,
-            taskID: <number>_data.taskID
-          }
-        })
-      },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
+    return this.fetch(
+      this.url('GetContractInfoBatch'),
+      createHttpRequest(JsonEncode(req, 'GetContractInfoBatchArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetContractInfoBatchReturn>(_data, 'GetContractInfoBatchReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
+        })
+      },
     )
   }
 
-  findContractInfo = (args: FindContractInfoArgs, headers?: object, signal?: AbortSignal): Promise<FindContractInfoReturn> => {
-    return this.fetch(this.url('FindContractInfo'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contractInfoList: <Array<ContractInfo>>_data.contractInfoList
-          }
+  findContractInfo = (
+    req: FindContractInfoArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<FindContractInfoReturn> => {
+    return this.fetch(
+      this.url('FindContractInfo'),
+      createHttpRequest(JsonEncode(req, 'FindContractInfoArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<FindContractInfoReturn>(_data, 'FindContractInfoReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   findContractInfoBatch = (
-    args: FindContractInfoBatchArgs,
+    req: FindContractInfoBatchArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<FindContractInfoBatchReturn> => {
-    return this.fetch(this.url('FindContractInfoBatch'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contractInfoByChain: <{ [key: string]: Array<ContractInfo> }>_data.contractInfoByChain
-          }
+    return this.fetch(
+      this.url('FindContractInfoBatch'),
+      createHttpRequest(JsonEncode(req, 'FindContractInfoBatchArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<FindContractInfoBatchReturn>(_data, 'FindContractInfoBatchReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   refreshContractInfo = (
-    args: RefreshContractInfoArgs,
+    req: RefreshContractInfoArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<RefreshContractInfoReturn> => {
-    return this.fetch(this.url('RefreshContractInfo'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            taskID: <number>_data.taskID
-          }
+    return this.fetch(
+      this.url('RefreshContractInfo'),
+      createHttpRequest(JsonEncode(req, 'RefreshContractInfoArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<RefreshContractInfoReturn>(_data, 'RefreshContractInfoReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   refreshContractInfoBatch = (
-    args: RefreshContractInfoBatchArgs,
+    req: RefreshContractInfoBatchArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<RefreshContractInfoBatchReturn> => {
-    return this.fetch(this.url('RefreshContractInfoBatch'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            taskID: <number>_data.taskID
-          }
+    return this.fetch(
+      this.url('RefreshContractInfoBatch'),
+      createHttpRequest(JsonEncode(req, 'RefreshContractInfoBatchArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<RefreshContractInfoBatchReturn>(_data, 'RefreshContractInfoBatchReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   searchContractsByQuery = (
-    args: SearchContractsByQueryArgs,
+    req: SearchContractsByQueryArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<SearchContractsByQueryReturn> => {
-    return this.fetch(this.url('SearchContractsByQuery'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contractInfo: <Array<ContractInfo>>_data.contractInfo,
-            nextPage: <Page>_data.nextPage
-          }
-        })
-      },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
+    return this.fetch(
+      this.url('SearchContractsByQuery'),
+      createHttpRequest(JsonEncode(req, 'SearchContractsByQueryArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<SearchContractsByQueryReturn>(_data, 'SearchContractsByQueryReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
+        })
+      },
     )
   }
 
-  getTokenMetadata = (args: GetTokenMetadataArgs, headers?: object, signal?: AbortSignal): Promise<GetTokenMetadataReturn> => {
-    return this.fetch(this.url('GetTokenMetadata'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            tokenMetadata: <Array<TokenMetadata>>_data.tokenMetadata,
-            taskID: <number>_data.taskID
-          }
+  getTokenMetadata = (
+    req: GetTokenMetadataArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetTokenMetadataReturn> => {
+    return this.fetch(
+      this.url('GetTokenMetadata'),
+      createHttpRequest(JsonEncode(req, 'GetTokenMetadataArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetTokenMetadataReturn>(_data, 'GetTokenMetadataReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   getTokenMetadataBatch = (
-    args: GetTokenMetadataBatchArgs,
+    req: GetTokenMetadataBatchArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<GetTokenMetadataBatchReturn> => {
-    return this.fetch(this.url('GetTokenMetadataBatch'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contractTokenMetadata: <{ [key: string]: Array<TokenMetadata> }>_data.contractTokenMetadata,
-            taskID: <number>_data.taskID
-          }
-        })
-      },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
+    return this.fetch(
+      this.url('GetTokenMetadataBatch'),
+      createHttpRequest(JsonEncode(req, 'GetTokenMetadataBatchArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetTokenMetadataBatchReturn>(_data, 'GetTokenMetadataBatchReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
+        })
+      },
     )
   }
 
   refreshTokenMetadata = (
-    args: RefreshTokenMetadataArgs,
+    req: RefreshTokenMetadataArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<RefreshTokenMetadataReturn> => {
-    return this.fetch(this.url('RefreshTokenMetadata'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            taskID: <number>_data.taskID
-          }
+    return this.fetch(
+      this.url('RefreshTokenMetadata'),
+      createHttpRequest(JsonEncode(req, 'RefreshTokenMetadataArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<RefreshTokenMetadataReturn>(_data, 'RefreshTokenMetadataReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   searchTokenMetadataByQuery = (
-    args: SearchTokenMetadataByQueryArgs,
+    req: SearchTokenMetadataByQueryArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<SearchTokenMetadataByQueryReturn> => {
-    return this.fetch(this.url('SearchTokenMetadataByQuery'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            tokenMetadata: <Array<TokenMetadata>>_data.tokenMetadata,
-            nextPage: <Page>_data.nextPage
-          }
-        })
-      },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
+    return this.fetch(
+      this.url('SearchTokenMetadataByQuery'),
+      createHttpRequest(JsonEncode(req, 'SearchTokenMetadataByQueryArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<SearchTokenMetadataByQueryReturn>(_data, 'SearchTokenMetadataByQueryReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
+        })
+      },
     )
   }
 
   searchTokenMetadata = (
-    args: SearchTokenMetadataArgs,
+    req: SearchTokenMetadataArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<SearchTokenMetadataReturn> => {
-    return this.fetch(this.url('SearchTokenMetadata'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            page: <Page>_data.page,
-            tokenMetadata: <Array<TokenMetadata>>_data.tokenMetadata
-          }
-        })
-      },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
+    return this.fetch(
+      this.url('SearchTokenMetadata'),
+      createHttpRequest(JsonEncode(req, 'SearchTokenMetadataArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<SearchTokenMetadataReturn>(_data, 'SearchTokenMetadataReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
+        })
+      },
     )
   }
 
   searchTokenMetadataTokenIDs = (
-    args: SearchTokenMetadataTokenIDsArgs,
+    req: SearchTokenMetadataTokenIDsArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<SearchTokenMetadataTokenIDsReturn> => {
-    return this.fetch(this.url('SearchTokenMetadataTokenIDs'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            page: <Page>_data.page,
-            tokenIDs: <Array<string>>_data.tokenIDs
-          }
-        })
-      },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
+    return this.fetch(
+      this.url('SearchTokenMetadataTokenIDs'),
+      createHttpRequest(JsonEncode(req, 'SearchTokenMetadataTokenIDsArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<SearchTokenMetadataTokenIDsReturn>(_data, 'SearchTokenMetadataTokenIDsReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
+        })
+      },
     )
   }
 
   getTokenMetadataPropertyFilters = (
-    args: GetTokenMetadataPropertyFiltersArgs,
+    req: GetTokenMetadataPropertyFiltersArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<GetTokenMetadataPropertyFiltersReturn> => {
-    return this.fetch(this.url('GetTokenMetadataPropertyFilters'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            filters: <Array<PropertyFilter>>_data.filters
-          }
+    return this.fetch(
+      this.url('GetTokenMetadataPropertyFilters'),
+      createHttpRequest(JsonEncode(req, 'GetTokenMetadataPropertyFiltersArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetTokenMetadataPropertyFiltersReturn>(_data, 'GetTokenMetadataPropertyFiltersReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   getTokenDirectoryNetworks = (
-    args: GetTokenDirectoryNetworksArgs,
+    req: GetTokenDirectoryNetworksArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<GetTokenDirectoryNetworksReturn> => {
-    return this.fetch(this.url('GetTokenDirectoryNetworks'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            chainIDs: <Array<number>>_data.chainIDs,
-            networks: <Array<string>>_data.networks
-          }
-        })
-      },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
+    return this.fetch(
+      this.url('GetTokenDirectoryNetworks'),
+      createHttpRequest(JsonEncode(req, 'GetTokenDirectoryNetworksArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetTokenDirectoryNetworksReturn>(_data, 'GetTokenDirectoryNetworksReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
+        })
+      },
     )
   }
 
-  getTokenDirectory = (args: GetTokenDirectoryArgs, headers?: object, signal?: AbortSignal): Promise<GetTokenDirectoryReturn> => {
-    return this.fetch(this.url('GetTokenDirectory'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contracts: <Array<ContractInfo>>_data.contracts,
-            page: <Page>_data.page
-          }
+  getTokenDirectory = (
+    req: GetTokenDirectoryArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<GetTokenDirectoryReturn> => {
+    return this.fetch(
+      this.url('GetTokenDirectory'),
+      createHttpRequest(JsonEncode(req, 'GetTokenDirectoryArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetTokenDirectoryReturn>(_data, 'GetTokenDirectoryReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   searchTokenDirectory = (
-    args: SearchTokenDirectoryArgs,
+    req: SearchTokenDirectoryArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<SearchTokenDirectoryReturn> => {
-    return this.fetch(this.url('SearchTokenDirectory'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contracts: <Array<ContractInfo>>_data.contracts,
-            page: <Page>_data.page
-          }
-        })
-      },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
+    return this.fetch(
+      this.url('SearchTokenDirectory'),
+      createHttpRequest(JsonEncode(req, 'SearchTokenDirectoryArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<SearchTokenDirectoryReturn>(_data, 'SearchTokenDirectoryReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
+        })
+      },
     )
   }
 
   getNiftyswapTokenQuantity = (
-    args: GetNiftyswapTokenQuantityArgs,
+    req: GetNiftyswapTokenQuantityArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<GetNiftyswapTokenQuantityReturn> => {
-    return this.fetch(this.url('GetNiftyswapTokenQuantity'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            quantity: <{ [key: string]: string }>_data.quantity
-          }
+    return this.fetch(
+      this.url('GetNiftyswapTokenQuantity'),
+      createHttpRequest(JsonEncode(req, 'GetNiftyswapTokenQuantityArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetNiftyswapTokenQuantityReturn>(_data, 'GetNiftyswapTokenQuantityReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   getNiftyswapUnitPrices = (
-    args: GetNiftyswapUnitPricesArgs,
+    req: GetNiftyswapUnitPricesArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<GetNiftyswapUnitPricesReturn> => {
-    return this.fetch(this.url('GetNiftyswapUnitPrices'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            prices: <{ [key: string]: string }>_data.prices
-          }
+    return this.fetch(
+      this.url('GetNiftyswapUnitPrices'),
+      createHttpRequest(JsonEncode(req, 'GetNiftyswapUnitPricesArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetNiftyswapUnitPricesReturn>(_data, 'GetNiftyswapUnitPricesReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   getNiftyswapUnitPricesWithQuantities = (
-    args: GetNiftyswapUnitPricesWithQuantitiesArgs,
+    req: GetNiftyswapUnitPricesWithQuantitiesArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<GetNiftyswapUnitPricesWithQuantitiesReturn> => {
-    return this.fetch(this.url('GetNiftyswapUnitPricesWithQuantities'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            prices: <{ [key: string]: GetNiftyswapUnitPricesResponse }>_data.prices
-          }
+    return this.fetch(
+      this.url('GetNiftyswapUnitPricesWithQuantities'),
+      createHttpRequest(JsonEncode(req, 'GetNiftyswapUnitPricesWithQuantitiesArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetNiftyswapUnitPricesWithQuantitiesReturn>(
+            _data,
+            'GetNiftyswapUnitPricesWithQuantitiesReturn',
+          )
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 }
-export class Collections implements Collections {
+export class Collections implements CollectionsClient {
   protected hostname: string
   protected fetch: Fetch
   protected path = '/rpc/Collections/'
@@ -1611,352 +1802,451 @@ export class Collections implements Collections {
     return this.hostname + this.path + name
   }
 
-  createCollection = (args: CreateCollectionArgs, headers?: object, signal?: AbortSignal): Promise<CreateCollectionReturn> => {
-    return this.fetch(this.url('CreateCollection'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            collection: <Collection>_data.collection
-          }
+  queryKey = {
+    createCollection: (req: CreateCollectionArgs) => ['Collections', 'createCollection', req] as const,
+    getCollection: (req: GetCollectionArgs) => ['Collections', 'getCollection', req] as const,
+    listCollections: (req: ListCollectionsArgs) => ['Collections', 'listCollections', req] as const,
+    updateCollection: (req: UpdateCollectionArgs) => ['Collections', 'updateCollection', req] as const,
+    deleteCollection: (req: DeleteCollectionArgs) => ['Collections', 'deleteCollection', req] as const,
+    publishCollection: (req: PublishCollectionArgs) => ['Collections', 'publishCollection', req] as const,
+    unpublishCollection: (req: UnpublishCollectionArgs) => ['Collections', 'unpublishCollection', req] as const,
+    createContractCollection: (req: CreateContractCollectionArgs) =>
+      ['Collections', 'createContractCollection', req] as const,
+    getContractCollection: (req: GetContractCollectionArgs) => ['Collections', 'getContractCollection', req] as const,
+    listContractCollections: (req: ListContractCollectionsArgs) =>
+      ['Collections', 'listContractCollections', req] as const,
+    updateContractCollection: (req: UpdateContractCollectionArgs) =>
+      ['Collections', 'updateContractCollection', req] as const,
+    deleteContractCollection: (req: DeleteContractCollectionArgs) =>
+      ['Collections', 'deleteContractCollection', req] as const,
+    createToken: (req: CreateTokenArgs) => ['Collections', 'createToken', req] as const,
+    getToken: (req: GetTokenArgs) => ['Collections', 'getToken', req] as const,
+    listTokens: (req: ListTokensArgs) => ['Collections', 'listTokens', req] as const,
+    updateToken: (req: UpdateTokenArgs) => ['Collections', 'updateToken', req] as const,
+    deleteToken: (req: DeleteTokenArgs) => ['Collections', 'deleteToken', req] as const,
+    createAsset: (req: CreateAssetArgs) => ['Collections', 'createAsset', req] as const,
+    getAsset: (req: GetAssetArgs) => ['Collections', 'getAsset', req] as const,
+    updateAsset: (req: UpdateAssetArgs) => ['Collections', 'updateAsset', req] as const,
+    deleteAsset: (req: DeleteAssetArgs) => ['Collections', 'deleteAsset', req] as const,
+  }
+
+  createCollection = (
+    req: CreateCollectionArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<CreateCollectionReturn> => {
+    return this.fetch(
+      this.url('CreateCollection'),
+      createHttpRequest(JsonEncode(req, 'CreateCollectionArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<CreateCollectionReturn>(_data, 'CreateCollectionReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  getCollection = (args: GetCollectionArgs, headers?: object, signal?: AbortSignal): Promise<GetCollectionReturn> => {
-    return this.fetch(this.url('GetCollection'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            collection: <Collection>_data.collection
-          }
+  getCollection = (req: GetCollectionArgs, headers?: object, signal?: AbortSignal): Promise<GetCollectionReturn> => {
+    return this.fetch(
+      this.url('GetCollection'),
+      createHttpRequest(JsonEncode(req, 'GetCollectionArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetCollectionReturn>(_data, 'GetCollectionReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  listCollections = (args: ListCollectionsArgs, headers?: object, signal?: AbortSignal): Promise<ListCollectionsReturn> => {
-    return this.fetch(this.url('ListCollections'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            page: <Page>_data.page,
-            collections: <Array<Collection>>_data.collections
-          }
+  listCollections = (
+    req: ListCollectionsArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<ListCollectionsReturn> => {
+    return this.fetch(
+      this.url('ListCollections'),
+      createHttpRequest(JsonEncode(req, 'ListCollectionsArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<ListCollectionsReturn>(_data, 'ListCollectionsReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  updateCollection = (args: UpdateCollectionArgs, headers?: object, signal?: AbortSignal): Promise<UpdateCollectionReturn> => {
-    return this.fetch(this.url('UpdateCollection'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            collection: <Collection>_data.collection
-          }
+  updateCollection = (
+    req: UpdateCollectionArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<UpdateCollectionReturn> => {
+    return this.fetch(
+      this.url('UpdateCollection'),
+      createHttpRequest(JsonEncode(req, 'UpdateCollectionArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<UpdateCollectionReturn>(_data, 'UpdateCollectionReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  deleteCollection = (args: DeleteCollectionArgs, headers?: object, signal?: AbortSignal): Promise<DeleteCollectionReturn> => {
-    return this.fetch(this.url('DeleteCollection'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            status: <boolean>_data.status
-          }
+  deleteCollection = (
+    req: DeleteCollectionArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<DeleteCollectionReturn> => {
+    return this.fetch(
+      this.url('DeleteCollection'),
+      createHttpRequest(JsonEncode(req, 'DeleteCollectionArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<DeleteCollectionReturn>(_data, 'DeleteCollectionReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  publishCollection = (args: PublishCollectionArgs, headers?: object, signal?: AbortSignal): Promise<PublishCollectionReturn> => {
-    return this.fetch(this.url('PublishCollection'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            collection: <Collection>_data.collection
-          }
+  publishCollection = (
+    req: PublishCollectionArgs,
+    headers?: object,
+    signal?: AbortSignal,
+  ): Promise<PublishCollectionReturn> => {
+    return this.fetch(
+      this.url('PublishCollection'),
+      createHttpRequest(JsonEncode(req, 'PublishCollectionArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<PublishCollectionReturn>(_data, 'PublishCollectionReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   unpublishCollection = (
-    args: UnpublishCollectionArgs,
+    req: UnpublishCollectionArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<UnpublishCollectionReturn> => {
-    return this.fetch(this.url('UnpublishCollection'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            collection: <Collection>_data.collection
-          }
+    return this.fetch(
+      this.url('UnpublishCollection'),
+      createHttpRequest(JsonEncode(req, 'UnpublishCollectionArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<UnpublishCollectionReturn>(_data, 'UnpublishCollectionReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   createContractCollection = (
-    args: CreateContractCollectionArgs,
+    req: CreateContractCollectionArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<CreateContractCollectionReturn> => {
-    return this.fetch(this.url('CreateContractCollection'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contractCollection: <ContractCollection>_data.contractCollection
-          }
+    return this.fetch(
+      this.url('CreateContractCollection'),
+      createHttpRequest(JsonEncode(req, 'CreateContractCollectionArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<CreateContractCollectionReturn>(_data, 'CreateContractCollectionReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   getContractCollection = (
-    args: GetContractCollectionArgs,
+    req: GetContractCollectionArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<GetContractCollectionReturn> => {
-    return this.fetch(this.url('GetContractCollection'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contractCollection: <ContractCollection>_data.contractCollection
-          }
+    return this.fetch(
+      this.url('GetContractCollection'),
+      createHttpRequest(JsonEncode(req, 'GetContractCollectionArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetContractCollectionReturn>(_data, 'GetContractCollectionReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   listContractCollections = (
-    args: ListContractCollectionsArgs,
+    req: ListContractCollectionsArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<ListContractCollectionsReturn> => {
-    return this.fetch(this.url('ListContractCollections'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contractCollections: <Array<ContractCollection>>_data.contractCollections,
-            collections: <Array<Collection>>_data.collections,
-            page: <Page>_data.page
-          }
-        })
-      },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
+    return this.fetch(
+      this.url('ListContractCollections'),
+      createHttpRequest(JsonEncode(req, 'ListContractCollectionsArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<ListContractCollectionsReturn>(_data, 'ListContractCollectionsReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
+        })
+      },
     )
   }
 
   updateContractCollection = (
-    args: UpdateContractCollectionArgs,
+    req: UpdateContractCollectionArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<UpdateContractCollectionReturn> => {
-    return this.fetch(this.url('UpdateContractCollection'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            ok: <boolean>_data.ok
-          }
+    return this.fetch(
+      this.url('UpdateContractCollection'),
+      createHttpRequest(JsonEncode(req, 'UpdateContractCollectionArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<UpdateContractCollectionReturn>(_data, 'UpdateContractCollectionReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   deleteContractCollection = (
-    args: DeleteContractCollectionArgs,
+    req: DeleteContractCollectionArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<DeleteContractCollectionReturn> => {
-    return this.fetch(this.url('DeleteContractCollection'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            ok: <boolean>_data.ok
-          }
+    return this.fetch(
+      this.url('DeleteContractCollection'),
+      createHttpRequest(JsonEncode(req, 'DeleteContractCollectionArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<DeleteContractCollectionReturn>(_data, 'DeleteContractCollectionReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  createToken = (args: CreateTokenArgs, headers?: object, signal?: AbortSignal): Promise<CreateTokenReturn> => {
-    return this.fetch(this.url('CreateToken'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            token: <TokenMetadata>_data.token,
-            assets: <Array<Asset>>_data.assets
-          }
+  createToken = (req: CreateTokenArgs, headers?: object, signal?: AbortSignal): Promise<CreateTokenReturn> => {
+    return this.fetch(
+      this.url('CreateToken'),
+      createHttpRequest(JsonEncode(req, 'CreateTokenArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<CreateTokenReturn>(_data, 'CreateTokenReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  getToken = (args: GetTokenArgs, headers?: object, signal?: AbortSignal): Promise<GetTokenReturn> => {
-    return this.fetch(this.url('GetToken'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            token: <TokenMetadata>_data.token,
-            assets: <Array<Asset>>_data.assets
-          }
+  getToken = (req: GetTokenArgs, headers?: object, signal?: AbortSignal): Promise<GetTokenReturn> => {
+    return this.fetch(this.url('GetToken'), createHttpRequest(JsonEncode(req, 'GetTokenArgs'), headers, signal)).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetTokenReturn>(_data, 'GetTokenReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  listTokens = (args: ListTokensArgs, headers?: object, signal?: AbortSignal): Promise<ListTokensReturn> => {
-    return this.fetch(this.url('ListTokens'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            page: <Page>_data.page,
-            tokens: <Array<TokenMetadata>>_data.tokens
-          }
+  listTokens = (req: ListTokensArgs, headers?: object, signal?: AbortSignal): Promise<ListTokensReturn> => {
+    return this.fetch(
+      this.url('ListTokens'),
+      createHttpRequest(JsonEncode(req, 'ListTokensArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<ListTokensReturn>(_data, 'ListTokensReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  updateToken = (args: UpdateTokenArgs, headers?: object, signal?: AbortSignal): Promise<UpdateTokenReturn> => {
-    return this.fetch(this.url('UpdateToken'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            token: <TokenMetadata>_data.token
-          }
+  updateToken = (req: UpdateTokenArgs, headers?: object, signal?: AbortSignal): Promise<UpdateTokenReturn> => {
+    return this.fetch(
+      this.url('UpdateToken'),
+      createHttpRequest(JsonEncode(req, 'UpdateTokenArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<UpdateTokenReturn>(_data, 'UpdateTokenReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  deleteToken = (args: DeleteTokenArgs, headers?: object, signal?: AbortSignal): Promise<DeleteTokenReturn> => {
-    return this.fetch(this.url('DeleteToken'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            status: <boolean>_data.status
-          }
+  deleteToken = (req: DeleteTokenArgs, headers?: object, signal?: AbortSignal): Promise<DeleteTokenReturn> => {
+    return this.fetch(
+      this.url('DeleteToken'),
+      createHttpRequest(JsonEncode(req, 'DeleteTokenArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<DeleteTokenReturn>(_data, 'DeleteTokenReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  createAsset = (args: CreateAssetArgs, headers?: object, signal?: AbortSignal): Promise<CreateAssetReturn> => {
-    return this.fetch(this.url('CreateAsset'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            asset: <Asset>_data.asset
-          }
+  createAsset = (req: CreateAssetArgs, headers?: object, signal?: AbortSignal): Promise<CreateAssetReturn> => {
+    return this.fetch(
+      this.url('CreateAsset'),
+      createHttpRequest(JsonEncode(req, 'CreateAssetArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<CreateAssetReturn>(_data, 'CreateAssetReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  getAsset = (args: GetAssetArgs, headers?: object, signal?: AbortSignal): Promise<GetAssetReturn> => {
-    return this.fetch(this.url('GetAsset'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            asset: <Asset>_data.asset
-          }
+  getAsset = (req: GetAssetArgs, headers?: object, signal?: AbortSignal): Promise<GetAssetReturn> => {
+    return this.fetch(this.url('GetAsset'), createHttpRequest(JsonEncode(req, 'GetAssetArgs'), headers, signal)).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetAssetReturn>(_data, 'GetAssetReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  updateAsset = (args: UpdateAssetArgs, headers?: object, signal?: AbortSignal): Promise<UpdateAssetReturn> => {
-    return this.fetch(this.url('UpdateAsset'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            asset: <Asset>_data.asset
-          }
+  updateAsset = (req: UpdateAssetArgs, headers?: object, signal?: AbortSignal): Promise<UpdateAssetReturn> => {
+    return this.fetch(
+      this.url('UpdateAsset'),
+      createHttpRequest(JsonEncode(req, 'UpdateAssetArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<UpdateAssetReturn>(_data, 'UpdateAssetReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
-  deleteAsset = (args: DeleteAssetArgs, headers?: object, signal?: AbortSignal): Promise<DeleteAssetReturn> => {
-    return this.fetch(this.url('DeleteAsset'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            status: <boolean>_data.status
-          }
+  deleteAsset = (req: DeleteAssetArgs, headers?: object, signal?: AbortSignal): Promise<DeleteAssetReturn> => {
+    return this.fetch(
+      this.url('DeleteAsset'),
+      createHttpRequest(JsonEncode(req, 'DeleteAssetArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<DeleteAssetReturn>(_data, 'DeleteAssetReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 }
-export class Admin implements Admin {
+export class Admin implements AdminClient {
   protected hostname: string
   protected fetch: Fetch
   protected path = '/rpc/Admin/'
@@ -1970,258 +2260,305 @@ export class Admin implements Admin {
     return this.hostname + this.path + name
   }
 
+  queryKey = {
+    refreshContractInfoUpdatedBefore: (req: RefreshContractInfoUpdatedBeforeArgs) =>
+      ['Admin', 'refreshContractInfoUpdatedBefore', req] as const,
+    refreshTokenMetadataUpdatedBefore: (req: RefreshTokenMetadataUpdatedBeforeArgs) =>
+      ['Admin', 'refreshTokenMetadataUpdatedBefore', req] as const,
+    getContractInfoOverride: (req: GetContractInfoOverrideArgs) => ['Admin', 'getContractInfoOverride', req] as const,
+    getContractInfoOverrides: (req: GetContractInfoOverridesArgs) =>
+      ['Admin', 'getContractInfoOverrides', req] as const,
+    addContractInfoOverride: (req: AddContractInfoOverrideArgs) => ['Admin', 'addContractInfoOverride', req] as const,
+    updateContractInfoOverride: (req: UpdateContractInfoOverrideArgs) =>
+      ['Admin', 'updateContractInfoOverride', req] as const,
+    removeContractInfoOverride: (req: RemoveContractInfoOverrideArgs) =>
+      ['Admin', 'removeContractInfoOverride', req] as const,
+    isInTokenDirectory: (req: IsInTokenDirectoryArgs) => ['Admin', 'isInTokenDirectory', req] as const,
+    setTokenDirectoryFeatureIndex: (req: SetTokenDirectoryFeatureIndexArgs) =>
+      ['Admin', 'setTokenDirectoryFeatureIndex', req] as const,
+    addContractToTokenDirectory: (req: AddContractToTokenDirectoryArgs) =>
+      ['Admin', 'addContractToTokenDirectory', req] as const,
+    removeContractFromTokenDirectory: (req: RemoveContractFromTokenDirectoryArgs) =>
+      ['Admin', 'removeContractFromTokenDirectory', req] as const,
+    refreshTokenDirectory: () => ['Admin', 'refreshTokenDirectory'] as const,
+  }
+
   refreshContractInfoUpdatedBefore = (
-    args: RefreshContractInfoUpdatedBeforeArgs,
+    req: RefreshContractInfoUpdatedBeforeArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<RefreshContractInfoUpdatedBeforeReturn> => {
-    return this.fetch(this.url('RefreshContractInfoUpdatedBefore'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            taskIDs: <Array<number>>_data.taskIDs
-          }
+    return this.fetch(
+      this.url('RefreshContractInfoUpdatedBefore'),
+      createHttpRequest(JsonEncode(req, 'RefreshContractInfoUpdatedBeforeArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<RefreshContractInfoUpdatedBeforeReturn>(_data, 'RefreshContractInfoUpdatedBeforeReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   refreshTokenMetadataUpdatedBefore = (
-    args: RefreshTokenMetadataUpdatedBeforeArgs,
+    req: RefreshTokenMetadataUpdatedBeforeArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<RefreshTokenMetadataUpdatedBeforeReturn> => {
-    return this.fetch(this.url('RefreshTokenMetadataUpdatedBefore'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            taskIDs: <Array<number>>_data.taskIDs
-          }
+    return this.fetch(
+      this.url('RefreshTokenMetadataUpdatedBefore'),
+      createHttpRequest(JsonEncode(req, 'RefreshTokenMetadataUpdatedBeforeArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<RefreshTokenMetadataUpdatedBeforeReturn>(_data, 'RefreshTokenMetadataUpdatedBeforeReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   getContractInfoOverride = (
-    args: GetContractInfoOverrideArgs,
+    req: GetContractInfoOverrideArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<GetContractInfoOverrideReturn> => {
-    return this.fetch(this.url('GetContractInfoOverride'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contractInfoOverride: <ContractInfoOverride>_data.contractInfoOverride
-          }
+    return this.fetch(
+      this.url('GetContractInfoOverride'),
+      createHttpRequest(JsonEncode(req, 'GetContractInfoOverrideArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetContractInfoOverrideReturn>(_data, 'GetContractInfoOverrideReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   getContractInfoOverrides = (
-    args: GetContractInfoOverridesArgs,
+    req: GetContractInfoOverridesArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<GetContractInfoOverridesReturn> => {
-    return this.fetch(this.url('GetContractInfoOverrides'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            contractInfoOverrides: <Array<ContractInfoOverride>>_data.contractInfoOverrides,
-            page: <Page>_data.page
-          }
-        })
-      },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
+    return this.fetch(
+      this.url('GetContractInfoOverrides'),
+      createHttpRequest(JsonEncode(req, 'GetContractInfoOverridesArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<GetContractInfoOverridesReturn>(_data, 'GetContractInfoOverridesReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
+        })
+      },
     )
   }
 
   addContractInfoOverride = (
-    args: AddContractInfoOverrideArgs,
+    req: AddContractInfoOverrideArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<AddContractInfoOverrideReturn> => {
-    return this.fetch(this.url('AddContractInfoOverride'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            ok: <boolean>_data.ok
-          }
+    return this.fetch(
+      this.url('AddContractInfoOverride'),
+      createHttpRequest(JsonEncode(req, 'AddContractInfoOverrideArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<AddContractInfoOverrideReturn>(_data, 'AddContractInfoOverrideReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   updateContractInfoOverride = (
-    args: UpdateContractInfoOverrideArgs,
+    req: UpdateContractInfoOverrideArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<UpdateContractInfoOverrideReturn> => {
-    return this.fetch(this.url('UpdateContractInfoOverride'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            ok: <boolean>_data.ok
-          }
+    return this.fetch(
+      this.url('UpdateContractInfoOverride'),
+      createHttpRequest(JsonEncode(req, 'UpdateContractInfoOverrideArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<UpdateContractInfoOverrideReturn>(_data, 'UpdateContractInfoOverrideReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   removeContractInfoOverride = (
-    args: RemoveContractInfoOverrideArgs,
+    req: RemoveContractInfoOverrideArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<RemoveContractInfoOverrideReturn> => {
-    return this.fetch(this.url('RemoveContractInfoOverride'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            ok: <boolean>_data.ok
-          }
+    return this.fetch(
+      this.url('RemoveContractInfoOverride'),
+      createHttpRequest(JsonEncode(req, 'RemoveContractInfoOverrideArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<RemoveContractInfoOverrideReturn>(_data, 'RemoveContractInfoOverrideReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   isInTokenDirectory = (
-    args: IsInTokenDirectoryArgs,
+    req: IsInTokenDirectoryArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<IsInTokenDirectoryReturn> => {
-    return this.fetch(this.url('IsInTokenDirectory'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            ok: <boolean>_data.ok,
-            featureIndex: <number>_data.featureIndex
-          }
-        })
-      },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
+    return this.fetch(
+      this.url('IsInTokenDirectory'),
+      createHttpRequest(JsonEncode(req, 'IsInTokenDirectoryArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<IsInTokenDirectoryReturn>(_data, 'IsInTokenDirectoryReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
+        })
+      },
     )
   }
 
   setTokenDirectoryFeatureIndex = (
-    args: SetTokenDirectoryFeatureIndexArgs,
+    req: SetTokenDirectoryFeatureIndexArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<SetTokenDirectoryFeatureIndexReturn> => {
-    return this.fetch(this.url('SetTokenDirectoryFeatureIndex'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            ok: <boolean>_data.ok
-          }
+    return this.fetch(
+      this.url('SetTokenDirectoryFeatureIndex'),
+      createHttpRequest(JsonEncode(req, 'SetTokenDirectoryFeatureIndexArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<SetTokenDirectoryFeatureIndexReturn>(_data, 'SetTokenDirectoryFeatureIndexReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   addContractToTokenDirectory = (
-    args: AddContractToTokenDirectoryArgs,
+    req: AddContractToTokenDirectoryArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<AddContractToTokenDirectoryReturn> => {
-    return this.fetch(this.url('AddContractToTokenDirectory'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            ok: <boolean>_data.ok
-          }
+    return this.fetch(
+      this.url('AddContractToTokenDirectory'),
+      createHttpRequest(JsonEncode(req, 'AddContractToTokenDirectoryArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<AddContractToTokenDirectoryReturn>(_data, 'AddContractToTokenDirectoryReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   removeContractFromTokenDirectory = (
-    args: RemoveContractFromTokenDirectoryArgs,
+    req: RemoveContractFromTokenDirectoryArgs,
     headers?: object,
-    signal?: AbortSignal
+    signal?: AbortSignal,
   ): Promise<RemoveContractFromTokenDirectoryReturn> => {
-    return this.fetch(this.url('RemoveContractFromTokenDirectory'), createHTTPRequest(args, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            ok: <boolean>_data.ok
-          }
+    return this.fetch(
+      this.url('RemoveContractFromTokenDirectory'),
+      createHttpRequest(JsonEncode(req, 'RemoveContractFromTokenDirectoryArgs'), headers, signal),
+    ).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<RemoveContractFromTokenDirectoryReturn>(_data, 'RemoveContractFromTokenDirectoryReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 
   refreshTokenDirectory = (headers?: object, signal?: AbortSignal): Promise<RefreshTokenDirectoryReturn> => {
-    return this.fetch(this.url('RefreshTokenDirectory'), createHTTPRequest({}, headers, signal)).then(
-      res => {
-        return buildResponse(res).then(_data => {
-          return {
-            taskID: <number>_data.taskID
-          }
+    return this.fetch(this.url('RefreshTokenDirectory'), createHttpRequest('{}', headers, signal)).then(
+      (res) => {
+        return buildResponse(res).then((_data) => {
+          return JsonDecode<RefreshTokenDirectoryReturn>(_data, 'RefreshTokenDirectoryReturn')
+        })
+      },
+      (error) => {
+        throw WebrpcRequestFailedError.new({
+          cause: `fetch(): ${error instanceof Error ? error.message : String(error)}`,
         })
       },
-      error => {
-        throw WebrpcRequestFailedError.new({ cause: `fetch(): ${error.message || ''}` })
-      }
     )
   }
 }
 
-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',
+    [WebrpcHeader]: WebrpcHeaderValue,
   }
+  return { method: 'POST', headers: reqHeaders, body, signal }
 }
 
 const buildResponse = (res: Response): Promise<any> => {
-  return res.text().then(text => {
+  return res.text().then((text) => {
     let data
     try {
       data = JSON.parse(text)
     } catch (error) {
-      let message = ''
-      if (error instanceof Error) {
-        message = error.message
-      }
       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) {
@@ -2232,426 +2569,409 @@ const buildResponse = (res: Response): Promise<any> => {
   })
 }
 
+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 FailError extends WebrpcError {
-  constructor(
-    name: string = 'Fail',
-    code: number = 1005,
-    message: string = `Request Failed`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'Fail'
+    this.code = typeof error.code === 'number' ? error.code : 1005
+    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, FailError.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 TaskFailedError extends WebrpcError {
-  constructor(
-    name: string = 'TaskFailed',
-    code: number = 1007,
-    message: string = `Task failed`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'TaskFailed'
+    this.code = typeof error.code === 'number' ? error.code : 1007
+    this.message = error.message || `Task failed`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, TaskFailedError.prototype)
   }
 }
 
 export class DeprecatedError extends WebrpcError {
-  constructor(
-    name: string = 'Deprecated',
-    code: number = 1008,
-    message: string = `RPC method is deprecated`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'Deprecated'
+    this.code = typeof error.code === 'number' ? error.code : 1008
+    this.message = error.message || `RPC method is deprecated`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, DeprecatedError.prototype)
   }
 }
 
 export class TimeoutError extends WebrpcError {
-  constructor(
-    name: string = 'Timeout',
-    code: number = 2000,
-    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 : 2000
+    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 RequiredArgumentError extends WebrpcError {
-  constructor(
-    name: string = 'RequiredArgument',
-    code: number = 2002,
-    message: string = `Required argument missing`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'RequiredArgument'
+    this.code = typeof error.code === 'number' ? error.code : 2002
+    this.message = error.message || `Required argument missing`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, RequiredArgumentError.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 ValidationFailedError extends WebrpcError {
-  constructor(
-    name: string = 'ValidationFailed',
-    code: number = 2004,
-    message: string = `Validation failed`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'ValidationFailed'
+    this.code = typeof error.code === 'number' ? error.code : 2004
+    this.message = error.message || `Validation failed`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, ValidationFailedError.prototype)
   }
 }
 
 export class RateLimitedError extends WebrpcError {
-  constructor(
-    name: string = 'RateLimited',
-    code: number = 2005,
-    message: string = `Rate limited`,
-    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 : 2005
+    this.message = error.message || `Rate limited`
+    this.status = typeof error.status === 'number' ? error.status : 429
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, RateLimitedError.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 ProjectNotFoundError extends WebrpcError {
-  constructor(
-    name: string = 'ProjectNotFound',
-    code: number = 3002,
-    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 : 3002
+    this.message = error.message || `Project not found`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, ProjectNotFoundError.prototype)
   }
 }
 
 export class ChainNotFoundError extends WebrpcError {
-  constructor(
-    name: string = 'ChainNotFound',
-    code: number = 3003,
-    message: string = `Chain not found`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'ChainNotFound'
+    this.code = typeof error.code === 'number' ? error.code : 3003
+    this.message = error.message || `Chain not found`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, ChainNotFoundError.prototype)
   }
 }
 
 export class TokenDirectoryDisabledError extends WebrpcError {
-  constructor(
-    name: string = 'TokenDirectoryDisabled',
-    code: number = 4001,
-    message: string = `Token Directory is disabled`,
-    status: number = 0,
-    cause?: string
-  ) {
-    super(name, code, message, status, cause)
+  constructor(error: WebrpcErrorParams = {}) {
+    super(error)
+    this.name = error.name || 'TokenDirectoryDisabled'
+    this.code = typeof error.code === 'number' ? error.code : 4001
+    this.message = error.message || `Token Directory is disabled`
+    this.status = typeof error.status === 'number' ? error.status : 400
+    if (error.cause !== undefined) this.cause = error.cause
     Object.setPrototypeOf(this, TokenDirectoryDisabledError.prototype)
   }
 }
@@ -2665,7 +2985,7 @@ export enum errors {
   WebrpcBadResponse = 'WebrpcBadResponse',
   WebrpcServerPanic = 'WebrpcServerPanic',
   WebrpcInternalError = 'WebrpcInternalError',
-  WebrpcClientDisconnected = 'WebrpcClientDisconnected',
+  WebrpcClientAborted = 'WebrpcClientAborted',
   WebrpcStreamLost = 'WebrpcStreamLost',
   WebrpcStreamFinished = 'WebrpcStreamFinished',
   Unauthorized = 'Unauthorized',
@@ -2686,7 +3006,7 @@ export enum errors {
   NotFound = 'NotFound',
   ProjectNotFound = 'ProjectNotFound',
   ChainNotFound = 'ChainNotFound',
-  TokenDirectoryDisabled = 'TokenDirectoryDisabled'
+  TokenDirectoryDisabled = 'TokenDirectoryDisabled',
 }
 
 export enum WebrpcErrorCodes {
@@ -2698,7 +3018,7 @@ export enum WebrpcErrorCodes {
   WebrpcBadResponse = -5,
   WebrpcServerPanic = -6,
   WebrpcInternalError = -7,
-  WebrpcClientDisconnected = -8,
+  WebrpcClientAborted = -8,
   WebrpcStreamLost = -9,
   WebrpcStreamFinished = -10,
   Unauthorized = 1000,
@@ -2719,7 +3039,7 @@ export enum WebrpcErrorCodes {
   NotFound = 3000,
   ProjectNotFound = 3002,
   ChainNotFound = 3003,
-  TokenDirectoryDisabled = 4001
+  TokenDirectoryDisabled = 4001,
 }
 
 export const webrpcErrorByCode: { [code: number]: any } = {
@@ -2731,7 +3051,7 @@ export const webrpcErrorByCode: { [code: number]: any } = {
   [-5]: WebrpcBadResponseError,
   [-6]: WebrpcServerPanicError,
   [-7]: WebrpcInternalErrorError,
-  [-8]: WebrpcClientDisconnectedError,
+  [-8]: WebrpcClientAbortedError,
   [-9]: WebrpcStreamLostError,
   [-10]: WebrpcStreamFinishedError,
   [1000]: UnauthorizedError,
@@ -2752,7 +3072,61 @@ export const webrpcErrorByCode: { [code: number]: any } = {
   [3000]: NotFoundError,
   [3002]: ProjectNotFoundError,
   [3003]: ChainNotFoundError,
-  [4001]: TokenDirectoryDisabledError
+  [4001]: TokenDirectoryDisabledError,
 }
 
-export type Fetch = (input: RequestInfo, init?: RequestInit) => Promise<Response>
+//
+// Webrpc
+//
+
+export const WebrpcHeader = 'Webrpc'
+
+export const WebrpcHeaderValue = 'webrpc@v0.31.0;gen-typescript@v0.22.5;sequence-metadata@v0.4.0'
+
+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 ?? '',
+  }
+}