Skip to content

Commit c997a37

Browse files
Luisfc68Luisfc68
committed
Merge branch 'master' into flyover-2.1.1
2 parents 117e8da + c5f286f commit c997a37

File tree

13 files changed

+113
-57
lines changed

13 files changed

+113
-57
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424

2525
- name: Set up Go
26-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
26+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2727
with:
2828
go-version-file: 'go.mod'
2929

@@ -49,7 +49,7 @@ jobs:
4949
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5050

5151
- name: Set up Go
52-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
52+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
5353
with:
5454
go-version-file: 'go.mod'
5555

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ jobs:
2929
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3030

3131
- name: Initialize CodeQL
32-
uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
32+
uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
3333
with:
3434
languages: ${{ matrix.language }}
3535
queries: +security-and-quality
3636

3737
- name: Autobuild
38-
uses: github/codeql-action/autobuild@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
38+
uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
3939

4040
- name: Perform CodeQL Analysis
41-
uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
41+
uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
4242
with:
4343
category: "/language:${{ matrix.language }}"

‎.github/workflows/deploy-dev.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2222

2323
- name: Configure AWS credentials
24-
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
24+
uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
2525
with:
2626
role-to-assume: ${{ secrets.DEV_ROLE_ARN }}
2727
aws-region: ${{ secrets.AWS_REGION }}

‎.github/workflows/e2e.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,25 @@ on:
66
pull_request:
77
branches: [ QA-Test, Stable-Test, master ]
88

9+
permissions: read-all
10+
911
jobs:
1012
e2e-test:
1113
name: Server initialization and health check
1214
runs-on: ubuntu-latest
1315
steps:
1416
- name: Checkout
15-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
17+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1618

1719
- name: Set up Go
18-
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
20+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
1921
with:
2022
go-version-file: 'go.mod'
2123

2224
- name: Update env file
23-
run: cd docker-compose/local/ && ./gh-action-env.sh ${{ secrets.GITHUB_TOKEN }}
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
run: cd docker-compose/local/ && ./gh-action-env.sh $GITHUB_TOKEN
2428

2529
- name: Building LPS environment...
2630
run: cd docker-compose/local/ && LPS_STAGE=regtest sh lps-env.sh up

‎.github/workflows/scorecard.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ jobs:
3434
publish_results: true
3535

3636
- name: "Upload artifact"
37-
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
37+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
3838
with:
3939
name: SARIF file
4040
path: results.sarif
4141
retention-days: 5
4242

4343
- name: "Upload to code-scanning"
44-
uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
44+
uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
4545
with:
4646
sarif_file: results.sarif

‎docker-compose/docker-compose.yml‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,33 @@ services:
4545
- 27017
4646
networks:
4747
- net_lps
48-
48+
rskj:
49+
build:
50+
context: ./rskj
51+
args:
52+
UID: "${LPS_UID}"
53+
image: rskj:latest
54+
container_name: rskj01
55+
ports:
56+
- "4444:4444"
57+
- "4445:4445"
58+
volumes:
59+
- ${RSKJ_HOME:-./volumes/rskj}/db:/home/rsk/.rsk
60+
- ${RSKJ_HOME:-./volumes/rskj}/logs:/home/rsk/logs
61+
networks:
62+
- net_lps
63+
command:
64+
[
65+
"java",
66+
"-Drpc.providers.web.http.bind_address=0.0.0.0",
67+
"-Drpc.providers.web.http.hosts.0=localhost",
68+
"-Drpc.providers.web.http.hosts.1=rskj",
69+
"-cp",
70+
"rskj-core.jar",
71+
"-Drsk.conf.file=rsk.conf",
72+
"co.rsk.Start",
73+
"--${LPS_STAGE}",
74+
]
4975
lps:
5076
build:
5177
context: ../

‎docker-compose/mainnet/docker-compose.yml‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,33 @@ services:
9393
networks:
9494
- net_lps
9595
command: ["liquidity-provider-server"]
96-
lbc-deployer:
96+
rskj:
9797
build:
98-
context: lbc-deployer
98+
context: ../rskj
9999
args:
100-
LBC_GIT_BRANCH: "${LBC_GIT_BRANCH:-master}"
101-
image: lbc-deployer:latest
102-
container_name: lbc-deployer01
103-
environment:
104-
- LPS_STAGE
100+
UID: "${LPS_UID}"
101+
image: rskj:latest
102+
container_name: rskj01
103+
ports:
104+
- "4444:4444"
105+
- "4445:4445"
106+
volumes:
107+
- ${RSKJ_HOME:-./volumes/rskj}/db:/home/rsk/.rsk
108+
- ${RSKJ_HOME:-./volumes/rskj}/logs:/home/rsk/logs
105109
networks:
106110
- net_lps
111+
command:
112+
[
113+
"java",
114+
"-Drpc.providers.web.http.bind_address=0.0.0.0",
115+
"-Drpc.providers.web.http.hosts.0=localhost",
116+
"-Drpc.providers.web.http.hosts.1=rskj",
117+
"-cp",
118+
"rskj-core.jar",
119+
"-Drsk.conf.file=rsk.conf",
120+
"co.rsk.Start",
121+
"--${LPS_STAGE}",
122+
]
107123

108124
networks:
109125
net_lps:

‎docker-compose/powpeg/pegin/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM openjdk:8-jdk-slim-buster@sha256:221a061dbd1a81efe42e6ce9bc099f7ce318b1f7f3ba186e387264f14e61dec2 AS builder
1+
FROM --platform=linux/amd64 eclipse-temurin:17-jdk@sha256:08295ab0f5007a37cbcc6679a8447a7278d9403f9f82acd80ed08cd10921e026 AS builder
22

33
RUN apt-get update -y && \
44
apt-get install -y -qq --no-install-recommends curl git gnupg && \
55
apt-get clean
66

77
WORKDIR /code/powpeg
88

9-
ARG POWPEG_RELEASE="ARROWHEAD"
10-
ARG POWPEG_VERSION="6.3.1.0"
9+
ARG POWPEG_RELEASE="LOVELL"
10+
ARG POWPEG_VERSION="7.0.0.0"
1111

1212
RUN gitrev="${POWPEG_RELEASE}-${POWPEG_VERSION}" && \
1313
git init && \
@@ -22,10 +22,10 @@ RUN gpg --keyserver https://secchannel.rsk.co/SUPPORT.asc --recv-keys A6DBEAC640
2222
./configure.sh && \
2323
./gradlew --no-daemon clean build -x test
2424

25-
FROM --platform=linux/amd64 openjdk:8-jdk@sha256:86e863cc57215cfb181bd319736d0baf625fe8f150577f9eb58bd937f5452cb8 AS runner
25+
FROM --platform=linux/amd64 eclipse-temurin:17-jre@sha256:f1515395c0695910a3ca665e973cc11013d1f50d265e61cb8c9156e999d914b4 AS runner
2626

2727
ARG HOME="/home/powpeg"
28-
RUN useradd -m -u 1000 --home="$HOME" powpeg
28+
RUN useradd -m -u 1001 --home="$HOME" powpeg
2929

3030
COPY --from=builder --chown=root:root --chmod=555 "/code/powpeg/build/libs/federate-node-*-all.jar" "$HOME/powpeg.jar"
3131

‎docker-compose/powpeg/pegout/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM openjdk:8-jdk-slim-buster@sha256:221a061dbd1a81efe42e6ce9bc099f7ce318b1f7f3ba186e387264f14e61dec2 AS builder
1+
FROM --platform=linux/amd64 eclipse-temurin:17-jdk@sha256:08295ab0f5007a37cbcc6679a8447a7278d9403f9f82acd80ed08cd10921e026 AS builder
22

33
RUN apt-get update -y && \
44
apt-get install -y -qq --no-install-recommends curl git gnupg && \
55
apt-get clean
66

77
WORKDIR /code/powpeg
88

9-
ARG POWPEG_RELEASE="ARROWHEAD"
10-
ARG POWPEG_VERSION="6.3.1.0"
9+
ARG POWPEG_RELEASE="LOVELL"
10+
ARG POWPEG_VERSION="7.0.0.0"
1111

1212
RUN gitrev="${POWPEG_RELEASE}-${POWPEG_VERSION}" && \
1313
git init && \
@@ -22,10 +22,10 @@ RUN gpg --keyserver https://secchannel.rsk.co/SUPPORT.asc --recv-keys A6DBEAC640
2222
./configure.sh && \
2323
./gradlew --no-daemon clean build -x test
2424

25-
FROM --platform=linux/amd64 openjdk:8-jdk@sha256:86e863cc57215cfb181bd319736d0baf625fe8f150577f9eb58bd937f5452cb8 AS runner
25+
FROM --platform=linux/amd64 eclipse-temurin:17-jre@sha256:f1515395c0695910a3ca665e973cc11013d1f50d265e61cb8c9156e999d914b4 AS runner
2626

2727
ARG HOME="/home/powpeg"
28-
RUN useradd -m -u 1000 --home="$HOME" powpeg
28+
RUN useradd -m -u 1001 --home="$HOME" powpeg
2929

3030
COPY --from=builder --chown=root:root --chmod=555 "/code/powpeg/build/libs/federate-node-*-all.jar" "$HOME/powpeg.jar"
3131

‎docker-compose/rskj/Dockerfile‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM openjdk:8-jdk-slim-buster@sha256:221a061dbd1a81efe42e6ce9bc099f7ce318b1f7f3ba186e387264f14e61dec2 AS builder
1+
FROM eclipse-temurin:17-jdk@sha256:0613a19436dc8f745914b25235d43f3b0eddb8d432d19edce30ffaf2d2f95403 AS builder
22

33
RUN apt-get update -y && \
44
apt-get install -y -qq --no-install-recommends curl git gnupg && \
55
apt-get clean
66

77
WORKDIR /code/rskj
88

9-
ARG RSKJ_RELEASE="ARROWHEAD"
10-
ARG RSKJ_VERSION="6.3.1"
9+
ARG RSKJ_RELEASE="LOVELL"
10+
ARG RSKJ_VERSION="7.0.0"
1111

1212
RUN gitrev="${RSKJ_RELEASE}-${RSKJ_VERSION}" && \
1313
git init && \
@@ -25,9 +25,9 @@ RUN gpg --keyserver https://secchannel.rsk.co/SUPPORT.asc --recv-keys 1DC9157991
2525
modifier=$(sed -n 's/^modifier=//p' "$file" | tr -d "\"'") && \
2626
cp "rskj-core/build/libs/rskj-core-$version_number-$modifier-all.jar" rsk.jar
2727

28-
FROM --platform=linux/amd64 openjdk:8-jdk@sha256:86e863cc57215cfb181bd319736d0baf625fe8f150577f9eb58bd937f5452cb8 AS runner
28+
FROM --platform=linux/amd64 eclipse-temurin:17-jre@sha256:38e0afc86a10bf4cadbf1586fb617b3a9a4d09c9a0be882e29ada4ed0895fc84
2929

30-
ARG UID=1000
30+
ARG UID=1001
3131
ARG HOME="/home/rsk"
3232
RUN useradd -m -u "$UID" --home="$HOME" rsk
3333

0 commit comments

Comments
 (0)