Added SC module implementation #306
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
Contributor
iulianpascalau
commented
Jul 3, 2024
iulianpascalau
commented
- added SC module implementation
iulianpascalau
changed the title
sstanculeanu
reviewed
Jul 3, 2024
| ODY5Yzk4ZGYwYjExZmRhMDgwNGQ3ODM1NGVjYTQzMWY4N2E2ZTkxMGZhZTE0MDgx | ||
| ZjczOGMzMTZhMjVlYTQwOTFlOGE4YjZiNDlkZTViN2JlMTBhYWExNThhNWE2YTRh | ||
| YmI0YjU2Y2MwOGY1MjRiYjVlNmNkNWYyMTFhZDNlMTM= | ||
| -----END PRIVATE KEY for erd1r69gk66fmedhhcg24g2c5kn2f2a5k4kvpr6jfw67dn2lyydd8cfswy6ede----- |
| // Close closes any components started | ||
| func (module *scCallsModule) Close() error { | ||
| errNonceTxsHandler := module.nonceTxsHandler.Close() | ||
| errPollingHandler := module.pollingHandler.Close() |
There was a problem hiding this comment.
probably not a big issue, but shouldn't we close first the pollingHandler, as it uses the nonceTxHandler on Execute?
There was a problem hiding this comment.
very good point, changed
Comment on lines
123
to
174
| func (filter *pendingOperationFilter) checkLists() error { | ||
| err := filter.checkEthList(filter.allowedEthAddresses) | ||
| if err != nil { | ||
| return fmt.Errorf("%w in list AllowedEthAddresses", err) | ||
| } | ||
|
|
||
| err = filter.checkEthList(filter.deniedEthAddresses) | ||
| if err != nil { | ||
| return fmt.Errorf("%w in list DeniedEthAddresses", err) | ||
| } | ||
|
|
||
| err = filter.checkMvxList(filter.allowedMvxAddresses) | ||
| if err != nil { | ||
| return fmt.Errorf("%w in list AllowedMvxAddresses", err) | ||
| } | ||
|
|
||
| err = filter.checkMvxList(filter.deniedMvxAddresses) | ||
| if err != nil { | ||
| return fmt.Errorf("%w in list DeniedMvxAddresses", err) | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (filter *pendingOperationFilter) checkEthList(list []string) error { | ||
| for index, item := range list { | ||
| if item == wildcardString { | ||
| continue | ||
| } | ||
|
|
||
| if !strings.HasPrefix(item, ethAddressPrefix) { | ||
| return fmt.Errorf("%w (%s) on item at index %d", errMissingEthPrefix, ethAddressPrefix, index) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (filter *pendingOperationFilter) checkMvxList(list []string) error { | ||
| for index, item := range list { | ||
| if item == wildcardString { | ||
| continue | ||
| } | ||
|
|
||
| _, err := data.NewAddressFromBech32String(item) | ||
| if err != nil { | ||
| return fmt.Errorf("%w on item at index %d", err, index) | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } |
There was a problem hiding this comment.
optional, not a strong opinion, could be reduced to:
func (filter *pendingOperationFilter) checkLists() error {
err := filter.checkList(filter.allowedEthAddresses, isEthItemValid)
if err != nil {
return fmt.Errorf("%w in list AllowedEthAddresses", err)
}
err = filter.checkList(filter.deniedEthAddresses, isEthItemValid)
if err != nil {
return fmt.Errorf("%w in list DeniedEthAddresses", err)
}
err = filter.checkList(filter.allowedMvxAddresses, isMvxItemValid)
if err != nil {
return fmt.Errorf("%w in list AllowedMvxAddresses", err)
}
err = filter.checkList(filter.deniedMvxAddresses, isMvxItemValid)
if err != nil {
return fmt.Errorf("%w in list DeniedMvxAddresses", err)
}
return nil
}
func isMvxItemValid(item string) bool {
_, errNewAddr := data.NewAddressFromBech32String(item)
return errNewAddr == nil
}
func isEthItemValid(item string) bool {
return !strings.HasPrefix(item, ethAddressPrefix)
}
func (filter *pendingOperationFilter) checkList(list []string, isItemValid func(item string) bool) error {
for index, item := range list {
if item == wildcardString {
continue
}
if !isItemValid(item) {
return fmt.Errorf("%w on item at index %d", errInvalidItem, index)
}
}
return nil
}There was a problem hiding this comment.
a little bit reticent on using function pointers, but agree with this solution. Changed
sstanculeanu
approved these changes
Jul 4, 2024
dragos-rebegea
approved these changes
Jul 4, 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.