payment-kit 1.29.10 → 1.29.12

package/api/src/integrations/arcblock/stake.ts

@@ -34,6 +34,10 @@ export async function ensureStakedForGas() {
           continue;
         }
 
+        // ensure context for stake (mirror integrations/arcblock/token.ts): client.stake
+        // -> getTokenStateMap reads client.context, which only getContext() populates.
+        await client.getContext();
+
         const result = await client.getForgeState({});
         const { token, txConfig } = result.state;
         const holding = (account?.tokens || []).find((x: any) => x.address === token.address);

package/api/src/libs/logger.ts

@@ -9,7 +9,7 @@
 // The blocklet server (BLOCKLET_LOG_DIR set) and the CF worker (aliased shim)
 // still get the real logger on first call — behavior unchanged for them.
 
-interface Logger {
+export interface Logger {
   debug: (...args: any[]) => void;
   info: (...args: any[]) => void;
   error: (...args: any[]) => void;
@@ -18,6 +18,15 @@ interface Logger {
 
 let resolved: Logger | undefined;
 
+// Host-injection seam: an embedding host (e.g. arc) can supply its own structured
+// logger so payment's lines join the host's unified log stream instead of the lazy
+// @blocklet/logger / console fallback. MUST be set before the first log call (the
+// embedded factory does this from its `logger` slot as its first action) so it wins
+// over `resolveLogger()`'s lazy default.
+export function setResolvedLogger(l: Logger): void {
+  resolved = l;
+}
+
 function resolveLogger(): Logger {
   if (resolved) return resolved;
   try {

package/api/src/service.ts

@@ -5,7 +5,7 @@ import { Hono } from 'hono';
 import type { ContentfulStatusCode } from 'hono/utils/http-status';
 import { isProduction } from './libs/env';
 
-import logger from './libs/logger';
+import logger, { type Logger, setResolvedLogger } from './libs/logger';
 import { context as requestContext } from './libs/context';
 import { TENANT_CONTEXT_MISSING, TenantError, getTenantMode, getDefaultInstanceDid } from './libs/tenant';
 import type { LocksDriver, QueueHostHooks, CronDriver, IdentityDriver, SecretsDriver } from './libs/drivers';
@@ -79,6 +79,14 @@ export interface PaymentCoreSlots {
    * keeping the runtime-neutral `http.fetch` free of node:fs.
    */
   staticHandler?: (app: Hono) => void;
+  /**
+   * Host-injected logger (e.g. arc's structured `ns:"payment"` logger). When set,
+   * payment's lines join the host's unified log stream instead of the lazy
+   * @blocklet/logger / console fallback. Applied via `setResolvedLogger` as the
+   * factory's first action, before any core module logs. Omit on blocklet-server
+   * (keeps the @blocklet/logger default).
+   */
+  logger?: Logger;
 }
 
 export interface PaymentCoreLifecycle {
@@ -661,6 +669,9 @@ async function stopBackgroundServices(): Promise<void> {
  */
 export function createEmbeddedPaymentService(slots: PaymentCoreSlots): EmbeddedPaymentService {
   if (!slots || typeof slots !== 'object') throw new PaymentCoreSlotError('config');
+  // Host-injected logger wins over the lazy @blocklet/logger / console fallback.
+  // Set FIRST so even slot-validation/init logging routes to the host stream.
+  if (slots.logger) setResolvedLogger(slots.logger);
   if (!slots.config) throw new PaymentCoreSlotError('config');
   if (!slots.db || !slots.db.sequelize) throw new PaymentCoreSlotError('db');
   // D1 (S3.0): validate the tenancy slot and derive the effective config BEFORE

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.29.10
+version: 1.29.12
 logo: logo.png
 files:
   - dist

package/cloudflare/cf-adapter.ts

@@ -347,6 +347,9 @@ export async function createCloudflarePaymentAdapter(
   };
 
   const svc: EmbeddedPaymentService = createEmbeddedPaymentService({
+    // Forward the host-injected logger so CF payment lines join the worker's
+    // unified log stream (omit → lazy @blocklet/logger / console fallback).
+    logger: options.logger,
     // Host-global csrf secret via the config boundary (payment-core's csrf reads
     // PAYMENT_CSRF_SECRET through readConfig). NO sessionSecret (decision #5).
     config: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.29.10",
+  "version": "1.29.12",
   "scripts": {
     "dev": "blocklet dev --open",
     "prelint": "npm run types",
@@ -48,7 +48,7 @@
   "dependencies": {
     "@abtnode/cron": "^1.17.13-beta-20260613-094425-b81920c8",
     "@arcblock/did": "^1.30.24",
-    "@arcblock/did-connect-js": "^4.1.2",
+    "@arcblock/did-connect-js": "^4.1.5",
     "@arcblock/did-connect-react": "^3.5.4",
     "@arcblock/did-connect-storage-nedb": "^1.8.0",
     "@arcblock/did-util": "^1.30.24",
@@ -60,9 +60,9 @@
     "@blocklet/error": "^0.3.5",
     "@blocklet/js-sdk": "^1.17.13-beta-20260613-094425-b81920c8",
     "@blocklet/logger": "^1.17.13-beta-20260613-094425-b81920c8",
-    "@blocklet/payment-broker-client": "1.29.10",
-    "@blocklet/payment-react": "1.29.10",
-    "@blocklet/payment-vendor": "1.29.10",
+    "@blocklet/payment-broker-client": "1.29.12",
+    "@blocklet/payment-react": "1.29.12",
+    "@blocklet/payment-vendor": "1.29.12",
     "@blocklet/sdk": "^1.17.13-beta-20260613-094425-b81920c8",
     "@blocklet/ui-react": "^3.5.4",
     "@blocklet/uploader": "^0.15.4",
@@ -133,7 +133,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.17.13-beta-20260613-094425-b81920c8",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.29.10",
+    "@blocklet/payment-types": "1.29.12",
     "@types/connect": "^3.4.38",
     "@types/debug": "^4.1.12",
     "@types/dotenv-flow": "^3.3.3",
@@ -180,5 +180,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "18c831f5dbdfb271a96640befb06f589adbeeab0"
+  "gitHead": "8473f4c5a7716d03d53f253563229f31e63ec0c4"
 }