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.

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

Candidate for 4.0.13 #1383

Merged
merged 28 commits into from
Jul 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
754ccb2
backpressure-miners
pragmaxim May 25, 2021
c4444af
self-adjustable prepareCandidate retry period
pragmaxim May 25, 2021
a308e9e
Merge branch 'v4.0.12' of github.com:ergoplatform/ergo into backpress…
kushti Jun 1, 2021
12fd519
commenting ErgoMiner
pragmaxim Jun 1, 2021
b8e9250
4.0.13 set
kushti Jun 3, 2021
14af02f
Merge branch 'v4.0.13' of github.com:ergoplatform/ergo into backpress…
kushti Jun 3, 2021
2d1471f
Merge branch 'backpressure-miners-to-avoid-failing' of github.com:erg…
kushti Jun 3, 2021
12e9772
Merge pull request #1364 from ergoplatform/backpressure-miners-to-avo…
kushti Jun 3, 2021
ae42ba5
Merge branch 'master' into v4.0.13
kushti Jun 3, 2021
c783580
scaladoc fix
kushti Jun 7, 2021
5251a78
Merge branch 'v4.0.13' of github.com:ergoplatform/ergo into v4.0.13
kushti Jun 7, 2021
9b2fdd3
avoiding silent wallet failure
pragmaxim Jun 15, 2021
b39552b
fix-api: set correct types in yaml
aslesarenko Jun 22, 2021
d7aff73
fix-api: scriptProcessor made lazy
aslesarenko Jun 22, 2021
203d963
Wait for concurrent thread completion in concurrent applyModifier() a…
knizhnik Jun 23, 2021
2c12339
Merge branch 'v4.0.13' of github.com:ergoplatform/ergo into fix-api
kushti Jun 23, 2021
12f1d96
Merge pull request #1393 from ergoplatform/fix-api
kushti Jun 23, 2021
49197ee
fixing ErgoMiner scaladoc
pragmaxim Jun 30, 2021
37d2b42
Merge pull request #1395 from ergoplatform/fix_concurrent_modification
kushti Jul 11, 2021
a5e7426
minor code improvements
kushti Jul 11, 2021
52ed239
loop fix for double-spending transactions
kushti Jul 12, 2021
61db9de
Merge pull request #1406 from ergoplatform/assembly-improvs
kushti Jul 13, 2021
d1e2851
Merge pull request #1391 from ergoplatform/avoiding-silent-wallet-fai…
kushti Jul 13, 2021
0a6fd12
scaladoc fix for validation settings
kushti Jul 18, 2021
f9d542c
changing comment on pubKey presence
kushti Jul 18, 2021
c160c01
actions
kushti Jul 19, 2021
beb0ae7
.github
kushti Jul 19, 2021
ced8f34
yml fixes
kushti Jul 19, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
47 changes: 47 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: CI
on:
pull_request:
push:
jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
os: [ubuntu-latest]
scala: [2.12.10, 2.11.12]
java: [adopt@1.8]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout current branch (full)
uses: actions/checkout@v2
with:
fetch-depth: 0

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v10
with:
java-version: ${{ matrix.java }}

- name: Cache sbt
uses: actions/cache@v2
with:
path: |
~/.sbt
~/.ivy2/cache
~/.coursier/cache/v1
~/.cache/coursier/v1
~/AppData/Local/Coursier/Cache/v1
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Runs tests for the wallet
run: sbt +ergoWallet/test

- name: Runs tests
run: sbt -Denv=test clean test

- name: Publish a wallet snapshot ${{ github.ref }}
run: sbt ++${{ matrix.scala }} +ergoWallet/publish
env:
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
39 changes: 39 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Publish a release

on:
release:
types: [published]

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
publish_release:
name: Publish release to Sonatype
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Setup Java and Scala
uses: olafurpg/setup-scala@v10
with:
java-version: adopt@1.8

- name: Cache sbt
uses: actions/cache@v2
with:
path: |
~/.sbt
~/.ivy2/cache
~/.coursier/cache/v1
~/.cache/coursier/v1
~/AppData/Local/Coursier/Cache/v1
~/Library/Caches/Coursier/v1
key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}

- name: Publish release ${{ github.ref }}
run: ci/publish_release_gpg2.sh
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ To run specific Ergo version `<VERSION>` as a service with custom config `/path/
-e MAX_HEAP=3G \
ergoplatform/ergo:<VERSION> --<networkId> -c /etc/myergo.conf

Available versions can be found on [Ergo Docker image page](https://hub.docker.com/r/ergoplatform/ergo/tags), for example, `v4.0.12`.
Available versions can be found on [Ergo Docker image page](https://hub.docker.com/r/ergoplatform/ergo/tags), for example, `v4.0.13`.

This will connect to the Ergo mainnet or testnet following your configuration passed in `myergo.conf` and network flag `--<networkId>`. Every default config value would be overwritten with corresponding value in `myergo.conf`. `MAX_HEAP` variable can be used to control how much memory can the node consume.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ object ErgoInterpreter {
* Preforms pre-compilation of the given scripts during instantiation.
* Keeps pre-compiled data structures for the lifetime of JVM.
*/
val scriptProcessor: PrecompiledScriptProcessor = {
/** Script compilation requires an instance of [[SigmaValidationSettings]].
lazy val scriptProcessor: PrecompiledScriptProcessor = {
/** Script compilation requires an instance of [[org.ergoplatform.validation.SigmaValidationSettings]].
* The only way to pass it to the CacheLoader is via cache key.
* So here we augment each script bytes with the instance of validation settings.
*/
Expand Down
33 changes: 23 additions & 10 deletions src/main/resources/api/openapi.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
openapi: "3.0.2"

info:
version: "4.0.12"
version: "4.0.13"
title: Ergo Node API
description: API docs for Ergo Node. Models are shared between all Ergo products
contact:
Expand Down Expand Up @@ -1114,7 +1114,7 @@ components:
$ref: '#/components/schemas/ErgoAddress'
ergValue:
description: Optional, amount of ergs to be put into box with issued assets
type: integer
type: int64
amount:
description: Supply amount
type: integer
Expand Down Expand Up @@ -1180,7 +1180,7 @@ components:
type: string
example: '0000000000000000'
d:
type: integer
type: number
example: 987654321

BlockHeaderWithoutPow:
Expand Down Expand Up @@ -1530,9 +1530,24 @@ components:
- currentNetworkTime
properties:
lastIncomingMessage:
$ref: '#/components/schemas/Timestamp'
type: integer
allOf:
- $ref: '#/components/schemas/Timestamp'
currentNetworkTime:
$ref: '#/components/schemas/Timestamp'
type: integer
allOf:
- $ref: '#/components/schemas/Timestamp'

BlacklistedPeers:
type: object
required:
- addresses
properties:
addresses:
type: array
items:
type: string
description: Blacklisted node address

NodeInfo:
type: object
Expand Down Expand Up @@ -1871,7 +1886,7 @@ components:
Timestamp:
description: Basic timestamp definition
type: integer
format: int32
format: int64
example: 1524143059077

EmissionInfo:
Expand Down Expand Up @@ -2730,10 +2745,8 @@ paths:
content:
application/json:
schema:
type: array
items:
type: string
description: Blacklisted node address
$ref: '#/components/schemas/BlacklistedPeers'

default:
description: Error
content:
Expand Down
8 changes: 8 additions & 0 deletions src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,15 @@ ergo {
}
}

bounded-mailbox {
mailbox-type = "akka.dispatch.NonBlockingBoundedMailbox"
mailbox-capacity = 5000
}

akka {
actor.mailbox.requirements {
"akka.dispatch.BoundedMessageQueueSemantics" = bounded-mailbox
}
http {
server {
request-timeout = 1 minute
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mainnet.conf
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ scorex {
network {
magicBytes = [1, 0, 2, 4]
bindAddress = "0.0.0.0:9030"
nodeName = "ergo-mainnet-4.0.12"
nodeName = "ergo-mainnet-4.0.13"
nodeName = ${?NODENAME}
knownPeers = [
"46.4.112.10:9030",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/testnet.conf
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ scorex {
network {
magicBytes = [2, 0, 0, 2]
bindAddress = "0.0.0.0:9020"
nodeName = "ergo-testnet-4.0.12"
nodeName = "ergo-testnet-4.0.13"
nodeName = ${?NODENAME}
knownPeers = [
"213.239.193.208:9020",
Expand Down