@daimo/pay-common 1.6.3 → 1.6.4

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.
@@ -246,7 +246,7 @@ export type DaimoPayOrderView = {
246
246
  };
247
247
  source: {
248
248
  payerAddress: Address | SolanaPublicKey | null;
249
- txHash: Hex | string;
249
+ txHash: Hex | string | null;
250
250
  chainId: string;
251
251
  amountUnits: string;
252
252
  tokenSymbol: string;
@@ -346,7 +346,6 @@ export declare function readDaimoPayOrderID(id: string): bigint;
346
346
  export declare function writeDaimoPayOrderID(id: bigint): string;
347
347
  export declare const zUUID: z.ZodString;
348
348
  export type UUID = z.infer<typeof zUUID>;
349
- export declare const zHex: z.ZodEffects<z.ZodString, `0x${string}`, string>;
350
349
  export type PaymentStartedEvent = {
351
350
  type: "payment_started";
352
351
  isTestEvent?: boolean;
package/dist/daimoPay.js CHANGED
@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  return (mod && mod.__esModule) ? mod : { "default": mod };
6
6
  };
7
7
  Object.defineProperty(exports, "__esModule", { value: true });
8
- exports.WebhookEventStatus = exports.zHex = exports.zUUID = exports.emptyOnChainCall = exports.DepositAddressPaymentOptions = exports.ExternalPaymentOptions = exports.zDaimoPayUserMetadata = exports.zDaimoPayOrderMetadata = exports.zBridgeTokenOutOptions = exports.DaimoPayIntentStatus = exports.DaimoPayOrderMode = exports.DaimoPayOrderStatusDest = exports.DaimoPayOrderStatusSource = void 0;
8
+ exports.WebhookEventStatus = exports.zUUID = exports.emptyOnChainCall = exports.DepositAddressPaymentOptions = exports.ExternalPaymentOptions = exports.zDaimoPayUserMetadata = exports.zDaimoPayOrderMetadata = exports.zBridgeTokenOutOptions = exports.DaimoPayIntentStatus = exports.DaimoPayOrderMode = exports.DaimoPayOrderStatusDest = exports.DaimoPayOrderStatusSource = void 0;
9
9
  exports.getOrderSourceChainId = getOrderSourceChainId;
10
10
  exports.getOrderDestChainId = getOrderDestChainId;
11
11
  exports.getDaimoPayOrderView = getDaimoPayOrderView;
@@ -145,7 +145,7 @@ function getDaimoPayOrderView(order) {
145
145
  order.sourceTokenAmount != null
146
146
  ? {
147
147
  payerAddress: order.sourceFulfillerAddr,
148
- txHash: (0, assert_1.assertNotNull)(order.sourceInitiateTxHash, `sourceInitiateTxHash is null for order with source token: ${order.id}`),
148
+ txHash: order.sourceInitiateTxHash,
149
149
  chainId: (0, assert_1.assertNotNull)(getOrderSourceChainId(order), `source chain id is null for order with source token: ${order.id}`).toString(),
150
150
  amountUnits: (0, viem_1.formatUnits)(BigInt(order.sourceTokenAmount.amount), order.sourceTokenAmount.token.decimals),
151
151
  tokenSymbol: order.sourceTokenAmount.token.symbol,
@@ -209,10 +209,6 @@ function writeDaimoPayOrderID(id) {
209
209
  return base_1.base58.encode((0, viem_1.numberToBytes)(id));
210
210
  }
211
211
  exports.zUUID = zod_1.default.string().uuid();
212
- exports.zHex = zod_1.default
213
- .string()
214
- .regex(/^0x[0-9a-f]*$/i)
215
- .refine((s) => true);
216
212
  // Lifecycle: Pending (just created) -> (if failing) Retrying (exponential backoff) -> Successful or Failed
217
213
  var WebhookEventStatus;
218
214
  (function (WebhookEventStatus) {
@@ -1 +1 @@
1
- {"version":3,"file":"daimoPay.js","sourceRoot":"","sources":["../src/daimoPay.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"daimoPay.js","sourceRoot":"","sources":["../src/daimoPay.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ import { z } from "zod";
2
2
  export declare const zBigIntStr: z.ZodEffects<z.ZodString, `${bigint}`, string>;
3
3
  export type BigIntStr = `${bigint}`;
4
4
  export declare const zAddress: z.ZodEffects<z.ZodString, `0x${string}`, string>;
5
+ export declare const zHex: z.ZodEffects<z.ZodString, `0x${string}`, string>;
5
6
  export declare const zSolanaPublicKey: z.ZodString;
6
7
  export type SolanaPublicKey = z.infer<typeof zSolanaPublicKey>;
7
8
  export type PlatformType = "ios" | "android" | "other";
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.zSolanaPublicKey = exports.zAddress = exports.zBigIntStr = void 0;
3
+ exports.zSolanaPublicKey = exports.zHex = exports.zAddress = exports.zBigIntStr = void 0;
4
4
  const zod_1 = require("zod");
5
5
  exports.zBigIntStr = zod_1.z
6
6
  .string()
@@ -10,5 +10,9 @@ exports.zAddress = zod_1.z
10
10
  .string()
11
11
  .regex(/^0x[0-9a-f]{40}$/i)
12
12
  .refine((s) => true);
13
+ exports.zHex = zod_1.z
14
+ .string()
15
+ .regex(/^0x[0-9a-f]*$/i)
16
+ .refine((s) => true);
13
17
  exports.zSolanaPublicKey = zod_1.z.string().regex(/^[1-9A-HJ-NP-Za-km-z]+$/);
14
18
  //# sourceMappingURL=primitiveTypes.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"primitiveTypes.js","sourceRoot":"","sources":["../src/primitiveTypes.ts"],"names":[],"mappings":";;;AACA,6BAAwB;AAEX,QAAA,UAAU,GAAG,OAAC;KACxB,MAAM,EAAE;KACR,KAAK,CAAC,WAAW,CAAC;KAClB,MAAM,CAAC,CAAC,CAAC,EAAkB,EAAE,CAAC,IAAI,CAAC,CAAC;AAI1B,QAAA,QAAQ,GAAG,OAAC;KACtB,MAAM,EAAE;KACR,KAAK,CAAC,mBAAmB,CAAC;KAC1B,MAAM,CAAC,CAAC,CAAC,EAAgB,EAAE,CAAC,IAAI,CAAC,CAAC;AAExB,QAAA,gBAAgB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC"}
1
+ {"version":3,"file":"primitiveTypes.js","sourceRoot":"","sources":["../src/primitiveTypes.ts"],"names":[],"mappings":";;;AACA,6BAAwB;AAEX,QAAA,UAAU,GAAG,OAAC;KACxB,MAAM,EAAE;KACR,KAAK,CAAC,WAAW,CAAC;KAClB,MAAM,CAAC,CAAC,CAAC,EAAkB,EAAE,CAAC,IAAI,CAAC,CAAC;AAI1B,QAAA,QAAQ,GAAG,OAAC;KACtB,MAAM,EAAE;KACR,KAAK,CAAC,mBAAmB,CAAC;KAC1B,MAAM,CAAC,CAAC,CAAC,EAAgB,EAAE,CAAC,IAAI,CAAC,CAAC;AAExB,QAAA,IAAI,GAAG,OAAC;KAClB,MAAM,EAAE;KACR,KAAK,CAAC,gBAAgB,CAAC;KACvB,MAAM,CAAC,CAAC,CAAC,EAAY,EAAE,CAAC,IAAI,CAAC,CAAC;AAEpB,QAAA,gBAAgB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@daimo/pay-common",
3
- "version": "1.6.3",
3
+ "version": "1.6.4",
4
4
  "description": "Daimo Pay shared types and utilities",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -10,7 +10,6 @@
10
10
  "build": "tsc",
11
11
  "test": "tape -r ts-node/register/transpile-only test/**/*.test.ts",
12
12
  "lint": "npm run lint:deps && npm run lint:style",
13
- "publish": "npm run build && npm publish",
14
13
  "lint:deps": "npx depcheck --ignores @tsconfig/node20,@types/tape,ts-node",
15
14
  "lint:style": "eslint --max-warnings=0"
16
15
  },
package/src/daimoPay.ts CHANGED
@@ -254,7 +254,7 @@ export type DaimoPayOrderView = {
254
254
  };
255
255
  source: {
256
256
  payerAddress: Address | SolanaPublicKey | null;
257
- txHash: Hex | string;
257
+ txHash: Hex | string | null;
258
258
  chainId: string;
259
259
  amountUnits: string;
260
260
  tokenSymbol: string;
@@ -307,10 +307,7 @@ export function getDaimoPayOrderView(order: DaimoPayOrder): DaimoPayOrderView {
307
307
  order.sourceTokenAmount != null
308
308
  ? {
309
309
  payerAddress: order.sourceFulfillerAddr,
310
- txHash: assertNotNull(
311
- order.sourceInitiateTxHash,
312
- `sourceInitiateTxHash is null for order with source token: ${order.id}`,
313
- ),
310
+ txHash: order.sourceInitiateTxHash,
314
311
  chainId: assertNotNull(
315
312
  getOrderSourceChainId(order),
316
313
  `source chain id is null for order with source token: ${order.id}`,
@@ -449,11 +446,6 @@ export const zUUID = z.string().uuid();
449
446
 
450
447
  export type UUID = z.infer<typeof zUUID>;
451
448
 
452
- export const zHex = z
453
- .string()
454
- .regex(/^0x[0-9a-f]*$/i)
455
- .refine((s): s is Hex => true);
456
-
457
449
  export type PaymentStartedEvent = {
458
450
  type: "payment_started";
459
451
  isTestEvent?: boolean;
@@ -1,4 +1,4 @@
1
- import { Address } from "viem";
1
+ import { Address, Hex } from "viem";
2
2
  import { z } from "zod";
3
3
 
4
4
  export const zBigIntStr = z
@@ -13,6 +13,11 @@ export const zAddress = z
13
13
  .regex(/^0x[0-9a-f]{40}$/i)
14
14
  .refine((s): s is Address => true);
15
15
 
16
+ export const zHex = z
17
+ .string()
18
+ .regex(/^0x[0-9a-f]*$/i)
19
+ .refine((s): s is Hex => true);
20
+
16
21
  export const zSolanaPublicKey = z.string().regex(/^[1-9A-HJ-NP-Za-km-z]+$/);
17
22
 
18
23
  export type SolanaPublicKey = z.infer<typeof zSolanaPublicKey>;