machankura/mempool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into mononaut/gbt-thread-optimization

Browse Source
This commit is contained in:
wiz 2022-12-22 09:20:15 +09:00 committed by GitHub
commit 5e633344c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/dependabot.yml vendored
View File

@ -6,23 +6,27 @@ updates:
interval: daily interval: daily
open-pull-requests-limit: 10 open-pull-requests-limit: 10
ignore: ignore:
- update-types: ["version-update:semver-major"] - dependency-name: "*"
update-types: ["version-update:semver-major"]
- package-ecosystem: npm - package-ecosystem: npm
directory: "/frontend" directory: "/frontend"
schedule: schedule:
interval: daily interval: daily
open-pull-requests-limit: 10 open-pull-requests-limit: 10
ignore: ignore:
- update-types: ["version-update:semver-major"] - dependency-name: "*"
update-types: ["version-update:semver-major"]
- package-ecosystem: docker - package-ecosystem: docker
directory: "/docker/backend" directory: "/docker/backend"
schedule: schedule:
interval: daily interval: daily
ignore: ignore:
- update-types: ["version-update:semver-major"] - dependency-name: "*"
update-types: ["version-update:semver-major"]
- package-ecosystem: "github-actions" - package-ecosystem: "github-actions"
directory: "/" directory: "/"
schedule: schedule:
interval: daily interval: daily
ignore: ignore:
- update-types: ["version-update:semver-major"] - dependency-name: "*"
update-types: ["version-update:semver-major"]

14
.github/workflows/cypress.yml vendored
View File

@ -2,7 +2,7 @@ name: Cypress Tests
on: on:
pull_request: pull_request:
types: [ opened, review_requested, synchronize ] types: [opened, review_requested, synchronize]
jobs: jobs:
cypress: cypress:
if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')" if: "!contains(github.event.pull_request.labels.*.name, 'ops') && !contains(github.head_ref, 'ops/')"
@ -28,32 +28,32 @@ jobs:
name: E2E tests for ${{ matrix.module }} name: E2E tests for ${{ matrix.module }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
path: ${{ matrix.module }} path: ${{ matrix.module }}
- name: Setup node - name: Setup node
uses: actions/setup-node@v2 uses: actions/setup-node@v3
with: with:
node-version: 16.15.0 node-version: 16.15.0
cache: 'npm' cache: "npm"
cache-dependency-path: ${{ matrix.module }}/frontend/package-lock.json cache-dependency-path: ${{ matrix.module }}/frontend/package-lock.json
- name: Chrome browser tests (${{ matrix.module }}) - name: Chrome browser tests (${{ matrix.module }})
uses: cypress-io/github-action@v4 uses: cypress-io/github-action@v5
with: with:
tag: ${{ github.event_name }} tag: ${{ github.event_name }}
working-directory: ${{ matrix.module }}/frontend working-directory: ${{ matrix.module }}/frontend
build: npm run config:defaults:${{ matrix.module }} build: npm run config:defaults:${{ matrix.module }}
start: npm run start:local-staging start: npm run start:local-staging
wait-on: 'http://localhost:4200' wait-on: "http://localhost:4200"
wait-on-timeout: 120 wait-on-timeout: 120
record: true record: true
parallel: true parallel: true
spec: ${{ matrix.spec }} spec: ${{ matrix.spec }}
group: Tests on Chrome (${{ matrix.module }}) group: Tests on Chrome (${{ matrix.module }})
browser: "chrome" browser: "chrome"
ci-build-id: '${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}' ci-build-id: "${{ github.sha }}-${{ github.workflow }}-${{ github.event_name }}"
env: env:
COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }} COMMIT_INFO_MESSAGE: ${{ github.event.pull_request.title }}
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}

31
frontend/package-lock.json generated
View File

@ -31,6 +31,7 @@
"bootstrap": "~4.6.1", "bootstrap": "~4.6.1",
"browserify": "^17.0.0", "browserify": "^17.0.0",
"clipboard": "^2.0.11", "clipboard": "^2.0.11",
"cypress": "^12.1.0",
"domino": "^2.1.6", "domino": "^2.1.6",
"echarts": "~5.4.0", "echarts": "~5.4.0",
"echarts-gl": "^2.0.9", "echarts-gl": "^2.0.9",
@ -57,8 +58,8 @@
"typescript": "~4.6.4" "typescript": "~4.6.4"
}, },
"optionalDependencies": { "optionalDependencies": {
"@cypress/schematic": "~2.3.0", "@cypress/schematic": "^2.4.0",
"cypress": "^11.2.0", "cypress": "^12.1.0",
"cypress-fail-on-console-error": "~4.0.2", "cypress-fail-on-console-error": "~4.0.2",
"cypress-wait-until": "^1.7.2", "cypress-wait-until": "^1.7.2",
"mock-socket": "~9.1.5", "mock-socket": "~9.1.5",
@ -3225,9 +3226,9 @@
} }
}, },
"node_modules/@cypress/schematic": { "node_modules/@cypress/schematic": {
"version": "2.3.0", "version": "2.4.0",
"resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-2.3.0.tgz", "resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-2.4.0.tgz",
"integrity": "sha512-LBKX20MUUYF2Xu+1+KpVbLCoMvt2Osa80yQfonduVsLJ/p8JxtLHqufuf/ryJp9Gm9R5sDfk/YhHL+rB7a+gsg==", "integrity": "sha512-aor8hQ+gMXqx/ASdo7CUGo/sMEWwwfSRsLr99rM2GjvW+pZnCKKTnRG4UPf8Ro9SevLJj7KRZAZWxa5MAkJzZA==",
"optional": true, "optional": true,
"dependencies": { "dependencies": {
"@angular-devkit/architect": "^0.1402.1", "@angular-devkit/architect": "^0.1402.1",
@ -7019,9 +7020,9 @@
"peer": true "peer": true
}, },
"node_modules/cypress": { "node_modules/cypress": {
"version": "11.2.0", "version": "12.1.0",
"resolved": "https://registry.npmjs.org/cypress/-/cypress-11.2.0.tgz", "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.1.0.tgz",
"integrity": "sha512-u61UGwtu7lpsNWLUma/FKNOsrjcI6wleNmda/TyKHe0dOBcVjbCPlp1N6uwFZ0doXev7f/91YDpU9bqDCFeBLA==", "integrity": "sha512-7fz8N84uhN1+ePNDsfQvoWEl4P3/VGKKmAg+bJQFY4onhA37Ys+6oBkGbNdwGeC7n2QqibNVPhk8x3YuQLwzfw==",
"hasInstallScript": true, "hasInstallScript": true,
"optional": true, "optional": true,
"dependencies": { "dependencies": {
@ -7072,7 +7073,7 @@
"cypress": "bin/cypress" "cypress": "bin/cypress"
}, },
"engines": { "engines": {
"node": ">=12.0.0" "node": "^14.0.0 || ^16.0.0 || >=18.0.0"
} }
}, },
"node_modules/cypress-fail-on-console-error": { "node_modules/cypress-fail-on-console-error": {
@ -19345,9 +19346,9 @@
} }
}, },
"@cypress/schematic": { "@cypress/schematic": {
"version": "2.3.0", "version": "2.4.0",
"resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-2.3.0.tgz", "resolved": "https://registry.npmjs.org/@cypress/schematic/-/schematic-2.4.0.tgz",
"integrity": "sha512-LBKX20MUUYF2Xu+1+KpVbLCoMvt2Osa80yQfonduVsLJ/p8JxtLHqufuf/ryJp9Gm9R5sDfk/YhHL+rB7a+gsg==", "integrity": "sha512-aor8hQ+gMXqx/ASdo7CUGo/sMEWwwfSRsLr99rM2GjvW+pZnCKKTnRG4UPf8Ro9SevLJj7KRZAZWxa5MAkJzZA==",
"optional": true, "optional": true,
"requires": { "requires": {
"@angular-devkit/architect": "^0.1402.1", "@angular-devkit/architect": "^0.1402.1",
@ -22282,9 +22283,9 @@
"peer": true "peer": true
}, },
"cypress": { "cypress": {
"version": "11.2.0", "version": "12.1.0",
"resolved": "https://registry.npmjs.org/cypress/-/cypress-11.2.0.tgz", "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.1.0.tgz",
"integrity": "sha512-u61UGwtu7lpsNWLUma/FKNOsrjcI6wleNmda/TyKHe0dOBcVjbCPlp1N6uwFZ0doXev7f/91YDpU9bqDCFeBLA==", "integrity": "sha512-7fz8N84uhN1+ePNDsfQvoWEl4P3/VGKKmAg+bJQFY4onhA37Ys+6oBkGbNdwGeC7n2QqibNVPhk8x3YuQLwzfw==",
"optional": true, "optional": true,
"requires": { "requires": {
"@cypress/request": "^2.88.10", "@cypress/request": "^2.88.10",

4
frontend/package.json
View File

@ -109,8 +109,8 @@
"typescript": "~4.6.4" "typescript": "~4.6.4"
}, },
"optionalDependencies": { "optionalDependencies": {
"@cypress/schematic": "~2.3.0", "@cypress/schematic": "^2.4.0",
"cypress": "^11.2.0", "cypress": "^12.1.0",
"cypress-fail-on-console-error": "~4.0.2", "cypress-fail-on-console-error": "~4.0.2",
"cypress-wait-until": "^1.7.2", "cypress-wait-until": "^1.7.2",
"mock-socket": "~9.1.5", "mock-socket": "~9.1.5",

2
frontend/proxy.conf.staging.js
View File

@ -5,7 +5,7 @@ let PROXY_CONFIG = require('./proxy.conf');
PROXY_CONFIG.forEach(entry => { PROXY_CONFIG.forEach(entry => {
entry.target = entry.target.replace("mempool.space", "mempool-staging.tk7.mempool.space"); entry.target = entry.target.replace("mempool.space", "mempool-staging.tk7.mempool.space");
entry.target = entry.target.replace("liquid.network", "liquid-staging.tk7.mempool.space"); entry.target = entry.target.replace("liquid.network", "liquid-staging.tk7.mempool.space");
entry.target = entry.target.replace("bisq.markets", "bisq-staging.tk7.mempool.space"); entry.target = entry.target.replace("bisq.markets", "bisq-staging.fra.mempool.space");
}); });
module.exports = PROXY_CONFIG; module.exports = PROXY_CONFIG;