@cityofzion/bs-solana 3.0.1 → 3.0.2

package/dist/BSSolana.d.ts

@@ -1,4 +1,4 @@
-import { TBSAccount, TGetLedgerTransport, IBlockchainDataService, IExchangeDataService, IExplorerService, INftDataService, ITokenService, TBSNetwork, TBSToken, TTransferParam, TPingNetworkResponse } from '@cityofzion/blockchain-service';
+import { TBSAccount, TGetLedgerTransport, IBlockchainDataService, IExchangeDataService, IExplorerService, INftDataService, ITokenService, TBSNetwork, TBSToken, TTransferParam, TPingNetworkResponse, type IWalletConnectService } from '@cityofzion/blockchain-service';
 import solanaSDK from '@solana/web3.js';
 import { Web3LedgerServiceSolana } from './services/ledger/Web3LedgerServiceSolana';
 import { IBSSolana, TBSSolanaNetworkId } from './types';
@@ -21,8 +21,10 @@ export declare class BSSolana<N extends string = string> implements IBSSolana<N>
     nftDataService: INftDataService;
     explorerService: IExplorerService;
     tokenService: ITokenService;
+    walletConnectService: IWalletConnectService<N>;
     connection: solanaSDK.Connection;
     constructor(name: N, network?: TBSNetwork<TBSSolanaNetworkId>, getLedgerTransport?: TGetLedgerTransport<N>);
+    generateKeyPairFromKey(key: string): solanaSDK.Keypair;
     setNetwork(network: TBSNetwork<TBSSolanaNetworkId>): void;
     pingNode(url: string): Promise<TPingNetworkResponse>;
     validateAddress(address: string): boolean;

package/dist/BSSolana.js

@@ -49,7 +49,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _BSSolana_instances, _BSSolana_generateKeyPairFromKey, _BSSolana_signTransaction, _BSSolana_buildTransferParams;
+var _BSSolana_instances, _BSSolana_signTransaction, _BSSolana_buildTransferParams;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSSolana = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -65,6 +65,7 @@ const SolScanESSolana_1 = require("./services/explorer/SolScanESSolana");
 const MoralisEDSSolana_1 = require("./services/exchange/MoralisEDSSolana");
 const TokenServiceSolana_1 = require("./services/token/TokenServiceSolana");
 const axios_1 = __importDefault(require("axios"));
+const WalletConnectServiceSolana_1 = require("./services/wallet-connect/WalletConnectServiceSolana");
 const KEY_BYTES_LENGTH = 64;
 class BSSolana {
     constructor(name, network, getLedgerTransport) {
@@ -81,6 +82,16 @@ class BSSolana {
         this.defaultNetwork = BSSolanaConstants_1.BSSolanaConstants.MAINNET_NETWORK;
         this.setNetwork(network !== null && network !== void 0 ? network : this.defaultNetwork);
     }
+    generateKeyPairFromKey(key) {
+        let keyBuffer;
+        try {
+            keyBuffer = bs58_1.default.decode(key);
+        }
+        catch (_a) {
+            keyBuffer = Uint8Array.from(key.split(',').map(Number));
+        }
+        return web3_js_1.default.Keypair.fromSecretKey(keyBuffer);
+    }
     setNetwork(network) {
         const rpcNetworkUrls = BSSolanaConstants_1.BSSolanaConstants.RPC_LIST_BY_NETWORK_ID[network.id] || [];
         const isValidNetwork = blockchain_service_1.BSUtilsHelper.validateNetwork(network, this.availableNetworks, rpcNetworkUrls);
@@ -94,6 +105,7 @@ class BSSolana {
         this.nftDataService = new RpcNDSSolana_1.RpcNDSSolana(this);
         this.explorerService = new SolScanESSolana_1.SolScanESSolana(this);
         this.exchangeDataService = new MoralisEDSSolana_1.MoralisEDSSolana(this);
+        this.walletConnectService = new WalletConnectServiceSolana_1.WalletConnectServiceSolana(this);
         this.connection = new web3_js_1.default.Connection(this.network.url);
     }
     // This method is done manually because we need to ensure that the request is aborted after timeout
@@ -151,7 +163,7 @@ class BSSolana {
         };
     }
     generateAccountFromKey(key) {
-        const keypair = __classPrivateFieldGet(this, _BSSolana_instances, "m", _BSSolana_generateKeyPairFromKey).call(this, key);
+        const keypair = this.generateKeyPairFromKey(key);
         const address = keypair.publicKey.toBase58();
         const base58Key = bs58_1.default.encode(keypair.secretKey);
         return {
@@ -203,16 +215,7 @@ class BSSolana {
     }
 }
 exports.BSSolana = BSSolana;
-_BSSolana_instances = new WeakSet(), _BSSolana_generateKeyPairFromKey = function _BSSolana_generateKeyPairFromKey(key) {
-    let keyBuffer;
-    try {
-        keyBuffer = bs58_1.default.decode(key);
-    }
-    catch (_a) {
-        keyBuffer = Uint8Array.from(key.split(',').map(Number));
-    }
-    return web3_js_1.default.Keypair.fromSecretKey(keyBuffer);
-}, _BSSolana_signTransaction = function _BSSolana_signTransaction(transaction, senderAccount) {
+_BSSolana_instances = new WeakSet(), _BSSolana_signTransaction = function _BSSolana_signTransaction(transaction, senderAccount) {
     return __awaiter(this, void 0, void 0, function* () {
         if (senderAccount.isHardware) {
             if (!this.ledgerService.getLedgerTransport)
@@ -222,7 +225,7 @@ _BSSolana_instances = new WeakSet(), _BSSolana_generateKeyPairFromKey = function
             const transport = yield this.ledgerService.getLedgerTransport(senderAccount);
             return yield this.ledgerService.signTransaction(transport, transaction, senderAccount);
         }
-        transaction.sign(__classPrivateFieldGet(this, _BSSolana_instances, "m", _BSSolana_generateKeyPairFromKey).call(this, senderAccount.key));
+        transaction.sign(this.generateKeyPairFromKey(senderAccount.key));
         return transaction.serialize();
     });
 }, _BSSolana_buildTransferParams = function _BSSolana_buildTransferParams(param) {

package/dist/services/wallet-connect/WalletConnectServiceSolana.d.ts

@@ -0,0 +1,33 @@
+import { type IWalletConnectService, type TWalletConnectServiceRequestMethodParams } from '@cityofzion/blockchain-service';
+import type { IBSSolana, TBSSolanaNetworkId } from '../../types';
+export declare class WalletConnectServiceSolana<N extends string> implements IWalletConnectService<N> {
+    #private;
+    static networkIdByNetworkType: Record<TBSSolanaNetworkId, string>;
+    readonly namespace = "solana";
+    readonly chain: string;
+    readonly supportedMethods: string[];
+    readonly supportedEvents: string[];
+    readonly calculableMethods: string[];
+    readonly autoApproveMethods: string[];
+    constructor(service: IBSSolana<N>);
+    [methodName: string]: any;
+    solana_getAccounts(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+        pubkey: string;
+    }[]>;
+    solana_requestAccounts(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+        pubkey: string;
+    }[]>;
+    solana_signMessage(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+        signature: string;
+    }>;
+    solana_signTransaction(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+        transaction: string;
+    }>;
+    solana_signAllTransactions(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+        transactions: any;
+    }>;
+    solana_signAndSendTransaction(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+        signature: string;
+    }>;
+    calculateRequestFee(args: TWalletConnectServiceRequestMethodParams<N>): Promise<string>;
+}

package/dist/services/wallet-connect/WalletConnectServiceSolana.js

@@ -0,0 +1,167 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var _WalletConnectServiceSolana_instances, _WalletConnectServiceSolana_service, _WalletConnectServiceSolana_parseTransaction, _WalletConnectServiceSolana_signTransaction;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WalletConnectServiceSolana = void 0;
+const blockchain_service_1 = require("@cityofzion/blockchain-service");
+const crypto_1 = require("crypto");
+const web3_js_1 = require("@solana/web3.js");
+const bs58_1 = __importDefault(require("bs58"));
+class WalletConnectServiceSolana {
+    constructor(service) {
+        _WalletConnectServiceSolana_instances.add(this);
+        this.namespace = 'solana';
+        this.supportedMethods = [];
+        this.supportedEvents = [];
+        this.calculableMethods = [];
+        this.autoApproveMethods = [];
+        _WalletConnectServiceSolana_service.set(this, void 0);
+        __classPrivateFieldSet(this, _WalletConnectServiceSolana_service, service, "f");
+        const networkId = WalletConnectServiceSolana.networkIdByNetworkType[__classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").network.type];
+        this.chain = `${this.namespace}:${networkId}`;
+    }
+    solana_getAccounts(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const keypair = __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").generateKeyPairFromKey(args.account.key);
+            return [{ pubkey: keypair.publicKey.toBase58() }];
+        });
+    }
+    solana_requestAccounts(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.solana_getAccounts(args);
+        });
+    }
+    solana_signMessage(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (typeof args.params.message !== 'string' || typeof args.params.pubKey !== 'string') {
+                throw new Error('Invalid params');
+            }
+            if (args.params.pubKey !== args.account.address) {
+                throw new Error('Public key does not match account address');
+            }
+            const messageBytes = bs58_1.default.decode(args.params.message);
+            const keypair = __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").generateKeyPairFromKey(args.account.key);
+            const seed = keypair.secretKey.slice(0, 32);
+            const privateKey = (0, crypto_1.createPrivateKey)({
+                key: Buffer.concat([Buffer.from('302e020100300506032b657004220420', 'hex'), seed]),
+                format: 'der',
+                type: 'pkcs8',
+            });
+            const signature = (0, crypto_1.sign)(null, messageBytes, privateKey);
+            return { signature: bs58_1.default.encode(signature) };
+        });
+    }
+    solana_signTransaction(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (typeof args.params.transaction !== 'string') {
+                throw new Error('Invalid params');
+            }
+            const transaction = __classPrivateFieldGet(this, _WalletConnectServiceSolana_instances, "m", _WalletConnectServiceSolana_signTransaction).call(this, args.params.transaction, args.account);
+            return { transaction: transaction.serialize().toString('base64') };
+        });
+    }
+    solana_signAllTransactions(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(args.params.transactions)) {
+                throw new Error('Invalid params');
+            }
+            const signedTransactions = args.params.transactions.map((transaction) => __classPrivateFieldGet(this, _WalletConnectServiceSolana_instances, "m", _WalletConnectServiceSolana_signTransaction).call(this, transaction, args.account).serialize().toString('base64'));
+            return {
+                transactions: signedTransactions,
+            };
+        });
+    }
+    solana_signAndSendTransaction(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            if (typeof args.params.transaction !== 'string') {
+                throw new Error('Invalid params');
+            }
+            const options = (_a = args.params.sendOptions) !== null && _a !== void 0 ? _a : {};
+            const signedTransaction = __classPrivateFieldGet(this, _WalletConnectServiceSolana_instances, "m", _WalletConnectServiceSolana_signTransaction).call(this, args.params.transaction, args.account);
+            const signature = yield __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").connection.sendRawTransaction(signedTransaction.serialize(), {
+                maxRetries: options.maxRetries,
+                preflightCommitment: options.preflightCommitment,
+                minContextSlot: options.minContextSlot,
+                skipPreflight: options.skipPreflight,
+            });
+            return { signature };
+        });
+    }
+    calculateRequestFee(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (typeof args.params.transaction !== 'string') {
+                throw new Error('Invalid params');
+            }
+            const transaction = __classPrivateFieldGet(this, _WalletConnectServiceSolana_instances, "m", _WalletConnectServiceSolana_parseTransaction).call(this, args.params.transaction);
+            let message;
+            if (transaction instanceof web3_js_1.Transaction) {
+                const { blockhash } = yield __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").connection.getLatestBlockhash();
+                transaction.recentBlockhash = blockhash;
+                message = transaction.compileMessage();
+            }
+            else {
+                message = transaction.message;
+            }
+            const fee = yield __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").connection.getFeeForMessage(message);
+            if (!fee.value) {
+                throw new Error('Failed to calculate fee');
+            }
+            const feeBn = blockchain_service_1.BSBigNumberHelper.fromDecimals(fee.value, __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").feeToken.decimals);
+            return blockchain_service_1.BSBigNumberHelper.toNumber(feeBn).toString();
+        });
+    }
+}
+exports.WalletConnectServiceSolana = WalletConnectServiceSolana;
+_WalletConnectServiceSolana_service = new WeakMap(), _WalletConnectServiceSolana_instances = new WeakSet(), _WalletConnectServiceSolana_parseTransaction = function _WalletConnectServiceSolana_parseTransaction(encodedTransaction) {
+    const buffer = Buffer.from(encodedTransaction, 'base64');
+    let transaction;
+    // Versioned tx starts with version byte >= 0x80
+    if (buffer[0] & 0x80) {
+        transaction = web3_js_1.VersionedTransaction.deserialize(buffer);
+    }
+    else {
+        transaction = web3_js_1.Transaction.from(buffer);
+    }
+    return transaction;
+}, _WalletConnectServiceSolana_signTransaction = function _WalletConnectServiceSolana_signTransaction(encodedTransaction, account) {
+    const transaction = __classPrivateFieldGet(this, _WalletConnectServiceSolana_instances, "m", _WalletConnectServiceSolana_parseTransaction).call(this, encodedTransaction);
+    const keypair = __classPrivateFieldGet(this, _WalletConnectServiceSolana_service, "f").generateKeyPairFromKey(account.key);
+    // Versioned tx starts with version byte >= 0x80
+    if (transaction instanceof web3_js_1.VersionedTransaction) {
+        transaction.sign([keypair]);
+    }
+    else {
+        if (transaction.feePayer && transaction.feePayer.toBase58() !== keypair.publicKey.toBase58()) {
+            throw new Error('Fee payer does not match account address');
+        }
+        transaction.partialSign(keypair);
+    }
+    return transaction;
+};
+WalletConnectServiceSolana.networkIdByNetworkType = {
+    'mainnet-beta': '5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp',
+    devnet: 'EtWTRABZaYq6iMfeYKouRu166VU2xqa1',
+};

package/dist/types.d.ts

@@ -1,8 +1,9 @@
-import type { IBlockchainService, IBSWithExplorer, IBSWithFee, IBSWithLedger, IBSWithNameService, IBSWithNft, TBSNetworkId } from '@cityofzion/blockchain-service';
+import type { IBlockchainService, IBSWithExplorer, IBSWithFee, IBSWithLedger, IBSWithNameService, IBSWithNft, IBSWithWalletConnect, TBSNetworkId } from '@cityofzion/blockchain-service';
 import type solanaSDK from '@solana/web3.js';
 export type TBSSolanaNetworkId = TBSNetworkId<'mainnet-beta' | 'devnet'>;
-export interface IBSSolana<N extends string = string> extends IBlockchainService<N, TBSSolanaNetworkId>, IBSWithFee<N>, IBSWithNameService, IBSWithLedger<N>, IBSWithNft, IBSWithExplorer {
+export interface IBSSolana<N extends string = string> extends IBlockchainService<N, TBSSolanaNetworkId>, IBSWithFee<N>, IBSWithNameService, IBSWithLedger<N>, IBSWithNft, IBSWithExplorer, IBSWithWalletConnect<N> {
     connection: solanaSDK.Connection;
+    generateKeyPairFromKey(key: string): solanaSDK.Keypair;
 }
 export type TMetaplexAssetByOwnerResponse = {
     jsonrpc: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-solana",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -21,7 +21,7 @@
     "@ledgerhq/hw-transport": "~6.32.0",
     "@metaplex-foundation/js": "~0.20.1",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "3.0.1"
+    "@cityofzion/blockchain-service": "3.0.2"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "~6.30.0",