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
26bf70ca
Unverified
Commit
26bf70ca
authored
Mar 16, 2023
by
Joshua Gutow
Committed by
GitHub
Mar 16, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #5142 from ethereum-optimism/jg/txgmr_timeout
op-batcher/proposer: Increase sendTx timeout
parents
6047ee37
2339364a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
txmgr.go
op-batcher/batcher/txmgr.go
+1
-1
l2_output_submitter.go
op-proposer/proposer/l2_output_submitter.go
+7
-6
No files found.
op-batcher/batcher/txmgr.go
View file @
26bf70ca
...
...
@@ -55,7 +55,7 @@ func (t *TransactionManager) SendTransaction(ctx context.Context, data []byte) (
return
nil
,
fmt
.
Errorf
(
"failed to create tx: %w"
,
err
)
}
ctx
,
cancel
:=
context
.
WithTimeout
(
ctx
,
10
0
*
time
.
Second
)
// TODO: Select a timeout that makes sense here.
ctx
,
cancel
:=
context
.
WithTimeout
(
ctx
,
10
*
time
.
Minute
)
// TODO: Select a timeout that makes sense here.
defer
cancel
()
if
receipt
,
err
:=
t
.
txMgr
.
Send
(
ctx
,
tx
);
err
!=
nil
{
t
.
log
.
Warn
(
"unable to publish tx"
,
"err"
,
err
,
"data_size"
,
len
(
data
))
...
...
op-proposer/proposer/l2_output_submitter.go
View file @
26bf70ca
...
...
@@ -384,30 +384,31 @@ func (l *L2OutputSubmitter) loop() {
for
{
select
{
case
<-
ticker
.
C
:
cCtx
,
cancel
:=
context
.
WithTimeout
(
ctx
,
3
*
time
.
Minute
)
cCtx
,
cancel
:=
context
.
WithTimeout
(
ctx
,
3
0
*
time
.
Second
)
output
,
shouldPropose
,
err
:=
l
.
FetchNextOutputInfo
(
cCtx
)
if
err
!=
nil
{
l
.
log
.
Error
(
"Failed to fetch next output"
,
"err"
,
err
)
cancel
()
if
err
!=
nil
{
break
}
if
!
shouldPropose
{
cancel
()
break
}
cCtx
,
cancel
=
context
.
WithTimeout
(
ctx
,
30
*
time
.
Second
)
tx
,
err
:=
l
.
CreateProposalTx
(
cCtx
,
output
)
cancel
()
if
err
!=
nil
{
l
.
log
.
Error
(
"Failed to create proposal transaction"
,
"err"
,
err
)
cancel
()
break
}
cCtx
,
cancel
=
context
.
WithTimeout
(
ctx
,
10
*
time
.
Minute
)
if
err
:=
l
.
SendTransaction
(
cCtx
,
tx
);
err
!=
nil
{
l
.
log
.
Error
(
"Failed to send proposal transaction"
,
"err"
,
err
)
cancel
()
break
}
}
else
{
cancel
()
}
case
<-
l
.
done
:
return
...
...
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