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
1cb0092e
Unverified
Commit
1cb0092e
authored
Feb 08, 2022
by
smartcontracts
Committed by
GitHub
Feb 08, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2171 from ethereum-optimism/sc/sdk-sort-bn
feat(sdk): have SDK sort messages descending by bn
parents
f52fc61e
da53dc64
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
52 additions
and
20 deletions
+52
-20
selfish-numbers-tan.md
.changeset/selfish-numbers-tan.md
+5
-0
eth-bridge.ts
packages/sdk/src/adapters/eth-bridge.ts
+23
-14
standard-bridge.ts
packages/sdk/src/adapters/standard-bridge.ts
+8
-0
cross-chain-messenger.ts
packages/sdk/src/cross-chain-messenger.ts
+16
-6
No files found.
.changeset/selfish-numbers-tan.md
0 → 100644
View file @
1cb0092e
---
'
@eth-optimism/sdk'
:
patch
---
Have SDK sort deposits/withdrawals descending by block number
packages/sdk/src/adapters/eth-bridge.ts
View file @
1cb0092e
...
...
@@ -30,20 +30,25 @@ export class ETHBridgeAdapter extends StandardBridgeAdapter {
opts
?.
toBlock
)
return
events
.
map
((
event
)
=>
{
return
{
direction
:
MessageDirection
.
L1_TO_L2
,
from
:
event
.
args
.
_from
,
to
:
event
.
args
.
_to
,
l1Token
:
ethers
.
constants
.
AddressZero
,
l2Token
:
predeploys
.
OVM_ETH
,
amount
:
event
.
args
.
_amount
,
data
:
event
.
args
.
_data
,
logIndex
:
event
.
logIndex
,
blockNumber
:
event
.
blockNumber
,
transactionHash
:
event
.
transactionHash
,
}
})
return
events
.
map
((
event
)
=>
{
return
{
direction
:
MessageDirection
.
L1_TO_L2
,
from
:
event
.
args
.
_from
,
to
:
event
.
args
.
_to
,
l1Token
:
ethers
.
constants
.
AddressZero
,
l2Token
:
predeploys
.
OVM_ETH
,
amount
:
event
.
args
.
_amount
,
data
:
event
.
args
.
_data
,
logIndex
:
event
.
logIndex
,
blockNumber
:
event
.
blockNumber
,
transactionHash
:
event
.
transactionHash
,
}
})
.
sort
((
a
,
b
)
=>
{
// Sort descending by block number
return
b
.
blockNumber
-
a
.
blockNumber
})
}
public
async
getWithdrawalsByAddress
(
...
...
@@ -81,6 +86,10 @@ export class ETHBridgeAdapter extends StandardBridgeAdapter {
transactionHash
:
event
.
transactionHash
,
}
})
.
sort
((
a
,
b
)
=>
{
// Sort descending by block number
return
b
.
blockNumber
-
a
.
blockNumber
})
}
public
async
supportsTokenPair
(
...
...
packages/sdk/src/adapters/standard-bridge.ts
View file @
1cb0092e
...
...
@@ -93,6 +93,10 @@ export class StandardBridgeAdapter implements IBridgeAdapter {
transactionHash
:
event
.
transactionHash
,
}
})
.
sort
((
a
,
b
)
=>
{
// Sort descending by block number
return
b
.
blockNumber
-
a
.
blockNumber
})
}
public
async
getWithdrawalsByAddress
(
...
...
@@ -132,6 +136,10 @@ export class StandardBridgeAdapter implements IBridgeAdapter {
transactionHash
:
event
.
transactionHash
,
}
})
.
sort
((
a
,
b
)
=>
{
// Sort descending by block number
return
b
.
blockNumber
-
a
.
blockNumber
})
}
public
async
supportsTokenPair
(
...
...
packages/sdk/src/cross-chain-messenger.ts
View file @
1cb0092e
...
...
@@ -253,9 +253,14 @@ export class CrossChainMessenger implements ICrossChainMessenger {
return
bridge
.
getDepositsByAddress
(
address
,
opts
)
})
)
).
reduce
((
acc
,
val
)
=>
{
return
acc
.
concat
(
val
)
},
[])
)
.
reduce
((
acc
,
val
)
=>
{
return
acc
.
concat
(
val
)
},
[])
.
sort
((
a
,
b
)
=>
{
// Sort descending by block number
return
b
.
blockNumber
-
a
.
blockNumber
})
}
public
async
getWithdrawalsByAddress
(
...
...
@@ -271,9 +276,14 @@ export class CrossChainMessenger implements ICrossChainMessenger {
return
bridge
.
getWithdrawalsByAddress
(
address
,
opts
)
})
)
).
reduce
((
acc
,
val
)
=>
{
return
acc
.
concat
(
val
)
},
[])
)
.
reduce
((
acc
,
val
)
=>
{
return
acc
.
concat
(
val
)
},
[])
.
sort
((
a
,
b
)
=>
{
// Sort descending by block number
return
b
.
blockNumber
-
a
.
blockNumber
})
}
public
async
toCrossChainMessage
(
...
...
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