@ilalv3/cli 0.2.12 → 0.2.14

package/dist/commands/swap.js

@@ -18,7 +18,7 @@
  *     --pool-id   0xPOOLID \
  *     --chain     84532
  */
-import { createPublicClient, createWalletClient, decodeAbiParameters, encodeAbiParameters, formatEther, formatUnits, http, isAddress, isHex, parseAbiParameters, parseUnits, } from "viem";
+import { createPublicClient, createWalletClient, decodeAbiParameters, encodeAbiParameters, formatEther, formatUnits, http, isAddress, isHex, parseAbiParameters, parseUnits, recoverTypedDataAddress, } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
 import { base, baseSepolia } from "viem/chains";
 import { fmt, log, header, Spinner, die, dieOnContract, requirePrivateKey } from "../ui.js";
@@ -86,6 +86,7 @@ const DYNAMIC_FEE_FLAG = 8388608;
 const PIPS_DENOMINATOR = 1000000n;
 const ZERO_ADDRESS = "0x0000000000000000000000000000000000000000";
 const MAX_UINT256 = 2n ** 256n - 1n;
+const SECP256K1_HALF_ORDER = BigInt("0x7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a0");
 function txUrl(chain, hash) {
     const baseUrl = chain.blockExplorers?.default?.url;
     return baseUrl ? `${baseUrl}/tx/${hash}` : undefined;
@@ -124,6 +125,17 @@ function allowanceLabel(raw, decimals, symbol) {
 function secondsSince(startMs) {
     return `${((Date.now() - startMs) / 1000).toFixed(1)}s`;
 }
+function validateEcdsaSignature(sig) {
+    if (!/^0x[0-9a-fA-F]{130}$/.test(sig))
+        return "signature must be 65 bytes";
+    const s = BigInt(`0x${sig.slice(66, 130)}`);
+    const v = Number.parseInt(sig.slice(130, 132), 16);
+    if (s > SECP256K1_HALF_ORDER)
+        return "signature uses high-s form; re-sign to produce canonical EIP-2 low-s signature";
+    if (v !== 27 && v !== 28)
+        return "signature recovery id must be 27 or 28";
+    return undefined;
+}
 // ─── Main export ──────────────────────────────────────────────────────────────
 export async function swap(opts) {
     const cfg = withConfig(opts);
@@ -259,7 +271,7 @@ export async function swap(opts) {
         if (!isHex(opts.hookData))
             die("--hook-data must be 0x-prefixed ABI-encoded hookData.");
         try {
-            const [externalToken] = decodeAbiParameters(HOOK_DATA_ABI, opts.hookData);
+            const [externalToken, externalSig] = decodeAbiParameters(HOOK_DATA_ABI, opts.hookData);
             const issues = [];
             if (externalToken.user.toLowerCase() !== account.address.toLowerCase())
                 issues.push("user does not match signer wallet");
@@ -277,6 +289,27 @@ export async function swap(opts) {
                 issues.push("action is not swap");
             if (externalToken.deadline < BigInt(Math.floor(Date.now() / 1000)))
                 issues.push("session deadline has expired");
+            const sigIssue = validateEcdsaSignature(externalSig);
+            if (sigIssue) {
+                issues.push(sigIssue);
+            }
+            else {
+                const recovered = await recoverTypedDataAddress({
+                    domain: {
+                        name: "ILAL ComplianceHook",
+                        version: "1",
+                        chainId: BigInt(chain.id),
+                        verifyingContract: cfg.hook,
+                    },
+                    types: { SessionToken: SESSION_TOKEN_TYPE },
+                    primaryType: "SessionToken",
+                    message: externalToken,
+                    signature: externalSig,
+                });
+                if (recovered.toLowerCase() !== externalToken.user.toLowerCase()) {
+                    issues.push(`signature does not recover to session user ${fmt.addr(externalToken.user)}`);
+                }
+            }
             if (issues.length > 0)
                 die(`Invalid --hook-data for this swap: ${issues.join("; ")}`);
             sessionNonce = externalToken.nonce;

package/dist/index.js

@@ -19,7 +19,7 @@ const program = new Command();
 program
     .name("ilal")
     .description("ILAL Protocol CLI — Uniswap v4 compliance hook toolkit")
-    .version("0.2.12")
+    .version("0.2.14")
     .addHelpText("before", `\n  ${fmt.bold(fmt.cyan("◆"))} ${fmt.bold("ILAL Protocol")}  ${fmt.gray("Uniswap v4 Compliance Hook")}\n`);
 // ─── init ─────────────────────────────────────────────────────────────────────
 program

package/dist/ui.js

@@ -178,6 +178,9 @@ const CONTRACT_ERRORS = {
     "0xfa9f081c": "Schema hash mismatch",
     "0xb7e9429b": "Issuer hash mismatch",
     "0x0e917e64": "Wallet hash mismatch — wrong wallet key",
+    "0x21374865": "Session signature invalid — re-sign hookData with the wallet that owns the CNF",
+    "0xd9b2290c": "Session user mismatch — hookData can only be used by the wallet that signed it",
+    "0x1fb09b80": "Session nonce already used — sign a fresh session",
 };
 function parseViemError(e) {
     const msg = e instanceof Error ? e.message : String(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ilalv3/cli",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "description": "ILAL Protocol CLI — compliant swaps and credential management for Uniswap v4",
   "type": "module",
   "bin": {