@dynamic-labs-wallet/node-svm 0.0.0-beta.310 → 0.0.0-beta.311

package/index.cjs.js

@@ -16,45 +16,75 @@ function _extends() {
 
 const ERROR_CREATE_WALLET_ACCOUNT = 'Error creating svm wallet account';
 
-async function getBalance({ address, rpcUrl = node.SOLANA_RPC_URL }) {
-    const connection = new web3_js.Connection(rpcUrl != null ? rpcUrl : 'https://api.devnet.solana.com');
-    const balance = await connection.getBalance(new web3_js.PublicKey(address));
-    return balance;
-}
-async function createSolanaTransaction({ senderSolanaAddress, amount, to, rpcUrl = 'https://api.devnet.solana.com' }) {
-    const connection = new web3_js.Connection(rpcUrl != null ? rpcUrl : 'https://api.devnet.solana.com');
-    const balance = await getBalance({
-        address: senderSolanaAddress,
-        rpcUrl
-    });
-    if (balance < amount * 1e9) {
-        throw new Error('Insufficient balance');
+// Base58 encoding/decoding (Bitcoin alphabet) without external dependencies
+// Implementation adapted from the reference algorithm; suitable for keys/signatures
+const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
+const ALPHABET_MAP = {};
+for(let i = 0; i < ALPHABET.length; i++)ALPHABET_MAP[ALPHABET[i]] = i;
+function encodeBase58(source) {
+    const bytes = source instanceof Uint8Array ? source : new Uint8Array(source);
+    if (bytes.length === 0) return '';
+    // Count leading zeros
+    let zeros = 0;
+    while(zeros < bytes.length && bytes[zeros] === 0)zeros++;
+    // Allocate enough space in big-endian base58 representation.
+    // log(256) / log(58), rounded up.
+    const size = (bytes.length - zeros) * 138 / 100 + 1 >>> 0;
+    const b58 = new Uint8Array(size);
+    let length = 0;
+    for(let i = zeros; i < bytes.length; i++){
+        let carry = bytes[i];
+        let j = 0;
+        for(let k = size - 1; (carry !== 0 || j < length) && k >= 0; k--, j++){
+            carry += 256 * b58[k] >>> 0;
+            b58[k] = carry % 58 >>> 0;
+            carry = carry / 58 >>> 0;
+        }
+        length = j;
     }
-    const fromPubkey = new web3_js.PublicKey(senderSolanaAddress);
-    const transaction = new web3_js.Transaction().add(web3_js.SystemProgram.transfer({
-        fromPubkey: fromPubkey,
-        toPubkey: new web3_js.PublicKey(to),
-        lamports: amount * 1e9
-    }));
-    const { blockhash } = await connection.getLatestBlockhash();
-    transaction.recentBlockhash = blockhash;
-    transaction.feePayer = fromPubkey;
-    const serializedTransaction = transaction.serializeMessage();
-    return {
-        transaction,
-        serializedTransaction
-    };
+    // Skip leading zeros in base58 result
+    let it = size - length;
+    while(it < size && b58[it] === 0)it++;
+    // Translate the result into a string.
+    let str = '';
+    for(let i = 0; i < zeros; i++)str += '1';
+    for(; it < size; it++)str += ALPHABET[b58[it]];
+    return str;
 }
-const addSignatureToTransaction = ({ transaction, signature, signerPublicKey })=>{
-    transaction.addSignature(signerPublicKey, Buffer.from(signature));
-    return transaction;
-};
-async function sendTransaction({ signedTransaction, rpcUrl = 'https://api.devnet.solana.com' }) {
-    const connection = new web3_js.Connection(rpcUrl != null ? rpcUrl : 'https://api.devnet.solana.com');
-    const txid = await connection.sendRawTransaction(Buffer.from(signedTransaction));
-    return txid;
+function decodeBase58(str) {
+    if (str.length === 0) return new Uint8Array();
+    // Count leading zeros
+    let zeros = 0;
+    while(zeros < str.length && str[zeros] === '1')zeros++;
+    // Allocate enough space in big-endian base256 representation.
+    // log(58) / log(256), rounded up.
+    const size = (str.length - zeros) * 733 / 1000 + 1 >>> 0;
+    const b256 = new Uint8Array(size);
+    let length = 0;
+    for(let i = zeros; i < str.length; i++){
+        const value = ALPHABET_MAP[str[i]];
+        if (value === undefined) throw new Error('Invalid base58 character');
+        let carry = value;
+        let j = 0;
+        for(let k = size - 1; (carry !== 0 || j < length) && k >= 0; k--, j++){
+            carry += 58 * b256[k] >>> 0;
+            b256[k] = (carry & 0xff) >>> 0;
+            carry = carry >> 8 >>> 0;
+        }
+        length = j;
+    }
+    // Skip leading zeros in b256
+    let it = size - length;
+    while(it < size && b256[it] === 0)it++;
+    const out = new Uint8Array(zeros + (size - it));
+    out.fill(0, 0, zeros);
+    let j = zeros;
+    while(it < size)out[j++] = b256[it++];
+    return out;
 }
 
+// Helper: normalize bytes to hex without triggering Buffer.from(string, encoding) overload
+const toHex = (bytes)=>(Buffer.isBuffer(bytes) ? bytes : Buffer.from(bytes)).toString('hex');
 class DynamicSvmWalletClient extends node.DynamicWalletClient {
     /**
    * Creates a wallet account on the Solana chain
@@ -117,10 +147,12 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
     }
     // Function to properly derive account address
     async deriveAccountAddress(rawPublicKey) {
-        const pubKeyBytes = typeof rawPublicKey === 'string' ? Buffer.from(rawPublicKey, 'hex') : rawPublicKey;
-        // Create PublicKey from bytes and convert to base58
-        const pubKey = new web3_js.PublicKey(pubKeyBytes);
-        const accountAddress = pubKey.toBase58();
+        function ensure32(u8) {
+            if (u8.length !== 32) throw new Error(`Invalid pubkey length: ${u8.length}`);
+            return u8;
+        }
+        const pubKeyBytes = typeof rawPublicKey === 'string' ? new Uint8Array(Buffer.from(rawPublicKey, 'hex')) : rawPublicKey;
+        const accountAddress = new web3_js.PublicKey(ensure32(pubKeyBytes)).toBase58();
         return {
             accountAddress
         };
@@ -132,25 +164,29 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
    * @param accountAddress Solana address (base58 encoded)
    * @param password The password for encrypted backup shares
    */ async signMessage({ message, accountAddress, password = undefined, externalServerKeyShares }) {
+        // Validate inputs early
+        if (!accountAddress) {
+            throw new Error('Account address is required');
+        }
+        if (Array.isArray(externalServerKeyShares) && externalServerKeyShares.length === 0) {
+            throw new Error('External server key shares are required');
+        }
         await this.verifyPassword({
             accountAddress,
             password,
             walletOperation: node.WalletOperation.SIGN_MESSAGE
         });
-        if (!accountAddress) {
-            throw new Error('Account address is required');
-        }
         try {
+            const messageBytes = typeof message === 'string' ? new TextEncoder().encode(message) : message;
+            const messageHex = toHex(messageBytes);
             const signatureEd25519 = await this.sign({
-                message,
-                accountAddress: accountAddress,
+                message: messageHex,
+                accountAddress,
                 chainName: this.chainName,
                 password,
                 externalServerKeyShares
             });
-            // Use PublicKey to encode signature
-            const base58Signature = new web3_js.PublicKey(signatureEd25519).toBase58();
-            return base58Signature;
+            return encodeBase58(signatureEd25519);
         } catch (error) {
             this.logger.error('Error signing message:', error);
             throw error;
@@ -158,6 +194,13 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
     }
     //todo:should txn just be a string?
     async signTransaction({ senderAddress, transaction, password = undefined, externalServerKeyShares }) {
+        // Validate inputs early
+        if (!senderAddress) {
+            throw new Error('Sender address is required');
+        }
+        if (Array.isArray(externalServerKeyShares) && externalServerKeyShares.length === 0) {
+            throw new Error('External server key shares are required');
+        }
         await this.verifyPassword({
             accountAddress: senderAddress,
             password,
@@ -165,14 +208,14 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
         });
         try {
             let messageToSign;
-            if (transaction instanceof web3_js.VersionedTransaction) {
-                // For versioned transactions, we need to sign the message directly
+            if (typeof transaction === 'string') {
+                messageToSign = transaction.startsWith('0x') ? transaction.slice(2) : transaction;
+            } else if (transaction instanceof web3_js.VersionedTransaction) {
                 const messageBytes = transaction.message.serialize();
-                messageToSign = Buffer.from(messageBytes).toString('hex');
+                messageToSign = toHex(messageBytes);
             } else {
-                // For legacy transactions, serialize the message
                 const messageBytes = transaction.serializeMessage();
-                messageToSign = Buffer.from(messageBytes).toString('hex');
+                messageToSign = toHex(Buffer.isBuffer(messageBytes) ? messageBytes : messageBytes);
             }
             const signatureEd25519 = await this.sign({
                 message: messageToSign,
@@ -184,13 +227,7 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
             if (!signatureEd25519) {
                 throw new Error('Signature is undefined');
             }
-            const senderPublicKey = new web3_js.PublicKey(senderAddress);
-            const signedTransaction = addSignatureToTransaction({
-                transaction,
-                signature: signatureEd25519,
-                signerPublicKey: senderPublicKey
-            });
-            return signedTransaction;
+            return encodeBase58(signatureEd25519);
         } catch (error) {
             this.logger.error('Error in signTransaction:', error);
             if (error instanceof Error) {
@@ -238,18 +275,19 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
    * @param privateKey The private key to convert
    * @returns The hex string
    */ decodePrivateKeyForSolana(privateKey) {
-        const decoded = new web3_js.PublicKey(privateKey).toBuffer();
-        const slicedBytes = decoded.slice(0, 32);
-        return Buffer.from(slicedBytes).toString('hex');
+        const decoded = decodeBase58(privateKey); // 64 bytes
+        if (decoded.length !== 64) throw new Error('Invalid Solana secret key length');
+        return Buffer.from(decoded.slice(0, 32)).toString('hex');
     }
     getPublicKeyFromPrivateKey(privateKey) {
-        const privateKeyBytes = new web3_js.PublicKey(privateKey).toBuffer();
-        const keypair = web3_js.Keypair.fromSecretKey(privateKeyBytes);
-        const publicKeyBase58 = keypair.publicKey.toBase58();
-        return publicKeyBase58;
+        const secret = decodeBase58(privateKey);
+        const keypair = web3_js.Keypair.fromSecretKey(secret);
+        return keypair.publicKey.toBase58();
     }
     encodePublicKey(publicKey) {
-        return new web3_js.PublicKey(publicKey).toBase58();
+        // Ensure a plain Uint8Array is passed to PublicKey
+        const bytes = publicKey instanceof Uint8Array ? publicKey : new Uint8Array(publicKey);
+        return new web3_js.PublicKey(bytes).toBase58();
     }
     /**
    * Imports the private key for a given account address
@@ -319,8 +357,59 @@ class DynamicSvmWalletClient extends node.DynamicWalletClient {
     }
 }
 
+async function getBalance({ address, rpcUrl = node.SOLANA_RPC_URL }) {
+    const connection = new web3_js.Connection(rpcUrl != null ? rpcUrl : 'https://api.devnet.solana.com');
+    const balance = await connection.getBalance(new web3_js.PublicKey(address));
+    return balance;
+}
+async function createSolanaTransaction({ senderSolanaAddress, amount, to, rpcUrl = 'https://api.devnet.solana.com' }) {
+    const connection = new web3_js.Connection(rpcUrl != null ? rpcUrl : 'https://api.devnet.solana.com');
+    const balance = await getBalance({
+        address: senderSolanaAddress,
+        rpcUrl
+    });
+    if (balance < amount * 1e9) {
+        throw new Error('Insufficient balance');
+    }
+    const fromPubkey = new web3_js.PublicKey(senderSolanaAddress);
+    const transaction = new web3_js.Transaction().add(web3_js.SystemProgram.transfer({
+        fromPubkey: fromPubkey,
+        toPubkey: new web3_js.PublicKey(to),
+        lamports: amount * 1e9
+    }));
+    const { blockhash } = await connection.getLatestBlockhash();
+    transaction.recentBlockhash = blockhash;
+    transaction.feePayer = fromPubkey;
+    const serializedTransaction = transaction.serializeMessage();
+    return {
+        transaction,
+        serializedTransaction
+    };
+}
+const addSignatureToTransaction = ({ transaction, signature, signerPublicKey })=>{
+    transaction.addSignature(signerPublicKey, Buffer.from(signature));
+    return transaction;
+};
+function attachSignature({ transaction, signatureBase58, senderAddress }) {
+    const sigBytes = decodeBase58(signatureBase58);
+    const signerPubkey = new web3_js.PublicKey(senderAddress);
+    return addSignatureToTransaction({
+        transaction,
+        signature: sigBytes,
+        signerPublicKey: signerPubkey
+    });
+}
+async function sendTransaction({ signedTransaction, rpcUrl = 'https://api.devnet.solana.com' }) {
+    const connection = new web3_js.Connection(rpcUrl != null ? rpcUrl : 'https://api.devnet.solana.com');
+    const txid = await connection.sendRawTransaction(Buffer.from(signedTransaction));
+    return txid;
+}
+
 exports.DynamicSvmWalletClient = DynamicSvmWalletClient;
 exports.addSignatureToTransaction = addSignatureToTransaction;
+exports.attachSignature = attachSignature;
 exports.createSolanaTransaction = createSolanaTransaction;
+exports.decodeBase58 = decodeBase58;
+exports.encodeBase58 = encodeBase58;
 exports.getBalance = getBalance;
 exports.sendTransaction = sendTransaction;

package/index.esm.js

@@ -1,5 +1,5 @@
-import { SOLANA_RPC_URL, DynamicWalletClient, getExternalServerKeyShareBackupInfo, WalletOperation } from '@dynamic-labs-wallet/node';
-import { Connection, PublicKey, Transaction, SystemProgram, VersionedTransaction, Keypair } from '@solana/web3.js';
+import { DynamicWalletClient, getExternalServerKeyShareBackupInfo, WalletOperation, SOLANA_RPC_URL } from '@dynamic-labs-wallet/node';
+import { PublicKey, VersionedTransaction, Keypair, Connection, Transaction, SystemProgram } from '@solana/web3.js';
 
 function _extends() {
     _extends = Object.assign || function assign(target) {
@@ -14,45 +14,75 @@ function _extends() {
 
 const ERROR_CREATE_WALLET_ACCOUNT = 'Error creating svm wallet account';
 
-async function getBalance({ address, rpcUrl = SOLANA_RPC_URL }) {
-    const connection = new Connection(rpcUrl != null ? rpcUrl : 'https://api.devnet.solana.com');
-    const balance = await connection.getBalance(new PublicKey(address));
-    return balance;
-}
-async function createSolanaTransaction({ senderSolanaAddress, amount, to, rpcUrl = 'https://api.devnet.solana.com' }) {
-    const connection = new Connection(rpcUrl != null ? rpcUrl : 'https://api.devnet.solana.com');
-    const balance = await getBalance({
-        address: senderSolanaAddress,
-        rpcUrl
-    });
-    if (balance < amount * 1e9) {
-        throw new Error('Insufficient balance');
+// Base58 encoding/decoding (Bitcoin alphabet) without external dependencies
+// Implementation adapted from the reference algorithm; suitable for keys/signatures
+const ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
+const ALPHABET_MAP = {};
+for(let i = 0; i < ALPHABET.length; i++)ALPHABET_MAP[ALPHABET[i]] = i;
+function encodeBase58(source) {
+    const bytes = source instanceof Uint8Array ? source : new Uint8Array(source);
+    if (bytes.length === 0) return '';
+    // Count leading zeros
+    let zeros = 0;
+    while(zeros < bytes.length && bytes[zeros] === 0)zeros++;
+    // Allocate enough space in big-endian base58 representation.
+    // log(256) / log(58), rounded up.
+    const size = (bytes.length - zeros) * 138 / 100 + 1 >>> 0;
+    const b58 = new Uint8Array(size);
+    let length = 0;
+    for(let i = zeros; i < bytes.length; i++){
+        let carry = bytes[i];
+        let j = 0;
+        for(let k = size - 1; (carry !== 0 || j < length) && k >= 0; k--, j++){
+            carry += 256 * b58[k] >>> 0;
+            b58[k] = carry % 58 >>> 0;
+            carry = carry / 58 >>> 0;
+        }
+        length = j;
     }
-    const fromPubkey = new PublicKey(senderSolanaAddress);
-    const transaction = new Transaction().add(SystemProgram.transfer({
-        fromPubkey: fromPubkey,
-        toPubkey: new PublicKey(to),
-        lamports: amount * 1e9
-    }));
-    const { blockhash } = await connection.getLatestBlockhash();
-    transaction.recentBlockhash = blockhash;
-    transaction.feePayer = fromPubkey;
-    const serializedTransaction = transaction.serializeMessage();
-    return {
-        transaction,
-        serializedTransaction
-    };
+    // Skip leading zeros in base58 result
+    let it = size - length;
+    while(it < size && b58[it] === 0)it++;
+    // Translate the result into a string.
+    let str = '';
+    for(let i = 0; i < zeros; i++)str += '1';
+    for(; it < size; it++)str += ALPHABET[b58[it]];
+    return str;
 }
-const addSignatureToTransaction = ({ transaction, signature, signerPublicKey })=>{
-    transaction.addSignature(signerPublicKey, Buffer.from(signature));
-    return transaction;
-};
-async function sendTransaction({ signedTransaction, rpcUrl = 'https://api.devnet.solana.com' }) {
-    const connection = new Connection(rpcUrl != null ? rpcUrl : 'https://api.devnet.solana.com');
-    const txid = await connection.sendRawTransaction(Buffer.from(signedTransaction));
-    return txid;
+function decodeBase58(str) {
+    if (str.length === 0) return new Uint8Array();
+    // Count leading zeros
+    let zeros = 0;
+    while(zeros < str.length && str[zeros] === '1')zeros++;
+    // Allocate enough space in big-endian base256 representation.
+    // log(58) / log(256), rounded up.
+    const size = (str.length - zeros) * 733 / 1000 + 1 >>> 0;
+    const b256 = new Uint8Array(size);
+    let length = 0;
+    for(let i = zeros; i < str.length; i++){
+        const value = ALPHABET_MAP[str[i]];
+        if (value === undefined) throw new Error('Invalid base58 character');
+        let carry = value;
+        let j = 0;
+        for(let k = size - 1; (carry !== 0 || j < length) && k >= 0; k--, j++){
+            carry += 58 * b256[k] >>> 0;
+            b256[k] = (carry & 0xff) >>> 0;
+            carry = carry >> 8 >>> 0;
+        }
+        length = j;
+    }
+    // Skip leading zeros in b256
+    let it = size - length;
+    while(it < size && b256[it] === 0)it++;
+    const out = new Uint8Array(zeros + (size - it));
+    out.fill(0, 0, zeros);
+    let j = zeros;
+    while(it < size)out[j++] = b256[it++];
+    return out;
 }
 
+// Helper: normalize bytes to hex without triggering Buffer.from(string, encoding) overload
+const toHex = (bytes)=>(Buffer.isBuffer(bytes) ? bytes : Buffer.from(bytes)).toString('hex');
 class DynamicSvmWalletClient extends DynamicWalletClient {
     /**
    * Creates a wallet account on the Solana chain
@@ -115,10 +145,12 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
     }
     // Function to properly derive account address
     async deriveAccountAddress(rawPublicKey) {
-        const pubKeyBytes = typeof rawPublicKey === 'string' ? Buffer.from(rawPublicKey, 'hex') : rawPublicKey;
-        // Create PublicKey from bytes and convert to base58
-        const pubKey = new PublicKey(pubKeyBytes);
-        const accountAddress = pubKey.toBase58();
+        function ensure32(u8) {
+            if (u8.length !== 32) throw new Error(`Invalid pubkey length: ${u8.length}`);
+            return u8;
+        }
+        const pubKeyBytes = typeof rawPublicKey === 'string' ? new Uint8Array(Buffer.from(rawPublicKey, 'hex')) : rawPublicKey;
+        const accountAddress = new PublicKey(ensure32(pubKeyBytes)).toBase58();
         return {
             accountAddress
         };
@@ -130,25 +162,29 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * @param accountAddress Solana address (base58 encoded)
    * @param password The password for encrypted backup shares
    */ async signMessage({ message, accountAddress, password = undefined, externalServerKeyShares }) {
+        // Validate inputs early
+        if (!accountAddress) {
+            throw new Error('Account address is required');
+        }
+        if (Array.isArray(externalServerKeyShares) && externalServerKeyShares.length === 0) {
+            throw new Error('External server key shares are required');
+        }
         await this.verifyPassword({
             accountAddress,
             password,
             walletOperation: WalletOperation.SIGN_MESSAGE
         });
-        if (!accountAddress) {
-            throw new Error('Account address is required');
-        }
         try {
+            const messageBytes = typeof message === 'string' ? new TextEncoder().encode(message) : message;
+            const messageHex = toHex(messageBytes);
             const signatureEd25519 = await this.sign({
-                message,
-                accountAddress: accountAddress,
+                message: messageHex,
+                accountAddress,
                 chainName: this.chainName,
                 password,
                 externalServerKeyShares
             });
-            // Use PublicKey to encode signature
-            const base58Signature = new PublicKey(signatureEd25519).toBase58();
-            return base58Signature;
+            return encodeBase58(signatureEd25519);
         } catch (error) {
             this.logger.error('Error signing message:', error);
             throw error;
@@ -156,6 +192,13 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
     }
     //todo:should txn just be a string?
     async signTransaction({ senderAddress, transaction, password = undefined, externalServerKeyShares }) {
+        // Validate inputs early
+        if (!senderAddress) {
+            throw new Error('Sender address is required');
+        }
+        if (Array.isArray(externalServerKeyShares) && externalServerKeyShares.length === 0) {
+            throw new Error('External server key shares are required');
+        }
         await this.verifyPassword({
             accountAddress: senderAddress,
             password,
@@ -163,14 +206,14 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
         });
         try {
             let messageToSign;
-            if (transaction instanceof VersionedTransaction) {
-                // For versioned transactions, we need to sign the message directly
+            if (typeof transaction === 'string') {
+                messageToSign = transaction.startsWith('0x') ? transaction.slice(2) : transaction;
+            } else if (transaction instanceof VersionedTransaction) {
                 const messageBytes = transaction.message.serialize();
-                messageToSign = Buffer.from(messageBytes).toString('hex');
+                messageToSign = toHex(messageBytes);
             } else {
-                // For legacy transactions, serialize the message
                 const messageBytes = transaction.serializeMessage();
-                messageToSign = Buffer.from(messageBytes).toString('hex');
+                messageToSign = toHex(Buffer.isBuffer(messageBytes) ? messageBytes : messageBytes);
             }
             const signatureEd25519 = await this.sign({
                 message: messageToSign,
@@ -182,13 +225,7 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
             if (!signatureEd25519) {
                 throw new Error('Signature is undefined');
             }
-            const senderPublicKey = new PublicKey(senderAddress);
-            const signedTransaction = addSignatureToTransaction({
-                transaction,
-                signature: signatureEd25519,
-                signerPublicKey: senderPublicKey
-            });
-            return signedTransaction;
+            return encodeBase58(signatureEd25519);
         } catch (error) {
             this.logger.error('Error in signTransaction:', error);
             if (error instanceof Error) {
@@ -236,18 +273,19 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
    * @param privateKey The private key to convert
    * @returns The hex string
    */ decodePrivateKeyForSolana(privateKey) {
-        const decoded = new PublicKey(privateKey).toBuffer();
-        const slicedBytes = decoded.slice(0, 32);
-        return Buffer.from(slicedBytes).toString('hex');
+        const decoded = decodeBase58(privateKey); // 64 bytes
+        if (decoded.length !== 64) throw new Error('Invalid Solana secret key length');
+        return Buffer.from(decoded.slice(0, 32)).toString('hex');
     }
     getPublicKeyFromPrivateKey(privateKey) {
-        const privateKeyBytes = new PublicKey(privateKey).toBuffer();
-        const keypair = Keypair.fromSecretKey(privateKeyBytes);
-        const publicKeyBase58 = keypair.publicKey.toBase58();
-        return publicKeyBase58;
+        const secret = decodeBase58(privateKey);
+        const keypair = Keypair.fromSecretKey(secret);
+        return keypair.publicKey.toBase58();
     }
     encodePublicKey(publicKey) {
-        return new PublicKey(publicKey).toBase58();
+        // Ensure a plain Uint8Array is passed to PublicKey
+        const bytes = publicKey instanceof Uint8Array ? publicKey : new Uint8Array(publicKey);
+        return new PublicKey(bytes).toBase58();
     }
     /**
    * Imports the private key for a given account address
@@ -317,4 +355,52 @@ class DynamicSvmWalletClient extends DynamicWalletClient {
     }
 }
 
-export { DynamicSvmWalletClient, addSignatureToTransaction, createSolanaTransaction, getBalance, sendTransaction };
+async function getBalance({ address, rpcUrl = SOLANA_RPC_URL }) {
+    const connection = new Connection(rpcUrl != null ? rpcUrl : 'https://api.devnet.solana.com');
+    const balance = await connection.getBalance(new PublicKey(address));
+    return balance;
+}
+async function createSolanaTransaction({ senderSolanaAddress, amount, to, rpcUrl = 'https://api.devnet.solana.com' }) {
+    const connection = new Connection(rpcUrl != null ? rpcUrl : 'https://api.devnet.solana.com');
+    const balance = await getBalance({
+        address: senderSolanaAddress,
+        rpcUrl
+    });
+    if (balance < amount * 1e9) {
+        throw new Error('Insufficient balance');
+    }
+    const fromPubkey = new PublicKey(senderSolanaAddress);
+    const transaction = new Transaction().add(SystemProgram.transfer({
+        fromPubkey: fromPubkey,
+        toPubkey: new PublicKey(to),
+        lamports: amount * 1e9
+    }));
+    const { blockhash } = await connection.getLatestBlockhash();
+    transaction.recentBlockhash = blockhash;
+    transaction.feePayer = fromPubkey;
+    const serializedTransaction = transaction.serializeMessage();
+    return {
+        transaction,
+        serializedTransaction
+    };
+}
+const addSignatureToTransaction = ({ transaction, signature, signerPublicKey })=>{
+    transaction.addSignature(signerPublicKey, Buffer.from(signature));
+    return transaction;
+};
+function attachSignature({ transaction, signatureBase58, senderAddress }) {
+    const sigBytes = decodeBase58(signatureBase58);
+    const signerPubkey = new PublicKey(senderAddress);
+    return addSignatureToTransaction({
+        transaction,
+        signature: sigBytes,
+        signerPublicKey: signerPubkey
+    });
+}
+async function sendTransaction({ signedTransaction, rpcUrl = 'https://api.devnet.solana.com' }) {
+    const connection = new Connection(rpcUrl != null ? rpcUrl : 'https://api.devnet.solana.com');
+    const txid = await connection.sendRawTransaction(Buffer.from(signedTransaction));
+    return txid;
+}
+
+export { DynamicSvmWalletClient, addSignatureToTransaction, attachSignature, createSolanaTransaction, decodeBase58, encodeBase58, getBalance, sendTransaction };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@dynamic-labs-wallet/node-svm",
-  "version": "0.0.0-beta.310",
+  "version": "0.0.0-beta.311",
   "license": "MIT",
   "dependencies": {
-    "@dynamic-labs-wallet/node": "0.0.0-beta.310",
+    "@dynamic-labs-wallet/node": "0.0.0-beta.311",
     "@solana/web3.js": "^1.98.2"
   },
   "publishConfig": {

package/src/client/base58.d.ts

@@ -0,0 +1,3 @@
+export declare function encodeBase58(source: Uint8Array): string;
+export declare function decodeBase58(str: string): Uint8Array;
+//# sourceMappingURL=base58.d.ts.map

package/src/client/base58.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base58.d.ts","sourceRoot":"","sources":["../../src/client/base58.ts"],"names":[],"mappings":"AAOA,wBAAgB,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CAmCvD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,CAmCpD"}

package/src/client/client.d.ts

@@ -36,17 +36,17 @@ export declare class DynamicSvmWalletClient extends DynamicWalletClient {
      * @param password The password for encrypted backup shares
      */
     signMessage({ message, accountAddress, password, externalServerKeyShares, }: {
-        message: string;
+        message: string | Uint8Array;
         accountAddress: string;
         password?: string;
         externalServerKeyShares?: ServerKeyShare[];
     }): Promise<string>;
     signTransaction({ senderAddress, transaction, password, externalServerKeyShares, }: {
         senderAddress: string;
-        transaction: VersionedTransaction | Transaction;
+        transaction: VersionedTransaction | Transaction | string;
         password?: string;
         externalServerKeyShares?: ServerKeyShare[];
-    }): Promise<VersionedTransaction | Transaction>;
+    }): Promise<string>;
     /**
      * Exports the private key for a given account address
      *

package/src/client/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,mBAAmB,EACnB,wBAAwB,EAGzB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAEL,WAAW,EACX,oBAAoB,EAErB,MAAM,iBAAiB,CAAC;AAIzB,qBAAa,sBAAuB,SAAQ,mBAAmB;IAC7D,QAAQ,CAAC,SAAS,SAAS;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;gBAEZ,EACV,aAAa,EACb,UAAU,EACV,kBAAkB,GACnB,EAAE;QACD,aAAa,EAAE,MAAM,CAAC;QACtB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B;IAQD;;;;;OAKG;IACG,mBAAmB,CAAC,EACxB,wBAAwB,EACxB,QAAoB,EACpB,OAAO,EACP,0BAAkC,GACnC,EAAE;QACD,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;QACjC,0BAA0B,CAAC,EAAE,OAAO,CAAC;KACtC,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,UAAU,GAAG,MAAM,CAAC;QAClC,uBAAuB,EAAE,cAAc,EAAE,CAAC;KAC3C,CAAC;IAsEI,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,UAAU;;;IAc5D;;;;;;OAMG;IACG,WAAW,CAAC,EAChB,OAAO,EACP,cAAc,EACd,QAAoB,EACpB,uBAAuB,GACxB,EAAE;QACD,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,uBAAuB,CAAC,EAAE,cAAc,EAAE,CAAC;KAC5C;IA+BK,eAAe,CAAC,EACpB,aAAa,EACb,WAAW,EACX,QAAoB,EACpB,uBAAuB,GACxB,EAAE;QACD,aAAa,EAAE,MAAM,CAAC;QACtB,WAAW,EAAE,oBAAoB,GAAG,WAAW,CAAC;QAChD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,uBAAuB,CAAC,EAAE,cAAc,EAAE,CAAC;KAC5C,GAAG,OAAO,CAAC,oBAAoB,GAAG,WAAW,CAAC;IAiD/C;;;;;;OAMG;IACG,gBAAgB,CAAC,EACrB,cAAc,EACd,QAAoB,EACpB,uBAAuB,GACxB,EAAE;QACD,cAAc,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,uBAAuB,CAAC,EAAE,cAAc,EAAE,CAAC;KAC5C;IAcD;;;;;OAKG;IACG,uBAAuB,CAAC,EAC5B,SAAS,EACT,cAAc,GACf,EAAE;QACD,SAAS,EAAE,mBAAmB,EAAE,CAAC;QACjC,cAAc,CAAC,EAAE,MAAM,CAAC;KACzB;;;IASD;;;;;OAKG;IACH,yBAAyB,CAAC,UAAU,EAAE,MAAM;IAM5C,0BAA0B,CAAC,UAAU,EAAE,MAAM;IAQ7C,eAAe,CAAC,SAAS,EAAE,UAAU,GAAG,MAAM;IAI9C;;;;;;;;OAQG;IACG,gBAAgB,CAAC,EACrB,UAAU,EACV,SAAS,EACT,wBAAwB,EACxB,QAAoB,EACpB,OAAO,EACP,0BAAkC,GACnC,EAAE;QACD,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,wBAAwB,EAAE,wBAAwB,CAAC;QACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;QACjC,0BAA0B,CAAC,EAAE,OAAO,CAAC;KACtC,GAAG,OAAO,CAAC;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,YAAY,EAAE,UAAU,GAAG,MAAM,GAAG,SAAS,CAAC;QAC9C,uBAAuB,EAAE,cAAc,EAAE,CAAC;KAC3C,CAAC;IA+DI,aAAa;CAOpB"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/client/client.ts"],"names":[],"mappings":"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"}

package/src/client/index.d.ts

@@ -1,3 +1,4 @@
 export * from './client';
 export * from './utils';
+export * from './base58';
 //# sourceMappingURL=index.d.ts.map

package/src/client/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/client/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC"}

package/src/client/utils.d.ts

@@ -17,6 +17,11 @@ export declare const addSignatureToTransaction: ({ transaction, signature, signe
     signature: Uint8Array;
     signerPublicKey: PublicKey;
 }) => VersionedTransaction | Transaction;
+export declare function attachSignature({ transaction, signatureBase58, senderAddress, }: {
+    transaction: Transaction | VersionedTransaction;
+    signatureBase58: string;
+    senderAddress: string;
+}): VersionedTransaction | Transaction;
 export declare function sendTransaction({ signedTransaction, rpcUrl, }: {
     signedTransaction: Uint8Array;
     rpcUrl?: string;

package/src/client/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/client/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,SAAS,EAET,WAAW,EACX,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAEzB,wBAAsB,UAAU,CAAC,EAC/B,OAAO,EACP,MAAuB,GACxB,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,mBAIA;AAED,wBAAsB,uBAAuB,CAAC,EAC5C,mBAAmB,EACnB,MAAM,EACN,EAAE,EACF,MAAwC,GACzC,EAAE;IACD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;;;GAwBA;AAED,eAAO,MAAM,yBAAyB,iDAInC;IACD,WAAW,EAAE,WAAW,GAAG,oBAAoB,CAAC;IAChD,SAAS,EAAE,UAAU,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;CAC5B,KAAG,oBAAoB,GAAG,WAG1B,CAAC;AAEF,wBAAsB,eAAe,CAAC,EACpC,iBAAiB,EACjB,MAAwC,GACzC,EAAE;IACD,iBAAiB,EAAE,UAAU,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,mBAMA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/client/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,SAAS,EAET,WAAW,EACX,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AAGzB,wBAAsB,UAAU,CAAC,EAC/B,OAAO,EACP,MAAuB,GACxB,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,mBAIA;AAED,wBAAsB,uBAAuB,CAAC,EAC5C,mBAAmB,EACnB,MAAM,EACN,EAAE,EACF,MAAwC,GACzC,EAAE;IACD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;;;GAwBA;AAED,eAAO,MAAM,yBAAyB,iDAInC;IACD,WAAW,EAAE,WAAW,GAAG,oBAAoB,CAAC;IAChD,SAAS,EAAE,UAAU,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;CAC5B,KAAG,oBAAoB,GAAG,WAG1B,CAAC;AAEF,wBAAgB,eAAe,CAAC,EAC9B,WAAW,EACX,eAAe,EACf,aAAa,GACd,EAAE;IACD,WAAW,EAAE,WAAW,GAAG,oBAAoB,CAAC;IAChD,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,oBAAoB,GAAG,WAAW,CAQrC;AAED,wBAAsB,eAAe,CAAC,EACpC,iBAAiB,EACjB,MAAwC,GACzC,EAAE;IACD,iBAAiB,EAAE,UAAU,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,mBAMA"}