@rozoai/intent-common 0.0.32-beta.2 → 0.0.32-beta.3
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.
- package/dist/api/new-payment.d.ts +15 -15
- package/dist/api/new-payment.js +2 -2
- package/dist/api/new-payment.js.map +1 -1
- package/dist/api/payment.d.ts +4 -1
- package/dist/api/payment.js.map +1 -1
- package/dist/bridge.d.ts +2 -1
- package/dist/bridge.js +41 -1
- package/dist/bridge.js.map +1 -1
- package/package.json +1 -1
- package/src/api/new-payment.ts +16 -16
- package/src/api/payment.ts +10 -5
- package/src/bridge.ts +49 -1
|
@@ -212,42 +212,42 @@ export interface PaymentResponse {
|
|
|
212
212
|
/**
|
|
213
213
|
* Your application ID
|
|
214
214
|
*/
|
|
215
|
-
appId
|
|
215
|
+
appId: string;
|
|
216
216
|
/**
|
|
217
217
|
* ISO 8601 timestamp
|
|
218
218
|
*/
|
|
219
|
-
createdAt
|
|
220
|
-
destination
|
|
221
|
-
display
|
|
222
|
-
errorCode
|
|
219
|
+
createdAt: Date;
|
|
220
|
+
destination: DestinationResponse;
|
|
221
|
+
display: DisplayInfo;
|
|
222
|
+
errorCode: PaymentErrorCode | null;
|
|
223
223
|
/**
|
|
224
224
|
* ISO 8601 timestamp (when payment expires)
|
|
225
225
|
*/
|
|
226
|
-
expiresAt
|
|
226
|
+
expiresAt: Date;
|
|
227
227
|
/**
|
|
228
228
|
* Payment ID
|
|
229
229
|
*/
|
|
230
|
-
id
|
|
231
|
-
metadata
|
|
230
|
+
id: string;
|
|
231
|
+
metadata: {
|
|
232
232
|
[key: string]: any;
|
|
233
|
-
};
|
|
233
|
+
} | null;
|
|
234
234
|
/**
|
|
235
235
|
* Your order reference ID
|
|
236
236
|
*/
|
|
237
|
-
orderId
|
|
238
|
-
source
|
|
239
|
-
status
|
|
240
|
-
type
|
|
237
|
+
orderId: string | null;
|
|
238
|
+
source: SourceResponse;
|
|
239
|
+
status: PaymentStatus;
|
|
240
|
+
type: FeeType;
|
|
241
241
|
/**
|
|
242
242
|
* ISO 8601 timestamp
|
|
243
243
|
*/
|
|
244
|
-
updatedAt
|
|
244
|
+
updatedAt: Date;
|
|
245
245
|
/**
|
|
246
246
|
* Secret for webhook signature verification.
|
|
247
247
|
* Only present when webhookUrl was provided in the request.
|
|
248
248
|
* Store this securely to verify incoming webhook signatures.
|
|
249
249
|
*/
|
|
250
|
-
webhookSecret
|
|
250
|
+
webhookSecret: string | null;
|
|
251
251
|
[property: string]: any;
|
|
252
252
|
}
|
|
253
253
|
/**
|
package/dist/api/new-payment.js
CHANGED
|
@@ -83,9 +83,9 @@ async function createNewPayment(params) {
|
|
|
83
83
|
preferredTokenAddress,
|
|
84
84
|
});
|
|
85
85
|
const sourceChain = (0, chain_1.getChainById)(Number(preferred.preferredChain));
|
|
86
|
-
const sourceToken = (0, token_1.getKnownToken)(Number(preferred.preferredChain), preferred.
|
|
86
|
+
const sourceToken = (0, token_1.getKnownToken)(Number(preferred.preferredChain), preferred.preferredTokenAddress);
|
|
87
87
|
const destinationChain = (0, chain_1.getChainById)(Number(destination.chainId));
|
|
88
|
-
const destinationToken = (0, token_1.getKnownToken)(Number(destination.chainId), destination.
|
|
88
|
+
const destinationToken = (0, token_1.getKnownToken)(Number(destination.chainId), destination.tokenAddress);
|
|
89
89
|
if (!sourceToken || !destinationToken) {
|
|
90
90
|
throw new Error("Source or destination token not found");
|
|
91
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new-payment.js","sourceRoot":"","sources":["../../src/api/new-payment.ts"],"names":[],"mappings":";;;AA0UA,4CA2FC;AAraD,sCAAsD;AACtD,oCAAwC;AACxC,oCAAyC;AACzC,iCAAgD;AAEhD;;;;GAIG;AACH,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,8BAAmB,CAAA;IACnB,gCAAqB,CAAA;AACvB,CAAC,EAHW,OAAO,uBAAP,OAAO,QAGlB;AAED;;GAEG;AACH,IAAY,aASX;AATD,WAAY,aAAa;IACvB,mDAAkC,CAAA;IAClC,uDAAsC,CAAA;IACtC,mDAAkC,CAAA;IAClC,kEAAiD,CAAA;IACjD,oEAAmD,CAAA;IACnD,qDAAoC,CAAA;IACpC,mDAAkC,CAAA;IAClC,iDAAgC,CAAA;AAClC,CAAC,EATW,aAAa,6BAAb,aAAa,QASxB;AAED;;GAEG;AACH,IAAY,gBAUX;AAVD,WAAY,gBAAgB;IAC1B,mDAA+B,CAAA;IAC/B,iDAA6B,CAAA;IAC7B,yDAAqC,CAAA;IACrC,mEAA+C,CAAA;IAC/C,yDAAqC,CAAA;IACrC,yDAAqC,CAAA;IACrC,iDAA6B,CAAA;IAC7B,mDAA+B,CAAA;IAC/B,6DAAyC,CAAA;AAC3C,CAAC,EAVW,gBAAgB,gCAAhB,gBAAgB,QAU3B;AAuQD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACI,KAAK,UAAU,gBAAgB,CACpC,MAA8B;IAE9B,MAAM,EACJ,OAAO,EACP,OAAO,EACP,SAAS,EACT,cAAc,EACd,qBAAqB,EACrB,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,WAAW,EACX,OAAO,EACP,IAAI,EACJ,UAAU,EACV,aAAa,EACb,YAAY,GACb,GAAG,MAAM,CAAC;IAEX,sCAAsC;IACtC,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,IAAA,kCAAyB,EAAC;QAC3D,OAAO;QACP,OAAO;QACP,SAAS;QACT,OAAO,EAAE,OAAO,IAAI,GAAG;QACvB,qDAAqD;QACrD,cAAc;QACd,qBAAqB;KACtB,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,IAAA,oBAAY,EAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;IACnE,MAAM,WAAW,GAAG,IAAA,qBAAa,EAC/B,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,EAChC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"new-payment.js","sourceRoot":"","sources":["../../src/api/new-payment.ts"],"names":[],"mappings":"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"}
|
package/dist/api/payment.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ApiResponse } from "./base";
|
|
2
|
+
import { DisplayInfo } from "./new-payment";
|
|
2
3
|
/**
|
|
3
4
|
* Payment display information
|
|
4
5
|
*/
|
|
@@ -43,11 +44,13 @@ export interface PaymentResponseData {
|
|
|
43
44
|
id: string;
|
|
44
45
|
status: "payment_unpaid" | string;
|
|
45
46
|
createdAt: string;
|
|
47
|
+
updatedAt: string;
|
|
48
|
+
expiresAt: string;
|
|
46
49
|
display: {
|
|
47
50
|
intent: string;
|
|
48
51
|
currency: string;
|
|
49
52
|
paymentValue?: string;
|
|
50
|
-
};
|
|
53
|
+
} | DisplayInfo;
|
|
51
54
|
source: PaymentSource | null;
|
|
52
55
|
destination: {
|
|
53
56
|
destinationAddress: string;
|
package/dist/api/payment.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../src/api/payment.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"payment.js","sourceRoot":"","sources":["../../src/api/payment.ts"],"names":[],"mappings":";;;AA2NA,8CAmDC;AA9QD,sCAAsD;AACtD,iCAAgD;AAyHhD;;;;GAIG;AACI,MAAM,cAAc,GAAG,CAC5B,SAAiB,EAC0B,EAAE;IAC7C,MAAM,WAAW,GAAG,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,WAAW;QAC1B,CAAC,CAAC,eAAe,SAAS,EAAE;QAC5B,CAAC,CAAC,cAAc,SAAS,EAAE,CAAC;IAC9B,OAAO,gBAAS,CAAC,GAAG,CAAsB,QAAQ,CAAC,CAAC;AACtD,CAAC,CAAC;AARW,QAAA,cAAc,kBAQzB;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiFG;AACI,KAAK,UAAU,iBAAiB,CACrC,MAAiC;IAEjC,MAAM,EACJ,OAAO,EACP,OAAO,EACP,SAAS,EACT,cAAc,EACd,qBAAqB,EACrB,OAAO,EACP,KAAK,EACL,QAAQ,GACT,GAAG,MAAM,CAAC;IACX,sCAAsC;IACtC,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,IAAA,kCAAyB,EAC3E;QACE,OAAO;QACP,OAAO;QACP,SAAS;QACT,OAAO,EAAE,OAAO,IAAI,GAAG;QACvB,qDAAqD;QACrD,cAAc;QACd,qBAAqB;KACtB,CACF,CAAC;IAEF,6BAA6B;IAC7B,MAAM,WAAW,GAAuB;QACtC,KAAK;QACL,OAAO,EAAE;YACP,MAAM,EAAE,EAAE;YACV,YAAY,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;YACnC,QAAQ,EAAE,KAAK;SAChB;QACD,WAAW;QACX,GAAG,SAAS;QACZ,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC;QACnB,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9C,CAAC;IAEF,yBAAyB;IACzB,MAAM,QAAQ,GAAG,MAAM,gBAAS,CAAC,IAAI,CACnC,cAAc,EACd,WAAW,CACZ,CAAC;IAEF,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,IAAI,yBAAyB,CAAC,CAAC;IACzE,CAAC;IAED,OAAO,QAAQ,CAAC,IAAI,CAAC;AACvB,CAAC"}
|
package/dist/bridge.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { RozoPayHydratedOrderWithOrg } from ".";
|
|
1
|
+
import { PaymentResponse, RozoPayHydratedOrderWithOrg } from ".";
|
|
2
2
|
import type { PaymentResponseData } from "./api/payment";
|
|
3
3
|
export interface PaymentBridgeConfig {
|
|
4
4
|
toChain: number;
|
|
@@ -198,4 +198,5 @@ export declare function createPaymentBridgeConfig({ toChain, toToken, toAddress,
|
|
|
198
198
|
* @see getKnownToken
|
|
199
199
|
*/
|
|
200
200
|
export declare function formatResponseToHydratedOrder(order: PaymentResponseData): RozoPayHydratedOrderWithOrg;
|
|
201
|
+
export declare function formatPaymentResponseToHydratedOrder(order: PaymentResponse): RozoPayHydratedOrderWithOrg;
|
|
201
202
|
export {};
|
package/dist/bridge.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createPaymentBridgeConfig = createPaymentBridgeConfig;
|
|
4
4
|
exports.formatResponseToHydratedOrder = formatResponseToHydratedOrder;
|
|
5
|
+
exports.formatPaymentResponseToHydratedOrder = formatPaymentResponseToHydratedOrder;
|
|
5
6
|
const viem_1 = require("viem");
|
|
6
7
|
const _1 = require(".");
|
|
7
8
|
/**
|
|
@@ -313,11 +314,50 @@ function formatResponseToHydratedOrder(order) {
|
|
|
313
314
|
},
|
|
314
315
|
externalId: order.externalId,
|
|
315
316
|
userMetadata: order.userMetadata,
|
|
316
|
-
expirationTs:
|
|
317
|
+
expirationTs: order.expiresAt
|
|
318
|
+
? BigInt(Math.floor(new Date(String(order.expiresAt)).getTime() / 1000).toString())
|
|
319
|
+
: BigInt(Math.floor(Date.now() / 1000 + 5 * 60).toString()),
|
|
317
320
|
org: {
|
|
318
321
|
orgId: order.orgId,
|
|
319
322
|
name: "",
|
|
320
323
|
},
|
|
321
324
|
};
|
|
322
325
|
}
|
|
326
|
+
function formatPaymentResponseToHydratedOrder(order) {
|
|
327
|
+
// Source amount is in the same units as the destination amount without fee
|
|
328
|
+
const sourceAmountUnits = order.source?.amount ?? "0";
|
|
329
|
+
return formatResponseToHydratedOrder({
|
|
330
|
+
id: order.id,
|
|
331
|
+
expiresAt: new Date(order.expiresAt).toISOString(),
|
|
332
|
+
updatedAt: new Date(order.updatedAt).toISOString(),
|
|
333
|
+
createdAt: new Date(order.createdAt).toISOString(),
|
|
334
|
+
status: _1.RozoPayOrderMode.HYDRATED,
|
|
335
|
+
display: order.display,
|
|
336
|
+
metadata: {
|
|
337
|
+
...order.metadata,
|
|
338
|
+
receivingAddress: order.source?.receiverAddress,
|
|
339
|
+
memo: order.source?.receiverMemo ?? null,
|
|
340
|
+
},
|
|
341
|
+
destination: {
|
|
342
|
+
destinationAddress: order.destination?.receiverAddress ?? "",
|
|
343
|
+
chainId: String(order.destination?.chainId ?? ""),
|
|
344
|
+
amountUnits: sourceAmountUnits,
|
|
345
|
+
tokenSymbol: order.destination?.tokenSymbol ?? "",
|
|
346
|
+
tokenAddress: order.destination?.tokenAddress ?? "",
|
|
347
|
+
txHash: order.destination?.txHash ?? null,
|
|
348
|
+
},
|
|
349
|
+
source: {
|
|
350
|
+
sourceAddress: order.source?.senderAddress ?? undefined,
|
|
351
|
+
chainId: String(order.source?.chainId ?? ""),
|
|
352
|
+
amountUnits: sourceAmountUnits,
|
|
353
|
+
tokenSymbol: order.source?.tokenSymbol ?? "",
|
|
354
|
+
tokenAddress: order.source?.tokenAddress ?? "",
|
|
355
|
+
},
|
|
356
|
+
url: order.url,
|
|
357
|
+
externalId: order.externalId,
|
|
358
|
+
userMetadata: order.userMetadata,
|
|
359
|
+
nonce: order.nonce,
|
|
360
|
+
orgId: order.orgId,
|
|
361
|
+
});
|
|
362
|
+
}
|
|
323
363
|
//# sourceMappingURL=bridge.js.map
|
package/dist/bridge.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../src/bridge.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../src/bridge.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/api/new-payment.ts
CHANGED
|
@@ -223,40 +223,40 @@ export interface PaymentResponse {
|
|
|
223
223
|
/**
|
|
224
224
|
* Your application ID
|
|
225
225
|
*/
|
|
226
|
-
appId
|
|
226
|
+
appId: string;
|
|
227
227
|
/**
|
|
228
228
|
* ISO 8601 timestamp
|
|
229
229
|
*/
|
|
230
|
-
createdAt
|
|
231
|
-
destination
|
|
232
|
-
display
|
|
233
|
-
errorCode
|
|
230
|
+
createdAt: Date;
|
|
231
|
+
destination: DestinationResponse;
|
|
232
|
+
display: DisplayInfo;
|
|
233
|
+
errorCode: PaymentErrorCode | null;
|
|
234
234
|
/**
|
|
235
235
|
* ISO 8601 timestamp (when payment expires)
|
|
236
236
|
*/
|
|
237
|
-
expiresAt
|
|
237
|
+
expiresAt: Date;
|
|
238
238
|
/**
|
|
239
239
|
* Payment ID
|
|
240
240
|
*/
|
|
241
|
-
id
|
|
242
|
-
metadata
|
|
241
|
+
id: string;
|
|
242
|
+
metadata: { [key: string]: any } | null;
|
|
243
243
|
/**
|
|
244
244
|
* Your order reference ID
|
|
245
245
|
*/
|
|
246
|
-
orderId
|
|
247
|
-
source
|
|
248
|
-
status
|
|
249
|
-
type
|
|
246
|
+
orderId: string | null;
|
|
247
|
+
source: SourceResponse;
|
|
248
|
+
status: PaymentStatus;
|
|
249
|
+
type: FeeType;
|
|
250
250
|
/**
|
|
251
251
|
* ISO 8601 timestamp
|
|
252
252
|
*/
|
|
253
|
-
updatedAt
|
|
253
|
+
updatedAt: Date;
|
|
254
254
|
/**
|
|
255
255
|
* Secret for webhook signature verification.
|
|
256
256
|
* Only present when webhookUrl was provided in the request.
|
|
257
257
|
* Store this securely to verify incoming webhook signatures.
|
|
258
258
|
*/
|
|
259
|
-
webhookSecret
|
|
259
|
+
webhookSecret: string | null;
|
|
260
260
|
[property: string]: any;
|
|
261
261
|
}
|
|
262
262
|
|
|
@@ -363,12 +363,12 @@ export async function createNewPayment(
|
|
|
363
363
|
const sourceChain = getChainById(Number(preferred.preferredChain));
|
|
364
364
|
const sourceToken = getKnownToken(
|
|
365
365
|
Number(preferred.preferredChain),
|
|
366
|
-
preferred.
|
|
366
|
+
preferred.preferredTokenAddress
|
|
367
367
|
);
|
|
368
368
|
const destinationChain = getChainById(Number(destination.chainId));
|
|
369
369
|
const destinationToken = getKnownToken(
|
|
370
370
|
Number(destination.chainId),
|
|
371
|
-
destination.
|
|
371
|
+
destination.tokenAddress
|
|
372
372
|
);
|
|
373
373
|
|
|
374
374
|
if (!sourceToken || !destinationToken) {
|
package/src/api/payment.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { createPaymentBridgeConfig } from "../bridge";
|
|
2
2
|
import { apiClient, ApiResponse } from "./base";
|
|
3
|
+
import { DisplayInfo } from "./new-payment";
|
|
3
4
|
|
|
4
5
|
/**
|
|
5
6
|
* Payment display information
|
|
@@ -49,11 +50,15 @@ export interface PaymentResponseData {
|
|
|
49
50
|
id: string;
|
|
50
51
|
status: "payment_unpaid" | string;
|
|
51
52
|
createdAt: string;
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
53
|
+
updatedAt: string;
|
|
54
|
+
expiresAt: string;
|
|
55
|
+
display:
|
|
56
|
+
| {
|
|
57
|
+
intent: string;
|
|
58
|
+
currency: string;
|
|
59
|
+
paymentValue?: string;
|
|
60
|
+
}
|
|
61
|
+
| DisplayInfo;
|
|
57
62
|
source: PaymentSource | null;
|
|
58
63
|
destination: {
|
|
59
64
|
destinationAddress: string;
|
package/src/bridge.ts
CHANGED
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
getKnownToken,
|
|
6
6
|
isChainSupported,
|
|
7
7
|
isTokenSupported,
|
|
8
|
+
PaymentResponse,
|
|
8
9
|
RozoPayHydratedOrderWithOrg,
|
|
9
10
|
RozoPayIntentStatus,
|
|
10
11
|
RozoPayOrderMode,
|
|
@@ -390,10 +391,57 @@ export function formatResponseToHydratedOrder(
|
|
|
390
391
|
} as any,
|
|
391
392
|
externalId: order.externalId as string | null,
|
|
392
393
|
userMetadata: order.userMetadata as RozoPayUserMetadata | null,
|
|
393
|
-
expirationTs:
|
|
394
|
+
expirationTs: order.expiresAt
|
|
395
|
+
? BigInt(
|
|
396
|
+
Math.floor(
|
|
397
|
+
new Date(String(order.expiresAt)).getTime() / 1000
|
|
398
|
+
).toString()
|
|
399
|
+
)
|
|
400
|
+
: BigInt(Math.floor(Date.now() / 1000 + 5 * 60).toString()),
|
|
394
401
|
org: {
|
|
395
402
|
orgId: order.orgId as string,
|
|
396
403
|
name: "",
|
|
397
404
|
},
|
|
398
405
|
};
|
|
399
406
|
}
|
|
407
|
+
|
|
408
|
+
export function formatPaymentResponseToHydratedOrder(
|
|
409
|
+
order: PaymentResponse
|
|
410
|
+
): RozoPayHydratedOrderWithOrg {
|
|
411
|
+
// Source amount is in the same units as the destination amount without fee
|
|
412
|
+
const sourceAmountUnits = order.source?.amount ?? "0";
|
|
413
|
+
|
|
414
|
+
return formatResponseToHydratedOrder({
|
|
415
|
+
id: order.id,
|
|
416
|
+
expiresAt: new Date(order.expiresAt).toISOString(),
|
|
417
|
+
updatedAt: new Date(order.updatedAt).toISOString(),
|
|
418
|
+
createdAt: new Date(order.createdAt).toISOString(),
|
|
419
|
+
status: RozoPayOrderMode.HYDRATED,
|
|
420
|
+
display: order.display,
|
|
421
|
+
metadata: {
|
|
422
|
+
...order.metadata,
|
|
423
|
+
receivingAddress: order.source?.receiverAddress,
|
|
424
|
+
memo: order.source?.receiverMemo ?? null,
|
|
425
|
+
} as any,
|
|
426
|
+
destination: {
|
|
427
|
+
destinationAddress: order.destination?.receiverAddress ?? "",
|
|
428
|
+
chainId: String(order.destination?.chainId ?? ""),
|
|
429
|
+
amountUnits: sourceAmountUnits,
|
|
430
|
+
tokenSymbol: order.destination?.tokenSymbol ?? "",
|
|
431
|
+
tokenAddress: order.destination?.tokenAddress ?? "",
|
|
432
|
+
txHash: order.destination?.txHash ?? null,
|
|
433
|
+
},
|
|
434
|
+
source: {
|
|
435
|
+
sourceAddress: order.source?.senderAddress ?? undefined,
|
|
436
|
+
chainId: String(order.source?.chainId ?? ""),
|
|
437
|
+
amountUnits: sourceAmountUnits,
|
|
438
|
+
tokenSymbol: order.source?.tokenSymbol ?? "",
|
|
439
|
+
tokenAddress: order.source?.tokenAddress ?? "",
|
|
440
|
+
},
|
|
441
|
+
url: order.url,
|
|
442
|
+
externalId: order.externalId,
|
|
443
|
+
userMetadata: order.userMetadata,
|
|
444
|
+
nonce: order.nonce,
|
|
445
|
+
orgId: order.orgId,
|
|
446
|
+
});
|
|
447
|
+
}
|