ox 1.0.0-beta.13 → 1.0.0-beta.15

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 (62) hide show
  1. package/dist/tempo/Channel.d.ts +8 -14
  2. package/dist/tempo/Channel.d.ts.map +1 -1
  3. package/dist/tempo/Channel.js +4 -8
  4. package/dist/tempo/Channel.js.map +1 -1
  5. package/dist/tempo/PoolId.d.ts +7 -7
  6. package/dist/tempo/PoolId.d.ts.map +1 -1
  7. package/dist/tempo/PoolId.js +9 -6
  8. package/dist/tempo/PoolId.js.map +1 -1
  9. package/dist/tempo/TransactionRequest.d.ts +15 -2
  10. package/dist/tempo/TransactionRequest.d.ts.map +1 -1
  11. package/dist/tempo/TransactionRequest.js +65 -29
  12. package/dist/tempo/TransactionRequest.js.map +1 -1
  13. package/dist/tempo/TxEnvelopeTempo.d.ts +2 -3
  14. package/dist/tempo/TxEnvelopeTempo.d.ts.map +1 -1
  15. package/dist/tempo/TxEnvelopeTempo.js +5 -6
  16. package/dist/tempo/TxEnvelopeTempo.js.map +1 -1
  17. package/dist/tempo/index.d.ts +3 -24
  18. package/dist/tempo/index.d.ts.map +1 -1
  19. package/dist/tempo/index.js +3 -24
  20. package/dist/tempo/index.js.map +1 -1
  21. package/dist/zod/tempo/RpcSchemaTempo.d.ts +46 -2
  22. package/dist/zod/tempo/RpcSchemaTempo.d.ts.map +1 -1
  23. package/dist/zod/tempo/TransactionRequest.d.ts +81 -4
  24. package/dist/zod/tempo/TransactionRequest.d.ts.map +1 -1
  25. package/dist/zod/tempo/TransactionRequest.js +81 -18
  26. package/dist/zod/tempo/TransactionRequest.js.map +1 -1
  27. package/dist/zod/tempo/TxEnvelopeTempo.d.ts +3 -3
  28. package/dist/zod/tempo/TxEnvelopeTempo.js +1 -1
  29. package/dist/zod/tempo/TxEnvelopeTempo.js.map +1 -1
  30. package/dist/zod/tempo/z.d.ts +0 -1
  31. package/dist/zod/tempo/z.d.ts.map +1 -1
  32. package/dist/zod/tempo/z.js +0 -1
  33. package/dist/zod/tempo/z.js.map +1 -1
  34. package/package.json +1 -11
  35. package/src/tempo/Channel.test.ts +2 -23
  36. package/src/tempo/Channel.ts +10 -22
  37. package/src/tempo/PoolId.test.ts +7 -41
  38. package/src/tempo/PoolId.ts +14 -10
  39. package/src/tempo/TransactionRequest.test.ts +174 -1
  40. package/src/tempo/TransactionRequest.ts +84 -32
  41. package/src/tempo/TxEnvelopeTempo.test.ts +2 -2
  42. package/src/tempo/TxEnvelopeTempo.ts +7 -7
  43. package/src/tempo/index.ts +3 -24
  44. package/src/version.ts +1 -1
  45. package/src/zod/tempo/TransactionRequest.ts +86 -20
  46. package/src/zod/tempo/TxEnvelopeTempo.ts +1 -1
  47. package/src/zod/tempo/_test/TransactionRequest.test.ts +44 -0
  48. package/src/zod/tempo/z.ts +0 -1
  49. package/dist/tempo/TokenId.d.ts +0 -87
  50. package/dist/tempo/TokenId.d.ts.map +0 -1
  51. package/dist/tempo/TokenId.js +0 -123
  52. package/dist/tempo/TokenId.js.map +0 -1
  53. package/dist/zod/tempo/TokenId.d.ts +0 -6
  54. package/dist/zod/tempo/TokenId.d.ts.map +0 -1
  55. package/dist/zod/tempo/TokenId.js +0 -14
  56. package/dist/zod/tempo/TokenId.js.map +0 -1
  57. package/src/tempo/TokenId.bench.ts +0 -36
  58. package/src/tempo/TokenId.test.ts +0 -79
  59. package/src/tempo/TokenId.ts +0 -141
  60. package/src/zod/tempo/TokenId.ts +0 -15
  61. package/src/zod/tempo/_test/TokenId.test-d.ts +0 -17
  62. package/src/zod/tempo/_test/TokenId.test.ts +0 -21
@@ -8,7 +8,6 @@ import * as z from 'zod/mini';
8
8
  import * as z_AuthorizationTempo from './AuthorizationTempo.js';
9
9
  import * as z_KeyAuthorization from './KeyAuthorization.js';
10
10
  import * as z_SignatureEnvelope from './SignatureEnvelope.js';
11
- import * as z_TokenId from './TokenId.js';
12
11
  const fromRpcType = { '0x76': 'tempo' };
13
12
  const toRpcType = { tempo: '0x76' };
14
13
  const KeyType = z.union([
@@ -43,6 +42,12 @@ const CallToRpc = z.object({
43
42
  to: z.optional(z_Address.Address),
44
43
  value: z.optional(uintBigintNumberish()),
45
44
  });
45
+ const Capabilities = z.record(z.string(), z.unknown());
46
+ const MultisigInit = z.object({
47
+ salt: z_Hex.Hex,
48
+ threshold: z.number(),
49
+ owners: z.readonly(z.array(z.object({ owner: z_Address.Address, weight: z.number() }))),
50
+ });
46
51
  /** RPC tempo transaction request schema. */
47
52
  export const Rpc = z.object({
48
53
  accessList: z.optional(z_AccessList.AccessList),
@@ -50,6 +55,7 @@ export const Rpc = z.object({
50
55
  blobVersionedHashes: z.optional(z.readonly(z.array(z_Hex.Hex))),
51
56
  blobs: z.optional(z.readonly(z.array(z_Hex.Hex))),
52
57
  calls: z.optional(z.readonly(z.array(CallRpc))),
58
+ capabilities: z.optional(Capabilities),
53
59
  chainId: z.optional(z_Hex.Hex),
54
60
  data: z.optional(z_Hex.Hex),
55
61
  feePayer: z.optional(z.boolean()),
@@ -61,10 +67,13 @@ export const Rpc = z.object({
61
67
  input: z.optional(z_Hex.Hex),
62
68
  keyAuthorization: z.optional(z_KeyAuthorization.Rpc),
63
69
  keyData: z.optional(z_Hex.Hex),
70
+ keyId: z.optional(z_Address.Address),
64
71
  keyType: z.optional(KeyType),
65
72
  maxFeePerBlobGas: z.optional(z_Hex.Hex),
66
73
  maxFeePerGas: z.optional(z_Hex.Hex),
67
74
  maxPriorityFeePerGas: z.optional(z_Hex.Hex),
75
+ multisigInit: z.optional(MultisigInit),
76
+ multisigSignatureCount: z.optional(z.number()),
68
77
  nonce: z.optional(z_Hex.Hex),
69
78
  nonceKey: z.optional(z_Hex.Hex),
70
79
  r: z.optional(z_Hex.Hex),
@@ -97,21 +106,25 @@ export const Domain = z.object({
97
106
  blobVersionedHashes: z.optional(z.readonly(z.array(z_Hex.Hex))),
98
107
  blobs: z.optional(z.readonly(z.array(z_Hex.Hex))),
99
108
  calls: z.optional(z.readonly(z.array(Call))),
109
+ capabilities: z.optional(Capabilities),
100
110
  chainId: z.optional(z.number()),
101
111
  data: z.optional(z_Hex.Hex),
102
112
  feePayer: z.optional(z.boolean()),
103
113
  feePayerSignature: z.optional(z.union([SignatureDecoded, z.null()])),
104
- feeToken: z.optional(z.union([z_Address.Address, z.bigint()])),
114
+ feeToken: z.optional(z_Address.Address),
105
115
  from: z.optional(z_Address.Address),
106
116
  gas: z.optional(z.bigint()),
107
117
  gasPrice: z.optional(z.bigint()),
108
118
  input: z.optional(z_Hex.Hex),
109
119
  keyAuthorization: z.optional(z_KeyAuthorization.Domain),
110
120
  keyData: z.optional(z_Hex.Hex),
121
+ keyId: z.optional(z_Address.Address),
111
122
  keyType: z.optional(KeyType),
112
123
  maxFeePerBlobGas: z.optional(z.bigint()),
113
124
  maxFeePerGas: z.optional(z.bigint()),
114
125
  maxPriorityFeePerGas: z.optional(z.bigint()),
126
+ multisigInit: z.optional(MultisigInit),
127
+ multisigSignatureCount: z.optional(z.number()),
115
128
  nonce: z.optional(z.bigint()),
116
129
  nonceKey: z.optional(z.union([z.bigint(), z.literal('random')])),
117
130
  r: z.optional(z_Hex.Hex),
@@ -132,21 +145,25 @@ export const DomainToRpc = z.object({
132
145
  blobVersionedHashes: z.optional(z.readonly(z.array(z_Hex.Hex))),
133
146
  blobs: z.optional(z.readonly(z.array(z_Hex.Hex))),
134
147
  calls: z.optional(z.readonly(z.array(CallToRpc))),
148
+ capabilities: z.optional(Capabilities),
135
149
  chainId: z.optional(uintNumberNumberish()),
136
150
  data: z.optional(z_Hex.Hex),
137
151
  feePayer: z.optional(z.boolean()),
138
152
  feePayerSignature: z.optional(z.union([SignatureDecoded, z.null()])),
139
- feeToken: z.optional(z.union([z_Address.Address, z.bigint()])),
153
+ feeToken: z.optional(z_Address.Address),
140
154
  from: z.optional(z_Address.Address),
141
155
  gas: z.optional(uintBigintNumberish()),
142
156
  gasPrice: z.optional(uintBigintNumberish()),
143
157
  input: z.optional(z_Hex.Hex),
144
158
  keyAuthorization: z.optional(z_KeyAuthorization.DomainToRpc),
145
159
  keyData: z.optional(z_Hex.Hex),
160
+ keyId: z.optional(z_Address.Address),
146
161
  keyType: z.optional(KeyType),
147
162
  maxFeePerBlobGas: z.optional(uintBigintNumberish()),
148
163
  maxFeePerGas: z.optional(uintBigintNumberish()),
149
164
  maxPriorityFeePerGas: z.optional(uintBigintNumberish()),
165
+ multisigInit: z.optional(MultisigInit),
166
+ multisigSignatureCount: z.optional(z.number()),
150
167
  nonce: z.optional(uintBigintNumberish()),
151
168
  nonceKey: z.optional(z.union([uintBigintNumberish(), z.literal('random')])),
152
169
  r: z.optional(z_Hex.Hex),
@@ -195,6 +212,20 @@ function fromRpc(request) {
195
212
  request_.feeToken = request.feeToken;
196
213
  if (request.keyAuthorization)
197
214
  request_.keyAuthorization = z.decode(z_KeyAuthorization.KeyAuthorization, request.keyAuthorization);
215
+ if (typeof request.capabilities !== 'undefined')
216
+ request_.capabilities = request.capabilities;
217
+ if (typeof request.feePayer !== 'undefined')
218
+ request_.feePayer = request.feePayer;
219
+ if (typeof request.keyData !== 'undefined')
220
+ request_.keyData = request.keyData;
221
+ if (typeof request.keyId !== 'undefined')
222
+ request_.keyId = request.keyId;
223
+ if (typeof request.keyType !== 'undefined')
224
+ request_.keyType = request.keyType;
225
+ if (typeof request.multisigInit !== 'undefined')
226
+ request_.multisigInit = request.multisigInit;
227
+ if (typeof request.multisigSignatureCount !== 'undefined')
228
+ request_.multisigSignatureCount = request.multisigSignatureCount;
198
229
  if (typeof request.validBefore !== 'undefined')
199
230
  request_.validBefore = core_Hex.toNumber(request.validBefore);
200
231
  if (typeof request.validAfter !== 'undefined')
@@ -209,6 +240,20 @@ function toRpc(request) {
209
240
  ...request,
210
241
  authorizationList: undefined,
211
242
  });
243
+ const tempo = typeof request.calls !== 'undefined' ||
244
+ typeof request.capabilities !== 'undefined' ||
245
+ typeof request.feePayer !== 'undefined' ||
246
+ typeof request.feeToken !== 'undefined' ||
247
+ typeof request.keyAuthorization !== 'undefined' ||
248
+ typeof request.keyData !== 'undefined' ||
249
+ typeof request.keyId !== 'undefined' ||
250
+ typeof request.keyType !== 'undefined' ||
251
+ typeof request.multisigInit !== 'undefined' ||
252
+ typeof request.multisigSignatureCount !== 'undefined' ||
253
+ typeof request.nonceKey !== 'undefined' ||
254
+ typeof request.validBefore !== 'undefined' ||
255
+ typeof request.validAfter !== 'undefined' ||
256
+ request.type === 'tempo';
212
257
  if (request.authorizationList)
213
258
  request_rpc.authorizationList = z.encode(z_AuthorizationTempo.ListSignedToRpc, request.authorizationList);
214
259
  if (request.signature)
@@ -221,21 +266,36 @@ function toRpc(request) {
221
266
  value: call.value ? encodeNumberish(call.value) : '0x',
222
267
  data: call.data ?? '0x',
223
268
  }));
224
- else if (request.to || request.data || request.value)
269
+ else if (request.to || request.data || request.value || tempo)
225
270
  request_rpc.calls = [
226
271
  {
227
- to: request.to ?? undefined,
272
+ to: request.to ||
273
+ (tempo && (!request.data || request.data === '0x')
274
+ ? '0x0000000000000000000000000000000000000000'
275
+ : undefined),
228
276
  value: request.value ? encodeNumberish(request.value) : '0x',
229
277
  data: request.data ?? '0x',
230
278
  },
231
279
  ];
232
- if (typeof request.feeToken !== 'undefined')
233
- request_rpc.feeToken =
234
- typeof request.feeToken === 'bigint'
235
- ? z.encode(z_TokenId.address, request.feeToken)
236
- : request.feeToken;
280
+ if (typeof request.feeToken !== 'undefined' &&
281
+ !(request.feePayer === true && !request.feePayerSignature))
282
+ request_rpc.feeToken = request.feeToken;
237
283
  if (request.keyAuthorization)
238
284
  request_rpc.keyAuthorization = z.encode(z_KeyAuthorization.KeyAuthorizationToRpc, request.keyAuthorization);
285
+ if (typeof request.capabilities !== 'undefined')
286
+ request_rpc.capabilities = request.capabilities;
287
+ if (typeof request.feePayer !== 'undefined')
288
+ request_rpc.feePayer = request.feePayer;
289
+ if (typeof request.keyData !== 'undefined')
290
+ request_rpc.keyData = shimKeyData(request.keyData);
291
+ if (typeof request.keyId !== 'undefined')
292
+ request_rpc.keyId = request.keyId;
293
+ if (typeof request.keyType !== 'undefined')
294
+ request_rpc.keyType = request.keyType;
295
+ if (typeof request.multisigInit !== 'undefined')
296
+ request_rpc.multisigInit = request.multisigInit;
297
+ if (typeof request.multisigSignatureCount !== 'undefined')
298
+ request_rpc.multisigSignatureCount = request.multisigSignatureCount;
239
299
  if (typeof request.validBefore !== 'undefined')
240
300
  request_rpc.validBefore = encodeNumberish(request.validBefore);
241
301
  if (typeof request.validAfter !== 'undefined')
@@ -249,14 +309,7 @@ function toRpc(request) {
249
309
  })();
250
310
  if (nonceKey)
251
311
  request_rpc.nonceKey = nonceKey;
252
- if (typeof request.calls !== 'undefined' ||
253
- typeof request.feePayer !== 'undefined' ||
254
- typeof request.feeToken !== 'undefined' ||
255
- typeof request.keyAuthorization !== 'undefined' ||
256
- typeof request.nonceKey !== 'undefined' ||
257
- typeof request.validBefore !== 'undefined' ||
258
- typeof request.validAfter !== 'undefined' ||
259
- request.type === 'tempo') {
312
+ if (tempo) {
260
313
  request_rpc.type = toRpcType.tempo;
261
314
  delete request_rpc.data;
262
315
  delete request_rpc.input;
@@ -265,6 +318,16 @@ function toRpc(request) {
265
318
  }
266
319
  return request_rpc;
267
320
  }
321
+ /**
322
+ * Shims key data longer than 4 bytes into a 2-byte big-endian length hint
323
+ * (the node's gas estimator only accepts 1, 2, or 4-byte key data).
324
+ */
325
+ function shimKeyData(data) {
326
+ const byteLength = core_Hex.size(data);
327
+ if (byteLength <= 4)
328
+ return data;
329
+ return core_Hex.fromNumber(byteLength, { size: 2 });
330
+ }
268
331
  /** Decodes an RPC signature into a recovered signature. */
269
332
  function signatureFromRpc(signature) {
270
333
  const v = signature.v ? Number(signature.v) : undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"TransactionRequest.js","sourceRoot":"","sources":["../../../src/zod/tempo/TransactionRequest.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,QAAQ,MAAM,mBAAmB,CAAA;AAC7C,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAA;AAChD,OAAO,KAAK,SAAS,MAAM,eAAe,CAAA;AAC1C,OAAO,KAAK,KAAK,MAAM,WAAW,CAAA;AAClC,OAAO,KAAK,oBAAoB,MAAM,0BAA0B,CAAA;AAChE,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,wBAAwB,CAAA;AAC/B,OAAO,KAAK,CAAC,MAAM,UAAU,CAAA;AAC7B,OAAO,KAAK,oBAAoB,MAAM,yBAAyB,CAAA;AAC/D,OAAO,KAAK,kBAAkB,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,mBAAmB,MAAM,wBAAwB,CAAA;AAC7D,OAAO,KAAK,SAAS,MAAM,cAAc,CAAA;AAEzC,MAAM,WAAW,GAAG,EAAE,MAAM,EAAE,OAAO,EAAW,CAAA;AAChD,MAAM,SAAS,GAAG,EAAE,KAAK,EAAE,MAAM,EAAW,CAAA;AAE5C,MAAM,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC;IACtB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IACtB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACjB,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;CACtB,CAAC,CAAA;AAEF,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,CAAC,EAAE,KAAK,CAAC,GAAG;IACZ,CAAC,EAAE,KAAK,CAAC,GAAG;IACZ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IACxB,OAAO,EAAE,KAAK,CAAC,GAAG;CACnB,CAAC,CAAA;AAEF,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC;IAChC,CAAC,EAAE,KAAK,CAAC,GAAG;IACZ,CAAC,EAAE,KAAK,CAAC,GAAG;IACZ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;CACpB,CAAC,CAAA;AAEF,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC;IACvB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC3B,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC;IACjC,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;CAC7B,CAAC,CAAA;AAEF,MAAM,IAAI,GAAG,CAAC,CAAC,MAAM,CAAC;IACpB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC3B,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC;IACjC,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CAC9B,CAAC,CAAA;AAEF,MAAM,SAAS,GAAG,CAAC,CAAC,MAAM,CAAC;IACzB,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC3B,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC;IACjC,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;CACzC,CAAC,CAAA;AAEF,4CAA4C;AAC5C,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1B,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC;IAC/C,iBAAiB,EAAE,CAAC,CAAC,QAAQ,CAAC,oBAAoB,CAAC,OAAO,CAAC;IAC3D,mBAAmB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAC/C,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC9B,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC3B,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACjC,iBAAiB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IAChE,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC/B,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC;IACnC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC1B,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC/B,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC5B,gBAAgB,EAAE,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,GAAG,CAAC;IACpD,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC9B,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC5B,gBAAgB,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IACvC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IACnC,oBAAoB,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC3C,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC5B,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC/B,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IACxB,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IACxB,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,GAAG,CAAC;IAC9C,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACtD,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IACxB,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IACjC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAClC,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC5B,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;CAC/B,CAAC,CAAA;AAEF,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC;IACnC,OAAO,EAAE,SAAS,CAAC,OAAO;IAC1B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;IACjB,SAAS,EAAE,mBAAmB,CAAC,MAAM;CACtC,CAAC,CAAA;AAEF,MAAM,wBAAwB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,OAAO,EAAE,SAAS,CAAC,OAAO;IAC1B,OAAO,EAAE,mBAAmB,EAAE;IAC9B,KAAK,EAAE,mBAAmB,EAAE;IAC5B,SAAS,EAAE,mBAAmB,CAAC,MAAM;CACtC,CAAC,CAAA;AAEF,gDAAgD;AAChD,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7B,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC;IAC/C,iBAAiB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC,CAAC;IACvE,mBAAmB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5C,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC/B,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC3B,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACjC,iBAAiB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACpE,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC9D,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC;IACnC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC3B,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChC,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC5B,gBAAgB,EAAE,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,MAAM,CAAC;IACvD,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC9B,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC5B,gBAAgB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACxC,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACpC,oBAAoB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5C,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC7B,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAChE,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IACxB,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IACxB,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC;IACjD,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACtD,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAClC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACnC,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC7B,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CAChC,CAAC,CAAA;AAEF,+FAA+F;AAC/F,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC;IAClC,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,UAAU,CAAC;IAC/C,iBAAiB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAC5E,mBAAmB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IACjD,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IAC1C,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC3B,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IACjC,iBAAiB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACpE,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;IAC9D,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,CAAC;IACnC,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IACtC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IAC3C,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC5B,gBAAgB,EAAE,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,WAAW,CAAC;IAC5D,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IAC9B,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC5B,gBAAgB,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IACnD,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IAC/C,oBAAoB,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IACvD,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IACxC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IACxB,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;IACxB,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,CAAC;IACjD,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACtD,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IAC7C,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IAC9C,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,CAAC;IACxC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CAChC,CAAC,CAAA;AAEF,kFAAkF;AAClF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE;IACrD,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAc,CAAU;IACnD,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAc,CAAU;CAClD,CAAC,CAAA;AAEF,sFAAsF;AACtF,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE;IAC/D,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAc,CAAU;IACnD,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAc,CAAU;CAClD,CAAC,CAAA;AAEF,2EAA2E;AAC3E,SAAS,OAAO,CACd,OAAoC;IAEpC,MAAM,EAAE,iBAAiB,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAA;IACjD,MAAM,QAAQ,GAAG,CAAC,CAAC,MAAM,CACvB,oBAAoB,CAAC,kBAAkB,EACvC,IAAa,CACgC,CAAA;IAE/C,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,WAAW;QACrC,QAAQ,CAAC,IAAI;YACX,WAAW,CAAC,OAAO,CAAC,IAAgC,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAA;IAE1E,IAAI,OAAO,CAAC,iBAAiB;QAC3B,QAAQ,CAAC,iBAAiB,GAAG,CAAC,CAAC,MAAM,CACnC,oBAAoB,CAAC,UAAU,EAC/B,OAAO,CAAC,iBAA0B,CAC1B,CAAA;IACZ,IAAI,OAAO,CAAC,SAAS;QACnB,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC,MAAM,CAC3B,mBAAmB,CAAC,iBAAiB,EACrC,OAAO,CAAC,SAAkB,CAClB,CAAA;IACZ,IAAI,OAAO,CAAC,iBAAiB;QAC3B,QAAQ,CAAC,iBAAiB,GAAG,gBAAgB,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;IAC1E,IAAI,OAAO,CAAC,KAAK;QACf,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC5C,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI;gBACnC,CAAC,CAAC,EAAE,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;gBAC1C,CAAC,CAAC,EAAE,CAAC;SACR,CAAC,CAAC,CAAA;IACL,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,WAAW;QACzC,QAAQ,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;IACtC,IAAI,OAAO,CAAC,gBAAgB;QAC1B,QAAQ,CAAC,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAClC,kBAAkB,CAAC,gBAAgB,EACnC,OAAO,CAAC,gBAAyB,CACzB,CAAA;IACZ,IAAI,OAAO,OAAO,CAAC,WAAW,KAAK,WAAW;QAC5C,QAAQ,CAAC,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAC/D,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,WAAW;QAC3C,QAAQ,CAAC,UAAU,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAC7D,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,WAAW;QACzC,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAEzD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAED,2EAA2E;AAC3E,SAAS,KAAK,CACZ,OAAmD;IAEnD,MAAM,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,oBAAoB,CAAC,uBAAuB,EAAE;QACzE,GAAG,OAAO;QACV,iBAAiB,EAAE,SAAS;KACpB,CAAgC,CAAA;IAE1C,IAAI,OAAO,CAAC,iBAAiB;QAC3B,WAAW,CAAC,iBAAiB,GAAG,CAAC,CAAC,MAAM,CACtC,oBAAoB,CAAC,eAAe,EACpC,OAAO,CAAC,iBAA0B,CAC1B,CAAA;IACZ,IAAI,OAAO,CAAC,SAAS;QACnB,WAAW,CAAC,SAAS,GAAG,CAAC,CAAC,MAAM,CAC9B,mBAAmB,CAAC,iBAAiB,EACrC,OAAO,CAAC,SAAkB,CAClB,CAAA;IACZ,IAAI,OAAO,CAAC,iBAAiB;QAC3B,WAAW,CAAC,iBAAiB,GAAG,cAAc,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;IAC3E,IAAI,OAAO,CAAC,KAAK;QACf,WAAW,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC/C,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;YACtD,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,IAAI;SACxB,CAAC,CAAC,CAAA;SACA,IAAI,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK;QAClD,WAAW,CAAC,KAAK,GAAG;YAClB;gBACE,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,SAAS;gBAC3B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC5D,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,IAAI;aAC3B;SACF,CAAA;IACH,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,WAAW;QACzC,WAAW,CAAC,QAAQ;YAClB,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ;gBAClC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,CAAC;gBAC/C,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAA;IACxB,IAAI,OAAO,CAAC,gBAAgB;QAC1B,WAAW,CAAC,gBAAgB,GAAG,CAAC,CAAC,MAAM,CACrC,kBAAkB,CAAC,qBAAqB,EACxC,OAAO,CAAC,gBAAyB,CACzB,CAAA;IACZ,IAAI,OAAO,OAAO,CAAC,WAAW,KAAK,WAAW;QAC5C,WAAW,CAAC,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAChE,IAAI,OAAO,OAAO,CAAC,UAAU,KAAK,WAAW;QAC3C,WAAW,CAAC,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;IAE9D,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE;QACrB,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ;YAAE,OAAO,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC7D,IAAI,OAAO,OAAO,CAAC,QAAQ,KAAK,WAAW;YACzC,OAAO,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC1C,OAAO,SAAS,CAAA;IAClB,CAAC,CAAC,EAAE,CAAA;IACJ,IAAI,QAAQ;QAAE,WAAW,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAE7C,IACE,OAAO,OAAO,CAAC,KAAK,KAAK,WAAW;QACpC,OAAO,OAAO,CAAC,QAAQ,KAAK,WAAW;QACvC,OAAO,OAAO,CAAC,QAAQ,KAAK,WAAW;QACvC,OAAO,OAAO,CAAC,gBAAgB,KAAK,WAAW;QAC/C,OAAO,OAAO,CAAC,QAAQ,KAAK,WAAW;QACvC,OAAO,OAAO,CAAC,WAAW,KAAK,WAAW;QAC1C,OAAO,OAAO,CAAC,UAAU,KAAK,WAAW;QACzC,OAAO,CAAC,IAAI,KAAK,OAAO,EACxB,CAAC;QACD,WAAW,CAAC,IAAI,GAAG,SAAS,CAAC,KAAK,CAAA;QAClC,OAAO,WAAW,CAAC,IAAI,CAAA;QACvB,OAAO,WAAW,CAAC,KAAK,CAAA;QACxB,OAAO,WAAW,CAAC,EAAE,CAAA;QACrB,OAAO,WAAW,CAAC,KAAK,CAAA;IAC1B,CAAC;IAED,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,2DAA2D;AAC3D,SAAS,gBAAgB,CAAC,SAKzB;IACC,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACvD,IAAI,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;IACvE,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QACzD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE;YAAE,OAAO,GAAG,CAAC,CAAA;aAC/B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE;YAAE,OAAO,GAAG,CAAC,CAAA;aACpC,IAAI,CAAC,IAAI,EAAE;YAAE,OAAO,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACjD,CAAC;IACD,OAAO;QACL,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;QACpC,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC;QACpC,OAAO,EAAE,OAAiB;KAC3B,CAAA;AACH,CAAC;AAED,2DAA2D;AAC3D,SAAS,cAAc,CAAC,SAIvB;IACC,OAAO;QACL,CAAC,EAAE,SAAS,CAAC,CAAC;QACd,CAAC,EAAE,SAAS,CAAC,CAAC;QACd,OAAO,EAAE,SAAS,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK;KACxC,CAAA;AACZ,CAAC"}
1
+ {"version":3,"file":"TransactionRequest.js","sourceRoot":"","sources":["../../../src/zod/tempo/TransactionRequest.ts"],"names":[],"mappings":"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"}
@@ -136,7 +136,7 @@ export declare const TxEnvelopeTempo: z.ZodMiniObject<{
136
136
  v: z.ZodMiniOptional<z.ZodMiniNumber<number>>;
137
137
  yParity: z.ZodMiniNumber<number>;
138
138
  }, z.core.$strip>, z.ZodMiniNull]>>;
139
- feeToken: z.ZodMiniOptional<z.ZodMiniUnion<readonly [z.ZodMiniTemplateLiteral<`0x${string}`>, z.ZodMiniBigInt<bigint>]>>;
139
+ feeToken: z.ZodMiniOptional<z.ZodMiniTemplateLiteral<`0x${string}`>>;
140
140
  from: z.ZodMiniOptional<z.ZodMiniTemplateLiteral<`0x${string}`>>;
141
141
  gas: z.ZodMiniOptional<z.ZodMiniBigInt<bigint>>;
142
142
  keyAuthorization: z.ZodMiniOptional<z.ZodMiniObject<{
@@ -345,7 +345,7 @@ export declare const Signed: z.ZodMiniObject<{
345
345
  v: z.ZodMiniOptional<z.ZodMiniNumber<number>>;
346
346
  yParity: z.ZodMiniNumber<number>;
347
347
  }, z.core.$strip>, z.ZodMiniNull]>>;
348
- feeToken: z.ZodMiniOptional<z.ZodMiniUnion<readonly [z.ZodMiniTemplateLiteral<`0x${string}`>, z.ZodMiniBigInt<bigint>]>>;
348
+ feeToken: z.ZodMiniOptional<z.ZodMiniTemplateLiteral<`0x${string}`>>;
349
349
  from: z.ZodMiniOptional<z.ZodMiniTemplateLiteral<`0x${string}`>>;
350
350
  gas: z.ZodMiniOptional<z.ZodMiniBigInt<bigint>>;
351
351
  keyAuthorization: z.ZodMiniOptional<z.ZodMiniObject<{
@@ -554,7 +554,7 @@ export declare const serialized: z.ZodMiniCodec<z.ZodMiniTemplateLiteral<`0x${st
554
554
  v: z.ZodMiniOptional<z.ZodMiniNumber<number>>;
555
555
  yParity: z.ZodMiniNumber<number>;
556
556
  }, z.core.$strip>, z.ZodMiniNull]>>;
557
- feeToken: z.ZodMiniOptional<z.ZodMiniUnion<readonly [z.ZodMiniTemplateLiteral<`0x${string}`>, z.ZodMiniBigInt<bigint>]>>;
557
+ feeToken: z.ZodMiniOptional<z.ZodMiniTemplateLiteral<`0x${string}`>>;
558
558
  from: z.ZodMiniOptional<z.ZodMiniTemplateLiteral<`0x${string}`>>;
559
559
  gas: z.ZodMiniOptional<z.ZodMiniBigInt<bigint>>;
560
560
  keyAuthorization: z.ZodMiniOptional<z.ZodMiniObject<{
@@ -27,7 +27,7 @@ const baseFields = {
27
27
  calls: z.readonly(z.array(Call)),
28
28
  chainId: z.number(),
29
29
  feePayerSignature: z.optional(z.union([FeePayerSignature, z.null()])),
30
- feeToken: z.optional(z.union([z_Address.Address, z.bigint()])),
30
+ feeToken: z.optional(z_Address.Address),
31
31
  from: z.optional(z_Address.Address),
32
32
  gas: z.optional(z.bigint()),
33
33
  keyAuthorization: z.optional(z_KeyAuthorization.Domain),
@@ -1 +1 @@
1
- {"version":3,"file":"TxEnvelopeTempo.js","sourceRoot":"","sources":["../../../src/zod/tempo/TxEnvelopeTempo.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TxEnvelopeTempo.js","sourceRoot":"","sources":["../../../src/zod/tempo/TxEnvelopeTempo.ts"],"names":[],"mappings":"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"}
@@ -5,7 +5,6 @@ export * as PoolId from './PoolId.js';
5
5
  export * as RpcSchemaTempo from './RpcSchemaTempo.js';
6
6
  export * as SignatureEnvelope from './SignatureEnvelope.js';
7
7
  export * as Tick from './Tick.js';
8
- export * as TokenId from './TokenId.js';
9
8
  export * as TokenRole from './TokenRole.js';
10
9
  export * as Transaction from './Transaction.js';
11
10
  export * as TransactionReceipt from './TransactionReceipt.js';
@@ -1 +1 @@
1
- {"version":3,"file":"z.d.ts","sourceRoot":"","sources":["../../../src/zod/tempo/z.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AACzD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}
1
+ {"version":3,"file":"z.d.ts","sourceRoot":"","sources":["../../../src/zod/tempo/z.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AACzD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}
@@ -6,7 +6,6 @@ export * as PoolId from './PoolId.js';
6
6
  export * as RpcSchemaTempo from './RpcSchemaTempo.js';
7
7
  export * as SignatureEnvelope from './SignatureEnvelope.js';
8
8
  export * as Tick from './Tick.js';
9
- export * as TokenId from './TokenId.js';
10
9
  export * as TokenRole from './TokenRole.js';
11
10
  export * as Transaction from './Transaction.js';
12
11
  export * as TransactionReceipt from './TransactionReceipt.js';
@@ -1 +1 @@
1
- {"version":3,"file":"z.js","sourceRoot":"","sources":["../../../src/zod/tempo/z.ts"],"names":[],"mappings":"AAAA,mGAAmG;AACnG,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AACzD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}
1
+ {"version":3,"file":"z.js","sourceRoot":"","sources":["../../../src/zod/tempo/z.ts"],"names":[],"mappings":"AAAA,mGAAmG;AACnG,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,gBAAgB,MAAM,uBAAuB,CAAA;AACzD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAC3D,OAAO,KAAK,IAAI,MAAM,WAAW,CAAA;AACjC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,kBAAkB,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AACrC,OAAO,KAAK,qBAAqB,MAAM,4BAA4B,CAAA"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "ox",
3
3
  "description": "Ethereum Standard Library",
4
4
  "type": "module",
5
- "version": "1.0.0-beta.13",
5
+ "version": "1.0.0-beta.15",
6
6
  "main": "./dist/index.js",
7
7
  "sideEffects": false,
8
8
  "license": "MIT",
@@ -559,11 +559,6 @@
559
559
  "types": "./dist/tempo/Tick.d.ts",
560
560
  "default": "./dist/tempo/Tick.js"
561
561
  },
562
- "./tempo/TokenId": {
563
- "src": "./src/tempo/TokenId.ts",
564
- "types": "./dist/tempo/TokenId.d.ts",
565
- "default": "./dist/tempo/TokenId.js"
566
- },
567
562
  "./tempo/TokenRole": {
568
563
  "src": "./src/tempo/TokenRole.ts",
569
564
  "types": "./dist/tempo/TokenRole.d.ts",
@@ -849,11 +844,6 @@
849
844
  "types": "./dist/zod/tempo/Tick.d.ts",
850
845
  "default": "./dist/zod/tempo/Tick.js"
851
846
  },
852
- "./zod/tempo/TokenId": {
853
- "src": "./src/zod/tempo/TokenId.ts",
854
- "types": "./dist/zod/tempo/TokenId.d.ts",
855
- "default": "./dist/zod/tempo/TokenId.js"
856
- },
857
847
  "./zod/tempo/TokenRole": {
858
848
  "src": "./src/zod/tempo/TokenRole.ts",
859
849
  "types": "./dist/zod/tempo/TokenRole.d.ts",
@@ -10,7 +10,7 @@ const channel = {
10
10
  payee: '0x2222222222222222222222222222222222222222',
11
11
  payer: '0x1111111111111111111111111111111111111111',
12
12
  salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
13
- token: 1n,
13
+ token: '0x20c0000000000000000000000000000000000001',
14
14
  } as const
15
15
 
16
16
  const chainId = 4217
@@ -84,26 +84,6 @@ describe('from', () => {
84
84
  `)
85
85
  })
86
86
 
87
- test('token address input', () => {
88
- expect(
89
- Channel.from({
90
- ...channel,
91
- operator: '0x4444444444444444444444444444444444444444',
92
- token: '0x20c0000000000000000000000000000000000001',
93
- }),
94
- ).toMatchInlineSnapshot(`
95
- {
96
- "authorizedSigner": "0x3333333333333333333333333333333333333333",
97
- "expiringNonceHash": "0x0000000000000000000000000000000000000000000000000000000000000002",
98
- "operator": "0x4444444444444444444444444444444444444444",
99
- "payee": "0x2222222222222222222222222222222222222222",
100
- "payer": "0x1111111111111111111111111111111111111111",
101
- "salt": "0x0000000000000000000000000000000000000000000000000000000000000001",
102
- "token": "0x20c0000000000000000000000000000000000001",
103
- }
104
- `)
105
- })
106
-
107
87
  test('return type', () => {
108
88
  const resolved = Channel.from({
109
89
  expiringNonceHash:
@@ -111,10 +91,9 @@ describe('from', () => {
111
91
  payee: '0x2222222222222222222222222222222222222222',
112
92
  payer: '0x1111111111111111111111111111111111111111',
113
93
  salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
114
- token: 1n,
94
+ token: '0x20c0000000000000000000000000000000000001',
115
95
  })
116
96
 
117
- resolved satisfies Channel.Resolved
118
97
  resolved satisfies Channel.Channel
119
98
  resolved.payer satisfies Address.Address
120
99
  resolved.token satisfies Address.Address
@@ -3,7 +3,6 @@ import * as Address from '../core/Address.js'
3
3
  import type * as Errors from '../core/Errors.js'
4
4
  import * as Hash from '../core/Hash.js'
5
5
  import * as Hex from '../core/Hex.js'
6
- import * as TokenId from './TokenId.js'
7
6
 
8
7
  const channelIdParameters = AbiParameters.from(
9
8
  'address, address, address, address, bytes32, address, bytes32, address, uint256',
@@ -57,18 +56,14 @@ export type Channel = {
57
56
  payer: Address.Address
58
57
  /** User-supplied salt to distinguish otherwise identical channels. */
59
58
  salt: Hex.Hex
60
- /** TIP-20 token address or ID held by the channel. */
61
- token: TokenId.TokenIdOrAddress
59
+ /** TIP-20 token address held by the channel. */
60
+ token: Address.Address
62
61
  }
63
62
 
64
- /** Hex-address-normalized {@link ox#Channel.Channel}. */
65
- export type Resolved = Omit<Channel, 'token'> & { token: Address.Address }
66
-
67
63
  /**
68
64
  * Instantiates a TIP-20 channel reserve descriptor.
69
65
  *
70
- * Accepts a TIP-20 token ID or address, and defaults `operator` and
71
- * `authorizedSigner` to the zero address.
66
+ * Defaults `operator` and `authorizedSigner` to the zero address.
72
67
  *
73
68
  * @example
74
69
  * ```ts twoslash
@@ -80,7 +75,7 @@ export type Resolved = Omit<Channel, 'token'> & { token: Address.Address }
80
75
  * payee: '0x2222222222222222222222222222222222222222',
81
76
  * payer: '0x1111111111111111111111111111111111111111',
82
77
  * salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
83
- * token: 1n
78
+ * token: '0x20c0000000000000000000000000000000000001'
84
79
  * })
85
80
  * ```
86
81
  *
@@ -105,10 +100,7 @@ export function from(value: from.Value): from.ReturnType {
105
100
  payee: resolveAddress(payee),
106
101
  payer: resolveAddress(payer),
107
102
  salt,
108
- token:
109
- typeof token === 'string'
110
- ? resolveAddress(token)
111
- : TokenId.toAddress(token),
103
+ token: resolveAddress(token),
112
104
  }
113
105
  }
114
106
 
@@ -126,17 +118,13 @@ export declare namespace from {
126
118
  payer: Address.Address
127
119
  /** User-supplied salt to distinguish otherwise identical channels. */
128
120
  salt: Hex.Hex
129
- /** TIP-20 token address or ID held by the channel. */
130
- token: TokenId.TokenIdOrAddress
121
+ /** TIP-20 token address held by the channel. */
122
+ token: Address.Address
131
123
  }
132
124
 
133
- type ReturnType = Resolved
125
+ type ReturnType = Channel
134
126
 
135
- type ErrorType =
136
- | Address.from.ErrorType
137
- | Hex.concat.ErrorType
138
- | Hex.fromNumber.ErrorType
139
- | Errors.GlobalErrorType
127
+ type ErrorType = Address.from.ErrorType | Errors.GlobalErrorType
140
128
  }
141
129
 
142
130
  /**
@@ -159,7 +147,7 @@ export declare namespace from {
159
147
  * payee: '0x2222222222222222222222222222222222222222',
160
148
  * payer: '0x1111111111111111111111111111111111111111',
161
149
  * salt: '0x0000000000000000000000000000000000000000000000000000000000000001',
162
- * token: 1n
150
+ * token: '0x20c0000000000000000000000000000000000001'
163
151
  * },
164
152
  * {
165
153
  * chainId: 4217
@@ -2,57 +2,23 @@ import { PoolId } from 'ox/tempo'
2
2
  import { expect, test } from 'vp/test'
3
3
 
4
4
  test('from', () => {
5
- // Test with bigint token IDs
6
- const poolId1 = PoolId.from({
7
- userToken: 0n,
8
- validatorToken: 1n,
9
- })
10
- expect(poolId1).toMatchInlineSnapshot(
11
- `"0x24fc92718dfd933b7f831893444e0dc6072ce0fff68198eaf48e86cb1f2ee2dc"`,
12
- )
13
-
14
- // Test with address token IDs
15
- const poolId2 = PoolId.from({
5
+ const poolId = PoolId.from({
16
6
  userToken: '0x20c0000000000000000000000000000000000000',
17
7
  validatorToken: '0x20c0000000000000000000000000000000000001',
18
8
  })
19
- expect(poolId2).toBe(poolId1)
20
-
21
- // Test with mixed types
22
- const poolId3 = PoolId.from({
23
- userToken: 0n,
24
- validatorToken: '0x20c0000000000000000000000000000000000001',
25
- })
26
- expect(poolId3).toBe(poolId1)
27
-
28
- const poolId4 = PoolId.from({
29
- userToken: '0x20c0000000000000000000000000000000000000',
30
- validatorToken: 1n,
31
- })
32
- expect(poolId4).toBe(poolId1)
9
+ expect(poolId).toMatchInlineSnapshot(
10
+ `"0x24fc92718dfd933b7f831893444e0dc6072ce0fff68198eaf48e86cb1f2ee2dc"`,
11
+ )
33
12
  })
34
13
 
35
14
  test('order-independent', () => {
36
15
  const poolId1 = PoolId.from({
37
- userToken: 0n,
38
- validatorToken: 1n,
16
+ userToken: '0x20c0000000000000000000000000000000000000',
17
+ validatorToken: '0x20c0000000000000000000000000000000000001',
39
18
  })
40
19
  const poolId2 = PoolId.from({
41
- userToken: 1n,
42
- validatorToken: 0n,
43
- })
44
- expect(poolId2).toBe(poolId1)
45
-
46
- const poolId3 = PoolId.from({
47
20
  userToken: '0x20c0000000000000000000000000000000000001',
48
21
  validatorToken: '0x20c0000000000000000000000000000000000000',
49
22
  })
50
- expect(poolId3).toBe(poolId1)
51
-
52
- // Mixed inputs (token id + address) in swapped order.
53
- const poolId4 = PoolId.from({
54
- userToken: '0x20c0000000000000000000000000000000000001',
55
- validatorToken: 0n,
56
- })
57
- expect(poolId4).toBe(poolId1)
23
+ expect(poolId2).toBe(poolId1)
58
24
  })
@@ -1,6 +1,6 @@
1
+ import * as Address from '../core/Address.js'
1
2
  import * as Hash from '../core/Hash.js'
2
3
  import * as Hex from '../core/Hex.js'
3
- import * as TokenId from './TokenId.js'
4
4
 
5
5
  /**
6
6
  * Converts a user token and validator token to a pool ID.
@@ -15,8 +15,8 @@ import * as TokenId from './TokenId.js'
15
15
  * import { PoolId } from 'ox/tempo'
16
16
  *
17
17
  * const poolId = PoolId.from({
18
- * userToken: 1n,
19
- * validatorToken: 2n
18
+ * userToken: '0x20c0000000000000000000000000000000000001',
19
+ * validatorToken: '0x20c0000000000000000000000000000000000002'
20
20
  * })
21
21
  * ```
22
22
  *
@@ -24,9 +24,13 @@ import * as TokenId from './TokenId.js'
24
24
  * @returns The pool ID.
25
25
  */
26
26
  export function from(value: from.Value): Hex.Hex {
27
- const a = TokenId.toAddress(value.userToken)
28
- const b = TokenId.toAddress(value.validatorToken)
29
- const [left, right] = a.toLowerCase() < b.toLowerCase() ? [a, b] : [b, a]
27
+ const { userToken, validatorToken } = value
28
+ Address.assert(userToken)
29
+ Address.assert(validatorToken)
30
+ const [left, right] =
31
+ userToken.toLowerCase() < validatorToken.toLowerCase()
32
+ ? [userToken, validatorToken]
33
+ : [validatorToken, userToken]
30
34
  return Hash.keccak256(
31
35
  Hex.concat(Hex.padLeft(left, 32), Hex.padLeft(right, 32)),
32
36
  )
@@ -34,9 +38,9 @@ export function from(value: from.Value): Hex.Hex {
34
38
 
35
39
  export declare namespace from {
36
40
  export type Value = {
37
- /** User token. */
38
- userToken: TokenId.TokenIdOrAddress
39
- /** Validator token. */
40
- validatorToken: TokenId.TokenIdOrAddress
41
+ /** User token address. */
42
+ userToken: Address.Address
43
+ /** Validator token address. */
44
+ validatorToken: Address.Address
41
45
  }
42
46
  }