@caatinga/cli 0.2.2 → 0.2.4

package/dist/index.js

@@ -419,12 +419,19 @@ import path from "path";
 import { fileURLToPath } from "url";
 import { CaatingaError as CaatingaError3, CaatingaErrorCode as CaatingaErrorCode3 } from "@caatinga/core";
 async function resolveTemplateDir(templateName) {
-  const envTemplatesDir = process.env.CAATINGA_TEMPLATES_DIR;
-  const candidates = [
-    envTemplatesDir ? path.join(envTemplatesDir, templateName) : void 0,
-    path.resolve(process.cwd(), "packages", "templates", templateName),
-    ...candidatePathsFromModule(templateName)
-  ].filter((candidate) => Boolean(candidate));
+  const candidates = buildTemplateCandidates(templateName);
+  if (process.env.CAATINGA_DEBUG_TEMPLATE_RESOLUTION === "1") {
+    const envValue = process.env.CAATINGA_TEMPLATES_DIR ?? "<unset>";
+    const cwd = process.cwd();
+    process.stderr.write(
+      `caatinga: template resolution candidates for "${templateName}": env=${envValue} cwd=${cwd}
+`
+    );
+    for (const candidate of candidates) {
+      process.stderr.write(`caatinga: candidate ${candidate}
+`);
+    }
+  }
   for (const candidate of candidates) {
     try {
       await access2(candidate);
@@ -435,9 +442,17 @@ async function resolveTemplateDir(templateName) {
   throw new CaatingaError3(
     `Template "${templateName}" was not found.`,
     CaatingaErrorCode3.TEMPLATE_NOT_FOUND,
-    "Set CAATINGA_TEMPLATES_DIR or run from a Caatinga checkout that includes packages/templates."
+    "Set CAATINGA_TEMPLATES_DIR, run `pnpm build` before `pnpm pack`, or run from a Caatinga checkout that includes packages/templates."
   );
 }
+function buildTemplateCandidates(templateName) {
+  const envTemplatesDir = process.env.CAATINGA_TEMPLATES_DIR;
+  return [
+    envTemplatesDir ? path.join(envTemplatesDir, templateName) : void 0,
+    path.resolve(process.cwd(), "packages", "templates", templateName),
+    ...candidatePathsFromModule(templateName)
+  ].filter((candidate) => Boolean(candidate));
+}
 function candidatePathsFromModule(templateName) {
   const currentFile = fileURLToPath(import.meta.url);
   const start = path.dirname(currentFile);
@@ -506,7 +521,7 @@ function registerInvokeCommand(program2) {
 }
 
 // src/version.ts
-var CAATINGA_CLI_VERSION = "0.2.2";
+var CAATINGA_CLI_VERSION = "0.2.4";
 
 // src/program.ts
 function createProgram() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caatinga/cli",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Caatinga CLI for building dApps on Stellar/Soroban",
   "keywords": [
     "stellar",
@@ -43,7 +43,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@caatinga/core": "^0.2.2",
+    "@caatinga/core": "^0.2.4",
     "chalk": "^5.4.1",
     "commander": "^12.1.0"
   },

package/templates/marketplace-with-token/caatinga.template.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "description": "Experimental multi-contract Soroban template with token dependency injection.",
   "caatinga": {
-    "compatibleCore": "^0.2.2",
+    "compatibleCore": "^0.2.4",
     "templateVersion": 1
   },
   "frontend": {

package/templates/marketplace-with-token/package.json

@@ -12,15 +12,15 @@
     "caatinga:generate": "caatinga generate token && caatinga generate marketplace"
   },
   "dependencies": {
-    "@caatinga/client": "^0.2.2",
-    "@caatinga/core": "^0.2.2",
+    "@caatinga/client": "^0.2.4",
+    "@caatinga/core": "^0.2.4",
     "@vitejs/plugin-react": "^4.3.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "vite": "^6.0.6"
   },
   "devDependencies": {
-    "@caatinga/cli": "^0.2.2",
+    "@caatinga/cli": "^0.2.4",
     "@types/react": "^18.3.18",
     "@types/react-dom": "^18.3.5",
     "typescript": "^5.7.2"

package/templates/react-vite-counter/.env.example

@@ -0,0 +1,5 @@
+VITE_WALLETCONNECT_PROJECT_ID=your_walletconnect_project_id
+VITE_APP_NAME=__PROJECT_NAME__
+VITE_APP_DESCRIPTION=Caatinga counter dApp
+VITE_APP_URL=https://your-dapp-url.com
+VITE_APP_ICON_URL=https://your-dapp-url.com/icon.png

package/templates/react-vite-counter/README.md

@@ -21,10 +21,12 @@ After `caatinga generate`, wire generated bindings to the client:
 
 ```ts
 import { createCaatingaClient } from "@caatinga/client";
-import { freighterWalletAdapter } from "@caatinga/client/freighter";
+import { createStellarWalletsKitAdapter } from "@caatinga/client/stellar-wallets-kit";
 import * as Counter from "./contracts/generated/counter";
 import artifacts from "../caatinga.artifacts.json";
 
+const wallet = createStellarWalletsKitAdapter();
+
 export const caatingaClient = createCaatingaClient({
   network: {
     name: "testnet",
@@ -32,7 +34,7 @@ export const caatingaClient = createCaatingaClient({
     networkPassphrase: "Test SDF Network ; September 2015"
   },
   artifacts,
-  wallet: freighterWalletAdapter,
+  wallet,
   contracts: {
     counter: {
       binding: Counter
@@ -48,7 +50,14 @@ const tx = await caatingaClient.contract("counter").buildXdr("increment");
 console.log(tx.preparedXdr);
 ```
 
-Invoke through Freighter:
+Read the on-chain counter through simulation:
+
+```ts
+const count = await caatingaClient.contract("counter").read<number>("get");
+console.log(count);
+```
+
+Invoke through a connected wallet:
 
 ```ts
 const result = await caatingaClient.contract("counter").invoke("increment", {

package/templates/react-vite-counter/caatinga.template.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "description": "Minimal Vite + React + Soroban counter dApp.",
   "caatinga": {
-    "compatibleCore": "^0.2.2",
+    "compatibleCore": "^0.2.4",
     "templateVersion": 1
   },
   "frontend": {

package/templates/react-vite-counter/package.json

@@ -12,16 +12,17 @@
     "caatinga:generate": "caatinga generate counter"
   },
   "dependencies": {
-    "@caatinga/client": "^0.2.2",
-    "@caatinga/core": "^0.2.2",
-    "@stellar/freighter-api": "^4.0.0",
+    "@caatinga/client": "^0.2.4",
+    "@caatinga/core": "^0.2.4",
+    "@creit.tech/xbull-wallet-connect": "github:Creit-Tech/xBull-Wallet-Connect",
     "@vitejs/plugin-react": "^4.3.4",
-    "vite": "^6.0.6",
     "react": "^18.3.1",
-    "react-dom": "^18.3.1"
+    "react-dom": "^18.3.1",
+    "stellar-wallets-kit": "github:Creit-Tech/Stellar-Wallets-Kit#v0.0.7",
+    "vite": "^6.0.6"
   },
   "devDependencies": {
-    "@caatinga/cli": "^0.2.2",
+    "@caatinga/cli": "^0.2.4",
     "@types/react": "^18.3.18",
     "@types/react-dom": "^18.3.5",
     "typescript": "^5.7.2"

package/templates/react-vite-counter/src/caatinga.ts

@@ -1,8 +1,8 @@
 import { createCaatingaClient } from "@caatinga/client";
-import { freighterWalletAdapter } from "@caatinga/client/freighter";
 import type { CaatingaArtifacts } from "@caatinga/core/browser";
 import artifactsJson from "../caatinga.artifacts.json";
 import * as Counter from "./contracts/generated/counter.js";
+import { stellarWalletAdapter } from "./wallet.js";
 
 const artifacts = artifactsJson as CaatingaArtifacts;
 
@@ -13,7 +13,7 @@ export const caatingaClient = createCaatingaClient({
     networkPassphrase: "Test SDF Network ; September 2015"
   },
   artifacts,
-  wallet: freighterWalletAdapter,
+  wallet: stellarWalletAdapter,
   contracts: {
     counter: { binding: Counter }
   }

package/templates/react-vite-counter/src/components/CounterCard.tsx

@@ -1,4 +1,4 @@
-import { useMemo, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 import { caatingaClient } from "../caatinga.js";
 import { CaatingaError } from "@caatinga/core/browser";
 
@@ -11,28 +11,44 @@ function formatCaatingaError(error: unknown): string {
 }
 
 export function CounterCard() {
-  const [count, setCount] = useState(0);
+  const [count, setCount] = useState<number | null>(null);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
-  const formattedCount = useMemo(() => new Intl.NumberFormat().format(count), [count]);
+  const formattedCount = useMemo(
+    () => (count === null ? "Unknown" : new Intl.NumberFormat().format(count)),
+    [count]
+  );
 
-  async function increment() {
+  const refresh = useCallback(async () => {
     setLoading(true);
     setError(null);
 
     try {
-      await caatingaClient.contract("counter").invoke("increment");
-      setCount((value) => value + 1);
+      const nextCount = await caatingaClient.contract("counter").read<number>("get");
+      setCount(nextCount);
     } catch (caught) {
       setError(formatCaatingaError(caught));
     } finally {
       setLoading(false);
     }
-  }
+  }, []);
 
-  function reset() {
-    setCount(0);
+  async function increment() {
+    setLoading(true);
     setError(null);
+
+    try {
+      const result = await caatingaClient.contract("counter").invoke<number>("increment");
+      if (typeof result.result === "number") {
+        setCount(result.result);
+      } else {
+        await refresh();
+      }
+    } catch (caught) {
+      setError(formatCaatingaError(caught));
+    } finally {
+      setLoading(false);
+    }
   }
 
   return (
@@ -51,8 +67,8 @@ export function CounterCard() {
         <button type="button" onClick={increment} disabled={loading}>
           {loading ? "Incrementing…" : "Increment"}
         </button>
-        <button className="secondary-button" type="button" onClick={reset} disabled={loading}>
-          Reset
+        <button className="secondary-button" type="button" onClick={refresh} disabled={loading}>
+          Refresh
         </button>
       </div>
 

package/templates/react-vite-counter/src/components/WalletButton.tsx

@@ -1,14 +1,5 @@
-import { freighterWalletAdapter } from "@caatinga/client/freighter";
-import { useState } from "react";
-import { CaatingaError } from "@caatinga/core/browser";
-
-function formatWalletError(error: unknown): string {
-  if (error instanceof CaatingaError) {
-    return `[${error.code}] ${error.message}`;
-  }
-
-  return error instanceof Error ? error.message : String(error);
-}
+import { WalletNetwork, WalletType } from "../wallet.js";
+import { useStellarWallet } from "../hooks/useStellarWallet.js";
 
 function shortenAddress(address: string): string {
   if (address.length <= 12) {
@@ -19,41 +10,54 @@ function shortenAddress(address: string): string {
 }
 
 export function WalletButton() {
-  const [publicKey, setPublicKey] = useState<string | null>(null);
-  const [error, setError] = useState<string | null>(null);
-  const [loading, setLoading] = useState(false);
-
-  async function connect() {
-    setLoading(true);
-    setError(null);
-
-    try {
-      const key = await freighterWalletAdapter.getPublicKey();
-      setPublicKey(key);
-    } catch (caught) {
-      setPublicKey(null);
-      setError(formatWalletError(caught));
-    } finally {
-      setLoading(false);
-    }
-  }
-
-  function disconnect() {
-    setPublicKey(null);
-    setError(null);
-  }
+  const {
+    publicKey,
+    selectedWallet,
+    network,
+    loading,
+    error,
+    selectWallet,
+    selectNetwork,
+    connect,
+    disconnect
+  } = useStellarWallet();
 
   return (
     <div className="wallet-shell">
+      <div className="wallet-controls">
+        <label>
+          <span>Wallet</span>
+          <select
+            value={selectedWallet}
+            onChange={(event) => void selectWallet(event.target.value as WalletType)}
+          >
+            <option value={WalletType.XBULL}>xBull</option>
+            <option value={WalletType.FREIGHTER}>Freighter</option>
+            <option value={WalletType.ALBEDO}>Albedo</option>
+            <option value={WalletType.RABET}>Rabet</option>
+            <option value={WalletType.WALLET_CONNECT}>WalletConnect</option>
+          </select>
+        </label>
+        <label>
+          <span>Network</span>
+          <select
+            value={network}
+            onChange={(event) => void selectNetwork(event.target.value as WalletNetwork)}
+          >
+            <option value={WalletNetwork.TESTNET}>Testnet</option>
+            <option value={WalletNetwork.PUBLIC}>Public</option>
+          </select>
+        </label>
+      </div>
       <button
         className="wallet-button"
         type="button"
-        onClick={publicKey ? disconnect : connect}
+        onClick={publicKey ? disconnect : () => void connect()}
         disabled={loading}
         aria-live="polite"
       >
         <span className={publicKey ? "status-dot status-dot--on" : "status-dot"} />
-        {loading ? "Connecting…" : publicKey ? shortenAddress(publicKey) : "Connect"}
+        {loading ? "Connecting..." : publicKey ? shortenAddress(publicKey) : "Connect"}
       </button>
       {error ? (
         <p className="wallet-error" role="alert">

package/templates/react-vite-counter/src/contracts/generated/counter.ts

@@ -3,6 +3,11 @@ type TransactionResult = {
   result?: unknown;
 };
 
+type SignTransaction = (
+  xdr: string,
+  opts?: { networkPassphrase?: string; address?: string }
+) => Promise<{ signedTxXdr: string }> | { signedTxXdr: string };
+
 class ExampleTransaction {
   constructor(
     private readonly method: string,
@@ -17,9 +22,13 @@ class ExampleTransaction {
     return this;
   }
 
-  async signAndSend(): Promise<TransactionResult> {
+  async signAndSend(input?: { signTransaction?: SignTransaction }): Promise<TransactionResult> {
+    const signed = input?.signTransaction
+      ? await input.signTransaction(this.toXDR())
+      : { signedTxXdr: this.toXDR() };
+
     return {
-      txHash: "example-transaction-hash",
+      txHash: `example-transaction-hash:${signed.signedTxXdr}`,
       result: this.result
     };
   }

package/templates/react-vite-counter/src/hooks/useStellarWallet.ts

@@ -0,0 +1,70 @@
+import { useCallback, useEffect, useState } from "react";
+import { stellarWalletAdapter, WalletNetwork, WalletType } from "../wallet.js";
+
+export function useStellarWallet() {
+  const [publicKey, setPublicKey] = useState<string | null>(null);
+  const [selectedWallet, setSelectedWallet] = useState<WalletType>(WalletType.XBULL);
+  const [network, setNetwork] = useState<WalletNetwork>(WalletNetwork.TESTNET);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+
+  const selectWallet = useCallback(async (wallet: WalletType) => {
+    setError(null);
+    await stellarWalletAdapter.setWallet(wallet);
+    setSelectedWallet(wallet);
+    setPublicKey(null);
+  }, []);
+
+  const selectNetwork = useCallback(async (nextNetwork: WalletNetwork) => {
+    setError(null);
+    await stellarWalletAdapter.setNetwork(nextNetwork);
+    setNetwork(nextNetwork);
+    setPublicKey(null);
+  }, []);
+
+  const connect = useCallback(async () => {
+    setLoading(true);
+    setError(null);
+
+    try {
+      if (selectedWallet === WalletType.WALLET_CONNECT) {
+        await stellarWalletAdapter.startWalletConnect();
+        await stellarWalletAdapter.connectWalletConnect();
+      }
+
+      const key = await stellarWalletAdapter.getPublicKey();
+      setPublicKey(key);
+      return key;
+    } catch (caught) {
+      const message = caught instanceof Error ? caught.message : String(caught);
+      setPublicKey(null);
+      setError(message);
+      throw caught;
+    } finally {
+      setLoading(false);
+    }
+  }, [selectedWallet]);
+
+  const disconnect = useCallback(() => {
+    setPublicKey(null);
+    setError(null);
+  }, []);
+
+  useEffect(() => {
+    stellarWalletAdapter.onWalletConnectSessionDeleted(() => {
+      setPublicKey(null);
+    });
+  }, []);
+
+  return {
+    publicKey,
+    selectedWallet,
+    network,
+    loading,
+    error,
+    selectWallet,
+    selectNetwork,
+    connect,
+    disconnect
+  };
+}

package/templates/react-vite-counter/src/styles.css

@@ -79,6 +79,33 @@ button:hover {
   gap: 8px;
 }
 
+.wallet-controls {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+  gap: 8px;
+}
+
+.wallet-controls label {
+  display: grid;
+  gap: 4px;
+  color: #45515a;
+  font-size: 0.72rem;
+  font-weight: 800;
+  text-transform: uppercase;
+}
+
+.wallet-controls select {
+  min-height: 36px;
+  border: 1px solid #d9d5ca;
+  border-radius: 8px;
+  background: #ffffff;
+  color: #20232a;
+  font: inherit;
+  font-size: 0.86rem;
+  text-transform: none;
+}
+
 .wallet-error,
 .counter-error {
   margin: 0;
@@ -169,6 +196,9 @@ button:hover {
   }
 
   .wallet-button,
+  .wallet-controls,
+  .wallet-controls label,
+  .wallet-controls select,
   .counter-actions button {
     width: 100%;
     justify-content: center;

package/templates/react-vite-counter/src/wallet.ts

@@ -0,0 +1,28 @@
+import {
+  createStellarWalletsKitAdapter,
+  type StellarWalletsKitMetadata
+} from "@caatinga/client/stellar-wallets-kit";
+import { WalletNetwork, WalletType } from "stellar-wallets-kit";
+
+export const stellarWalletAdapter = createStellarWalletsKitAdapter({
+  network: WalletNetwork.TESTNET,
+  selectedWallet: WalletType.XBULL,
+  walletConnectMetadata: getWalletConnectMetadata()
+});
+
+export { WalletNetwork, WalletType };
+
+function getWalletConnectMetadata(): StellarWalletsKitMetadata | undefined {
+  const projectId = import.meta.env.VITE_WALLETCONNECT_PROJECT_ID as string | undefined;
+  if (!projectId) {
+    return undefined;
+  }
+
+  return {
+    projectId,
+    name: import.meta.env.VITE_APP_NAME ?? "__PROJECT_NAME__",
+    description: import.meta.env.VITE_APP_DESCRIPTION ?? "Caatinga counter dApp",
+    url: import.meta.env.VITE_APP_URL ?? window.location.origin,
+    icons: [import.meta.env.VITE_APP_ICON_URL ?? `${window.location.origin}/icon.png`]
+  };
+}

package/templates/react-vite-counter/tsconfig.json

@@ -14,7 +14,8 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx"
+    "jsx": "react-jsx",
+    "types": ["vite/client"]
   },
   "include": ["src"],
   "references": []

package/templates/react-vite-counter/vite.config.ts

@@ -1,6 +1,16 @@
 import { defineConfig } from "vite";
 import react from "@vitejs/plugin-react";
+import { createRequire } from "node:module";
+import { dirname, join } from "node:path";
+
+const require = createRequire(import.meta.url);
+const xbullWalletConnectRoot = dirname(require.resolve("@creit.tech/xbull-wallet-connect/package.json"));
 
 export default defineConfig({
-  plugins: [react()]
+  plugins: [react()],
+  resolve: {
+    alias: {
+      "@creit-tech/xbull-wallet-connect": join(xbullWalletConnectRoot, "src/index.ts")
+    }
+  }
 });