@armory-sh/base 0.2.12 → 0.2.14

package/dist/types/{simple.d.ts → api.d.ts}

@@ -31,6 +31,40 @@ export interface FacilitatorConfig {
     /** Tokens this facilitator supports (optional) */
     tokens?: TokenId[];
 }
+/**
+ * Result from facilitator verification
+ */
+export interface FacilitatorVerifyResult {
+    success: boolean;
+    payerAddress?: string;
+    balance?: string;
+    requiredAmount?: string;
+    error?: string;
+}
+/**
+ * Result from facilitator settlement
+ */
+export interface FacilitatorSettleResult {
+    success: boolean;
+    txHash?: string;
+    error?: string;
+}
+/**
+ * Settlement mode - verify only, settle only, or both
+ */
+export type SettlementMode = "verify" | "settle" | "async";
+/**
+ * CAIP-2 chain ID type (e.g., eip155:8453)
+ */
+export type CAIP2ChainId = `eip155:${string}`;
+/**
+ * CAIP-2 asset ID type (e.g., eip155:8453/erc20:0xa0b8691...)
+ */
+export type CAIP2AssetId = `eip155:${string}/erc20:${string}`;
+/**
+ * Payment destination - address, CAIP-2 chain ID, or CAIP asset ID
+ */
+export type PayToAddress = `0x${string}` | CAIP2ChainId | CAIP2AssetId;
 /**
  * Pricing configuration for a specific network/token/facilitator combination
  */
@@ -54,8 +88,8 @@ export interface AcceptPaymentOptions {
     tokens?: TokenId[];
     /** Facilitator(s) for payment verification/settlement */
     facilitators?: FacilitatorConfig | FacilitatorConfig[];
-    /** Protocol version (default: auto-detect) */
-    version?: 1 | 2 | "auto";
+    /** Protocol version (V2 only) */
+    version?: 2;
     /** Pricing configurations - if not provided, uses amount from top-level config */
     pricing?: PricingConfig[];
 }
@@ -138,8 +172,8 @@ export interface ResolvedPaymentConfig {
     token: ResolvedToken;
     /** Facilitator(s) to use */
     facilitators: ResolvedFacilitator[];
-    /** Protocol version */
-    version: 1 | 2 | "auto";
+    /** Protocol version (V2 only) */
+    version: 2;
     /** Recipient address */
     payTo: Address;
     /** Amount to charge */

package/dist/types/networks.d.ts

@@ -12,14 +12,14 @@ export interface CustomToken {
     version: string;
     contractAddress: `0x${string}`;
     chainId: number;
-    decimals: number;
+    decimals?: number;
 }
 export declare const NETWORKS: Record<string, NetworkConfig>;
 export declare const getNetworkConfig: (name: string) => NetworkConfig | undefined;
 export declare const getNetworkByChainId: (chainId: number) => NetworkConfig | undefined;
 export declare const getMainnets: () => NetworkConfig[];
 export declare const getTestnets: () => NetworkConfig[];
-export declare const registerToken: (token: CustomToken) => CustomToken;
+export declare const registerToken: (token: unknown) => CustomToken;
 export declare const getCustomToken: (chainId: number, contractAddress: string) => CustomToken | undefined;
 export declare const getAllCustomTokens: () => CustomToken[];
 export declare const unregisterToken: (chainId: number, contractAddress: string) => boolean;

package/dist/types/protocol.d.ts

@@ -1,107 +1,91 @@
 /**
- * Protocol Union Types and Version Detection
+ * Protocol Types - x402 V2 Only
  *
- * Handles both x402 V1 and V2 formats along with legacy Armory formats
+ * Simplified to support only x402 V2 format (Coinbase compatible)
  */
-import type { X402PaymentPayloadV1, X402PaymentRequiredV1, X402PaymentRequirementsV1, X402SettlementResponseV1, LegacyPaymentPayloadV1, LegacyPaymentRequirementsV1, LegacySettlementResponseV1 } from "./v1";
-import type { PaymentPayloadV2, PaymentRequirementsV2, SettlementResponseV2, PaymentRequiredV2 } from "./v2";
+import type { PaymentPayloadV2, PaymentRequirementsV2, SettlementResponseV2, PaymentRequiredV2, Address } from "./v2";
+export type PaymentPayload = PaymentPayloadV2;
+export type PaymentRequirements = PaymentRequirementsV2;
+export type SettlementResponse = SettlementResponseV2;
+export type PaymentRequired = PaymentRequiredV2;
 /**
- * All x402 compatible payment payload types
+ * Configuration for connecting to a facilitator service
  */
-export type PaymentPayload = X402PaymentPayloadV1 | PaymentPayloadV2 | LegacyPaymentPayloadV1;
+export interface FacilitatorConfig {
+    url: string;
+    createHeaders?: () => Record<string, string>;
+}
 /**
- * All x402 compatible payment requirements types
+ * Result from facilitator verification
  */
-export type PaymentRequirements = X402PaymentRequirementsV1 | PaymentRequirementsV2 | LegacyPaymentRequirementsV1;
+export interface FacilitatorVerifyResult {
+    success: boolean;
+    payerAddress?: string;
+    balance?: string;
+    requiredAmount?: string;
+    error?: string;
+}
 /**
- * All x402 compatible settlement response types
+ * Result from facilitator settlement
  */
-export type SettlementResponse = X402SettlementResponseV1 | SettlementResponseV2 | LegacySettlementResponseV1;
+export interface FacilitatorSettleResult {
+    success: boolean;
+    txHash?: string;
+    error?: string;
+}
 /**
- * All x402 compatible payment required response types
+ * Settlement mode - verify only, settle only, or both
  */
-export type PaymentRequired = X402PaymentRequiredV1 | PaymentRequiredV2;
+export type SettlementMode = "verify" | "settle" | "async";
 /**
- * Check if payload is x402 V1 format
+ * Payment destination - address, CAIP-2 chain ID, or CAIP asset ID
  */
-export declare function isX402V1Payload(obj: unknown): obj is X402PaymentPayloadV1;
+export type PayToAddress = Address | CAIP2ChainId | CAIPAssetId;
 /**
- * Check if payload is x402 V2 format
+ * CAIP-2 chain ID type (e.g., eip155:8453)
  */
-export declare function isX402V2Payload(obj: unknown): obj is PaymentPayloadV2;
-/**
- * Check if payload is legacy Armory V1 format
- */
-export declare function isLegacyV1Payload(obj: unknown): obj is LegacyPaymentPayloadV1;
+export type CAIP2ChainId = `eip155:${string}`;
 /**
- * Check if payload is legacy Armory V2 format
+ * CAIP-2 asset ID type (e.g., eip155:8453/erc20:0xa0b8691...)
  */
-export declare function isLegacyV2Payload(obj: unknown): boolean;
+export type CAIPAssetId = `eip155:${string}/erc20:${string}`;
 /**
- * Get x402 version from payload
+ * Check if payload is x402 V2 format (Coinbase format)
  */
-export declare function getPaymentVersion(payload: PaymentPayload): 1 | 2;
+export declare function isX402V2Payload(obj: unknown): obj is PaymentPayloadV2;
 /**
- * Check if requirements is x402 V1 format
+ * Check if payload is legacy Armory V2 format
  */
-export declare function isX402V1Requirements(obj: unknown): obj is X402PaymentRequirementsV1;
+export declare function isLegacyV2Payload(obj: unknown): boolean;
 /**
  * Check if requirements is x402 V2 format
  */
 export declare function isX402V2Requirements(obj: unknown): obj is PaymentRequirementsV2;
-/**
- * Get x402 version from requirements
- */
-export declare function getRequirementsVersion(requirements: PaymentRequirements): 1 | 2;
-/**
- * Check if settlement response is x402 V1 format
- */
-export declare function isX402V1Settlement(obj: unknown): obj is X402SettlementResponseV1;
 /**
  * Check if settlement response is x402 V2 format
  */
 export declare function isX402V2Settlement(obj: unknown): obj is SettlementResponseV2;
-/**
- * Get x402 version from settlement response
- */
-export declare function getSettlementVersion(response: SettlementResponse): 1 | 2;
-/**
- * Check if payment required is x402 V1 format
- */
-export declare function isX402V1PaymentRequired(obj: unknown): obj is X402PaymentRequiredV1;
 /**
  * Check if payment required is x402 V2 format
  */
 export declare function isX402V2PaymentRequired(obj: unknown): obj is PaymentRequiredV2;
 /**
- * Get x402 version from payment required
+ * x402 V2 payment header name
  */
-export declare function getPaymentRequiredVersion(obj: PaymentRequired): 1 | 2;
+export declare const PAYMENT_SIGNATURE_HEADER: "PAYMENT-SIGNATURE";
 /**
- * Get payment header name for version
+ * x402 V2 payment response header name
  */
-export declare function getPaymentHeaderName(version: 1 | 2): string;
+export declare const PAYMENT_RESPONSE_HEADER: "PAYMENT-RESPONSE";
 /**
- * Get payment response header name for version
+ * x402 V2 payment required header name
  */
-export declare function getPaymentResponseHeaderName(version: 1 | 2): string;
-/**
- * Get payment required header name for version
- */
-export declare function getPaymentRequiredHeaderName(version: 1 | 2): string;
+export declare const PAYMENT_REQUIRED_HEADER: "PAYMENT-REQUIRED";
 /**
  * Check if settlement was successful
  */
 export declare function isSettlementSuccessful(response: SettlementResponse): boolean;
 /**
- * Get transaction hash from settlement response
+ * Get transaction hash from settlement response (V2 only)
  */
 export declare function getTxHash(response: SettlementResponse): string | undefined;
-/**
- * @deprecated Use isX402V1Payload or isLegacyV1Payload instead
- */
-export declare function isV1(obj: unknown): boolean;
-/**
- * @deprecated Use isX402V2Payload or isLegacyV2Payload instead
- */
-export declare function isV2(obj: unknown): boolean;

package/dist/types/v2.d.ts

@@ -18,6 +18,7 @@ export type PayToV2 = Address | {
     role?: string;
     callback?: string;
 };
+export type PayToAddress = Address | PayToV2;
 export interface Extensions {
     [key: string]: unknown;
 }
@@ -49,7 +50,11 @@ export interface PaymentRequirementsV2 {
     payTo: Address;
     /** Maximum time allowed for payment completion */
     maxTimeoutSeconds: number;
-    /** Scheme-specific additional information (token name, version, etc.) */
+    /** EIP-712 domain parameter: token name */
+    name?: string;
+    /** EIP-712 domain parameter: token version */
+    version?: string;
+    /** Scheme-specific additional information */
     extra?: Extensions;
 }
 /**
@@ -97,17 +102,19 @@ export interface SchemePayloadV2 {
 }
 /**
  * Payment payload sent by client
- * Matches x402 V2 PaymentPayload spec
+ * Matches x402 V2 PaymentPayload spec (Coinbase format)
  */
 export interface PaymentPayloadV2 {
     /** Protocol version identifier */
     x402Version: 2;
-    /** Resource being accessed (echoed from server) */
-    resource?: ResourceInfo;
-    /** Selected payment requirement from server's accepts array */
-    accepted: PaymentRequirementsV2;
+    /** Payment scheme (e.g., "exact") */
+    scheme: string;
+    /** Network identifier in CAIP-2 format */
+    network: string;
     /** Scheme-specific payment data */
     payload: SchemePayloadV2;
+    /** Resource being accessed (optional, echoed from server) */
+    resource?: ResourceInfo;
     /** Protocol extensions data */
     extensions?: Extensions;
 }

package/dist/types/x402.d.ts

@@ -52,18 +52,17 @@ export interface UnsignedPaymentPayload {
 }
 /**
  * Payment requirements for 402 response
+ * Matches x402 SDK format
  */
 export interface PaymentRequirements {
     scheme: Scheme;
     network: Network;
-    maxAmountRequired: string;
-    resource: string;
-    description: string;
-    mimeType: string;
-    outputSchema?: Record<string, unknown>;
+    amount: string;
     payTo: Address;
     maxTimeoutSeconds: number;
     asset: Address;
+    name?: string;
+    version?: string;
     extra?: Record<string, unknown>;
 }
 /**

package/dist/utils/utils/index.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Test Utilities Index
+ *
+ * Re-exports commonly used test utilities
+ */
+export * from "./mock-facilitator";
+export * from "../../fixtures/config";

package/dist/utils/utils/mock-facilitator.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Mock Facilitator for Testing
+ */
+import type { PaymentPayload } from "@armory-sh/base";
+export interface FacilitatorVerifyRequest {
+    payload: PaymentPayload;
+    requirements: Record<string, unknown>;
+    options?: Record<string, unknown>;
+}
+export interface FacilitatorVerifyResponse {
+    success: boolean;
+    payerAddress?: string;
+    balance?: string;
+    requiredAmount?: string;
+    error?: string;
+}
+export interface FacilitatorSettleRequest {
+    payload: PaymentPayload;
+    requirements: Record<string, unknown>;
+}
+export interface FacilitatorSettleResponse {
+    success: boolean;
+    txHash?: string;
+    error?: string;
+}
+export type AnyFacilitatorRequest = FacilitatorVerifyRequest | FacilitatorSettleRequest;
+export type AnyFacilitatorResponse = FacilitatorVerifyResponse | FacilitatorSettleResponse;
+export interface MockFacilitatorOptions {
+    port?: number;
+    alwaysVerify?: boolean;
+    alwaysSettle?: boolean;
+    verifyDelay?: number;
+    settleDelay?: number;
+}
+export declare const createMockFacilitator: (options?: MockFacilitatorOptions) => Promise<{
+    url: string;
+    close: () => Promise<void>;
+}>;

package/dist/validation.d.ts

@@ -2,50 +2,23 @@
  * Comprehensive validation for Armory configurations
  * Ensures networks, tokens, and facilitators are compatible
  */
-import type { NetworkId, TokenId, FacilitatorConfig, ResolvedNetwork, ResolvedToken, ResolvedFacilitator, ResolvedPaymentConfig, ValidationError, PaymentErrorCode } from "./types/simple.js";
+import type { NetworkId, TokenId, FacilitatorConfig, ResolvedNetwork, ResolvedToken, ResolvedFacilitator, ResolvedPaymentConfig, ValidationError, PaymentErrorCode } from "./types/api";
 export declare const createError: (code: PaymentErrorCode, message: string, details?: Partial<ValidationError>) => ValidationError;
-/**
- * Normalize network name to match registry keys
- */
 export declare const normalizeNetworkName: (name: string) => string;
-/**
- * Resolve a network identifier to a network config
- */
-export declare const resolveNetwork: (input: NetworkId) => ResolvedNetwork | ValidationError;
-/**
- * Get all available network names
- */
+export declare const resolveNetwork: (input: unknown) => ResolvedNetwork | ValidationError;
 export declare const getAvailableNetworks: () => string[];
-/**
- * Resolve a token identifier to a token config
- */
-export declare const resolveToken: (input: TokenId, network?: ResolvedNetwork) => ResolvedToken | ValidationError;
-/**
- * Get all available token symbols
- */
+export declare const resolveToken: (input: unknown, network?: ResolvedNetwork) => ResolvedToken | ValidationError;
 export declare const getAvailableTokens: () => string[];
-/**
- * Resolve a facilitator configuration
- */
 export declare const resolveFacilitator: (input: FacilitatorConfig, supportedNetworks?: ResolvedNetwork[], supportedTokens?: ResolvedToken[]) => ResolvedFacilitator | ValidationError;
-/**
- * Check if a facilitator supports a specific network/token combination
- */
 export declare const checkFacilitatorSupport: (facilitator: ResolvedFacilitator, network: ResolvedNetwork, token: ResolvedToken) => ValidationError | {
     supported: true;
 };
-/**
- * Validate a complete payment configuration
- */
 export declare const validatePaymentConfig: (network: NetworkId, token: TokenId, facilitators?: FacilitatorConfig | FacilitatorConfig[], payTo?: string, amount?: string) => ResolvedPaymentConfig | ValidationError;
-/**
- * Validate multi-accept configuration (for merchants)
- */
 export declare const validateAcceptConfig: (options: {
     networks?: NetworkId[];
     tokens?: TokenId[];
     facilitators?: FacilitatorConfig | FacilitatorConfig[];
-    version?: 1 | 2 | "auto";
+    version?: 2;
 }, payTo: string, amount: string) => {
     success: true;
     config: ResolvedPaymentConfig[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@armory-sh/base",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "license": "MIT",
   "author": "Sawyer Cutler <sawyer@dirtroad.dev>",
   "type": "module",
@@ -24,18 +24,17 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thegreataxios/armory.git",
-    "directory": "packages/core"
-  },
-  "dependencies": {
-    "viem": "2.45.0"
+    "directory": "packages/base"
   },
+  "dependencies": {},
   "devDependencies": {
     "@types/node": "^25.2.1",
     "bun-types": "latest",
     "typescript": "5.9.3"
   },
   "scripts": {
-    "build": "tsup && tsc --emitDeclarationOnly",
-    "test": "bun test"
+    "build": "rm -rf dist && tsup && tsc --emitDeclarationOnly",
+    "test": "bun test",
+    "typecheck": "tsc --noEmit"
   }
-}
+}

package/dist/validation.test.d.ts

@@ -1,5 +0,0 @@
-/**
- * Comprehensive unit tests for validation layer
- * Tests all input formats, cross-checks, and error messages
- */
-export {};