@across-protocol/sdk 4.3.143-alpha.3 → 4.3.144

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.
Files changed (10) hide show
  1. package/dist/cjs/src/clients/BundleDataClient/utils/SuperstructUtils.d.ts +64 -63
  2. package/dist/cjs/src/clients/BundleDataClient/utils/SuperstructUtils.js +31 -13
  3. package/dist/cjs/src/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
  4. package/dist/esm/src/clients/BundleDataClient/utils/SuperstructUtils.d.ts +64 -63
  5. package/dist/esm/src/clients/BundleDataClient/utils/SuperstructUtils.js +29 -11
  6. package/dist/esm/src/clients/BundleDataClient/utils/SuperstructUtils.js.map +1 -1
  7. package/dist/types/src/clients/BundleDataClient/utils/SuperstructUtils.d.ts +64 -63
  8. package/dist/types/src/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map +1 -1
  9. package/package.json +2 -2
  10. package/src/clients/BundleDataClient/utils/SuperstructUtils.ts +26 -12
package/dist/cjs/src/clients/BundleDataClient/utils/SuperstructUtils.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { Infer } from "superstruct";
2
- import { BigNumber, EvmAddress, RawAddress, SvmAddress } from "../../../utils";
2
+ import { BigNumber, EvmAddress, RawAddress, SvmAddress, TvmAddress } from "../../../utils";
3
+ export declare const AddressType: import("superstruct").Struct<SvmAddress | EvmAddress | TvmAddress | RawAddress, null>;
3
4
  export declare const SortableEventSS: {
4
5
  blockNumber: import("superstruct").Struct<number, null>;
5
6
  logIndex: import("superstruct").Struct<number, null>;
@@ -13,13 +14,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
13
14
  message: string;
14
15
  destinationChainId: number;
15
16
  originChainId: number;
16
- depositor: SvmAddress | EvmAddress | RawAddress;
17
- recipient: SvmAddress | EvmAddress | RawAddress;
18
- inputToken: SvmAddress | EvmAddress | RawAddress;
19
- outputToken: SvmAddress | EvmAddress | RawAddress;
17
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
18
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
19
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
20
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
20
21
  inputAmount: BigNumber;
21
22
  outputAmount: BigNumber;
22
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
23
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
23
24
  quoteTimestamp: number;
24
25
  fillDeadline: number;
25
26
  depositId: BigNumber;
@@ -31,7 +32,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
31
32
  blockNumber: number;
32
33
  logIndex: number;
33
34
  updatedOutputAmount?: BigNumber | undefined;
34
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
35
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
35
36
  updatedMessage?: string | undefined;
36
37
  speedUpSignature?: string | undefined;
37
38
  txnIndex?: number | undefined;
@@ -44,23 +45,23 @@ export declare const BundleDataSS: import("superstruct").Struct<{
44
45
  fills: {
45
46
  destinationChainId: number;
46
47
  originChainId: number;
47
- depositor: SvmAddress | EvmAddress | RawAddress;
48
- recipient: SvmAddress | EvmAddress | RawAddress;
49
- inputToken: SvmAddress | EvmAddress | RawAddress;
50
- outputToken: SvmAddress | EvmAddress | RawAddress;
48
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
49
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
50
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
51
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
51
52
  inputAmount: BigNumber;
52
53
  outputAmount: BigNumber;
53
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
54
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
54
55
  quoteTimestamp: number;
55
56
  fillDeadline: number;
56
57
  depositId: BigNumber;
57
58
  exclusivityDeadline: number;
58
59
  repaymentChainId: number;
59
- relayer: SvmAddress | EvmAddress | RawAddress;
60
+ relayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
60
61
  messageHash: string;
61
62
  relayExecutionInfo: {
62
63
  updatedOutputAmount: BigNumber;
63
- updatedRecipient: SvmAddress | EvmAddress | RawAddress;
64
+ updatedRecipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
64
65
  updatedMessageHash: string;
65
66
  fillType: number;
66
67
  updatedMessage?: string | undefined;
@@ -82,13 +83,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
82
83
  message: string;
83
84
  destinationChainId: number;
84
85
  originChainId: number;
85
- depositor: SvmAddress | EvmAddress | RawAddress;
86
- recipient: SvmAddress | EvmAddress | RawAddress;
87
- inputToken: SvmAddress | EvmAddress | RawAddress;
88
- outputToken: SvmAddress | EvmAddress | RawAddress;
86
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
87
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
88
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
89
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
89
90
  inputAmount: BigNumber;
90
91
  outputAmount: BigNumber;
91
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
92
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
92
93
  quoteTimestamp: number;
93
94
  fillDeadline: number;
94
95
  depositId: BigNumber;
@@ -101,7 +102,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
101
102
  logIndex: number;
102
103
  lpFeePct: BigNumber;
103
104
  updatedOutputAmount?: BigNumber | undefined;
104
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
105
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
105
106
  updatedMessage?: string | undefined;
106
107
  speedUpSignature?: string | undefined;
107
108
  txnIndex?: number | undefined;
@@ -114,13 +115,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
114
115
  message: string;
115
116
  destinationChainId: number;
116
117
  originChainId: number;
117
- depositor: SvmAddress | EvmAddress | RawAddress;
118
- recipient: SvmAddress | EvmAddress | RawAddress;
119
- inputToken: SvmAddress | EvmAddress | RawAddress;
120
- outputToken: SvmAddress | EvmAddress | RawAddress;
118
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
119
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
120
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
121
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
121
122
  inputAmount: BigNumber;
122
123
  outputAmount: BigNumber;
123
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
124
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
124
125
  quoteTimestamp: number;
125
126
  fillDeadline: number;
126
127
  depositId: BigNumber;
@@ -132,7 +133,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
132
133
  blockNumber: number;
133
134
  logIndex: number;
134
135
  updatedOutputAmount?: BigNumber | undefined;
135
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
136
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
136
137
  updatedMessage?: string | undefined;
137
138
  speedUpSignature?: string | undefined;
138
139
  txnIndex?: number | undefined;
@@ -145,13 +146,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
145
146
  message: string;
146
147
  destinationChainId: number;
147
148
  originChainId: number;
148
- depositor: SvmAddress | EvmAddress | RawAddress;
149
- recipient: SvmAddress | EvmAddress | RawAddress;
150
- inputToken: SvmAddress | EvmAddress | RawAddress;
151
- outputToken: SvmAddress | EvmAddress | RawAddress;
149
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
150
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
151
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
152
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
152
153
  inputAmount: BigNumber;
153
154
  outputAmount: BigNumber;
154
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
155
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
155
156
  quoteTimestamp: number;
156
157
  fillDeadline: number;
157
158
  depositId: BigNumber;
@@ -164,7 +165,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
164
165
  logIndex: number;
165
166
  lpFeePct: BigNumber;
166
167
  updatedOutputAmount?: BigNumber | undefined;
167
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
168
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
168
169
  updatedMessage?: string | undefined;
169
170
  speedUpSignature?: string | undefined;
170
171
  txnIndex?: number | undefined;
@@ -178,13 +179,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
178
179
  message: string;
179
180
  destinationChainId: number;
180
181
  originChainId: number;
181
- depositor: SvmAddress | EvmAddress | RawAddress;
182
- recipient: SvmAddress | EvmAddress | RawAddress;
183
- inputToken: SvmAddress | EvmAddress | RawAddress;
184
- outputToken: SvmAddress | EvmAddress | RawAddress;
182
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
183
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
184
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
185
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
185
186
  inputAmount: BigNumber;
186
187
  outputAmount: BigNumber;
187
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
188
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
188
189
  quoteTimestamp: number;
189
190
  fillDeadline: number;
190
191
  depositId: BigNumber;
@@ -196,7 +197,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
196
197
  blockNumber: number;
197
198
  logIndex: number;
198
199
  updatedOutputAmount?: BigNumber | undefined;
199
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
200
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
200
201
  updatedMessage?: string | undefined;
201
202
  speedUpSignature?: string | undefined;
202
203
  txnIndex?: number | undefined;
@@ -209,13 +210,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
209
210
  message: string;
210
211
  destinationChainId: number;
211
212
  originChainId: number;
212
- depositor: SvmAddress | EvmAddress | RawAddress;
213
- recipient: SvmAddress | EvmAddress | RawAddress;
214
- inputToken: SvmAddress | EvmAddress | RawAddress;
215
- outputToken: SvmAddress | EvmAddress | RawAddress;
213
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
214
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
215
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
216
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
216
217
  inputAmount: BigNumber;
217
218
  outputAmount: BigNumber;
218
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
219
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
219
220
  quoteTimestamp: number;
220
221
  fillDeadline: number;
221
222
  depositId: BigNumber;
@@ -227,7 +228,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
227
228
  blockNumber: number;
228
229
  logIndex: number;
229
230
  updatedOutputAmount?: BigNumber | undefined;
230
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
231
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
231
232
  updatedMessage?: string | undefined;
232
233
  speedUpSignature?: string | undefined;
233
234
  txnIndex?: number | undefined;
@@ -240,13 +241,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
240
241
  message: string;
241
242
  destinationChainId: number;
242
243
  originChainId: number;
243
- depositor: SvmAddress | EvmAddress | RawAddress;
244
- recipient: SvmAddress | EvmAddress | RawAddress;
245
- inputToken: SvmAddress | EvmAddress | RawAddress;
246
- outputToken: SvmAddress | EvmAddress | RawAddress;
244
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
245
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
246
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
247
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
247
248
  inputAmount: BigNumber;
248
249
  outputAmount: BigNumber;
249
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
250
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
250
251
  quoteTimestamp: number;
251
252
  fillDeadline: number;
252
253
  depositId: BigNumber;
@@ -259,7 +260,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
259
260
  logIndex: number;
260
261
  lpFeePct: BigNumber;
261
262
  updatedOutputAmount?: BigNumber | undefined;
262
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
263
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
263
264
  updatedMessage?: string | undefined;
264
265
  speedUpSignature?: string | undefined;
265
266
  txnIndex?: number | undefined;
@@ -272,13 +273,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
272
273
  message: string;
273
274
  destinationChainId: number;
274
275
  originChainId: number;
275
- depositor: SvmAddress | EvmAddress | RawAddress;
276
- recipient: SvmAddress | EvmAddress | RawAddress;
277
- inputToken: SvmAddress | EvmAddress | RawAddress;
278
- outputToken: SvmAddress | EvmAddress | RawAddress;
276
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
277
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
278
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
279
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
279
280
  inputAmount: BigNumber;
280
281
  outputAmount: BigNumber;
281
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
282
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
282
283
  quoteTimestamp: number;
283
284
  fillDeadline: number;
284
285
  depositId: BigNumber;
@@ -291,7 +292,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
291
292
  logIndex: number;
292
293
  lpFeePct: BigNumber;
293
294
  updatedOutputAmount?: BigNumber | undefined;
294
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
295
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
295
296
  updatedMessage?: string | undefined;
296
297
  speedUpSignature?: string | undefined;
297
298
  txnIndex?: number | undefined;
@@ -304,23 +305,23 @@ export declare const BundleDataSS: import("superstruct").Struct<{
304
305
  fills: {
305
306
  destinationChainId: number;
306
307
  originChainId: number;
307
- depositor: SvmAddress | EvmAddress | RawAddress;
308
- recipient: SvmAddress | EvmAddress | RawAddress;
309
- inputToken: SvmAddress | EvmAddress | RawAddress;
310
- outputToken: SvmAddress | EvmAddress | RawAddress;
308
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
309
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
310
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
311
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
311
312
  inputAmount: BigNumber;
312
313
  outputAmount: BigNumber;
313
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
314
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
314
315
  quoteTimestamp: number;
315
316
  fillDeadline: number;
316
317
  depositId: BigNumber;
317
318
  exclusivityDeadline: number;
318
319
  repaymentChainId: number;
319
- relayer: SvmAddress | EvmAddress | RawAddress;
320
+ relayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
320
321
  messageHash: string;
321
322
  relayExecutionInfo: {
322
323
  updatedOutputAmount: BigNumber;
323
- updatedRecipient: SvmAddress | EvmAddress | RawAddress;
324
+ updatedRecipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
324
325
  updatedMessageHash: string;
325
326
  fillType: number;
326
327
  updatedMessage?: string | undefined;
package/dist/cjs/src/clients/BundleDataClient/utils/SuperstructUtils.js CHANGED
@@ -1,7 +1,11 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.BundleDataSS = exports.SortableEventSS = void 0;
3
+ exports.BundleDataSS = exports.SortableEventSS = exports.AddressType = void 0;
4
4
  const superstruct_1 = require("superstruct");
5
+ const ethers_1 = require("ethers");
6
+ const viem_1 = require("viem");
7
+ const kit_1 = require("@solana/kit");
8
+ const tronweb_1 = require("tronweb");
5
9
  const constants_1 = require("../../../constants");
6
10
  const utils_1 = require("../../../utils");
7
11
  const PositiveIntegerStringSS = (0, superstruct_1.pattern)((0, superstruct_1.string)(), /\d+/);
@@ -14,26 +18,40 @@ const BigNumberType = (0, superstruct_1.coerce)((0, superstruct_1.instance)(util
14
18
  return value;
15
19
  }
16
20
  });
17
- const AddressInstanceSS = (0, superstruct_1.union)([(0, superstruct_1.instance)(utils_1.EvmAddress), (0, superstruct_1.instance)(utils_1.SvmAddress), (0, superstruct_1.instance)(utils_1.RawAddress)]);
18
- const AddressType = (0, superstruct_1.coerce)(AddressInstanceSS, (0, superstruct_1.string)(), (value) => {
19
- const chainId = value.startsWith("0x") ? constants_1.CHAIN_IDs.MAINNET : constants_1.CHAIN_IDs.SOLANA;
20
- return (0, utils_1.toAddressType)(value, chainId);
21
+ const AddressInstanceSS = (0, superstruct_1.union)([
22
+ (0, superstruct_1.instance)(utils_1.EvmAddress),
23
+ (0, superstruct_1.instance)(utils_1.SvmAddress),
24
+ (0, superstruct_1.instance)(utils_1.TvmAddress),
25
+ (0, superstruct_1.instance)(utils_1.RawAddress),
26
+ ]);
27
+ exports.AddressType = (0, superstruct_1.coerce)(AddressInstanceSS, (0, superstruct_1.string)(), (value) => {
28
+ try {
29
+ if (value.length === 42 && (0, viem_1.isAddress)(value, { strict: false }))
30
+ return utils_1.EvmAddress.from(value);
31
+ if (value.length === 34 && tronweb_1.TronWeb.isAddress(value))
32
+ return utils_1.TvmAddress.from(value);
33
+ if ((0, kit_1.isAddress)(value))
34
+ return utils_1.SvmAddress.from(value);
35
+ }
36
+ catch {
37
+ }
38
+ return new utils_1.RawAddress(value.startsWith("0x") ? ethers_1.utils.arrayify(value) : utils_1.bs58.decode(value));
21
39
  });
22
40
  const Web3AddressType = (0, superstruct_1.coerce)(Web3AddressSS, (0, superstruct_1.string)(), (value) => {
23
41
  return (0, utils_1.toBytes32)(value);
24
42
  });
25
43
  const FillTypeSS = (0, superstruct_1.number)();
26
44
  const V3RelayDataSS = {
27
- inputToken: AddressType,
45
+ inputToken: exports.AddressType,
28
46
  inputAmount: BigNumberType,
29
- outputToken: AddressType,
47
+ outputToken: exports.AddressType,
30
48
  outputAmount: BigNumberType,
31
49
  fillDeadline: (0, superstruct_1.number)(),
32
- exclusiveRelayer: AddressType,
50
+ exclusiveRelayer: exports.AddressType,
33
51
  exclusivityDeadline: (0, superstruct_1.number)(),
34
52
  originChainId: (0, superstruct_1.number)(),
35
- depositor: AddressType,
36
- recipient: AddressType,
53
+ depositor: exports.AddressType,
54
+ recipient: exports.AddressType,
37
55
  depositId: BigNumberType,
38
56
  message: (0, superstruct_1.string)(),
39
57
  };
@@ -53,7 +71,7 @@ const V3DepositSS = {
53
71
  quoteTimestamp: (0, superstruct_1.number)(),
54
72
  relayerFeePct: (0, superstruct_1.optional)(BigNumberType),
55
73
  speedUpSignature: (0, superstruct_1.optional)((0, superstruct_1.string)()),
56
- updatedRecipient: (0, superstruct_1.optional)(AddressType),
74
+ updatedRecipient: (0, superstruct_1.optional)(exports.AddressType),
57
75
  updatedOutputAmount: (0, superstruct_1.optional)(BigNumberType),
58
76
  updatedMessage: (0, superstruct_1.optional)((0, superstruct_1.string)()),
59
77
  };
@@ -71,7 +89,7 @@ const V3DepositWithBlockLpFeeSS = (0, superstruct_1.object)({
71
89
  const V3RelayExecutionEventInfoSS = (0, superstruct_1.object)({
72
90
  updatedOutputAmount: BigNumberType,
73
91
  fillType: FillTypeSS,
74
- updatedRecipient: AddressType,
92
+ updatedRecipient: exports.AddressType,
75
93
  updatedMessage: (0, superstruct_1.optional)((0, superstruct_1.string)()),
76
94
  updatedMessageHash: (0, superstruct_1.defaulted)((0, superstruct_1.string)(), constants_1.UNDEFINED_MESSAGE_HASH),
77
95
  });
@@ -80,7 +98,7 @@ const V3FillSS = {
80
98
  message: (0, superstruct_1.optional)((0, superstruct_1.string)()),
81
99
  messageHash: (0, superstruct_1.defaulted)((0, superstruct_1.string)(), constants_1.UNDEFINED_MESSAGE_HASH),
82
100
  destinationChainId: (0, superstruct_1.number)(),
83
- relayer: AddressType,
101
+ relayer: exports.AddressType,
84
102
  repaymentChainId: (0, superstruct_1.number)(),
85
103
  relayExecutionInfo: V3RelayExecutionEventInfoSS,
86
104
  quoteTimestamp: (0, superstruct_1.number)(),
package/dist/cjs/src/clients/BundleDataClient/utils/SuperstructUtils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SuperstructUtils.js","sourceRoot":"","sources":["../../../../../../src/clients/BundleDataClient/utils/SuperstructUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SuperstructUtils.js","sourceRoot":"","sources":["../../../../../../src/clients/BundleDataClient/utils/SuperstructUtils.ts"],"names":[],"mappings":"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"}
package/dist/esm/src/clients/BundleDataClient/utils/SuperstructUtils.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { Infer } from "superstruct";
2
- import { BigNumber, EvmAddress, RawAddress, SvmAddress } from "../../../utils";
2
+ import { BigNumber, EvmAddress, RawAddress, SvmAddress, TvmAddress } from "../../../utils";
3
+ export declare const AddressType: import("superstruct").Struct<SvmAddress | EvmAddress | TvmAddress | RawAddress, null>;
3
4
  export declare const SortableEventSS: {
4
5
  blockNumber: import("superstruct").Struct<number, null>;
5
6
  logIndex: import("superstruct").Struct<number, null>;
@@ -13,13 +14,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
13
14
  message: string;
14
15
  destinationChainId: number;
15
16
  originChainId: number;
16
- depositor: SvmAddress | EvmAddress | RawAddress;
17
- recipient: SvmAddress | EvmAddress | RawAddress;
18
- inputToken: SvmAddress | EvmAddress | RawAddress;
19
- outputToken: SvmAddress | EvmAddress | RawAddress;
17
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
18
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
19
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
20
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
20
21
  inputAmount: BigNumber;
21
22
  outputAmount: BigNumber;
22
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
23
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
23
24
  quoteTimestamp: number;
24
25
  fillDeadline: number;
25
26
  depositId: BigNumber;
@@ -31,7 +32,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
31
32
  blockNumber: number;
32
33
  logIndex: number;
33
34
  updatedOutputAmount?: BigNumber | undefined;
34
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
35
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
35
36
  updatedMessage?: string | undefined;
36
37
  speedUpSignature?: string | undefined;
37
38
  txnIndex?: number | undefined;
@@ -44,23 +45,23 @@ export declare const BundleDataSS: import("superstruct").Struct<{
44
45
  fills: {
45
46
  destinationChainId: number;
46
47
  originChainId: number;
47
- depositor: SvmAddress | EvmAddress | RawAddress;
48
- recipient: SvmAddress | EvmAddress | RawAddress;
49
- inputToken: SvmAddress | EvmAddress | RawAddress;
50
- outputToken: SvmAddress | EvmAddress | RawAddress;
48
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
49
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
50
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
51
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
51
52
  inputAmount: BigNumber;
52
53
  outputAmount: BigNumber;
53
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
54
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
54
55
  quoteTimestamp: number;
55
56
  fillDeadline: number;
56
57
  depositId: BigNumber;
57
58
  exclusivityDeadline: number;
58
59
  repaymentChainId: number;
59
- relayer: SvmAddress | EvmAddress | RawAddress;
60
+ relayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
60
61
  messageHash: string;
61
62
  relayExecutionInfo: {
62
63
  updatedOutputAmount: BigNumber;
63
- updatedRecipient: SvmAddress | EvmAddress | RawAddress;
64
+ updatedRecipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
64
65
  updatedMessageHash: string;
65
66
  fillType: number;
66
67
  updatedMessage?: string | undefined;
@@ -82,13 +83,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
82
83
  message: string;
83
84
  destinationChainId: number;
84
85
  originChainId: number;
85
- depositor: SvmAddress | EvmAddress | RawAddress;
86
- recipient: SvmAddress | EvmAddress | RawAddress;
87
- inputToken: SvmAddress | EvmAddress | RawAddress;
88
- outputToken: SvmAddress | EvmAddress | RawAddress;
86
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
87
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
88
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
89
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
89
90
  inputAmount: BigNumber;
90
91
  outputAmount: BigNumber;
91
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
92
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
92
93
  quoteTimestamp: number;
93
94
  fillDeadline: number;
94
95
  depositId: BigNumber;
@@ -101,7 +102,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
101
102
  logIndex: number;
102
103
  lpFeePct: BigNumber;
103
104
  updatedOutputAmount?: BigNumber | undefined;
104
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
105
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
105
106
  updatedMessage?: string | undefined;
106
107
  speedUpSignature?: string | undefined;
107
108
  txnIndex?: number | undefined;
@@ -114,13 +115,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
114
115
  message: string;
115
116
  destinationChainId: number;
116
117
  originChainId: number;
117
- depositor: SvmAddress | EvmAddress | RawAddress;
118
- recipient: SvmAddress | EvmAddress | RawAddress;
119
- inputToken: SvmAddress | EvmAddress | RawAddress;
120
- outputToken: SvmAddress | EvmAddress | RawAddress;
118
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
119
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
120
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
121
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
121
122
  inputAmount: BigNumber;
122
123
  outputAmount: BigNumber;
123
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
124
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
124
125
  quoteTimestamp: number;
125
126
  fillDeadline: number;
126
127
  depositId: BigNumber;
@@ -132,7 +133,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
132
133
  blockNumber: number;
133
134
  logIndex: number;
134
135
  updatedOutputAmount?: BigNumber | undefined;
135
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
136
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
136
137
  updatedMessage?: string | undefined;
137
138
  speedUpSignature?: string | undefined;
138
139
  txnIndex?: number | undefined;
@@ -145,13 +146,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
145
146
  message: string;
146
147
  destinationChainId: number;
147
148
  originChainId: number;
148
- depositor: SvmAddress | EvmAddress | RawAddress;
149
- recipient: SvmAddress | EvmAddress | RawAddress;
150
- inputToken: SvmAddress | EvmAddress | RawAddress;
151
- outputToken: SvmAddress | EvmAddress | RawAddress;
149
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
150
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
151
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
152
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
152
153
  inputAmount: BigNumber;
153
154
  outputAmount: BigNumber;
154
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
155
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
155
156
  quoteTimestamp: number;
156
157
  fillDeadline: number;
157
158
  depositId: BigNumber;
@@ -164,7 +165,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
164
165
  logIndex: number;
165
166
  lpFeePct: BigNumber;
166
167
  updatedOutputAmount?: BigNumber | undefined;
167
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
168
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
168
169
  updatedMessage?: string | undefined;
169
170
  speedUpSignature?: string | undefined;
170
171
  txnIndex?: number | undefined;
@@ -178,13 +179,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
178
179
  message: string;
179
180
  destinationChainId: number;
180
181
  originChainId: number;
181
- depositor: SvmAddress | EvmAddress | RawAddress;
182
- recipient: SvmAddress | EvmAddress | RawAddress;
183
- inputToken: SvmAddress | EvmAddress | RawAddress;
184
- outputToken: SvmAddress | EvmAddress | RawAddress;
182
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
183
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
184
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
185
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
185
186
  inputAmount: BigNumber;
186
187
  outputAmount: BigNumber;
187
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
188
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
188
189
  quoteTimestamp: number;
189
190
  fillDeadline: number;
190
191
  depositId: BigNumber;
@@ -196,7 +197,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
196
197
  blockNumber: number;
197
198
  logIndex: number;
198
199
  updatedOutputAmount?: BigNumber | undefined;
199
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
200
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
200
201
  updatedMessage?: string | undefined;
201
202
  speedUpSignature?: string | undefined;
202
203
  txnIndex?: number | undefined;
@@ -209,13 +210,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
209
210
  message: string;
210
211
  destinationChainId: number;
211
212
  originChainId: number;
212
- depositor: SvmAddress | EvmAddress | RawAddress;
213
- recipient: SvmAddress | EvmAddress | RawAddress;
214
- inputToken: SvmAddress | EvmAddress | RawAddress;
215
- outputToken: SvmAddress | EvmAddress | RawAddress;
213
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
214
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
215
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
216
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
216
217
  inputAmount: BigNumber;
217
218
  outputAmount: BigNumber;
218
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
219
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
219
220
  quoteTimestamp: number;
220
221
  fillDeadline: number;
221
222
  depositId: BigNumber;
@@ -227,7 +228,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
227
228
  blockNumber: number;
228
229
  logIndex: number;
229
230
  updatedOutputAmount?: BigNumber | undefined;
230
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
231
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
231
232
  updatedMessage?: string | undefined;
232
233
  speedUpSignature?: string | undefined;
233
234
  txnIndex?: number | undefined;
@@ -240,13 +241,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
240
241
  message: string;
241
242
  destinationChainId: number;
242
243
  originChainId: number;
243
- depositor: SvmAddress | EvmAddress | RawAddress;
244
- recipient: SvmAddress | EvmAddress | RawAddress;
245
- inputToken: SvmAddress | EvmAddress | RawAddress;
246
- outputToken: SvmAddress | EvmAddress | RawAddress;
244
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
245
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
246
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
247
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
247
248
  inputAmount: BigNumber;
248
249
  outputAmount: BigNumber;
249
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
250
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
250
251
  quoteTimestamp: number;
251
252
  fillDeadline: number;
252
253
  depositId: BigNumber;
@@ -259,7 +260,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
259
260
  logIndex: number;
260
261
  lpFeePct: BigNumber;
261
262
  updatedOutputAmount?: BigNumber | undefined;
262
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
263
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
263
264
  updatedMessage?: string | undefined;
264
265
  speedUpSignature?: string | undefined;
265
266
  txnIndex?: number | undefined;
@@ -272,13 +273,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
272
273
  message: string;
273
274
  destinationChainId: number;
274
275
  originChainId: number;
275
- depositor: SvmAddress | EvmAddress | RawAddress;
276
- recipient: SvmAddress | EvmAddress | RawAddress;
277
- inputToken: SvmAddress | EvmAddress | RawAddress;
278
- outputToken: SvmAddress | EvmAddress | RawAddress;
276
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
277
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
278
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
279
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
279
280
  inputAmount: BigNumber;
280
281
  outputAmount: BigNumber;
281
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
282
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
282
283
  quoteTimestamp: number;
283
284
  fillDeadline: number;
284
285
  depositId: BigNumber;
@@ -291,7 +292,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
291
292
  logIndex: number;
292
293
  lpFeePct: BigNumber;
293
294
  updatedOutputAmount?: BigNumber | undefined;
294
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
295
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
295
296
  updatedMessage?: string | undefined;
296
297
  speedUpSignature?: string | undefined;
297
298
  txnIndex?: number | undefined;
@@ -304,23 +305,23 @@ export declare const BundleDataSS: import("superstruct").Struct<{
304
305
  fills: {
305
306
  destinationChainId: number;
306
307
  originChainId: number;
307
- depositor: SvmAddress | EvmAddress | RawAddress;
308
- recipient: SvmAddress | EvmAddress | RawAddress;
309
- inputToken: SvmAddress | EvmAddress | RawAddress;
310
- outputToken: SvmAddress | EvmAddress | RawAddress;
308
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
309
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
310
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
311
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
311
312
  inputAmount: BigNumber;
312
313
  outputAmount: BigNumber;
313
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
314
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
314
315
  quoteTimestamp: number;
315
316
  fillDeadline: number;
316
317
  depositId: BigNumber;
317
318
  exclusivityDeadline: number;
318
319
  repaymentChainId: number;
319
- relayer: SvmAddress | EvmAddress | RawAddress;
320
+ relayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
320
321
  messageHash: string;
321
322
  relayExecutionInfo: {
322
323
  updatedOutputAmount: BigNumber;
323
- updatedRecipient: SvmAddress | EvmAddress | RawAddress;
324
+ updatedRecipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
324
325
  updatedMessageHash: string;
325
326
  fillType: number;
326
327
  updatedMessage?: string | undefined;
package/dist/esm/src/clients/BundleDataClient/utils/SuperstructUtils.js CHANGED
@@ -1,6 +1,10 @@
1
1
  import { object, number, optional, string, array, record, coerce, instance, pattern, boolean, defaulted, union, type, } from "superstruct";
2
- import { CHAIN_IDs, UNDEFINED_MESSAGE_HASH } from "../../../constants";
3
- import { BigNumber, EvmAddress, RawAddress, SvmAddress, toAddressType, toBytes32 } from "../../../utils";
2
+ import { utils as ethersUtils } from "ethers";
3
+ import { isAddress as isValidEvmAddress } from "viem";
4
+ import { isAddress as isValidSvmAddress } from "@solana/kit";
5
+ import { TronWeb } from "tronweb";
6
+ import { UNDEFINED_MESSAGE_HASH } from "../../../constants";
7
+ import { BigNumber, bs58, EvmAddress, RawAddress, SvmAddress, TvmAddress, toBytes32 } from "../../../utils";
4
8
  const PositiveIntegerStringSS = pattern(string(), /\d+/);
5
9
  const Web3AddressSS = pattern(string(), /^0x[a-fA-F0-9]{64}$/);
6
10
  const BigNumberType = coerce(instance(BigNumber), union([string(), number()]), (value) => {
@@ -14,15 +18,29 @@ const BigNumberType = coerce(instance(BigNumber), union([string(), number()]), (
14
18
  return value;
15
19
  }
16
20
  });
17
- // Accept any concrete implementation of `Address` (Evm, Svm, or Raw) but avoid using the
18
- // abstract `Address` class directly to keep TypeScript happy.
19
- const AddressInstanceSS = union([instance(EvmAddress), instance(SvmAddress), instance(RawAddress)]);
20
- const AddressType = coerce(AddressInstanceSS, string(), (value) => {
21
- // Addresses are posted to arweave in their native format (base16 for EVM, base58 for SVM). The chainId for
22
- // for the event data is not directly available, so infer it based on the shape of the address. RawAddress
23
- // will be instantiated if the address format does not match the expected family.
24
- const chainId = value.startsWith("0x") ? CHAIN_IDs.MAINNET : CHAIN_IDs.SOLANA;
25
- return toAddressType(value, chainId);
21
+ const AddressInstanceSS = union([
22
+ instance(EvmAddress),
23
+ instance(SvmAddress),
24
+ instance(TvmAddress),
25
+ instance(RawAddress),
26
+ ]);
27
+ export const AddressType = coerce(AddressInstanceSS, string(), (value) => {
28
+ // Each family is matched by its native-format validator plus a length gate where it
29
+ // disambiguates. Unknown shapes fall to `RawAddress`, forcing future families into explicit
30
+ // branches rather than being absorbed silently.
31
+ try {
32
+ // strict: false preserves the prior byte-level acceptance of all-upper / non-checksummed hex.
33
+ if (value.length === 42 && isValidEvmAddress(value, { strict: false }))
34
+ return EvmAddress.from(value);
35
+ if (value.length === 34 && TronWeb.isAddress(value))
36
+ return TvmAddress.from(value);
37
+ if (isValidSvmAddress(value))
38
+ return SvmAddress.from(value);
39
+ }
40
+ catch {
41
+ // Validator accepted but `from()` rejected (e.g. SVM 12-zero EVM-masquerade) → RawAddress.
42
+ }
43
+ return new RawAddress(value.startsWith("0x") ? ethersUtils.arrayify(value) : bs58.decode(value));
26
44
  });
27
45
  const Web3AddressType = coerce(Web3AddressSS, string(), (value) => {
28
46
  return toBytes32(value);
package/dist/esm/src/clients/BundleDataClient/utils/SuperstructUtils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SuperstructUtils.js","sourceRoot":"","sources":["../../../../../../src/clients/BundleDataClient/utils/SuperstructUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SuperstructUtils.js","sourceRoot":"","sources":["../../../../../../src/clients/BundleDataClient/utils/SuperstructUtils.ts"],"names":[],"mappings":"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"}
package/dist/types/src/clients/BundleDataClient/utils/SuperstructUtils.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { Infer } from "superstruct";
2
- import { BigNumber, EvmAddress, RawAddress, SvmAddress } from "../../../utils";
2
+ import { BigNumber, EvmAddress, RawAddress, SvmAddress, TvmAddress } from "../../../utils";
3
+ export declare const AddressType: import("superstruct").Struct<SvmAddress | EvmAddress | TvmAddress | RawAddress, null>;
3
4
  export declare const SortableEventSS: {
4
5
  blockNumber: import("superstruct").Struct<number, null>;
5
6
  logIndex: import("superstruct").Struct<number, null>;
@@ -13,13 +14,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
13
14
  message: string;
14
15
  destinationChainId: number;
15
16
  originChainId: number;
16
- depositor: SvmAddress | EvmAddress | RawAddress;
17
- recipient: SvmAddress | EvmAddress | RawAddress;
18
- inputToken: SvmAddress | EvmAddress | RawAddress;
19
- outputToken: SvmAddress | EvmAddress | RawAddress;
17
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
18
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
19
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
20
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
20
21
  inputAmount: BigNumber;
21
22
  outputAmount: BigNumber;
22
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
23
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
23
24
  quoteTimestamp: number;
24
25
  fillDeadline: number;
25
26
  depositId: BigNumber;
@@ -31,7 +32,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
31
32
  blockNumber: number;
32
33
  logIndex: number;
33
34
  updatedOutputAmount?: BigNumber | undefined;
34
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
35
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
35
36
  updatedMessage?: string | undefined;
36
37
  speedUpSignature?: string | undefined;
37
38
  txnIndex?: number | undefined;
@@ -44,23 +45,23 @@ export declare const BundleDataSS: import("superstruct").Struct<{
44
45
  fills: {
45
46
  destinationChainId: number;
46
47
  originChainId: number;
47
- depositor: SvmAddress | EvmAddress | RawAddress;
48
- recipient: SvmAddress | EvmAddress | RawAddress;
49
- inputToken: SvmAddress | EvmAddress | RawAddress;
50
- outputToken: SvmAddress | EvmAddress | RawAddress;
48
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
49
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
50
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
51
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
51
52
  inputAmount: BigNumber;
52
53
  outputAmount: BigNumber;
53
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
54
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
54
55
  quoteTimestamp: number;
55
56
  fillDeadline: number;
56
57
  depositId: BigNumber;
57
58
  exclusivityDeadline: number;
58
59
  repaymentChainId: number;
59
- relayer: SvmAddress | EvmAddress | RawAddress;
60
+ relayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
60
61
  messageHash: string;
61
62
  relayExecutionInfo: {
62
63
  updatedOutputAmount: BigNumber;
63
- updatedRecipient: SvmAddress | EvmAddress | RawAddress;
64
+ updatedRecipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
64
65
  updatedMessageHash: string;
65
66
  fillType: number;
66
67
  updatedMessage?: string | undefined;
@@ -82,13 +83,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
82
83
  message: string;
83
84
  destinationChainId: number;
84
85
  originChainId: number;
85
- depositor: SvmAddress | EvmAddress | RawAddress;
86
- recipient: SvmAddress | EvmAddress | RawAddress;
87
- inputToken: SvmAddress | EvmAddress | RawAddress;
88
- outputToken: SvmAddress | EvmAddress | RawAddress;
86
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
87
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
88
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
89
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
89
90
  inputAmount: BigNumber;
90
91
  outputAmount: BigNumber;
91
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
92
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
92
93
  quoteTimestamp: number;
93
94
  fillDeadline: number;
94
95
  depositId: BigNumber;
@@ -101,7 +102,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
101
102
  logIndex: number;
102
103
  lpFeePct: BigNumber;
103
104
  updatedOutputAmount?: BigNumber | undefined;
104
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
105
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
105
106
  updatedMessage?: string | undefined;
106
107
  speedUpSignature?: string | undefined;
107
108
  txnIndex?: number | undefined;
@@ -114,13 +115,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
114
115
  message: string;
115
116
  destinationChainId: number;
116
117
  originChainId: number;
117
- depositor: SvmAddress | EvmAddress | RawAddress;
118
- recipient: SvmAddress | EvmAddress | RawAddress;
119
- inputToken: SvmAddress | EvmAddress | RawAddress;
120
- outputToken: SvmAddress | EvmAddress | RawAddress;
118
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
119
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
120
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
121
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
121
122
  inputAmount: BigNumber;
122
123
  outputAmount: BigNumber;
123
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
124
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
124
125
  quoteTimestamp: number;
125
126
  fillDeadline: number;
126
127
  depositId: BigNumber;
@@ -132,7 +133,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
132
133
  blockNumber: number;
133
134
  logIndex: number;
134
135
  updatedOutputAmount?: BigNumber | undefined;
135
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
136
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
136
137
  updatedMessage?: string | undefined;
137
138
  speedUpSignature?: string | undefined;
138
139
  txnIndex?: number | undefined;
@@ -145,13 +146,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
145
146
  message: string;
146
147
  destinationChainId: number;
147
148
  originChainId: number;
148
- depositor: SvmAddress | EvmAddress | RawAddress;
149
- recipient: SvmAddress | EvmAddress | RawAddress;
150
- inputToken: SvmAddress | EvmAddress | RawAddress;
151
- outputToken: SvmAddress | EvmAddress | RawAddress;
149
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
150
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
151
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
152
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
152
153
  inputAmount: BigNumber;
153
154
  outputAmount: BigNumber;
154
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
155
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
155
156
  quoteTimestamp: number;
156
157
  fillDeadline: number;
157
158
  depositId: BigNumber;
@@ -164,7 +165,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
164
165
  logIndex: number;
165
166
  lpFeePct: BigNumber;
166
167
  updatedOutputAmount?: BigNumber | undefined;
167
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
168
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
168
169
  updatedMessage?: string | undefined;
169
170
  speedUpSignature?: string | undefined;
170
171
  txnIndex?: number | undefined;
@@ -178,13 +179,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
178
179
  message: string;
179
180
  destinationChainId: number;
180
181
  originChainId: number;
181
- depositor: SvmAddress | EvmAddress | RawAddress;
182
- recipient: SvmAddress | EvmAddress | RawAddress;
183
- inputToken: SvmAddress | EvmAddress | RawAddress;
184
- outputToken: SvmAddress | EvmAddress | RawAddress;
182
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
183
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
184
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
185
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
185
186
  inputAmount: BigNumber;
186
187
  outputAmount: BigNumber;
187
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
188
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
188
189
  quoteTimestamp: number;
189
190
  fillDeadline: number;
190
191
  depositId: BigNumber;
@@ -196,7 +197,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
196
197
  blockNumber: number;
197
198
  logIndex: number;
198
199
  updatedOutputAmount?: BigNumber | undefined;
199
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
200
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
200
201
  updatedMessage?: string | undefined;
201
202
  speedUpSignature?: string | undefined;
202
203
  txnIndex?: number | undefined;
@@ -209,13 +210,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
209
210
  message: string;
210
211
  destinationChainId: number;
211
212
  originChainId: number;
212
- depositor: SvmAddress | EvmAddress | RawAddress;
213
- recipient: SvmAddress | EvmAddress | RawAddress;
214
- inputToken: SvmAddress | EvmAddress | RawAddress;
215
- outputToken: SvmAddress | EvmAddress | RawAddress;
213
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
214
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
215
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
216
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
216
217
  inputAmount: BigNumber;
217
218
  outputAmount: BigNumber;
218
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
219
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
219
220
  quoteTimestamp: number;
220
221
  fillDeadline: number;
221
222
  depositId: BigNumber;
@@ -227,7 +228,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
227
228
  blockNumber: number;
228
229
  logIndex: number;
229
230
  updatedOutputAmount?: BigNumber | undefined;
230
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
231
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
231
232
  updatedMessage?: string | undefined;
232
233
  speedUpSignature?: string | undefined;
233
234
  txnIndex?: number | undefined;
@@ -240,13 +241,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
240
241
  message: string;
241
242
  destinationChainId: number;
242
243
  originChainId: number;
243
- depositor: SvmAddress | EvmAddress | RawAddress;
244
- recipient: SvmAddress | EvmAddress | RawAddress;
245
- inputToken: SvmAddress | EvmAddress | RawAddress;
246
- outputToken: SvmAddress | EvmAddress | RawAddress;
244
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
245
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
246
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
247
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
247
248
  inputAmount: BigNumber;
248
249
  outputAmount: BigNumber;
249
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
250
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
250
251
  quoteTimestamp: number;
251
252
  fillDeadline: number;
252
253
  depositId: BigNumber;
@@ -259,7 +260,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
259
260
  logIndex: number;
260
261
  lpFeePct: BigNumber;
261
262
  updatedOutputAmount?: BigNumber | undefined;
262
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
263
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
263
264
  updatedMessage?: string | undefined;
264
265
  speedUpSignature?: string | undefined;
265
266
  txnIndex?: number | undefined;
@@ -272,13 +273,13 @@ export declare const BundleDataSS: import("superstruct").Struct<{
272
273
  message: string;
273
274
  destinationChainId: number;
274
275
  originChainId: number;
275
- depositor: SvmAddress | EvmAddress | RawAddress;
276
- recipient: SvmAddress | EvmAddress | RawAddress;
277
- inputToken: SvmAddress | EvmAddress | RawAddress;
278
- outputToken: SvmAddress | EvmAddress | RawAddress;
276
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
277
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
278
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
279
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
279
280
  inputAmount: BigNumber;
280
281
  outputAmount: BigNumber;
281
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
282
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
282
283
  quoteTimestamp: number;
283
284
  fillDeadline: number;
284
285
  depositId: BigNumber;
@@ -291,7 +292,7 @@ export declare const BundleDataSS: import("superstruct").Struct<{
291
292
  logIndex: number;
292
293
  lpFeePct: BigNumber;
293
294
  updatedOutputAmount?: BigNumber | undefined;
294
- updatedRecipient?: SvmAddress | EvmAddress | RawAddress | undefined;
295
+ updatedRecipient?: SvmAddress | EvmAddress | TvmAddress | RawAddress | undefined;
295
296
  updatedMessage?: string | undefined;
296
297
  speedUpSignature?: string | undefined;
297
298
  txnIndex?: number | undefined;
@@ -304,23 +305,23 @@ export declare const BundleDataSS: import("superstruct").Struct<{
304
305
  fills: {
305
306
  destinationChainId: number;
306
307
  originChainId: number;
307
- depositor: SvmAddress | EvmAddress | RawAddress;
308
- recipient: SvmAddress | EvmAddress | RawAddress;
309
- inputToken: SvmAddress | EvmAddress | RawAddress;
310
- outputToken: SvmAddress | EvmAddress | RawAddress;
308
+ depositor: SvmAddress | EvmAddress | TvmAddress | RawAddress;
309
+ recipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
310
+ inputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
311
+ outputToken: SvmAddress | EvmAddress | TvmAddress | RawAddress;
311
312
  inputAmount: BigNumber;
312
313
  outputAmount: BigNumber;
313
- exclusiveRelayer: SvmAddress | EvmAddress | RawAddress;
314
+ exclusiveRelayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
314
315
  quoteTimestamp: number;
315
316
  fillDeadline: number;
316
317
  depositId: BigNumber;
317
318
  exclusivityDeadline: number;
318
319
  repaymentChainId: number;
319
- relayer: SvmAddress | EvmAddress | RawAddress;
320
+ relayer: SvmAddress | EvmAddress | TvmAddress | RawAddress;
320
321
  messageHash: string;
321
322
  relayExecutionInfo: {
322
323
  updatedOutputAmount: BigNumber;
323
- updatedRecipient: SvmAddress | EvmAddress | RawAddress;
324
+ updatedRecipient: SvmAddress | EvmAddress | TvmAddress | RawAddress;
324
325
  updatedMessageHash: string;
325
326
  fillType: number;
326
327
  updatedMessage?: string | undefined;
package/dist/types/src/clients/BundleDataClient/utils/SuperstructUtils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SuperstructUtils.d.ts","sourceRoot":"","sources":["../../../../../../src/clients/BundleDataClient/utils/SuperstructUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAcN,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAA4B,MAAM,gBAAgB,CAAC;AAiDzG,eAAO,MAAM,eAAe;;;;;;;CAS3B,CAAC;AA6EF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMvB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC"}
1
+ {"version":3,"file":"SuperstructUtils.d.ts","sourceRoot":"","sources":["../../../../../../src/clients/BundleDataClient/utils/SuperstructUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAcN,MAAM,aAAa,CAAC;AAMrB,OAAO,EAAE,SAAS,EAAQ,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAa,MAAM,gBAAgB,CAAC;AAuB5G,eAAO,MAAM,WAAW,uFAatB,CAAC;AAuBH,eAAO,MAAM,eAAe;;;;;;;CAS3B,CAAC;AA6EF,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMvB,CAAC;AAEH,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,YAAY,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@across-protocol/sdk",
3
3
  "author": "UMA Team",
4
- "version": "4.3.143-alpha.3",
4
+ "version": "4.3.144",
5
5
  "license": "AGPL-3.0",
6
6
  "homepage": "https://docs.across.to/reference/sdk",
7
7
  "repository": {
@@ -81,7 +81,7 @@
81
81
  },
82
82
  "dependencies": {
83
83
  "@across-protocol/constants": "^3.1.109",
84
- "@across-protocol/contracts": "5.0.6",
84
+ "@across-protocol/contracts": "5.0.7",
85
85
  "@coral-xyz/anchor": "^0.30.1",
86
86
  "@eth-optimism/sdk": "^3.3.1",
87
87
  "@ethersproject/bignumber": "^5.7.0",
package/src/clients/BundleDataClient/utils/SuperstructUtils.ts CHANGED
@@ -14,8 +14,12 @@ import {
14
14
  union,
15
15
  type,
16
16
  } from "superstruct";
17
- import { CHAIN_IDs, UNDEFINED_MESSAGE_HASH } from "../../../constants";
18
- import { BigNumber, EvmAddress, RawAddress, SvmAddress, toAddressType, toBytes32 } from "../../../utils";
17
+ import { utils as ethersUtils } from "ethers";
18
+ import { isAddress as isValidEvmAddress } from "viem";
19
+ import { isAddress as isValidSvmAddress } from "@solana/kit";
20
+ import { TronWeb } from "tronweb";
21
+ import { UNDEFINED_MESSAGE_HASH } from "../../../constants";
22
+ import { BigNumber, bs58, EvmAddress, RawAddress, SvmAddress, TvmAddress, toBytes32 } from "../../../utils";
19
23
 
20
24
  const PositiveIntegerStringSS = pattern(string(), /\d+/);
21
25
  const Web3AddressSS = pattern(string(), /^0x[a-fA-F0-9]{64}$/);
@@ -31,16 +35,26 @@ const BigNumberType = coerce(instance(BigNumber), union([string(), number()]), (
31
35
  }
32
36
  });
33
37
 
34
- // Accept any concrete implementation of `Address` (Evm, Svm, or Raw) but avoid using the
35
- // abstract `Address` class directly to keep TypeScript happy.
36
- const AddressInstanceSS = union([instance(EvmAddress), instance(SvmAddress), instance(RawAddress)]);
37
-
38
- const AddressType = coerce(AddressInstanceSS, string(), (value) => {
39
- // Addresses are posted to arweave in their native format (base16 for EVM, base58 for SVM). The chainId for
40
- // for the event data is not directly available, so infer it based on the shape of the address. RawAddress
41
- // will be instantiated if the address format does not match the expected family.
42
- const chainId = value.startsWith("0x") ? CHAIN_IDs.MAINNET : CHAIN_IDs.SOLANA;
43
- return toAddressType(value, chainId);
38
+ const AddressInstanceSS = union([
39
+ instance(EvmAddress),
40
+ instance(SvmAddress),
41
+ instance(TvmAddress),
42
+ instance(RawAddress),
43
+ ]);
44
+
45
+ export const AddressType = coerce(AddressInstanceSS, string(), (value) => {
46
+ // Each family is matched by its native-format validator plus a length gate where it
47
+ // disambiguates. Unknown shapes fall to `RawAddress`, forcing future families into explicit
48
+ // branches rather than being absorbed silently.
49
+ try {
50
+ // strict: false preserves the prior byte-level acceptance of all-upper / non-checksummed hex.
51
+ if (value.length === 42 && isValidEvmAddress(value, { strict: false })) return EvmAddress.from(value);
52
+ if (value.length === 34 && TronWeb.isAddress(value)) return TvmAddress.from(value);
53
+ if (isValidSvmAddress(value)) return SvmAddress.from(value);
54
+ } catch {
55
+ // Validator accepted but `from()` rejected (e.g. SVM 12-zero EVM-masquerade) → RawAddress.
56
+ }
57
+ return new RawAddress(value.startsWith("0x") ? ethersUtils.arrayify(value) : bs58.decode(value));
44
58
  });
45
59
 
46
60
  const Web3AddressType = coerce(Web3AddressSS, string(), (value) => {