From 1ec005c96df143e2c51cc210804cd6ea8246ba69 Mon Sep 17 00:00:00 2001 From: kean Date: Mon, 23 Oct 2023 21:30:19 +0800 Subject: [PATCH 1/9] =?UTF-8?q?feat=EF=BC=9Aupdate=20the=20Wallet=20name?= =?UTF-8?q?=20from=20bitget=20to=20Bitget=20Wallet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md | 4 ++-- packages/{bitget => bitget-wallet}/README.md | 0 packages/{bitget => bitget-wallet}/package.json | 6 +++--- packages/{bitget => bitget-wallet}/src/index.ts | 6 +++--- packages/{bitget => bitget-wallet}/tsconfig.json | 0 packages/bitkeep/package.json | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) rename packages/{bitget => bitget-wallet}/README.md (100%) rename packages/{bitget => bitget-wallet}/package.json (94%) rename packages/{bitget => bitget-wallet}/src/index.ts (92%) rename packages/{bitget => bitget-wallet}/tsconfig.json (100%) diff --git a/docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md b/docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md index 8ba3bf23a..a28c0adbe 100644 --- a/docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md +++ b/docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md @@ -14,14 +14,14 @@ Bitget Wallet SDK wallet module for connecting to Web3-Onboard. Web3-Onboard mak ```sh copy -yarn add @web3-onboard/bitget +yarn add @web3-onboard/bitget-wallet ``` ```sh copy -npm install @web3-onboard/bitget +npm install @web3-onboard/bitget-wallet ``` diff --git a/packages/bitget/README.md b/packages/bitget-wallet/README.md similarity index 100% rename from packages/bitget/README.md rename to packages/bitget-wallet/README.md diff --git a/packages/bitget/package.json b/packages/bitget-wallet/package.json similarity index 94% rename from packages/bitget/package.json rename to packages/bitget-wallet/package.json index d31186aeb..d96445a30 100644 --- a/packages/bitget/package.json +++ b/packages/bitget-wallet/package.json @@ -1,5 +1,5 @@ { - "name": "@web3-onboard/bitget", + "name": "@web3-onboard/bitget-wallet", "version": "2.0.0", "description": "bitget-wallet SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.", "keywords": [ @@ -33,7 +33,7 @@ "Crypto", "Crypto Wallet", "Enkrypt", - "bitgetWallet" + "Bitget Wallet" ], "repository": { "type": "git", @@ -61,7 +61,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@bitget-wallet/web3-sdk": "^0.0.6", + "@bitget-wallet/web3-sdk": "^0.0.8", "@web3-onboard/common": "^2.3.3" } } diff --git a/packages/bitget/src/index.ts b/packages/bitget-wallet/src/index.ts similarity index 92% rename from packages/bitget/src/index.ts rename to packages/bitget-wallet/src/index.ts index 27efed8a2..2e5e6fea6 100644 --- a/packages/bitget/src/index.ts +++ b/packages/bitget-wallet/src/index.ts @@ -17,12 +17,12 @@ const loadBitgetDependencies = async (getAdapter?: boolean) => { return bitgetDependencies } -function bitget(): WalletInit { +function bitgetWallet(): WalletInit { if (typeof window === 'undefined') return () => null return () => { return { - label: 'Bitget', + label: 'Bitget Wallet', getIcon: async () => { const sdkAdapter = await loadBitgetDependencies(true) return sdkAdapter.getLogo() @@ -48,4 +48,4 @@ function bitget(): WalletInit { } } -export default bitget +export default bitgetWallet diff --git a/packages/bitget/tsconfig.json b/packages/bitget-wallet/tsconfig.json similarity index 100% rename from packages/bitget/tsconfig.json rename to packages/bitget-wallet/tsconfig.json diff --git a/packages/bitkeep/package.json b/packages/bitkeep/package.json index 083ffd69b..23cf03f7d 100644 --- a/packages/bitkeep/package.json +++ b/packages/bitkeep/package.json @@ -33,7 +33,7 @@ "Crypto", "Crypto Wallet", "Enkrypt", - "bitkeep" + "Bitget Wallet" ], "repository": { "type": "git", @@ -61,7 +61,7 @@ "typescript": "^4.5.5" }, "dependencies": { - "@bitget-wallet/web3-sdk": "^0.0.6", + "@bitget-wallet/web3-sdk": "^0.0.8", "@web3-onboard/common": "^2.3.3" } } From 5ec47d53c6f61adc4bb862a4573ce8de7b7b03b9 Mon Sep 17 00:00:00 2001 From: kean Date: Tue, 24 Oct 2023 14:51:29 +0800 Subject: [PATCH 2/9] feat: Modify the wallet icon format from the original base64 to svg --- packages/bitget-wallet/src/index.ts | 26 +++++++++++++------------- packages/bitkeep/src/index.ts | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/bitget-wallet/src/index.ts b/packages/bitget-wallet/src/index.ts index 2e5e6fea6..209a065c4 100644 --- a/packages/bitget-wallet/src/index.ts +++ b/packages/bitget-wallet/src/index.ts @@ -1,20 +1,20 @@ import type { WalletInit, EIP1193Provider } from '@web3-onboard/common' -let bitgetDependencies: any = null -let bitgetAdapter: any = null +let bitgetWalletDependencies: any = null +let bitgetWalletAdapter: any = null -const loadBitgetDependencies = async (getAdapter?: boolean) => { - if (!bitgetDependencies) { - bitgetDependencies = await import('@bitget-wallet/web3-sdk') +const loadBitgetWalletDependencies = async (getAdapter?: boolean) => { + if (!bitgetWalletDependencies) { + bitgetWalletDependencies = await import('@bitget-wallet/web3-sdk') } - if (getAdapter && !bitgetAdapter) { - bitgetAdapter = new bitgetDependencies.LegacyEip1193Adapter() - return bitgetAdapter + if (getAdapter && !bitgetWalletAdapter) { + bitgetWalletAdapter = new bitgetWalletDependencies.LegacyEip1193Adapter() + return bitgetWalletAdapter } if (getAdapter) { - return bitgetAdapter + return bitgetWalletAdapter } - return bitgetDependencies + return bitgetWalletDependencies } function bitgetWallet(): WalletInit { @@ -24,8 +24,8 @@ function bitgetWallet(): WalletInit { return { label: 'Bitget Wallet', getIcon: async () => { - const sdkAdapter = await loadBitgetDependencies(true) - return sdkAdapter.getLogo() + const { WalletInfo } = await loadBitgetWalletDependencies() + return WalletInfo.logolist.svg[256]; }, getInterface: async () => { const { @@ -33,7 +33,7 @@ function bitgetWallet(): WalletInit { getIsInstall, getDownload, installWalletMessage - } = await loadBitgetDependencies() + } = await loadBitgetWalletDependencies() let provider: EIP1193Provider if (getIsInstall()) { diff --git a/packages/bitkeep/src/index.ts b/packages/bitkeep/src/index.ts index 681408296..3209532e1 100644 --- a/packages/bitkeep/src/index.ts +++ b/packages/bitkeep/src/index.ts @@ -24,8 +24,8 @@ function bitKeep(): WalletInit { return { label: 'BitKeep', getIcon: async () => { - const sdkAdapter = await loadBitKeepDependencies(true) - return sdkAdapter.getLogo() + const { WalletInfo } = await loadBitKeepDependencies(); + return WalletInfo.logolist.svg[256]; }, getInterface: async () => { const { From 6ac4b258179c1340f9a3247aab765131b2c5c2ac Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Tue, 24 Oct 2023 15:31:40 -0600 Subject: [PATCH 3/9] Update packages/bitget-wallet/package.json --- packages/bitget-wallet/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/bitget-wallet/package.json b/packages/bitget-wallet/package.json index d96445a30..4516bdfe7 100644 --- a/packages/bitget-wallet/package.json +++ b/packages/bitget-wallet/package.json @@ -1,5 +1,5 @@ { - "name": "@web3-onboard/bitget-wallet", + "name": "@web3-onboard/bitget", "version": "2.0.0", "description": "bitget-wallet SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.", "keywords": [ From 4c7730f221c774e310bdac10a1acb7bdcb7f6292 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Tue, 24 Oct 2023 15:32:01 -0600 Subject: [PATCH 4/9] Update docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md --- docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md b/docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md index a28c0adbe..a22887444 100644 --- a/docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md +++ b/docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md @@ -14,7 +14,7 @@ Bitget Wallet SDK wallet module for connecting to Web3-Onboard. Web3-Onboard mak ```sh copy -yarn add @web3-onboard/bitget-wallet +yarn add @web3-onboard/bitget ``` From e52710e5f5c95801836aa90929f4cec00bc3034f Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Tue, 24 Oct 2023 15:32:06 -0600 Subject: [PATCH 5/9] Update docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md --- docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md b/docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md index a22887444..8ba3bf23a 100644 --- a/docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md +++ b/docs/src/routes/docs/[...4]wallets/[...2]bitget/+page.md @@ -21,7 +21,7 @@ yarn add @web3-onboard/bitget ```sh copy -npm install @web3-onboard/bitget-wallet +npm install @web3-onboard/bitget ``` From 9e4a0847aebca37c4a9fa256b210c68b12191480 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Tue, 24 Oct 2023 15:34:10 -0600 Subject: [PATCH 6/9] Revert folder name change --- packages/{bitget-wallet => bitget}/README.md | 0 packages/{bitget-wallet => bitget}/package.json | 0 packages/{bitget-wallet => bitget}/src/index.ts | 0 packages/{bitget-wallet => bitget}/tsconfig.json | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename packages/{bitget-wallet => bitget}/README.md (100%) rename packages/{bitget-wallet => bitget}/package.json (100%) rename packages/{bitget-wallet => bitget}/src/index.ts (100%) rename packages/{bitget-wallet => bitget}/tsconfig.json (100%) diff --git a/packages/bitget-wallet/README.md b/packages/bitget/README.md similarity index 100% rename from packages/bitget-wallet/README.md rename to packages/bitget/README.md diff --git a/packages/bitget-wallet/package.json b/packages/bitget/package.json similarity index 100% rename from packages/bitget-wallet/package.json rename to packages/bitget/package.json diff --git a/packages/bitget-wallet/src/index.ts b/packages/bitget/src/index.ts similarity index 100% rename from packages/bitget-wallet/src/index.ts rename to packages/bitget/src/index.ts diff --git a/packages/bitget-wallet/tsconfig.json b/packages/bitget/tsconfig.json similarity index 100% rename from packages/bitget-wallet/tsconfig.json rename to packages/bitget/tsconfig.json From 7889597a1b3460440a811c67cbc3053cf2d75beb Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Tue, 24 Oct 2023 15:38:19 -0600 Subject: [PATCH 7/9] Bump bitget and bitkeep package versions --- packages/bitget/package.json | 2 +- packages/bitkeep/package.json | 2 +- packages/demo/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/bitget/package.json b/packages/bitget/package.json index 4516bdfe7..95eabf160 100644 --- a/packages/bitget/package.json +++ b/packages/bitget/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/bitget", - "version": "2.0.0", + "version": "2.0.1-alpha.1", "description": "bitget-wallet SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.", "keywords": [ "Ethereum", diff --git a/packages/bitkeep/package.json b/packages/bitkeep/package.json index 23cf03f7d..2ea099a20 100644 --- a/packages/bitkeep/package.json +++ b/packages/bitkeep/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/bitkeep", - "version": "2.0.0", + "version": "2.0.1-alpha.1", "description": "Bitkeep Wallet SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.", "keywords": [ "Ethereum", diff --git a/packages/demo/package.json b/packages/demo/package.json index 9fa5879d0..31ecc1621 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -28,7 +28,7 @@ "@safe-global/safe-apps-provider": "^0.18.0", "@safe-global/safe-apps-sdk": "^8.1.0", "@web3-onboard/arcana-auth": "^2.0.0", - "@web3-onboard/bitget": "2.0.0", + "@web3-onboard/bitget": "2.0.1-alpha.1", "@web3-onboard/blocto": "2.0.0", "@web3-onboard/cede-store": "^2.1.0", "@web3-onboard/coinbase": "^2.2.6", diff --git a/yarn.lock b/yarn.lock index 5ea4c2d56..cec66a0d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -426,10 +426,10 @@ "@babel/helper-validator-identifier" "^7.22.20" to-fast-properties "^2.0.0" -"@bitget-wallet/web3-sdk@^0.0.6": - version "0.0.6" - resolved "https://registry.yarnpkg.com/@bitget-wallet/web3-sdk/-/web3-sdk-0.0.6.tgz#f30f7fbdeb804ddc98b175ed977340bc856011ed" - integrity sha512-UfMxJGmIAyqJBIY90nS1IrhFZvOzAvvcPt2/QhsfRQBYya8PoIwXEBofIfFeMgyVD00E7oq130DheAwFUduadA== +"@bitget-wallet/web3-sdk@^0.0.8": + version "0.0.8" + resolved "https://registry.yarnpkg.com/@bitget-wallet/web3-sdk/-/web3-sdk-0.0.8.tgz#1510b0b379654ff0de5e10ae19bef93fa86e46c3" + integrity sha512-WFk6URUxTCukKrU3YpTdWTCScrj6/wwd/0O7eSANeQl1KDbDs+yj/fAkN1Wy6ebI3NMcW6sqN9mrmfwz53dPMQ== dependencies: "@metamask/safe-event-emitter" "^3.0.0" "@solana/web3.js" "^1.78.0" From d0190d57b04573fc21a6ad7c71d78c8c0c9b6f88 Mon Sep 17 00:00:00 2001 From: kean Date: Wed, 25 Oct 2023 11:55:02 +0800 Subject: [PATCH 8/9] =?UTF-8?q?feat=EF=BC=9Aadd=20a=20declaration=20and=20?= =?UTF-8?q?modify=20the=20bitkeep=20documentation=20that=20@web3-onboard/b?= =?UTF-8?q?itkeep=20is=20deprecated,=20and=20the=20linked=20wallet=20uses?= =?UTF-8?q?=20@web3-onboard/bitget?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docs/[...4]wallets/[...3]bitkeep/+page.md | 43 +------------------ 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/docs/src/routes/docs/[...4]wallets/[...3]bitkeep/+page.md b/docs/src/routes/docs/[...4]wallets/[...3]bitkeep/+page.md index e13da46c5..f3226d531 100644 --- a/docs/src/routes/docs/[...4]wallets/[...3]bitkeep/+page.md +++ b/docs/src/routes/docs/[...4]wallets/[...3]bitkeep/+page.md @@ -4,45 +4,6 @@ title: BitKeep # {$frontmatter.title} -## Wallet module for connecting BitKeep Wallet through web3-onboard +## BitKeep undergoes a comprehensive brand upgrade and and has officially rebranded as Bitget Wallet, @web3-onboard/Bitkeep is deprecated -BitKeep Wallet SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications. - -### Install - - - - -```sh copy -yarn add @web3-onboard/bitkeep -``` - - - - -```sh copy -npm install @web3-onboard/bitkeep -``` - - - - -## Usage - -```typescript -import Onboard from '@web3-onboard/core' -import bitKeepWalletModule from '@web3-onboard/bitkeep' - -const bitKeepWallet = bitKeepWalletModule() - -const onboard = Onboard({ - // ... other Onboard options - wallets: [ - bitKeepWallet() - //... other wallets - ] -}) - -const connectedWallets = await onboard.connectWallet() -console.log(connectedWallets) -``` +BitKeep undergoes a comprehensive brand upgrade and and has officially rebranded as Bitget Wallet, please use [`@web3-onboard/bitget`](https://www.npmjs.com/package/@web3-onboard/bitget) package and refer to the [docs](https://onboard.blocknative.com/docs/wallets/bitget) \ No newline at end of file From d5777c33f906958e51bca19ab1b054970a86cb66 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Wed, 25 Oct 2023 09:04:43 -0600 Subject: [PATCH 9/9] Revert removal of install and usage docs, add warning to docs and readme --- .../docs/[...4]wallets/[...3]bitkeep/+page.md | 47 ++++++++++++++++++- packages/bitkeep/README.md | 3 ++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/docs/src/routes/docs/[...4]wallets/[...3]bitkeep/+page.md b/docs/src/routes/docs/[...4]wallets/[...3]bitkeep/+page.md index f3226d531..e0b9bddbe 100644 --- a/docs/src/routes/docs/[...4]wallets/[...3]bitkeep/+page.md +++ b/docs/src/routes/docs/[...4]wallets/[...3]bitkeep/+page.md @@ -4,6 +4,49 @@ title: BitKeep # {$frontmatter.title} -## BitKeep undergoes a comprehensive brand upgrade and and has officially rebranded as Bitget Wallet, @web3-onboard/Bitkeep is deprecated +:::admonition type=warning +_Wallet module for connecting Bitkeep to web3-onboard is now deprecated due to company rebranding. Please use [@web3-onboard/bitget](../../wallets/bitget.md)_ +::: -BitKeep undergoes a comprehensive brand upgrade and and has officially rebranded as Bitget Wallet, please use [`@web3-onboard/bitget`](https://www.npmjs.com/package/@web3-onboard/bitget) package and refer to the [docs](https://onboard.blocknative.com/docs/wallets/bitget) \ No newline at end of file +## Wallet module for connecting BitKeep Wallet through web3-onboard + +BitKeep Wallet SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications. + +### Install + + + + +```sh copy +yarn add @web3-onboard/bitkeep +``` + + + + +```sh copy +npm install @web3-onboard/bitkeep +``` + + + + +## Usage + +```typescript +import Onboard from '@web3-onboard/core' +import bitKeepWalletModule from '@web3-onboard/bitkeep' + +const bitKeepWallet = bitKeepWalletModule() + +const onboard = Onboard({ + // ... other Onboard options + wallets: [ + bitKeepWallet() + //... other wallets + ] +}) + +const connectedWallets = await onboard.connectWallet() +console.log(connectedWallets) +``` diff --git a/packages/bitkeep/README.md b/packages/bitkeep/README.md index 8de401043..5bf012de6 100644 --- a/packages/bitkeep/README.md +++ b/packages/bitkeep/README.md @@ -1,5 +1,8 @@ # @web3-onboard/bitkeep +## (Deprecated) Wallet module for connecting Bitkeep to web3-onboard +_Use [@web3-onboard/bitget](https://www.npmjs.com/package/@web3-onboard/bitget)_ + ## Wallet module for connecting Bitkeep Wallet through web3-onboard Bitkeep Wallet SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardized spec compliant web3 providers for all supported wallets, framework agnostic modern javascript UI with code splitting, CSS customization, multi-chain and multi-account support, reactive wallet state subscriptions and real-time transaction state change notifications.