2024-09-26 FE Release #3155
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,8 @@ | ||
| { | ||
| "editor.fontLigatures": "'calt', 'liga', 'ss01', 'ss02', 'ss03', 'ss04', 'ss05', 'ss06', 'ss07', 'ss08', 'ss09'", | ||
| "[solidity]": { | ||
| "editor.defaultFormatter": "JuanBlanco.solidity" | ||
| }, | ||
| "[typescript]": { | ||
| "editor.defaultFormatter": "dbaeumer.vscode-eslint" | ||
| }, | ||
|
|
@@ -16,11 +19,8 @@ | |
| "eslint.format.enable": true, | ||
| "editorconfig.generateAuto": false, | ||
| "files.trimTrailingWhitespace": true, | ||
| "solidity.formatter": "forge", | ||
|
There was a problem hiding this comment. Tip Codebase Verification Solidity formatter change to 'forge' may be ineffective due to missing 'forge' command. The Analysis chainVerify the impact of changing Solidity formatter to forge. Changing the Solidity formatter from "prettier" to "forge" is consistent with the new default formatter configuration. However, this change might affect the formatting style of existing Solidity files. Please run the following script to check the impact on Solidity files: Scripts executedThe following scripts were executed for the analysis: Script: #!/bin/bash
# Description: Check the impact of changing Solidity formatter to forge
# Test: List all Solidity files that might be affected
echo "Solidity files that might be affected:"
fd -e sol
# Test: Show a diff of formatting changes (if forge is available)
if command -v forge &> /dev/null
then
echo "Formatting diff (sample of up to 5 files):"
fd -e sol | head -n 5 | xargs -I {} sh -c 'echo "File: {}"; forge fmt --check {}'
else
echo "Note: 'forge' command not found. Unable to show formatting diff."
fi
Length of output: 14973 |
||
| "solidity.monoRepoSupport": true, | ||
| "tailwindCSS.classAttributes": [ | ||
| ".*class.*", | ||
| ".*Class.*", | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,6 +64,7 @@ root | |
| │ ├── <a href="./packages/coverage-aggregator">coverage-aggregator</a>: Javascript coverage aggregator based on <a href="https://www.npmjs.com/package/nyc">nyc</a> | ||
| │ ├── <a href="./packages/docs">docs</a>: Docasaurus documentation. Note: this is not yet in use, and docs are still maintained on gitbook | ||
| │ ├── <a href="./packages/explorer-ui">explorer-ui</a>: Explorer UI | ||
| │ ├── <a href="./packages/rfq-indexer">rfq-indexer</a>: RFQ indexer | ||
| │ ├── <a href="./packages/rest-api">rest-api</a>: Rest API | ||
| │ ├── <a href="./packages/sdk-router">sdk-router</a>: SDK router | ||
| │ ├── <a href="./packages/solidity-devops">solidity-devops</a>: provides a set of tools and scripts to help with the development of Solidity smart contracts | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -25,6 +25,7 @@ import ( | |||||||||||||
| "github.com/synapsecns/sanguine/core/retry" | ||||||||||||||
| "github.com/synapsecns/sanguine/ethergo/chaindata" | ||||||||||||||
| "github.com/synapsecns/sanguine/ethergo/client" | ||||||||||||||
| "github.com/synapsecns/sanguine/ethergo/submitter" | ||||||||||||||
| rfqClient "github.com/synapsecns/sanguine/services/rfq/api/client" | ||||||||||||||
| "github.com/synapsecns/sanguine/services/rfq/contracts/fastbridge" | ||||||||||||||
| "github.com/synapsecns/sanguine/services/rfq/relayer/relapi" | ||||||||||||||
|
|
@@ -347,17 +348,12 @@ func (b *Bot) rfqRefund() *slacker.CommandDefinition { | |||||||||||||
| return | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| var status submitter.SubmissionStatus | ||||||||||||||
| err = retry.WithBackoff( | ||||||||||||||
| ctx.Context(), | ||||||||||||||
| func(ctx context.Context) error { | ||||||||||||||
| status, err = b.submitter.GetSubmissionStatus(ctx, big.NewInt(int64(rawRequest.OriginChainID)), nonce) | ||||||||||||||
| if err != nil || !status.HasTx() { | ||||||||||||||
| b.logger.Errorf(ctx, "error fetching quote request: %v", err) | ||||||||||||||
| return fmt.Errorf("error fetching quote request: %w", err) | ||||||||||||||
|
Comment on lines
+356
to
358
There was a problem hiding this comment. Correct the error messages to reflect the actual operation. The error messages in the logging and returned error incorrectly state "error fetching quote request," but the code is fetching the submission status. To avoid confusion and improve clarity, please update the error messages to accurately describe the error. Apply this diff to correct the error messages: - b.logger.Errorf(ctx, "error fetching quote request: %v", err)
+ b.logger.Errorf(ctx, "error fetching submission status: %v", err)
- return fmt.Errorf("error fetching quote request: %w", err)
+ return fmt.Errorf("error fetching submission status: %w", err)Committable suggestion
Suggested change
|
||||||||||||||
| } | ||||||||||||||
|
|
@@ -373,7 +369,7 @@ func (b *Bot) rfqRefund() *slacker.CommandDefinition { | |||||||||||||
| return | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| _, err = ctx.Response().Reply(fmt.Sprintf("refund submitted: %s", toExplorerSlackLink(status.TxHash().String()))) | ||||||||||||||
| if err != nil { | ||||||||||||||
| log.Println(err) | ||||||||||||||
| } | ||||||||||||||
|
|
||||||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -142,17 +142,17 @@ func (e *exporter) collectMetrics(parentCtx context.Context) (err error) { | |
| for _, pending := range e.cfg.DFKPending { | ||
| if err := e.stuckHeroCountStats(ctx, common.HexToAddress(pending.Owner), pending.ChainName); err != nil { | ||
| errs = append(errs, fmt.Errorf("could not get stuck hero count: %w", err)) | ||
| span.AddEvent("could not get stuck hero count") | ||
| } | ||
| } | ||
|
|
||
| for _, gasCheck := range e.cfg.SubmitterChecks { | ||
| for _, chainID := range gasCheck.ChainIDs { | ||
| if err := e.submitterStats(common.HexToAddress(gasCheck.Address), chainID, gasCheck.Name); err != nil { | ||
| errs = append(errs, fmt.Errorf("could not get submitter stats: %w", err)) | ||
| span.AddEvent("could not get submitter stats") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| for chainID := range e.cfg.BridgeChecks { | ||
|
|
@@ -161,7 +161,8 @@ func (e *exporter) collectMetrics(parentCtx context.Context) (err error) { | |
| return retry.WithBackoff(ctx, func(ctx context.Context) error { | ||
| err := e.vpriceStats(ctx, chainID, token) | ||
| if err != nil && !errors.Is(err, errPoolNotExist) { | ||
| errs = append(errs, fmt.Errorf("could not get vprice %w", err)) | ||
| span.AddEvent("could not get vprice stats") | ||
| } | ||
|
|
||
| return nil | ||
|
|
@@ -172,7 +173,7 @@ func (e *exporter) collectMetrics(parentCtx context.Context) (err error) { | |
|
|
||
| if len(errs) > 0 { | ||
| span.AddEvent("could not collect metrics") | ||
| return fmt.Errorf("could not collect metrics: %w", combineErrors(errs)) | ||
| } | ||
|
|
||
| return nil | ||
|
|
||
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -3,6 +3,7 @@ package commandline | |||||||||||||||||||||||||||||||||||||||||||||||
| import ( | ||||||||||||||||||||||||||||||||||||||||||||||||
| "context" | ||||||||||||||||||||||||||||||||||||||||||||||||
| "fmt" | ||||||||||||||||||||||||||||||||||||||||||||||||
| "k8s.io/apimachinery/pkg/util/sets" | ||||||||||||||||||||||||||||||||||||||||||||||||
| "os" | ||||||||||||||||||||||||||||||||||||||||||||||||
| "os/signal" | ||||||||||||||||||||||||||||||||||||||||||||||||
| "os/user" | ||||||||||||||||||||||||||||||||||||||||||||||||
|
|
@@ -90,11 +91,18 @@ func GenerateShellCommand(shellCommands []*cli.Command) *cli.Command { | |||||||||||||||||||||||||||||||||||||||||||||||
| // pruneShellCommands gets a list of commands including the shell command. | ||||||||||||||||||||||||||||||||||||||||||||||||
| func pruneShellCommands(commands []*cli.Command) (prunedCommands []*cli.Command) { | ||||||||||||||||||||||||||||||||||||||||||||||||
| // initialize shell commands | ||||||||||||||||||||||||||||||||||||||||||||||||
| nameSet := sets.NewString() | ||||||||||||||||||||||||||||||||||||||||||||||||
| for _, command := range commands { | ||||||||||||||||||||||||||||||||||||||||||||||||
| if command.Name != shellCommandName { | ||||||||||||||||||||||||||||||||||||||||||||||||
| prunedCommands = append(prunedCommands, command) | ||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||
| if !nameSet.Has(command.Name) { | ||||||||||||||||||||||||||||||||||||||||||||||||
| fmt.Printf("Command %s already exists, skipping\n", command.Name) | ||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||
| nameSet.Insert(command.Name) | ||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+94
to
+105
There was a problem hiding this comment. Fix logic for handling duplicate command names. The current implementation has a few issues:
Please apply the following changes to fix these issues: func pruneShellCommands(commands []*cli.Command) (prunedCommands []*cli.Command) {
// initialize shell commands
nameSet := sets.NewString()
for _, command := range commands {
- if command.Name != shellCommandName {
- prunedCommands = append(prunedCommands, command)
- }
- if !nameSet.Has(command.Name) {
- fmt.Printf("Command %s already exists, skipping\n", command.Name)
+ if command.Name == shellCommandName {
+ continue
}
-
- nameSet.Insert(command.Name)
+ if nameSet.Has(command.Name) {
+ fmt.Printf("Command %s already exists, skipping\n", command.Name)
+ continue
+ }
+ nameSet.Insert(command.Name)
+ prunedCommands = append(prunedCommands, command)
}
return prunedCommands
}These changes will:
📝 Committable suggestion
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||||||||
| return prunedCommands | ||||||||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,7 @@ | |
| "useWorkspaces": true, | ||
| "packages": [ | ||
| "packages/*", | ||
| "packages/rfq-indexer/*", | ||
| "docs/*" | ||
| ], | ||
| "version": "independent" | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ | |
| "workspaces": { | ||
| "packages": [ | ||
| "packages/*", | ||
| "packages/rfq-indexer/*", | ||
| "docs/*" | ||
| ], | ||
| "nohoist": [ | ||
|
|
@@ -73,7 +74,8 @@ | |
| "ts-mocha": "^10.0.0", | ||
| "typedoc": "^0.23.24", | ||
| "typedoc-plugin-markdown": "^3.14.0", | ||
| "typescript": "^5.0.4", | ||
| "wagmi": "^2.12.12" | ||
| }, | ||
| "dependencies": { | ||
| "@changesets/cli": "2.22.0", | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "[solidity]": { | ||
| "editor.defaultFormatter": "JuanBlanco.solidity" | ||
| }, | ||
| "solidity.formatter": "forge", | ||
|
There was a problem hiding this comment. Tip Codebase Verification Issue: Forge is set as Solidity formatter but is not installed Forge is specified as the Solidity formatter in the settings, but it is not installed in the development environment. Please install Forge to ensure the formatter works correctly.
Analysis chainLGTM: Forge set as Solidity formatter Using Forge as the Solidity formatter is a good choice, aligning with modern development practices. Ensure that Forge is installed and properly configured in the development environment. Run the following command to verify: Scripts executedThe following scripts were executed for the analysis: Script: #!/bin/bash
# Check if Forge is installed
if command -v forge &> /dev/null
then
echo "Forge is installed. Version:"
forge --version
else
echo "Forge is not installed. Please install it to use the specified formatter."
fi
Length of output: 175 |
||
| "solidity.monoRepoSupport": false | ||
|
There was a problem hiding this comment. Tip Codebase Verification Mono-repo support setting may be misconfigured The project structure indicates a monorepo setup with multiple packages and services. Consider setting
Analysis chainVerify project structure for mono-repo setting The Please confirm that this setting aligns with the project's structure. You can verify this by checking the root directory structure: If you see multiple packages or projects at the same level, you might need to reconsider this setting. Scripts executedThe following scripts were executed for the analysis: Script: #!/bin/bash
# Check the root directory structure
echo "Project root structure:"
ls -R | grep ":$" | sed -e 's/:$//' -e 's/[^-][^\/]*\// /g' -e 's/^/ /' -e 's/-/|/'
Length of output: 17137 |
||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix potential shell scripting issue
There's a potential issue with the shell command on this line. Unquoted variables can lead to unexpected behavior if they contain spaces or special characters.
To address this, please modify the line as follows:
This change ensures that the
$GITHUB_STEP_SUMMARYvariable is properly quoted, preventing potential issues with globbing and word splitting.📝 Committable suggestion
🧰 Tools
actionlint