@deserialize/multi-vm-wallet 1.3.2 → 1.3.4

package/utils/svm/svm.ts

@@ -24,6 +24,8 @@ import {
 import BN from "bn.js";
 import nacl from "tweetnacl";
 import base58 from "bs58";
+import { fetchPrices } from "../price";
+import { PriceResponse } from "../price.types";
 import { getSVMTransactionHistory, SVMTransactionHistoryItem } from "./transactionParsing";
 
 
@@ -76,12 +78,37 @@ export class SVMVM extends VM<PublicKey, Keypair, Connection> {
         const privateKey = SVMDeriveChildPrivateKey(_seed, index, derivationPath);
         return { privateKey, index };
     }
+
+    /**
+     * Derive a savings account using BIP-44 account index
+     *
+     * Uses the pattern: m/44'/501'/accountIndex'/0/0
+     * - Main wallet: m/44'/501'/0'/0/0 (account index 0)
+     * - Savings 1: m/44'/501'/1'/0/0 (account index 1)
+     * - Savings 2: m/44'/501'/2'/0/0 (account index 2)
+     *
+     * @param accountIndex - The BIP-44 account index (0 for main, 1+ for savings)
+     * @returns Object containing privateKey (Keypair), address (PublicKey), and derivation path
+     */
+    deriveSavingsAccount(accountIndex: number): { privateKey: Keypair; address: PublicKey; derivationPath: string } {
+        // Use fixed address index 0 for savings accounts
+        // Vary only the account index (3rd position in BIP-44)
+        const derivationPath = `m/44'/501'/${accountIndex}'/0/0`;
+
+        // Derive the keypair using the account index in the path
+        const keypair = SVMDeriveChildPrivateKey(this.seed, 0, `m/44'/501'/${accountIndex}'/0/`);
+
+        return {
+            privateKey: keypair,
+            address: keypair.publicKey,
+            derivationPath
+        };
+    }
+
     static fromMnemonic(mnemonic: string): VM<PublicKey, Keypair, Connection> {
         const seed = VM.mnemonicToSeed(mnemonic)
         return new SVMVM(seed)
     }
-
-
 }
 
 export class SVMChainWallet extends ChainWallet<PublicKey, Keypair, Connection> {
@@ -175,6 +202,20 @@ export class SVMChainWallet extends ChainWallet<PublicKey, Keypair, Connection>
         return await SVMVM.getTokenInfo(tokenAddress, this.connection!)
     }
 
+    async getPrices(tokenAddresses: string[]): Promise<PriceResponse> {
+        const result = await fetchPrices({
+            vm: 'SVM',
+            chainId: this.config.chainId,
+            tokenAddresses,
+        });
+
+        if (result.error) {
+            throw new Error(result.error.message);
+        }
+
+        return result.data as PriceResponse;
+    }
+
     async swap(fromToken: TokenInfo, toToken: PublicKey, amount: number, slippage: number = 50): Promise<TransactionResult> {
         try {
             if (amount <= 0) {

package/utils/test.ts

@@ -11,31 +11,30 @@ import { ChainWalletConfig } from "./types";
 import { discoverNFTs, EVMChainWallet } from "./evm";
 import { } from "./svm/transactionParsing";
 import { getEVMTransactionHistory } from "./evm/transactionParsing";
-import { createPublicClient, encodeFunctionData, Hex, http, parseAbi, parseUnits, PublicClient } from "viem";
+import { createPublicClient, encodeFunctionData, Hex, http, parseAbi, parseUnits, PublicClient, zeroAddress } from "viem";
 import { base, baseGoerli } from "viem/chains";
 import { discoverTokens, fetchWalletNfts, getTokenInfo } from "./svm/utils";
-import { JsonRpcProvider } from "ethers";
+import { JsonRpcProvider, N } from "ethers";
 
 import { } from "@solana/spl-token-metadata"
 import { entryPoint07Address } from "viem/account-abstraction";
 
 import { KERNEL_V3_3, KernelVersionToAddressesMap } from '@zerodev/sdk/constants';
+import { deserializeSessionKey } from "./evm/aa-service";
+import { toSpendingLimitHook } from "@zerodev/hooks"
 // const mnemonic = GenerateNewMnemonic()
 
 
 // console.log('mnemonic: ', mnemonic);
 
 // const seed = VM.mnemonicToSeed(mnemonic)
-const pKey = "4QxETeX9pndiF1XNghUiDTnZnHq3cfjmuPLBJysrgocsLq1yb8w96aPWALa8ZnRZWmDU4wM8Tg8d1ZRVVByj7uXE"
+const pKey = ""
 
 const testUserKeyPair = Keypair.fromSecretKey(base58.decode(pKey));
 // const x = testUserKeyPair instanceof Keypair;
-const evePrivateKey = "0x4c0883a69102937d6231471b5dbb6204fe5129617082792ae468d01a3f362318"
-const evmPrivateKey2 = "0x0123456789012345678901234567890123456789012345678901234567890123"
-const ogPrivKey = "d2d3f7117aa9a4c6e5d4affedd8a5ea624ffd82b2a1de81509e5913709b1ea72"
 
-const evmPrivKey = "0xc9ca95aa5f40bae8b0f741ec89acc07b837590b2f9f818d3439df98c6e4f8dbe"
-const evmPrivateKeyExposed = "0x92cccc7792024dcac5992e5d2986dade41770acfd3dab0fe98ee953ed1bf0c3a"
+const evmPrivKey = ""
+const evmPrivateKeyExposed = ""
 // const vm = new SVMVM(seed)
 
 
@@ -59,7 +58,7 @@ const chainConfig: ChainWalletConfig = {
 const evmChainConfig: ChainWalletConfig = {
     chainId: 8453,
     name: "Base",
-    // rpcUrl: "https://eth-mainnet.g.alchemy.com/v2/lhoyb3hc9ccT9NA_y2cfA",
+    // rpcUrl: "https://base-mainnet.g.alchemy.com/v2/TFdA4BilCnKIwaqtypk0d",
     rpcUrl: base.rpcUrls.default.http[0],
     explorerUrl: "https://explorer.ethereum.com",
     nativeToken: { name: "Ethereum", symbol: "ETH", decimals: 18 },
@@ -70,7 +69,8 @@ const evmChainConfig: ChainWalletConfig = {
         enabled: true,
         entryPoints: [
             {
-                address: entryPoint07Address,
+                address: entryPoint07Address
+                ,
                 version: "0.7"
             }
         ],
@@ -102,20 +102,17 @@ const OgChainConfig: ChainWalletConfig = {
 const wallet = new EVMChainWallet(evmChainConfig, evmPrivateKeyExposed, 0)
 
 //IIFE
-const walletA = new EVMChainWallet(evmChainConfig, evmPrivateKeyExposed, 0); //wallet that usdc to send
+const walletA = new EVMChainWallet(evmChainConfig, evmPrivateKeyExposed, 0); //wallet that has usdc to send
 const walletB = new EVMChainWallet(evmChainConfig, evmPrivKey, 0); // wallet that has gas
 const SEPOLIA_USDC_ADDRESS = '0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238' as Hex;
 const BASE_USDC_ADDRESS = '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913' as Hex;
 const bundlerUrl = `https://api.pimlico.io/v2/${evmChainConfig.chainId}/rpc?apikey=pim_3UEhbTpS98H1XFm8p9kRxg`;
 
 const RECIPIENT = "0x7027F9C9a701adCbfCD55D16aD219501D4b9589A";
-(async () => {
-    return
-    console.log("walletA address: ", walletA.address);
-    console.log("walletB address: ", walletB.address);
+const testSessionKeys = async () => {
 
+    console.log("walletA address: ", walletA.address);
 
-    //GET TOKEN LOGO using @solana/spl-token-metadata
     const walletANativeBalance = await walletA.getNativeBalance();
     console.log('walletA native balance: ', walletANativeBalance);
 
@@ -125,6 +122,9 @@ const RECIPIENT = "0x7027F9C9a701adCbfCD55D16aD219501D4b9589A";
     //wallet B USDC balance
     const walletBUSDCBalance = await walletB.getTokenBalance(BASE_USDC_ADDRESS);
     console.log('walletB USDC balance: ', walletBUSDCBalance);
+    console.log("walletB address: ", walletB.address);
+
+
 
     //extend wallet A wallet to a smart wallet with AA support
     const extendedWalletA = await walletA.extend({
@@ -134,17 +134,82 @@ const RECIPIENT = "0x7027F9C9a701adCbfCD55D16aD219501D4b9589A";
     // console.log('extendedWalletA: ', extendedWalletA);
     const initializedExtendedWalletA = await extendedWalletA.initialize()
 
-    // console.log('initializedExtendedWalletA: ', initializedExtendedWalletA);
+
+    //now we want to test session keys 
+    const sessionKeys = await initializedExtendedWalletA.generateSessionKey()
+    console.log('sessionKeys: ', sessionKeys);
+
+
 
 
+    // return;
+    const usdcPermission = initializedExtendedWalletA.createUSDCPermission(
+        BASE_USDC_ADDRESS,
+        "1", // approve up to 100 USDC,
+        RECIPIENT
+    )
+    console.log('usdcPermission: ', usdcPermission);
+    const sessionKeyApproval = await initializedExtendedWalletA.approveSessionKey(
+        {
+            sessionKeyAddress: sessionKeys.address,
+            sessionKeyPrivateKey: sessionKeys.privateKey,
+            permissions: [usdcPermission],
+            // useSudoPolicy: true,
+        }
+    )
 
-})();
+    const data = encodeFunctionData({
+        abi: parseAbi([
+            'function transfer(address to, uint256 amount) public returns (bool)'
+        ]),
+        functionName: 'transfer',
+        args: [RECIPIENT, parseUnits('0.01', 6)]
+    }) // transfer 10 USDC
+    console.log('sessionKeyApproval: ', sessionKeyApproval);
+
+
+
+    const sessionKeyAccount = await deserializeSessionKey({
+        approval: sessionKeyApproval,
+        sessionKeySigner: sessionKeys.signer,
+        chain: base
+    })
+
+    //send transaction using session key
+
+    const sessionAccount = {
+        account: sessionKeyAccount,
+        address: sessionKeyAccount.address,
+    };
+
+    const hash = await initializedExtendedWalletA.sendTransaction(BASE_USDC_ADDRESS, 0n, data, {
+        sessionAccount: sessionAccount
+    })
+    console.log('hash: ', hash);
+    //get session key client
+
+
+
+
+}
+
+const testModule = async () => {
+    const extendedWalletA = await walletA.extend({
+        bundlerUrl: bundlerUrl
+    })
+
+    const initializedExtendedWalletA = await extendedWalletA.initialize()
+
+
+
+    //this is where we will test installation of modules
+}
 
 
 
 // console.log('wallet: ', wallet);
 // getTokenInfo(new PublicKey("9BB6NFEcjBCtnNLFko2FqVQBq8HHM13kCyYcdQbgpump"), wallet.connection!).then(e => console.log('token info: ', e))
-wallet.discoverToken().then(e => console.log('discovered tokens: ', e))
+
 // wallet.getNativeBalance().then(e => console.log('native balance: ', e))
 
 // const toBuy = new PublicKey("9BB6NFEcjBCtnNLFko2FqVQBq8HHM13kCyYcdQbgpump")

package/utils/vm.ts

@@ -1,7 +1,8 @@
-
 import { Balance, ChainWalletConfig, TokenInfo, vmTypes } from "./types";
 import * as bip39 from "@scure/bip39";
 import CryptoJS from "crypto-js";
+import { PriceResponse } from "./price.types";
+
 // Abstract Base Classes
 export abstract class VM<AddressType, PrivateKeyType, ConnectionType> {
     protected seed: string;
@@ -70,6 +71,16 @@ export abstract class VM<AddressType, PrivateKeyType, ConnectionType> {
     abstract generatePrivateKey(index: number, mnemonic?: string, derivationPath?: string): { privateKey: PrivateKeyType, index: number };
     abstract getTokenInfo(tokenAddress: AddressType, connection: ConnectionType): Promise<TokenInfo>
 
+    /**
+     * Derive a savings account using BIP-44 account index
+     *
+     * Main wallet uses: m/44'/60'/0'/0/0 (account index 0)
+     * Savings accounts use: m/44'/60'/N'/0/0 (account index N)
+     *
+     * @param accountIndex - The BIP-44 account index (1 for first savings, 2 for second, etc.)
+     * @returns Object containing privateKey, address, and derivation path
+     */
+    abstract deriveSavingsAccount(accountIndex: number): { privateKey: PrivateKeyType; address: AddressType; derivationPath: string };
 
     // abstract validateAddress(address: AddressType): boolean;
     // abstract getNativeBalance(address: AddressType, connection: ConnectionType): Promise<Balance>;