@solana-mobile/wallet-adapter-mobile 2.0.1 → 2.0.2

package/lib/cjs/index.browser.js

@@ -54,8 +54,9 @@ function getPublicKeyFromAddress(address) {
 function isVersionedTransaction(transaction) {
     return 'version' in transaction;
 }
-class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalletAdapter {
+class SolanaMobileWalletAdapter extends walletAdapterBase.BaseSignInMessageSignerWalletAdapter {
     constructor(config) {
+        var _a;
         super();
         this.supportedTransactionVersions = new Set(
         // FIXME(#244): We can't actually know what versions are supported until we know which wallet we're talking to.
@@ -74,7 +75,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         this._authorizationResultCache = config.authorizationResultCache;
         this._addressSelector = config.addressSelector;
         this._appIdentity = config.appIdentity;
-        this._cluster = config.cluster;
+        this._chain = (_a = config.chain) !== null && _a !== void 0 ? _a : config.cluster;
         this._onWalletNotFound = config.onWalletNotFound;
         if (this._readyState !== walletAdapterBase.WalletReadyState.Unsupported) {
             this._authorizationResultCache.get().then((authorizationResult) => {
@@ -166,23 +167,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                 }
                 this._connecting = true;
                 try {
-                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                    if (cachedAuthorizationResult) {
-                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                        this.handleAuthorizationResult(cachedAuthorizationResult);
-                        return;
-                    }
-                    yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                        const authorizationResult = yield wallet.authorize({
-                            cluster: this._cluster,
-                            identity: this._appIdentity,
-                        });
-                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                        Promise.all([
-                            this._authorizationResultCache.set(authorizationResult),
-                            this.handleAuthorizationResult(authorizationResult),
-                        ]);
-                    }));
+                    yield this.performAuthorization();
                 }
                 catch (e) {
                     throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
@@ -193,6 +178,34 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             }));
         });
     }
+    performAuthorization(signInPayload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                if (cachedAuthorizationResult) {
+                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                    this.handleAuthorizationResult(cachedAuthorizationResult);
+                    return cachedAuthorizationResult;
+                }
+                return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
+                    const authorizationResult = yield wallet.authorize({
+                        chain: this._chain,
+                        identity: this._appIdentity,
+                        sign_in_payload: signInPayload,
+                    });
+                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                    Promise.all([
+                        this._authorizationResultCache.set(authorizationResult),
+                        this.handleAuthorizationResult(authorizationResult),
+                    ]);
+                    return authorizationResult;
+                }));
+            }
+            catch (e) {
+                throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+            }
+        });
+    }
     handleAuthorizationResult(authorizationResult) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -221,7 +234,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
     performReauthorization(wallet, authToken) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const authorizationResult = yield wallet.reauthorize({
+                const authorizationResult = yield wallet.authorize({
                     auth_token: authToken,
                     identity: this._appIdentity,
                 });
@@ -420,6 +433,38 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             }));
         });
     }
+    signIn(input) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
+                    throw new walletAdapterBase.WalletNotReadyError();
+                }
+                this._connecting = true;
+                try {
+                    const authorizationResult = yield this.performAuthorization(Object.assign(Object.assign({}, input), { domain: (_a = input === null || input === void 0 ? void 0 : input.domain) !== null && _a !== void 0 ? _a : window.location.host }));
+                    if (!authorizationResult.sign_in_result) {
+                        throw new Error("Sign in failed, no sign in result returned by wallet");
+                    }
+                    const signedInAddress = authorizationResult.sign_in_result.address;
+                    const signedInAccount = Object.assign(Object.assign({}, (_b = authorizationResult.accounts.find(acc => acc.address == signedInAddress)) !== null && _b !== void 0 ? _b : {
+                        address: signedInAddress
+                    }), { publicKey: toUint8Array(signedInAddress) });
+                    return {
+                        account: signedInAccount,
+                        signedMessage: toUint8Array(authorizationResult.sign_in_result.signed_message),
+                        signature: toUint8Array(authorizationResult.sign_in_result.signature)
+                    };
+                }
+                catch (e) {
+                    throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+                }
+                finally {
+                    this._connecting = false;
+                }
+            }));
+        });
+    }
 }
 
 function createDefaultAddressSelector() {

package/lib/cjs/index.js

@@ -54,8 +54,9 @@ function getPublicKeyFromAddress(address) {
 function isVersionedTransaction(transaction) {
     return 'version' in transaction;
 }
-class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalletAdapter {
+class SolanaMobileWalletAdapter extends walletAdapterBase.BaseSignInMessageSignerWalletAdapter {
     constructor(config) {
+        var _a;
         super();
         this.supportedTransactionVersions = new Set(
         // FIXME(#244): We can't actually know what versions are supported until we know which wallet we're talking to.
@@ -74,7 +75,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         this._authorizationResultCache = config.authorizationResultCache;
         this._addressSelector = config.addressSelector;
         this._appIdentity = config.appIdentity;
-        this._cluster = config.cluster;
+        this._chain = (_a = config.chain) !== null && _a !== void 0 ? _a : config.cluster;
         this._onWalletNotFound = config.onWalletNotFound;
         if (this._readyState !== walletAdapterBase.WalletReadyState.Unsupported) {
             this._authorizationResultCache.get().then((authorizationResult) => {
@@ -166,23 +167,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                 }
                 this._connecting = true;
                 try {
-                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                    if (cachedAuthorizationResult) {
-                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                        this.handleAuthorizationResult(cachedAuthorizationResult);
-                        return;
-                    }
-                    yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                        const authorizationResult = yield wallet.authorize({
-                            cluster: this._cluster,
-                            identity: this._appIdentity,
-                        });
-                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                        Promise.all([
-                            this._authorizationResultCache.set(authorizationResult),
-                            this.handleAuthorizationResult(authorizationResult),
-                        ]);
-                    }));
+                    yield this.performAuthorization();
                 }
                 catch (e) {
                     throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
@@ -193,6 +178,34 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             }));
         });
     }
+    performAuthorization(signInPayload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                if (cachedAuthorizationResult) {
+                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                    this.handleAuthorizationResult(cachedAuthorizationResult);
+                    return cachedAuthorizationResult;
+                }
+                return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
+                    const authorizationResult = yield wallet.authorize({
+                        chain: this._chain,
+                        identity: this._appIdentity,
+                        sign_in_payload: signInPayload,
+                    });
+                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                    Promise.all([
+                        this._authorizationResultCache.set(authorizationResult),
+                        this.handleAuthorizationResult(authorizationResult),
+                    ]);
+                    return authorizationResult;
+                }));
+            }
+            catch (e) {
+                throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+            }
+        });
+    }
     handleAuthorizationResult(authorizationResult) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -221,7 +234,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
     performReauthorization(wallet, authToken) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const authorizationResult = yield wallet.reauthorize({
+                const authorizationResult = yield wallet.authorize({
                     auth_token: authToken,
                     identity: this._appIdentity,
                 });
@@ -420,6 +433,38 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             }));
         });
     }
+    signIn(input) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
+                    throw new walletAdapterBase.WalletNotReadyError();
+                }
+                this._connecting = true;
+                try {
+                    const authorizationResult = yield this.performAuthorization(Object.assign(Object.assign({}, input), { domain: (_a = input === null || input === void 0 ? void 0 : input.domain) !== null && _a !== void 0 ? _a : window.location.host }));
+                    if (!authorizationResult.sign_in_result) {
+                        throw new Error("Sign in failed, no sign in result returned by wallet");
+                    }
+                    const signedInAddress = authorizationResult.sign_in_result.address;
+                    const signedInAccount = Object.assign(Object.assign({}, (_b = authorizationResult.accounts.find(acc => acc.address == signedInAddress)) !== null && _b !== void 0 ? _b : {
+                        address: signedInAddress
+                    }), { publicKey: toUint8Array(signedInAddress) });
+                    return {
+                        account: signedInAccount,
+                        signedMessage: toUint8Array(authorizationResult.sign_in_result.signed_message),
+                        signature: toUint8Array(authorizationResult.sign_in_result.signature)
+                    };
+                }
+                catch (e) {
+                    throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+                }
+                finally {
+                    this._connecting = false;
+                }
+            }));
+        });
+    }
 }
 
 function createDefaultAddressSelector() {

package/lib/cjs/index.native.js

@@ -51,8 +51,9 @@ function getPublicKeyFromAddress(address) {
 function isVersionedTransaction(transaction) {
     return 'version' in transaction;
 }
-class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalletAdapter {
+class SolanaMobileWalletAdapter extends walletAdapterBase.BaseSignInMessageSignerWalletAdapter {
     constructor(config) {
+        var _a;
         super();
         this.supportedTransactionVersions = new Set(
         // FIXME(#244): We can't actually know what versions are supported until we know which wallet we're talking to.
@@ -71,7 +72,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
         this._authorizationResultCache = config.authorizationResultCache;
         this._addressSelector = config.addressSelector;
         this._appIdentity = config.appIdentity;
-        this._cluster = config.cluster;
+        this._chain = (_a = config.chain) !== null && _a !== void 0 ? _a : config.cluster;
         this._onWalletNotFound = config.onWalletNotFound;
         if (this._readyState !== walletAdapterBase.WalletReadyState.Unsupported) {
             this._authorizationResultCache.get().then((authorizationResult) => {
@@ -163,23 +164,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
                 }
                 this._connecting = true;
                 try {
-                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                    if (cachedAuthorizationResult) {
-                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                        this.handleAuthorizationResult(cachedAuthorizationResult);
-                        return;
-                    }
-                    yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                        const authorizationResult = yield wallet.authorize({
-                            cluster: this._cluster,
-                            identity: this._appIdentity,
-                        });
-                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                        Promise.all([
-                            this._authorizationResultCache.set(authorizationResult),
-                            this.handleAuthorizationResult(authorizationResult),
-                        ]);
-                    }));
+                    yield this.performAuthorization();
                 }
                 catch (e) {
                     throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
@@ -190,6 +175,34 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             }));
         });
     }
+    performAuthorization(signInPayload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                if (cachedAuthorizationResult) {
+                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                    this.handleAuthorizationResult(cachedAuthorizationResult);
+                    return cachedAuthorizationResult;
+                }
+                return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
+                    const authorizationResult = yield wallet.authorize({
+                        chain: this._chain,
+                        identity: this._appIdentity,
+                        sign_in_payload: signInPayload,
+                    });
+                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                    Promise.all([
+                        this._authorizationResultCache.set(authorizationResult),
+                        this.handleAuthorizationResult(authorizationResult),
+                    ]);
+                    return authorizationResult;
+                }));
+            }
+            catch (e) {
+                throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+            }
+        });
+    }
     handleAuthorizationResult(authorizationResult) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -218,7 +231,7 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
     performReauthorization(wallet, authToken) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const authorizationResult = yield wallet.reauthorize({
+                const authorizationResult = yield wallet.authorize({
                     auth_token: authToken,
                     identity: this._appIdentity,
                 });
@@ -417,6 +430,38 @@ class SolanaMobileWalletAdapter extends walletAdapterBase.BaseMessageSignerWalle
             }));
         });
     }
+    signIn(input) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                if (this._readyState !== walletAdapterBase.WalletReadyState.Installed && this._readyState !== walletAdapterBase.WalletReadyState.Loadable) {
+                    throw new walletAdapterBase.WalletNotReadyError();
+                }
+                this._connecting = true;
+                try {
+                    const authorizationResult = yield this.performAuthorization(Object.assign(Object.assign({}, input), { domain: (_a = input === null || input === void 0 ? void 0 : input.domain) !== null && _a !== void 0 ? _a : window.location.host }));
+                    if (!authorizationResult.sign_in_result) {
+                        throw new Error("Sign in failed, no sign in result returned by wallet");
+                    }
+                    const signedInAddress = authorizationResult.sign_in_result.address;
+                    const signedInAccount = Object.assign(Object.assign({}, (_b = authorizationResult.accounts.find(acc => acc.address == signedInAddress)) !== null && _b !== void 0 ? _b : {
+                        address: signedInAddress
+                    }), { publicKey: jsBase64.toUint8Array(signedInAddress) });
+                    return {
+                        account: signedInAccount,
+                        signedMessage: jsBase64.toUint8Array(authorizationResult.sign_in_result.signed_message),
+                        signature: jsBase64.toUint8Array(authorizationResult.sign_in_result.signature)
+                    };
+                }
+                catch (e) {
+                    throw new walletAdapterBase.WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+                }
+                finally {
+                    this._connecting = false;
+                }
+            }));
+        });
+    }
 }
 
 function createDefaultAddressSelector() {

package/lib/esm/index.browser.js

@@ -1,4 +1,4 @@
-import { BaseMessageSignerWalletAdapter, WalletReadyState, WalletPublicKeyError, WalletNotReadyError, WalletConnectionError, WalletDisconnectedError, WalletNotConnectedError, WalletSignTransactionError, WalletSendTransactionError, WalletSignMessageError } from '@solana/wallet-adapter-base';
+import { BaseSignInMessageSignerWalletAdapter, WalletReadyState, WalletPublicKeyError, WalletNotReadyError, WalletConnectionError, WalletDisconnectedError, WalletNotConnectedError, WalletSignTransactionError, WalletSendTransactionError, WalletSignMessageError } from '@solana/wallet-adapter-base';
 import { PublicKey } from '@solana/web3.js';
 import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
 
@@ -50,8 +50,9 @@ function getPublicKeyFromAddress(address) {
 function isVersionedTransaction(transaction) {
     return 'version' in transaction;
 }
-class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
+class SolanaMobileWalletAdapter extends BaseSignInMessageSignerWalletAdapter {
     constructor(config) {
+        var _a;
         super();
         this.supportedTransactionVersions = new Set(
         // FIXME(#244): We can't actually know what versions are supported until we know which wallet we're talking to.
@@ -70,7 +71,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         this._authorizationResultCache = config.authorizationResultCache;
         this._addressSelector = config.addressSelector;
         this._appIdentity = config.appIdentity;
-        this._cluster = config.cluster;
+        this._chain = (_a = config.chain) !== null && _a !== void 0 ? _a : config.cluster;
         this._onWalletNotFound = config.onWalletNotFound;
         if (this._readyState !== WalletReadyState.Unsupported) {
             this._authorizationResultCache.get().then((authorizationResult) => {
@@ -162,23 +163,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
                 }
                 this._connecting = true;
                 try {
-                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                    if (cachedAuthorizationResult) {
-                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                        this.handleAuthorizationResult(cachedAuthorizationResult);
-                        return;
-                    }
-                    yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                        const authorizationResult = yield wallet.authorize({
-                            cluster: this._cluster,
-                            identity: this._appIdentity,
-                        });
-                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                        Promise.all([
-                            this._authorizationResultCache.set(authorizationResult),
-                            this.handleAuthorizationResult(authorizationResult),
-                        ]);
-                    }));
+                    yield this.performAuthorization();
                 }
                 catch (e) {
                     throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
@@ -189,6 +174,34 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             }));
         });
     }
+    performAuthorization(signInPayload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                if (cachedAuthorizationResult) {
+                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                    this.handleAuthorizationResult(cachedAuthorizationResult);
+                    return cachedAuthorizationResult;
+                }
+                return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
+                    const authorizationResult = yield wallet.authorize({
+                        chain: this._chain,
+                        identity: this._appIdentity,
+                        sign_in_payload: signInPayload,
+                    });
+                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                    Promise.all([
+                        this._authorizationResultCache.set(authorizationResult),
+                        this.handleAuthorizationResult(authorizationResult),
+                    ]);
+                    return authorizationResult;
+                }));
+            }
+            catch (e) {
+                throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+            }
+        });
+    }
     handleAuthorizationResult(authorizationResult) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -217,7 +230,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     performReauthorization(wallet, authToken) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const authorizationResult = yield wallet.reauthorize({
+                const authorizationResult = yield wallet.authorize({
                     auth_token: authToken,
                     identity: this._appIdentity,
                 });
@@ -416,6 +429,38 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             }));
         });
     }
+    signIn(input) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                if (this._readyState !== WalletReadyState.Installed && this._readyState !== WalletReadyState.Loadable) {
+                    throw new WalletNotReadyError();
+                }
+                this._connecting = true;
+                try {
+                    const authorizationResult = yield this.performAuthorization(Object.assign(Object.assign({}, input), { domain: (_a = input === null || input === void 0 ? void 0 : input.domain) !== null && _a !== void 0 ? _a : window.location.host }));
+                    if (!authorizationResult.sign_in_result) {
+                        throw new Error("Sign in failed, no sign in result returned by wallet");
+                    }
+                    const signedInAddress = authorizationResult.sign_in_result.address;
+                    const signedInAccount = Object.assign(Object.assign({}, (_b = authorizationResult.accounts.find(acc => acc.address == signedInAddress)) !== null && _b !== void 0 ? _b : {
+                        address: signedInAddress
+                    }), { publicKey: toUint8Array(signedInAddress) });
+                    return {
+                        account: signedInAccount,
+                        signedMessage: toUint8Array(authorizationResult.sign_in_result.signed_message),
+                        signature: toUint8Array(authorizationResult.sign_in_result.signature)
+                    };
+                }
+                catch (e) {
+                    throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+                }
+                finally {
+                    this._connecting = false;
+                }
+            }));
+        });
+    }
 }
 
 function createDefaultAddressSelector() {

package/lib/esm/index.js

@@ -1,4 +1,4 @@
-import { BaseMessageSignerWalletAdapter, WalletReadyState, WalletPublicKeyError, WalletNotReadyError, WalletConnectionError, WalletDisconnectedError, WalletNotConnectedError, WalletSignTransactionError, WalletSendTransactionError, WalletSignMessageError } from '@solana/wallet-adapter-base';
+import { BaseSignInMessageSignerWalletAdapter, WalletReadyState, WalletPublicKeyError, WalletNotReadyError, WalletConnectionError, WalletDisconnectedError, WalletNotConnectedError, WalletSignTransactionError, WalletSendTransactionError, WalletSignMessageError } from '@solana/wallet-adapter-base';
 import { PublicKey } from '@solana/web3.js';
 import { transact } from '@solana-mobile/mobile-wallet-adapter-protocol-web3js';
 
@@ -50,8 +50,9 @@ function getPublicKeyFromAddress(address) {
 function isVersionedTransaction(transaction) {
     return 'version' in transaction;
 }
-class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
+class SolanaMobileWalletAdapter extends BaseSignInMessageSignerWalletAdapter {
     constructor(config) {
+        var _a;
         super();
         this.supportedTransactionVersions = new Set(
         // FIXME(#244): We can't actually know what versions are supported until we know which wallet we're talking to.
@@ -70,7 +71,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         this._authorizationResultCache = config.authorizationResultCache;
         this._addressSelector = config.addressSelector;
         this._appIdentity = config.appIdentity;
-        this._cluster = config.cluster;
+        this._chain = (_a = config.chain) !== null && _a !== void 0 ? _a : config.cluster;
         this._onWalletNotFound = config.onWalletNotFound;
         if (this._readyState !== WalletReadyState.Unsupported) {
             this._authorizationResultCache.get().then((authorizationResult) => {
@@ -162,23 +163,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
                 }
                 this._connecting = true;
                 try {
-                    const cachedAuthorizationResult = yield this._authorizationResultCache.get();
-                    if (cachedAuthorizationResult) {
-                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                        this.handleAuthorizationResult(cachedAuthorizationResult);
-                        return;
-                    }
-                    yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
-                        const authorizationResult = yield wallet.authorize({
-                            cluster: this._cluster,
-                            identity: this._appIdentity,
-                        });
-                        // TODO: Evaluate whether there's any threat to not `awaiting` this expression
-                        Promise.all([
-                            this._authorizationResultCache.set(authorizationResult),
-                            this.handleAuthorizationResult(authorizationResult),
-                        ]);
-                    }));
+                    yield this.performAuthorization();
                 }
                 catch (e) {
                     throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
@@ -189,6 +174,34 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             }));
         });
     }
+    performAuthorization(signInPayload) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const cachedAuthorizationResult = yield this._authorizationResultCache.get();
+                if (cachedAuthorizationResult) {
+                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                    this.handleAuthorizationResult(cachedAuthorizationResult);
+                    return cachedAuthorizationResult;
+                }
+                return yield this.transact((wallet) => __awaiter(this, void 0, void 0, function* () {
+                    const authorizationResult = yield wallet.authorize({
+                        chain: this._chain,
+                        identity: this._appIdentity,
+                        sign_in_payload: signInPayload,
+                    });
+                    // TODO: Evaluate whether there's any threat to not `awaiting` this expression
+                    Promise.all([
+                        this._authorizationResultCache.set(authorizationResult),
+                        this.handleAuthorizationResult(authorizationResult),
+                    ]);
+                    return authorizationResult;
+                }));
+            }
+            catch (e) {
+                throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+            }
+        });
+    }
     handleAuthorizationResult(authorizationResult) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -217,7 +230,7 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     performReauthorization(wallet, authToken) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const authorizationResult = yield wallet.reauthorize({
+                const authorizationResult = yield wallet.authorize({
                     auth_token: authToken,
                     identity: this._appIdentity,
                 });
@@ -416,6 +429,38 @@ class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
             }));
         });
     }
+    signIn(input) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this.runWithGuard(() => __awaiter(this, void 0, void 0, function* () {
+                var _a, _b;
+                if (this._readyState !== WalletReadyState.Installed && this._readyState !== WalletReadyState.Loadable) {
+                    throw new WalletNotReadyError();
+                }
+                this._connecting = true;
+                try {
+                    const authorizationResult = yield this.performAuthorization(Object.assign(Object.assign({}, input), { domain: (_a = input === null || input === void 0 ? void 0 : input.domain) !== null && _a !== void 0 ? _a : window.location.host }));
+                    if (!authorizationResult.sign_in_result) {
+                        throw new Error("Sign in failed, no sign in result returned by wallet");
+                    }
+                    const signedInAddress = authorizationResult.sign_in_result.address;
+                    const signedInAccount = Object.assign(Object.assign({}, (_b = authorizationResult.accounts.find(acc => acc.address == signedInAddress)) !== null && _b !== void 0 ? _b : {
+                        address: signedInAddress
+                    }), { publicKey: toUint8Array(signedInAddress) });
+                    return {
+                        account: signedInAccount,
+                        signedMessage: toUint8Array(authorizationResult.sign_in_result.signed_message),
+                        signature: toUint8Array(authorizationResult.sign_in_result.signature)
+                    };
+                }
+                catch (e) {
+                    throw new WalletConnectionError((e instanceof Error && e.message) || 'Unknown error', e);
+                }
+                finally {
+                    this._connecting = false;
+                }
+            }));
+        });
+    }
 }
 
 function createDefaultAddressSelector() {

package/lib/types/index.browser.d.ts

@@ -1,7 +1,8 @@
-import { BaseMessageSignerWalletAdapter, WalletName, WalletReadyState } from "@solana/wallet-adapter-base";
+import { BaseSignInMessageSignerWalletAdapter, WalletName, WalletReadyState } from "@solana/wallet-adapter-base";
 import { Connection, PublicKey, SendOptions, TransactionSignature, TransactionVersion, VersionedTransaction } from "@solana/web3.js";
 import { Transaction as LegacyTransaction } from "@solana/web3.js";
-import { AppIdentity, AuthorizationResult, Base64EncodedAddress, Cluster } from "@solana-mobile/mobile-wallet-adapter-protocol";
+import { AppIdentity, AuthorizationResult, Base64EncodedAddress, Chain, Cluster, SignInPayload } from "@solana-mobile/mobile-wallet-adapter-protocol";
+import { SolanaSignInInput, SolanaSignInOutput } from "@solana/wallet-standard-features";
 interface AuthorizationResultCache {
     clear(): Promise<void>;
     get(): Promise<AuthorizationResult | undefined>;
@@ -11,7 +12,7 @@ interface AddressSelector {
     select(addresses: Base64EncodedAddress[]): Promise<Base64EncodedAddress>;
 }
 declare const SolanaMobileWalletAdapterWalletName: WalletName<string>;
-declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
+declare class SolanaMobileWalletAdapter extends BaseSignInMessageSignerWalletAdapter {
     readonly supportedTransactionVersions: Set<TransactionVersion>;
     name: WalletName<string>;
     url: string;
@@ -27,11 +28,14 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
      * 'generation' don't continue to do work and throw exceptions.
      */
     private _connectionGeneration;
-    private _cluster;
+    private _chain;
     private _onWalletNotFound;
     private _publicKey;
     private _readyState;
     private _selectedAddress;
+    /**
+     * @deprecated @param cluster config paramter is deprecated, use @param chain instead
+     */
     constructor(config: {
         addressSelector: AddressSelector;
         appIdentity: AppIdentity;
@@ -39,6 +43,13 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         cluster: Cluster;
         onWalletNotFound: (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
     });
+    constructor(config: {
+        addressSelector: AddressSelector;
+        appIdentity: AppIdentity;
+        authorizationResultCache: AuthorizationResultCache;
+        chain: Chain;
+        onWalletNotFound: (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
+    });
     get publicKey(): PublicKey | null;
     get connected(): boolean;
     get connecting(): boolean;
@@ -49,6 +60,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(): Promise<void>;
     autoConnect(): Promise<void>;
     connect(): Promise<void>;
+    performAuthorization(signInPayload?: SignInPayload): Promise<AuthorizationResult>;
     private handleAuthorizationResult;
     private performReauthorization;
     disconnect(): Promise<void>;
@@ -59,6 +71,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     signTransaction<T extends LegacyTransaction | VersionedTransaction>(transaction: T): Promise<T>;
     signAllTransactions<T extends LegacyTransaction | VersionedTransaction>(transactions: T[]): Promise<T[]>;
     signMessage(message: Uint8Array): Promise<Uint8Array>;
+    signIn(input?: SolanaSignInInput): Promise<SolanaSignInOutput>;
 }
 declare function createDefaultAddressSelector(): AddressSelector;
 declare function createDefaultAuthorizationResultCache(): AuthorizationResultCache;

package/lib/types/index.d.ts

@@ -1,7 +1,8 @@
-import { BaseMessageSignerWalletAdapter, WalletName, WalletReadyState } from "@solana/wallet-adapter-base";
+import { BaseSignInMessageSignerWalletAdapter, WalletName, WalletReadyState } from "@solana/wallet-adapter-base";
 import { Connection, PublicKey, SendOptions, TransactionSignature, TransactionVersion, VersionedTransaction } from "@solana/web3.js";
 import { Transaction as LegacyTransaction } from "@solana/web3.js";
-import { AppIdentity, AuthorizationResult, Base64EncodedAddress, Cluster } from "@solana-mobile/mobile-wallet-adapter-protocol";
+import { AppIdentity, AuthorizationResult, Base64EncodedAddress, Chain, Cluster, SignInPayload } from "@solana-mobile/mobile-wallet-adapter-protocol";
+import { SolanaSignInInput, SolanaSignInOutput } from "@solana/wallet-standard-features";
 interface AuthorizationResultCache {
     clear(): Promise<void>;
     get(): Promise<AuthorizationResult | undefined>;
@@ -11,7 +12,7 @@ interface AddressSelector {
     select(addresses: Base64EncodedAddress[]): Promise<Base64EncodedAddress>;
 }
 declare const SolanaMobileWalletAdapterWalletName: WalletName<string>;
-declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
+declare class SolanaMobileWalletAdapter extends BaseSignInMessageSignerWalletAdapter {
     readonly supportedTransactionVersions: Set<TransactionVersion>;
     name: WalletName<string>;
     url: string;
@@ -27,11 +28,14 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
      * 'generation' don't continue to do work and throw exceptions.
      */
     private _connectionGeneration;
-    private _cluster;
+    private _chain;
     private _onWalletNotFound;
     private _publicKey;
     private _readyState;
     private _selectedAddress;
+    /**
+     * @deprecated @param cluster config paramter is deprecated, use @param chain instead
+     */
     constructor(config: {
         addressSelector: AddressSelector;
         appIdentity: AppIdentity;
@@ -39,6 +43,13 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         cluster: Cluster;
         onWalletNotFound: (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
     });
+    constructor(config: {
+        addressSelector: AddressSelector;
+        appIdentity: AppIdentity;
+        authorizationResultCache: AuthorizationResultCache;
+        chain: Chain;
+        onWalletNotFound: (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
+    });
     get publicKey(): PublicKey | null;
     get connected(): boolean;
     get connecting(): boolean;
@@ -49,6 +60,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(): Promise<void>;
     autoConnect(): Promise<void>;
     connect(): Promise<void>;
+    performAuthorization(signInPayload?: SignInPayload): Promise<AuthorizationResult>;
     private handleAuthorizationResult;
     private performReauthorization;
     disconnect(): Promise<void>;
@@ -59,6 +71,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     signTransaction<T extends LegacyTransaction | VersionedTransaction>(transaction: T): Promise<T>;
     signAllTransactions<T extends LegacyTransaction | VersionedTransaction>(transactions: T[]): Promise<T[]>;
     signMessage(message: Uint8Array): Promise<Uint8Array>;
+    signIn(input?: SolanaSignInInput): Promise<SolanaSignInOutput>;
 }
 declare function createDefaultAddressSelector(): AddressSelector;
 declare function createDefaultAuthorizationResultCache(): AuthorizationResultCache;

package/lib/types/index.native.d.ts

@@ -1,7 +1,8 @@
-import { BaseMessageSignerWalletAdapter, WalletName, WalletReadyState } from "@solana/wallet-adapter-base";
+import { BaseSignInMessageSignerWalletAdapter, WalletName, WalletReadyState } from "@solana/wallet-adapter-base";
 import { Connection, PublicKey, SendOptions, TransactionSignature, TransactionVersion, VersionedTransaction } from "@solana/web3.js";
 import { Transaction as LegacyTransaction } from "@solana/web3.js";
-import { AppIdentity, AuthorizationResult, Base64EncodedAddress, Cluster } from "@solana-mobile/mobile-wallet-adapter-protocol";
+import { AppIdentity, AuthorizationResult, Base64EncodedAddress, Chain, Cluster, SignInPayload } from "@solana-mobile/mobile-wallet-adapter-protocol";
+import { SolanaSignInInput, SolanaSignInOutput } from "@solana/wallet-standard-features";
 interface AuthorizationResultCache {
     clear(): Promise<void>;
     get(): Promise<AuthorizationResult | undefined>;
@@ -11,7 +12,7 @@ interface AddressSelector {
     select(addresses: Base64EncodedAddress[]): Promise<Base64EncodedAddress>;
 }
 declare const SolanaMobileWalletAdapterWalletName: WalletName<string>;
-declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
+declare class SolanaMobileWalletAdapter extends BaseSignInMessageSignerWalletAdapter {
     readonly supportedTransactionVersions: Set<TransactionVersion>;
     name: WalletName<string>;
     url: string;
@@ -27,11 +28,14 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
      * 'generation' don't continue to do work and throw exceptions.
      */
     private _connectionGeneration;
-    private _cluster;
+    private _chain;
     private _onWalletNotFound;
     private _publicKey;
     private _readyState;
     private _selectedAddress;
+    /**
+     * @deprecated @param cluster config paramter is deprecated, use @param chain instead
+     */
     constructor(config: {
         addressSelector: AddressSelector;
         appIdentity: AppIdentity;
@@ -39,6 +43,13 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
         cluster: Cluster;
         onWalletNotFound: (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
     });
+    constructor(config: {
+        addressSelector: AddressSelector;
+        appIdentity: AppIdentity;
+        authorizationResultCache: AuthorizationResultCache;
+        chain: Chain;
+        onWalletNotFound: (mobileWalletAdapter: SolanaMobileWalletAdapter) => Promise<void>;
+    });
     get publicKey(): PublicKey | null;
     get connected(): boolean;
     get connecting(): boolean;
@@ -49,6 +60,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     autoConnect_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(): Promise<void>;
     autoConnect(): Promise<void>;
     connect(): Promise<void>;
+    performAuthorization(signInPayload?: SignInPayload): Promise<AuthorizationResult>;
     private handleAuthorizationResult;
     private performReauthorization;
     disconnect(): Promise<void>;
@@ -59,6 +71,7 @@ declare class SolanaMobileWalletAdapter extends BaseMessageSignerWalletAdapter {
     signTransaction<T extends LegacyTransaction | VersionedTransaction>(transaction: T): Promise<T>;
     signAllTransactions<T extends LegacyTransaction | VersionedTransaction>(transactions: T[]): Promise<T[]>;
     signMessage(message: Uint8Array): Promise<Uint8Array>;
+    signIn(input?: SolanaSignInInput): Promise<SolanaSignInOutput>;
 }
 declare function createDefaultAddressSelector(): AddressSelector;
 declare function createDefaultAuthorizationResultCache(): AuthorizationResultCache;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@solana-mobile/wallet-adapter-mobile",
     "description": "An adapter for mobile wallet apps that conform to the Solana Mobile Wallet Adapter protocol",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "author": "Steven Luscher <steven.luscher@solanamobile.com>",
     "repository": "https://github.com/solana-mobile/mobile-wallet-adapter",
     "license": "Apache-2.0",
@@ -40,11 +40,14 @@
         "@solana/web3.js": "^1.58.0"
     },
     "dependencies": {
-        "@react-native-async-storage/async-storage": "^1.17.7",
         "@solana-mobile/mobile-wallet-adapter-protocol-web3js": "^2.0.1",
-        "@solana/wallet-adapter-base": "^0.9.17",
+        "@solana/wallet-adapter-base": "^0.9.23",
+        "@solana/wallet-standard-features": "^1.1.0",
         "js-base64": "^3.7.2"
     },
+    "optionalDependencies": {
+        "@react-native-async-storage/async-storage": "^1.17.7"
+    },
     "devDependencies": {
         "@solana/web3.js": "^1.58.0",
         "agadoo": "^2.0.0",