From 20fa1ee1a158113bb3163c4f2ce364b932828c92 Mon Sep 17 00:00:00 2001 From: Brian Chitester Date: Tue, 21 Jun 2022 15:53:11 -0400 Subject: [PATCH 1/3] add coinbase wallet-adapter --- FAQ.md | 1 + README.md | 1 + packages/wallets/coinbase/.gitignore | 1 + packages/wallets/coinbase/.prettierignore | 1 + packages/wallets/coinbase/LICENSE | 202 ++++++++++++++++ packages/wallets/coinbase/README.md | 5 + packages/wallets/coinbase/package.json | 33 +++ packages/wallets/coinbase/src/adapter.ts | 250 ++++++++++++++++++++ packages/wallets/coinbase/src/index.ts | 1 + packages/wallets/coinbase/tsconfig.cjs.json | 10 + packages/wallets/coinbase/tsconfig.json | 9 + packages/wallets/icons/coinbase.svg | 4 + packages/wallets/wallets/package.json | 1 + packages/wallets/wallets/src/index.ts | 1 + 14 files changed, 520 insertions(+) create mode 100644 packages/wallets/coinbase/.gitignore create mode 100644 packages/wallets/coinbase/.prettierignore create mode 100644 packages/wallets/coinbase/LICENSE create mode 100644 packages/wallets/coinbase/README.md create mode 100644 packages/wallets/coinbase/package.json create mode 100644 packages/wallets/coinbase/src/adapter.ts create mode 100644 packages/wallets/coinbase/src/index.ts create mode 100644 packages/wallets/coinbase/tsconfig.cjs.json create mode 100644 packages/wallets/coinbase/tsconfig.json create mode 100644 packages/wallets/icons/coinbase.svg diff --git a/FAQ.md b/FAQ.md index e54d7e71d..9cbf84f6a 100644 --- a/FAQ.md +++ b/FAQ.md @@ -101,6 +101,7 @@ Please see [issue #72](https://github.com/solana-labs/wallet-adapter/issues/72#i Some wallet adapters provide a `signMessage` method for signing arbitrary bytes: +- [Coinbase](https://github.com/solana-labs/wallet-adapter/tree/master/packages/wallets/coinbase) - [Exodus](https://github.com/solana-labs/wallet-adapter/tree/master/packages/wallets/exodus) - [Glow](https://github.com/solana-labs/wallet-adapter/tree/master/packages/wallets/glow) - [Phantom](https://github.com/solana-labs/wallet-adapter/tree/master/packages/wallets/phantom) diff --git a/README.md b/README.md index a91f7bcb0..39f955ca4 100644 --- a/README.md +++ b/README.md @@ -162,6 +162,7 @@ You can use the [wallets](https://github.com/solana-labs/wallet-adapter/tree/mas | [blocto](https://github.com/solana-labs/wallet-adapter/tree/master/packages/wallets/blocto) | Adapter for [Blocto](https://blocto.app) | [`@solana/wallet-adapter-blocto`](https://npmjs.com/package/@solana/wallet-adapter-blocto) | | [clover](https://github.com/solana-labs/wallet-adapter/tree/master/packages/wallets/clover) | Adapter for [Clover](https://clover.finance) | [`@solana/wallet-adapter-clover`](https://npmjs.com/package/@solana/wallet-adapter-clover) | | [coin98](https://github.com/solana-labs/wallet-adapter/tree/master/packages/wallets/coin98) | Adapter for [Coin98](https://coin98.com) | [`@solana/wallet-adapter-coin98`](https://npmjs.com/package/@solana/wallet-adapter-coin98) | +| [coinbase](https://github.com/solana-labs/wallet-adapter/tree/master/packages/wallets/coinbase) | Adapter for [Coinbase](https://www.coinbase.com/) | [`@solana/wallet-adapter-coinbase`](https://npmjs.com/package/@solana/wallet-adapter-coinbase) | | [coinhub](https://github.com/solana-labs/wallet-adapter/tree/master/packages/wallets/coinhub) | Adapter for [Coinhub](https://coinhub.org) | [`@solana/wallet-adapter-coinhub`](https://npmjs.com/package/@solana/wallet-adapter-coinhub) | | [exodus](https://github.com/solana-labs/wallet-adapter/tree/master/packages/wallets/exodus) | Adapter for [Exodus](https://exodus.com) | [`@solana/wallet-adapter-exodus`](https://npmjs.com/package/@solana/wallet-adapter-exodus) | | [glow](https://github.com/solana-labs/wallet-adapter/tree/master/packages/wallets/glow) | Adapter for [Glow](https://glow.app) | [`@solana/wallet-adapter-glow`](https://npmjs.com/package/@solana/wallet-adapter-glow) | diff --git a/packages/wallets/coinbase/.gitignore b/packages/wallets/coinbase/.gitignore new file mode 100644 index 000000000..a65b41774 --- /dev/null +++ b/packages/wallets/coinbase/.gitignore @@ -0,0 +1 @@ +lib diff --git a/packages/wallets/coinbase/.prettierignore b/packages/wallets/coinbase/.prettierignore new file mode 100644 index 000000000..a65b41774 --- /dev/null +++ b/packages/wallets/coinbase/.prettierignore @@ -0,0 +1 @@ +lib diff --git a/packages/wallets/coinbase/LICENSE b/packages/wallets/coinbase/LICENSE new file mode 100644 index 000000000..d64569567 --- /dev/null +++ b/packages/wallets/coinbase/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/packages/wallets/coinbase/README.md b/packages/wallets/coinbase/README.md new file mode 100644 index 000000000..811fc03ab --- /dev/null +++ b/packages/wallets/coinbase/README.md @@ -0,0 +1,5 @@ +# `@solana/wallet-adapter-coinbase` + + + +Coming soon. \ No newline at end of file diff --git a/packages/wallets/coinbase/package.json b/packages/wallets/coinbase/package.json new file mode 100644 index 000000000..a441621f5 --- /dev/null +++ b/packages/wallets/coinbase/package.json @@ -0,0 +1,33 @@ +{ + "name": "@solana/wallet-adapter-coinbase", + "version": "0.1.3", + "author": "Solana Maintainers ", + "repository": "https://github.com/solana-labs/wallet-adapter", + "license": "Apache-2.0", + "type": "module", + "sideEffects": false, + "main": "lib/cjs/index.js", + "module": "lib/esm/index.mjs", + "types": "lib/types/index.d.ts", + "exports": { + "import": "./lib/esm/index.mjs", + "require": "./lib/cjs/index.js" + }, + "files": [ + "lib", + "src", + "LICENSE" + ], + "publishConfig": { + "access": "public" + }, + "scripts": { + "clean": "shx rm -rf lib/*", + "build": "yarn clean && tsc -p tsconfig.json && tsc-esm -p tsconfig.json && tsc -p tsconfig.cjs.json", + "postbuild": "echo '{\"type\":\"commonjs\"}' | npx json > lib/cjs/package.json && echo '{\"type\":\"module\"} ' | npx json > lib/esm/package.json" + }, + "dependencies": { + "@solana/wallet-adapter-base": "^0.9.4", + "@solana/web3.js": "^1.36.0" + } +} diff --git a/packages/wallets/coinbase/src/adapter.ts b/packages/wallets/coinbase/src/adapter.ts new file mode 100644 index 000000000..27c4eba22 --- /dev/null +++ b/packages/wallets/coinbase/src/adapter.ts @@ -0,0 +1,250 @@ +import { + BaseMessageSignerWalletAdapter, + EventEmitter, + scopePollingDetectionStrategy, + SendTransactionOptions, + WalletAccountError, + WalletConnectionError, + WalletDisconnectedError, + WalletDisconnectionError, + WalletError, + WalletName, + WalletNotConnectedError, + WalletNotReadyError, + WalletPublicKeyError, + WalletReadyState, + WalletSignTransactionError, +} from '@solana/wallet-adapter-base'; +import { Connection, PublicKey, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; + +interface CoinbaseWalletEvents { + connect(...args: unknown[]): unknown; + disconnect(...args: unknown[]): unknown; +} + +interface CoinbaseWallet extends EventEmitter { + publicKey?: PublicKey; + signTransaction(transaction: Transaction): Promise; + signAllTransactions(transactions: Transaction[]): Promise; + signAndSendTransaction( + transaction: Transaction, + options?: SendOptions + ): Promise<{ signature: TransactionSignature }>; + signMessage(message: Uint8Array): Promise<{ signature: Uint8Array }>; + connect(): Promise; + disconnect(): Promise; + _handleDisconnect(...args: unknown[]): unknown; +} + +interface CoinbaseWindow extends Window { + coinbaseSolana?: CoinbaseWallet; +} + +declare const window: CoinbaseWindow; + +export interface CoinbaseWalletAdapterConfig {} + +export const CoinbaseWalletName = 'Coinbase' as WalletName; + +export class CoinbaseWalletAdapter extends BaseMessageSignerWalletAdapter { + name = CoinbaseWalletName; + url = 'https://chrome.google.com/webstore/detail/coinbase-wallet-extension/hnfanknocfeofbddgcijnmhnfnkdnaad'; + icon = + 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTAyNCIgaGVpZ2h0PSIxMDI0IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8Y2lyY2xlIGN4PSI1MTIiIGN5PSI1MTIiIHI9IjUxMiIgZmlsbD0iIzAwNTJGRiIvPgo8cGF0aCBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGNsaXAtcnVsZT0iZXZlbm9kZCIgZD0iTTE1MiA1MTJDMTUyIDcxMC44MjMgMzEzLjE3NyA4NzIgNTEyIDg3MkM3MTAuODIzIDg3MiA4NzIgNzEwLjgyMyA4NzIgNTEyQzg3MiAzMTMuMTc3IDcxMC44MjMgMTUyIDUxMiAxNTJDMzEzLjE3NyAxNTIgMTUyIDMxMy4xNzcgMTUyIDUxMlpNNDIwIDM5NkM0MDYuNzQ1IDM5NiAzOTYgNDA2Ljc0NSAzOTYgNDIwVjYwNEMzOTYgNjE3LjI1NSA0MDYuNzQ1IDYyOCA0MjAgNjI4SDYwNEM2MTcuMjU1IDYyOCA2MjggNjE3LjI1NSA2MjggNjA0VjQyMEM2MjggNDA2Ljc0NSA2MTcuMjU1IDM5NiA2MDQgMzk2SDQyMFoiIGZpbGw9IndoaXRlIi8+Cjwvc3ZnPgo='; + private _connecting: boolean; + private _wallet: CoinbaseWallet | null; + private _publicKey: PublicKey | null; + private _readyState: WalletReadyState = + typeof window === 'undefined' || typeof document === 'undefined' + ? WalletReadyState.Unsupported + : WalletReadyState.NotDetected; + + constructor(config: CoinbaseWalletAdapterConfig = {}) { + super(); + this._connecting = false; + this._wallet = null; + this._publicKey = null; + if (this._readyState !== WalletReadyState.Unsupported) { + scopePollingDetectionStrategy(() => { + if (window?.coinbaseSolana) { + this._readyState = WalletReadyState.Installed; + this.emit('readyStateChange', this._readyState); + return true; + } + return false; + }); + } + } + + get publicKey(): PublicKey | null { + return this._publicKey; + } + + get connecting(): boolean { + return this._connecting; + } + + get connected(): boolean { + return !!this._publicKey; + } + + get readyState(): WalletReadyState { + return this._readyState; + } + + async connect(): Promise { + try { + if (this.connected || this.connecting) return; + if (this._readyState !== WalletReadyState.Installed) throw new WalletNotReadyError(); + + this._connecting = true; + + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const wallet = window!.coinbaseSolana!; + try { + await new Promise((resolve, reject) => { + const connect = () => { + wallet.off('connect', connect); + resolve(); + }; + + wallet.on('connect', connect); + + wallet.connect().then(resolve).catch((reason: any) => { + wallet.off('connect', connect); + reject(reason); + }); + }); + } catch (error: any) { + if (error instanceof WalletError) throw error; + throw new WalletConnectionError(error?.message, error); + } + + if (!wallet.publicKey) throw new WalletAccountError(); + + let publicKey: PublicKey; + try { + publicKey = new PublicKey(wallet.publicKey.toBytes()); + } catch (error: any) { + throw new WalletPublicKeyError(error?.message, error); + } + + wallet.on('disconnect', this._disconnected); + + this._wallet = wallet; + this._publicKey = publicKey; + + this.emit('connect', publicKey); + } catch (error: any) { + this.emit('error', error); + throw error; + } finally { + this._connecting = false; + } + } + + async disconnect(): Promise { + const wallet = this._wallet; + if (wallet) { + wallet.off('disconnect', this._disconnected); + + this._wallet = null; + this._publicKey = null; + + try { + await wallet.disconnect(); + } catch (error: any) { + this.emit('error', new WalletDisconnectionError(error?.message, error)); + } + } + + this.emit('disconnect'); + } + + async sendTransaction( + transaction: Transaction, + connection: Connection, + options?: SendTransactionOptions + ): Promise { + try { + const wallet = this._wallet; + // Coinbase doesn't handle partial signers, so if they are provided, don't use `signAndSendTransaction` + if (wallet && 'signAndSendTransaction' in wallet && !options?.signers) { + // HACK: Coinbase's `signAndSendTransaction` should always set these, but doesn't yet + transaction.feePayer = transaction.feePayer || this.publicKey || undefined; + transaction.recentBlockhash = + transaction.recentBlockhash || (await connection.getRecentBlockhash('finalized')).blockhash; + + const { signature } = await wallet.signAndSendTransaction(transaction, options); + return signature; + } + } catch (error: any) { + this.emit('error', error); + throw error; + } + + return await super.sendTransaction(transaction, connection, options); + } + + async signTransaction(transaction: Transaction): Promise { + try { + const wallet = this._wallet; + if (!wallet) throw new WalletNotConnectedError(); + + try { + return (await wallet.signTransaction(transaction)) || transaction; + } catch (error: any) { + throw new WalletSignTransactionError(error?.message, error); + } + } catch (error: any) { + this.emit('error', error); + throw error; + } + } + + async signAllTransactions(transactions: Transaction[]): Promise { + try { + const wallet = this._wallet; + if (!wallet) throw new WalletNotConnectedError(); + + try { + return (await wallet.signAllTransactions(transactions)) || transactions; + } catch (error: any) { + throw new WalletSignTransactionError(error?.message, error); + } + } catch (error: any) { + this.emit('error', error); + throw error; + } + } + + async signMessage(message: Uint8Array): Promise { + try { + const wallet = this._wallet; + if (!wallet) throw new WalletNotConnectedError(); + + try { + const { signature } = await wallet.signMessage(message); + return signature; + } catch (error: any) { + throw new WalletSignTransactionError(error?.message, error); + } + } catch (error: any) { + this.emit('error', error); + throw error; + } + } + + private _disconnected = () => { + const wallet = this._wallet; + if (wallet) { + wallet.off('disconnect', this._disconnected); + + this._wallet = null; + this._publicKey = null; + + this.emit('error', new WalletDisconnectedError()); + this.emit('disconnect'); + } + }; +} diff --git a/packages/wallets/coinbase/src/index.ts b/packages/wallets/coinbase/src/index.ts new file mode 100644 index 000000000..7e77e9fc2 --- /dev/null +++ b/packages/wallets/coinbase/src/index.ts @@ -0,0 +1 @@ +export * from './adapter'; diff --git a/packages/wallets/coinbase/tsconfig.cjs.json b/packages/wallets/coinbase/tsconfig.cjs.json new file mode 100644 index 000000000..443b583a0 --- /dev/null +++ b/packages/wallets/coinbase/tsconfig.cjs.json @@ -0,0 +1,10 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "target": "es6", + "module": "commonjs", + "outDir": "lib/cjs", + "declarationDir": null, + "declaration": false + } +} diff --git a/packages/wallets/coinbase/tsconfig.json b/packages/wallets/coinbase/tsconfig.json new file mode 100644 index 000000000..ea51e41c4 --- /dev/null +++ b/packages/wallets/coinbase/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../../tsconfig.json", + "include": ["src"], + "compilerOptions": { + "outDir": "lib/esm", + "declarationDir": "lib/types", + "noEmit": false + } +} diff --git a/packages/wallets/icons/coinbase.svg b/packages/wallets/icons/coinbase.svg new file mode 100644 index 000000000..58826f96d --- /dev/null +++ b/packages/wallets/icons/coinbase.svg @@ -0,0 +1,4 @@ + + + + diff --git a/packages/wallets/wallets/package.json b/packages/wallets/wallets/package.json index 4de6b5d19..7971bcc0e 100644 --- a/packages/wallets/wallets/package.json +++ b/packages/wallets/wallets/package.json @@ -33,6 +33,7 @@ "@solana/wallet-adapter-blocto": "^0.5.2", "@solana/wallet-adapter-clover": "^0.4.2", "@solana/wallet-adapter-coin98": "^0.5.2", + "@solana/wallet-adapter-coinbase": "^0.1.3", "@solana/wallet-adapter-coinhub": "^0.3.2", "@solana/wallet-adapter-exodus": "^0.1.0", "@solana/wallet-adapter-glow": "^0.1.0", diff --git a/packages/wallets/wallets/src/index.ts b/packages/wallets/wallets/src/index.ts index 1d70bb17c..4a3460670 100644 --- a/packages/wallets/wallets/src/index.ts +++ b/packages/wallets/wallets/src/index.ts @@ -3,6 +3,7 @@ export * from '@solana/wallet-adapter-bitpie'; export * from '@solana/wallet-adapter-blocto'; export * from '@solana/wallet-adapter-clover'; export * from '@solana/wallet-adapter-coin98'; +export * from '@solana/wallet-adapter-coinbase'; export * from '@solana/wallet-adapter-coinhub'; export * from '@solana/wallet-adapter-exodus'; export * from '@solana/wallet-adapter-glow'; From ef4a9d31e9c9a962ca30ed8cd8d844b8062d095d Mon Sep 17 00:00:00 2001 From: Brian Chitester Date: Mon, 27 Jun 2022 17:03:34 -0400 Subject: [PATCH 2/3] updates from code review --- packages/wallets/coinbase/package.json | 9 +++++-- packages/wallets/coinbase/src/adapter.ts | 34 +++++++----------------- packages/wallets/wallets/package.json | 2 +- 3 files changed, 17 insertions(+), 28 deletions(-) diff --git a/packages/wallets/coinbase/package.json b/packages/wallets/coinbase/package.json index a441621f5..6504ba2c2 100644 --- a/packages/wallets/coinbase/package.json +++ b/packages/wallets/coinbase/package.json @@ -1,6 +1,6 @@ { "name": "@solana/wallet-adapter-coinbase", - "version": "0.1.3", + "version": "0.1.0", "author": "Solana Maintainers ", "repository": "https://github.com/solana-labs/wallet-adapter", "license": "Apache-2.0", @@ -26,8 +26,13 @@ "build": "yarn clean && tsc -p tsconfig.json && tsc-esm -p tsconfig.json && tsc -p tsconfig.cjs.json", "postbuild": "echo '{\"type\":\"commonjs\"}' | npx json > lib/cjs/package.json && echo '{\"type\":\"module\"} ' | npx json > lib/esm/package.json" }, + "peerDependencies": { + "@solana/web3.js": "^1.36.0" + }, "dependencies": { - "@solana/wallet-adapter-base": "^0.9.4", + "@solana/wallet-adapter-base": "^0.9.4" + }, + "devDependencies": { "@solana/web3.js": "^1.36.0" } } diff --git a/packages/wallets/coinbase/src/adapter.ts b/packages/wallets/coinbase/src/adapter.ts index 27c4eba22..fa0476508 100644 --- a/packages/wallets/coinbase/src/adapter.ts +++ b/packages/wallets/coinbase/src/adapter.ts @@ -7,12 +7,12 @@ import { WalletConnectionError, WalletDisconnectedError, WalletDisconnectionError, - WalletError, WalletName, WalletNotConnectedError, WalletNotReadyError, WalletPublicKeyError, WalletReadyState, + WalletSendTransactionError, WalletSignTransactionError, } from '@solana/wallet-adapter-base'; import { Connection, PublicKey, SendOptions, Transaction, TransactionSignature } from '@solana/web3.js'; @@ -101,24 +101,9 @@ export class CoinbaseWalletAdapter extends BaseMessageSignerWalletAdapter { // eslint-disable-next-line @typescript-eslint/no-non-null-assertion const wallet = window!.coinbaseSolana!; - try { - await new Promise((resolve, reject) => { - const connect = () => { - wallet.off('connect', connect); - resolve(); - }; - - wallet.on('connect', connect); - - wallet.connect().then(resolve).catch((reason: any) => { - wallet.off('connect', connect); - reject(reason); - }); - }); - } catch (error: any) { - if (error instanceof WalletError) throw error; + await wallet.connect().catch((error: any) => { throw new WalletConnectionError(error?.message, error); - } + }); if (!wallet.publicKey) throw new WalletAccountError(); @@ -168,22 +153,21 @@ export class CoinbaseWalletAdapter extends BaseMessageSignerWalletAdapter { ): Promise { try { const wallet = this._wallet; - // Coinbase doesn't handle partial signers, so if they are provided, don't use `signAndSendTransaction` - if (wallet && 'signAndSendTransaction' in wallet && !options?.signers) { - // HACK: Coinbase's `signAndSendTransaction` should always set these, but doesn't yet + if (!wallet) throw new WalletNotConnectedError(); + if (!transaction.feePayer && !this.publicKey) throw new WalletSendTransactionError('Missing feePayer'); + try { transaction.feePayer = transaction.feePayer || this.publicKey || undefined; transaction.recentBlockhash = - transaction.recentBlockhash || (await connection.getRecentBlockhash('finalized')).blockhash; - + transaction.recentBlockhash || (await connection.getLatestBlockhash('finalized')).blockhash; const { signature } = await wallet.signAndSendTransaction(transaction, options); return signature; + } catch (error: any) { + throw new WalletSendTransactionError(error?.message, error); } } catch (error: any) { this.emit('error', error); throw error; } - - return await super.sendTransaction(transaction, connection, options); } async signTransaction(transaction: Transaction): Promise { diff --git a/packages/wallets/wallets/package.json b/packages/wallets/wallets/package.json index 7971bcc0e..491c3b846 100644 --- a/packages/wallets/wallets/package.json +++ b/packages/wallets/wallets/package.json @@ -33,7 +33,7 @@ "@solana/wallet-adapter-blocto": "^0.5.2", "@solana/wallet-adapter-clover": "^0.4.2", "@solana/wallet-adapter-coin98": "^0.5.2", - "@solana/wallet-adapter-coinbase": "^0.1.3", + "@solana/wallet-adapter-coinbase": "^0.1.0", "@solana/wallet-adapter-coinhub": "^0.3.2", "@solana/wallet-adapter-exodus": "^0.1.0", "@solana/wallet-adapter-glow": "^0.1.0", From 561830677a63f65c1f2471eca3112d577e495719 Mon Sep 17 00:00:00 2001 From: Brian Chitester Date: Mon, 27 Jun 2022 17:05:56 -0400 Subject: [PATCH 3/3] remove _handleDisconnect --- packages/wallets/coinbase/src/adapter.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/wallets/coinbase/src/adapter.ts b/packages/wallets/coinbase/src/adapter.ts index fa0476508..0441a0124 100644 --- a/packages/wallets/coinbase/src/adapter.ts +++ b/packages/wallets/coinbase/src/adapter.ts @@ -33,7 +33,6 @@ interface CoinbaseWallet extends EventEmitter { signMessage(message: Uint8Array): Promise<{ signature: Uint8Array }>; connect(): Promise; disconnect(): Promise; - _handleDisconnect(...args: unknown[]): unknown; } interface CoinbaseWindow extends Window {