Skip to content

Commit 2278bf7

Browse files
Adamj1232Adamj1232
authored
1.37.3 Release - Master (#811)
* 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 parent 9955d3a commit 2278bf7

File tree

10 files changed

+107
-31
lines changed

10 files changed

+107
-31
lines changed

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bnc-onboard",
3-
"version": "1.37.2",
3+
"version": "1.37.3",
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",
@@ -57,8 +57,8 @@
5757
"@ensdomains/ensjs": "^2.0.1",
5858
"@ethereumjs/common": "^2.0.0",
5959
"@ethereumjs/tx": "^3.0.0",
60-
"@gnosis.pm/safe-apps-provider": "^0.5.0",
61-
"@gnosis.pm/safe-apps-sdk": "^3.0.0",
60+
"@gnosis.pm/safe-apps-provider": "^0.9.3",
61+
"@gnosis.pm/safe-apps-sdk": "^6.2.0",
6262
"@keystonehq/eth-keyring": "0.9.0",
6363
"@ledgerhq/hw-app-eth": "6.8.1",
6464
"@ledgerhq/hw-transport-u2f": "^5.21.0",
@@ -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.4",
85+
"walletlink": "^2.4.6",
8686
"web3-provider-engine": "^15.0.4"
8787
},
8888
"resolutions": {

‎src/modules/select/index.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { getProviderName } from '../../utilities'
99
// wallets that qualify for default wallets need to have no
1010
// init parameters that are required for full functionality
1111
const desktopDefaultWalletNames = [
12+
'tokenary',
1213
'tally',
1314
'metamask',
1415
'binance',
@@ -17,10 +18,11 @@ const desktopDefaultWalletNames = [
1718
'torus',
1819
'opera',
1920
'liquality',
20-
'blankwallet'
21+
'blockwallet'
2122
]
2223

2324
const mobileDefaultWalletNames = [
25+
'tokenary',
2426
'1inch',
2527
'metamask',
2628
'coinbase',
@@ -47,6 +49,8 @@ const providerNameToWalletName = (providerName: string) =>
4749
? providerName
4850
: providerName === 'WalletConnect'
4951
? 'walletConnect'
52+
: providerName === `D'CENT`
53+
? 'dcent'
5054
: providerName.toLocaleLowerCase()
5155

5256
function select(
@@ -154,6 +158,8 @@ function getModule(name: string): Promise<{
154158
return import('./wallets/meetone')
155159
case 'tally':
156160
return import('./wallets/tally')
161+
case 'tokenary':
162+
return import('./wallets/tokenary')
157163
case 'metamask':
158164
return import('./wallets/metamask')
159165
case 'portis':
@@ -232,8 +238,9 @@ function getModule(name: string): Promise<{
232238
return import('./wallets/mathwallet')
233239
case '1inch':
234240
return import('./wallets/1inch')
241+
case 'blockwallet':
235242
case 'blankwallet':
236-
return import('./wallets/blankwallet')
243+
return import('./wallets/blockwallet')
237244
case 'ronin':
238245
return import('./wallets/ronin')
239246
default:

‎src/modules/select/wallet-icons/icon-blankwallet.ts renamed to ‎src/modules/select/wallet-icons/icon-blockwallet.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
const blankwalletIcon = `
1+
const blockWalletIcon = `
22
<svg width="30" height="30" viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
33
<path fill-rule="evenodd" clip-rule="evenodd" d="M15 30C23.2843 30 30 23.2843 30 15C30 6.71573 23.2843 0 15 0C6.71573 0 0 6.71573 0 15C0 23.2843 6.71573 30 15 30ZM23.125 6.875H6.875V23.125H23.125V6.875Z" fill="currentColor"/>
44
</svg>
55
`
66

7-
export default blankwalletIcon
7+
export default blockWalletIcon

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

784 Bytes
Loading

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

1.36 KB
Loading

‎src/modules/select/wallets/blankwallet.ts renamed to ‎src/modules/select/wallets/blockwallet.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import { extensionInstallMessage } from '../content'
22
import { WalletModule, Helpers, CommonWalletOptions } from '../../../interfaces'
33

4-
import blankwalletIcon from '../wallet-icons/icon-blankwallet'
4+
import blockWalletIcon from '../wallet-icons/icon-blockwallet'
55

6-
function blankwallet(options: CommonWalletOptions): WalletModule {
6+
function blockwallet(options: CommonWalletOptions): WalletModule {
77
const { preferred, label, iconSrc, svg } = options
88

99
return {
10-
name: label || 'Blank Wallet',
10+
name: label || 'BlockWallet',
1111
iconSrc,
12-
svg: svg || blankwalletIcon,
12+
svg: svg || blockWalletIcon,
1313
wallet: async (helpers: Helpers) => {
1414
const {
1515
getProviderName,
@@ -24,20 +24,20 @@ function blankwallet(options: CommonWalletOptions): WalletModule {
2424
return {
2525
provider,
2626
interface:
27-
provider && getProviderName(provider) === 'BlankWallet'
27+
provider && getProviderName(provider) === 'BlockWallet'
2828
? typeof provider.enable === 'function'
2929
? createModernProviderInterface(provider)
3030
: createLegacyProviderInterface(provider)
3131
: null
3232
}
3333
},
3434
type: 'injected',
35-
link: `https://www.goblank.io/`,
35+
link: `https://www.blockwallet.io/`,
3636
installMessage: extensionInstallMessage,
3737
desktop: true,
3838
mobile: false,
3939
preferred
4040
}
4141
}
4242

43-
export default blankwallet
43+
export default blockwallet

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import gnosisWalletIcon from '../wallet-icons/icon-gnosis'
55

66
const getSafe = (sdk: SafeAppsSDK): Promise<SafeInfo | undefined> =>
77
Promise.race([
8-
sdk.getSafeInfo(),
8+
sdk.safe.getInfo(),
99
// Timeout need as this method hangs until it can find the safe info
1010
new Promise<undefined>(resolve => setTimeout(resolve, 200))
1111
])

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import { extensionInstallMessage } from '../content'
2+
import { WalletModule, Helpers, CommonWalletOptions } from '../../../interfaces'
3+
4+
import tokenaryIcon from '../wallet-icons/icon-tokenary.png'
5+
import tokenaryIcon2x from '../wallet-icons/icon-tokenary@2x.png'
6+
7+
function tokenary(options: CommonWalletOptions): WalletModule {
8+
const { preferred, label, iconSrc, svg } = options
9+
10+
return {
11+
name: label || 'Tokenary',
12+
iconSrc: iconSrc || tokenaryIcon,
13+
iconSrcSet: iconSrc || tokenaryIcon2x,
14+
svg,
15+
wallet: async (helpers: Helpers) => {
16+
const { getProviderName, createModernProviderInterface } = helpers
17+
const windowAsAny = window as any
18+
const provider = windowAsAny.ethereum || windowAsAny.web3.currentProvider
19+
20+
return {
21+
provider,
22+
interface:
23+
provider && getProviderName(provider) === 'Tokenary'
24+
? createModernProviderInterface(provider)
25+
: null
26+
}
27+
},
28+
type: 'injected',
29+
link: `https://tokenary.io/get`,
30+
installMessage: extensionInstallMessage,
31+
desktop: true,
32+
mobile: true,
33+
preferred,
34+
osExclusions: ['Android']
35+
}
36+
}
37+
38+
export default tokenary

‎src/utilities.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,10 @@ export function getProviderName(provider: any): string | undefined {
317317
return 'Tally'
318318
}
319319

320+
if (provider.isTokenary) {
321+
return 'Tokenary'
322+
}
323+
320324
if (provider.isFrame) {
321325
return 'Frame'
322326
}
@@ -353,8 +357,12 @@ export function getProviderName(provider: any): string | undefined {
353357
return 'tp'
354358
}
355359

356-
if (provider.isBlank) {
357-
return 'BlankWallet'
360+
if (provider.isBlockWallet) {
361+
return 'BlockWallet'
362+
}
363+
364+
if (provider.isOneInchIOSWallet) {
365+
return '1inch'
358366
}
359367

360368
if (provider.isOneInchIOSWallet) {

‎yarn.lock

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2059,18 +2059,28 @@
20592059
resolved "https://registry.yarnpkg.com/@formatjs/intl-utils/-/intl-utils-2.3.0.tgz#2dc8c57044de0340eb53a7ba602e59abf80dc799"
20602060
integrity sha512-KWk80UPIzPmUg+P0rKh6TqspRw0G6eux1PuJr+zz47ftMaZ9QDwbGzHZbtzWkl5hgayM/qrKRutllRC7D/vVXQ==
20612061

2062-
"@gnosis.pm/safe-apps-provider@^0.5.0":
2063-
version "0.5.0"
2064-
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-provider/-/safe-apps-provider-0.5.0.tgz#e0121553ef22c1458eb95cf0afed14e8c2570ae3"
2065-
integrity sha512-c4OuKV+cIW2aDmv0DZfLOelmyNNZz5Dr3OG5TvnCfmYhZtHyOd1x6bd2xnROCuiZU+QAUGJsm65mBe6iy8NAVQ==
2062+
"@gnosis.pm/safe-apps-provider@^0.9.3":
2063+
version "0.9.3"
2064+
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-provider/-/safe-apps-provider-0.9.3.tgz#d8913b0f8abc15fdca229571eefc5f9385c82ea7"
2065+
integrity sha512-WzsfEMrOTd7/epEKs7S0QBB+sgw25d1B4SeLCD7q9RYi0vYLaeWT3jTuVXVGqwAlT3tFyedmvXnryLV5SUwiug==
20662066
dependencies:
2067-
"@gnosis.pm/safe-apps-sdk" "3.0.0"
2067+
"@gnosis.pm/safe-apps-sdk" "6.2.0"
20682068
events "^3.3.0"
20692069

2070-
"@gnosis.pm/safe-apps-sdk@3.0.0", "@gnosis.pm/safe-apps-sdk@^3.0.0":
2071-
version "3.0.0"
2072-
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-sdk/-/safe-apps-sdk-3.0.0.tgz#0f90185c3693f2683322d275e796e61ff99ce87d"
2073-
integrity sha512-dLCSlniYnxEqCglx4XdhByvi7KKuSYRWJKm1lVXAc4oJqwwVkoCwp0bFIejLZ/dnf7cQSBUUVsTGWhvSda511w==
2070+
"@gnosis.pm/safe-apps-sdk@6.2.0", "@gnosis.pm/safe-apps-sdk@^6.2.0":
2071+
version "6.2.0"
2072+
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-apps-sdk/-/safe-apps-sdk-6.2.0.tgz#05751b4ae4c6cfa7e19839d3655e7d9b5fb72dfe"
2073+
integrity sha512-dOpVBlu+Nv7bOrOl9llTeRriEpdUnnbXEM/RgTkS1v8Q2swT6+M+WIKTuKB/cadFXbjUsBD/nd3IsihHP24b5g==
2074+
dependencies:
2075+
"@gnosis.pm/safe-react-gateway-sdk" "^2.5.6"
2076+
ethers "^5.4.7"
2077+
2078+
"@gnosis.pm/safe-react-gateway-sdk@^2.5.6":
2079+
version "2.8.4"
2080+
resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-react-gateway-sdk/-/safe-react-gateway-sdk-2.8.4.tgz#93817e7519654c16a88b11a4659c8ef408214284"
2081+
integrity sha512-e7WSKUFSbw1b9MHOQW8p0aegwVIUcdwiMsa1vPGdkmXsuVYiIvLUFaMDxVbtOuNEW8zAU3DBb6gnE4gOHinW5g==
2082+
dependencies:
2083+
isomorphic-unfetch "^3.1.0"
20742084

20752085
"@keepkey/device-protocol@^7.2.1":
20762086
version "7.2.1"
@@ -6299,6 +6309,14 @@ isobject@^3.0.0, isobject@^3.0.1:
62996309
resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
63006310
integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
63016311

6312+
isomorphic-unfetch@^3.1.0:
6313+
version "3.1.0"
6314+
resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f"
6315+
integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==
6316+
dependencies:
6317+
node-fetch "^2.6.1"
6318+
unfetch "^4.2.0"
6319+
63026320
isstream@~0.1.2:
63036321
version "0.1.2"
63046322
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -9277,6 +9295,11 @@ underscore@1.9.1, underscore@^1.12.1:
92779295
resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.1.tgz#0c1c6bd2df54b6b69f2314066d65b6cde6fcf9d1"
92789296
integrity sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==
92799297

9298+
unfetch@^4.2.0:
9299+
version "4.2.0"
9300+
resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
9301+
integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==
9302+
92809303
unicode-canonical-property-names-ecmascript@^1.0.4:
92819304
version "1.0.4"
92829305
resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
@@ -9465,10 +9488,10 @@ vm-browserify@^1.0.1:
94659488
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
94669489
integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
94679490

9468-
walletlink@^2.4.4:
9469-
version "2.4.4"
9470-
resolved "https://registry.yarnpkg.com/walletlink/-/walletlink-2.4.4.tgz#dc2a71d1d235335ef844cfb83da7eb9c264521d0"
9471-
integrity sha512-BzEfSXhykuVYv0Ltv0nQtxkCzBGQk7tJ1D46wF7N/P23USiJap48i8YXa1o+5WmcxonWwA3//HWVkguJ6vHwMg==
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==
94729495
dependencies:
94739496
"@metamask/safe-event-emitter" "2.0.0"
94749497
bind-decorator "^1.0.11"

0 commit comments

Comments
 (0)