Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
interface
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LuckySwap
interface
Commits
30e30189
Unverified
Commit
30e30189
authored
Feb 16, 2022
by
Zach Pomerantz
Committed by
GitHub
Feb 16, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: use a void signer for ethers providers (#3327)
parent
6a602cf6
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
16 deletions
+40
-16
package.json
package.json
+2
-1
Widget.tsx
src/lib/components/Widget.tsx
+3
-14
useEip1193Provider.ts
src/lib/hooks/useEip1193Provider.ts
+34
-0
yarn.lock
yarn.lock
+1
-1
No files found.
package.json
View file @
30e30189
...
@@ -15,7 +15,6 @@
...
@@ -15,7 +15,6 @@
"
@babel/preset-env
"
:
"
^7.16.11
"
,
"
@babel/preset-env
"
:
"
^7.16.11
"
,
"
@babel/preset-react
"
:
"
^7.16.7
"
,
"
@babel/preset-react
"
:
"
^7.16.7
"
,
"
@babel/preset-typescript
"
:
"
^7.16.7
"
,
"
@babel/preset-typescript
"
:
"
^7.16.7
"
,
"
@ethersproject/experimental
"
:
"
^5.4.0
"
,
"
@gnosis.pm/safe-apps-web3-react
"
:
"
^0.6.0
"
,
"
@gnosis.pm/safe-apps-web3-react
"
:
"
^0.6.0
"
,
"
@graphql-codegen/cli
"
:
"
1.21.5
"
,
"
@graphql-codegen/cli
"
:
"
1.21.5
"
,
"
@graphql-codegen/typescript
"
:
"
1.22.3
"
,
"
@graphql-codegen/typescript
"
:
"
1.22.3
"
,
...
@@ -173,11 +172,13 @@
...
@@ -173,11 +172,13 @@
"
@babel/runtime
"
:
"
^7.17.0
"
,
"
@babel/runtime
"
:
"
^7.17.0
"
,
"
@ethersproject/abi
"
:
"
^5.4.1
"
,
"
@ethersproject/abi
"
:
"
^5.4.1
"
,
"
@ethersproject/abstract-provider
"
:
"
^5.4.1
"
,
"
@ethersproject/abstract-provider
"
:
"
^5.4.1
"
,
"
@ethersproject/abstract-signer
"
:
"
^5.4.1
"
,
"
@ethersproject/address
"
:
"
^5.4.0
"
,
"
@ethersproject/address
"
:
"
^5.4.0
"
,
"
@ethersproject/bignumber
"
:
"
^5.4.2
"
,
"
@ethersproject/bignumber
"
:
"
^5.4.2
"
,
"
@ethersproject/bytes
"
:
"
^5.4.0
"
,
"
@ethersproject/bytes
"
:
"
^5.4.0
"
,
"
@ethersproject/constants
"
:
"
^5.4.0
"
,
"
@ethersproject/constants
"
:
"
^5.4.0
"
,
"
@ethersproject/contracts
"
:
"
^5.4.1
"
,
"
@ethersproject/contracts
"
:
"
^5.4.1
"
,
"
@ethersproject/experimental
"
:
"
^5.4.0
"
,
"
@ethersproject/hash
"
:
"
^5.4.0
"
,
"
@ethersproject/hash
"
:
"
^5.4.0
"
,
"
@ethersproject/providers
"
:
"
5.4.0
"
,
"
@ethersproject/providers
"
:
"
5.4.0
"
,
"
@ethersproject/solidity
"
:
"
^5.4.0
"
,
"
@ethersproject/solidity
"
:
"
^5.4.0
"
,
...
...
src/lib/components/Widget.tsx
View file @
30e30189
import
{
Provider
as
EthersProvider
}
from
'
@ethersproject/abstract-provider
'
import
{
Provider
as
EthersProvider
}
from
'
@ethersproject/abstract-provider
'
import
{
Signer
as
EthersSigner
}
from
'
@ethersproject/abstract-signer
'
import
{
Signer
as
EthersSigner
}
from
'
@ethersproject/abstract-signer
'
import
{
Eip1193Bridge
}
from
'
@ethersproject/experimental
'
import
{
ExternalProvider
}
from
'
@ethersproject/providers
'
import
{
JsonRpcProvider
}
from
'
@ethersproject/providers
'
import
{
Provider
as
Eip1193Provider
}
from
'
@web3-react/types
'
import
{
Provider
as
Eip1193Provider
}
from
'
@web3-react/types
'
import
{
DEFAULT_LOCALE
,
SupportedLocale
}
from
'
constants/locales
'
import
{
DEFAULT_LOCALE
,
SupportedLocale
}
from
'
constants/locales
'
import
{
Provider
as
AtomProvider
}
from
'
jotai
'
import
{
Provider
as
AtomProvider
}
from
'
jotai
'
import
{
TransactionsUpdater
}
from
'
lib/hooks/transactions
'
import
{
TransactionsUpdater
}
from
'
lib/hooks/transactions
'
import
{
BlockUpdater
}
from
'
lib/hooks/useBlockNumber
'
import
{
BlockUpdater
}
from
'
lib/hooks/useBlockNumber
'
import
useEip1193Provider
from
'
lib/hooks/useEip1193Provider
'
import
{
UNMOUNTING
}
from
'
lib/hooks/useUnmount
'
import
{
UNMOUNTING
}
from
'
lib/hooks/useUnmount
'
import
{
Provider
as
I18nProvider
}
from
'
lib/i18n
'
import
{
Provider
as
I18nProvider
}
from
'
lib/i18n
'
import
{
MulticallUpdater
,
store
as
multicallStore
}
from
'
lib/state/multicall
'
import
{
MulticallUpdater
,
store
as
multicallStore
}
from
'
lib/state/multicall
'
...
@@ -96,7 +94,7 @@ function Updaters() {
...
@@ -96,7 +94,7 @@ function Updaters() {
export
type
WidgetProps
=
{
export
type
WidgetProps
=
{
theme
?:
Theme
theme
?:
Theme
locale
?:
SupportedLocale
locale
?:
SupportedLocale
provider
?:
Eip1193Provider
|
E
xternalProvider
|
JsonRpc
Provider
|
{
provider
:
EthersProvider
;
signer
:
EthersSigner
}
provider
?:
Eip1193Provider
|
E
thers
Provider
|
{
provider
:
EthersProvider
;
signer
:
EthersSigner
}
jsonRpcEndpoint
?:
string
jsonRpcEndpoint
?:
string
width
?:
string
|
number
width
?:
string
|
number
dialog
?:
HTMLElement
|
null
dialog
?:
HTMLElement
|
null
...
@@ -116,16 +114,7 @@ export default function Widget(props: PropsWithChildren<WidgetProps>) {
...
@@ -116,16 +114,7 @@ export default function Widget(props: PropsWithChildren<WidgetProps>) {
className
,
className
,
onError
,
onError
,
}
=
props
}
=
props
const
eip1193
=
useEip1193Provider
(
provider
)
let
eip1193
:
Eip1193Provider
|
undefined
if
(
provider
&&
'
provider
'
in
provider
&&
'
signer
'
in
provider
)
{
eip1193
=
new
Eip1193Bridge
(
provider
.
signer
,
provider
.
provider
)
}
else
if
(
provider
instanceof
JsonRpcProvider
)
{
eip1193
=
new
Eip1193Bridge
(
provider
.
getSigner
(),
provider
)
}
else
if
(
provider
)
{
eip1193
=
provider
as
Eip1193Provider
}
const
[
dialog
,
setDialog
]
=
useState
<
HTMLDivElement
|
null
>
(
null
)
const
[
dialog
,
setDialog
]
=
useState
<
HTMLDivElement
|
null
>
(
null
)
return
(
return
(
<
StrictMode
>
<
StrictMode
>
...
...
src/lib/hooks/useEip1193Provider.ts
0 → 100644
View file @
30e30189
import
{
Provider
as
EthersProvider
}
from
'
@ethersproject/abstract-provider
'
import
{
Signer
as
EthersSigner
}
from
'
@ethersproject/abstract-signer
'
import
{
VoidSigner
}
from
'
@ethersproject/abstract-signer
'
import
{
Eip1193Bridge
}
from
'
@ethersproject/experimental
'
import
{
JsonRpcProvider
}
from
'
@ethersproject/providers
'
import
{
Provider
as
Eip1193Provider
}
from
'
@web3-react/types
'
import
{
ZERO_ADDRESS
}
from
'
constants/misc
'
import
{
useMemo
}
from
'
react
'
const
voidSigner
=
new
VoidSigner
(
ZERO_ADDRESS
)
export
default
function
useEip1193Provider
(
provider
?:
Eip1193Provider
|
EthersProvider
|
JsonRpcProvider
|
{
provider
:
EthersProvider
;
signer
:
EthersSigner
}
):
Eip1193Provider
|
undefined
{
return
useMemo
(()
=>
{
if
(
provider
)
{
if
(
provider
instanceof
EthersProvider
)
{
// A JsonRpcProvider includes its own Signer, otherwise use a VoidSigner.
const
signer
=
'
getSigner
'
in
provider
?
provider
.
getSigner
()
:
null
??
voidSigner
return
new
Eip1193Bridge
(
signer
,
provider
)
}
if
(
'
provider
'
in
provider
&&
'
signer
'
in
provider
)
{
return
new
Eip1193Bridge
(
provider
.
signer
,
provider
.
provider
)
}
// See https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1193.md.
if
(
'
request
'
in
provider
&&
'
on
'
in
provider
&&
'
removeListener
'
in
provider
)
{
return
provider
}
}
return
},
[
provider
])
}
yarn.lock
View file @
30e30189
...
@@ -1553,7 +1553,7 @@
...
@@ -1553,7 +1553,7 @@
"@ethersproject/logger" "^5.4.0"
"@ethersproject/logger" "^5.4.0"
"@ethersproject/properties" "^5.4.0"
"@ethersproject/properties" "^5.4.0"
"@ethersproject/abstract-signer@^5.4.0", "@ethersproject/abstract-signer@^5.5.0":
"@ethersproject/abstract-signer@^5.4.0", "@ethersproject/abstract-signer@^5.
4.1", "@ethersproject/abstract-signer@^5.
5.0":
version "5.5.0"
version "5.5.0"
resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.5.0.tgz#590ff6693370c60ae376bf1c7ada59eb2a8dd08d"
resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.5.0.tgz#590ff6693370c60ae376bf1c7ada59eb2a8dd08d"
integrity sha512-lj//7r250MXVLKI7sVarXAbZXbv9P50lgmJQGr2/is82EwEb8r7HrxsmMqAjTsztMYy7ohrIhGMIml+Gx4D3mA==
integrity sha512-lj//7r250MXVLKI7sVarXAbZXbv9P50lgmJQGr2/is82EwEb8r7HrxsmMqAjTsztMYy7ohrIhGMIml+Gx4D3mA==
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment