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

Develop to beta #1797

Merged
merged 263 commits into from
Jan 22, 2024
Merged

Develop to beta #1797

merged 263 commits into from
Jan 22, 2024

Conversation

DmytroNazarenko
Copy link
Collaborator

No description provided.

olehnikolaiev and others added 30 commits September 14, 2023 11:21
@olehnikolaiev
Merge pull request #1647 from skalenetwork/bug/1619-content-type-header
b5009cb 
Bug/1619 content type header
@DmytroNazarenko
Enable tx broadcasting
2b22a45
@DmytroNazarenko
Enable transactions methods for syncNode
5e19bd3
@DmytroNazarenko
Exit sync node if stateRoot
2fbb33c
@olehnikolaiev
1550 reenable cat cycle test
a3a46de
@olehnikolaiev
Merge pull request #1671 from skalenetwork/bug/1550-reenable-cat-cycl…
26b8c02 
…e-test

1550 reenable cat cycle test
@olehnikolaiev
1198 handle params in blockNumber
8feadd2
@olehnikolaiev
Merge pull request #1677 from skalenetwork/bug/bug-1198-dont-ignore-p…
f10195c 
…arams-eth-block-number

Bug/bug 1198 dont ignore params eth block number
@olehnikolaiev
1482 update consensus for db usage call fix
334e064
@olehnikolaiev
1482 update consensus
4434e51
@olehnikolaiev
Merge pull request #1685 from skalenetwork/bug/1482-skale-db-usage-call
45a4e56 
1482 update consensus for db usage call fix
@olehnikolaiev
1689 fix microprofile option
fed1457
@olehnikolaiev
Merge branch 'v3.18.0' into bug/1689-microprofile-build
c420ff1
@olehnikolaiev
Merge pull request #1690 from skalenetwork/bug/1689-microprofile-build
cff2955 
Bug/1689 microprofile build
@dimalit
Merge branch 'develop' into bug/SKALED-1623-sigterm-at-exit
b66cb8f
@dimalit
Merge remote-tracking branch 'origin/develop' into bug/SKALED-1623-si…
a9a5d09 
…gterm-at-exit
@dimalit
SKALED-1623 Logs fix
9692d78
@dimalit
Merge remote-tracking branch 'origin/v3.18.0' into bug/SKALED-1623-si…
10fc6ea 
…gterm-at-exit
@DmytroNazarenko
1640 drop broadcast txns if skaled has outdated state
4a0e390
@olehnikolaiev
1640 drop broadcast transactions if skaled has outdated state
b210405
@olehnikolaiev
1640 add logs when dropping txn through broadcast
aac143f
@olehnikolaiev
Merge branch 'develop' into merge-develop-to-3.18
531ffac
@DmytroNazarenko
Merge pull request #1699 from skalenetwork/merge-develop-to-3.18
997aeaa 
Merge develop to 3.18
@olehnikolaiev
Merge branch 'v3.18.0' into bug/1640-slow-catchup
a00c194
@kladkogex
new op codes
cd46989
@kladkogex
1700 push zero
83379f9
@kladkogex
1700 PUSHD
bbd707d
@kladkogex
1700 add pushd
33502b1
@kladkogex
1700 clang format
aad381b
@kladkogex
1700 clang format
53f4ecf
olehnikolaiev and others added 26 commits January 16, 2024 16:06
@olehnikolaiev
Merge branch 'bug/IS-902-allow-uploading-only-one-snapshot' of github…
53160e7 
….com:skalenetwork/skaled into bug/IS-902-allow-uploading-only-one-snapshot
@olehnikolaiev
fix tests
99a645a
@olehnikolaiev
fix tests
886c695
@olehnikolaiev
#1785 fix unittests
2b7cf66
@olehnikolaiev
#1785 fix SkaleHostSuite tests
a20069c
@olehnikolaiev
Merge branch 'v3.18.0' into bug/1785-fix-unittests
a17da41
@olehnikolaiev
#1785 fix EstimateGasSuite unittests
2a3fadd
@olehnikolaiev
#1785 build historic mode in different folder
5253168
@olehnikolaiev
#1785 fix JsonRpcSuite tests
d6427e7
@olehnikolaiev
Merge pull request #1786 from skalenetwork/bug/1785-fix-unittests
85146a0 
Bug/1785 fix unittests
@olehnikolaiev
Merge branch 'v3.18.0' into bug/IS-902-allow-uploading-only-one-snapshot
04298fe
@dimalit
SKALED-1693 Run functional test twice - for both original and histori…
9ea8a42 
…c builds
@olehnikolaiev
Merge pull request #1784 from skalenetwork/bug/IS-902-allow-uploading…
678f59b 
…-only-one-snapshot

IS-902 check block number to download snapshot
@olehnikolaiev
Merge branch 'v3.18.0' into bug/1640-change-snapshot-hash-computation
2d0e3d5
@olehnikolaiev
#1588 rename variables
7c67a04
@olehnikolaiev
#1588 rename variables and remove colored logs
b8cdd8d
@olehnikolaiev
#1588 move batchCHunkSize to class field
ac6490e
@olehnikolaiev
#1588 bool flag to continue db hash computation
a79c45d
@DmytroNazarenko
Merge pull request #1787 from skalenetwork/bug/1640-change-snapshot-h…
46bbdbd 
…ash-computation

Bug/1588 change snapshot hash computation
@dimalit
SKALED-1693 Run functional tests for orig and historic builds
bde0c84
@dimalit
Merge branch 'v3.18.0' into enhancement/SKALED-1693-func-tests-on-bot…
bd6fa93 
…h-builds
@olehnikolaiev
IS-902 fix 0 zero snapshot case
92bb424
@DmytroNazarenko
Merge pull request #1788 from skalenetwork/enhancement/SKALED-1693-fu…
fce0fd1 
…nc-tests-on-both-builds

Enhancement/skaled 1693 func tests on both builds
@olehnikolaiev
Merge branch 'v3.18.0' into bug/IS-902-zero-snapshot
484421e
@DmytroNazarenko
Merge pull request #1790 from skalenetwork/bug/IS-902-zero-snapshot
4880e19 
Bug/is 902 zero snapshot
@DmytroNazarenko
Merge pull request #1791 from skalenetwork/v3.18.0
f7f2d13 
V3.18.0 to develop
@github-actions GitHub Actions
Copy link

SUGGESTIONS BEFORE MERGE:

  1. Build custom container here: https://github.com/skalenetwork/skaled/actions?query=workflow%3A%22Custom+Docker+and+Binary%22
  2. Test it here: https://github.com/skalenetwork/skale-ci-integration_tests/actions?query=workflow%3A%22Skaled+Nightly+Tests%22
  3. Edit VERSION file appropriately to your changes!
    See https://skalelabs.atlassian.net/wiki/spaces/SKALE/pages/2444951553/Branching+instructions

@DmytroNazarenko DmytroNazarenko merged commit cb58c6d into beta Jan 22, 2024
8 of 10 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Jan 22, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@kladkogex kladkogex Awaiting requested review from kladkogex kladkogex is a code owner

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

Successfully merging this pull request may close these issues.
5 participants
@DmytroNazarenko @olehnikolaiev @dimalit @kladkogex @badrogger