@lidofinance/lsv-cli 1.0.0-alpha.60 → 1.0.0-alpha.62

package/dist/utils/wallet-connect.js

@@ -0,0 +1,179 @@
+import { SignClient } from '@walletconnect/sign-client';
+import qrcode from 'qrcode-terminal';
+import { createWalletClient, custom, } from 'viem';
+import { getConfig, getChain } from '../configs/index.js';
+import { logInfo, logError } from '../utils/logging/index.js';
+import { sleep } from '../utils/sleep.js';
+const DESCRIPTION = 'Lido Staking Vault CLI';
+const URL = 'https://github.com/lidofinance/lido-staking-vault-cli';
+const ICONS = [
+    'https://github.com/lidofinance/lido-staking-vault-cli/blob/develop/docs/static/img/favicon.png',
+];
+const NAME = 'Lido Staking Vault CLI';
+// Retry settings
+const DEFAULT_MAX_RETRIES = 3;
+const DEFAULT_CONNECTION_TIMEOUT = 180_000; // 180 seconds
+// Cache for the wallet connect client
+let cachedWalletConnectClient = null;
+let cachedSignClient = null;
+// TODO: fix this type
+let cachedSession = null;
+// Create a wallet connect client
+export const createWalletConnectClient = async () => {
+    try {
+        const chain = getChain();
+        // If the wallet connect client is already created, return it
+        if (cachedWalletConnectClient) {
+            return cachedWalletConnectClient;
+        }
+        const { session, accounts } = await connectWalletConnectWithRetry();
+        logInfo('Found accounts:', accounts.length);
+        // Get the address from the accounts
+        const address = accounts[0]?.split(':')[2];
+        // If no address is found, throw an error
+        if (!address) {
+            throw new Error('No address found. Check your wallet and try again.');
+        }
+        // Log the connected account
+        logInfo('Connected to WalletConnect with the following account:', address);
+        logInfo('Waiting for transaction...');
+        // Create an account object
+        const account = {
+            address,
+            type: 'json-rpc',
+        };
+        // Create a wallet connect client
+        const walletConnectClient = createWalletClient({
+            account,
+            chain: getChain(),
+            transport: custom({
+                async request({ method, params }) {
+                    return await cachedSignClient?.request({
+                        topic: session.topic,
+                        chainId: `eip155:${chain.id}`,
+                        request: { method, params },
+                    });
+                },
+            }),
+        });
+        // Cache the wallet connect client and account
+        cachedWalletConnectClient = walletConnectClient;
+        return cachedWalletConnectClient;
+    }
+    catch (error) {
+        logError('Error creating wallet connect client:', error);
+        throw error;
+    }
+};
+export const connectWalletConnectWithRetry = async (options = {}) => {
+    const { maxRetries = DEFAULT_MAX_RETRIES, connectionTimeout = DEFAULT_CONNECTION_TIMEOUT, } = options;
+    let lastError = null;
+    for (let attempt = 1; attempt <= maxRetries; attempt++) {
+        try {
+            logInfo(`WalletConnect connection attempt ${attempt}/${maxRetries}...`);
+            const result = await connectWalletConnectWithTimeout(connectionTimeout);
+            logInfo('✅ WalletConnect connected successfully!');
+            return result;
+        }
+        catch (error) {
+            lastError = error;
+            logError(`❌ Attempt ${attempt} failed:`, lastError.message);
+            if (attempt < maxRetries) {
+                logInfo(`⏳ Retrying in 2 seconds...`);
+                await sleep(2000);
+                // Clear the cache for a new attempt
+                cachedSignClient = null;
+                cachedWalletConnectClient = null;
+            }
+        }
+    }
+    throw new Error(`Failed to connect to WalletConnect after ${maxRetries} attempts. Last error: ${lastError?.message}`);
+};
+const connectWalletConnectWithTimeout = async (timeout) => {
+    // eslint-disable-next-line no-async-promise-executor
+    return new Promise(async (resolve, reject) => {
+        const timeoutId = setTimeout(() => {
+            reject(new Error(`Connection timeout after ${timeout}ms`));
+        }, timeout);
+        try {
+            const result = await connectWalletConnect();
+            clearTimeout(timeoutId);
+            resolve(result);
+        }
+        catch (error) {
+            clearTimeout(timeoutId);
+            reject(error);
+        }
+    });
+};
+const connectWalletConnect = async () => {
+    const chain = getChain();
+    const { WALLET_CONNECT_PROJECT_ID } = getConfig();
+    // Initialize the wallet connect client
+    const signClient = await SignClient.init({
+        projectId: WALLET_CONNECT_PROJECT_ID,
+        logger: 'error',
+        metadata: {
+            description: DESCRIPTION,
+            url: URL,
+            icons: ICONS,
+            name: NAME,
+        },
+    });
+    cachedSignClient = signClient;
+    logInfo('Used Chain:', chain.id);
+    logInfo('Connecting to WalletConnect...');
+    // Connect to WalletConnect
+    const { uri, approval } = await signClient.connect({
+        optionalNamespaces: {
+            eip155: {
+                methods: [
+                    'eth_sendTransaction',
+                    'eth_signTransaction',
+                    'eth_accounts',
+                    'eth_sign',
+                    'eth_chainId',
+                    'wallet_sendCalls',
+                    'wallet_getCallsStatus',
+                ],
+                chains: [`eip155:${chain.id}`],
+                events: ['chainChanged', 'accountsChanged'],
+            },
+        },
+    });
+    // If no URI is found, throw an error
+    if (!uri) {
+        throw new Error('No WalletConnect URI found. Try again.');
+    }
+    // Log the WalletConnect URI
+    logInfo(`\nPlease navigate to url:\n\n${uri}\n\nor scan QR code:\n`);
+    qrcode.generate(uri, { small: true });
+    logInfo('Waiting for approval...');
+    // Wait for the user to approve the connection
+    const session = await approval();
+    cachedSession = session;
+    const accounts = session.namespaces.eip155?.accounts;
+    logInfo('Session topic:', session.topic);
+    logInfo(`Session expiration: ${new Date(session.expiry * 1000).toLocaleString()}`);
+    // If no accounts are found, throw an error
+    if (!accounts) {
+        throw new Error('No accounts found. Check your wallet and try again.');
+    }
+    return {
+        session,
+        accounts,
+    };
+};
+export const disconnectWalletConnect = async () => {
+    await cachedSignClient?.disconnect({
+        topic: cachedSession?.topic,
+        reason: {
+            code: 4001,
+            message: 'Disconnect from app',
+        },
+    });
+    cachedSignClient = null;
+    cachedWalletConnectClient = null;
+    cachedSession = null;
+};
+//# sourceMappingURL=wallet-connect.js.map

package/dist/utils/wallet-connect.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wallet-connect.js","sourceRoot":"","sources":["../../utils/wallet-connect.ts"],"names":[],"mappings":"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"}

package/dist/version/index.js

@@ -1 +1 @@
-export const version = 'v1.0.0-alpha.60'
+export const version = 'v1.0.0-alpha.62'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lidofinance/lsv-cli",
-  "version": "1.0.0-alpha.60",
+  "version": "1.0.0-alpha.62",
   "main": "dist/index.js",
   "files": [
     "dist"
@@ -38,6 +38,7 @@
     "@chainsafe/ssz": "^1.0.2",
     "@lodestar/types": "^1.27.1",
     "@openzeppelin/merkle-tree": "^1.0.8",
+    "@walletconnect/sign-client": "^2.22.3",
     "blessed": "^0.1.81",
     "blessed-contrib": "^4.11.0",
     "blockstore-core": "^5.0.2",
@@ -46,19 +47,20 @@
     "cli-table3": "^0.6.5",
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",
-    "ethers": "^6.14.3",
     "fs-extra": "^11.3.0",
     "ipfs-unixfs-importer": "^15.3.2",
     "json-bigint": "^1.0.0",
     "log-update": "^6.1.0",
     "multiformats": "^13.3.2",
+    "ox": "^0.8.6",
     "prompts": "^2.4.2",
-    "viem": "^2.21.37"
+    "qrcode-terminal": "^0.12.0",
+    "viem": "^2.33.2"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.4.4",
     "@commitlint/config-conventional": "^17.4.4",
-    "@commitlint/prompt": "^17.4.4",
+    "@commitlint/prompt": "^19.8.1",
     "@jest/globals": "^29.7.0",
     "@lidofinance/eslint-config": "^0.48.0",
     "@swc/core": "^1.11.21",
@@ -69,6 +71,7 @@
     "@types/log-update": "^3.1.0",
     "@types/node": "^22.14.1",
     "@types/prompts": "^2.4.9",
+    "@types/qrcode-terminal": "^0.12.2",
     "@typescript-eslint/eslint-plugin": "^5",
     "@typescript-eslint/parser": "^5.46.0",
     "eslint": "^8.46.0",
@@ -96,7 +99,8 @@
     "typescript": "^5.7.2"
   },
   "resolutions": {
-    "xml2js": "^0.5.0"
+    "xml2js": "^0.5.0",
+    "tmp": "^0.2.4"
   },
   "lint-staged": {
     "./**/*.{ts,tsx}": [
@@ -113,6 +117,16 @@
         "name": "develop",
         "channel": "alpha",
         "prerelease": "alpha"
+      },
+      {
+        "name": "testnet-2",
+        "channel": "alpha",
+        "prerelease": "alpha-testnet-2"
+      },
+      {
+        "name": "testnet-3",
+        "channel": "alpha",
+        "prerelease": "alpha-testnet-3"
       }
     ]
   },