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
d35ffaee
Commit
d35ffaee
authored
Sep 06, 2023
by
Hamdi Allam
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small bugfix
parent
415537cf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
14 deletions
+14
-14
l1_bridge_processor.go
indexer/processors/bridge/l1_bridge_processor.go
+7
-7
l2_bridge_processor.go
indexer/processors/bridge/l2_bridge_processor.go
+7
-7
No files found.
indexer/processors/bridge/l1_bridge_processor.go
View file @
d35ffaee
...
@@ -51,7 +51,7 @@ func L1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, chainConfig
...
@@ -51,7 +51,7 @@ func L1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, chainConfig
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
if
len
(
crossDomainSentMessages
)
>
len
(
transactionDeposits
)
{
if
len
(
crossDomainSentMessages
)
<
len
(
transactionDeposits
)
{
return
fmt
.
Errorf
(
"missing transaction deposit for each cross-domain message. deposits: %d, messages: %d"
,
len
(
transactionDeposits
),
len
(
crossDomainSentMessages
))
return
fmt
.
Errorf
(
"missing transaction deposit for each cross-domain message. deposits: %d, messages: %d"
,
len
(
transactionDeposits
),
len
(
crossDomainSentMessages
))
}
}
...
@@ -64,7 +64,7 @@ func L1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, chainConfig
...
@@ -64,7 +64,7 @@ func L1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, chainConfig
// extract the deposit hash from the previous TransactionDepositedEvent
// extract the deposit hash from the previous TransactionDepositedEvent
portalDeposit
,
ok
:=
portalDeposits
[
logKey
{
sentMessage
.
Event
.
BlockHash
,
sentMessage
.
Event
.
LogIndex
-
1
}]
portalDeposit
,
ok
:=
portalDeposits
[
logKey
{
sentMessage
.
Event
.
BlockHash
,
sentMessage
.
Event
.
LogIndex
-
1
}]
if
!
ok
{
if
!
ok
{
return
fmt
.
Errorf
(
"
missing expected preceding TransactionDeposit for SentMessage
. tx_hash = %s"
,
sentMessage
.
Event
.
TransactionHash
)
return
fmt
.
Errorf
(
"
expected TransactionDeposit preceding SentMessage event
. tx_hash = %s"
,
sentMessage
.
Event
.
TransactionHash
)
}
}
l1BridgeMessages
[
i
]
=
database
.
L1BridgeMessage
{
TransactionSourceHash
:
portalDeposit
.
DepositTx
.
SourceHash
,
BridgeMessage
:
sentMessage
.
BridgeMessage
}
l1BridgeMessages
[
i
]
=
database
.
L1BridgeMessage
{
TransactionSourceHash
:
portalDeposit
.
DepositTx
.
SourceHash
,
BridgeMessage
:
sentMessage
.
BridgeMessage
}
...
@@ -82,7 +82,7 @@ func L1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, chainConfig
...
@@ -82,7 +82,7 @@ func L1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, chainConfig
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
if
len
(
initiatedBridges
)
>
len
(
crossDomainSentMessages
)
{
if
len
(
initiatedBridges
)
<
len
(
crossDomainSentMessages
)
{
return
fmt
.
Errorf
(
"missing cross-domain message for each initiated bridge event. messages: %d, bridges: %d"
,
len
(
crossDomainSentMessages
),
len
(
initiatedBridges
))
return
fmt
.
Errorf
(
"missing cross-domain message for each initiated bridge event. messages: %d, bridges: %d"
,
len
(
crossDomainSentMessages
),
len
(
initiatedBridges
))
}
}
...
@@ -93,11 +93,11 @@ func L1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, chainConfig
...
@@ -93,11 +93,11 @@ func L1ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, chainConfig
// extract the cross domain message hash & deposit source hash from the following events
// extract the cross domain message hash & deposit source hash from the following events
portalDeposit
,
ok
:=
portalDeposits
[
logKey
{
initiatedBridge
.
Event
.
BlockHash
,
initiatedBridge
.
Event
.
LogIndex
+
1
}]
portalDeposit
,
ok
:=
portalDeposits
[
logKey
{
initiatedBridge
.
Event
.
BlockHash
,
initiatedBridge
.
Event
.
LogIndex
+
1
}]
if
!
ok
{
if
!
ok
{
return
fmt
.
Errorf
(
"
missing expected following TransactionDeposit for BridgeInitiated
. tx_hash = %s"
,
initiatedBridge
.
Event
.
TransactionHash
)
return
fmt
.
Errorf
(
"
expected TransactionDeposit following BridgeInitiated event
. tx_hash = %s"
,
initiatedBridge
.
Event
.
TransactionHash
)
}
}
sentMessage
,
ok
:=
sentMessages
[
logKey
{
initiatedBridge
.
Event
.
BlockHash
,
initiatedBridge
.
Event
.
LogIndex
+
2
}]
sentMessage
,
ok
:=
sentMessages
[
logKey
{
initiatedBridge
.
Event
.
BlockHash
,
initiatedBridge
.
Event
.
LogIndex
+
2
}]
if
!
ok
{
if
!
ok
{
return
fmt
.
Errorf
(
"
missing expected following SentMessage for BridgeInitiated
. tx_hash = %s"
,
initiatedBridge
.
Event
.
TransactionHash
)
return
fmt
.
Errorf
(
"
expected SentMessage following TransactionDeposit event
. tx_hash = %s"
,
initiatedBridge
.
Event
.
TransactionHash
)
}
}
initiatedBridge
.
BridgeTransfer
.
CrossDomainMessageHash
=
&
sentMessage
.
BridgeMessage
.
MessageHash
initiatedBridge
.
BridgeTransfer
.
CrossDomainMessageHash
=
&
sentMessage
.
BridgeMessage
.
MessageHash
...
@@ -205,7 +205,7 @@ func L1ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, chainConfig
...
@@ -205,7 +205,7 @@ func L1ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, chainConfig
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
if
len
(
finalizedBridges
)
>
len
(
crossDomainRelayedMessages
)
{
if
len
(
finalizedBridges
)
<
len
(
crossDomainRelayedMessages
)
{
return
fmt
.
Errorf
(
"missing cross-domain message for each finalized bridge event. messages: %d, bridges: %d"
,
len
(
crossDomainRelayedMessages
),
len
(
finalizedBridges
))
return
fmt
.
Errorf
(
"missing cross-domain message for each finalized bridge event. messages: %d, bridges: %d"
,
len
(
crossDomainRelayedMessages
),
len
(
finalizedBridges
))
}
}
...
@@ -215,7 +215,7 @@ func L1ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, chainConfig
...
@@ -215,7 +215,7 @@ func L1ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, chainConfig
finalizedBridge
:=
finalizedBridges
[
i
]
finalizedBridge
:=
finalizedBridges
[
i
]
relayedMessage
,
ok
:=
relayedMessages
[
logKey
{
finalizedBridge
.
Event
.
BlockHash
,
finalizedBridge
.
Event
.
LogIndex
+
1
}]
relayedMessage
,
ok
:=
relayedMessages
[
logKey
{
finalizedBridge
.
Event
.
BlockHash
,
finalizedBridge
.
Event
.
LogIndex
+
1
}]
if
!
ok
{
if
!
ok
{
return
fmt
.
Errorf
(
"
missing following RelayedMessage for
BridgeFinalized event. tx_hash = %s"
,
finalizedBridge
.
Event
.
TransactionHash
)
return
fmt
.
Errorf
(
"
expected RelayedMessage following
BridgeFinalized event. tx_hash = %s"
,
finalizedBridge
.
Event
.
TransactionHash
)
}
}
// Since the message hash is computed from the relayed message, this ensures the deposit fields must match. For good measure,
// Since the message hash is computed from the relayed message, this ensures the deposit fields must match. For good measure,
...
...
indexer/processors/bridge/l2_bridge_processor.go
View file @
d35ffaee
...
@@ -50,7 +50,7 @@ func L2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, fromHeight
...
@@ -50,7 +50,7 @@ func L2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, fromHeight
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
if
len
(
crossDomainSentMessages
)
>
len
(
messagesPassed
)
{
if
len
(
crossDomainSentMessages
)
<
len
(
messagesPassed
)
{
return
fmt
.
Errorf
(
"missing L2ToL1MP withdrawal for each cross-domain message. withdrawals: %d, messages: %d"
,
len
(
messagesPassed
),
len
(
crossDomainSentMessages
))
return
fmt
.
Errorf
(
"missing L2ToL1MP withdrawal for each cross-domain message. withdrawals: %d, messages: %d"
,
len
(
messagesPassed
),
len
(
crossDomainSentMessages
))
}
}
...
@@ -63,7 +63,7 @@ func L2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, fromHeight
...
@@ -63,7 +63,7 @@ func L2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, fromHeight
// extract the withdrawal hash from the previous MessagePassed event
// extract the withdrawal hash from the previous MessagePassed event
messagePassed
,
ok
:=
messagesPassed
[
logKey
{
sentMessage
.
Event
.
BlockHash
,
sentMessage
.
Event
.
LogIndex
-
1
}]
messagePassed
,
ok
:=
messagesPassed
[
logKey
{
sentMessage
.
Event
.
BlockHash
,
sentMessage
.
Event
.
LogIndex
-
1
}]
if
!
ok
{
if
!
ok
{
return
fmt
.
Errorf
(
"
missing expected preceding MessagePassedEvent for
SentMessage. tx_hash = %s"
,
sentMessage
.
Event
.
TransactionHash
)
return
fmt
.
Errorf
(
"
expected MessagePassedEvent preceding
SentMessage. tx_hash = %s"
,
sentMessage
.
Event
.
TransactionHash
)
}
}
l2BridgeMessages
[
i
]
=
database
.
L2BridgeMessage
{
TransactionWithdrawalHash
:
messagePassed
.
WithdrawalHash
,
BridgeMessage
:
sentMessage
.
BridgeMessage
}
l2BridgeMessages
[
i
]
=
database
.
L2BridgeMessage
{
TransactionWithdrawalHash
:
messagePassed
.
WithdrawalHash
,
BridgeMessage
:
sentMessage
.
BridgeMessage
}
...
@@ -81,7 +81,7 @@ func L2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, fromHeight
...
@@ -81,7 +81,7 @@ func L2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, fromHeight
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
if
len
(
initiatedBridges
)
>
len
(
crossDomainSentMessages
)
{
if
len
(
initiatedBridges
)
<
len
(
crossDomainSentMessages
)
{
return
fmt
.
Errorf
(
"missing cross-domain message for each initiated bridge event. messages: %d, bridges: %d"
,
len
(
crossDomainSentMessages
),
len
(
initiatedBridges
))
return
fmt
.
Errorf
(
"missing cross-domain message for each initiated bridge event. messages: %d, bridges: %d"
,
len
(
crossDomainSentMessages
),
len
(
initiatedBridges
))
}
}
...
@@ -92,11 +92,11 @@ func L2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, fromHeight
...
@@ -92,11 +92,11 @@ func L2ProcessInitiatedBridgeEvents(log log.Logger, db *database.DB, fromHeight
// extract the cross domain message hash & deposit source hash from the following events
// extract the cross domain message hash & deposit source hash from the following events
messagePassed
,
ok
:=
messagesPassed
[
logKey
{
initiatedBridge
.
Event
.
BlockHash
,
initiatedBridge
.
Event
.
LogIndex
+
1
}]
messagePassed
,
ok
:=
messagesPassed
[
logKey
{
initiatedBridge
.
Event
.
BlockHash
,
initiatedBridge
.
Event
.
LogIndex
+
1
}]
if
!
ok
{
if
!
ok
{
return
fmt
.
Errorf
(
"
missing expected following MessagePassed for BridgeInitiated
. tx_hash = %s"
,
initiatedBridge
.
Event
.
TransactionHash
)
return
fmt
.
Errorf
(
"
expected MessagePassed following BridgeInitiated event
. tx_hash = %s"
,
initiatedBridge
.
Event
.
TransactionHash
)
}
}
sentMessage
,
ok
:=
sentMessages
[
logKey
{
initiatedBridge
.
Event
.
BlockHash
,
initiatedBridge
.
Event
.
LogIndex
+
2
}]
sentMessage
,
ok
:=
sentMessages
[
logKey
{
initiatedBridge
.
Event
.
BlockHash
,
initiatedBridge
.
Event
.
LogIndex
+
2
}]
if
!
ok
{
if
!
ok
{
return
fmt
.
Errorf
(
"
missing expected following SentMessage for BridgeInitiated
. tx_hash = %s"
,
initiatedBridge
.
Event
.
TransactionHash
)
return
fmt
.
Errorf
(
"
expected SentMessage following MessagePassed event
. tx_hash = %s"
,
initiatedBridge
.
Event
.
TransactionHash
)
}
}
initiatedBridge
.
BridgeTransfer
.
CrossDomainMessageHash
=
&
sentMessage
.
BridgeMessage
.
MessageHash
initiatedBridge
.
BridgeTransfer
.
CrossDomainMessageHash
=
&
sentMessage
.
BridgeMessage
.
MessageHash
...
@@ -153,7 +153,7 @@ func L2ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, fromHeight
...
@@ -153,7 +153,7 @@ func L2ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, fromHeight
if
err
!=
nil
{
if
err
!=
nil
{
return
err
return
err
}
}
if
len
(
finalizedBridges
)
>
len
(
crossDomainRelayedMessages
)
{
if
len
(
finalizedBridges
)
<
len
(
crossDomainRelayedMessages
)
{
return
fmt
.
Errorf
(
"missing cross-domain message for each finalized bridge event. messages: %d, bridges: %d"
,
len
(
crossDomainRelayedMessages
),
len
(
finalizedBridges
))
return
fmt
.
Errorf
(
"missing cross-domain message for each finalized bridge event. messages: %d, bridges: %d"
,
len
(
crossDomainRelayedMessages
),
len
(
finalizedBridges
))
}
}
...
@@ -163,7 +163,7 @@ func L2ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, fromHeight
...
@@ -163,7 +163,7 @@ func L2ProcessFinalizedBridgeEvents(log log.Logger, db *database.DB, fromHeight
finalizedBridge
:=
finalizedBridges
[
i
]
finalizedBridge
:=
finalizedBridges
[
i
]
relayedMessage
,
ok
:=
relayedMessages
[
logKey
{
finalizedBridge
.
Event
.
BlockHash
,
finalizedBridge
.
Event
.
LogIndex
+
1
}]
relayedMessage
,
ok
:=
relayedMessages
[
logKey
{
finalizedBridge
.
Event
.
BlockHash
,
finalizedBridge
.
Event
.
LogIndex
+
1
}]
if
!
ok
{
if
!
ok
{
return
fmt
.
Errorf
(
"
missing following RelayedMessage for
BridgeFinalized event. tx_hash = %s"
,
finalizedBridge
.
Event
.
TransactionHash
)
return
fmt
.
Errorf
(
"
expected RelayedMessage following
BridgeFinalized event. tx_hash = %s"
,
finalizedBridge
.
Event
.
TransactionHash
)
}
}
// Since the message hash is computed from the relayed message, this ensures the withdrawal fields must match. For good measure,
// Since the message hash is computed from the relayed message, this ensures the withdrawal fields must match. For good measure,
...
...
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