small update

bindings/index.ts

@@ -38,6 +38,7 @@ export * from "./src/types/BalanceProofSignature";
 export * from "./src/types/Block";
 export * from "./src/types/BlockId";
 export * from "./src/types/BucketId";
+export * from "./src/types/CallInstructionRequest";
 export * from "./src/types/ClaimBurnRequest";
 export * from "./src/types/ClaimBurnResponse";
 export * from "./src/types/Claims";

bindings/src/helpers/helpers.ts

@@ -1,7 +1,13 @@
+import { JrpcPermission } from "../types/JrpcPermission";
 import { RejectReason } from "../types/RejectReason";
+import { SubstateDiff } from "../types/SubstateDiff";
 import { SubstateId } from "../types/SubstateId";
+import { TransactionResult } from "../types/TransactionResult";
 
-export function substateIdToString(substateId: SubstateId): string {
+export function substateIdToString(substateId: SubstateId | null): string {
+  if (substateId === null) {
+    return "";
+  }
   if ("Component" in substateId) {
     return substateId.Component;
   }
@@ -30,25 +36,70 @@ export function substateIdToString(substateId: SubstateId): string {
   return "Unknown";
 }
 
-export function rejectReasonToString(reason: RejectReason): string {
+export function rejectReasonToString(reason: RejectReason | null): string {
+  if (reason === null) {
+    return "";
+  }
   if (typeof reason === "string") {
     return reason;
   }
   if ("ShardsNotPledged" in reason) {
-    return reason.ShardsNotPledged;
+    return `ShardsNotPledged(${reason.ShardsNotPledged})`;
   }
   if ("ExecutionFailure" in reason) {
-    return reason.ExecutionFailure;
+    return `ExecutionFailure(${reason.ExecutionFailure})`;
   }
   if ("ShardPledgedToAnotherPayload" in reason) {
-    return reason.ShardPledgedToAnotherPayload;
+    return `ShardPledgedToAnotherPayload(${reason.ShardPledgedToAnotherPayload})`;
   }
   if ("ShardRejected" in reason) {
-    return reason.ShardRejected;
+    return `ShardRejected(${reason.ShardRejected})`;
   }
   if ("FeesNotPaid" in reason) {
-    return reason.FeesNotPaid;
+    return `FeesNotPaid(${reason.FeesNotPaid})`;
   }
   console.error("Unknown reason", reason);
   return "Unknown";
 }
+
+export function getSubstateDiffFromTransactionResult(result: TransactionResult): SubstateDiff | null {
+  if ("Accept" in result) {
+    return result.Accept;
+  }
+  if ("AcceptFeeRejectRest" in result) {
+    return result.AcceptFeeRejectRest[0];
+  }
+  return null;
+}
+
+export function getRejectReasonFromTransactionResult(result: TransactionResult): RejectReason | null {
+  if ("Reject" in result) {
+    return result.Reject;
+  }
+  if ("AcceptFeeRejectRest" in result) {
+    return result.AcceptFeeRejectRest[1];
+  }
+  return null;
+}
+
+export function jrpcPermissionToString(jrpcPermission: JrpcPermission): string {
+  if (typeof jrpcPermission === "string") {
+    return jrpcPermission;
+  }
+  if ("NftGetOwnershipProof" in jrpcPermission) {
+    return `NftGetOwnershipProof(${jrpcPermission.NftGetOwnershipProof})`;
+  }
+  if ("AccountBalance" in jrpcPermission) {
+    return `AccountBalance(${substateIdToString(jrpcPermission.AccountBalance)})`;
+  }
+  if ("AccountList" in jrpcPermission) {
+    return `AccountList(${jrpcPermission.AccountList})`;
+  }
+  if ("TransactionSend" in jrpcPermission) {
+    return `TransactionSend(${jrpcPermission.TransactionSend})`;
+  }
+  if ("GetNft" in jrpcPermission) {
+    return `GetNft(${substateIdToString(jrpcPermission.GetNft[0])}, ${jrpcPermission.GetNft[1]})`;
+  }
+  return "Unknown";
+}

bindings/src/types/CallInstructionRequest.ts

@@ -0,0 +1,18 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { ComponentAddressOrName } from "./ComponentAddressOrName";
+import type { Instruction } from "./Instruction";
+import type { SubstateRequirement } from "./SubstateRequirement";
+
+export interface CallInstructionRequest {
+  instructions: Array<Instruction>;
+  fee_account: ComponentAddressOrName;
+  dump_outputs_into: ComponentAddressOrName | null;
+  max_fee: bigint;
+  inputs: Array<SubstateRequirement>;
+  override_inputs: boolean | null;
+  new_outputs: number | null;
+  is_dry_run: boolean;
+  proof_ids: Array<bigint>;
+  min_epoch: bigint | null;
+  max_epoch: bigint | null;
+}

bindings/src/types/Claims.ts

@@ -2,7 +2,7 @@
 import type { JrpcPermissions } from "./JrpcPermissions";
 
 export interface Claims {
-  id: bigint;
+  id: number;
   name: string;
   permissions: JrpcPermissions;
   exp: number;

bindings/src/types/LogEntry.ts

@@ -2,7 +2,7 @@
 import type { LogLevel } from "./LogLevel";
 
 export interface LogEntry {
-  timestamp: bigint;
+  timestamp: number;
   message: string;
   level: LogLevel;
 }

clients/validator_node_client/src/types.rs

@@ -248,6 +248,7 @@ pub struct GetBlocksCountResponse {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct LogEntry {
+    #[cfg_attr(feature = "ts", ts(type = "number"))]
     pub timestamp: u64,
     pub message: String,
     pub level: LogLevel,

clients/wallet_daemon_client/src/types.rs

@@ -54,12 +54,14 @@ use crate::{
 };
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
+#[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct CallInstructionRequest {
     pub instructions: Vec<Instruction>,
     #[serde(deserialize_with = "string_or_struct")]
     pub fee_account: ComponentAddressOrName,
     #[serde(default, deserialize_with = "opt_string_or_struct")]
     pub dump_outputs_into: Option<ComponentAddressOrName>,
+    #[cfg_attr(feature = "ts", ts(type = "number"))]
     pub max_fee: u64,
     #[serde(default)]
     pub inputs: Vec<SubstateRequirement>,
@@ -72,8 +74,10 @@ pub struct CallInstructionRequest {
     #[serde(default)]
     pub proof_ids: Vec<ConfidentialProofId>,
     #[serde(default)]
+    #[cfg_attr(feature = "ts", ts(type = "number | null"))]
     pub min_epoch: Option<u64>,
     #[serde(default)]
+    #[cfg_attr(feature = "ts", ts(type = "number | null"))]
     pub max_epoch: Option<u64>,
 }
 

dan_layer/wallet/sdk/src/apis/jwt.rs

@@ -144,6 +144,7 @@ impl TryFrom<&[String]> for JrpcPermissions {
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[cfg_attr(feature = "ts", derive(TS), ts(export, export_to = "../../bindings/src/types/"))]
 pub struct Claims {
+    #[cfg_attr(feature = "ts", ts(type = "number"))]
     pub id: u64,
     pub name: String,
     pub permissions: JrpcPermissions,