From 206f4e8e6b82e073553ea5c7a3fa516b40971ff4 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Tue, 21 Feb 2023 11:01:12 -0700 Subject: [PATCH 1/7] Rename TallyHo wallet name to Taho --- README.md | 2 +- .../connect-wallet/ReactConnectWallet.md | 6 +-- .../connect-wallet/SvelteConnectWallet.md | 6 +-- .../docs/[...1]overview/[...1]introduction.md | 2 +- .../src/routes/docs/[...4]wallets/injected.md | 2 +- docs/src/routes/docs/[...4]wallets/taho.md | 44 +++++++++++++++++++ docs/yarn.lock | 16 +++---- examples/with-nextjs-13/web3-onboard.ts | 8 ++-- packages/demo/package.json | 4 +- packages/injected/README.md | 2 +- packages/injected/package.json | 2 +- packages/injected/src/types.ts | 2 +- packages/tallyho/README.md | 12 ++--- packages/tallyho/package.json | 2 +- packages/tallyho/src/index.ts | 4 +- taho_rename | 0 16 files changed, 79 insertions(+), 35 deletions(-) create mode 100644 docs/src/routes/docs/[...4]wallets/taho.md create mode 100644 taho_rename diff --git a/README.md b/README.md index b0f453146..056bfa807 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ For full documentation, check out the README.md for each package or the [docs pa - [MEW-Wallet](packages/mew-wallet/README.md) - [Web3Auth](packages/web3auth/README.md) - [Sequence](packages/sequence/README.md) -- [TallyHo](packages/tallyho/README.md) +- [Taho](packages/tallyho/README.md) - [Enkrypt](packages/enkrypt/README.md) - [Unstoppable Domains](packages/uauth/README.md) - [Frontier](packages/frontier/README.md) diff --git a/docs/src/lib/components/examples/connect-wallet/ReactConnectWallet.md b/docs/src/lib/components/examples/connect-wallet/ReactConnectWallet.md index 679388e18..678d9d09d 100644 --- a/docs/src/lib/components/examples/connect-wallet/ReactConnectWallet.md +++ b/docs/src/lib/components/examples/connect-wallet/ReactConnectWallet.md @@ -20,7 +20,7 @@ import magicModule from '@web3-onboard/magic' import web3authModule from '@web3-onboard/web3auth' import dcentModule from '@web3-onboard/dcent' import sequenceModule from '@web3-onboard/sequence' -import tallyHoModule from '@web3-onboard/tallyho' +import tahoModule from '@web3-onboard/tallyho' import trustModule from '@web3-onboard/trust' import frontierModule from '@web3-onboard/frontier' @@ -44,7 +44,7 @@ const keystone = keystoneModule() const keepkey = keepkeyModule() const gnosis = gnosisModule() const sequence = sequenceModule() -const tally = tallyModule() +const taho = tahoModule() // Previously named Tally Ho wallet const trust = trustModule() const frontier = frontierModule() @@ -68,7 +68,7 @@ const wallets = [ injected, trust, frontier, - tally, + taho, ledger, coinbase, dcent, diff --git a/docs/src/lib/components/examples/connect-wallet/SvelteConnectWallet.md b/docs/src/lib/components/examples/connect-wallet/SvelteConnectWallet.md index d763918c3..f2f82f62e 100644 --- a/docs/src/lib/components/examples/connect-wallet/SvelteConnectWallet.md +++ b/docs/src/lib/components/examples/connect-wallet/SvelteConnectWallet.md @@ -20,7 +20,7 @@ import magicModule from '@web3-onboard/magic' import web3authModule from '@web3-onboard/web3auth' import dcentModule from '@web3-onboard/dcent' import sequenceModule from '@web3-onboard/sequence' -import tallyHoModule from '@web3-onboard/tallyho' +import tahoModule from '@web3-onboard/tallyho' import trustModule from '@web3-onboard/trust' import frontierModule from '@web3-onboard/frontier' @@ -44,7 +44,7 @@ const keystone = keystoneModule() const keepkey = keepkeyModule() const gnosis = gnosisModule() const sequence = sequenceModule() -const tally = tallyModule() +const taho = tahoModule() // Previously named Tally Ho wallet const trust = trustModule() const frontier = frontierModule() @@ -66,7 +66,7 @@ const wallets = [ keepkey, sequence, injected, - tally, + taho, ledger, coinbase, dcent, diff --git a/docs/src/routes/docs/[...1]overview/[...1]introduction.md b/docs/src/routes/docs/[...1]overview/[...1]introduction.md index 139379c5b..18799012c 100644 --- a/docs/src/routes/docs/[...1]overview/[...1]introduction.md +++ b/docs/src/routes/docs/[...1]overview/[...1]introduction.md @@ -133,7 +133,7 @@ if (wallets[0]) { ## Wallet Modules Add other wallet modules such as Wallet Connect or Ledger to increase the support and functionality of your web3-onboard implementation. All modules are listed below and can be accessed through the subpages of web3-onboard docs on the left. -We recommend you add the [Core Repo](https://onboard.blocknative.com/docs/modules/core#install) and consider adding the [Injected Wallets](https://onboard.blocknative.com/docs/packages/injected#install) module to get connected with wallets like Metamask, Tally, Coinbase Wallet & more right away. +We recommend you add the [Core Repo](https://onboard.blocknative.com/docs/modules/core#install) and consider adding the [Injected Wallets](https://onboard.blocknative.com/docs/packages/injected#install) module to get connected with wallets like Metamask, Taho, Coinbase Wallet & more right away. [**Core Repo**](https://onboard.blocknative.com/docs/modules/core#install) diff --git a/docs/src/routes/docs/[...4]wallets/injected.md b/docs/src/routes/docs/[...4]wallets/injected.md index 73ab92a82..5b04e4042 100644 --- a/docs/src/routes/docs/[...4]wallets/injected.md +++ b/docs/src/routes/docs/[...4]wallets/injected.md @@ -274,7 +274,7 @@ const injected = injectedModule({ - SafePal - _Desktop & Mobile_ - Zerion - _Desktop & Mobile_ - OKX Wallet - _Desktop_ -- Tally - _Desktop_ +- Taho (Previously named Tally Ho wallet) - _Desktop_ - Trust - _Mobile_ - Opera - _Desktop & Mobile_ - Status - _Mobile_ diff --git a/docs/src/routes/docs/[...4]wallets/taho.md b/docs/src/routes/docs/[...4]wallets/taho.md new file mode 100644 index 000000000..863e25f63 --- /dev/null +++ b/docs/src/routes/docs/[...4]wallets/taho.md @@ -0,0 +1,44 @@ + +# Taho (previously Tally Ho) + +## Wallet module for connecting Taho (wallet previously named Tally Ho) +See [Taho Developer Docs](https://docs.tally.cash/tally/developers/integrating-dapps) + + +## Install + + + + +```sh copy +yarn add @web3-onboard/core @web3-onboard/tallyho +``` + + + + +```sh copy +npm install @web3-onboard/core @web3-onboard/tallyho +``` + + + + + +## Usage + +```typescript +import Onboard from '@web3-onboard/core' +import tahoWalletModule from '@web3-onboard/tallyho' + +const onboard = Onboard({ + // ... other Onboard options + wallets: [ + tahoWalletModule() + //... other wallets + ] +}) + +const connectedWallets = await onboard.connectWallet() +console.log(connectedWallets) +``` diff --git a/docs/yarn.lock b/docs/yarn.lock index a190ee699..a2b91211c 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -2969,10 +2969,10 @@ ethers "5.5.4" joi "^17.6.1" -"@web3-onboard/core@^2.15.1-alpha.1": - version "2.15.1-alpha.1" - resolved "https://registry.yarnpkg.com/@web3-onboard/core/-/core-2.15.1-alpha.1.tgz#a6c241ba7eb84f40547e57b8192ecd46759ec5ad" - integrity sha512-CrAj0WkBxO52j2JUs5YFIbvfwyrUoWXO7B3QOG6VrQ9w4HRXO5lVBsD2RYMSA5fTbAbRZ7VwPiHCdmQ/ztKYLg== +"@web3-onboard/core@^2.15.2-alpha.1": + version "2.15.2" + resolved "https://registry.yarnpkg.com/@web3-onboard/core/-/core-2.15.2.tgz#9156f3c0a39dfb9aa8963a8ef4d8cf11bd8b5695" + integrity sha512-5p7rW6xNpljAq85kCcU5O/MKSR7uDG4V3EixwfwvNSITHejtjpfGmcUPFW7pYI/J+PQ3Z/u1ThMRDoD2tfjevA== dependencies: "@unstoppabledomains/resolution" "^8.0" "@web3-onboard/common" "^2.2.3" @@ -3138,10 +3138,10 @@ "@toruslabs/torus-embed" "1.38.2" "@web3-onboard/common" "^2.2.3" -"@web3-onboard/transaction-preview@^2.0.3-alpha.1": - version "2.0.3-alpha.1" - resolved "https://registry.yarnpkg.com/@web3-onboard/transaction-preview/-/transaction-preview-2.0.3-alpha.1.tgz#b8945c3b785dc1e0281709c01b464fe45aea1570" - integrity sha512-iJZtvGcYh3ZbmTzaNRAUWKmX4VwgbgaKbmlYCdmeOvNjB7fZykzqr9CXbGwwVmfI3xA7zT17hP5M0WjGFyuDFA== +"@web3-onboard/transaction-preview@^2.0.4-alpha.1": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@web3-onboard/transaction-preview/-/transaction-preview-2.0.4.tgz#c2d5dc55cf1602e9150c70238fc38a573ae580c7" + integrity sha512-GWnyPzQh0/7qVE8TDiehILqAlSsoodlUGq6FCuyIU2abaBDhssODxX+s9MLrSF0SlV8jniJ+KoG3ir1Q1chQTQ== dependencies: "@web3-onboard/common" "^2.2.3" bnc-sdk "^4.6.7" diff --git a/examples/with-nextjs-13/web3-onboard.ts b/examples/with-nextjs-13/web3-onboard.ts index 92f698e2a..36cdc5de8 100644 --- a/examples/with-nextjs-13/web3-onboard.ts +++ b/examples/with-nextjs-13/web3-onboard.ts @@ -13,7 +13,7 @@ import magicModule from '@web3-onboard/magic' import dcentModule from '@web3-onboard/dcent' import mewModule from '@web3-onboard/mew-wallet' import sequenceModule from '@web3-onboard/sequence' -import tallyHoWalletModule from '@web3-onboard/tallyho' +import tahoWalletModule from '@web3-onboard/tallyho' import web3authModule from '@web3-onboard/web3auth' import { init } from '@web3-onboard/react' @@ -50,7 +50,7 @@ const keystone = keystoneModule() const gnosis = gnosisModule() const dcent = dcentModule() const mew = mewModule() -const talltHoWalletSdk = tallyHoWalletModule() +const tahoWalletSdk = tahoWalletModule() // Previously named Tally Ho wallet const web3auth = web3authModule({ clientId: 'DJuUOKvmNnlzy6ruVgeWYWIMKLRyYtjYa9Y10VCeJzWZcygDlrYLyXsBQjpJ2hxlBO9dnl8t9GmAC2qOP5vnIGo' @@ -74,7 +74,7 @@ const magic = magicModule({ export default init({ // An array of wallet modules that you would like to be presented to the user to select from when connecting a wallet. wallets: [ - injected, + // injected, gnosis, fortmatic, portis, @@ -88,7 +88,7 @@ export default init({ keystone, dcent, mew, - talltHoWalletSdk, + tahoWalletSdk, web3auth, sequence ], diff --git a/packages/demo/package.json b/packages/demo/package.json index 9e40a7ca4..60c67cfbc 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -34,7 +34,7 @@ "@web3-onboard/keepkey": "^2.3.3", "@web3-onboard/keystone": "^2.3.3", "@web3-onboard/ledger": "^2.4.2", - "@web3-onboard/injected-wallets": "^2.8.0", + "@web3-onboard/injected-wallets": "^2.8.1-alpha.1", "@web3-onboard/magic": "^2.1.3", "@web3-onboard/phantom": "^2.0.0-alpha.1", "@web3-onboard/portis": "^2.1.3", @@ -42,7 +42,7 @@ "@web3-onboard/trezor": "^2.3.3", "@web3-onboard/trust": "^2.0.0", "@web3-onboard/torus": "^2.2.1", - "@web3-onboard/tallyho": "^2.0.1", + "@web3-onboard/tallyho": "^2.0.2-alpha.1", "@web3-onboard/web3auth": "^2.1.4", "@web3-onboard/walletconnect": "^2.3.0-alpha.2", "@web3-onboard/enkrypt": "^2.0.0", diff --git a/packages/injected/README.md b/packages/injected/README.md index b20c39b3d..04a60cd0b 100644 --- a/packages/injected/README.md +++ b/packages/injected/README.md @@ -42,7 +42,7 @@ console.log(connectedWallets) - SafePal - _Desktop & Mobile_ - Zerion - _Desktop & Mobile_ - OKX Wallet - _Desktop_ -- Tally - _Desktop_ +- Taho (Previously named Tally Ho wallet) - _Desktop_ - Trust - _Mobile_ - Opera - _Desktop & Mobile_ - Status - _Mobile_ diff --git a/packages/injected/package.json b/packages/injected/package.json index 75bb4d2e1..bdaa07381 100644 --- a/packages/injected/package.json +++ b/packages/injected/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/injected-wallets", - "version": "2.8.0", + "version": "2.8.1-alpha.1", "description": "Injected wallet module for connecting browser extension and mobile wallets to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised 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/injected/src/types.ts b/packages/injected/src/types.ts index 1c807aafc..fda02e992 100644 --- a/packages/injected/src/types.ts +++ b/packages/injected/src/types.ts @@ -95,7 +95,7 @@ export enum ProviderLabel { XDEFI = 'XDEFI Wallet', OneInch = '1inch Wallet', Tokenary = 'Tokenary Wallet', - Tally = 'Tally Ho Wallet', + Tally = 'Taho', Rabby = 'Rabby', MathWallet = 'MathWallet', GameStop = 'GameStop Wallet', diff --git a/packages/tallyho/README.md b/packages/tallyho/README.md index 928c58cf5..0b51d6b27 100644 --- a/packages/tallyho/README.md +++ b/packages/tallyho/README.md @@ -1,7 +1,7 @@ -# @web3-onboard/tallyho +# @web3-onboard/tallyho (Taho previously named Tally Ho wallet) -## Wallet module for connecting Tally Ho Wallet to web3-onboard -See [Tally Ho Wallet Developer Docs](https://docs.tally.cash/tally/developers/integrating-dapps) +## Wallet module for connecting Taho (Previously named Tally Ho wallet) Wallet to web3-onboard +See [Taho Developer Docs](https://docs.tally.cash/tally/developers/integrating-dapps) ### Install @@ -12,15 +12,15 @@ See [Tally Ho Wallet Developer Docs](https://docs.tally.cash/tally/developers/in ```typescript import Onboard from '@web3-onboard/core' -import tallyHoWalletModule from '@web3-onboard/tallyho' +import tahoWalletModule from '@web3-onboard/tallyho' // initialize the module with options -const talltHoWalletSdk = tallyHoWalletModule() +const tahoWalletSdk = tahoWalletModule() const onboard = Onboard({ // ... other Onboard options wallets: [ - tallyHoWalletModule() + tahoWalletModule() //... other wallets ] }) diff --git a/packages/tallyho/package.json b/packages/tallyho/package.json index b607ad7af..8eabd8c5c 100644 --- a/packages/tallyho/package.json +++ b/packages/tallyho/package.json @@ -1,6 +1,6 @@ { "name": "@web3-onboard/tallyho", - "version": "2.0.1", + "version": "2.0.2-alpha.1", "description": "Tally Ho SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised 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/tallyho/src/index.ts b/packages/tallyho/src/index.ts index 6e616155c..4e7e710b4 100644 --- a/packages/tallyho/src/index.ts +++ b/packages/tallyho/src/index.ts @@ -9,7 +9,7 @@ function tallyHoWallet(): WalletInit { if (typeof window === 'undefined') return () => null return () => { return { - label: 'Tally Ho Wallet', + label: 'Taho', injectedNamespace: 'tally', checkProviderIdentity: ({ provider }: { provider: any }) => { !!provider && !!provider['isTally'] @@ -20,7 +20,7 @@ function tallyHoWallet(): WalletInit { if (!provider) { const onboarding = new TallyHoOnboarding() onboarding.startOnboarding() - throw new Error('Please install Tally Ho to use this wallet') + throw new Error('Please install Taho to use this wallet') } else { return { provider: createEIP1193Provider(window.tally) } } diff --git a/taho_rename b/taho_rename new file mode 100644 index 000000000..e69de29bb From 3172785bff29c04eb799563b67dbb712e70888d7 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Wed, 22 Feb 2023 11:34:53 -0700 Subject: [PATCH 2/7] Remove commented out code --- examples/with-nextjs-13/web3-onboard.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/with-nextjs-13/web3-onboard.ts b/examples/with-nextjs-13/web3-onboard.ts index 36cdc5de8..19f39b9e4 100644 --- a/examples/with-nextjs-13/web3-onboard.ts +++ b/examples/with-nextjs-13/web3-onboard.ts @@ -74,7 +74,7 @@ const magic = magicModule({ export default init({ // An array of wallet modules that you would like to be presented to the user to select from when connecting a wallet. wallets: [ - // injected, + injected, gnosis, fortmatic, portis, From 7028dcf071c995f31aa69da1437243aa922fdcbf Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Wed, 22 Feb 2023 11:35:39 -0700 Subject: [PATCH 3/7] Remove unneeded file --- taho_rename | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 taho_rename diff --git a/taho_rename b/taho_rename deleted file mode 100644 index e69de29bb..000000000 From 6c54aca918f3d8514cc899a1bbef858eafaabd14 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Mon, 6 Mar 2023 13:54:35 -0700 Subject: [PATCH 4/7] Refine deploy script --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1a4f557be..0c9a98e81 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -797,7 +797,7 @@ workflows: <<: *deploy_staging_filters taho: jobs: - - build-taho-wallet: + - build-taho: <<: *deploy_production_filters - - build-staging-taho-wallet: + - build-staging-taho: <<: *deploy_staging_filters From 42d40e51235099a14d8fa9473a43bf272fcf6c50 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Mon, 6 Mar 2023 14:31:15 -0700 Subject: [PATCH 5/7] Revert docs changes --- packages/demo/package.json | 1 + packages/tallyho/README.md | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/demo/package.json b/packages/demo/package.json index 11aa4ac9e..92da93643 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -44,6 +44,7 @@ "@web3-onboard/trust": "^2.0.0", "@web3-onboard/torus": "^2.2.1", "@web3-onboard/tallyho": "^2.0.2-alpha.1", + "@web3-onboard/taho": "^2.0.0-alpha.1", "@web3-onboard/web3auth": "^2.1.4", "@web3-onboard/walletconnect": "^2.3.1", "@web3-onboard/enkrypt": "^2.0.0", diff --git a/packages/tallyho/README.md b/packages/tallyho/README.md index 0d25e158b..46996d92f 100644 --- a/packages/tallyho/README.md +++ b/packages/tallyho/README.md @@ -1,6 +1,6 @@ -# @web3-onboard/tallyho (Taho previously named Tally Ho wallet) +# @web3-onboard/tallyho (now named Taho wallet) -## (Deprecated) Wallet module for connecting Taho (Previously named Tally Ho wallet) Wallet to web3-onboard +## (Deprecated) Wallet module for connecting Tally Ho Wallet to web3-onboard _Use [@web3-onboard/taho](../taho/README.md)_ See [Taho Developer Docs](https://docs.tally.cash/tally/developers/integrating-dapps) @@ -9,20 +9,19 @@ See [Taho Developer Docs](https://docs.tally.cash/tally/developers/integrating-d `npm i @web3-onboard/tallyho` - ## Usage ```typescript import Onboard from '@web3-onboard/core' -import tahoWalletModule from '@web3-onboard/tallyho' +import tallyHoWalletModule from '@web3-onboard/tallyho' // initialize the module with options -const tahoWalletSdk = tahoWalletModule() +const tallyHoWalletSdk = tallyHoWalletModule() const onboard = Onboard({ // ... other Onboard options wallets: [ - tahoWalletModule() + tallyHoWalletModule() //... other wallets ] }) From 24179eb007265847bdfe9115263b367aca92b40c Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Mon, 6 Mar 2023 14:37:30 -0700 Subject: [PATCH 6/7] Update more docs --- README.md | 2 +- .../components/examples/connect-wallet/ReactConnectWallet.md | 2 +- .../components/examples/connect-wallet/SvelteConnectWallet.md | 2 +- docs/src/routes/docs/[...1]overview/[...1]introduction.md | 2 +- examples/with-nextjs-13/package.json | 2 +- examples/with-nextjs-13/web3-onboard.ts | 2 +- packages/tallyho/package.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2b20057b0..c5fa4c276 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ For full documentation, check out the README.md for each package or the [docs pa - [MEW-Wallet](packages/mew-wallet/README.md) - [Web3Auth](packages/web3auth/README.md) - [Sequence](packages/sequence/README.md) -- [Taho](packages/tallyho/README.md) +- [Taho (previously Tally Ho)](packages/tallyho/README.md) - [Enkrypt](packages/enkrypt/README.md) - [Unstoppable Domains](packages/uauth/README.md) - [Frontier](packages/frontier/README.md) diff --git a/docs/src/lib/components/examples/connect-wallet/ReactConnectWallet.md b/docs/src/lib/components/examples/connect-wallet/ReactConnectWallet.md index f591f4929..50da7aa96 100644 --- a/docs/src/lib/components/examples/connect-wallet/ReactConnectWallet.md +++ b/docs/src/lib/components/examples/connect-wallet/ReactConnectWallet.md @@ -20,7 +20,7 @@ import magicModule from '@web3-onboard/magic' import web3authModule from '@web3-onboard/web3auth' import dcentModule from '@web3-onboard/dcent' import sequenceModule from '@web3-onboard/sequence' -import tahoModule from '@web3-onboard/tallyho' +import tahoModule from '@web3-onboard/taho' import trustModule from '@web3-onboard/trust' import frontierModule from '@web3-onboard/frontier' diff --git a/docs/src/lib/components/examples/connect-wallet/SvelteConnectWallet.md b/docs/src/lib/components/examples/connect-wallet/SvelteConnectWallet.md index a04b6c2ec..684c4735e 100644 --- a/docs/src/lib/components/examples/connect-wallet/SvelteConnectWallet.md +++ b/docs/src/lib/components/examples/connect-wallet/SvelteConnectWallet.md @@ -20,7 +20,7 @@ import magicModule from '@web3-onboard/magic' import web3authModule from '@web3-onboard/web3auth' import dcentModule from '@web3-onboard/dcent' import sequenceModule from '@web3-onboard/sequence' -import tahoModule from '@web3-onboard/tallyho' +import tahoModule from '@web3-onboard/taho' import trustModule from '@web3-onboard/trust' import frontierModule from '@web3-onboard/frontier' diff --git a/docs/src/routes/docs/[...1]overview/[...1]introduction.md b/docs/src/routes/docs/[...1]overview/[...1]introduction.md index 889f808f8..74bae6239 100644 --- a/docs/src/routes/docs/[...1]overview/[...1]introduction.md +++ b/docs/src/routes/docs/[...1]overview/[...1]introduction.md @@ -137,7 +137,7 @@ if (wallets[0]) { Add other wallet modules such as Wallet Connect or Ledger to increase the support and functionality of your web3-onboard implementation. All modules are listed below and can be accessed through the subpages of web3-onboard docs on the left. -We recommend you add the [Core Repo](https://onboard.blocknative.com/docs/modules/core#install) and consider adding the [Injected Wallets](https://onboard.blocknative.com/docs/packages/injected#install) module to get connected with wallets like Metamask, Taho, Coinbase Wallet & more right away. +We recommend you add the [Core Repo](https://onboard.blocknative.com/docs/modules/core#install) and consider adding the [Injected Wallets](https://onboard.blocknative.com/docs/packages/injected#install) module to get connected with wallets like Metamask, Trust, Coinbase Wallet & more right away. [**Core Repo**](https://onboard.blocknative.com/docs/modules/core#install) diff --git a/examples/with-nextjs-13/package.json b/examples/with-nextjs-13/package.json index 724dd10eb..ece23ace8 100644 --- a/examples/with-nextjs-13/package.json +++ b/examples/with-nextjs-13/package.json @@ -25,7 +25,7 @@ "@web3-onboard/portis": "^2.1.3", "@web3-onboard/react": "^2.6.1", "@web3-onboard/sequence": "^2.0.3", - "@web3-onboard/tallyho": "^2.0.1", + "@web3-onboard/taho": "^2.0.0", "@web3-onboard/torus": "^2.1.3", "@web3-onboard/trezor": "^2.3.1", "@web3-onboard/walletconnect": "^2.1.3", diff --git a/examples/with-nextjs-13/web3-onboard.ts b/examples/with-nextjs-13/web3-onboard.ts index 19f39b9e4..2c2316bd1 100644 --- a/examples/with-nextjs-13/web3-onboard.ts +++ b/examples/with-nextjs-13/web3-onboard.ts @@ -13,7 +13,7 @@ import magicModule from '@web3-onboard/magic' import dcentModule from '@web3-onboard/dcent' import mewModule from '@web3-onboard/mew-wallet' import sequenceModule from '@web3-onboard/sequence' -import tahoWalletModule from '@web3-onboard/tallyho' +import tahoWalletModule from '@web3-onboard/taho' import web3authModule from '@web3-onboard/web3auth' import { init } from '@web3-onboard/react' diff --git a/packages/tallyho/package.json b/packages/tallyho/package.json index 8eabd8c5c..f6c97b92a 100644 --- a/packages/tallyho/package.json +++ b/packages/tallyho/package.json @@ -1,7 +1,7 @@ { "name": "@web3-onboard/tallyho", "version": "2.0.2-alpha.1", - "description": "Tally Ho SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised 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.", + "description": "(DEPRECATED. Use @web3-onboard/taho instead) Tally Ho (now named Taho 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 standardised 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", "Web3", From f40ed961800a9d024e065c05ec95e002c77ae7d8 Mon Sep 17 00:00:00 2001 From: Adam Carpenter Date: Mon, 6 Mar 2023 14:56:38 -0700 Subject: [PATCH 7/7] Add Taho docs and fix connect wallet button issue --- .../lib/components/ConnectWalletButton.svelte | 11 ++- docs/src/routes/docs/[...4]wallets/tallyho.md | 48 ++++++++++++ packages/taho/README.md | 30 ++++++++ packages/taho/package.json | 73 +++++++++++++++++++ packages/taho/src/icon.ts | 6 ++ packages/taho/src/index.ts | 33 +++++++++ packages/taho/src/types.ts | 4 + packages/taho/tsconfig.json | 16 ++++ 8 files changed, 218 insertions(+), 3 deletions(-) create mode 100644 docs/src/routes/docs/[...4]wallets/tallyho.md create mode 100644 packages/taho/README.md create mode 100644 packages/taho/package.json create mode 100644 packages/taho/src/icon.ts create mode 100644 packages/taho/src/index.ts create mode 100644 packages/taho/src/types.ts create mode 100644 packages/taho/tsconfig.json diff --git a/docs/src/lib/components/ConnectWalletButton.svelte b/docs/src/lib/components/ConnectWalletButton.svelte index 9f5bb3589..09d6f0fb3 100644 --- a/docs/src/lib/components/ConnectWalletButton.svelte +++ b/docs/src/lib/components/ConnectWalletButton.svelte @@ -7,6 +7,7 @@ let buttonText = 'Connect' async function connectWallet() { + if (!onboard) await initOnboard() if (onboard && onboard.state.get().wallets.length) { onboard.disconnectWallet({ label: onboard.state.get().wallets[0].label }) buttonText = 'Connect' @@ -17,13 +18,17 @@ } } - onMount(async () => { - if (!onboard) { - if (document.location.href.includes('theming-tool')) { + const initOnboard = async () => { + if (document.location.href.includes('theming-tool')) { onboard = await getOnboard('default') } else { onboard = await getOnboard() } + } + + onMount(async () => { + if (!onboard) { + await initOnboard() } onboard.state.select('wallets').subscribe((wallets) => { connectedWallets = wallets diff --git a/docs/src/routes/docs/[...4]wallets/tallyho.md b/docs/src/routes/docs/[...4]wallets/tallyho.md new file mode 100644 index 000000000..9b15a63f2 --- /dev/null +++ b/docs/src/routes/docs/[...4]wallets/tallyho.md @@ -0,0 +1,48 @@ + +# Tally Ho + +:::admonition type=warning +_Wallet module for connecting TallyHo to web3-onboard is now deprecated. Please use [@web3-onboard/taho](./taho.md)_ +::: + +## Wallet module for connecting TallyHo +See [Taho Developer Docs](https://docs.tally.cash/tally/developers/integrating-dapps) + + +## Install + + + + +```sh copy +yarn add @web3-onboard/core @web3-onboard/tallyho +``` + + + + +```sh copy +npm install @web3-onboard/core @web3-onboard/tallyho +``` + + + + + +## Usage + +```typescript +import Onboard from '@web3-onboard/core' +import tallyWalletModule from '@web3-onboard/tallyho' + +const onboard = Onboard({ + // ... other Onboard options + wallets: [ + tallyWalletModule() + //... other wallets + ] +}) + +const connectedWallets = await onboard.connectWallet() +console.log(connectedWallets) +``` diff --git a/packages/taho/README.md b/packages/taho/README.md new file mode 100644 index 000000000..b29eb6775 --- /dev/null +++ b/packages/taho/README.md @@ -0,0 +1,30 @@ +# @web3-onboard/taho (Taho previously named Tally Ho wallet) + +## Wallet module for connecting Taho (Previously named Tally Ho wallet) Wallet to web3-onboard +See [Taho Developer Docs](https://docs.tally.cash/tally/developers/integrating-dapps) + +### Install + +`npm i @web3-onboard/taho` + + +## Usage + +```typescript +import Onboard from '@web3-onboard/core' +import tahoWalletModule from '@web3-onboard/taho' + +// initialize the module with options +const tahoWalletSdk = tahoWalletModule() + +const onboard = Onboard({ + // ... other Onboard options + wallets: [ + tahoWalletModule() + //... other wallets + ] +}) + +const connectedWallets = await onboard.connectWallet() +console.log(connectedWallets) +``` diff --git a/packages/taho/package.json b/packages/taho/package.json new file mode 100644 index 000000000..e67f9fb87 --- /dev/null +++ b/packages/taho/package.json @@ -0,0 +1,73 @@ +{ + "name": "@web3-onboard/taho", + "version": "2.0.0-alpha.1", + "description": "Taho SDK wallet module for connecting to Web3-Onboard. Web3-Onboard makes it simple to connect Ethereum hardware and software wallets to your dapp. Features standardised 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", + "Web3", + "EVM", + "dapp", + "Multichain", + "Wallet", + "Transaction", + "Provider", + "Hardware Wallet", + "Notifications", + "React", + "Svelte", + "Vue", + "Next", + "Nuxt", + "MetaMask", + "Coinbase", + "WalletConnect", + "Ledger", + "Trezor", + "Connect Wallet", + "Ethereum Hooks", + "Blocknative", + "Mempool", + "pending", + "confirmed", + "Injected Wallet", + "Crypto", + "Crypto Wallet", + "Tally Ho", + "Taho", + "Taho Wallet" + ], + "repository": { + "type": "git", + "url": "https://github.com/blocknative/web3-onboard.git", + "directory": "packages/core" + }, + "homepage": "https://onboard.blocknative.com", + "bugs": "https://github.com/blocknative/web3-onboard/issues", + "module": "dist/index.js", + "browser": "dist/index.js", + "main": "dist/index.js", + "type": "module", + "typings": "dist/index.d.ts", + "files": [ + "dist" + ], + "scripts": { + "build": "tsc", + "dev": "tsc -w", + "type-check": "tsc --noEmit" + }, + "license": "MIT", + "devDependencies": { + "@ethersproject/providers": "^5.5.0", + "@types/lodash.uniqby": "^4.7.6", + "@types/node": "^17.0.21", + "ts-node": "^10.2.1", + "typescript": "^4.5.5", + "window": "^4.2.7" + }, + "dependencies": { + "@web3-onboard/common": "^2.2.3", + "tallyho-detect-provider": "^1.0.0", + "tallyho-onboarding": "^1.0.2" + } +} diff --git a/packages/taho/src/icon.ts b/packages/taho/src/icon.ts new file mode 100644 index 000000000..c9f2358e7 --- /dev/null +++ b/packages/taho/src/icon.ts @@ -0,0 +1,6 @@ +export default ` + + + + +` diff --git a/packages/taho/src/index.ts b/packages/taho/src/index.ts new file mode 100644 index 000000000..3ab08fd59 --- /dev/null +++ b/packages/taho/src/index.ts @@ -0,0 +1,33 @@ +import type { WalletInit } from '@web3-onboard/common' +import { createEIP1193Provider } from '@web3-onboard/common' +import { CustomWindow } from './types.js' +import detectEthereumProvider from 'tallyho-detect-provider' +import TallyHoOnboarding from 'tallyho-onboarding' +declare const window: CustomWindow + +function tahoWallet(): WalletInit { + if (typeof window === 'undefined') return () => null + return () => { + return { + label: 'Taho', + injectedNamespace: 'tally', + checkProviderIdentity: ({ provider }: { provider: any }) => { + !!provider && !!provider['isTally'] + }, + getIcon: async () => (await import('./icon.js')).default, + getInterface: async () => { + const provider = await detectEthereumProvider({ mustBeTallyHo: true }) + if (!provider) { + const onboarding = new TallyHoOnboarding() + onboarding.startOnboarding() + throw new Error('Please install Taho to use this wallet') + } else { + return { provider: createEIP1193Provider(window.tally) } + } + }, + platforms: ['desktop'] + } + } +} + +export default tahoWallet diff --git a/packages/taho/src/types.ts b/packages/taho/src/types.ts new file mode 100644 index 000000000..1503a530d --- /dev/null +++ b/packages/taho/src/types.ts @@ -0,0 +1,4 @@ +import type { ExternalProvider } from '@ethersproject/providers' +export interface CustomWindow extends Window { + tally: ExternalProvider +} diff --git a/packages/taho/tsconfig.json b/packages/taho/tsconfig.json new file mode 100644 index 000000000..53a27ffad --- /dev/null +++ b/packages/taho/tsconfig.json @@ -0,0 +1,16 @@ +{ + "extends": "../../tsconfig.json", + "include": ["src/**/*"], + + "compilerOptions": { + "outDir": "dist", + "rootDir": "src", + "declaration": true, + "declarationDir": "dist", + "allowSyntheticDefaultImports": true, + "paths": { + "*": ["./src/*", "./node_modules/*"] + }, + "typeRoots": ["node_modules/@types"] + } + } \ No newline at end of file