Skip to content

Resolve main-develop conflicts#430

Merged
Raneet10 merged 3 commits intodevelopfrom
raneet10/resolve-main-develop-conflicts
Aug 19, 2025
Merged

Resolve main-develop conflicts#430
Raneet10 merged 3 commits intodevelopfrom
raneet10/resolve-main-develop-conflicts

Conversation

@Raneet10
Copy link
Copy Markdown
Contributor

@Raneet10 Raneet10 commented Aug 18, 2025

Description

This PR is to resolve conflicts from #428

Changes

  • Bugfix (non-breaking change that solves an issue)
  • Hotfix (change that solves an urgent issue and requires immediate attention)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (change that is not backwards-compatible and/or changes current functionality)
  • Changes only for a subset of nodes

Checklist

  • I have added at least two reviewers or the whole pos-v1 team
  • I have added sufficient documentation in code
  • I will be resolving comments — if any — by pushing each fix in a separate commit and linking the commit hash in the comment reply

Testing

  • I have added unit tests
  • I have added tests to CI
  • I have tested this code manually on the local environment
  • I have tested this code manually on a remote devnet using express-cli
  • I have tested this code manually on amoy/mumbai
  • I have created new e2e tests into express-cli

pratikspatil024 and others added 3 commits July 30, 2025 15:57
@pratikspatil024
Merge pull request #412 from 0xPolygon/v0.2.16-candidate
6cb0ca7 
V0.2.16
@Raneet10
Add span range check (#426)
1ec3f5f 
* x/bor: add missing span duration check

* Fix generate-keystore command (#424)

* cmd: allow generate-keystore to accept private key

* cmd: add --generate-new flag

* helper: fix lint
@Raneet10
helper: fix conflicts
5200067
@Raneet10 Raneet10 requested a review from a team August 18, 2025 05:25
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud bot commented Aug 18, 2025

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

pratikspatil024
pratikspatil024 approved these changes Aug 18, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@pratikspatil024 pratikspatil024 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.
Should be ok to close #428

@marcello33
Copy link
Copy Markdown
Collaborator

marcello33 commented Aug 18, 2025

Strange that e2e are failing at bor contracts deployment, no?
Other than that, LGTM

@kamuikatsurgi
Copy link
Copy Markdown
Member

kamuikatsurgi commented Aug 18, 2025

Strange that e2e are failing at bor contracts deployment, no? Other than that, LGTM

Kurtosis E2E tests passed. I guess a re-run should help in this case.

@kamuikatsurgi kamuikatsurgi added the do not squash merge Do not use squash merge to merge this PR. label Aug 18, 2025
@kamuikatsurgi
Copy link
Copy Markdown
Member

kamuikatsurgi commented Aug 18, 2025 •
edited
Loading

Hmm...weird that matic-cli e2e tests are failing here and in my PR in Bor too. Re-run didn't help.

@marcello33
Copy link
Copy Markdown
Collaborator

marcello33 commented Aug 18, 2025

Hmm...weird that matic-cli e2e tests are failing here and in my PR in Bor too. Re-run didn't help.

What's the branch used for bor in such tests? Can bor be broken?
Usually when the deployment on bor fails, that's a good indication for bor not being healthy

@kamuikatsurgi
Copy link
Copy Markdown
Member

kamuikatsurgi commented Aug 18, 2025 •
edited
Loading

Hmm...weird that matic-cli e2e tests are failing here and in my PR in Bor too. Re-run didn't help.

What's the branch used for bor in such tests? Can bor be broken? Usually when the deployment on bor fails, that's a good indication for bor not being healthy

In matic-cli as well as in kurtosis e2e tests, the develop branch is used. Though I don't think bor should have any issues, cause the kurtosis e2e tests passed. It also uses the develop branch.

I guess that something in matic-cli is broken.

@kamuikatsurgi
Copy link
Copy Markdown
Member

kamuikatsurgi commented Aug 18, 2025

@marcello33, the test is failing with this:

Error: error sending request for url (http://localhost:9545/)

Context:
- Error #0: client error (Connect)
- Error #1: tcp connect error
- Error #2: Connection refused (os error 111)
Failed to sync Bor contracts deployment
Error: Process completed with exit code 1.

The port 9545 is for anvil, so it seems there is some issue with anvil, rather than bor.

@kamuikatsurgi kamuikatsurgi mentioned this pull request Aug 19, 2025
Merged
16 tasks
@Raneet10
Copy link
Copy Markdown
Contributor Author

Raneet10 commented Aug 19, 2025

Going ahead with the merge.

@Raneet10 Raneet10 merged commit b41bc60 into develop Aug 19, 2025
15 of 19 checks passed
@Raneet10 Raneet10 deleted the raneet10/resolve-main-develop-conflicts branch August 19, 2025 05:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pratikspatil024 pratikspatil024 pratikspatil024 approved these changes

@kamuikatsurgi kamuikatsurgi kamuikatsurgi approved these changes

Assignees

No one assigned

Labels

do not squash merge Do not use squash merge to merge this PR.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Raneet10 @marcello33 @kamuikatsurgi @pratikspatil024