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
235124a9
Unverified
Commit
235124a9
authored
Nov 28, 2023
by
Ethen Pociask
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[indexer.withdrawal_type_supplies] address PR feedback
parent
64c9b2e5
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11812 additions
and
21 deletions
+11812
-21
api_test.go
indexer/api/api_test.go
+1
-1
models.go
indexer/api/models/models.go
+0
-8
service.go
indexer/api/service/service.go
+4
-4
bridge_transfers.go
indexer/database/bridge_transfers.go
+15
-8
test_out.txt
indexer/test_out.txt
+11792
-0
No files found.
indexer/api/api_test.go
View file @
235124a9
...
...
@@ -99,7 +99,7 @@ func (mbv *MockBridgeTransfersView) L2BridgeWithdrawalsByAddress(address common.
func
(
mbv
*
MockBridgeTransfersView
)
L1BridgeDepositSum
()
(
float64
,
error
)
{
return
69
,
nil
}
func
(
mbv
*
MockBridgeTransfersView
)
L2BridgeWithdrawalSum
(
models
.
WithdrawFilter
)
(
float64
,
error
)
{
func
(
mbv
*
MockBridgeTransfersView
)
L2BridgeWithdrawalSum
(
database
.
WithdrawFilter
)
(
float64
,
error
)
{
return
420
,
nil
}
...
...
indexer/api/models/models.go
View file @
235124a9
...
...
@@ -10,14 +10,6 @@ type QueryParams struct {
Cursor
string
}
type
WithdrawFilter
uint8
const
(
All
WithdrawFilter
=
iota
// Same as "initialized"
Proven
Finalized
)
// DepositItem ... Deposit item model for API responses
type
DepositItem
struct
{
Guid
string
`json:"guid"`
...
...
indexer/api/service/service.go
View file @
235124a9
...
...
@@ -15,7 +15,7 @@ type Service interface {
WithdrawResponse
(
*
database
.
L2BridgeWithdrawalsResponse
)
models
.
WithdrawalResponse
GetSupplyInfo
()
(
*
models
.
BridgeSupplyView
,
error
)
QueryParams
(
a
,
l
,
c
string
)
(
*
models
.
QueryParams
,
error
)
QueryParams
(
a
ddress
,
cursor
,
limit
string
)
(
*
models
.
QueryParams
,
error
)
}
type
HandlerSvc
struct
{
...
...
@@ -148,19 +148,19 @@ func (svc *HandlerSvc) GetSupplyInfo() (*models.BridgeSupplyView, error) {
return
nil
,
err
}
initSum
,
err
:=
svc
.
db
.
L2BridgeWithdrawalSum
(
models
.
All
)
initSum
,
err
:=
svc
.
db
.
L2BridgeWithdrawalSum
(
database
.
All
)
if
err
!=
nil
{
svc
.
logger
.
Error
(
"error getting init sum"
,
"err"
,
err
)
return
nil
,
err
}
provenSum
,
err
:=
svc
.
db
.
L2BridgeWithdrawalSum
(
models
.
Proven
)
provenSum
,
err
:=
svc
.
db
.
L2BridgeWithdrawalSum
(
database
.
Proven
)
if
err
!=
nil
{
svc
.
logger
.
Error
(
"error getting proven sum"
,
"err"
,
err
)
return
nil
,
err
}
finalizedSum
,
err
:=
svc
.
db
.
L2BridgeWithdrawalSum
(
models
.
Finalized
)
finalizedSum
,
err
:=
svc
.
db
.
L2BridgeWithdrawalSum
(
database
.
Finalized
)
if
err
!=
nil
{
svc
.
logger
.
Error
(
"error getting finalized sum"
,
"err"
,
err
)
return
nil
,
err
...
...
indexer/database/bridge_transfers.go
View file @
235124a9
...
...
@@ -8,7 +8,6 @@ import (
"gorm.io/gorm"
"gorm.io/gorm/clause"
"github.com/ethereum-optimism/optimism/indexer/api/models"
"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/log"
...
...
@@ -68,7 +67,7 @@ type BridgeTransfersView interface {
L1BridgeDepositsByAddress
(
common
.
Address
,
string
,
int
)
(
*
L1BridgeDepositsResponse
,
error
)
L2BridgeWithdrawal
(
common
.
Hash
)
(
*
L2BridgeWithdrawal
,
error
)
L2BridgeWithdrawalSum
(
filter
models
.
WithdrawFilter
)
(
float64
,
error
)
L2BridgeWithdrawalSum
(
filter
WithdrawFilter
)
(
float64
,
error
)
L2BridgeWithdrawalWithFilter
(
BridgeTransfer
)
(
*
L2BridgeWithdrawal
,
error
)
L2BridgeWithdrawalsByAddress
(
common
.
Address
,
string
,
int
)
(
*
L2BridgeWithdrawalsResponse
,
error
)
}
...
...
@@ -143,7 +142,7 @@ type L1BridgeDepositsResponse struct {
// L1BridgeDepositSum ... returns the sum of all l1 bridge deposit mints in gwei
func
(
db
*
bridgeTransfersDB
)
L1BridgeDepositSum
()
(
float64
,
error
)
{
var
sum
float64
result
:=
db
.
gorm
.
Model
(
&
L1TransactionDeposit
{})
.
Select
(
"
sum
(amount)"
)
.
Scan
(
&
sum
)
result
:=
db
.
gorm
.
Model
(
&
L1TransactionDeposit
{})
.
Select
(
"
SUM
(amount)"
)
.
Scan
(
&
sum
)
if
result
.
Error
!=
nil
{
return
0
,
result
.
Error
}
...
...
@@ -248,17 +247,25 @@ func (db *bridgeTransfersDB) L2BridgeWithdrawal(txWithdrawalHash common.Hash) (*
return
&
withdrawal
,
nil
}
func
(
db
*
bridgeTransfersDB
)
L2BridgeWithdrawalSum
(
filter
models
.
WithdrawFilter
)
(
float64
,
error
)
{
type
WithdrawFilter
uint8
const
(
All
WithdrawFilter
=
iota
// Same as "initialized"
Proven
Finalized
)
func
(
db
*
bridgeTransfersDB
)
L2BridgeWithdrawalSum
(
filter
WithdrawFilter
)
(
float64
,
error
)
{
// Determine where filter
var
clause
string
switch
filter
{
case
models
.
All
:
case
All
:
clause
=
""
case
models
.
Finalized
:
case
Finalized
:
clause
=
"finalized_l1_event_guid IS NOT NULL"
case
models
.
Proven
:
case
Proven
:
clause
=
"proven_l1_event_guid IS NOT NULL"
default
:
...
...
@@ -269,7 +276,7 @@ func (db *bridgeTransfersDB) L2BridgeWithdrawalSum(filter models.WithdrawFilter)
// This is ok though given all bridges will never exceed max float64 (10^308 || 1.7E+308) in wei value locked
// since that would require 10^308 / 10^18 = 10^290 ETH locked in the bridge
var
sum
float64
result
:=
db
.
gorm
.
Model
(
&
L2TransactionWithdrawal
{})
.
Where
(
clause
)
.
Select
(
"
sum
(amount)"
)
.
Scan
(
&
sum
)
result
:=
db
.
gorm
.
Model
(
&
L2TransactionWithdrawal
{})
.
Where
(
clause
)
.
Select
(
"
SUM
(amount)"
)
.
Scan
(
&
sum
)
if
result
.
Error
!=
nil
&&
strings
.
Contains
(
result
.
Error
.
Error
(),
"converting NULL to float64 is unsupported"
)
{
// no rows found
return
0
,
nil
...
...
indexer/test_out.txt
0 → 100644
View file @
235124a9
This diff is collapsed.
Click to expand it.
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