@kynesyslabs/demosdk 1.0.21 → 1.0.22

package/build/encryption/Cryptography.d.ts

@@ -1,5 +1,22 @@
 import forge from "node-forge";
-export default class Cryptography {
+export declare class Cryptography {
+    static new(): {
+        publicKey: forge.pki.ed25519.NativeBuffer;
+        privateKey: forge.pki.ed25519.NativeBuffer;
+    };
+    static newFromSeed(stringSeed: string): {
+        publicKey: forge.pki.ed25519.NativeBuffer;
+        privateKey: forge.pki.ed25519.NativeBuffer;
+    };
+    static save(keypair: forge.pki.KeyPair, path: string, mode?: string): Promise<void>;
+    static saveToHex(forgeBuffer: forge.pki.PrivateKey): string;
+    static saveEncrypted(keypair: forge.pki.KeyPair, path: string, password: string): Promise<void>;
+    static loadEncrypted(path: string, password: string): Promise<forge.pki.KeyPair>;
+    static load(path: string, isFile?: boolean): Promise<forge.pki.KeyPair>;
+    static loadFromHex(content: string): forge.pki.KeyPair;
+    static loadFromBufferString(content: string): forge.pki.KeyPair;
+    static sign(message: string, privateKey: forge.pki.ed25519.BinaryBuffer | any): forge.pki.ed25519.NativeBuffer;
+    static verify(signed: string, signature: any | forge.pki.ed25519.BinaryBuffer, publicKey: any | forge.pki.ed25519.BinaryBuffer): boolean;
     static ed25519: {
         sign: (message: string, privateKey: forge.pki.ed25519.BinaryBuffer | any) => forge.pki.ed25519.NativeBuffer;
         verify: (signed: string, signature: any | forge.pki.ed25519.BinaryBuffer, publicKey: any | forge.pki.ed25519.BinaryBuffer) => boolean;

package/build/encryption/Cryptography.js

@@ -9,15 +9,197 @@ Human readable license: https://creativecommons.org/licenses/by-nc-nd/4.0/
 KyneSys Labs: https://www.kynesys.xyz/
 
 */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Cryptography = void 0;
+const crypto = __importStar(require("crypto"));
+const fs_1 = require("fs");
 const node_forge_1 = __importDefault(require("node-forge"));
 const dataManipulation_1 = require("../utils/dataManipulation");
 const algorithm = "aes-256-cbc";
 class Cryptography {
+    static new() {
+        const seed = node_forge_1.default.random.getBytesSync(32);
+        const keys = node_forge_1.default.pki.ed25519.generateKeyPair({ seed });
+        console.log("Generated new keypair");
+        return keys;
+    }
+    // INFO Method to generate a new key pair from a seed
+    static newFromSeed(stringSeed) {
+        return node_forge_1.default.pki.ed25519.generateKeyPair({ seed: stringSeed });
+    }
+    // TODO Eliminate the old legacy compatibility
+    static async save(keypair, path, mode = "hex") {
+        console.log(keypair.privateKey);
+        if (mode === "hex") {
+            let hexPrivKey = Cryptography.saveToHex(keypair.privateKey);
+            await fs_1.promises.writeFile(path, hexPrivKey);
+        }
+        else {
+            await fs_1.promises.writeFile(path, JSON.stringify(keypair.privateKey));
+        }
+    }
+    static saveToHex(forgeBuffer) {
+        console.log("[forge to string encoded]");
+        //console.log(forgeBuffer) // REVIEW if it is like this
+        let stringBuffer = forgeBuffer.toString("hex");
+        console.log("DECODED INTO:");
+        console.log("0x" + stringBuffer);
+        return "0x" + stringBuffer;
+    }
+    // SECTION Encrypted save and load
+    static async saveEncrypted(keypair, path, password) {
+        const key = crypto.createCipher(algorithm, password);
+        // Getting the private key in hex form
+        const hex_key = keypair.privateKey.toString("hex");
+        // Encrypting and saving
+        const encryptedMessage = key.update(hex_key, "utf8", "hex");
+        await fs_1.promises.writeFile(path, encryptedMessage);
+    }
+    static async loadEncrypted(path, password) {
+        let keypair = {
+            privateKey: null,
+            publicKey: null,
+        };
+        // Preparing the environment
+        const decipher = crypto.createDecipher(algorithm, password);
+        const contentOfFile = await fs_1.promises.readFile(path, "utf8");
+        // Decrypting
+        const decryptedKey = decipher.update(contentOfFile, "hex", "utf8");
+        // Loading
+        if (decryptedKey.includes("{")) {
+            keypair = Cryptography.loadFromBufferString(contentOfFile);
+        }
+        else {
+            keypair = Cryptography.loadFromHex(contentOfFile);
+        }
+        return keypair;
+    }
+    // !SECTION Encrypted save and load
+    // NOTE Accepts both file paths and strings being either hex or buffer strings
+    static async load(path, isFile = true) {
+        let keypair = {
+            privateKey: null,
+            publicKey: null,
+        };
+        let content;
+        if (isFile) {
+            content = await fs_1.promises.readFile(path, "utf8");
+        }
+        else {
+            content = path;
+        }
+        if (content.includes("{")) {
+            keypair = Cryptography.loadFromBufferString(content);
+        }
+        else {
+            keypair = Cryptography.loadFromHex(content);
+        }
+        return keypair;
+    }
+    static loadFromHex(content) {
+        let keypair = { publicKey: null, privateKey: null };
+        content = content.slice(2);
+        let finalArray = new Uint8Array(64);
+        console.log("[string to forge encoded]");
+        console.log(content);
+        for (let i = 0; i < content.length; i += 2) {
+            const hexValue = content.substr(i, 2);
+            const decimalValue = parseInt(hexValue, 16);
+            finalArray[i / 2] = decimalValue;
+        }
+        console.log("ENCODED INTO:");
+        //console.log(finalArray)
+        // Condensing
+        console.log("That means:");
+        keypair.privateKey = Buffer.from(finalArray);
+        console.log(keypair.privateKey);
+        console.log("And the public key is:");
+        keypair.publicKey = node_forge_1.default.pki.ed25519.publicKeyFromPrivateKey({
+            privateKey: keypair.privateKey,
+        });
+        console.log(keypair.publicKey);
+        return keypair;
+    }
+    static loadFromBufferString(content) {
+        let keypair = { publicKey: null, privateKey: null };
+        keypair.privateKey = Buffer.from(JSON.parse(content));
+        keypair.publicKey = node_forge_1.default.pki.ed25519.publicKeyFromPrivateKey({
+            privateKey: keypair.privateKey,
+        });
+        return keypair;
+    }
+    static sign(message, privateKey) {
+        // REVIEW Test HexToForge support
+        if (privateKey.type == "string") {
+            console.log("[HexToForge] Deriving a buffer from privateKey...");
+            privateKey = (0, dataManipulation_1.HexToForge)(privateKey);
+        }
+        return node_forge_1.default.pki.ed25519.sign({
+            message,
+            encoding: "utf8",
+            privateKey,
+        });
+    }
+    static verify(signed, signature, publicKey) {
+        // REVIEW Test HexToForge support
+        if (signature.type == "string") {
+            console.log("[HexToForge] Deriving a buffer from signature...");
+            signature = (0, dataManipulation_1.HexToForge)(signature);
+        }
+        if (publicKey.type == "string") {
+            console.log("[HexToForge] Deriving a buffer from publicKey...");
+            publicKey = (0, dataManipulation_1.HexToForge)(publicKey);
+        }
+        // Also, we have to sanitize buffers so that they are forge compatible
+        if (signature.type == "Buffer") {
+            console.log("[*] Normalizing signature...");
+            console.log(typeof signature);
+            signature = Buffer.from(signature); // REVIEW Does not work in bun
+        }
+        if (publicKey.type == "Buffer") {
+            console.log("[*] Normalizing publicKey...");
+            publicKey = Buffer.from(publicKey); // REVIEW Does not work in bun
+        }
+        console.log("[*] Verifying the signature of: " + signed + "\n");
+        console.log("[*] Using the signature: ");
+        console.log(signature);
+        console.log("[*] And the public key: ");
+        console.log(publicKey);
+        return node_forge_1.default.pki.ed25519.verify({
+            message: signed,
+            encoding: "utf8",
+            signature: signature,
+            publicKey: publicKey,
+        });
+    }
 }
+exports.Cryptography = Cryptography;
 Cryptography.ed25519 = {
     sign: (message, privateKey) => {
         // REVIEW Test HexToForge support
@@ -101,5 +283,4 @@ Cryptography.rsa = {
         return [true, decrypted.toString()];
     },
 };
-exports.default = Cryptography;
 //# sourceMappingURL=Cryptography.js.map

package/build/encryption/Cryptography.js.map

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

package/build/encryption/Hashing.d.ts

@@ -1,3 +1,3 @@
-export default class Hashing {
+export declare class Hashing {
     static sha256(message: string): string;
 }

package/build/encryption/Hashing.js

@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Hashing = void 0;
 const node_forge_1 = __importDefault(require("node-forge"));
 class Hashing {
     static sha256(message) {
@@ -21,5 +22,5 @@ class Hashing {
         return md.digest().toHex();
     }
 }
-exports.default = Hashing;
+exports.Hashing = Hashing;
 //# sourceMappingURL=Hashing.js.map

package/build/encryption/Hashing.js.map

@@ -1 +1 @@
-{"version":3,"file":"Hashing.js","sourceRoot":"","sources":["../../../src/encryption/Hashing.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;AAEF,4DAA8B;AAE9B,MAAqB,OAAO;IACxB,MAAM,CAAC,MAAM,CAAC,OAAe;QACzB,MAAM,EAAE,GAAG,oBAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;QAChC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAClB,OAAO,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IAC9B,CAAC;CACJ;AAND,0BAMC"}
+{"version":3,"file":"Hashing.js","sourceRoot":"","sources":["../../../src/encryption/Hashing.ts"],"names":[],"mappings":";AAAA;;;;;;;;;EASE;;;;;;AAEF,4DAA8B;AAE9B,MAAa,OAAO;IAChB,MAAM,CAAC,MAAM,CAAC,OAAe;QACzB,MAAM,EAAE,GAAG,oBAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;QAChC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAClB,OAAO,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAA;IAC9B,CAAC;CACJ;AAND,0BAMC"}

package/build/encryption/index.d.ts

@@ -1,5 +1,5 @@
 export * as FHE from './FHE';
 export * as PQC from './PQC';
 export * as zK from './zK';
-export * as Cryptography from './Cryptography';
-export * as Hashing from './Hashing';
+export { Cryptography } from './Cryptography';
+export { Hashing } from './Hashing';

package/build/encryption/index.js

@@ -27,6 +27,8 @@ exports.Hashing = exports.Cryptography = exports.zK = exports.PQC = exports.FHE
 exports.FHE = __importStar(require("./FHE"));
 exports.PQC = __importStar(require("./PQC"));
 exports.zK = __importStar(require("./zK"));
-exports.Cryptography = __importStar(require("./Cryptography"));
-exports.Hashing = __importStar(require("./Hashing"));
+var Cryptography_1 = require("./Cryptography");
+Object.defineProperty(exports, "Cryptography", { enumerable: true, get: function () { return Cryptography_1.Cryptography; } });
+var Hashing_1 = require("./Hashing");
+Object.defineProperty(exports, "Hashing", { enumerable: true, get: function () { return Hashing_1.Hashing; } });
 //# sourceMappingURL=index.js.map

package/build/encryption/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/encryption/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA4B;AAC5B,6CAA4B;AAC5B,2CAA0B;AAC1B,+DAA8C;AAC9C,qDAAoC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/encryption/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA4B;AAC5B,6CAA4B;AAC5B,2CAA0B;AAC1B,+CAA6C;AAApC,4GAAA,YAAY,OAAA;AACrB,qCAAmC;AAA1B,kGAAA,OAAO,OAAA"}

package/build/index.d.ts

@@ -3,3 +3,4 @@ export * as encryption from './encryption';
 export * as utils from './utils';
 export * as xmlocalsdk from './multichain/localsdk';
 export * as xmwebsdk from './multichain/websdk';
+export * as wallet from './wallet';

package/build/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.xmwebsdk = exports.xmlocalsdk = exports.utils = exports.encryption = exports.types = void 0;
+exports.wallet = exports.xmwebsdk = exports.xmlocalsdk = exports.utils = exports.encryption = exports.types = void 0;
 // Common types and constants
 exports.types = __importStar(require("./types"));
 // Basic cryptographic and data manipulation functions
@@ -32,4 +32,5 @@ exports.utils = __importStar(require("./utils"));
 //  Specific features of the SDK
 exports.xmlocalsdk = __importStar(require("./multichain/localsdk"));
 exports.xmwebsdk = __importStar(require("./multichain/websdk"));
+exports.wallet = __importStar(require("./wallet"));
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA6B;AAC7B,iDAAgC;AAChC,sDAAsD;AACtD,2DAA0C;AAC1C,iDAAgC;AAChC,gCAAgC;AAChC,oEAAmD;AACnD,gEAA+C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA6B;AAC7B,iDAAgC;AAChC,sDAAsD;AACtD,2DAA0C;AAC1C,iDAAgC;AAChC,gCAAgC;AAChC,oEAAmD;AACnD,gEAA+C;AAC/C,mDAAkC"}

package/build/multichain/core/solana.d.ts

@@ -1,47 +1,34 @@
-import { Keypair, Connection, Transaction, NonceAccount } from "@solana/web3.js";
+import { Keypair, Connection, VersionedTransaction } from "@solana/web3.js";
 import { IPayOptions } from "./types/interfaces";
-import { DefaultChain, SolanaDefaultChain } from "./types/defaultChain";
+import { DefaultChain } from "./types/defaultChain";
 interface SignTxOptions {
     /**
      * The private key to sign the transaction with, instead of the connected wallet.
      */
     privateKey?: string;
-    /**
-     * The address of your nonce account for signing with durable nonces.
-     */
-    nonceAccountAddress?: string;
-    /**
-     * The secret key of the nonce account authority, for signing the tx.
-     *
-     * Defaults to the connected wallet's secret key.
-     */
-    nonceAccountAuthority?: string;
 }
-export declare class SOLANA extends DefaultChain implements SolanaDefaultChain {
+export declare class SOLANA extends DefaultChain {
     private static instance;
     wallet: Keypair;
     provider: Connection;
     constructor(rpc_url: string);
     connect(): Promise<boolean>;
     disconnect(): Promise<boolean>;
-    connectWallet(privateKey: string, options?: {
-        /**
-         * If the private key is in base58 format
-         */
-        base58: boolean;
-    }): Promise<Keypair>;
+    createWallet(): Promise<{
+        address: string;
+        secretKey: string;
+        keypair: Keypair;
+    }>;
+    connectWallet(privateKey: string): Promise<Keypair>;
     getBalance(address: string): Promise<string>;
-    info(): Promise<string>;
-    signTransaction(tx: Transaction, options?: SignTxOptions): Promise<Transaction>;
-    readNonce(address: string): Promise<NonceAccount>;
-    createNonceAccount(): Promise<string>;
-    signTransactions(transactions: Transaction[], options?: SignTxOptions): Promise<Transaction[]>;
+    signTransaction(tx: VersionedTransaction, options?: SignTxOptions): Promise<Uint8Array>;
+    signTransactions(transactions: VersionedTransaction[], options?: SignTxOptions): Promise<Uint8Array[]>;
     getAddress(): string;
-    getEmptyTransaction(): Transaction;
-    preparePay(receiver: string, amount: string, options?: SignTxOptions): Promise<Transaction>;
-    preparePays(payments: IPayOptions[], options?: SignTxOptions): Promise<Transaction[]>;
-    prepareTransfer(receiver: string, amount: string, options: {}): Promise<Transaction>;
-    prepareTransfers(transfers: IPayOptions[], options: {}): Promise<Transaction[]>;
+    getEmptyTransaction(): VersionedTransaction;
+    preparePay(receiver: string, amount: string, options?: SignTxOptions): Promise<Uint8Array>;
+    preparePays(payments: IPayOptions[], options?: SignTxOptions): Promise<Uint8Array[]>;
+    prepareTransfer(receiver: string, amount: string, options?: SignTxOptions): Promise<Uint8Array>;
+    prepareTransfers(transfers: IPayOptions[], options?: SignTxOptions): Promise<Uint8Array[]>;
     static getInstance(): SOLANA | boolean;
     static createInstance(rpc_url: string): SOLANA;
 }

package/build/multichain/core/solana.js

@@ -14,7 +14,9 @@ class SOLANA extends defaultChain_1.DefaultChain {
         this.name = "solana";
     }
     async connect() {
-        this.provider = new web3_js_1.Connection(this.rpc_url);
+        this.provider = new web3_js_1.Connection(this.rpc_url, {
+            confirmTransactionInitialTimeout: 5000,
+        });
         const version = await this.provider.getVersion();
         this.connected = Number.isInteger(version["feature-set"]);
         return this.connected;
@@ -23,18 +25,18 @@ class SOLANA extends defaultChain_1.DefaultChain {
         this.resetInstance();
         return true;
     }
-    // async createWallet() {}
+    async createWallet() {
+        const keypair = web3_js_1.Keypair.generate();
+        return {
+            address: keypair.publicKey.toBase58(),
+            secretKey: bs58_1.default.encode(keypair.secretKey),
+            keypair: keypair,
+        };
+    }
     // ANCHOR Public methods
-    async connectWallet(privateKey, options) {
-        let privateKeyBuffer;
-        if (options && options.base58) {
-            privateKeyBuffer = bs58_1.default.decode(privateKey);
-        }
-        else {
-            const pk = privateKey.split(",").map(x => parseInt(x));
-            privateKeyBuffer = Buffer.from(pk);
-        }
-        this.wallet = web3_js_1.Keypair.fromSecretKey(privateKeyBuffer);
+    async connectWallet(privateKey) {
+        const pkBuffer = bs58_1.default.decode(privateKey);
+        this.wallet = web3_js_1.Keypair.fromSecretKey(pkBuffer);
         return this.wallet;
     }
     async getBalance(address) {
@@ -42,20 +44,6 @@ class SOLANA extends defaultChain_1.DefaultChain {
         const balance = await this.provider.getBalance(publicKey);
         return balance.toString();
     }
-    // async pay(to: string, amount: string): Promise<any> {
-    //     required(this.wallet, 'Wallet not connected')
-    //     // TODO
-    //     return null
-    // }
-    async info() {
-        let info = "";
-        // TODO
-        return info;
-    }
-    // INFO Returning an empty raw transaction skeleton
-    // async createRawTransaction(): Promise<Transaction> {
-    // }
-    // INFO Placeholder compatibility function that is here only for the interface
     async signTransaction(tx, options) {
         (0, utils_1.required)(this.wallet, "Wallet not connected");
         // LINK https://docs.shyft.to/tutorials/how-to-sign-transactions-on-solana
@@ -64,110 +52,54 @@ class SOLANA extends defaultChain_1.DefaultChain {
         const txs = await this.signTransactions([tx], options);
         return txs[0];
     }
-    async readNonce(address) {
-        console.log("reading nonce account: ", address);
-        const pubkey = new web3_js_1.PublicKey(address);
-        const accountInfo = await this.provider.getAccountInfo(pubkey);
-        console.log("accountInfo: ", accountInfo);
-        if (accountInfo) {
-            return web3_js_1.NonceAccount.fromAccountData(accountInfo?.data);
-        }
-        return null;
-    }
-    async createNonceAccount() {
-        (0, utils_1.required)(this.wallet, "Wallet not connected");
-        let tx = new web3_js_1.Transaction();
-        const nonceAccount = web3_js_1.Keypair.generate();
-        const create_acc_ix = web3_js_1.SystemProgram.createAccount({
-            fromPubkey: this.wallet.publicKey,
-            newAccountPubkey: nonceAccount.publicKey,
-            lamports: await this.provider.getMinimumBalanceForRentExemption(web3_js_1.NONCE_ACCOUNT_LENGTH),
-            space: web3_js_1.NONCE_ACCOUNT_LENGTH,
-            programId: web3_js_1.SystemProgram.programId,
-        });
-        const init_nonce_ix = web3_js_1.SystemProgram.nonceInitialize({
-            noncePubkey: nonceAccount.publicKey,
-            authorizedPubkey: this.wallet.publicKey,
-        });
-        tx.add(create_acc_ix, init_nonce_ix);
-        const txhash = this.provider.sendTransaction(tx, [
-            this.wallet,
-            nonceAccount,
-        ]);
-        console.log("txhash: ", txhash);
-        return nonceAccount.publicKey.toBase58();
-    }
     async signTransactions(transactions, options) {
-        (0, utils_1.required)(this.wallet, "Wallet not connected");
-        let nonceAccount = null;
-        let advanceNonceIx = null;
-        let nonceAuthority = this.wallet;
-        const nonceAccAvailable = options && options.nonceAccountAddress ? true : false;
-        // if we have the nonce authority, overwrite.
-        if (nonceAccAvailable && options.nonceAccountAuthority) {
-            nonceAuthority = web3_js_1.Keypair.fromSecretKey(bs58_1.default.decode(options.nonceAccountAuthority));
-        }
-        // if we have the nonce address, create a nonce advance instruction
-        if (nonceAccAvailable) {
-            advanceNonceIx = web3_js_1.SystemProgram.nonceAdvance({
-                authorizedPubkey: nonceAuthority.publicKey,
-                noncePubkey: new web3_js_1.PublicKey(options.nonceAccountAddress),
-            });
-            nonceAccount = await this.readNonce(options.nonceAccountAddress);
-        }
-        // if advance instruction is not null
-        // ie. we have the nonce address,
-        // insert the advance nonce ix at instructions index 0
-        // on each transaction
-        if (advanceNonceIx && nonceAccount) {
-            transactions.forEach(tx => {
-                tx.instructions.splice(0, 0, advanceNonceIx);
-                // update recent block hash to use the current nonce
-                tx.recentBlockhash = nonceAccount.nonce;
-                nonceAccount?.nonce;
-                // TODO: FIND OUT WHAT HAPPENS WHEN MULTIPLE TX HAVE THE SAME DURABLE NONCE
-            });
+        (0, utils_1.required)(this.wallet || (options && options.privateKey), "Wallet not connected");
+        let signers = [this.wallet];
+        if (options && options.privateKey) {
+            const privateKeyBuffer = bs58_1.default.decode(options.privateKey);
+            const keypair = web3_js_1.Keypair.fromSecretKey(privateKeyBuffer);
+            signers = [keypair];
         }
-        const signers = new Set([this.wallet, nonceAuthority]);
-        console.log("signers length: ", signers.size);
-        console.log("signers: ", signers);
-        transactions.forEach(async (tx) => {
-            tx.sign(...signers);
+        return transactions.map(tx => {
+            tx.sign(signers);
+            return tx.serialize();
         });
-        return transactions;
     }
     getAddress() {
         (0, utils_1.required)(this.wallet, "Wallet not connected");
         return this.wallet.publicKey.toBase58();
     }
     getEmptyTransaction() {
-        // const recentBlockhash = await this.provider.getLatestBlockhash()
-        const options = {
-            feePayer: this.wallet.publicKey,
-        };
-        let empty_tx = new web3_js_1.Transaction(options);
-        // empty_tx.recentBlockhash = recentBlockhash.blockhash
-        // empty_tx.lastValidBlockHeight = recentBlockhash.lastValidBlockHeight
-        return empty_tx;
+        const vmsg = new web3_js_1.TransactionMessage({
+            payerKey: this.wallet.publicKey,
+            recentBlockhash: "",
+            instructions: [],
+        }).compileToV0Message();
+        return new web3_js_1.VersionedTransaction(vmsg);
     }
     async preparePay(receiver, amount, options) {
         const tx = await this.preparePays([{ address: receiver, amount }], options);
         return tx[0];
     }
     async preparePays(payments, options) {
-        const recentBlockhash = await this.provider.getLatestBlockhash();
+        const blockInfo = await this.provider.getLatestBlockhash();
         const transactions = payments.map(payment => {
-            const tx = this.getEmptyTransaction();
-            tx.recentBlockhash = recentBlockhash.blockhash;
-            tx.lastValidBlockHeight = recentBlockhash.lastValidBlockHeight;
+            // create a transfer instruction
             const transferIx = web3_js_1.SystemProgram.transfer({
                 fromPubkey: this.wallet.publicKey,
                 toPubkey: new web3_js_1.PublicKey(payment.address),
                 lamports: parseFloat(payment.amount) * web3_js_1.LAMPORTS_PER_SOL,
             });
-            tx.add(transferIx);
-            return tx;
+            // compile the instruction into a message
+            const vmsg = new web3_js_1.TransactionMessage({
+                instructions: [transferIx],
+                payerKey: this.wallet.publicKey,
+                recentBlockhash: blockInfo.blockhash,
+            }).compileToV0Message();
+            // create a versioned transaction
+            return new web3_js_1.VersionedTransaction(vmsg);
         });
+        // sign the transactions
         return this.signTransactions(transactions, options);
     }
     async prepareTransfer(receiver, amount, options) {
@@ -176,24 +108,6 @@ class SOLANA extends defaultChain_1.DefaultChain {
     async prepareTransfers(transfers, options) {
         return await this.preparePays(transfers, options);
     }
-    // TODO: move sendTransaction to localsdk
-    // INFO Sending a transfer transaction on Solana network
-    // sendTransaction({ to, amount }) {
-    //     required(this.wallet, 'Wallet not connected')
-    //     let tx = new Transaction()
-    //     tx.add(
-    //         SystemProgram.transfer({
-    //             fromPubkey: this.wallet.publicKey,
-    //             toPubkey: to,
-    //             lamports: amount * LAMPORTS_PER_SOL,
-    //         })
-    //     )
-    //     let result = sendAndConfirmTransaction(this.provider, tx, [
-    //         this.wallet,
-    //     ])
-    //     return result
-    // }
-    // ANCHOR Static singleton methods
     static getInstance() {
         if (!SOLANA.instance) {
             return false;