zkcloudworker 0.18.27 → 0.18.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1933,12 +1933,70 @@ var TokenAPI = class {
1933
1933
  console.log("waitForJobResult result:", deployResult?.result?.result?.slice(0, 50));
1934
1934
  return deployResult?.result?.result ?? "error";
1935
1935
  }
1936
+ // async getResult(jobId: string): Promise<FungibleTokenJobResult> {
1937
+ // try {
1938
+ // const callResult = await this.client.jobResult({ jobId });
1939
+ // let jobStatus: JobStatus | "unknown" = "unknown";
1940
+ // if (callResult?.result && typeof callResult?.result !== "string")
1941
+ // jobStatus = callResult.result.jobStatus ?? "unknown";
1942
+ // if (!callResult.success) {
1943
+ // //console.error("Job result error", jobId, JSON.stringify(callResult));
1944
+ // return {
1945
+ // success: false,
1946
+ // error: callResult?.error,
1947
+ // jobStatus,
1948
+ // };
1949
+ // }
1950
+ // if (callResult.error)
1951
+ // return {
1952
+ // success: false,
1953
+ // error: callResult.error,
1954
+ // jobStatus,
1955
+ // };
1956
+ // const jobResult = callResult.result?.result;
1957
+ // if (!jobResult) return { success: true, jobStatus };
1958
+ // if (typeof jobResult !== "string")
1959
+ // return {
1960
+ // success: false,
1961
+ // error: `Job result is not a string: ${String(jobResult)}`,
1962
+ // jobStatus,
1963
+ // };
1964
+ // if (jobResult.toLowerCase().startsWith("error"))
1965
+ // return {
1966
+ // success: false,
1967
+ // error: jobResult,
1968
+ // jobStatus,
1969
+ // };
1970
+ // try {
1971
+ // const { success, tx, hash, error } = JSON.parse(jobResult);
1972
+ // if (success === undefined)
1973
+ // return {
1974
+ // success: false,
1975
+ // tx,
1976
+ // hash,
1977
+ // error,
1978
+ // jobStatus,
1979
+ // };
1980
+ // return { success, tx, hash, error, jobStatus };
1981
+ // } catch (e: any) {
1982
+ // return {
1983
+ // success: false,
1984
+ // error: `Error parsing job result: ${jobResult} ${e?.message ?? ""}`,
1985
+ // jobStatus,
1986
+ // };
1987
+ // }
1988
+ // } catch (e: any) {
1989
+ // return {
1990
+ // success: false,
1991
+ // error: `Error getting job result: ${e?.message ?? ""}`,
1992
+ // jobStatus: "unknown",
1993
+ // };
1994
+ // }
1995
+ // }
1936
1996
  async getResult(jobId) {
1937
1997
  try {
1938
1998
  const callResult = await this.client.jobResult({ jobId });
1939
- let jobStatus = "unknown";
1940
- if (callResult?.result && typeof callResult?.result !== "string")
1941
- jobStatus = callResult.result.jobStatus ?? "unknown";
1999
+ const jobStatus = typeof callResult?.result === "string" ? void 0 : callResult?.result?.jobStatus;
1942
2000
  if (!callResult.success) {
1943
2001
  return {
1944
2002
  success: false,
@@ -1946,21 +2004,15 @@ var TokenAPI = class {
1946
2004
  jobStatus
1947
2005
  };
1948
2006
  }
2007
+ const jobResult = callResult.result?.result;
1949
2008
  if (callResult.error)
1950
2009
  return {
1951
2010
  success: false,
1952
2011
  error: callResult.error,
1953
2012
  jobStatus
1954
2013
  };
1955
- const jobResult = callResult.result?.result;
1956
2014
  if (!jobResult)
1957
2015
  return { success: true, jobStatus };
1958
- if (typeof jobResult !== "string")
1959
- return {
1960
- success: false,
1961
- error: `Job result is not a string: ${String(jobResult)}`,
1962
- jobStatus
1963
- };
1964
2016
  if (jobResult.toLowerCase().startsWith("error"))
1965
2017
  return {
1966
2018
  success: false,
@@ -1989,7 +2041,7 @@ var TokenAPI = class {
1989
2041
  return {
1990
2042
  success: false,
1991
2043
  error: `Error getting job result: ${e?.message ?? ""}`,
1992
- jobStatus: "unknown"
2044
+ jobStatus: void 0
1993
2045
  };
1994
2046
  }
1995
2047
  }
@@ -41,7 +41,7 @@ export interface FungibleTokenTransactionParams {
41
41
  }
42
42
  export interface FungibleTokenJobResult {
43
43
  success: boolean;
44
- jobStatus: JobStatus | "unknown";
44
+ jobStatus?: JobStatus;
45
45
  tx?: string;
46
46
  hash?: string;
47
47
  error?: string;
@@ -49,35 +49,92 @@ export class TokenAPI {
49
49
  console.log("waitForJobResult result:", deployResult?.result?.result?.slice(0, 50));
50
50
  return deployResult?.result?.result ?? "error";
51
51
  }
52
+ // async getResult(jobId: string): Promise<FungibleTokenJobResult> {
53
+ // try {
54
+ // const callResult = await this.client.jobResult({ jobId });
55
+ // let jobStatus: JobStatus | "unknown" = "unknown";
56
+ // if (callResult?.result && typeof callResult?.result !== "string")
57
+ // jobStatus = callResult.result.jobStatus ?? "unknown";
58
+ // if (!callResult.success) {
59
+ // //console.error("Job result error", jobId, JSON.stringify(callResult));
60
+ // return {
61
+ // success: false,
62
+ // error: callResult?.error,
63
+ // jobStatus,
64
+ // };
65
+ // }
66
+ // if (callResult.error)
67
+ // return {
68
+ // success: false,
69
+ // error: callResult.error,
70
+ // jobStatus,
71
+ // };
72
+ // const jobResult = callResult.result?.result;
73
+ // if (!jobResult) return { success: true, jobStatus };
74
+ // if (typeof jobResult !== "string")
75
+ // return {
76
+ // success: false,
77
+ // error: `Job result is not a string: ${String(jobResult)}`,
78
+ // jobStatus,
79
+ // };
80
+ // if (jobResult.toLowerCase().startsWith("error"))
81
+ // return {
82
+ // success: false,
83
+ // error: jobResult,
84
+ // jobStatus,
85
+ // };
86
+ // try {
87
+ // const { success, tx, hash, error } = JSON.parse(jobResult);
88
+ // if (success === undefined)
89
+ // return {
90
+ // success: false,
91
+ // tx,
92
+ // hash,
93
+ // error,
94
+ // jobStatus,
95
+ // };
96
+ // return { success, tx, hash, error, jobStatus };
97
+ // } catch (e: any) {
98
+ // return {
99
+ // success: false,
100
+ // error: `Error parsing job result: ${jobResult} ${e?.message ?? ""}`,
101
+ // jobStatus,
102
+ // };
103
+ // }
104
+ // } catch (e: any) {
105
+ // return {
106
+ // success: false,
107
+ // error: `Error getting job result: ${e?.message ?? ""}`,
108
+ // jobStatus: "unknown",
109
+ // };
110
+ // }
111
+ // }
52
112
  async getResult(jobId) {
53
113
  try {
54
114
  const callResult = await this.client.jobResult({ jobId });
55
- let jobStatus = "unknown";
56
- if (callResult?.result && typeof callResult?.result !== "string")
57
- jobStatus = callResult.result.jobStatus ?? "unknown";
115
+ // const jobStatus: JobStatus | undefined =
116
+ // callResult?.success === true
117
+ // ? callResult?.result?.jobStatus
118
+ // : undefined;
119
+ const jobStatus = typeof callResult?.result === "string"
120
+ ? undefined
121
+ : callResult?.result?.jobStatus;
58
122
  if (!callResult.success) {
59
- //console.error("Job result error", jobId, JSON.stringify(callResult));
60
123
  return {
61
124
  success: false,
62
125
  error: callResult?.error,
63
126
  jobStatus,
64
127
  };
65
128
  }
129
+ const jobResult = callResult.result?.result;
66
130
  if (callResult.error)
67
131
  return {
68
132
  success: false,
69
133
  error: callResult.error,
70
134
  jobStatus,
71
135
  };
72
- const jobResult = callResult.result?.result;
73
136
  if (!jobResult)
74
137
  return { success: true, jobStatus };
75
- if (typeof jobResult !== "string")
76
- return {
77
- success: false,
78
- error: `Job result is not a string: ${String(jobResult)}`,
79
- jobStatus,
80
- };
81
138
  if (jobResult.toLowerCase().startsWith("error"))
82
139
  return {
83
140
  success: false,
@@ -108,7 +165,7 @@ export class TokenAPI {
108
165
  return {
109
166
  success: false,
110
167
  error: `Error getting job result: ${e?.message ?? ""}`,
111
- jobStatus: "unknown",
168
+ jobStatus: undefined,
112
169
  };
113
170
  }
114
171
  }
@@ -1 +1 @@
1
- {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/mina/token/api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAwDpD,MAAM,OAAO,QAAQ;IAGnB,YAAY,MAIX;QACC,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;QAC7C,IAAI,GAAG,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAE3D,IAAI,CAAC,MAAM,GAAG,IAAI,mBAAmB,CAAC;YACpC,GAAG;YACH,KAAK;YACL,aAAa;SACd,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,qBAAqB,CACzB,MAAiC;QAEjC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;QAE1B,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;YACvC,SAAS,EAAE,MAAM;YACjB,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,CAAC,WAAW,CAAC;YAC3B,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC;YAC3D,QAAQ,EAAE,gBAAgB,MAAM,EAAE;SACnC,CAAC,CAAC;QAEH,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC3B,IAAI,KAAK,KAAK,SAAS;YACrB,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAClE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,MAAsC;QAEtC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;QAElC,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;QAEpD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;YACvC,SAAS,EAAE,MAAM;YACjB,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,CAAC,WAAW,CAAC;YAC3B,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC;YAC3D,QAAQ,EAAE,GAAG,MAAM,SAAS,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;SACzD,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC3B,IAAI,KAAK,KAAK,SAAS;YACrB,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACnE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,wGAAwG;IACxG,iEAAiE;IACjE,KAAK,CAAC,gBAAgB,CAAC,MAMtB;QACC,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAChE,OAAO,CAAC,GAAG,CACT,0BAA0B,EAC1B,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAC3C,CAAC;QACF,OAAO,YAAY,EAAE,MAAM,EAAE,MAAM,IAAI,OAAO,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAa;QAC3B,IAAI,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1D,IAAI,SAAS,GAA0B,SAAS,CAAC;YACjD,IAAI,UAAU,EAAE,MAAM,IAAI,OAAO,UAAU,EAAE,MAAM,KAAK,QAAQ;gBAC9D,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,SAAS,IAAI,SAAS,CAAC;YAEvD,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;gBACxB,uEAAuE;gBACvE,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,UAAU,EAAE,KAAK;oBACxB,SAAS;iBACV,CAAC;YACJ,CAAC;YAED,IAAI,UAAU,CAAC,KAAK;gBAClB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,UAAU,CAAC,KAAK;oBACvB,SAAS;iBACV,CAAC;YAEJ,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC;YAC5C,IAAI,CAAC,SAAS;gBAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YAEpD,IAAI,OAAO,SAAS,KAAK,QAAQ;gBAC/B,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,+BAA+B,MAAM,CAAC,SAAS,CAAC,EAAE;oBACzD,SAAS;iBACV,CAAC;YAEJ,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;gBAC7C,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,SAAS;oBAChB,SAAS;iBACV,CAAC;YAEJ,IAAI,CAAC;gBACH,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;gBAC3D,IAAI,OAAO,KAAK,SAAS;oBACvB,OAAO;wBACL,OAAO,EAAE,KAAK;wBACd,EAAE;wBACF,IAAI;wBACJ,KAAK;wBACL,SAAS;qBACV,CAAC;gBACJ,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;YACjD,CAAC;YAAC,OAAO,CAAM,EAAE,CAAC;gBAChB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,6BAA6B,SAAS,IAAI,CAAC,EAAE,OAAO,IAAI,EAAE,EAAE;oBACnE,SAAS;iBACV,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,6BAA6B,CAAC,EAAE,OAAO,IAAI,EAAE,EAAE;gBACtD,SAAS,EAAE,SAAS;aACrB,CAAC;QACJ,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/mina/token/api.ts"],"names":[],"mappings":"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"}
@@ -41,7 +41,7 @@ export interface FungibleTokenTransactionParams {
41
41
  }
42
42
  export interface FungibleTokenJobResult {
43
43
  success: boolean;
44
- jobStatus: JobStatus | "unknown";
44
+ jobStatus?: JobStatus;
45
45
  tx?: string;
46
46
  hash?: string;
47
47
  error?: string;
@@ -49,35 +49,92 @@ export class TokenAPI {
49
49
  console.log("waitForJobResult result:", deployResult?.result?.result?.slice(0, 50));
50
50
  return deployResult?.result?.result ?? "error";
51
51
  }
52
+ // async getResult(jobId: string): Promise<FungibleTokenJobResult> {
53
+ // try {
54
+ // const callResult = await this.client.jobResult({ jobId });
55
+ // let jobStatus: JobStatus | "unknown" = "unknown";
56
+ // if (callResult?.result && typeof callResult?.result !== "string")
57
+ // jobStatus = callResult.result.jobStatus ?? "unknown";
58
+ // if (!callResult.success) {
59
+ // //console.error("Job result error", jobId, JSON.stringify(callResult));
60
+ // return {
61
+ // success: false,
62
+ // error: callResult?.error,
63
+ // jobStatus,
64
+ // };
65
+ // }
66
+ // if (callResult.error)
67
+ // return {
68
+ // success: false,
69
+ // error: callResult.error,
70
+ // jobStatus,
71
+ // };
72
+ // const jobResult = callResult.result?.result;
73
+ // if (!jobResult) return { success: true, jobStatus };
74
+ // if (typeof jobResult !== "string")
75
+ // return {
76
+ // success: false,
77
+ // error: `Job result is not a string: ${String(jobResult)}`,
78
+ // jobStatus,
79
+ // };
80
+ // if (jobResult.toLowerCase().startsWith("error"))
81
+ // return {
82
+ // success: false,
83
+ // error: jobResult,
84
+ // jobStatus,
85
+ // };
86
+ // try {
87
+ // const { success, tx, hash, error } = JSON.parse(jobResult);
88
+ // if (success === undefined)
89
+ // return {
90
+ // success: false,
91
+ // tx,
92
+ // hash,
93
+ // error,
94
+ // jobStatus,
95
+ // };
96
+ // return { success, tx, hash, error, jobStatus };
97
+ // } catch (e: any) {
98
+ // return {
99
+ // success: false,
100
+ // error: `Error parsing job result: ${jobResult} ${e?.message ?? ""}`,
101
+ // jobStatus,
102
+ // };
103
+ // }
104
+ // } catch (e: any) {
105
+ // return {
106
+ // success: false,
107
+ // error: `Error getting job result: ${e?.message ?? ""}`,
108
+ // jobStatus: "unknown",
109
+ // };
110
+ // }
111
+ // }
52
112
  async getResult(jobId) {
53
113
  try {
54
114
  const callResult = await this.client.jobResult({ jobId });
55
- let jobStatus = "unknown";
56
- if (callResult?.result && typeof callResult?.result !== "string")
57
- jobStatus = callResult.result.jobStatus ?? "unknown";
115
+ // const jobStatus: JobStatus | undefined =
116
+ // callResult?.success === true
117
+ // ? callResult?.result?.jobStatus
118
+ // : undefined;
119
+ const jobStatus = typeof callResult?.result === "string"
120
+ ? undefined
121
+ : callResult?.result?.jobStatus;
58
122
  if (!callResult.success) {
59
- //console.error("Job result error", jobId, JSON.stringify(callResult));
60
123
  return {
61
124
  success: false,
62
125
  error: callResult?.error,
63
126
  jobStatus,
64
127
  };
65
128
  }
129
+ const jobResult = callResult.result?.result;
66
130
  if (callResult.error)
67
131
  return {
68
132
  success: false,
69
133
  error: callResult.error,
70
134
  jobStatus,
71
135
  };
72
- const jobResult = callResult.result?.result;
73
136
  if (!jobResult)
74
137
  return { success: true, jobStatus };
75
- if (typeof jobResult !== "string")
76
- return {
77
- success: false,
78
- error: `Job result is not a string: ${String(jobResult)}`,
79
- jobStatus,
80
- };
81
138
  if (jobResult.toLowerCase().startsWith("error"))
82
139
  return {
83
140
  success: false,
@@ -108,7 +165,7 @@ export class TokenAPI {
108
165
  return {
109
166
  success: false,
110
167
  error: `Error getting job result: ${e?.message ?? ""}`,
111
- jobStatus: "unknown",
168
+ jobStatus: undefined,
112
169
  };
113
170
  }
114
171
  }
@@ -1 +1 @@
1
- {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/mina/token/api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../src/mina/token/api.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zkcloudworker",
3
- "version": "0.18.27",
3
+ "version": "0.18.29",
4
4
  "type": "module",
5
5
  "description": "zkCloudWorker library",
6
6
  "author": "zkCloudWorker",
@@ -47,9 +47,17 @@ export interface FungibleTokenTransactionParams {
47
47
  symbol?: string;
48
48
  }
49
49
 
50
+ // export interface FungibleTokenJobResult {
51
+ // success: boolean;
52
+ // jobStatus: JobStatus | "unknown";
53
+ // tx?: string;
54
+ // hash?: string;
55
+ // error?: string;
56
+ // }
57
+
50
58
  export interface FungibleTokenJobResult {
51
59
  success: boolean;
52
- jobStatus: JobStatus | "unknown";
60
+ jobStatus?: JobStatus;
53
61
  tx?: string;
54
62
  hash?: string;
55
63
  error?: string;
@@ -133,39 +141,100 @@ export class TokenAPI {
133
141
  return deployResult?.result?.result ?? "error";
134
142
  }
135
143
 
144
+ // async getResult(jobId: string): Promise<FungibleTokenJobResult> {
145
+ // try {
146
+ // const callResult = await this.client.jobResult({ jobId });
147
+ // let jobStatus: JobStatus | "unknown" = "unknown";
148
+ // if (callResult?.result && typeof callResult?.result !== "string")
149
+ // jobStatus = callResult.result.jobStatus ?? "unknown";
150
+
151
+ // if (!callResult.success) {
152
+ // //console.error("Job result error", jobId, JSON.stringify(callResult));
153
+ // return {
154
+ // success: false,
155
+ // error: callResult?.error,
156
+ // jobStatus,
157
+ // };
158
+ // }
159
+
160
+ // if (callResult.error)
161
+ // return {
162
+ // success: false,
163
+ // error: callResult.error,
164
+ // jobStatus,
165
+ // };
166
+
167
+ // const jobResult = callResult.result?.result;
168
+ // if (!jobResult) return { success: true, jobStatus };
169
+
170
+ // if (typeof jobResult !== "string")
171
+ // return {
172
+ // success: false,
173
+ // error: `Job result is not a string: ${String(jobResult)}`,
174
+ // jobStatus,
175
+ // };
176
+
177
+ // if (jobResult.toLowerCase().startsWith("error"))
178
+ // return {
179
+ // success: false,
180
+ // error: jobResult,
181
+ // jobStatus,
182
+ // };
183
+
184
+ // try {
185
+ // const { success, tx, hash, error } = JSON.parse(jobResult);
186
+ // if (success === undefined)
187
+ // return {
188
+ // success: false,
189
+ // tx,
190
+ // hash,
191
+ // error,
192
+ // jobStatus,
193
+ // };
194
+ // return { success, tx, hash, error, jobStatus };
195
+ // } catch (e: any) {
196
+ // return {
197
+ // success: false,
198
+ // error: `Error parsing job result: ${jobResult} ${e?.message ?? ""}`,
199
+ // jobStatus,
200
+ // };
201
+ // }
202
+ // } catch (e: any) {
203
+ // return {
204
+ // success: false,
205
+ // error: `Error getting job result: ${e?.message ?? ""}`,
206
+ // jobStatus: "unknown",
207
+ // };
208
+ // }
209
+ // }
210
+
136
211
  async getResult(jobId: string): Promise<FungibleTokenJobResult> {
137
212
  try {
138
213
  const callResult = await this.client.jobResult({ jobId });
139
- let jobStatus: JobStatus | "unknown" = "unknown";
140
- if (callResult?.result && typeof callResult?.result !== "string")
141
- jobStatus = callResult.result.jobStatus ?? "unknown";
142
-
214
+ // const jobStatus: JobStatus | undefined =
215
+ // callResult?.success === true
216
+ // ? callResult?.result?.jobStatus
217
+ // : undefined;
218
+ const jobStatus: JobStatus | undefined =
219
+ typeof callResult?.result === "string"
220
+ ? undefined
221
+ : callResult?.result?.jobStatus;
143
222
  if (!callResult.success) {
144
- //console.error("Job result error", jobId, JSON.stringify(callResult));
145
223
  return {
146
224
  success: false,
147
225
  error: callResult?.error,
148
226
  jobStatus,
149
227
  };
150
228
  }
151
-
229
+ const jobResult = callResult.result?.result;
152
230
  if (callResult.error)
153
231
  return {
154
232
  success: false,
155
233
  error: callResult.error,
156
234
  jobStatus,
157
235
  };
158
-
159
- const jobResult = callResult.result?.result;
160
236
  if (!jobResult) return { success: true, jobStatus };
161
237
 
162
- if (typeof jobResult !== "string")
163
- return {
164
- success: false,
165
- error: `Job result is not a string: ${String(jobResult)}`,
166
- jobStatus,
167
- };
168
-
169
238
  if (jobResult.toLowerCase().startsWith("error"))
170
239
  return {
171
240
  success: false,
@@ -195,7 +264,7 @@ export class TokenAPI {
195
264
  return {
196
265
  success: false,
197
266
  error: `Error getting job result: ${e?.message ?? ""}`,
198
- jobStatus: "unknown",
267
+ jobStatus: undefined,
199
268
  };
200
269
  }
201
270
  }