Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
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
exchain
nebula
Commits
cdaf2490
Unverified
Commit
cdaf2490
authored
Aug 20, 2021
by
Mark Tyneway
Committed by
GitHub
Aug 20, 2021
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1354 from ethereum-optimism/fix/static-jsonrpc-provider
batch-submitter,dtl: use ethers.StaticJsonRpcProvider
parents
3aa1cad0
b5b9fd89
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
27 additions
and
10 deletions
+27
-10
empty-colts-attack.md
.changeset/empty-colts-attack.md
+5
-0
healthy-dragons-worry.md
.changeset/healthy-dragons-worry.md
+5
-0
batch-submitter.ts
...es/batch-submitter/src/batch-submitter/batch-submitter.ts
+1
-1
state-batch-submitter.ts
...ch-submitter/src/batch-submitter/state-batch-submitter.ts
+1
-1
tx-batch-submitter.ts
...batch-submitter/src/batch-submitter/tx-batch-submitter.ts
+1
-1
run-batch-submitter.ts
packages/batch-submitter/src/exec/run-batch-submitter.ts
+11
-4
service.ts
...data-transport-layer/src/services/l1-ingestion/service.ts
+3
-3
No files found.
.changeset/empty-colts-attack.md
0 → 100644
View file @
cdaf2490
---
'
@eth-optimism/batch-submitter'
:
patch
---
Migrate to using
`ethers.StaticJsonRpcProvider`
.changeset/healthy-dragons-worry.md
0 → 100644
View file @
cdaf2490
---
'
@eth-optimism/data-transport-layer'
:
patch
---
Migrate to using
`ethers.StaticJsonRpcProvider`
packages/batch-submitter/src/batch-submitter/batch-submitter.ts
View file @
cdaf2490
...
@@ -43,7 +43,7 @@ export abstract class BatchSubmitter {
...
@@ -43,7 +43,7 @@ export abstract class BatchSubmitter {
constructor
(
constructor
(
readonly
signer
:
Signer
,
readonly
signer
:
Signer
,
readonly
l2Provider
:
providers
.
JsonRpcProvider
,
readonly
l2Provider
:
providers
.
Static
JsonRpcProvider
,
readonly
minTxSize
:
number
,
readonly
minTxSize
:
number
,
readonly
maxTxSize
:
number
,
readonly
maxTxSize
:
number
,
readonly
maxBatchSize
:
number
,
readonly
maxBatchSize
:
number
,
...
...
packages/batch-submitter/src/batch-submitter/state-batch-submitter.ts
View file @
cdaf2490
...
@@ -28,7 +28,7 @@ export class StateBatchSubmitter extends BatchSubmitter {
...
@@ -28,7 +28,7 @@ export class StateBatchSubmitter extends BatchSubmitter {
constructor
(
constructor
(
signer
:
Signer
,
signer
:
Signer
,
l2Provider
:
providers
.
JsonRpcProvider
,
l2Provider
:
providers
.
Static
JsonRpcProvider
,
minTxSize
:
number
,
minTxSize
:
number
,
maxTxSize
:
number
,
maxTxSize
:
number
,
maxBatchSize
:
number
,
maxBatchSize
:
number
,
...
...
packages/batch-submitter/src/batch-submitter/tx-batch-submitter.ts
View file @
cdaf2490
...
@@ -41,7 +41,7 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
...
@@ -41,7 +41,7 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
constructor
(
constructor
(
signer
:
Signer
,
signer
:
Signer
,
l2Provider
:
providers
.
JsonRpcProvider
,
l2Provider
:
providers
.
Static
JsonRpcProvider
,
minTxSize
:
number
,
minTxSize
:
number
,
maxTxSize
:
number
,
maxTxSize
:
number
,
maxBatchSize
:
number
,
maxBatchSize
:
number
,
...
...
packages/batch-submitter/src/exec/run-batch-submitter.ts
View file @
cdaf2490
...
@@ -4,7 +4,10 @@ import * as Sentry from '@sentry/node'
...
@@ -4,7 +4,10 @@ import * as Sentry from '@sentry/node'
import
{
Logger
,
Metrics
,
createMetricsServer
}
from
'
@eth-optimism/common-ts
'
import
{
Logger
,
Metrics
,
createMetricsServer
}
from
'
@eth-optimism/common-ts
'
import
{
exit
}
from
'
process
'
import
{
exit
}
from
'
process
'
import
{
Signer
,
Wallet
}
from
'
ethers
'
import
{
Signer
,
Wallet
}
from
'
ethers
'
import
{
JsonRpcProvider
,
TransactionReceipt
}
from
'
@ethersproject/providers
'
import
{
StaticJsonRpcProvider
,
TransactionReceipt
,
}
from
'
@ethersproject/providers
'
import
*
as
dotenv
from
'
dotenv
'
import
*
as
dotenv
from
'
dotenv
'
import
Config
from
'
bcfg
'
import
Config
from
'
bcfg
'
...
@@ -136,7 +139,9 @@ export const run = async () => {
...
@@ -136,7 +139,9 @@ export const run = async () => {
)
)
const
getSequencerSigner
=
async
():
Promise
<
Signer
>
=>
{
const
getSequencerSigner
=
async
():
Promise
<
Signer
>
=>
{
const
l1Provider
=
new
JsonRpcProvider
(
requiredEnvVars
.
L1_NODE_WEB3_URL
)
const
l1Provider
=
new
StaticJsonRpcProvider
(
requiredEnvVars
.
L1_NODE_WEB3_URL
)
if
(
useHardhat
)
{
if
(
useHardhat
)
{
if
(
!
DEBUG_IMPERSONATE_SEQUENCER_ADDRESS
)
{
if
(
!
DEBUG_IMPERSONATE_SEQUENCER_ADDRESS
)
{
...
@@ -161,7 +166,9 @@ export const run = async () => {
...
@@ -161,7 +166,9 @@ export const run = async () => {
}
}
const
getProposerSigner
=
async
():
Promise
<
Signer
>
=>
{
const
getProposerSigner
=
async
():
Promise
<
Signer
>
=>
{
const
l1Provider
=
new
JsonRpcProvider
(
requiredEnvVars
.
L1_NODE_WEB3_URL
)
const
l1Provider
=
new
StaticJsonRpcProvider
(
requiredEnvVars
.
L1_NODE_WEB3_URL
)
if
(
useHardhat
)
{
if
(
useHardhat
)
{
if
(
!
DEBUG_IMPERSONATE_PROPOSER_ADDRESS
)
{
if
(
!
DEBUG_IMPERSONATE_PROPOSER_ADDRESS
)
{
...
@@ -335,7 +342,7 @@ export const run = async () => {
...
@@ -335,7 +342,7 @@ export const run = async () => {
const
clearPendingTxs
=
requiredEnvVars
.
CLEAR_PENDING_TXS
const
clearPendingTxs
=
requiredEnvVars
.
CLEAR_PENDING_TXS
const
l2Provider
=
injectL2Context
(
const
l2Provider
=
injectL2Context
(
new
JsonRpcProvider
(
requiredEnvVars
.
L2_NODE_WEB3_URL
)
new
Static
JsonRpcProvider
(
requiredEnvVars
.
L2_NODE_WEB3_URL
)
)
)
const
sequencerSigner
:
Signer
=
await
getSequencerSigner
()
const
sequencerSigner
:
Signer
=
await
getSequencerSigner
()
...
...
packages/data-transport-layer/src/services/l1-ingestion/service.ts
View file @
cdaf2490
/* Imports: External */
/* Imports: External */
import
{
fromHexString
}
from
'
@eth-optimism/core-utils
'
import
{
fromHexString
}
from
'
@eth-optimism/core-utils
'
import
{
BaseService
,
Metrics
}
from
'
@eth-optimism/common-ts
'
import
{
BaseService
,
Metrics
}
from
'
@eth-optimism/common-ts
'
import
{
JsonRpcProvider
}
from
'
@ethersproject/providers
'
import
{
Static
JsonRpcProvider
}
from
'
@ethersproject/providers
'
import
{
LevelUp
}
from
'
levelup
'
import
{
LevelUp
}
from
'
levelup
'
import
{
ethers
,
constants
}
from
'
ethers
'
import
{
ethers
,
constants
}
from
'
ethers
'
import
{
Gauge
,
Counter
}
from
'
prom-client
'
import
{
Gauge
,
Counter
}
from
'
prom-client
'
...
@@ -98,7 +98,7 @@ export class L1IngestionService extends BaseService<L1IngestionServiceOptions> {
...
@@ -98,7 +98,7 @@ export class L1IngestionService extends BaseService<L1IngestionServiceOptions> {
private
state
:
{
private
state
:
{
db
:
TransportDB
db
:
TransportDB
contracts
:
OptimismContracts
contracts
:
OptimismContracts
l1RpcProvider
:
JsonRpcProvider
l1RpcProvider
:
Static
JsonRpcProvider
startingL1BlockNumber
:
number
startingL1BlockNumber
:
number
}
=
{}
as
any
}
=
{}
as
any
...
@@ -109,7 +109,7 @@ export class L1IngestionService extends BaseService<L1IngestionServiceOptions> {
...
@@ -109,7 +109,7 @@ export class L1IngestionService extends BaseService<L1IngestionServiceOptions> {
this
.
state
.
l1RpcProvider
=
this
.
state
.
l1RpcProvider
=
typeof
this
.
options
.
l1RpcProvider
===
'
string
'
typeof
this
.
options
.
l1RpcProvider
===
'
string
'
?
new
JsonRpcProvider
(
this
.
options
.
l1RpcProvider
)
?
new
Static
JsonRpcProvider
(
this
.
options
.
l1RpcProvider
)
:
this
.
options
.
l1RpcProvider
:
this
.
options
.
l1RpcProvider
this
.
logger
.
info
(
'
Using AddressManager
'
,
{
this
.
logger
.
info
(
'
Using AddressManager
'
,
{
...
...
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