update the path, add helpers, fix some types

tari-project · Jan 29, 2024 · 4baff13 · 4baff13
1 parent 8d9db0d
commit 4baff13
Show file tree

Hide file tree

Showing 301 changed files with 577 additions and 501 deletions.
diff --git a/bindings/build.sh b/bindings/build.sh
@@ -1,7 +1,8 @@
 cargo test --workspace --exclude integration_tests export_bindings --features ts
-shx mv ../dan_layer/bindings/src/* ./src/
+shx mv ../dan_layer/bindings/src/types/* ./src/types/
 shx rm -rf ../dan_layer/bindings/
-DIRECTORY_PATH="./src" # replace with your directory path
+DIRECTORY_PATH="./src/types" # replace with your directory path
+HELPERS_PATH="./src/helpers" # replace with your directory path
 INDEX_FILE="./index.ts"
 
 # Remove the index file if it exists
@@ -18,4 +19,13 @@ for file in $(find $DIRECTORY_PATH -name "*.ts"); do
   fi
 done
 
-npx prettier --write "./**/*.{ts,tsx,css,json}"
+# Add helpers
+for file in $(find $HELPERS_PATH -name "*.ts"); do
+  FILE_NAME=$(basename $file)
+  if [ "$FILE_NAME" != "index.ts" ]; then
+    MODULE_NAME="${FILE_NAME%.*}"
+    echo "export * from '$HELPERS_PATH/$MODULE_NAME';" >> $INDEX_FILE
+  fi
+done
+
+npx prettier --write "./**/*.{ts,tsx,css,json}" --log-level=warn
diff --git a/bindings/index.ts b/bindings/index.ts
diff --git a/bindings/src/helpers/helpers.ts b/bindings/src/helpers/helpers.ts
@@ -0,0 +1,54 @@
+import { RejectReason } from "../types/RejectReason";
+import { SubstateId } from "../types/SubstateId";
+
+export function substateIdToString(substateId: SubstateId): string {
+  if ("Component" in substateId) {
+    return substateId.Component;
+  }
+  if ("Resource" in substateId) {
+    return substateId.Resource;
+  }
+  if ("Vault" in substateId) {
+    return substateId.Vault;
+  }
+  if ("UnclaimedConfidentialOutput" in substateId) {
+    return substateId.UnclaimedConfidentialOutput;
+  }
+  if ("NonFungible" in substateId) {
+    return substateId.NonFungible;
+  }
+  if ("NonFungibleIndex" in substateId) {
+    return `${substateId.NonFungibleIndex.resource_address}:${substateId.NonFungibleIndex.index}`;
+  }
+  if ("TransactionReceipt" in substateId) {
+    return substateId.TransactionReceipt;
+  }
+  if ("FeeClaim" in substateId) {
+    return substateId.FeeClaim;
+  }
+  console.error("Unknown substate id", substateId);
+  return "Unknown";
+}
+
+export function rejectReasonToString(reason: RejectReason): string {
+  if (typeof reason === "string") {
+    return reason;
+  }
+  if ("ShardsNotPledged" in reason) {
+    return reason.ShardsNotPledged;
+  }
+  if ("ExecutionFailure" in reason) {
+    return reason.ExecutionFailure;
+  }
+  if ("ShardPledgedToAnotherPayload" in reason) {
+    return reason.ShardPledgedToAnotherPayload;
+  }
+  if ("ShardRejected" in reason) {
+    return reason.ShardRejected;
+  }
+  if ("FeesNotPaid" in reason) {
+    return reason.FeesNotPaid;
+  }
+  console.error("Unknown reason", reason);
+  return "Unknown";
+}
diff --git a/bindings/src/AccessRule.ts → bindings/src/types/AccessRule.ts b/bindings/src/AccessRule.ts → bindings/src/types/AccessRule.ts
diff --git a/bindings/src/Account.ts → bindings/src/types/Account.ts b/bindings/src/Account.ts → bindings/src/types/Account.ts
@@ -4,6 +4,6 @@ import type { SubstateId } from "./SubstateId";
 export interface Account {
   name: string | null;
   address: SubstateId;
-  key_index: bigint;
+  key_index: number;
   is_default: boolean;
 }
diff --git a/bindings/src/AccountGetDefaultRequest.ts → ...ngs/src/types/AccountGetDefaultRequest.ts b/bindings/src/AccountGetDefaultRequest.ts → ...ngs/src/types/AccountGetDefaultRequest.ts
diff --git a/bindings/src/AccountGetRequest.ts → bindings/src/types/AccountGetRequest.ts b/bindings/src/AccountGetRequest.ts → bindings/src/types/AccountGetRequest.ts
diff --git a/bindings/src/AccountGetResponse.ts → bindings/src/types/AccountGetResponse.ts b/bindings/src/AccountGetResponse.ts → bindings/src/types/AccountGetResponse.ts
diff --git a/bindings/src/AccountInfo.ts → bindings/src/types/AccountInfo.ts b/bindings/src/AccountInfo.ts → bindings/src/types/AccountInfo.ts
diff --git a/bindings/src/AccountNftInfo.ts → bindings/src/types/AccountNftInfo.ts b/bindings/src/AccountNftInfo.ts → bindings/src/types/AccountNftInfo.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface AccountNftInfo {
-  metadata: string;
+  metadata: any;
   is_burned: boolean;
 }
diff --git a/bindings/src/AccountSetDefaultRequest.ts → ...ngs/src/types/AccountSetDefaultRequest.ts b/bindings/src/AccountSetDefaultRequest.ts → ...ngs/src/types/AccountSetDefaultRequest.ts
diff --git a/bindings/src/AccountSetDefaultResponse.ts → ...gs/src/types/AccountSetDefaultResponse.ts b/bindings/src/AccountSetDefaultResponse.ts → ...gs/src/types/AccountSetDefaultResponse.ts
diff --git a/...src/AccountsCreateFreeTestCoinsRequest.ts → ...pes/AccountsCreateFreeTestCoinsRequest.ts b/...src/AccountsCreateFreeTestCoinsRequest.ts → ...pes/AccountsCreateFreeTestCoinsRequest.ts
@@ -6,5 +6,5 @@ export interface AccountsCreateFreeTestCoinsRequest {
   account: ComponentAddressOrName | null;
   amount: Amount;
   max_fee: Amount | null;
-  key_id: bigint | null;
+  key_id: number | null;
 }
diff --git a/...rc/AccountsCreateFreeTestCoinsResponse.ts → ...es/AccountsCreateFreeTestCoinsResponse.ts b/...rc/AccountsCreateFreeTestCoinsResponse.ts → ...es/AccountsCreateFreeTestCoinsResponse.ts
diff --git a/bindings/src/AccountsCreateRequest.ts → bindings/src/types/AccountsCreateRequest.ts b/bindings/src/AccountsCreateRequest.ts → bindings/src/types/AccountsCreateRequest.ts
diff --git a/bindings/src/AccountsCreateResponse.ts → bindings/src/types/AccountsCreateResponse.ts b/bindings/src/AccountsCreateResponse.ts → bindings/src/types/AccountsCreateResponse.ts
diff --git a/bindings/src/AccountsGetBalancesRequest.ts → ...s/src/types/AccountsGetBalancesRequest.ts b/bindings/src/AccountsGetBalancesRequest.ts → ...s/src/types/AccountsGetBalancesRequest.ts
diff --git a/bindings/src/AccountsGetBalancesResponse.ts → .../src/types/AccountsGetBalancesResponse.ts b/bindings/src/AccountsGetBalancesResponse.ts → .../src/types/AccountsGetBalancesResponse.ts
diff --git a/bindings/src/AccountsInvokeRequest.ts → bindings/src/types/AccountsInvokeRequest.ts b/bindings/src/AccountsInvokeRequest.ts → bindings/src/types/AccountsInvokeRequest.ts
diff --git a/bindings/src/AccountsInvokeResponse.ts → bindings/src/types/AccountsInvokeResponse.ts b/bindings/src/AccountsInvokeResponse.ts → bindings/src/types/AccountsInvokeResponse.ts
diff --git a/bindings/src/AccountsListRequest.ts → bindings/src/types/AccountsListRequest.ts b/bindings/src/AccountsListRequest.ts → bindings/src/types/AccountsListRequest.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface AccountsListRequest {
-  offset: bigint;
-  limit: bigint;
+  offset: number;
+  limit: number;
 }
diff --git a/bindings/src/AccountsListResponse.ts → bindings/src/types/AccountsListResponse.ts b/bindings/src/AccountsListResponse.ts → bindings/src/types/AccountsListResponse.ts
diff --git a/bindings/src/AddAddressRequest.ts → bindings/src/types/AddAddressRequest.ts b/bindings/src/AddAddressRequest.ts → bindings/src/types/AddAddressRequest.ts
diff --git a/bindings/src/AddPeerRequest.ts → bindings/src/types/AddPeerRequest.ts b/bindings/src/AddPeerRequest.ts → bindings/src/types/AddPeerRequest.ts
diff --git a/bindings/src/AddPeerResponse.ts → bindings/src/types/AddPeerResponse.ts b/bindings/src/AddPeerResponse.ts → bindings/src/types/AddPeerResponse.ts
diff --git a/bindings/src/Amount.ts → bindings/src/types/Amount.ts b/bindings/src/Amount.ts → bindings/src/types/Amount.ts
diff --git a/bindings/src/Arg.ts → bindings/src/types/Arg.ts b/bindings/src/Arg.ts → bindings/src/types/Arg.ts
diff --git a/bindings/src/ArgDef.ts → bindings/src/types/ArgDef.ts b/bindings/src/ArgDef.ts → bindings/src/types/ArgDef.ts
diff --git a/bindings/src/AuthGetAllJwtRequest.ts → bindings/src/types/AuthGetAllJwtRequest.ts b/bindings/src/AuthGetAllJwtRequest.ts → bindings/src/types/AuthGetAllJwtRequest.ts
diff --git a/bindings/src/AuthGetAllJwtResponse.ts → bindings/src/types/AuthGetAllJwtResponse.ts b/bindings/src/AuthGetAllJwtResponse.ts → bindings/src/types/AuthGetAllJwtResponse.ts
diff --git a/bindings/src/AuthLoginAcceptRequest.ts → bindings/src/types/AuthLoginAcceptRequest.ts b/bindings/src/AuthLoginAcceptRequest.ts → bindings/src/types/AuthLoginAcceptRequest.ts
diff --git a/bindings/src/AuthLoginAcceptResponse.ts → ...ings/src/types/AuthLoginAcceptResponse.ts b/bindings/src/AuthLoginAcceptResponse.ts → ...ings/src/types/AuthLoginAcceptResponse.ts
diff --git a/bindings/src/AuthLoginDenyRequest.ts → bindings/src/types/AuthLoginDenyRequest.ts b/bindings/src/AuthLoginDenyRequest.ts → bindings/src/types/AuthLoginDenyRequest.ts
diff --git a/bindings/src/AuthLoginDenyResponse.ts → bindings/src/types/AuthLoginDenyResponse.ts b/bindings/src/AuthLoginDenyResponse.ts → bindings/src/types/AuthLoginDenyResponse.ts
diff --git a/bindings/src/AuthLoginRequest.ts → bindings/src/types/AuthLoginRequest.ts b/bindings/src/AuthLoginRequest.ts → bindings/src/types/AuthLoginRequest.ts
diff --git a/bindings/src/AuthLoginResponse.ts → bindings/src/types/AuthLoginResponse.ts b/bindings/src/AuthLoginResponse.ts → bindings/src/types/AuthLoginResponse.ts
diff --git a/bindings/src/AuthRevokeTokenRequest.ts → bindings/src/types/AuthRevokeTokenRequest.ts b/bindings/src/AuthRevokeTokenRequest.ts → bindings/src/types/AuthRevokeTokenRequest.ts
diff --git a/bindings/src/AuthRevokeTokenResponse.ts → ...ings/src/types/AuthRevokeTokenResponse.ts b/bindings/src/AuthRevokeTokenResponse.ts → ...ings/src/types/AuthRevokeTokenResponse.ts
diff --git a/bindings/src/BalanceEntry.ts → bindings/src/types/BalanceEntry.ts b/bindings/src/BalanceEntry.ts → bindings/src/types/BalanceEntry.ts
diff --git a/bindings/src/BalanceProofSignature.ts → bindings/src/types/BalanceProofSignature.ts b/bindings/src/BalanceProofSignature.ts → bindings/src/types/BalanceProofSignature.ts
diff --git a/bindings/src/Block.ts → bindings/src/types/Block.ts b/bindings/src/Block.ts → bindings/src/types/Block.ts
diff --git a/bindings/src/BlockId.ts → bindings/src/types/BlockId.ts b/bindings/src/BlockId.ts → bindings/src/types/BlockId.ts
diff --git a/bindings/src/BucketId.ts → bindings/src/types/BucketId.ts b/bindings/src/BucketId.ts → bindings/src/types/BucketId.ts
diff --git a/bindings/src/ClaimBurnRequest.ts → bindings/src/types/ClaimBurnRequest.ts b/bindings/src/ClaimBurnRequest.ts → bindings/src/types/ClaimBurnRequest.ts
@@ -6,5 +6,5 @@ export interface ClaimBurnRequest {
   account: ComponentAddressOrName | null;
   claim_proof: string;
   max_fee: Amount | null;
-  key_id: bigint | null;
+  key_id: number | null;
 }
diff --git a/bindings/src/ClaimBurnResponse.ts → bindings/src/types/ClaimBurnResponse.ts b/bindings/src/ClaimBurnResponse.ts → bindings/src/types/ClaimBurnResponse.ts
diff --git a/bindings/src/ClaimValidatorFeesRequest.ts → ...gs/src/types/ClaimValidatorFeesRequest.ts b/bindings/src/ClaimValidatorFeesRequest.ts → ...gs/src/types/ClaimValidatorFeesRequest.ts
diff --git a/bindings/src/ClaimValidatorFeesResponse.ts → ...s/src/types/ClaimValidatorFeesResponse.ts b/bindings/src/ClaimValidatorFeesResponse.ts → ...s/src/types/ClaimValidatorFeesResponse.ts
diff --git a/bindings/src/Claims.ts → bindings/src/types/Claims.ts b/bindings/src/Claims.ts → bindings/src/types/Claims.ts
diff --git a/bindings/src/Command.ts → bindings/src/types/Command.ts b/bindings/src/Command.ts → bindings/src/types/Command.ts
diff --git a/bindings/src/CommitteeShard.ts → bindings/src/types/CommitteeShard.ts b/bindings/src/CommitteeShard.ts → bindings/src/types/CommitteeShard.ts
diff --git a/bindings/src/CommitteeShardInfo.ts → bindings/src/types/CommitteeShardInfo.ts b/bindings/src/CommitteeShardInfo.ts → bindings/src/types/CommitteeShardInfo.ts
diff --git a/bindings/src/ComponentAccessRules.ts → bindings/src/types/ComponentAccessRules.ts b/bindings/src/ComponentAccessRules.ts → bindings/src/types/ComponentAccessRules.ts
diff --git a/bindings/src/ComponentAddress.ts → bindings/src/types/ComponentAddress.ts b/bindings/src/ComponentAddress.ts → bindings/src/types/ComponentAddress.ts
diff --git a/bindings/src/ComponentAddressOrName.ts → bindings/src/types/ComponentAddressOrName.ts b/bindings/src/ComponentAddressOrName.ts → bindings/src/types/ComponentAddressOrName.ts
diff --git a/bindings/src/ComponentBody.ts → bindings/src/types/ComponentBody.ts b/bindings/src/ComponentBody.ts → bindings/src/types/ComponentBody.ts
diff --git a/bindings/src/ComponentHeader.ts → bindings/src/types/ComponentHeader.ts b/bindings/src/ComponentHeader.ts → bindings/src/types/ComponentHeader.ts
diff --git a/bindings/src/ConfidentialClaim.ts → bindings/src/types/ConfidentialClaim.ts b/bindings/src/ConfidentialClaim.ts → bindings/src/types/ConfidentialClaim.ts
diff --git a/...c/ConfidentialCreateOutputProofRequest.ts → ...s/ConfidentialCreateOutputProofRequest.ts b/...c/ConfidentialCreateOutputProofRequest.ts → ...s/ConfidentialCreateOutputProofRequest.ts
diff --git a/.../ConfidentialCreateOutputProofResponse.ts → .../ConfidentialCreateOutputProofResponse.ts b/.../ConfidentialCreateOutputProofResponse.ts → .../ConfidentialCreateOutputProofResponse.ts
diff --git a/bindings/src/ConfidentialOutput.ts → bindings/src/types/ConfidentialOutput.ts b/bindings/src/ConfidentialOutput.ts → bindings/src/types/ConfidentialOutput.ts
diff --git a/bindings/src/ConfidentialOutputProof.ts → ...ings/src/types/ConfidentialOutputProof.ts b/bindings/src/ConfidentialOutputProof.ts → ...ings/src/types/ConfidentialOutputProof.ts
diff --git a/bindings/src/ConfidentialStatement.ts → bindings/src/types/ConfidentialStatement.ts b/bindings/src/ConfidentialStatement.ts → bindings/src/types/ConfidentialStatement.ts
diff --git a/bindings/src/ConfidentialTransferRequest.ts → .../src/types/ConfidentialTransferRequest.ts b/bindings/src/ConfidentialTransferRequest.ts → .../src/types/ConfidentialTransferRequest.ts
diff --git a/bindings/src/ConfidentialTransferResponse.ts → ...src/types/ConfidentialTransferResponse.ts b/bindings/src/ConfidentialTransferResponse.ts → ...src/types/ConfidentialTransferResponse.ts
diff --git a/bindings/src/ConfidentialWithdrawProof.ts → ...gs/src/types/ConfidentialWithdrawProof.ts b/bindings/src/ConfidentialWithdrawProof.ts → ...gs/src/types/ConfidentialWithdrawProof.ts
diff --git a/bindings/src/Connection.ts → bindings/src/types/Connection.ts b/bindings/src/Connection.ts → bindings/src/types/Connection.ts
diff --git a/bindings/src/ConnectionDirection.ts → bindings/src/types/ConnectionDirection.ts b/bindings/src/ConnectionDirection.ts → bindings/src/types/ConnectionDirection.ts
diff --git a/bindings/src/Decision.ts → bindings/src/types/Decision.ts b/bindings/src/Decision.ts → bindings/src/types/Decision.ts
diff --git a/bindings/src/DeleteAddressRequest.ts → bindings/src/types/DeleteAddressRequest.ts b/bindings/src/DeleteAddressRequest.ts → bindings/src/types/DeleteAddressRequest.ts
diff --git a/...gs/src/DryRunTransactionFinalizeResult.ts → .../types/DryRunTransactionFinalizeResult.ts b/...gs/src/DryRunTransactionFinalizeResult.ts → .../types/DryRunTransactionFinalizeResult.ts
diff --git a/bindings/src/EncryptedData.ts → bindings/src/types/EncryptedData.ts b/bindings/src/EncryptedData.ts → bindings/src/types/EncryptedData.ts
diff --git a/bindings/src/Epoch.ts → bindings/src/types/Epoch.ts b/bindings/src/Epoch.ts → bindings/src/types/Epoch.ts
diff --git a/bindings/src/Event.ts → bindings/src/types/Event.ts b/bindings/src/Event.ts → bindings/src/types/Event.ts
@@ -1,12 +1,11 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 import type { ComponentAddress } from "./ComponentAddress";
-import type { Hash } from "./Hash";
 import type { Metadata } from "./Metadata";
 
 export interface Event {
   component_address: ComponentAddress | null;
-  template_address: Hash;
-  tx_hash: Hash;
+  template_address: string;
+  tx_hash: string;
   topic: string;
   payload: Metadata;
 }
diff --git a/bindings/src/Evidence.ts → bindings/src/types/Evidence.ts b/bindings/src/Evidence.ts → bindings/src/types/Evidence.ts
diff --git a/bindings/src/ExecuteResult.ts → bindings/src/types/ExecuteResult.ts b/bindings/src/ExecuteResult.ts → bindings/src/types/ExecuteResult.ts
diff --git a/bindings/src/ExecutedTransaction.ts → bindings/src/types/ExecutedTransaction.ts b/bindings/src/ExecutedTransaction.ts → bindings/src/types/ExecutedTransaction.ts
diff --git a/bindings/src/FeeClaim.ts → bindings/src/types/FeeClaim.ts b/bindings/src/FeeClaim.ts → bindings/src/types/FeeClaim.ts
diff --git a/bindings/src/FeeClaimAddress.ts → bindings/src/types/FeeClaimAddress.ts b/bindings/src/FeeClaimAddress.ts → bindings/src/types/FeeClaimAddress.ts
diff --git a/bindings/src/FeeCostBreakdown.ts → bindings/src/types/FeeCostBreakdown.ts b/bindings/src/FeeCostBreakdown.ts → bindings/src/types/FeeCostBreakdown.ts
diff --git a/bindings/src/FeeReceipt.ts → bindings/src/types/FeeReceipt.ts b/bindings/src/FeeReceipt.ts → bindings/src/types/FeeReceipt.ts
diff --git a/bindings/src/FeeSource.ts → bindings/src/types/FeeSource.ts b/bindings/src/FeeSource.ts → bindings/src/types/FeeSource.ts
diff --git a/bindings/src/FinalizeResult.ts → bindings/src/types/FinalizeResult.ts b/bindings/src/FinalizeResult.ts → bindings/src/types/FinalizeResult.ts
diff --git a/bindings/src/ForeignProposal.ts → bindings/src/types/ForeignProposal.ts b/bindings/src/ForeignProposal.ts → bindings/src/types/ForeignProposal.ts
diff --git a/bindings/src/ForeignProposalState.ts → bindings/src/types/ForeignProposalState.ts b/bindings/src/ForeignProposalState.ts → bindings/src/types/ForeignProposalState.ts
diff --git a/bindings/src/FunctionDef.ts → bindings/src/types/FunctionDef.ts b/bindings/src/FunctionDef.ts → bindings/src/types/FunctionDef.ts
diff --git a/bindings/src/GetAccountNftRequest.ts → bindings/src/types/GetAccountNftRequest.ts b/bindings/src/GetAccountNftRequest.ts → bindings/src/types/GetAccountNftRequest.ts
diff --git a/bindings/src/GetBlockRequest.ts → bindings/src/types/GetBlockRequest.ts b/bindings/src/GetBlockRequest.ts → bindings/src/types/GetBlockRequest.ts
diff --git a/bindings/src/GetBlockResponse.ts → bindings/src/types/GetBlockResponse.ts b/bindings/src/GetBlockResponse.ts → bindings/src/types/GetBlockResponse.ts
diff --git a/bindings/src/GetBlocksCountResponse.ts → bindings/src/types/GetBlocksCountResponse.ts b/bindings/src/GetBlocksCountResponse.ts → bindings/src/types/GetBlocksCountResponse.ts
diff --git a/bindings/src/GetBlocksRequest.ts → bindings/src/types/GetBlocksRequest.ts b/bindings/src/GetBlocksRequest.ts → bindings/src/types/GetBlocksRequest.ts
diff --git a/bindings/src/GetBlocksResponse.ts → bindings/src/types/GetBlocksResponse.ts b/bindings/src/GetBlocksResponse.ts → bindings/src/types/GetBlocksResponse.ts
diff --git a/bindings/src/GetCommitteeRequest.ts → bindings/src/types/GetCommitteeRequest.ts b/bindings/src/GetCommitteeRequest.ts → bindings/src/types/GetCommitteeRequest.ts
diff --git a/bindings/src/GetConnectionsResponse.ts → bindings/src/types/GetConnectionsResponse.ts b/bindings/src/GetConnectionsResponse.ts → bindings/src/types/GetConnectionsResponse.ts
diff --git a/bindings/src/GetEpochManagerStatsResponse.ts → ...src/types/GetEpochManagerStatsResponse.ts b/bindings/src/GetEpochManagerStatsResponse.ts → ...src/types/GetEpochManagerStatsResponse.ts
diff --git a/bindings/src/GetIdentityResponse.ts → bindings/src/types/GetIdentityResponse.ts b/bindings/src/GetIdentityResponse.ts → bindings/src/types/GetIdentityResponse.ts
diff --git a/bindings/src/GetNetworkCommitteeResponse.ts → .../src/types/GetNetworkCommitteeResponse.ts b/bindings/src/GetNetworkCommitteeResponse.ts → .../src/types/GetNetworkCommitteeResponse.ts
diff --git a/bindings/src/GetNonFungibleCountRequest.ts → ...s/src/types/GetNonFungibleCountRequest.ts b/bindings/src/GetNonFungibleCountRequest.ts → ...s/src/types/GetNonFungibleCountRequest.ts
diff --git a/bindings/src/GetNonFungiblesRequest.ts → bindings/src/types/GetNonFungiblesRequest.ts b/bindings/src/GetNonFungiblesRequest.ts → bindings/src/types/GetNonFungiblesRequest.ts
diff --git a/bindings/src/GetNonFungiblesResponse.ts → ...ings/src/types/GetNonFungiblesResponse.ts b/bindings/src/GetNonFungiblesResponse.ts → ...ings/src/types/GetNonFungiblesResponse.ts
diff --git a/bindings/src/GetRecentTransactionsRequest.ts → ...src/types/GetRecentTransactionsRequest.ts b/bindings/src/GetRecentTransactionsRequest.ts → ...src/types/GetRecentTransactionsRequest.ts
diff --git a/...ings/src/GetRecentTransactionsResponse.ts → ...rc/types/GetRecentTransactionsResponse.ts b/...ings/src/GetRecentTransactionsResponse.ts → ...rc/types/GetRecentTransactionsResponse.ts
diff --git a/...ings/src/GetRelatedTransactionsRequest.ts → ...rc/types/GetRelatedTransactionsRequest.ts b/...ings/src/GetRelatedTransactionsRequest.ts → ...rc/types/GetRelatedTransactionsRequest.ts
diff --git a/...ngs/src/GetRelatedTransactionsResponse.ts → ...c/types/GetRelatedTransactionsResponse.ts b/...ngs/src/GetRelatedTransactionsResponse.ts → ...c/types/GetRelatedTransactionsResponse.ts
diff --git a/bindings/src/GetShardKey.ts → bindings/src/types/GetShardKey.ts b/bindings/src/GetShardKey.ts → bindings/src/types/GetShardKey.ts
diff --git a/bindings/src/GetStateRequest.ts → bindings/src/types/GetStateRequest.ts b/bindings/src/GetStateRequest.ts → bindings/src/types/GetStateRequest.ts
diff --git a/bindings/src/GetStateResponse.ts → bindings/src/types/GetStateResponse.ts b/bindings/src/GetStateResponse.ts → bindings/src/types/GetStateResponse.ts
diff --git a/bindings/src/GetSubstateRequest.ts → bindings/src/types/GetSubstateRequest.ts b/bindings/src/GetSubstateRequest.ts → bindings/src/types/GetSubstateRequest.ts
diff --git a/bindings/src/GetSubstateResponse.ts → bindings/src/types/GetSubstateResponse.ts b/bindings/src/GetSubstateResponse.ts → bindings/src/types/GetSubstateResponse.ts
diff --git a/...s/src/GetSubstatesByTransactionRequest.ts → ...types/GetSubstatesByTransactionRequest.ts b/...s/src/GetSubstatesByTransactionRequest.ts → ...types/GetSubstatesByTransactionRequest.ts
diff --git a/.../src/GetSubstatesByTransactionResponse.ts → ...ypes/GetSubstatesByTransactionResponse.ts b/.../src/GetSubstatesByTransactionResponse.ts → ...ypes/GetSubstatesByTransactionResponse.ts
diff --git a/bindings/src/GetTemplateRequest.ts → bindings/src/types/GetTemplateRequest.ts b/bindings/src/GetTemplateRequest.ts → bindings/src/types/GetTemplateRequest.ts
diff --git a/bindings/src/GetTemplateResponse.ts → bindings/src/types/GetTemplateResponse.ts b/bindings/src/GetTemplateResponse.ts → bindings/src/types/GetTemplateResponse.ts
diff --git a/bindings/src/GetTemplatesRequest.ts → bindings/src/types/GetTemplatesRequest.ts b/bindings/src/GetTemplatesRequest.ts → bindings/src/types/GetTemplatesRequest.ts
diff --git a/bindings/src/GetTemplatesResponse.ts → bindings/src/types/GetTemplatesResponse.ts b/bindings/src/GetTemplatesResponse.ts → bindings/src/types/GetTemplatesResponse.ts
diff --git a/bindings/src/GetTransactionRequest.ts → bindings/src/types/GetTransactionRequest.ts b/bindings/src/GetTransactionRequest.ts → bindings/src/types/GetTransactionRequest.ts
diff --git a/bindings/src/GetTransactionResponse.ts → bindings/src/types/GetTransactionResponse.ts b/bindings/src/GetTransactionResponse.ts → bindings/src/types/GetTransactionResponse.ts
diff --git a/bindings/src/GetTransactionResultRequest.ts → .../src/types/GetTransactionResultRequest.ts b/bindings/src/GetTransactionResultRequest.ts → .../src/types/GetTransactionResultRequest.ts
diff --git a/bindings/src/GetTransactionResultResponse.ts → ...src/types/GetTransactionResultResponse.ts b/bindings/src/GetTransactionResultResponse.ts → ...src/types/GetTransactionResultResponse.ts
diff --git a/bindings/src/GetValidatorFeesRequest.ts → ...ings/src/types/GetValidatorFeesRequest.ts b/bindings/src/GetValidatorFeesRequest.ts → ...ings/src/types/GetValidatorFeesRequest.ts
diff --git a/bindings/src/GetValidatorFeesResponse.ts → ...ngs/src/types/GetValidatorFeesResponse.ts b/bindings/src/GetValidatorFeesResponse.ts → ...ngs/src/types/GetValidatorFeesResponse.ts
diff --git a/bindings/src/Hash.ts → bindings/src/types/Hash.ts b/bindings/src/Hash.ts → bindings/src/types/Hash.ts
diff --git a/bindings/src/IndexedValue.ts → bindings/src/types/IndexedValue.ts b/bindings/src/IndexedValue.ts → bindings/src/types/IndexedValue.ts
diff --git a/bindings/src/IndexedWellKnownTypes.ts → bindings/src/types/IndexedWellKnownTypes.ts b/bindings/src/IndexedWellKnownTypes.ts → bindings/src/types/IndexedWellKnownTypes.ts
diff --git a/.../src/IndexerTransactionFinalizedResult.ts → ...ypes/IndexerTransactionFinalizedResult.ts b/.../src/IndexerTransactionFinalizedResult.ts → ...ypes/IndexerTransactionFinalizedResult.ts
diff --git a/bindings/src/InspectSubstateRequest.ts → bindings/src/types/InspectSubstateRequest.ts b/bindings/src/InspectSubstateRequest.ts → bindings/src/types/InspectSubstateRequest.ts
diff --git a/bindings/src/InspectSubstateResponse.ts → ...ings/src/types/InspectSubstateResponse.ts b/bindings/src/InspectSubstateResponse.ts → ...ings/src/types/InspectSubstateResponse.ts
diff --git a/bindings/src/Instruction.ts → bindings/src/types/Instruction.ts b/bindings/src/Instruction.ts → bindings/src/types/Instruction.ts
diff --git a/bindings/src/InstructionResult.ts → bindings/src/types/InstructionResult.ts b/bindings/src/InstructionResult.ts → bindings/src/types/InstructionResult.ts
diff --git a/bindings/src/JrpcPermission.ts → bindings/src/types/JrpcPermission.ts b/bindings/src/JrpcPermission.ts → bindings/src/types/JrpcPermission.ts
diff --git a/bindings/src/JrpcPermissions.ts → bindings/src/types/JrpcPermissions.ts b/bindings/src/JrpcPermissions.ts → bindings/src/types/JrpcPermissions.ts
diff --git a/bindings/src/KeysCreateRequest.ts → bindings/src/types/KeysCreateRequest.ts b/bindings/src/KeysCreateRequest.ts → bindings/src/types/KeysCreateRequest.ts
@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface KeysCreateRequest {
-  specific_index: bigint | null;
+  specific_index: number | null;
 }
diff --git a/bindings/src/KeysCreateResponse.ts → bindings/src/types/KeysCreateResponse.ts b/bindings/src/KeysCreateResponse.ts → bindings/src/types/KeysCreateResponse.ts
diff --git a/bindings/src/KeysListRequest.ts → bindings/src/types/KeysListRequest.ts b/bindings/src/KeysListRequest.ts → bindings/src/types/KeysListRequest.ts
diff --git a/bindings/src/KeysListResponse.ts → bindings/src/types/KeysListResponse.ts b/bindings/src/KeysListResponse.ts → bindings/src/types/KeysListResponse.ts
diff --git a/bindings/src/KeysSetActiveRequest.ts → bindings/src/types/KeysSetActiveRequest.ts b/bindings/src/KeysSetActiveRequest.ts → bindings/src/types/KeysSetActiveRequest.ts
@@ -1,5 +1,5 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface KeysSetActiveRequest {
-  index: bigint;
+  index: number;
 }
diff --git a/bindings/src/KeysSetActiveResponse.ts → bindings/src/types/KeysSetActiveResponse.ts b/bindings/src/KeysSetActiveResponse.ts → bindings/src/types/KeysSetActiveResponse.ts
diff --git a/bindings/src/ListAccountNftRequest.ts → bindings/src/types/ListAccountNftRequest.ts b/bindings/src/ListAccountNftRequest.ts → bindings/src/types/ListAccountNftRequest.ts
@@ -1,6 +1,6 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
 
 export interface ListAccountNftRequest {
-  limit: bigint;
-  offset: bigint;
+  limit: number;
+  offset: number;
 }
diff --git a/bindings/src/ListAccountNftResponse.ts → bindings/src/types/ListAccountNftResponse.ts b/bindings/src/ListAccountNftResponse.ts → bindings/src/types/ListAccountNftResponse.ts
diff --git a/bindings/src/ListBlocksRequest.ts → bindings/src/types/ListBlocksRequest.ts b/bindings/src/ListBlocksRequest.ts → bindings/src/types/ListBlocksRequest.ts
diff --git a/bindings/src/ListBlocksResponse.ts → bindings/src/types/ListBlocksResponse.ts b/bindings/src/ListBlocksResponse.ts → bindings/src/types/ListBlocksResponse.ts
diff --git a/bindings/src/LockFlag.ts → bindings/src/types/LockFlag.ts b/bindings/src/LockFlag.ts → bindings/src/types/LockFlag.ts
diff --git a/bindings/src/LogEntry.ts → bindings/src/types/LogEntry.ts b/bindings/src/LogEntry.ts → bindings/src/types/LogEntry.ts
diff --git a/bindings/src/LogLevel.ts → bindings/src/types/LogLevel.ts b/bindings/src/LogLevel.ts → bindings/src/types/LogLevel.ts
diff --git a/bindings/src/Metadata.ts → bindings/src/types/Metadata.ts b/bindings/src/Metadata.ts → bindings/src/types/Metadata.ts
diff --git a/bindings/src/MintAccountNftRequest.ts → bindings/src/types/MintAccountNftRequest.ts b/bindings/src/MintAccountNftRequest.ts → bindings/src/types/MintAccountNftRequest.ts
diff --git a/bindings/src/MintAccountNftResponse.ts → bindings/src/types/MintAccountNftResponse.ts b/bindings/src/MintAccountNftResponse.ts → bindings/src/types/MintAccountNftResponse.ts
diff --git a/bindings/src/NodeHeight.ts → bindings/src/types/NodeHeight.ts b/bindings/src/NodeHeight.ts → bindings/src/types/NodeHeight.ts
diff --git a/bindings/src/NonFungible.ts → bindings/src/types/NonFungible.ts b/bindings/src/NonFungible.ts → bindings/src/types/NonFungible.ts
diff --git a/bindings/src/NonFungibleAddress.ts → bindings/src/types/NonFungibleAddress.ts b/bindings/src/NonFungibleAddress.ts → bindings/src/types/NonFungibleAddress.ts
diff --git a/bindings/src/NonFungibleAddressContents.ts → ...s/src/types/NonFungibleAddressContents.ts b/bindings/src/NonFungibleAddressContents.ts → ...s/src/types/NonFungibleAddressContents.ts
diff --git a/bindings/src/NonFungibleContainer.ts → bindings/src/types/NonFungibleContainer.ts b/bindings/src/NonFungibleContainer.ts → bindings/src/types/NonFungibleContainer.ts
diff --git a/bindings/src/NonFungibleId.ts → bindings/src/types/NonFungibleId.ts b/bindings/src/NonFungibleId.ts → bindings/src/types/NonFungibleId.ts
diff --git a/bindings/src/NonFungibleIndex.ts → bindings/src/types/NonFungibleIndex.ts b/bindings/src/NonFungibleIndex.ts → bindings/src/types/NonFungibleIndex.ts
diff --git a/bindings/src/NonFungibleIndexAddress.ts → ...ings/src/types/NonFungibleIndexAddress.ts b/bindings/src/NonFungibleIndexAddress.ts → ...ings/src/types/NonFungibleIndexAddress.ts
@@ -3,5 +3,5 @@ import type { ResourceAddress } from "./ResourceAddress";
 
 export interface NonFungibleIndexAddress {
   resource_address: ResourceAddress;
-  index: bigint;
+  index: number;
 }
diff --git a/bindings/src/NonFungibleSubstate.ts → bindings/src/types/NonFungibleSubstate.ts b/bindings/src/NonFungibleSubstate.ts → bindings/src/types/NonFungibleSubstate.ts
diff --git a/bindings/src/Ordering.ts → bindings/src/types/Ordering.ts b/bindings/src/Ordering.ts → bindings/src/types/Ordering.ts
diff --git a/bindings/src/OwnerRule.ts → bindings/src/types/OwnerRule.ts b/bindings/src/OwnerRule.ts → bindings/src/types/OwnerRule.ts
diff --git a/bindings/src/PedersonCommitmentBytes.ts → ...ings/src/types/PedersonCommitmentBytes.ts b/bindings/src/PedersonCommitmentBytes.ts → ...ings/src/types/PedersonCommitmentBytes.ts
diff --git a/bindings/src/ProofId.ts → bindings/src/types/ProofId.ts b/bindings/src/ProofId.ts → bindings/src/types/ProofId.ts
diff --git a/bindings/src/ProofsCancelRequest.ts → bindings/src/types/ProofsCancelRequest.ts b/bindings/src/ProofsCancelRequest.ts → bindings/src/types/ProofsCancelRequest.ts
diff --git a/bindings/src/ProofsCancelResponse.ts → bindings/src/types/ProofsCancelResponse.ts b/bindings/src/ProofsCancelResponse.ts → bindings/src/types/ProofsCancelResponse.ts
diff --git a/bindings/src/ProofsFinalizeRequest.ts → bindings/src/types/ProofsFinalizeRequest.ts b/bindings/src/ProofsFinalizeRequest.ts → bindings/src/types/ProofsFinalizeRequest.ts
diff --git a/bindings/src/ProofsFinalizeResponse.ts → bindings/src/types/ProofsFinalizeResponse.ts b/bindings/src/ProofsFinalizeResponse.ts → bindings/src/types/ProofsFinalizeResponse.ts
diff --git a/bindings/src/ProofsGenerateRequest.ts → bindings/src/types/ProofsGenerateRequest.ts b/bindings/src/ProofsGenerateRequest.ts → bindings/src/types/ProofsGenerateRequest.ts
diff --git a/bindings/src/ProofsGenerateResponse.ts → bindings/src/types/ProofsGenerateResponse.ts b/bindings/src/ProofsGenerateResponse.ts → bindings/src/types/ProofsGenerateResponse.ts
diff --git a/bindings/src/QcId.ts → bindings/src/types/QcId.ts b/bindings/src/QcId.ts → bindings/src/types/QcId.ts
diff --git a/bindings/src/QuorumCertificate.ts → bindings/src/types/QuorumCertificate.ts b/bindings/src/QuorumCertificate.ts → bindings/src/types/QuorumCertificate.ts
diff --git a/bindings/src/QuorumDecision.ts → bindings/src/types/QuorumDecision.ts b/bindings/src/QuorumDecision.ts → bindings/src/types/QuorumDecision.ts
diff --git a/bindings/src/RegisterValidatorNodeRequest.ts → ...src/types/RegisterValidatorNodeRequest.ts b/bindings/src/RegisterValidatorNodeRequest.ts → ...src/types/RegisterValidatorNodeRequest.ts
diff --git a/...ings/src/RegisterValidatorNodeResponse.ts → ...rc/types/RegisterValidatorNodeResponse.ts b/...ings/src/RegisterValidatorNodeResponse.ts → ...rc/types/RegisterValidatorNodeResponse.ts
diff --git a/bindings/src/RejectReason.ts → bindings/src/types/RejectReason.ts b/bindings/src/RejectReason.ts → bindings/src/types/RejectReason.ts
diff --git a/bindings/src/RequireRule.ts → bindings/src/types/RequireRule.ts b/bindings/src/RequireRule.ts → bindings/src/types/RequireRule.ts
diff --git a/bindings/src/Resource.ts → bindings/src/types/Resource.ts b/bindings/src/Resource.ts → bindings/src/types/Resource.ts
diff --git a/bindings/src/ResourceAccessRules.ts → bindings/src/types/ResourceAccessRules.ts b/bindings/src/ResourceAccessRules.ts → bindings/src/types/ResourceAccessRules.ts
diff --git a/bindings/src/ResourceAddress.ts → bindings/src/types/ResourceAddress.ts b/bindings/src/ResourceAddress.ts → bindings/src/types/ResourceAddress.ts
diff --git a/bindings/src/ResourceContainer.ts → bindings/src/types/ResourceContainer.ts b/bindings/src/ResourceContainer.ts → bindings/src/types/ResourceContainer.ts
diff --git a/bindings/src/ResourceType.ts → bindings/src/types/ResourceType.ts b/bindings/src/ResourceType.ts → bindings/src/types/ResourceType.ts
diff --git a/bindings/src/RestrictedAccessRule.ts → bindings/src/types/RestrictedAccessRule.ts b/bindings/src/RestrictedAccessRule.ts → bindings/src/types/RestrictedAccessRule.ts
diff --git a/bindings/src/RevealFundsRequest.ts → bindings/src/types/RevealFundsRequest.ts b/bindings/src/RevealFundsRequest.ts → bindings/src/types/RevealFundsRequest.ts
diff --git a/bindings/src/RevealFundsResponse.ts → bindings/src/types/RevealFundsResponse.ts b/bindings/src/RevealFundsResponse.ts → bindings/src/types/RevealFundsResponse.ts
diff --git a/bindings/src/RistrettoPublicKeyBytes.ts → ...ings/src/types/RistrettoPublicKeyBytes.ts b/bindings/src/RistrettoPublicKeyBytes.ts → ...ings/src/types/RistrettoPublicKeyBytes.ts
diff --git a/bindings/src/RuleRequirement.ts → bindings/src/types/RuleRequirement.ts b/bindings/src/RuleRequirement.ts → bindings/src/types/RuleRequirement.ts
diff --git a/bindings/src/SettingsGetResponse.ts → bindings/src/types/SettingsGetResponse.ts b/bindings/src/SettingsGetResponse.ts → bindings/src/types/SettingsGetResponse.ts
diff --git a/bindings/src/SettingsSetRequest.ts → bindings/src/types/SettingsSetRequest.ts b/bindings/src/SettingsSetRequest.ts → bindings/src/types/SettingsSetRequest.ts
diff --git a/bindings/src/SettingsSetResponse.ts → bindings/src/types/SettingsSetResponse.ts b/bindings/src/SettingsSetResponse.ts → bindings/src/types/SettingsSetResponse.ts
diff --git a/bindings/src/Shard.ts → bindings/src/types/Shard.ts b/bindings/src/Shard.ts → bindings/src/types/Shard.ts
diff --git a/bindings/src/ShardEvidence.ts → bindings/src/types/ShardEvidence.ts b/bindings/src/ShardEvidence.ts → bindings/src/types/ShardEvidence.ts
diff --git a/bindings/src/SubmitTransactionRequest.ts → ...ngs/src/types/SubmitTransactionRequest.ts b/bindings/src/SubmitTransactionRequest.ts → ...ngs/src/types/SubmitTransactionRequest.ts
diff --git a/bindings/src/SubmitTransactionResponse.ts → ...gs/src/types/SubmitTransactionResponse.ts b/bindings/src/SubmitTransactionResponse.ts → ...gs/src/types/SubmitTransactionResponse.ts
diff --git a/bindings/src/Substate.ts → bindings/src/types/Substate.ts b/bindings/src/Substate.ts → bindings/src/types/Substate.ts
diff --git a/bindings/src/SubstateAddress.ts → bindings/src/types/SubstateAddress.ts b/bindings/src/SubstateAddress.ts → bindings/src/types/SubstateAddress.ts
diff --git a/bindings/src/SubstateDestroyed.ts → bindings/src/types/SubstateDestroyed.ts b/bindings/src/SubstateDestroyed.ts → bindings/src/types/SubstateDestroyed.ts
diff --git a/bindings/src/SubstateDiff.ts → bindings/src/types/SubstateDiff.ts b/bindings/src/SubstateDiff.ts → bindings/src/types/SubstateDiff.ts
diff --git a/bindings/src/SubstateId.ts → bindings/src/types/SubstateId.ts b/bindings/src/SubstateId.ts → bindings/src/types/SubstateId.ts
diff --git a/bindings/src/SubstateRecord.ts → bindings/src/types/SubstateRecord.ts b/bindings/src/SubstateRecord.ts → bindings/src/types/SubstateRecord.ts
diff --git a/bindings/src/SubstateRequirement.ts → bindings/src/types/SubstateRequirement.ts b/bindings/src/SubstateRequirement.ts → bindings/src/types/SubstateRequirement.ts
diff --git a/bindings/src/SubstateStatus.ts → bindings/src/types/SubstateStatus.ts b/bindings/src/SubstateStatus.ts → bindings/src/types/SubstateStatus.ts
diff --git a/bindings/src/SubstateValue.ts → bindings/src/types/SubstateValue.ts b/bindings/src/SubstateValue.ts → bindings/src/types/SubstateValue.ts
diff --git a/bindings/src/TemplateAbi.ts → bindings/src/types/TemplateAbi.ts b/bindings/src/TemplateAbi.ts → bindings/src/types/TemplateAbi.ts
diff --git a/bindings/src/TemplateMetadata.ts → bindings/src/types/TemplateMetadata.ts b/bindings/src/TemplateMetadata.ts → bindings/src/types/TemplateMetadata.ts
diff --git a/bindings/src/TemplateRegistrationRequest.ts → .../src/types/TemplateRegistrationRequest.ts b/bindings/src/TemplateRegistrationRequest.ts → .../src/types/TemplateRegistrationRequest.ts
diff --git a/bindings/src/TemplateRegistrationResponse.ts → ...src/types/TemplateRegistrationResponse.ts b/bindings/src/TemplateRegistrationResponse.ts → ...src/types/TemplateRegistrationResponse.ts
diff --git a/bindings/src/Transaction.ts → bindings/src/types/Transaction.ts b/bindings/src/Transaction.ts → bindings/src/types/Transaction.ts
diff --git a/bindings/src/TransactionAtom.ts → bindings/src/types/TransactionAtom.ts b/bindings/src/TransactionAtom.ts → bindings/src/types/TransactionAtom.ts
diff --git a/bindings/src/TransactionClaimBurnResponse.ts → ...src/types/TransactionClaimBurnResponse.ts b/bindings/src/TransactionClaimBurnResponse.ts → ...src/types/TransactionClaimBurnResponse.ts
diff --git a/bindings/src/TransactionGetAllRequest.ts → ...ngs/src/types/TransactionGetAllRequest.ts b/bindings/src/TransactionGetAllRequest.ts → ...ngs/src/types/TransactionGetAllRequest.ts
diff --git a/bindings/src/TransactionGetAllResponse.ts → ...gs/src/types/TransactionGetAllResponse.ts b/bindings/src/TransactionGetAllResponse.ts → ...gs/src/types/TransactionGetAllResponse.ts
diff --git a/bindings/src/TransactionGetRequest.ts → bindings/src/types/TransactionGetRequest.ts b/bindings/src/TransactionGetRequest.ts → bindings/src/types/TransactionGetRequest.ts
diff --git a/bindings/src/TransactionGetResponse.ts → bindings/src/types/TransactionGetResponse.ts b/bindings/src/TransactionGetResponse.ts → bindings/src/types/TransactionGetResponse.ts
diff --git a/bindings/src/TransactionGetResultRequest.ts → .../src/types/TransactionGetResultRequest.ts b/bindings/src/TransactionGetResultRequest.ts → .../src/types/TransactionGetResultRequest.ts
diff --git a/bindings/src/TransactionGetResultResponse.ts → ...src/types/TransactionGetResultResponse.ts b/bindings/src/TransactionGetResultResponse.ts → ...src/types/TransactionGetResultResponse.ts
diff --git a/bindings/src/TransactionId.ts → bindings/src/types/TransactionId.ts b/bindings/src/TransactionId.ts → bindings/src/types/TransactionId.ts
diff --git a/bindings/src/TransactionReceipt.ts → bindings/src/types/TransactionReceipt.ts b/bindings/src/TransactionReceipt.ts → bindings/src/types/TransactionReceipt.ts
diff --git a/bindings/src/TransactionReceiptAddress.ts → ...gs/src/types/TransactionReceiptAddress.ts b/bindings/src/TransactionReceiptAddress.ts → ...gs/src/types/TransactionReceiptAddress.ts
diff --git a/bindings/src/TransactionResult.ts → bindings/src/types/TransactionResult.ts b/bindings/src/TransactionResult.ts → bindings/src/types/TransactionResult.ts
diff --git a/bindings/src/TransactionSignature.ts → bindings/src/types/TransactionSignature.ts b/bindings/src/TransactionSignature.ts → bindings/src/types/TransactionSignature.ts
diff --git a/bindings/src/TransactionStatus.ts → bindings/src/types/TransactionStatus.ts b/bindings/src/TransactionStatus.ts → bindings/src/types/TransactionStatus.ts
diff --git a/bindings/src/TransactionSubmitRequest.ts → ...ngs/src/types/TransactionSubmitRequest.ts b/bindings/src/TransactionSubmitRequest.ts → ...ngs/src/types/TransactionSubmitRequest.ts
diff --git a/bindings/src/TransactionSubmitResponse.ts → ...gs/src/types/TransactionSubmitResponse.ts b/bindings/src/TransactionSubmitResponse.ts → ...gs/src/types/TransactionSubmitResponse.ts
diff --git a/bindings/src/TransactionWaitResultRequest.ts → ...src/types/TransactionWaitResultRequest.ts b/bindings/src/TransactionWaitResultRequest.ts → ...src/types/TransactionWaitResultRequest.ts
diff --git a/...ings/src/TransactionWaitResultResponse.ts → ...rc/types/TransactionWaitResultResponse.ts b/...ings/src/TransactionWaitResultResponse.ts → ...rc/types/TransactionWaitResultResponse.ts
diff --git a/bindings/src/TransferRequest.ts → bindings/src/types/TransferRequest.ts b/bindings/src/TransferRequest.ts → bindings/src/types/TransferRequest.ts
diff --git a/bindings/src/TransferResponse.ts → bindings/src/types/TransferResponse.ts b/bindings/src/TransferResponse.ts → bindings/src/types/TransferResponse.ts
diff --git a/bindings/src/Type.ts → bindings/src/types/Type.ts b/bindings/src/Type.ts → bindings/src/types/Type.ts
diff --git a/bindings/src/UnclaimedConfidentialOutput.ts → .../src/types/UnclaimedConfidentialOutput.ts b/bindings/src/UnclaimedConfidentialOutput.ts → .../src/types/UnclaimedConfidentialOutput.ts
diff --git a/...src/UnclaimedConfidentialOutputAddress.ts → ...pes/UnclaimedConfidentialOutputAddress.ts b/...src/UnclaimedConfidentialOutputAddress.ts → ...pes/UnclaimedConfidentialOutputAddress.ts
@@ -1,4 +1,3 @@
 // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { Hash } from "./Hash";
 
-export type UnclaimedConfidentialOutputAddress = Hash;
+export type UnclaimedConfidentialOutputAddress = string;
diff --git a/bindings/src/ValidatorFee.ts → bindings/src/types/ValidatorFee.ts b/bindings/src/ValidatorFee.ts → bindings/src/types/ValidatorFee.ts
diff --git a/bindings/src/ValidatorNode.ts → bindings/src/types/ValidatorNode.ts b/bindings/src/ValidatorNode.ts → bindings/src/types/ValidatorNode.ts
diff --git a/bindings/src/ValidatorSignature.ts → bindings/src/types/ValidatorSignature.ts b/bindings/src/ValidatorSignature.ts → bindings/src/types/ValidatorSignature.ts
diff --git a/bindings/src/Vault.ts → bindings/src/types/Vault.ts b/bindings/src/Vault.ts → bindings/src/types/Vault.ts
diff --git a/bindings/src/VaultId.ts → bindings/src/types/VaultId.ts b/bindings/src/VaultId.ts → bindings/src/types/VaultId.ts
diff --git a/bindings/src/WebRtcStart.ts → bindings/src/types/WebRtcStart.ts b/bindings/src/WebRtcStart.ts → bindings/src/types/WebRtcStart.ts
diff --git a/bindings/src/WebRtcStartRequest.ts → bindings/src/types/WebRtcStartRequest.ts b/bindings/src/WebRtcStartRequest.ts → bindings/src/types/WebRtcStartRequest.ts
diff --git a/bindings/src/WebRtcStartResponse.ts → bindings/src/types/WebRtcStartResponse.ts b/bindings/src/WebRtcStartResponse.ts → bindings/src/types/WebRtcStartResponse.ts
diff --git a/clients/tari_indexer_client/src/types.rs b/clients/tari_indexer_client/src/types.rs
@@ -20,7 +20,7 @@ use tari_transaction::{SubstateRequirement, Transaction, TransactionId};
 use ts_rs::TS;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct GetSubstateRequest {
     #[serde(with = "serde_tools::string")]
     pub address: SubstateId,
@@ -30,7 +30,7 @@ pub struct GetSubstateRequest {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct GetSubstateResponse {
     #[serde(with = "serde_tools::string")]
     pub address: SubstateId,
@@ -41,7 +41,7 @@ pub struct GetSubstateResponse {
 
 #[serde_as]
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct InspectSubstateRequest {
     #[serde_as(as = "DisplayFromStr")]
     pub address: SubstateId,
@@ -50,7 +50,7 @@ pub struct InspectSubstateRequest {
 
 #[serde_as]
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct InspectSubstateResponse {
     #[serde_as(as = "DisplayFromStr")]
     pub address: SubstateId,
@@ -61,34 +61,34 @@ pub struct InspectSubstateResponse {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct SubmitTransactionRequest {
     pub transaction: Transaction,
     pub required_substates: Vec<SubstateRequirement>,
     pub is_dry_run: bool,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct SubmitTransactionResponse {
     pub transaction_id: TransactionId,
     pub result: IndexerTransactionFinalizedResult,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct GetTransactionResultRequest {
     pub transaction_id: TransactionId,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct GetTransactionResultResponse {
     pub result: IndexerTransactionFinalizedResult,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub enum IndexerTransactionFinalizedResult {
     Pending,
     Finalized {
@@ -103,7 +103,7 @@ pub enum IndexerTransactionFinalizedResult {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct GetIdentityResponse {
     pub peer_id: String,
     #[cfg_attr(feature = "ts", ts(type = "string"))]
@@ -114,31 +114,31 @@ pub struct GetIdentityResponse {
 
 #[serde_as]
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct AddAddressRequest {
     #[serde_as(as = "DisplayFromStr")]
     pub address: SubstateId,
 }
 
 #[serde_as]
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct DeleteAddressRequest {
     #[serde_as(as = "DisplayFromStr")]
     pub address: SubstateId,
 }
 
 #[serde_as]
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct GetNonFungibleCountRequest {
     #[serde_as(as = "DisplayFromStr")]
     pub address: SubstateId,
 }
 
 #[serde_as]
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct GetNonFungiblesRequest {
     #[serde_as(as = "DisplayFromStr")]
     pub address: SubstateId,
@@ -147,14 +147,14 @@ pub struct GetNonFungiblesRequest {
 }
 
 #[derive(Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct GetNonFungiblesResponse {
     pub non_fungibles: Vec<NonFungibleSubstate>,
 }
 
 #[serde_as]
 #[derive(Debug, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct NonFungibleSubstate {
     pub index: u64,
     #[serde_as(as = "DisplayFromStr")]
@@ -164,21 +164,21 @@ pub struct NonFungibleSubstate {
 
 #[serde_as]
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct GetRelatedTransactionsRequest {
     #[serde_as(as = "DisplayFromStr")]
     pub address: SubstateId,
     pub version: Option<u32>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct GetRelatedTransactionsResponse {
     pub transaction_results: Vec<IndexerTransactionFinalizedResult>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct AddPeerRequest {
     #[cfg_attr(feature = "ts", ts(type = "string"))]
     pub public_key: PublicKey,
@@ -188,18 +188,18 @@ pub struct AddPeerRequest {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct AddPeerResponse {}
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct GetEpochManagerStatsResponse {
     pub current_epoch: Epoch,
     pub current_block_height: u64,
 }
 
 #[derive(Serialize, Debug)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct Connection {
     pub connection_id: String,
     pub peer_id: String,
@@ -213,14 +213,14 @@ pub struct Connection {
 }
 
 #[derive(Serialize, Debug)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub enum ConnectionDirection {
     Inbound,
     Outbound,
 }
 
 #[derive(Serialize, Debug)]
-#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/"))]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct GetConnectionsResponse {
     pub connections: Vec<Connection>,
 }