Merge branch 'QA-Test' into flyover-2.3.0

Luisfc68 · Luisfc68 · commit 2bc16f9676ef · 2025-08-21T15:08:54.000-03:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-*       @Luisfc68 @MaximStanciu8 @gsoares85 @Dominikkq @AndresQuijano
+*       @rsksmart/xbridges
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,7 +9,14 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+    target-branch: QA-Test
+    groups:
+      dependencies:
+        dependency-type: production
+      dev-dependencies:
+        dependency-type: development
   - package-ecosystem: docker
     directory: "/"
     schedule:
       interval: "daily"
+    target-branch: QA-Test
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -22,9 +22,7 @@ jobs:
           go-version-file: 'go.mod'
 
       - name: Update env file
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: cd docker-compose/local/ && ./gh-action-env.sh $GITHUB_TOKEN
+        run: cd docker-compose/local/ && ./gh-action-env.sh
 
       - name: Building LPS environment...
         run: cd docker-compose/local/ && LPS_STAGE=regtest ./lps-env.sh up
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,6 @@ pwd.txt
 test/integration/integration-test.config.json
 integration/geth_keystore
 
-/docker-compose/lbc-deployer/liquidity-bridge-contract/
 keystore/
 build/
 /utils/*
diff --git a/docker-compose/lbc-deployer/Dockerfile b/docker-compose/lbc-deployer/Dockerfile
diff --git a/docker-compose/lbc-deployer/deploy-lbc.sh b/docker-compose/lbc-deployer/deploy-lbc.sh
diff --git a/docker-compose/lbc-deployer/truffle-config.patch b/docker-compose/lbc-deployer/truffle-config.patch
diff --git a/docker-compose/local/docker-compose.lbc-deployer.yml b/docker-compose/local/docker-compose.lbc-deployer.yml
@@ -1,17 +1,10 @@
 services:
   lbc-deployer:
-    build:
-      context: ../lbc-deployer
-      secrets:
-        - gh_token
-      args:
-        LBC_GIT_BRANCH: "${LBC_GIT_BRANCH:-master}"
-    image: lbc-deployer:latest
+    image: ghcr.io/rsksmart/liquidity-bridge-contract:${LBC_VERSION}
     container_name: lbc-deployer01
     environment:
+      - NETWORK_NAME=rskRegtest
+      - REGTEST_RPC_URL=${RSK_ENDPOINT}
       - LPS_STAGE
     networks:
       - net_lps
-secrets:
-  gh_token:
-    file: ./gh_token.txt
diff --git a/docker-compose/local/docker-compose.yml b/docker-compose/local/docker-compose.yml
@@ -31,11 +31,6 @@ services:
       - ${POWPEG_PEGIN_HOME:-./volumes/powpeg/pegin}/logs:/home/powpeg/logs
     networks:
       - net_lps
-    depends_on:
-      rskj:
-        condition: service_healthy
-      bitcoind:
-        condition: service_healthy
     command:
       [
         "java",
diff --git a/docker-compose/local/gh-action-env.sh b/docker-compose/local/gh-action-env.sh
@@ -1,5 +1,3 @@
 #!/bin/bash
 
-TOKEN=$1
-sed -i "s/GITHUB_TOKEN=/GITHUB_TOKEN=$TOKEN/g" ../../sample-config.env
-sed -i 's/ENABLE_MANAGEMENT_API=false/ENABLE_MANAGEMENT_API=true/g' ../../sample-config.env
+sed -i 's/ENABLE_MANAGEMENT_API=false/ENABLE_MANAGEMENT_API=true/g' ../../sample-config.env
diff --git a/docker-compose/local/lps-env.sh b/docker-compose/local/lps-env.sh
@@ -170,10 +170,10 @@ if [ "$LPS_STAGE" = "regtest" ]; then
   if [ -z "${LBC_ADDR}" ]; then
     echo "LBC_ADDR is not set. Deploying LBC contract..."
 
-    (grep GITHUB_TOKEN | head -n 1 | tr -d '\r' | awk '{gsub("GITHUB_TOKEN=",""); print}' > gh_token.txt) < $ENV_FILE
     # deploy LBC contracts to RSKJ
-    LBC_ADDR_LINE=$(docker compose --env-file "$ENV_FILE" -f docker-compose.yml -f docker-compose.lbc-deployer.yml run --rm lbc-deployer bash deploy-lbc.sh | grep LBC_ADDR | head -n 1 | tr -d '\r')
-    export LBC_ADDR="${LBC_ADDR_LINE#"LBC_ADDR="}"
+    LBC_ADDR_LINE=$(docker compose --env-file "$ENV_FILE" -f docker-compose.yml -f docker-compose.lbc-deployer.yml up lbc-deployer | grep LBC_ADDR | head -n 1 | tr -d '\r')
+    LBC_ADDR=$(echo "${LBC_ADDR_LINE#"LBC_ADDR="}" | awk -F= '{print tolower($2)}')
+    export LBC_ADDR
   fi
 fi
 
@@ -186,7 +186,6 @@ echo "LBC deployed at $LBC_ADDR"
 
 docker compose --env-file "$ENV_FILE" up -d powpeg-pegin powpeg-pegout
 # start LPS
-
 docker compose --env-file "$ENV_FILE" -f docker-compose.yml -f docker-compose.lps.yml build lps
 docker compose --env-file "$ENV_FILE" -f docker-compose.yml -f docker-compose.lps.yml up -d lps
 
@@ -196,7 +195,8 @@ do
   sleep 5
   curl -s "http://localhost:8080/health" \
     && echo "LPS is up and running" \
-    && FAIL=false
+    && FAIL=false \
+    || echo "LPS is not up yet"
   if [ "$FAIL" = false ]; then
     break
   fi
diff --git a/go.mod b/go.mod
@@ -23,8 +23,8 @@ require (
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.10.0
 	go.mongodb.org/mongo-driver v1.17.4
-	golang.org/x/crypto v0.37.0
-	golang.org/x/term v0.31.0
+	golang.org/x/crypto v0.40.0
+	golang.org/x/term v0.33.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
@@ -81,10 +81,10 @@ require (
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
-	golang.org/x/net v0.39.0 // indirect
-	golang.org/x/sync v0.13.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
-	golang.org/x/text v0.24.0 // indirect
+	golang.org/x/net v0.41.0 // indirect
+	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/sys v0.34.0 // indirect
+	golang.org/x/text v0.27.0 // indirect
 	google.golang.org/protobuf v1.35.1 // indirect
 	rsc.io/tmplfunc v0.0.3 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -305,8 +305,8 @@ golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
-golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
+golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
+golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -318,13 +318,13 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
-golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
-golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -345,19 +345,19 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
-golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
+golang.org/x/term v0.33.0 h1:NuFncQrRcaRvVmgRkvM3j/F00gWIAlcmlB8ACEKmGIg=
+golang.org/x/term v0.33.0/go.mod h1:s18+ql9tYWp1IfpV9DmCtQDDSRBUjKaw9M1eAv5UeF0=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
-golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
diff --git a/sample-config.env b/sample-config.env
@@ -95,6 +95,7 @@ AWS_SECRET_ACCESS_KEY=test
 AWS_REGION=us-east-1
 
 # Used by local scripts
+LBC_VERSION=pr-353
 LIQUIDITY_PROVIDER_RSK_ADDR=0x9D93929A9099be4355fC2389FbF253982F9dF47c
 GITHUB_TOKEN=
 TRUSTED_ACCOUNT_ADDRESS=0x1538283abbD198DcD966f43230363A68108c6373
diff --git a/test/lp-swap/docker-compose.yml b/test/lp-swap/docker-compose.yml
@@ -80,16 +80,12 @@ services:
         "--regtest",
       ]
   lbc-deployer:
-    build:
-      context: ../../docker-compose/lbc-deployer
-      secrets:
-        - gh_token
-      args:
-        LBC_GIT_BRANCH: "${LBC_GIT_BRANCH:-master}"
-    image: lbc-deployer:latest
+    image: ghcr.io/rsksmart/liquidity-bridge-contract:${LBC_VERSION}
     container_name: lbc-deployer01
     environment:
-      - LPS_STAGE=regtest
+      - NETWORK_NAME=rskRegtest
+      - REGTEST_RPC_URL=${RSK_ENDPOINT}
+      - LPS_STAGE
     networks:
       - lp-swap-network
   ui:
diff --git a/test/lp-swap/setup.sh b/test/lp-swap/setup.sh
@@ -36,7 +36,7 @@ echo "Transferring 10 RBTC to $LP2..."
 TX_HASH=$(curl -s -X POST "http://127.0.0.1:4444" -H "Content-Type: application/json" -d "{\"jsonrpc\":\"2.0\",\"method\":\"eth_sendTransaction\",\"params\": [{\"from\": \"0xcd2a3d9f938e13cd947ec05abc7fe734df8dd826\", \"to\": \"$LP2\", \"value\": \"0x8AC7230489E80000\"}],\"id\":1}" | jq -r ".result")
 echo "Result: $TX_HASH"
 
-LBC_ADDR_LINE=$(docker compose run --rm lbc-deployer bash deploy-lbc.sh)
+LBC_ADDR_LINE=$(docker compose run --rm lbc-deployer)
 echo "LBC_ADDR_LINE: $LBC_ADDR_LINE"
 docker exec btc01 bitcoin-cli -rpcuser=test -rpcpassword=test -rpcport=5555 -rpcconnect=127.0.0.1 addnode btc02:18444 add
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @Luisfc68 @MaximStanciu8 @gsoares85 @Dominikkq @AndresQuijano`
	`1`	`+* @rsksmart/xbridges`