Merge branch 'QA-Test' into stable-test-sync

rsksmart · Dec 11, 2024 · 5d526e5 · 5d526e5
2 parents 3a31d35 + 61d0ba4
commit 5d526e5
Show file tree

Hide file tree

Showing 140 changed files with 31,798 additions and 11,623 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -0,0 +1,32 @@
+name: LPS E2E test
+
+on:
+  push:
+    branches: [ QA-Test, Stable-Test, master ]
+  pull_request:
+    branches: [ QA-Test, Stable-Test, master ]
+
+jobs:
+  e2e-test:
+    name: Server initialization and health check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Set up Go
+        uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
+        with:
+          go-version-file: 'go.mod'
+
+      - name: Update env file
+        run: cd docker-compose/local/ && ./gh-action-env.sh ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Building LPS environment...
+        run: cd docker-compose/local/ && LPS_STAGE=regtest sh lps-env.sh up
+
+      - name: Checking LPS health...
+        run: curl -X GET http://localhost:8080/health
+
+      - name: Shutting LPS environment down...
+        run: cd docker-compose/local/ && LPS_STAGE=regtest sh lps-env.sh down
diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,7 @@ build/
 /utils/*
 /**/.env.regtest
 /**/gh_token.txt
+/**/local/cookie_jar.txt
 !sample-config.env
 /**/*.env
 /**/.env*
diff --git a/.mockery.yaml b/.mockery.yaml
@@ -46,4 +46,13 @@ packages:
       RootstockRpcServer:
   github.com/rsksmart/liquidity-provider-server/internal/adapters/dataproviders/utils:
     interfaces:
-      HttpClient:
+      HttpClient:
+  github.com/rsksmart/liquidity-provider-server/internal/adapters/entrypoints/watcher:
+    interfaces:
+      Ticker:
+  github.com/rsksmart/liquidity-provider-server/internal/adapters/entrypoints/rest/registry:
+    interfaces:
+      UseCaseRegistry:
+  github.com/gorilla/sessions:
+    interfaces:
+      Store:
diff --git a/OpenApi.yml b/OpenApi.yml
@@ -196,25 +196,25 @@ components:
       - status
       - providerType
       type: object
-    PeginConfiguration:
+    PeginConfigurationDTO:
       properties:
         callFee:
-          $ref: '#/components/schemas/Wei'
+          type: string
         callTime:
           type: integer
         maxValue:
-          $ref: '#/components/schemas/Wei'
+          type: string
         minValue:
-          $ref: '#/components/schemas/Wei'
+          type: string
         penaltyFee:
-          $ref: '#/components/schemas/Wei'
+          type: string
         timeForDeposit:
           type: integer
       type: object
     PeginConfigurationRequest:
       properties:
         configuration:
-          $ref: '#/components/schemas/PeginConfiguration'
+          $ref: '#/components/schemas/PeginConfigurationDTO'
           type: object
       type: object
     PeginQuoteDTO:
@@ -309,11 +309,6 @@ components:
       type: object
     PeginQuoteRequest:
       properties:
-        bitcoinRefundAddress:
-          description: 'User Bitcoin refund address. Note: Must be a legacy address,
-            segwit addresses are not accepted'
-          example: "0x0"
-          type: string
         callContractArguments:
           description: Contract data
           example: "0x0"
@@ -335,7 +330,6 @@ components:
       - callContractArguments
       - valueToTransfer
       - rskRefundAddress
-      - bitcoinRefundAddress
       type: object
     PeginQuoteStatusDTO:
       properties:
@@ -351,29 +345,29 @@ components:
       - detail
       - status
       type: object
-    PegoutConfiguration:
+    PegoutConfigurationDTO:
       properties:
         bridgeTransactionMin:
-          $ref: '#/components/schemas/Wei'
+          type: string
         callFee:
-          $ref: '#/components/schemas/Wei'
-        callTime:
-          type: integer
+          type: string
         expireBlocks:
           type: integer
+        expireTime:
+          type: integer
         maxValue:
-          $ref: '#/components/schemas/Wei'
+          type: string
         minValue:
-          $ref: '#/components/schemas/Wei'
+          type: string
         penaltyFee:
-          $ref: '#/components/schemas/Wei'
+          type: string
         timeForDeposit:
           type: integer
       type: object
     PegoutConfigurationRequest:
       properties:
         configuration:
-          $ref: '#/components/schemas/PegoutConfiguration'
+          $ref: '#/components/schemas/PegoutConfigurationDTO'
           type: object
       type: object
     PegoutQuoteDTO:
@@ -443,10 +437,6 @@ components:
       type: object
     PegoutQuoteRequest:
       properties:
-        bitcoinRefundAddress:
-          description: BitcoinRefundAddress
-          example: "0x0"
-          type: string
         rskRefundAddress:
           description: RskRefundAddress
           example: "0x0"
@@ -462,7 +452,6 @@ components:
       - to
       - valueToTransfer
       - rskRefundAddress
-      - bitcoinRefundAddress
       type: object
     PegoutQuoteStatusDTO:
       properties:
@@ -624,8 +613,6 @@ components:
         rsk:
           type: string
       type: object
-    Wei: {}
-    entities.Wei: {}
     pkg.AcceptQuoteRequest:
       properties:
         quoteHash:

diff --git a/ci/tasks/deploy-mainnet.yml b/ci/tasks/deploy-mainnet.yml
diff --git a/ci/tasks/deploy.yml b/ci/tasks/deploy.yml
diff --git a/cmd/application/lps/application.go b/cmd/application/lps/application.go
@@ -84,7 +84,7 @@ func NewApplication(initCtx context.Context, env environment.Environment) *Appli
 	mutexes := environment.NewApplicationMutexes()
 
 	useCaseRegistry := registry.NewUseCaseRegistry(env, rootstockRegistry, btcRegistry, dbRegistry, liquidityProvider, messagingRegistry, mutexes)
-	watcherRegistry := registry.NewWatcherRegistry(env, useCaseRegistry, rootstockRegistry, btcRegistry, liquidityProvider, messagingRegistry)
+	watcherRegistry := registry.NewWatcherRegistry(env, useCaseRegistry, rootstockRegistry, btcRegistry, liquidityProvider, messagingRegistry, watcher.NewApplicationTickers())
 
 	return &Application{
 		env:               env,