@vainplex/shieldapi-cli 1.1.1 → 1.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vainplex/shieldapi-cli",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "Security intelligence from your terminal. Pay-per-request with USDC.",
   "type": "module",
   "bin": {
@@ -33,6 +33,7 @@
   },
   "homepage": "https://shield.vainplex.dev",
   "dependencies": {
+    "@x402/core": "^2.5.0",
     "@x402/evm": "^2.5.0",
     "@x402/fetch": "^2.5.0",
     "chalk": "^5.3.0",

package/src/index.js

@@ -14,7 +14,7 @@ export function run(argv) {
   program
     .name('shieldapi')
     .description('🛡️  ShieldAPI CLI — Security intelligence from your terminal. Pay-per-request with USDC.')
-    .version('1.1.1')
+    .version('1.2.1')
     .option('--wallet <key>', 'Private key for x402 payments (or set SHIELDAPI_WALLET_KEY)')
     .option('--json', 'Output raw JSON instead of formatted output')
     .option('--no-color', 'Disable colors')

package/src/lib/api.js

@@ -7,7 +7,7 @@ const BASE_URL = 'https://shield.vainplex.dev/api';
  * @param {Record<string, string>} params - Query parameters
  * @param {object} options
  * @param {boolean} options.demo - Use demo mode
- * @param {{ signer: object }|null} options.wallet - Wallet with x402 signer
+ * @param {{ signer: object }|null} options.wallet - Wallet with x402 ClientEvmSigner
  * @returns {Promise<object>} Parsed JSON response
  */
 export async function apiRequest(endpoint, params = {}, { demo = false, wallet = null } = {}) {
@@ -35,9 +35,18 @@ export async function apiRequest(endpoint, params = {}, { demo = false, wallet =
     );
   }
 
-  // Dynamic import to keep startup fast when not needed
+  // Dynamic imports to keep startup fast (PR-2: lazy loading)
+  const { x402Client } = await import('@x402/core/client');
+  const { registerExactEvmScheme } = await import('@x402/evm/exact/client');
   const { wrapFetchWithPayment } = await import('@x402/fetch');
-  const paidFetch = wrapFetchWithPayment(fetch, wallet.signer);
+
+  // Create x402 client with EVM scheme registered
+  // wallet.signer is a ClientEvmSigner (from toClientEvmSigner) with .address + .signTypedData + .readContract
+  const client = new x402Client();
+  registerExactEvmScheme(client, { signer: wallet.signer });
+
+  // Wrap fetch with x402 payment handling
+  const paidFetch = wrapFetchWithPayment(fetch, client);
 
   const res = await paidFetch(url);
 

package/src/lib/wallet.js

@@ -1,13 +1,17 @@
-import { createWalletClient, http, publicActions } from 'viem';
+import { createWalletClient, createPublicClient, http } from 'viem';
 import { privateKeyToAccount } from 'viem/accounts';
 import { base } from 'viem/chains';
 import { toClientEvmSigner } from '@x402/evm';
 
 /**
- * Create a viem wallet client + x402 signer from a private key.
+ * Create a wallet + x402-compatible signer from a private key.
+ * 
+ * Uses toClientEvmSigner to compose an account (for signing) with
+ * a publicClient (for readContract), producing a ClientEvmSigner
+ * that has both `.address` and `.signTypedData` + `.readContract`.
  * 
  * @param {string} privateKey - Hex private key (with or without 0x prefix)
- * @returns {{ client: import('viem').WalletClient, signer: object }}
+ * @returns {{ signer: object, address: string }}
  */
 export function createWallet(privateKey) {
   if (!privateKey) return null;
@@ -16,15 +20,16 @@ export function createWallet(privateKey) {
 
   try {
     const account = privateKeyToAccount(key);
-    const client = createWalletClient({
-      account,
+    const publicClient = createPublicClient({
       chain: base,
       transport: http(),
-    }).extend(publicActions);
+    });
 
-    const signer = toClientEvmSigner(client);
+    // toClientEvmSigner composes account.signTypedData + publicClient.readContract
+    // and exposes .address correctly
+    const signer = toClientEvmSigner(account, publicClient);
 
-    return { client, signer, address: account.address };
+    return { signer, address: account.address };
   } catch (err) {
     throw new Error(`Invalid private key: ${err.message}`);
   }