Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge develop #1083

Merged
merged 10 commits into from
Oct 16, 2023
Merged

merge develop #1083

merged 10 commits into from
Oct 16, 2023

Conversation

marcello33
Copy link
Contributor

Description

Merge develop to master

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 2 reviewer 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

svenski123 and others added 10 commits August 10, 2023 18:09
@svenski123
Where validation of the merkle transaction inclusion proof has failed…
56bb4eb 
…, when the block contains a single transaction and the block header root hash matches the transaction hash itself, accept the transaction as valid.
@djpolygon
Addressing packages issues
491a245
@VAIBHAVJINDAL3012
Merge pull request #1064 from maticnetwork/djpolygon/package_fixes
4810a26 
Addressing packages issues
@Raneet10
Add README for bor module (#1071)
f7decae 
* bor: init README for bor module

* bor: address comments

* minor improvements based on comments

* bor: improve readme structure and headings

* bor: fix link fragments
@omahs @VAIBHAVJINDAL3012
Fix typos (#1061)
54d1070 
* fix typos

* fix typo

* fix typo

---------

Co-authored-by: VaibhavJindal <74560896+VAIBHAVJINDAL3012@users.noreply.github.com>
@anshalshukla
Merge pull request #1030 from svenski123/230810-accept-alternate-root…
00712f8 
…-hash-for-single-tx-blocks

ValidateTxResult: accept single transaction blocks as currently produced by heimdall as valid
@0xKrishna
Added Clerk README (#1075)
beaaa4d 
* Added clerk readme

* Fix table of contents

* Fix state-sync image

* Fix typo

* Fix typo
@marcello33
Merge branch 'master' into backport/master-to-develop
fa1846d
@marcello33
Merge pull request #1078 from maticnetwork/backport/master-to-develop
3fcbae3
@marcello33
Add CodeQL (#1079)
24378c4 
* dev: add: codeQL

* dev: chg: remove js scan after dismissing issues for swaggerUI

* dev: chg: bump geth to solve p2p ddos

* dev: chg: bump govuln action go versions

* dev: chg: name of CI for govuln

* dev: chg: bump x/net to 0.17 as per PR-1080

* dev: chg: remove snyk files
@marcello33 marcello33 merged commit 8811f35 into master Oct 16, 2023
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ssandeep ssandeep ssandeep approved these changes

@pratikspatil024 pratikspatil024 pratikspatil024 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
10 participants
@marcello33 @ssandeep @pratikspatil024 @svenski123 @djpolygon @VAIBHAVJINDAL3012 @Raneet10 @omahs @anshalshukla @0xKrishna