Skip to content

Commit 1d2174d

Browse files
taylorjdawsontaylorjdawson
committed
Merge latest develop
2 parents 09a48ab + 4b62cc5 commit 1d2174d

File tree

5 files changed

+83
-54
lines changed

5 files changed

+83
-54
lines changed

‎.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2
22
jobs:
33
test:
44
docker:
5-
- image: circleci/node:10.18.1-browsers
5+
- image: circleci/node:12-browsers
66
steps:
77
- checkout
88
- restore_cache:
@@ -19,7 +19,7 @@ jobs:
1919
key: v1-dependencies-{{ checksum "package.json" }}
2020
deploy_stage:
2121
docker:
22-
- image: circleci/node:10.18.1-browsers
22+
- image: circleci/node:12-browsers
2323
user: root
2424
steps:
2525
- checkout
@@ -31,7 +31,7 @@ jobs:
3131
- run: npm publish --dry-run
3232
deploy_prod:
3333
docker:
34-
- image: circleci/node:10.18.1-browsers
34+
- image: circleci/node:12-browsers
3535
user: root
3636
steps:
3737
- checkout
@@ -43,7 +43,7 @@ jobs:
4343
- run: npm publish
4444
deploy_demo:
4545
docker:
46-
- image: circleci/node:10.18.1-browsers
46+
- image: circleci/node:12-browsers
4747
user: root
4848
steps:
4949
- checkout

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bnc-onboard",
3-
"version": "1.34.3",
3+
"version": "1.35.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",
@@ -59,7 +59,7 @@
5959
"@ethereumjs/tx": "^3.0.0",
6060
"@gnosis.pm/safe-apps-provider": "^0.5.0",
6161
"@gnosis.pm/safe-apps-sdk": "^3.0.0",
62-
"@keystonehq/eth-keyring": "0.7.7",
62+
"@keystonehq/eth-keyring": "0.8.4",
6363
"@ledgerhq/hw-app-eth": "^5.49.0",
6464
"@ledgerhq/hw-transport-u2f": "^5.21.0",
6565
"@ledgerhq/hw-transport-webusb": "5.53.0",

‎src/modules/select/wallets/binance-chain-wallet.ts

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,43 @@ function binanceChainWallet(
1818
// Ref: https://binance-wallet.gitbook.io/binance-chain-extension-wallet
1919
const provider = (window as any).BinanceChain
2020

21+
// The following code is necessary as when polling BSC wallet for a balance causes it to
22+
// relaunch the login prompt indefinitely
23+
24+
let providerInterface = null
25+
let address: string | number | null | undefined
26+
27+
if (provider) {
28+
providerInterface = createModernProviderInterface(provider)
29+
30+
if (providerInterface.balance.get) {
31+
if (providerInterface.address.get) {
32+
// Save and override the address `get` method
33+
// Enables us to save the address used below to determine when to get the balance
34+
// We only want to get the balance after we get the address
35+
const addressGet = providerInterface.address.get
36+
providerInterface.address.get = async () => {
37+
address = await addressGet()
38+
return address
39+
}
40+
} else if (providerInterface.address.onChange) {
41+
// Intercept the onChange event to save the address internally
42+
providerInterface.address.onChange(updatedAddress => {
43+
address = updatedAddress
44+
})
45+
}
46+
// Save and override the balance `get` method -- only call the original method
47+
// if we have an address from BSC
48+
const balanceGet = providerInterface.balance.get
49+
providerInterface.balance.get = () => {
50+
return address ? balanceGet() : Promise.resolve(null)
51+
}
52+
}
53+
}
54+
2155
return {
2256
provider,
23-
interface: provider && createModernProviderInterface(provider)
57+
interface: providerInterface
2458
}
2559
},
2660
type: 'injected',

‎src/stores.ts

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -75,28 +75,13 @@ export function initializeStores() {
7575
initialState: null
7676
})
7777

78-
balance = get(
79-
derived<WalletStateSliceStore, BalanceStore | WalletStateSliceStore>(
80-
address,
81-
$address => {
82-
if (!$address) {
83-
return {
84-
subscribe: () => () => {},
85-
setStateSyncer: (stateSyncer: StateSyncer) => undefined,
86-
reset: () => {},
87-
get: () => {}
88-
}
89-
}
90-
return get(app).dappId
91-
? createBalanceStore(null)
92-
: createWalletStateSliceStore({
93-
parameter: 'balance',
94-
initialState: null,
95-
intervalSetting: 1000
96-
})
97-
}
98-
)
99-
)
78+
balance = get(app).dappId
79+
? createBalanceStore(null)
80+
: createWalletStateSliceStore({
81+
parameter: 'balance',
82+
initialState: null,
83+
intervalSetting: 1000
84+
})
10085

10186
wallet = writable({
10287
name: null,

‎yarn.lock

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1776,10 +1776,21 @@
17761776
google-protobuf "^3.7.0-rc.2"
17771777
pbjs "^0.0.5"
17781778

1779-
"@keystonehq/bc-ur-registry-eth@^0.6.8":
1780-
version "0.6.8"
1781-
resolved "https://registry.yarnpkg.com/@keystonehq/bc-ur-registry-eth/-/bc-ur-registry-eth-0.6.8.tgz#1cbb661a25a27f3b0d68ad0644883c2521b4bbc1"
1782-
integrity sha512-JluftBw7BbK2v/Lv3j9nwr5QWqXnDbIGB/7FLKwrniKpMCihbA/Lpr0lK6vOqo2+7bReJ7yXMm2LOaXSEdQ+hw==
1779+
"@keystonehq/base-eth-keyring@^0.0.9":
1780+
version "0.0.9"
1781+
resolved "https://registry.yarnpkg.com/@keystonehq/base-eth-keyring/-/base-eth-keyring-0.0.9.tgz#67c2e37ac1669c3bcc65b2709eb6106d2f517fa0"
1782+
integrity sha512-gx2XLTVbX5ORLuEhTwQHRzEl7XEqvowE9zraZqb08styEr4YQGai6HMjLZbGl7YiixVo2y8m/4NOdPXeg20rDQ==
1783+
dependencies:
1784+
"@ethereumjs/tx" "3.0.0"
1785+
"@keystonehq/bc-ur-registry-eth" "^0.6.13"
1786+
ethereumjs-util "^7.0.8"
1787+
hdkey "^2.0.1"
1788+
uuid "^8.3.2"
1789+
1790+
"@keystonehq/bc-ur-registry-eth@^0.6.13":
1791+
version "0.6.13"
1792+
resolved "https://registry.yarnpkg.com/@keystonehq/bc-ur-registry-eth/-/bc-ur-registry-eth-0.6.13.tgz#c1680930b1d3fed14857336bd4fb47a484dfac32"
1793+
integrity sha512-sQQMMiKlacxMOIGeH8l/m/j3sL2VaM7Zid/xvf6cogZ5EZ5pa8Jow8cgY/t7krTOOBp81/GglCbwCGC8RIOLqA==
17831794
dependencies:
17841795
"@keystonehq/bc-ur-registry" "^0.4.4"
17851796
ethereumjs-util "^7.0.8"
@@ -1795,29 +1806,27 @@
17951806
base58check "^2.0.0"
17961807
tslib "^2.3.0"
17971808

1798-
"@keystonehq/eth-keyring@0.7.7":
1799-
version "0.7.7"
1800-
resolved "https://registry.yarnpkg.com/@keystonehq/eth-keyring/-/eth-keyring-0.7.7.tgz#c22612e40dbf45fee875c09bf0ee332b3d580cb0"
1801-
integrity sha512-BAfiUKu7vc8GlUpA+ZUA4nVOXGFx3CyO3sOrRdv5/wtTLE0SbcOYSQKrYUop2ERHbhcOilGOtuJfu/vwkOk1cA==
1809+
"@keystonehq/eth-keyring@0.8.4":
1810+
version "0.8.4"
1811+
resolved "https://registry.yarnpkg.com/@keystonehq/eth-keyring/-/eth-keyring-0.8.4.tgz#0b5c86d1dcf204eba02b36a58b9be91cf7a8869b"
1812+
integrity sha512-ULUm6tg3wPQjhVyuUN7sJcmlb1yyLHzid0+OaQSlkZlf57GeIZGdqpd33XcmpXBILG7t3FCrQ5LvHVmTNFpSgg==
18021813
dependencies:
18031814
"@ethereumjs/tx" "3.0.0"
1804-
"@keystonehq/bc-ur-registry-eth" "^0.6.8"
1805-
"@keystonehq/sdk" "^0.7.8"
1815+
"@keystonehq/base-eth-keyring" "^0.0.9"
1816+
"@keystonehq/bc-ur-registry-eth" "^0.6.13"
1817+
"@keystonehq/sdk" "^0.7.13"
1818+
"@metamask/obs-store" "^7.0.0"
18061819
bs58check "^2.1.2"
18071820
ethereumjs-util "^7.0.8"
18081821
hdkey "^2.0.1"
18091822
uuid "^8.3.2"
18101823

1811-
"@keystonehq/sdk@^0.7.8":
1812-
version "0.7.8"
1813-
resolved "https://registry.yarnpkg.com/@keystonehq/sdk/-/sdk-0.7.8.tgz#1d808c4c59bd7a58d29c3f7fb2df10beb38a4c3f"
1814-
integrity sha512-WlrKftKYsdNopKqMwP+FZRFX2VBfkUC0T3NeaNg9f8RsFokeYXqYd/E4TSbv1dYY9R+jAvRqSzz44g5H2RPIlg==
1824+
"@keystonehq/sdk@^0.7.13":
1825+
version "0.7.13"
1826+
resolved "https://registry.yarnpkg.com/@keystonehq/sdk/-/sdk-0.7.13.tgz#127c465735a5c942468c7e729f4a8f982de9a0ff"
1827+
integrity sha512-m4bDz2w94Q3qlt1Nq2kepbH2rEI/97lxbuak8wk1dzRDLpe+VLb/TCy/87EepOfnjJD+1h6q/c4ZMgE2YMFZyA==
18151828
dependencies:
18161829
"@ngraveio/bc-ur" "^1.0.0"
1817-
"@types/qrcode.react" "^1.0.1"
1818-
"@types/react-dom" "^17.0.9"
1819-
"@types/react-modal" "^3.12.0"
1820-
"@types/react-qr-reader" "^2.1.3"
18211830
qrcode.react "^1.0.1"
18221831
react "16.13.1"
18231832
react-dom "16.13.1"
@@ -1893,6 +1902,14 @@
18931902
resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-5.50.0.tgz#29c6419e8379d496ab6d0426eadf3c4d100cd186"
18941903
integrity sha512-swKHYCOZUGyVt4ge0u8a7AwNcA//h4nx5wIi0sruGye1IJ5Cva0GyK9L2/WdX+kWVTKp92ZiEo1df31lrWGPgA==
18951904

1905+
"@metamask/obs-store@^7.0.0":
1906+
version "7.0.0"
1907+
resolved "https://registry.yarnpkg.com/@metamask/obs-store/-/obs-store-7.0.0.tgz#6cae5f28306bb3e83a381bc9ae22682316095bd3"
1908+
integrity sha512-Tr61Uu9CGXkCg5CZwOYRMQERd+y6fbtrtLd/PzDTPHO5UJpmSbU+7MPcQK7d1DwZCOCeCIvhmZSUCvYliC8uGw==
1909+
dependencies:
1910+
"@metamask/safe-event-emitter" "^2.0.0"
1911+
through2 "^2.0.3"
1912+
18961913
"@metamask/safe-event-emitter@2.0.0", "@metamask/safe-event-emitter@^2.0.0":
18971914
version "2.0.0"
18981915
resolved "https://registry.yarnpkg.com/@metamask/safe-event-emitter/-/safe-event-emitter-2.0.0.tgz#af577b477c683fad17c619a78208cede06f9605c"
@@ -2238,13 +2255,6 @@
22382255
dependencies:
22392256
"@types/react" "*"
22402257

2241-
"@types/react-dom@^17.0.9":
2242-
version "17.0.9"
2243-
resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.9.tgz#441a981da9d7be117042e1a6fd3dac4b30f55add"
2244-
integrity sha512-wIvGxLfgpVDSAMH5utdL9Ngm5Owu0VsGmldro3ORLXV8CShrL8awVj06NuEXFQ5xyaYfdca7Sgbk/50Ri1GdPg==
2245-
dependencies:
2246-
"@types/react" "*"
2247-
22482258
"@types/react-modal@^3.12.0":
22492259
version "3.12.0"
22502260
resolved "https://registry.yarnpkg.com/@types/react-modal/-/react-modal-3.12.0.tgz#91fa86a76fd7fc57e36d2cf9b76efe5735a855a1"

0 commit comments

Comments
 (0)