Skip to content

Commit 8b6dcca

Browse files
Adamj1232taylorjdawsonbrendanwwAdam Carpentercb-jake
authored
1.38.0 Release - Master (#823)
* update walletlink to 2.4.4 * 1.37.0-0.0.2 - Update yarn.lock deps to run in Node v12 container (#786) * update yarn.lock to run in Node v12 container * Update package.json ver Co-authored-by: Adam Carpenter <Adam@blocknative.com> * 1.37.0-0.0.3 - Update to PR checklist for fork merges to run yarn with nove v12 (#787) * Update to PR checklist for fork merges to run yarn with nove v12 * Ver inc Co-authored-by: Adam Carpenter <Adam@blocknative.com> * 1.37.0-0.0.4 : use window.ethereum provider if available (#777) * coinbase wallet use window.ethereum vs. web3 * bump minor version Co-authored-by: Adam Carpenter <adamcarpenter86@gmail.com> * Release: 1.37.1 (#788) Co-authored-by: Adam Carpenter <Adam@blocknative.com> * 1inch wallet (#779) * 1inch wallet * Up version due to 1inch wallet integration * Fix lint Co-authored-by: Adam Carpenter <adamcarpenter86@gmail.com> * 1.37.1-0.0.2 - Update Walletconnect dep to 1.7.1 (#775) * Update walletconnect to 1.7.1 * Update to latest develop version Co-authored-by: Adam Carpenter <adamcarpenter86@gmail.com> * 1.37.2 Release - Develop (#801) * Release: 1.37.1 - Master (#789) * update walletlink to 2.4.4 * 1.37.0-0.0.2 - Update yarn.lock deps to run in Node v12 container (#786) * update yarn.lock to run in Node v12 container * Update package.json ver Co-authored-by: Adam Carpenter <Adam@blocknative.com> * 1.37.0-0.0.3 - Update to PR checklist for fork merges to run yarn with nove v12 (#787) * Update to PR checklist for fork merges to run yarn with nove v12 * Ver inc Co-authored-by: Adam Carpenter <Adam@blocknative.com> * Inc version number * 1.37.0-0.0.4 : use window.ethereum provider if available (#777) * coinbase wallet use window.ethereum vs. web3 * bump minor version Co-authored-by: Adam Carpenter <adamcarpenter86@gmail.com> Co-authored-by: Taylor Dawson <taylorjdawson@gmail.com> Co-authored-by: Brendan Weinstein <brendan.weinstein@coinbase.com> Co-authored-by: Adam Carpenter <Adam@blocknative.com> Co-authored-by: cb-jake <95890768+cb-jake@users.noreply.github.com> * Update version for release Co-authored-by: Taylor Dawson <taylorjdawson@gmail.com> Co-authored-by: Brendan Weinstein <brendan.weinstein@coinbase.com> Co-authored-by: Adam Carpenter <Adam@blocknative.com> Co-authored-by: cb-jake <95890768+cb-jake@users.noreply.github.com> * 1.37.2-0.0.1 : [feature] - Add Tokenary Wallet (#805) * Add Tokenary * Fix icon name * Update tokenary.ts * 1.37.2-0.0.2 : [update] - Update Gnosis SDK Packages (#809) * Update Gnosis packages * Update renamed getSafeInfo method * yarn.locl * Update versioning * 1.37.2-0.0.3 : [update] - BlankWallet -> BlockWallet rebrand changes (#804) * BlockWallet rebrand changes * include feature version * 1.37.2-0.0.4 - Update walletlink to 2.4.6 (#812) * fix: update walletlink to 2.4.6 * fix: bump minor version * 1.37.3 Release - Develop (#810) * 1.37.2-0.0.1 : [feature] - Add Tokenary Wallet (#805) * 1.37.2-0.0.2 : [update] - Update Gnosis SDK Packages (#809) * 1.37.2-0.0.3 : [update] - BlankWallet -> BlockWallet rebrand changes (#804) * 1.37.2-0.0.4 - Update walletlink to 2.4.6 (#812) * 1.37.3-0.0.1 : [feat] -Add DID wallet (#773) * add did wallet * update package.json version field * fix lint error Co-authored-by: Adam Carpenter <adamcarpenter86@gmail.com> * Dependabot - Bump simple-get from 2.8.1 to 2.8.2 (#818) Bumps [simple-get](https://github.com/feross/simple-get) from 2.8.1 to 2.8.2. - [Release notes](https://github.com/feross/simple-get/releases) - [Commits](feross/simple-get@v2.8.1...v2.8.2) --- updated-dependencies: - dependency-name: simple-get dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 1.37.3-0.0.2 - Update walletlink to 2.4.7 (#820) * fix: update walletlink to 2.4.7 * fix: incremental version update * fix: increment version * Updated version number * 1.37.3-0.0.3 - Wallet select error when no provider to the WalletSelect(#825) * fix: undefined on object keys in safari * chore: bump version * Dependabot - Bump follow-redirects from 1.14.3 to 1.14.8 (#826) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.3 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](follow-redirects/follow-redirects@v1.14.3...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update version bump to minor release with the new SDK changes Co-authored-by: Taylor Dawson <taylorjdawson@gmail.com> Co-authored-by: Brendan Weinstein <brendan.weinstein@coinbase.com> Co-authored-by: Adam Carpenter <Adam@blocknative.com> Co-authored-by: cb-jake <95890768+cb-jake@users.noreply.github.com> Co-authored-by: Alexandr Kazachenko <shoom3301@gmail.com> Co-authored-by: WC <677680+welps@users.noreply.github.com> Co-authored-by: Ivan Grachev <ivan@ivan.lol> Co-authored-by: Yago Pérez Vázquez <yago.perez@gnosis.pm> Co-authored-by: ImanH <63911931+ImanH@users.noreply.github.com> Co-authored-by: Brendan Weinstein <65564422+brendanww@users.noreply.github.com> Co-authored-by: NateRobinson <840501291@qq.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: turtlemoji <78362532+turtlemoji@users.noreply.github.com>
1 parent 2278bf7 commit 8b6dcca

File tree

7 files changed

+56
-14
lines changed

7 files changed

+56
-14
lines changed

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bnc-onboard",
3-
"version": "1.37.3",
3+
"version": "1.38.0",
44
"description": "Onboard users to web3 by allowing them to select a wallet, get that wallet ready to transact and have access to synced wallet state.",
55
"keywords": [
66
"ethereum",
@@ -71,7 +71,7 @@
7171
"@walletconnect/web3-provider": "^1.7.1",
7272
"authereum": "^0.1.12",
7373
"bignumber.js": "^9.0.0",
74-
"bnc-sdk": "^3.4.1",
74+
"bnc-sdk": "^4.1.0",
7575
"bowser": "^2.10.0",
7676
"eth-lattice-keyring": "^0.2.7",
7777
"eth-provider": "^0.6.1",
@@ -82,7 +82,7 @@
8282
"hdkey": "^2.0.1",
8383
"regenerator-runtime": "^0.13.7",
8484
"trezor-connect": "^8.1.9",
85-
"walletlink": "^2.4.6",
85+
"walletlink": "^2.4.7",
8686
"web3-provider-engine": "^15.0.4"
8787
},
8888
"resolutions": {

‎src/modules/select/wallet-icons/icon-didwallet.png

4.98 KB
Loading

‎src/modules/select/wallet-icons/icon-didwallet@2x.png

13.3 KB
Loading

‎src/modules/select/wallets/detectedwallet.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function injected(options: CommonWalletOptions): WalletModule {
1111

1212
const name =
1313
label ||
14-
Object.keys(provider)
14+
Object.keys(provider || {})
1515
.find(
1616
key =>
1717
key.startsWith('is') &&

‎src/modules/select/wallets/didwallet.ts

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import { mobileWalletInstallMessage } from '../content'
2+
import { WalletModule, Helpers, CommonWalletOptions } from '../../../interfaces'
3+
4+
import didWalletIcon from '../wallet-icons/icon-didwallet.png'
5+
import didWalletIcon2x from '../wallet-icons/icon-didwallet@2x.png'
6+
7+
function didwallet(options: CommonWalletOptions): WalletModule {
8+
const { preferred, label, iconSrc, svg } = options
9+
10+
return {
11+
name: label || 'DID Wallet',
12+
iconSrc: iconSrc || didWalletIcon,
13+
iconSrcSet: iconSrc || didWalletIcon2x,
14+
svg,
15+
wallet: async (helpers: Helpers) => {
16+
const { getProviderName, createLegacyProviderInterface } = helpers
17+
const provider =
18+
(window as any).web3 && (window as any).web3.currentProvider
19+
20+
return {
21+
provider,
22+
interface:
23+
provider && getProviderName(provider) === 'DIDWallet'
24+
? createLegacyProviderInterface(provider)
25+
: null
26+
}
27+
},
28+
type: 'injected',
29+
link: `abt://abtwallet.io/i?action=requestOpenUrl&url=${encodeURIComponent(
30+
window.location.href
31+
)}`,
32+
installMessage: mobileWalletInstallMessage,
33+
mobile: true,
34+
preferred
35+
}
36+
}
37+
38+
export default didwallet

‎src/utilities.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,10 @@ export function getProviderName(provider: any): string | undefined {
257257
return 'MathWallet'
258258
}
259259

260+
if (provider.isDIDWallet) {
261+
return 'DIDWallet'
262+
}
263+
260264
if (provider.isWalletIO) {
261265
return 'wallet.io'
262266
}

‎yarn.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5452,9 +5452,9 @@ flatted@^2.0.0:
54525452
integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
54535453

54545454
follow-redirects@^1.14.0:
5455-
version "1.14.3"
5456-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e"
5457-
integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw==
5455+
version "1.14.8"
5456+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
5457+
integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
54585458

54595459
for-in@^1.0.2:
54605460
version "1.0.2"
@@ -8582,9 +8582,9 @@ simple-concat@^1.0.0:
85828582
integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
85838583

85848584
simple-get@^2.7.0:
8585-
version "2.8.1"
8586-
resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.1.tgz#0e22e91d4575d87620620bc91308d57a77f44b5d"
8587-
integrity sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==
8585+
version "2.8.2"
8586+
resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-2.8.2.tgz#5708fb0919d440657326cd5fe7d2599d07705019"
8587+
integrity sha512-Ijd/rV5o+mSBBs4F/x9oDPtTx9Zb6X9brmnXvMW4J7IR15ngi9q5xxqWBKU744jTZiaXtxaPL7uHG6vtN8kUkw==
85888588
dependencies:
85898589
decompress-response "^3.3.0"
85908590
once "^1.3.1"
@@ -9488,10 +9488,10 @@ vm-browserify@^1.0.1:
94889488
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
94899489
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
94909490

9491-
walletlink@^2.4.6:
9492-
version "2.4.6"
9493-
resolved "https://registry.yarnpkg.com/walletlink/-/walletlink-2.4.6.tgz#efaa950c16447bf34e186495b55755b3d7157725"
9494-
integrity sha512-CtfyRa3Tc9yTRFIoE0P0rhiq57WB6/XnJ0Fyc3tmSR4yntFP29sqp+SCDOI0R9Ot20gAKaYb2w/nnmLRrhfiJQ==
9491+
walletlink@^2.4.7:
9492+
version "2.4.7"
9493+
resolved "https://registry.yarnpkg.com/walletlink/-/walletlink-2.4.7.tgz#3dd034f7cd6e9d9f4cc1d677bb951869dc743e20"
9494+
integrity sha512-jhLVOMly9oWiSE8mZ4/+uMyVsAKHw71kGbgC1xYp50SQpuLT2pfa6Hiw2VQ0omP/WHsDAPFuBo8hJGxggr768w==
94959495
dependencies:
94969496
"@metamask/safe-event-emitter" "2.0.0"
94979497
bind-decorator "^1.0.11"

0 commit comments

Comments
 (0)