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
32f95569
Unverified
Commit
32f95569
authored
Mar 09, 2022
by
Zach Pomerantz
Committed by
GitHub
Mar 09, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: restructure web3 to memoize (#3472)
parent
96c66a58
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
64 additions
and
71 deletions
+64
-71
Web3Provider.tsx
src/lib/components/Web3Provider.tsx
+0
-40
Widget.tsx
src/lib/components/Widget.tsx
+1
-1
useActiveWeb3React.ts
src/lib/hooks/useActiveWeb3React.ts
+0
-19
useActiveWeb3React.tsx
src/lib/hooks/useActiveWeb3React.tsx
+63
-0
web3.ts
src/lib/state/web3.ts
+0
-11
No files found.
src/lib/components/Web3Provider.tsx
deleted
100644 → 0
View file @
96c66a58
import
{
initializeConnector
}
from
'
@web3-react/core
'
import
{
EIP1193
}
from
'
@web3-react/eip1193
'
import
{
Actions
,
Connector
,
Provider
as
Eip1193Provider
}
from
'
@web3-react/types
'
import
{
Url
}
from
'
@web3-react/url
'
import
{
SetStateAction
}
from
'
jotai
'
import
{
RESET
,
useUpdateAtom
}
from
'
jotai/utils
'
import
{
injectedAtom
,
urlAtom
,
Web3ReactState
}
from
'
lib/state/web3
'
import
{
ReactNode
,
useEffect
}
from
'
react
'
interface
Web3ProviderProps
{
jsonRpcEndpoint
?:
string
provider
?:
Eip1193Provider
children
:
ReactNode
}
function
useConnector
<
T
extends
{
new
(
actions
:
Actions
,
initializer
:
I
):
Connector
},
I
>
(
Connector
:
T
,
initializer
:
I
|
undefined
,
setContext
:
(
update
:
typeof
RESET
|
SetStateAction
<
Web3ReactState
>
)
=>
void
)
{
return
useEffect
(()
=>
{
if
(
initializer
)
{
const
state
=
initializeConnector
((
actions
)
=>
new
Connector
(
actions
,
initializer
))
state
[
0
].
activate
()
setContext
(
state
)
}
else
{
setContext
(
RESET
)
}
},
[
Connector
,
initializer
,
setContext
])
}
export
default
function
Web3Provider
({
jsonRpcEndpoint
,
provider
,
children
}:
Web3ProviderProps
)
{
const
setUrl
=
useUpdateAtom
(
urlAtom
)
useConnector
(
Url
,
jsonRpcEndpoint
,
setUrl
)
const
setInjected
=
useUpdateAtom
(
injectedAtom
)
useConnector
(
EIP1193
,
provider
,
setInjected
)
return
<>
{
children
}
</>
}
src/lib/components/Widget.tsx
View file @
32f95569
...
...
@@ -3,6 +3,7 @@ import { Provider as Eip1193Provider } from '@web3-react/types'
import
{
DEFAULT_LOCALE
,
SupportedLocale
}
from
'
constants/locales
'
import
{
Provider
as
AtomProvider
}
from
'
jotai
'
import
{
TransactionsUpdater
}
from
'
lib/hooks/transactions
'
import
{
Web3Provider
}
from
'
lib/hooks/useActiveWeb3React
'
import
{
BlockUpdater
}
from
'
lib/hooks/useBlockNumber
'
import
useEip1193Provider
from
'
lib/hooks/useEip1193Provider
'
import
{
UNMOUNTING
}
from
'
lib/hooks/useUnmount
'
...
...
@@ -15,7 +16,6 @@ import { Provider as ReduxProvider } from 'react-redux'
import
{
Modal
,
Provider
as
DialogProvider
}
from
'
./Dialog
'
import
ErrorBoundary
,
{
ErrorHandler
}
from
'
./Error/ErrorBoundary
'
import
WidgetPropValidator
from
'
./Error/WidgetsPropsValidator
'
import
Web3Provider
from
'
./Web3Provider
'
const
WidgetWrapper
=
styled
.
div
<
{
width
?:
number
|
string
}
>
`
-moz-osx-font-smoothing: grayscale;
...
...
src/lib/hooks/useActiveWeb3React.ts
deleted
100644 → 0
View file @
96c66a58
import
{
Web3ReactHooks
}
from
'
@web3-react/core
'
import
{
useAtomValue
}
from
'
jotai/utils
'
import
{
injectedAtom
,
urlAtom
,
Web3ReactState
}
from
'
lib/state/web3
'
export
function
useActiveWeb3ReactState
():
Web3ReactState
{
const
injected
=
useAtomValue
(
injectedAtom
)
const
url
=
useAtomValue
(
urlAtom
)
return
injected
[
1
].
useIsActive
()
?
injected
:
url
}
export
function
useActiveWeb3ReactHooks
():
Web3ReactHooks
{
const
[,
hooks
]
=
useActiveWeb3ReactState
()
return
hooks
}
export
default
function
useActiveWeb3React
()
{
const
{
useProvider
,
useWeb3React
}
=
useActiveWeb3ReactHooks
()
return
useWeb3React
(
useProvider
())
}
src/lib/hooks/useActiveWeb3React.tsx
0 → 100644
View file @
32f95569
import
{
getPriorityConnector
,
initializeConnector
,
Web3ReactHooks
}
from
'
@web3-react/core
'
import
{
EIP1193
}
from
'
@web3-react/eip1193
'
import
{
EMPTY
}
from
'
@web3-react/empty
'
import
{
Actions
,
Connector
,
Provider
as
Eip1193Provider
}
from
'
@web3-react/types
'
import
{
Url
}
from
'
@web3-react/url
'
import
{
useAtom
,
WritableAtom
}
from
'
jotai
'
import
{
useAtomValue
}
from
'
jotai/utils
'
import
{
atomWithDefault
,
RESET
,
useUpdateAtom
}
from
'
jotai/utils
'
import
{
PropsWithChildren
,
useEffect
}
from
'
react
'
const
[
connector
,
hooks
]
=
initializeConnector
(()
=>
EMPTY
)
const
EMPTY_CONNECTOR
:
[
Connector
,
Web3ReactHooks
]
=
[
connector
,
hooks
]
const
urlConnectorAtom
=
atomWithDefault
<
[
Connector
,
Web3ReactHooks
]
>
(()
=>
EMPTY_CONNECTOR
)
const
injectedConnectorAtom
=
atomWithDefault
<
[
Connector
,
Web3ReactHooks
]
>
(()
=>
EMPTY_CONNECTOR
)
const
web3Atom
=
atomWithDefault
<
ReturnType
<
typeof
hooks
.
useWeb3React
>>
(()
=>
({
connector
:
EMPTY_CONNECTOR
[
0
],
library
:
undefined
,
chainId
:
undefined
,
account
:
undefined
,
active
:
false
,
error
:
undefined
,
}))
export
default
function
useActiveWeb3React
()
{
return
useAtomValue
(
web3Atom
)
}
function
useConnector
<
T
extends
{
new
(
actions
:
Actions
,
initializer
:
I
):
Connector
},
I
>
(
connectorAtom
:
WritableAtom
<
[
Connector
,
Web3ReactHooks
],
typeof
RESET
|
[
Connector
,
Web3ReactHooks
]
>
,
Connector
:
T
,
initializer
:
I
|
undefined
)
{
const
[
connector
,
setConnector
]
=
useAtom
(
connectorAtom
)
useEffect
(()
=>
{
if
(
initializer
)
{
const
[
connector
,
hooks
]
=
initializeConnector
((
actions
)
=>
new
Connector
(
actions
,
initializer
))
connector
.
activate
()
setConnector
([
connector
,
hooks
])
}
else
{
setConnector
(
RESET
)
}
},
[
Connector
,
initializer
,
setConnector
])
return
connector
}
interface
Web3ProviderProps
{
provider
?:
Eip1193Provider
jsonRpcEndpoint
?:
string
}
export
function
Web3Provider
({
provider
,
jsonRpcEndpoint
,
children
}:
PropsWithChildren
<
Web3ProviderProps
>
)
{
const
injectedConnector
=
useConnector
(
injectedConnectorAtom
,
EIP1193
,
provider
)
const
urlConnector
=
useConnector
(
urlConnectorAtom
,
Url
,
jsonRpcEndpoint
)
const
priorityConnector
=
getPriorityConnector
(
injectedConnector
,
urlConnector
)
const
priorityProvider
=
priorityConnector
.
usePriorityProvider
()
const
priorityWeb3React
=
priorityConnector
.
usePriorityWeb3React
(
priorityProvider
)
const
setWeb3
=
useUpdateAtom
(
web3Atom
)
useEffect
(()
=>
{
setWeb3
(
priorityWeb3React
)
},
[
priorityWeb3React
,
setWeb3
])
return
<>
{
children
}
</>
}
src/lib/state/web3.ts
deleted
100644 → 0
View file @
96c66a58
import
{
initializeConnector
,
Web3ReactHooks
}
from
'
@web3-react/core
'
import
{
EMPTY
}
from
'
@web3-react/empty
'
import
{
Connector
,
Web3ReactStore
}
from
'
@web3-react/types
'
import
{
atomWithDefault
}
from
'
jotai/utils
'
export
type
Web3ReactState
=
[
Connector
,
Web3ReactHooks
,
Web3ReactStore
]
const
EMPTY_CONNECTOR
=
initializeConnector
(()
=>
EMPTY
)
export
const
urlAtom
=
atomWithDefault
<
Web3ReactState
>
(()
=>
EMPTY_CONNECTOR
)
export
const
injectedAtom
=
atomWithDefault
<
Web3ReactState
>
(()
=>
EMPTY_CONNECTOR
)
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