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

Qa test -> Stable-Test #591

Merged
merged 69 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
b9e8d4d
ci: update e2e github action
Luisfc68 May 30, 2024
3df43c0
ci: update action execution condition
Luisfc68 May 31, 2024
d4fd2bc
Merge pull request #445 from rsksmart/feature/GBI-1861
Luisfc68 Jun 3, 2024
1922cfa
Merge branch 'QA-Test' into flyover-2.1
Luisfc68 Jun 7, 2024
ae79744
test: add rest common tests
Luisfc68 Jun 10, 2024
d23bfe7
test: add watchers tests
Luisfc68 Jun 14, 2024
3dc7baf
Merge pull request #457 from rsksmart/feature/GBI-1874
Luisfc68 Jun 18, 2024
fdf975c
test: routes and cookies packages
Luisfc68 Jun 24, 2024
65696ac
fix: sonar warnings
Luisfc68 Jun 24, 2024
cb90509
feat: update getProviders usage
Luisfc68 Jun 25, 2024
831e76a
Merge pull request #467 from rsksmart/feature/GBI-1921
Luisfc68 Jun 25, 2024
03f2de3
fix: sonar warning
Luisfc68 Jun 25, 2024
f628839
Merge pull request #468 from rsksmart/feature/GBI-1962
Luisfc68 Jun 26, 2024
73aaf1f
Merge branch 'QA-Test' into flyover-2.1
Luisfc68 Jul 10, 2024
6fb75dd
feat: add bech32 decoding and remove validations
Luisfc68 Jul 16, 2024
0bba31a
fix: local script configuration requests
Luisfc68 Jul 16, 2024
fb23001
fix: typo in assertion message
Luisfc68 Jul 16, 2024
c801541
feat: add coinbase tx registration
Luisfc68 Jul 20, 2024
72fb5bc
refactor: remove old btc wallet implementation
Luisfc68 Jul 20, 2024
2a78a17
Merge pull request #482 from rsksmart/feature/GBI-1904
Luisfc68 Jul 22, 2024
c184d90
Merge pull request #484 from rsksmart/feature/GBI-1906
Luisfc68 Jul 23, 2024
7b040f5
feat: merge branch 'QA-Test' into flyover-2.1
Luisfc68 Jul 23, 2024
0253c0c
feat: update merkle branch calculations
Luisfc68 Jul 24, 2024
ea98f80
feat: remove btcRefundAddress from pegin request
Luisfc68 Jul 24, 2024
5813db6
feat: remove btcRefundAddress from pegout request
Luisfc68 Jul 24, 2024
8b0e61b
chore: update OpenApi.yml
Luisfc68 Jul 24, 2024
fb7e86f
Merge pull request #497 from rsksmart/feature/GBI-1905
Luisfc68 Jul 29, 2024
62b2b7a
Merge pull request #498 from rsksmart/feature/GBI-1907
Luisfc68 Jul 29, 2024
1e6d729
Merge pull request #499 from rsksmart/feature/GBI-1908
Luisfc68 Jul 30, 2024
2a6ed39
fix: registration attempt after adding collateral
Luisfc68 Jul 30, 2024
b6294d6
Merge pull request #500 from rsksmart/bugfix/GBI-2031
Luisfc68 Aug 1, 2024
967d563
feat: merge branch 'QA-Test' into flyover-2.1
Luisfc68 Aug 1, 2024
262c43e
chore(deps): bump google.golang.org/protobuf from 1.30.0 to 1.33.0
dependabot[bot] Aug 8, 2024
011b308
chore(deps): bump golang.org/x/net from 0.10.0 to 0.23.0
dependabot[bot] Aug 8, 2024
8da71c5
fix: replace docker-compose by docker compose
Luisfc68 Aug 9, 2024
6acca96
Merge pull request #506 from rsksmart/flyover-2.1
Luisfc68 Aug 13, 2024
3d95382
Merge branch 'QA-Test' into dependabot/go_modules/golang.org/x/net-0.…
Luisfc68 Aug 13, 2024
0de7f29
Merge pull request #505 from rsksmart/dependabot/go_modules/golang.or…
Luisfc68 Aug 13, 2024
366dbe5
Merge pull request #503 from rsksmart/dependabot/go_modules/google.go…
Luisfc68 Aug 14, 2024
5bf6498
feat: upgrade geth version
Luisfc68 Aug 14, 2024
ca26a76
docs: update coverage metrics
Luisfc68 Aug 14, 2024
0c4894e
Merge pull request #507 from rsksmart/geth-update
Luisfc68 Aug 14, 2024
945cb21
Merge pull request #511 from rsksmart/Stable-Test
Luisfc68 Aug 15, 2024
5624dfa
Merge branch 'Stable-Test' into QA-Test-sync
Luisfc68 Sep 10, 2024
fba60a1
Merge pull request #526 from rsksmart/QA-Test-sync
Luisfc68 Sep 10, 2024
26e90bb
fix: existing integration tests
Luisfc68 Sep 11, 2024
59cda20
Erasing concourse leftovers
rafaiovlabs Sep 19, 2024
1f8bde6
feat: add lp swap local env scrips
Luisfc68 Sep 25, 2024
0fa6281
fix: placeholder values
Luisfc68 Sep 26, 2024
b5d128e
fix: change mongo password in local env
Luisfc68 Oct 4, 2024
830f9e1
fix: token parsing in local script
Luisfc68 Oct 7, 2024
87d3265
Merge pull request #532 from rsksmart/feature/GBI-2105
Luisfc68 Oct 7, 2024
b7bf393
Merge pull request #529 from rsksmart/devops/rm-concourse-leftovers
Luisfc68 Oct 7, 2024
3207684
fix: pegout btc watcher mutex lock order
Luisfc68 Oct 29, 2024
1225712
feat: apply 2.0.2 changes to 2.1.0
Luisfc68 Nov 11, 2024
2409fc4
test: fix mock
Luisfc68 Nov 11, 2024
196bc29
test: update watcher test assertions
Luisfc68 Nov 11, 2024
88e0470
Merge pull request #554 from rsksmart/bugfix/GBI-2174
Luisfc68 Nov 11, 2024
bac10cf
fix: assigment in watcher
Luisfc68 Nov 11, 2024
1fea156
fix: assignment in watcher
Luisfc68 Nov 12, 2024
9ab0860
feat: remove witness data from serialization
Luisfc68 Nov 12, 2024
0156414
Merge branch 'flyover-2.0.2' into 2.0.2-sync
Luisfc68 Nov 12, 2024
5dfc6ce
Merge branch '2.0.2-sync' into feature/GBI-2221
Luisfc68 Nov 12, 2024
ab3b646
Merge branch 'QA-Test' into 2.0.2-sync
Luisfc68 Nov 12, 2024
dc466af
Merge pull request #563 from rsksmart/2.0.2-sync
Luisfc68 Nov 13, 2024
6dc8180
Merge branch 'QA-Test' into feature/GBI-2221
Luisfc68 Nov 13, 2024
61d0ba4
Merge pull request #567 from rsksmart/feature/GBI-2221
Luisfc68 Nov 14, 2024
5d526e5
Merge branch 'QA-Test' into stable-test-sync
Luisfc68 Dec 11, 2024
e99920c
Merge pull request #590 from rsksmart/stable-test-sync
Luisfc68 Dec 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ build/
/utils/*
/**/.env.regtest
/**/gh_token.txt
/**/local/cookie_jar.txt
!sample-config.env
/**/*.env
/**/.env*
11 changes: 10 additions & 1 deletion .mockery.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
43 changes: 15 additions & 28 deletions OpenApi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand All @@ -335,7 +330,6 @@ components:
- callContractArguments
- valueToTransfer
- rskRefundAddress
- bitcoinRefundAddress
type: object
PeginQuoteStatusDTO:
properties:
Expand All @@ -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:
Expand Down Expand Up @@ -443,10 +437,6 @@ components:
type: object
PegoutQuoteRequest:
properties:
bitcoinRefundAddress:
description: BitcoinRefundAddress
example: "0x0"
type: string
rskRefundAddress:
description: RskRefundAddress
example: "0x0"
Expand All @@ -462,7 +452,6 @@ components:
- to
- valueToTransfer
- rskRefundAddress
- bitcoinRefundAddress
type: object
PegoutQuoteStatusDTO:
properties:
Expand Down Expand Up @@ -624,8 +613,6 @@ components:
rsk:
type: string
type: object
Wei: {}
entities.Wei: {}
pkg.AcceptQuoteRequest:
properties:
quoteHash:
Expand Down
46 changes: 0 additions & 46 deletions ci/tasks/deploy-mainnet.yml

This file was deleted.

46 changes: 0 additions & 46 deletions ci/tasks/deploy.yml

This file was deleted.

2 changes: 1 addition & 1 deletion cmd/application/lps/application.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading
Loading