@solana/wallet-adapter-base - npm Package Compare versions

Comparing version 0.5.0 to 0.5.1

lib/adapter.js

@@ -1,6 +0,13 @@
-import EventEmitter from 'eventemitter3';
-export { EventEmitter };
-export class BaseWalletAdapter extends EventEmitter {
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WalletAdapterNetwork = exports.BaseWalletAdapter = exports.EventEmitter = void 0;
+const eventemitter3_1 = __importDefault(require("eventemitter3"));
+exports.EventEmitter = eventemitter3_1.default;
+class BaseWalletAdapter extends eventemitter3_1.default {
 }
-export var WalletAdapterNetwork;
+exports.BaseWalletAdapter = BaseWalletAdapter;
+var WalletAdapterNetwork;
 (function (WalletAdapterNetwork) {
@@ -10,3 +17,3 @@ WalletAdapterNetwork["Mainnet"] = "mainnet-beta";
     WalletAdapterNetwork["Devnet"] = "devnet";
-})(WalletAdapterNetwork || (WalletAdapterNetwork = {}));
+})(WalletAdapterNetwork = exports.WalletAdapterNetwork || (exports.WalletAdapterNetwork = {}));
 //# sourceMappingURL=adapter.js.map

lib/errors.d.ts

@@ -38,2 +38,5 @@ export declare class WalletError extends Error {
 }
+export declare class WalletSignMessageError extends WalletError {
+    name: string;
+}
 export declare class WalletSignTransactionError extends WalletError {
@@ -40,0 +43,0 @@ name: string;

lib/errors.js

@@ -1,2 +0,5 @@
-export class WalletError extends Error {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WalletWindowClosedError = exports.WalletWindowBlockedError = exports.WalletSignTransactionError = exports.WalletSignMessageError = exports.WalletSendTransactionError = exports.WalletNotConnectedError = exports.WalletKeypairError = exports.WalletPublicKeyError = exports.WalletAccountError = exports.WalletDisconnectionError = exports.WalletDisconnectedError = exports.WalletConnectionError = exports.WalletNotReadyError = exports.WalletNotInstalledError = exports.WalletNotFoundError = exports.WalletError = void 0;
+class WalletError extends Error {
     constructor(message, error) {
@@ -7,3 +10,4 @@ super(message);
 }
-export class WalletNotFoundError extends WalletError {
+exports.WalletError = WalletError;
+class WalletNotFoundError extends WalletError {
     constructor() {
@@ -14,3 +18,4 @@ super(...arguments);
 }
-export class WalletNotInstalledError extends WalletError {
+exports.WalletNotFoundError = WalletNotFoundError;
+class WalletNotInstalledError extends WalletError {
     constructor() {
@@ -21,3 +26,4 @@ super(...arguments);
 }
-export class WalletNotReadyError extends WalletError {
+exports.WalletNotInstalledError = WalletNotInstalledError;
+class WalletNotReadyError extends WalletError {
     constructor() {
@@ -28,3 +34,4 @@ super(...arguments);
 }
-export class WalletConnectionError extends WalletError {
+exports.WalletNotReadyError = WalletNotReadyError;
+class WalletConnectionError extends WalletError {
     constructor() {
@@ -35,3 +42,4 @@ super(...arguments);
 }
-export class WalletDisconnectedError extends WalletError {
+exports.WalletConnectionError = WalletConnectionError;
+class WalletDisconnectedError extends WalletError {
     constructor() {
@@ -42,3 +50,4 @@ super(...arguments);
 }
-export class WalletDisconnectionError extends WalletError {
+exports.WalletDisconnectedError = WalletDisconnectedError;
+class WalletDisconnectionError extends WalletError {
     constructor() {
@@ -49,3 +58,4 @@ super(...arguments);
 }
-export class WalletAccountError extends WalletError {
+exports.WalletDisconnectionError = WalletDisconnectionError;
+class WalletAccountError extends WalletError {
     constructor() {
@@ -56,3 +66,4 @@ super(...arguments);
 }
-export class WalletPublicKeyError extends WalletError {
+exports.WalletAccountError = WalletAccountError;
+class WalletPublicKeyError extends WalletError {
     constructor() {
@@ -63,3 +74,4 @@ super(...arguments);
 }
-export class WalletKeypairError extends WalletError {
+exports.WalletPublicKeyError = WalletPublicKeyError;
+class WalletKeypairError extends WalletError {
     constructor() {
@@ -70,3 +82,4 @@ super(...arguments);
 }
-export class WalletNotConnectedError extends WalletError {
+exports.WalletKeypairError = WalletKeypairError;
+class WalletNotConnectedError extends WalletError {
     constructor() {
@@ -77,3 +90,4 @@ super(...arguments);
 }
-export class WalletSendTransactionError extends WalletError {
+exports.WalletNotConnectedError = WalletNotConnectedError;
+class WalletSendTransactionError extends WalletError {
     constructor() {
@@ -84,9 +98,18 @@ super(...arguments);
 }
-export class WalletSignTransactionError extends WalletError {
+exports.WalletSendTransactionError = WalletSendTransactionError;
+class WalletSignMessageError extends WalletError {
     constructor() {
         super(...arguments);
+        this.name = 'WalletSignMessageError';
+    }
+}
+exports.WalletSignMessageError = WalletSignMessageError;
+class WalletSignTransactionError extends WalletError {
+    constructor() {
+        super(...arguments);
         this.name = 'WalletSignTransactionError';
     }
 }
-export class WalletWindowBlockedError extends WalletError {
+exports.WalletSignTransactionError = WalletSignTransactionError;
+class WalletWindowBlockedError extends WalletError {
     constructor() {
@@ -97,3 +120,4 @@ super(...arguments);
 }
-export class WalletWindowClosedError extends WalletError {
+exports.WalletWindowBlockedError = WalletWindowBlockedError;
+class WalletWindowClosedError extends WalletError {
     constructor() {
@@ -104,2 +128,3 @@ super(...arguments);
 }
+exports.WalletWindowClosedError = WalletWindowClosedError;
 //# sourceMappingURL=errors.js.map

lib/index.js

@@ -1,5 +0,17 @@
-export * from './adapter';
-export * from './errors';
-export * from './poll';
-export * from './signer';
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./adapter"), exports);
+__exportStar(require("./errors"), exports);
+__exportStar(require("./poll"), exports);
+__exportStar(require("./signer"), exports);
 //# sourceMappingURL=index.js.map

lib/poll.js

@@ -0,1 +1,2 @@
+"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -10,3 +11,5 @@ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
 };
-export function poll(callback, interval, count) {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pollUntilReady = exports.poll = void 0;
+function poll(callback, interval, count) {
     if (count > 0) {
@@ -20,3 +23,4 @@ setTimeout(() => __awaiter(this, void 0, void 0, function* () {
 }
-export function pollUntilReady(adapter, pollInterval, pollCount) {
+exports.poll = poll;
+function pollUntilReady(adapter, pollInterval, pollCount) {
     poll(() => {
@@ -32,2 +36,3 @@ const { ready } = adapter;
 }
+exports.pollUntilReady = pollUntilReady;
 //# sourceMappingURL=poll.js.map

lib/signer.d.ts

@@ -13,1 +13,8 @@ import { Connection, Transaction, TransactionSignature } from '@solana/web3.js';
 }
+export interface MessageSignerWalletAdapterProps {
+    signMessage(message: Uint8Array): Promise<Uint8Array>;
+}
+export declare type MessageSignerWalletAdapter = WalletAdapter & MessageSignerWalletAdapterProps;
+export declare abstract class BaseMessageSignerWalletAdapter extends BaseSignerWalletAdapter implements MessageSignerWalletAdapter {
+    abstract signMessage(message: Uint8Array): Promise<Uint8Array>;
+}

lib/signer.js

@@ -0,1 +1,2 @@
+"use strict";
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
@@ -21,20 +22,26 @@ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
 };
-import { BaseWalletAdapter } from './adapter';
-import { WalletError, WalletSendTransactionError } from './errors';
-export class BaseSignerWalletAdapter extends BaseWalletAdapter {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseMessageSignerWalletAdapter = exports.BaseSignerWalletAdapter = void 0;
+const adapter_1 = require("./adapter");
+const errors_1 = require("./errors");
+class BaseSignerWalletAdapter extends adapter_1.BaseWalletAdapter {
     sendTransaction(transaction, connection, options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                transaction.feePayer || (transaction.feePayer = this.publicKey || undefined);
-                transaction.recentBlockhash || (transaction.recentBlockhash = (yield connection.getRecentBlockhash('max')).blockhash);
-                const { signers } = options, sendOptions = __rest(options, ["signers"]);
-                (signers === null || signers === void 0 ? void 0 : signers.length) && transaction.partialSign(...signers);
-                transaction = yield this.signTransaction(transaction);
-                const rawTransaction = transaction.serialize();
-                return yield connection.sendRawTransaction(rawTransaction, sendOptions);
+                try {
+                    transaction.feePayer || (transaction.feePayer = this.publicKey || undefined);
+                    transaction.recentBlockhash || (transaction.recentBlockhash = (yield connection.getRecentBlockhash('finalized')).blockhash);
+                    const { signers } = options, sendOptions = __rest(options, ["signers"]);
+                    (signers === null || signers === void 0 ? void 0 : signers.length) && transaction.partialSign(...signers);
+                    transaction = yield this.signTransaction(transaction);
+                    const rawTransaction = transaction.serialize();
+                    return yield connection.sendRawTransaction(rawTransaction, sendOptions);
+                }
+                catch (error) {
+                    if (error instanceof errors_1.WalletError)
+                        throw error;
+                    throw new errors_1.WalletSendTransactionError(error === null || error === void 0 ? void 0 : error.message, error);
+                }
             }
             catch (error) {
-                if (!(error instanceof WalletError)) {
-                    error = new WalletSendTransactionError(error.message, error);
-                }
                 this.emit('error', error);
@@ -46,2 +53,6 @@ throw error;
 }
+exports.BaseSignerWalletAdapter = BaseSignerWalletAdapter;
+class BaseMessageSignerWalletAdapter extends BaseSignerWalletAdapter {
+}
+exports.BaseMessageSignerWalletAdapter = BaseMessageSignerWalletAdapter;
 //# sourceMappingURL=signer.js.map

package.json

 {
     "name": "@solana/wallet-adapter-base",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "author": "Solana Maintainers <[e-mail]>",
@@ -30,3 +30,3 @@ "repository": "https://github.com/solana-labs/wallet-adapter",
     },
-    "gitHead": "76ff330eaf74b916f448eb8870302ae127a94b3d"
+    "gitHead": "4e46f44d180bda0f9ca4d20e48f62759a9af4c2c"
 }

src/errors.ts

@@ -54,2 +54,6 @@ export class WalletError extends Error {
 
+export class WalletSignMessageError extends WalletError {
+    name = 'WalletSignMessageError';
+}
+
 export class WalletSignTransactionError extends WalletError {
@@ -56,0 +60,0 @@ name = 'WalletSignTransactionError';

src/signer.ts

 import { Connection, Transaction, TransactionSignature } from '@solana/web3.js';
 import { BaseWalletAdapter, SendTransactionOptions, WalletAdapter } from './adapter';
-import { WalletError, WalletNotConnectedError, WalletSendTransactionError } from './errors';
+import { WalletError, WalletSendTransactionError } from './errors';
 
@@ -19,18 +19,20 @@ export interface SignerWalletAdapterProps {
         try {
-            transaction.feePayer ||= this.publicKey || undefined;
-            transaction.recentBlockhash ||= (await connection.getRecentBlockhash('max')).blockhash;
+            try {
+                transaction.feePayer ||= this.publicKey || undefined;
+                transaction.recentBlockhash ||= (await connection.getRecentBlockhash('finalized')).blockhash;
 
-            const { signers, ...sendOptions } = options;
+                const { signers, ...sendOptions } = options;
 
-            signers?.length && transaction.partialSign(...signers);
+                signers?.length && transaction.partialSign(...signers);
 
-            transaction = await this.signTransaction(transaction);
+                transaction = await this.signTransaction(transaction);
 
-            const rawTransaction = transaction.serialize();
+                const rawTransaction = transaction.serialize();
 
-            return await connection.sendRawTransaction(rawTransaction, sendOptions);
-        } catch (error) {
-            if (!(error instanceof WalletError)) {
-                error = new WalletSendTransactionError(error.message, error);
+                return await connection.sendRawTransaction(rawTransaction, sendOptions);
+            } catch (error: any) {
+                if (error instanceof WalletError) throw error;
+                throw new WalletSendTransactionError(error?.message, error);
             }
+        } catch (error: any) {
             this.emit('error', error);
@@ -44,1 +46,14 @@ throw error;
 }
+
+export interface MessageSignerWalletAdapterProps {
+    signMessage(message: Uint8Array): Promise<Uint8Array>;
+}
+
+export type MessageSignerWalletAdapter = WalletAdapter & MessageSignerWalletAdapterProps;
+
+export abstract class BaseMessageSignerWalletAdapter
+    extends BaseSignerWalletAdapter
+    implements MessageSignerWalletAdapter
+{
+    abstract signMessage(message: Uint8Array): Promise<Uint8Array>;
+}

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

37325

increased by14.19%

Lines of code

524

increased by19.63%

No dependency changes