Skip to content

Commit 737874f

Browse files
Luisfc68Luisfc68
committed
Merge branch 'QA-Test' into v.2.5.0
2 parents ce1d08a + e47c004 commit 737874f

File tree

77 files changed

+7426
-286
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+7426
-286
lines changed

‎.github/dependabot.yml‎

Lines changed: 114 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,128 @@
11
version: 2
2+
23
updates:
3-
- package-ecosystem: 'gomod'
4+
# Go modules - Minor and Patch updates
5+
- package-ecosystem: "gomod"
46
directory: "/"
7+
target-branch: QA-Test
8+
schedule:
9+
interval: "weekly"
10+
# Wait at least 10 days after a new version is released before opening a PR
11+
cooldown:
12+
default-days: 10
13+
labels:
14+
- "dependencies"
15+
- "go"
16+
# one PR per week that groups BOTH minor + patch updates
17+
groups:
18+
go-updates:
19+
applies-to: version-updates
20+
patterns:
21+
- "*"
22+
update-types:
23+
- minor
24+
- patch
25+
26+
# Go modules - Security updates
27+
- package-ecosystem: "gomod"
28+
directory: "/"
29+
target-branch: master
530
schedule:
631
interval: "daily"
32+
# Wait at least 1 day after a security update is released before opening a PR
33+
cooldown:
34+
default-days: 1
35+
labels:
36+
- "dependencies"
37+
- "go"
38+
- "security"
39+
# one PR that groups security updates
40+
groups:
41+
security:
42+
applies-to: security-updates
43+
patterns:
44+
- "*"
45+
46+
# GitHub Actions - Minor and Patch updates
47+
- package-ecosystem: "github-actions"
48+
directory: "/"
749
target-branch: QA-Test
8-
- package-ecosystem: github-actions
50+
schedule:
51+
interval: "weekly"
52+
# Wait at least 10 days after a new version is released before opening a PR
53+
cooldown:
54+
default-days: 10
55+
labels:
56+
- "dependencies"
57+
- "github_actions"
58+
# one PR per week that groups BOTH minor + patch updates
59+
groups:
60+
actions-updates:
61+
applies-to: version-updates
62+
patterns:
63+
- "*"
64+
update-types:
65+
- minor
66+
- patch
67+
68+
# GitHub Actions - Security updates
69+
- package-ecosystem: "github-actions"
970
directory: "/"
71+
target-branch: master
1072
schedule:
1173
interval: "daily"
74+
# Wait at least 1 day after a security update is released before opening a PR
75+
cooldown:
76+
default-days: 1
77+
labels:
78+
- "dependencies"
79+
- "github_actions"
80+
- "security"
81+
# one PR that groups security updates
82+
groups:
83+
security:
84+
applies-to: security-updates
85+
patterns:
86+
- "*"
87+
88+
# Docker - Minor and Patch updates
89+
- package-ecosystem: "docker"
90+
directory: "/"
1291
target-branch: QA-Test
92+
schedule:
93+
interval: "weekly"
94+
# Wait at least 10 days after a new version is released before opening a PR
95+
cooldown:
96+
default-days: 10
97+
labels:
98+
- "dependencies"
99+
- "docker"
100+
# one PR per week that groups BOTH minor + patch updates
13101
groups:
14-
dependencies:
15-
dependency-type: production
16-
dev-dependencies:
17-
dependency-type: development
18-
- package-ecosystem: docker
102+
docker-updates:
103+
applies-to: version-updates
104+
patterns:
105+
- "*"
106+
update-types:
107+
- minor
108+
- patch
109+
110+
# Docker - Security updates
111+
- package-ecosystem: "docker"
19112
directory: "/"
113+
target-branch: master
20114
schedule:
21115
interval: "daily"
22-
target-branch: QA-Test
116+
# Wait at least 1 day after a security update is released before opening a PR
117+
cooldown:
118+
default-days: 1
119+
labels:
120+
- "dependencies"
121+
- "docker"
122+
- "security"
123+
# one PR that groups security updates
124+
groups:
125+
security:
126+
applies-to: security-updates
127+
patterns:
128+
- "*"

‎.github/workflows/devPortal-update.yml‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,28 @@ jobs:
210210
rm ${TEMP_FILE}
211211
cp ${TRANSFORMED_FILE} ${BASE_DST}/advanced-operations.md
212212
213+
#####################################
214+
# Trusted accounts #
215+
#####################################
216+
TEMP_FILE="trusted-accounts.md"
217+
tail -n +2 ${BASE_SRC}/docs/Trusted-Accounts.md > ${TEMP_FILE}
218+
TRANSFORMED_FILE="transformed/trusted-accounts.md"
219+
echo "---" > ${TRANSFORMED_FILE}
220+
echo "sidebar_label: Trusted Accounts feature" >> ${TRANSFORMED_FILE}
221+
echo "sidebar_position: 240" >> ${TRANSFORMED_FILE}
222+
echo "title: Flyover SDK - Trusted Accounts" >> ${TRANSFORMED_FILE}
223+
echo "tags: [rsk, rootstock, rif, flyover, integrate, integration guide, rbtc, powpeg, automation]" >> ${TRANSFORMED_FILE}
224+
echo "description: Trusted accounts allowed to perform automated PegIn and PegOut operations." >> ${TRANSFORMED_FILE}
225+
echo "---" >> ${TRANSFORMED_FILE}
226+
echo "" >> ${TRANSFORMED_FILE}
227+
echo ":::info[Note]" >> ${TRANSFORMED_FILE}
228+
echo "If you wish to suggest changes on this document, please open a PR on the [Liquidity Provider Server Repository](https://github.com/rsksmart/liquidity-provider-server.git)" >> ${TRANSFORMED_FILE}
229+
echo ":::" >> ${TRANSFORMED_FILE}
230+
echo "" >> ${TRANSFORMED_FILE}
231+
cat ${TEMP_FILE} >> ${TRANSFORMED_FILE}
232+
rm ${TEMP_FILE}
233+
cp ${TRANSFORMED_FILE} ${BASE_DST}/trusted-accounts.md
234+
213235
# Step 3: Commit and Push Changes to Devportal Repository
214236
- name: Commit and Push Changes
215237
env:
@@ -233,4 +255,4 @@ jobs:
233255
-H "Authorization: Bearer ${{ secrets.DEVPORTAL_DOCS_UPDATE_TOKEN }}" \
234256
-H "X-GitHub-Api-Version: 2022-11-28" \
235257
https://api.github.com/repos/rsksmart/devportal/pulls \
236-
-d "{\"title\":\"Liquidity-provider-server automated update of documentation ${BRANCH_NAME}\",\"body\":\"This PR updates the Devportal documentation with the latest changes from the Liquidity Provider Server repository.\",\"head\":\"${BRANCH_NAME}\",\"base\":\"main\"}"
258+
-d "{\"title\":\"Liquidity-provider-server automated update of documentation ${BRANCH_NAME}\",\"body\":\"This PR updates the Devportal documentation with the latest changes from the Liquidity Provider Server repository.\",\"head\":\"${BRANCH_NAME}\",\"base\":\"main\"}"

‎.mockery.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,23 @@ packages:
4242
interfaces:
4343
ResignUseCase:
4444
AcceptQuoteUseCase:
45+
AddPeginCollateralUseCase:
46+
AddPegoutCollateralUseCase:
47+
ChangeStatusUseCase:
4548
GetAssetsReportUseCase:
49+
GetAvailableLiquidityUseCase:
50+
GetConfigUseCase:
51+
GetManagementUiDataUseCase:
52+
HealthUseCase:
53+
GetPeginCollateralUseCase:
54+
GetPeginQuoteUseCase:
55+
GetPegoutCollateralUseCase:
56+
GetPegoutQuoteUseCase:
57+
GetProvidersUseCase:
58+
GetUserDepositsUseCase:
59+
LoginUseCase:
60+
SessionManager:
61+
SetCredentialsUseCase:
4662
PeginStatusUseCase:
4763
PegoutStatusUseCase:
4864
SetGeneralConfigUseCase:
@@ -52,6 +68,9 @@ packages:
5268
RecommendedPeginUseCase:
5369
GetRevenueReportUseCase:
5470
GetSummariesReportUseCase:
71+
GetTrustedAccountsUseCase:
72+
ServerInfoUseCase:
73+
WithdrawCollateralUseCase:
5574
github.com/rsksmart/liquidity-provider-server/internal/entities/liquidity_provider:
5675
interfaces:
5776
LiquidityProviderRepository:

‎docker-compose/docker-compose.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,20 +56,12 @@ services:
5656
- "4444:4444"
5757
- "4445:4445"
5858
volumes:
59-
- ${RSKJ_HOME:-./volumes/rskj}/db:/home/rsk/.rsk
60-
- ${RSKJ_HOME:-./volumes/rskj}/logs:/home/rsk/logs
59+
- ${RSKJ_HOME:-./volumes/rskj}/db:/var/lib/rsk/database
60+
- ${RSKJ_HOME:-./volumes/rskj}/logs:/var/log/rsk
6161
networks:
6262
- net_lps
6363
command:
6464
[
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",
7365
"--${LPS_STAGE}",
7466
]
7567
lps:

‎docker-compose/local/docker-compose.yml‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -115,23 +115,12 @@ services:
115115
- "4444:4444"
116116
- "4445:4445"
117117
volumes:
118-
- ${RSKJ_HOME:-./volumes/rskj}/db:/home/rsk/.rsk
119-
- ${RSKJ_HOME:-./volumes/rskj}/logs:/home/rsk/logs
118+
- ${RSKJ_HOME:-./volumes/rskj}/db:/var/lib/rsk/database
119+
- ${RSKJ_HOME:-./volumes/rskj}/logs:/var/log/rsk
120120
networks:
121121
- net_lps
122122
command:
123123
[
124-
"java",
125-
"-Drpc.providers.web.ws.bind_address=0.0.0.0",
126-
"-Drpc.providers.web.http.bind_address=0.0.0.0",
127-
"-Drpc.providers.web.cors=*",
128-
"-Drpc.providers.web.ws.enabled=true",
129-
"-Drpc.providers.web.http.hosts.0=localhost",
130-
"-Drpc.providers.web.http.hosts.1=rskj",
131-
"-cp",
132-
"rskj-core.jar",
133-
"-Drsk.conf.file=rsk.conf",
134-
"co.rsk.Start",
135124
"--${LPS_STAGE}",
136125
]
137126
mongodb:

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,20 +120,12 @@ services:
120120
- "4444:4444"
121121
- "4445:4445"
122122
volumes:
123-
- ${RSKJ_HOME:-./volumes/rskj}/db:/home/rsk/.rsk
124-
- ${RSKJ_HOME:-./volumes/rskj}/logs:/home/rsk/logs
123+
- ${RSKJ_HOME:-./volumes/rskj}/db:/var/lib/rsk/database
124+
- ${RSKJ_HOME:-./volumes/rskj}/logs:/var/log/rsk
125125
networks:
126126
- net_lps
127127
command:
128128
[
129-
"java",
130-
"-Drpc.providers.web.http.bind_address=0.0.0.0",
131-
"-Drpc.providers.web.http.hosts.0=localhost",
132-
"-Drpc.providers.web.http.hosts.1=rskj",
133-
"-cp",
134-
"rskj-core.jar",
135-
"-Drsk.conf.file=rsk.conf",
136-
"co.rsk.Start",
137129
"--${LPS_STAGE}",
138130
]
139131

‎docker-compose/rskj/Dockerfile‎

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,33 @@
1-
FROM eclipse-temurin:17-jdk@sha256:0613a19436dc8f745914b25235d43f3b0eddb8d432d19edce30ffaf2d2f95403 AS builder
2-
3-
RUN apt-get update -y && \
4-
apt-get install -y -qq --no-install-recommends curl git gnupg && \
5-
apt-get clean
6-
7-
WORKDIR /code/rskj
8-
9-
ARG RSKJ_RELEASE="REED"
10-
ARG RSKJ_VERSION="8.0.0"
11-
12-
RUN gitrev="${RSKJ_RELEASE}-${RSKJ_VERSION}" && \
13-
git init && \
14-
git remote add origin https://github.com/rsksmart/rskj.git && \
15-
git fetch --depth 1 origin tag "$gitrev" && \
16-
git checkout "$gitrev"
17-
18-
RUN gpg --keyserver https://secchannel.rsk.co/SUPPORT.asc --recv-keys 1DC9157991323D23FD37BAA7A6DBEAC640C5A14B && \
19-
gpg --verify --output SHA256SUMS SHA256SUMS.asc && \
20-
sha256sum --check SHA256SUMS && \
21-
./configure.sh && \
22-
./gradlew --no-daemon clean build -x test && \
23-
file=rskj-core/src/main/resources/version.properties && \
24-
version_number=$(sed -n 's/^versionNumber=//p' "$file" | tr -d "\"'") && \
25-
modifier=$(sed -n 's/^modifier=//p' "$file" | tr -d "\"'") && \
26-
cp "rskj-core/build/libs/rskj-core-$version_number-$modifier-all.jar" rsk.jar
27-
28-
FROM --platform=linux/amd64 eclipse-temurin:17-jre@sha256:38e0afc86a10bf4cadbf1586fb617b3a9a4d09c9a0be882e29ada4ed0895fc84
1+
FROM --platform=linux/amd64 ubuntu:noble@sha256:d22e4fb389065efa4a61bb36416768698ef6d955fe8a7e0cdb3cd6de80fa7eec
292

3+
ARG RSKJ_VERSION="8.1.0~noble"
304
ARG UID=1001
315
ARG HOME="/home/rsk"
32-
RUN useradd -m -u "$UID" --home="$HOME" rsk
336

34-
COPY --from=builder --chown=root:root --chmod=555 "/code/rskj/rskj-core/build/libs/rskj-core-*-all.jar" "$HOME/rskj-core.jar"
35-
COPY --chown=root:root --chmod=444 rsk.conf $HOME
7+
ENV DEBIAN_FRONTEND=noninteractive
368

37-
RUN mkdir -p "$HOME/.rsk"; chown "$UID" "$HOME/.rsk"
38-
RUN mkdir -p "$HOME/logs"; chown -R "$UID" "$HOME/logs"
9+
RUN useradd -m -u "$UID" --home="$HOME" rsk && \
10+
apt-get update && \
11+
apt-get install --no-install-recommends -y \
12+
dbus debconf-utils \
13+
init-system-helpers \
14+
software-properties-common \
15+
systemd systemd-sysv && \
16+
apt-add-repository -y ppa:rsksmart/rskj && \
17+
apt-get update && \
18+
echo 'rskj shared/accepted-rsk-license-v1-1 boolean true' | debconf-set-selections && \
19+
echo 'rskj shared/config select regtest' | debconf-set-selections && \
20+
apt-get install -y rskj=$RSKJ_VERSION && \
21+
rm -rf /var/lib/apt/lists/*
22+
23+
COPY rsk.conf /etc/rsk/node.conf
3924

4025
WORKDIR "$HOME"
4126

4227
USER rsk
4328

29+
ENTRYPOINT ["/usr/bin/java", "-Dlogback.configurationFile=/etc/rsk/logback.xml", "-cp", "/usr/share/rsk/rsk.jar", "co.rsk.Start"]
30+
4431
HEALTHCHECK --start-period=15s --retries=5 --interval=20s \
4532
CMD curl -s "http://127.0.0.1:4444" -X POST -H "Content-Type: application/json" \
4633
-d '{"jsonrpc":"2.0","method":"eth_chainId","params": [],"id":1}' || exit 1

‎docker-compose/rskj/rsk.conf‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
rpc {
2+
providers {
3+
web {
4+
http {
5+
enabled = true
6+
bind_address = "0.0.0.0"
7+
hosts = [
8+
"localhost",
9+
"rskj"
10+
]
11+
}
12+
}
13+
}
14+
modules {
15+
txpool { enabled: "false" },
16+
rpc { enabled: "false" },
17+
web3 { enabled: "true" },
18+
personal { enabled: "false" },
19+
rsk { enabled: "false" },
20+
evm { enabled: "false" }
21+
}
22+
}
23+
124
peer {
225
port = 50501
326
privateKey = "f6544f45612f67768bf8e735c977136853e40955d3c384f983ad30c426341873"
@@ -20,6 +43,7 @@ miner {
2043
}
2144

2245
blockchain.config {
46+
name = "regtest"
2347
consensusRules = {
2448
rskip97 = -1 # disable orchid difficulty drop
2549
rskipUMM = 1

0 commit comments

Comments
 (0)