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 #1042

Merged
merged 14 commits into from
Oct 16, 2023
Merged

merge develop #1042

merged 14 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
  • Created a task in Jira and informed the team for implementation in Erigon client (if applicable)
  • Includes RPC methods changes, and the Notion documentation has been updated

pratikspatil024 and others added 14 commits September 21, 2023 11:05
@pratikspatil024
Merge pull request #1013 from maticnetwork/master-to-develop
ef38194 
Backport master to develop after v1.0.4
@manav2401
internal/cli: add support to overwrite config.toml values via cli fla…
8613ff1 
…gs (#1008)

* internal/cli: add support to overwrite config.toml via cli flags

* fix lint and refactor

* add extensive tests for flagset

* fix type conversion for big.Int

* add more tests for coverage

* add t.parallel

* internal/cli/flagset: handle flag conversion using interface

* internal/cli/flagset: fix test
@anshalshukla
update discord links
da58cbc
@anshalshukla
merge develop
043b71d
@anshalshukla
Merge pull request #1015 from maticnetwork/discord
5e43bdb 
readme: update discord links
@marcello33
Merge branch 'master' into backport/master-to-develop
53f28f2
@marcello33
Merge pull request #1029 from maticnetwork/backport/master-to-develop
cb2f8ad
@marcello33
Merge branch 'master' into backport/master-develop
ac25ecf
@marcello33
Merge pull request #1032 from maticnetwork/backport/master-develop
4440815 
backport/master-to-develop
@marcello33
Merge branch 'master' into mardizzone/master-to-develop
3d9eb2c
@marcello33
Merge pull request #1035 from maticnetwork/mardizzone/master-to-develop
d79e671 
mardizzone/master-to-develop
@pratikspatil024
worker: (Block-STM) Do not hardcode EnableMVHashMap as false (#1039)
a5d53af 
* do not hardcode EnableMVHashMap as false

* addressed comment

* lint
@0xsharma
Fix Codecov and add integration tests coverage (#1020)
db1562b 
* add : gocovmerge support

* fix : minor fix

* add : dependancy for codecov

* fix : dependancy

* fix : codecov upload/download artifact

* fix : fix unable to find cover.out file

* fix : rename integration_cover.out

* chg : codecov-action from v1 to v3
@marcello33
Add CodeQL (#1037)
1a81777 
* dev: add: codeQL

* dev: chg: solve codeQL high vulns

* dev: chg: remove js scan after dismissing relative issues

* dev: chg: fix size allocation checks

* dev: chg: fix size allocation checks

* dev: chg: use math.MaxUint8 for incorrect coversion for integer

* dev: chg: revert on one check / return error on trezorExchange func

* dev: chg: remove checks on logger as not harmful

* 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-1038

* dev: chg: remove snyk files
@marcello33 marcello33 changed the title Develop merge develop Oct 16, 2023
@marcello33 marcello33 merged commit 06f2985 into master Oct 16, 2023
22 checks passed
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

@ssandeep ssandeep ssandeep 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.
6 participants
@marcello33 @ssandeep @pratikspatil024 @manav2401 @anshalshukla @0xsharma