Feat/deposits start #74
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pashteto
approved these changes
Aug 29, 2024
services/accounts.go
Outdated
| @@ -472,7 +473,7 @@ func (s *Service) formatAccounts(opts *bind.FilterOpts) ([]*models.Account, erro | |||
|
|
|||
| for iterator.Next() { | |||
| if iterator.Error() != nil { | |||
| logger.Log().WithField("layer", "Service-formatAccounts").Errorf("iterator error: %v", err.Error()) | |||
| logger.Log().WithField("layer", "Service-formatAccounts").Errorf("iterator error: %s", err) | |||
There was a problem hiding this comment.
Thats requires err.Error()
services/accounts.go
Outdated
| @@ -498,7 +499,7 @@ func (s *Service) formatAccountsCore(opts *bind.FilterOpts) ([]*models.Account, | |||
|
|
|||
| for iterator.Next() { | |||
| if iterator.Error() != nil { | |||
| logger.Log().WithField("layer", "Service-formatAccountsCore").Errorf("iterator error: %v", err.Error()) | |||
| logger.Log().WithField("layer", "Service-formatAccountsCore").Errorf("iterator error: %s", err) | |||
services/collateral.go
Outdated
| if fromBlock == 0 { | ||
| fromBlock = s.coreFirstBlock | ||
| } | ||
|
|
||
| var withdraws []*models.CollateralWithdrawn | ||
|
|
||
| logger.Log().WithField("layer", "Service-RetrieveCollateralWithdrawnLimit").Infof( |
There was a problem hiding this comment.
Service-RetrieveCollateralWithdrawn instead of
"Service-RetrieveCollateralWithdrawnLimit
| if endBlockOfIteration > toBlock { | ||
| endBlockOfIteration = toBlock | ||
| } | ||
|
|
||
| for i := uint64(1); i <= iterations; i++ { | ||
| if i%10 == 0 || i == iterations { | ||
| logger.Log().WithField("layer", "Service-RetrieveCollateralWithdrawnLimit").Infof("-- iteration %v", i) | ||
| } |
services/collateral.go
Outdated
| if fromBlock == 0 { | ||
| fromBlock = s.coreFirstBlock | ||
| } | ||
|
|
||
| var deposits []*models.CollateralDeposited | ||
|
|
||
| logger.Log().WithField("layer", "Service-RetrieveCollateralDepositedLimit").Infof( |
There was a problem hiding this comment.
Service-RetrieveCollateralDepositedLimit here is incorrect
| if endBlockOfIteration > toBlock { | ||
| endBlockOfIteration = toBlock | ||
| } | ||
|
|
||
| for i := uint64(1); i <= iterations; i++ { | ||
| if i%10 == 0 || i == iterations { | ||
| logger.Log().WithField("layer", "Service-RetrieveCollateralDepositedLimit").Infof("-- iteration %v", i) | ||
| } |
There was a problem hiding this comment.
Service-RetrieveCollateralDepositedLimit here is incorrect
services/pools.go
Outdated
| if endBlockOfIteration > toBlock { | ||
| endBlockOfIteration = toBlock | ||
| } | ||
|
|
||
| for i := uint64(1); i <= iterations; i++ { | ||
| if i%10 == 0 || i == iterations { | ||
| logger.Log().WithField("layer", "Service-RetrieveUSDMintedLimit").Infof("-- iteration %v", i) |
There was a problem hiding this comment.
Service-RetrieveUSDMintedLimit incorrect
services/pools.go
Outdated
| @@ -27,16 +30,25 @@ func (s *Service) RetrieveUSDMintedLimit(limit uint64) ([]*models.USDMinted, err | |||
|
|
|||
| logger.Log().WithField("layer", "Service-RetrieveUSDMintedLimit").Infof( | |||
There was a problem hiding this comment.
Service-RetrieveUSDMintedLimit incorrect
services/collateral.go
Outdated
| } | ||
|
|
||
| func (s *Service) RetrieveCollateralWithdrawn(fromBlock uint64, toBlock uint64, limit uint64) ([]*models.CollateralWithdrawn, error) { | ||
| iterations, lastBlock, err := s.getIterationsForLimitQueryCore(limit) |
There was a problem hiding this comment.
should be s.getIterationsForQuery, instead of s.getIterationsForLimitQueryCore
Because s.getIterationsForLimitQueryCore gives iterations in range from core contract's first block to RPC's last block
services/collateral.go
Outdated
| } | ||
|
|
||
| func (s *Service) RetrieveCollateralDeposited(fromBlock uint64, toBlock uint64, limit uint64) ([]*models.CollateralDeposited, error) { | ||
| iterations, lastBlock, err := s.getIterationsForLimitQueryCore(limit) |
services/pools.go
Outdated
| return s.RetrieveUSDMinted(0, 0, limit) | ||
| } | ||
| func (s *Service) RetrieveUSDMinted(fromBlock uint64, toBlock uint64, limit uint64) ([]*models.USDMinted, error) { | ||
| iterations, lastBlock, err := s.getIterationsForLimitQueryCore(limit) |
services/pools.go
Outdated
| } | ||
|
|
||
| func (s *Service) RetrieveUSDBurned(fromBlock uint64, toBlock uint64, limit uint64) ([]*models.USDBurned, error) { | ||
| iterations, lastBlock, err := s.getIterationsForLimitQueryCore(limit) |
|
We should also add new functions (such as |
Pashteto
approved these changes
Aug 30, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.