✨ Move wallet cli to typescript

Author: BertrandD

script/.gitignore

@@ -1 +1,3 @@
 node_modules
+dist/
+*.js.map

script/bun.lock

@@ -15,6 +15,8 @@
       "devDependencies": {
         "@types/crypto-js": "^4.2.2",
         "@types/elliptic": "^6.4.18",
+        "@types/node": "^20.0.0",
+        "typescript": "^5.0.0",
       },
     },
   },
@@ -41,7 +43,7 @@
 
     "@types/history": ["@types/[email protected]", "", {}, "sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA=="],
 
-    "@types/node": ["@types/node@24.3.0", "", { "dependencies": { "undici-types": "~7.10.0" } }, "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow=="],
+    "@types/node": ["@types/node@20.19.16", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-VS6TTONVdgwJwtJr7U+ghEjpfmQdqehLLpg/iMYGOd1+ilaFjdBJwFuPggJ4EAYPDCzWfDUHoIxyVnu+tOWVuQ=="],
 
     "@types/react": ["@types/[email protected]", "", { "dependencies": { "csstype": "^3.0.2" } }, "sha512-cMoR+FoAf/Jyq6+Df2/Z41jISvGZZ2eTlnsaJRptmZ76Caldwy1odD4xTr/gNV9VLj0AWgg/nmkevIyUfIIq5w=="],
 
@@ -117,6 +119,12 @@
 
     "tslib": ["[email protected]", "", {}, "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="],
 
-    "undici-types": ["[email protected]", "", {}, "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag=="],
+    "typescript": ["[email protected]", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A=="],
+
+    "undici-types": ["[email protected]", "", {}, "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="],
+
+    "@types/bn.js/@types/node": ["@types/[email protected]", "", { "dependencies": { "undici-types": "~7.10.0" } }, "sha512-aPTXCrfwnDLj4VvXrm+UUCQjNEvJgNA8s5F1cvwQU+3KNltTOkBm1j30uNLyqqPNe7gE3KFzImYoZEfLhp4Yow=="],
+
+    "@types/bn.js/@types/node/undici-types": ["[email protected]", "", {}, "sha512-t5Fy/nfn+14LuOc2KNYg75vZqClpAiqscVvMygNnlsHBFpSXdJaYtXMcdNLpl/Qvc3P2cB3s6lOV51nqsFq4ag=="],
   }
 }

script/hyli-wallet.js renamed to script/hyli-wallet.ts

@@ -1,38 +1,73 @@
 #!/usr/bin/env node
 
 import { Buffer } from "buffer";
-import { NodeApiHttpClient, IndexerApiHttpClient, blob_builder } from "hyli";
+import { NodeApiHttpClient, IndexerApiHttpClient, blob_builder, Blob, BlobTransaction } from "hyli";
 import { check_secret } from "hyli-noir";
 import EC from "elliptic";
 import pkg from "js-sha3";
-import { register as registerBlob, addSessionKey as addSessionKeyBlob, verifyIdentity } from "hyli-wallet";
+import { register as registerBlob, addSessionKey as addSessionKeyBlob, verifyIdentity, Wallet, AccountInfo } from "hyli-wallet";
+
 const { sha3_256 } = pkg;
 
+// Type definitions
+interface Config {
+    NODE_BASE_URL: string;
+    INDEXER_BASE_URL: string;
+    WALLET_API_BASE_URL: string;
+    WALLET_CONTRACT_NAME: string;
+}
+
+interface SessionKey {
+    publicKey: string;
+    privateKey: string;
+    expiration: number;
+    whitelist: string[];
+}
+
+interface RegistrationResult {
+    success: boolean;
+    wallet?: Wallet;
+    error?: string;
+}
+
+interface TransferResult {
+    success: boolean;
+    transactionHash?: string;
+    proofTransactionHash?: string;
+    transfer?: {
+        from: string;
+        to: string;
+        amount: number;
+        token: string;
+    };
+    error?: string;
+}
+
 // Configuration - update these values
-const CONFIG = {
+const CONFIG: Config = {
     NODE_BASE_URL: process.env.NODE_BASE_URL || "http://localhost:4321",
     INDEXER_BASE_URL: process.env.INDEXER_BASE_URL || "http://localhost:4322",
     WALLET_API_BASE_URL: process.env.WALLET_API_BASE_URL || "http://localhost:4000",
     WALLET_CONTRACT_NAME: "wallet",
 };
 
 // Utility functions
-const encodeToHex = (data) => {
+const encodeToHex = (data: Uint8Array): string => {
     return Array.from(data)
         .map((byte) => byte.toString(16).padStart(2, "0"))
         .join("");
 };
 
-async function hashBlob(blob) {
+async function hashBlob(blob: Blob): Promise<string> {
     const contractBytes = new TextEncoder().encode(blob.contract_name);
-    const dataBytes = blob.data instanceof Uint8Array ? blob.data : new Uint8Array(blob.data);
+    const dataBytes = new Uint8Array(blob.data);
     const input = new Uint8Array(contractBytes.length + dataBytes.length);
     input.set(contractBytes, 0);
     input.set(dataBytes, contractBytes.length);
     return encodeToHex(new Uint8Array(sha3_256.arrayBuffer(input)));
 }
 
-async function hashBlobTransaction(tx) {
+async function hashBlobTransaction(tx: BlobTransaction): Promise<string> {
     const identityBytes = new TextEncoder().encode(tx.identity);
     let input = new Uint8Array(identityBytes.length);
     input.set(identityBytes, 0);
@@ -47,8 +82,13 @@ async function hashBlobTransaction(tx) {
 }
 
 // Password validation function
-async function validatePassword(username, password, accountInfo) {
+async function validatePassword(username: string, password: string, accountInfo: AccountInfo): Promise<boolean> {
     const identity = `${username}@${CONFIG.WALLET_CONTRACT_NAME}`;
+    
+    if (!('Password' in accountInfo.auth_method)) {
+        throw new Error("Account does not use password authentication");
+    }
+    
     const storedHash = accountInfo.auth_method.Password.hash;
     const storedSalt = accountInfo.salt;
 
@@ -59,7 +99,7 @@ async function validatePassword(username, password, accountInfo) {
 }
 
 // Session key generation
-function generateSessionKey(expiration, whitelist = []) {
+function generateSessionKey(expiration: number, whitelist: string[] = []): SessionKey {
     const ec = new EC.ec("secp256k1");
     const keyPair = ec.genKeyPair();
 
@@ -82,15 +122,21 @@ function generateSessionKey(expiration, whitelist = []) {
 }
 
 // Main registration function
-async function registerAccount(username, password, inviteCode, salt, enableSessionKey = false) {
+async function registerAccount(
+    username: string,
+    password: string,
+    inviteCode: string,
+    salt: string,
+    enableSessionKey: boolean = false
+): Promise<RegistrationResult> {
     console.log(`Starting registration for username: ${username}`);
 
     try {
         // Initialize services
         const nodeService = new NodeApiHttpClient(CONFIG.NODE_BASE_URL);
 
         // Check if account already exists
-        let accountInfo;
+        let accountInfo: AccountInfo | undefined;
         try {
             const response = await fetch(
                 `${CONFIG.WALLET_API_BASE_URL}/v1/indexer/contract/${CONFIG.WALLET_CONTRACT_NAME}/account/${username}`,
@@ -106,7 +152,11 @@ async function registerAccount(username, password, inviteCode, salt, enableSessi
 
         if (accountInfo) {
             console.log(`Account ${username} already exists`);
-            return { success: true, wallet: accountInfo };
+            return { success: true, wallet: {
+                username,
+                address: `${username}@${CONFIG.WALLET_CONTRACT_NAME}`,
+                salt: accountInfo.salt
+            } };
         }
 
         // Validate password
@@ -116,7 +166,7 @@ async function registerAccount(username, password, inviteCode, salt, enableSessi
 
         // Claim invite code
         console.log("Claiming invite code...");
-        let inviteCodeBlob;
+        let inviteCodeBlob: Blob;
         try {
             const response = await fetch(`${CONFIG.WALLET_API_BASE_URL}/api/consume_invite`, {
                 method: "POST",
@@ -135,7 +185,7 @@ async function registerAccount(username, password, inviteCode, salt, enableSessi
 
             inviteCodeBlob = await response.json();
             console.log("Invite code claimed successfully");
-        } catch (error) {
+        } catch (error: any) {
             throw new Error(`Failed to claim invite code: ${error.message}`);
         }
 
@@ -148,13 +198,13 @@ async function registerAccount(username, password, inviteCode, salt, enableSessi
         const hash = Buffer.from(blob0.data).toString("hex");
         const blob1 = registerBlob(username, Date.now(), salt, { Password: { hash: hash } }, inviteCode);
 
-        const blobTx = {
+        const blobTx: BlobTransaction = {
             identity,
             blobs: [blob0, blob1, inviteCodeBlob],
         };
 
         // Generate session key if requested
-        let newSessionKey;
+        let newSessionKey: SessionKey | undefined;
         if (enableSessionKey) {
             console.log("Generating session key...");
             const { duration = 24 * 60 * 60 * 1000, whitelist = [] } = {}; // 24 hours default
@@ -192,7 +242,7 @@ async function registerAccount(username, password, inviteCode, salt, enableSessi
         console.log(`Proof transaction hash: ${proofTxHash}`);
 
         // Create wallet object
-        const wallet = {
+        const wallet: Wallet = {
             username,
             address: identity,
             salt,
@@ -206,14 +256,20 @@ async function registerAccount(username, password, inviteCode, salt, enableSessi
         console.log("Wallet:", JSON.stringify(wallet, null, 2));
 
         return { success: true, wallet };
-    } catch (error) {
+    } catch (error: any) {
         console.error("Registration failed:", error);
         return { success: false, error: error.message };
     }
 }
 
 // Transfer function
-async function transferFunds(username, password, amount, token, destination) {
+async function transferFunds(
+    username: string,
+    password: string,
+    amount: string,
+    token: string,
+    destination: string
+): Promise<TransferResult> {
     console.log(`Starting transfer from ${username} to ${destination}`);
     console.log(`Amount: ${amount} ${token}`);
 
@@ -234,7 +290,7 @@ async function transferFunds(username, password, amount, token, destination) {
 
         // Check if account exists and get account info
         console.log("Checking account information...");
-        let accountInfo;
+        let accountInfo: AccountInfo;
         try {
             const response = await fetch(
                 `${CONFIG.WALLET_API_BASE_URL}/v1/indexer/contract/${CONFIG.WALLET_CONTRACT_NAME}/account/${username}`,
@@ -247,7 +303,7 @@ async function transferFunds(username, password, amount, token, destination) {
             if (!accountInfo) {
                 throw new Error(`Account with username "${username}" does not exist.`);
             }
-        } catch (error) {
+        } catch (error: any) {
             throw new Error(`Failed to get account info: ${error.message}`);
         }
 
@@ -263,14 +319,14 @@ async function transferFunds(username, password, amount, token, destination) {
 
         // Check that account has enough balance
         console.log("Checking balance...");
-        let balance;
+        let balance: number;
         try {
             const result = await indexerService.get(
                 `v1/indexer/contract/${token}/balance/${identity}`,
                 "Checking balance",
-            );
+            ) as { balance: number };
             balance = result.balance;
-        } catch (error) {
+        } catch (error: any) {
             throw new Error(`Failed to get balance: ${error.message}. User might have no balance for this token.`);
         }
         console.log(`Balance for ${username} is`, balance);
@@ -285,7 +341,7 @@ async function transferFunds(username, password, amount, token, destination) {
         const blob1 = verifyIdentity(username, Date.now());
         const blob2 = blob_builder.smt_token.transfer(identity, destination, token, BigInt(parsedAmount), null);
 
-        const blobTx = {
+        const blobTx: BlobTransaction = {
             identity,
             blobs: [blob0, blob1, blob2],
         };
@@ -328,14 +384,14 @@ async function transferFunds(username, password, amount, token, destination) {
                 token: token,
             },
         };
-    } catch (error) {
+    } catch (error: any) {
         console.error("Transfer failed:", error);
         return { success: false, error: error.message };
     }
 }
 
 // CLI interface
-async function main() {
+async function main(): Promise<void> {
     const args = process.argv.slice(2);
 
     if (args.length < 1) {
@@ -356,7 +412,7 @@ async function main() {
     }
 }
 
-function showUsage() {
+function showUsage(): void {
     console.log("Usage: hyli-wallet <command> [options]");
     console.log("");
     console.log("Commands:");
@@ -388,14 +444,14 @@ function showUsage() {
     console.log("  NODE_BASE_URL=http://localhost:4321 hyli-wallet register myuser mypassword123 INVITE123");
 }
 
-async function handleRegisterCommand(args) {
+async function handleRegisterCommand(args: string[]): Promise<void> {
     if (args.length < 3) {
         console.log("Register command requires at least 3 arguments: username, password, inviteCode");
         console.log("Usage: hyli-wallet register <username> <password> <inviteCode> [salt] [enableSessionKey]");
         process.exit(1);
     }
 
-    const [username, password, inviteCode, salt = Math.random().toString(36).substring(2), enableSessionKey = false] =
+    const [username, password, inviteCode, salt = Math.random().toString(36).substring(2), enableSessionKey = "false"] =
         args;
 
     console.log("Configuration:");
@@ -418,7 +474,7 @@ async function handleRegisterCommand(args) {
     }
 }
 
-async function handleTransferCommand(args) {
+async function handleTransferCommand(args: string[]): Promise<void> {
     if (args.length < 5) {
         console.log("Transfer command requires 5 arguments: username, password, amount, token, destination");
         console.log("Usage: hyli-wallet transfer <username> <password> <amount> <token> <destination>");

script/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hyli-wallet-cli",
-    "version": "0.5.2",
+    "version": "0.6.0",
     "type": "module",
     "license": "MIT",
     "repository": {
@@ -11,18 +11,20 @@
     "bugs": {
         "url": "https://github.com/hyli-org/wallet/issues"
     },
-    "main": "hyli-wallet.js",
+    "main": "dist/hyli-wallet.js",
     "bin": {
-        "hyli-wallet": "./hyli-wallet.js"
+        "hyli-wallet": "./dist/hyli-wallet.js"
     },
     "files": [
-        "hyli-wallet.js",
+        "dist/",
         "README.md"
     ],
     "scripts": {
-        "start": "node hyli-wallet.js",
-        "register": "node hyli-wallet.js",
-        "pub": "npm publish"
+        "build": "tsc",
+        "prepublishOnly": "bun run build",
+        "start": "node dist/hyli-wallet.js",
+        "dev": "tsc --watch",
+        "pub": "bun publish"
     },
     "dependencies": {
         "buffer": "^6.0.3",
@@ -35,7 +37,9 @@
     },
     "devDependencies": {
         "@types/crypto-js": "^4.2.2",
-        "@types/elliptic": "^6.4.18"
+        "@types/elliptic": "^6.4.18",
+        "@types/node": "^20.0.0",
+        "typescript": "^5.0.0"
     },
     "keywords": [
         "wallet",