Merge branch 'master' into knorrium/backend_unit_tests
This commit is contained in:
Felipe Knorr Kuhn
GitHub
commit
15fcbf18bf
8588
frontend/package-lock.json
generated
8588
frontend/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -63,18 +63,18 @@
|
||||
"cypress:run:ci:staging": "node update-config.js TESTNET_ENABLED=true SIGNET_ENABLED=true LIQUID_ENABLED=true BISQ_ENABLED=true ITEMS_PER_PAGE=25 && npm run generate-config && start-server-and-test serve:local-staging 4200 cypress:run:record"
|
||||
},
|
||||
"dependencies": {
|
||||
"@angular-devkit/build-angular": "~13.3.7",
|
||||
"@angular/animations": "~13.3.10",
|
||||
"@angular/cli": "~13.3.7",
|
||||
"@angular/common": "~13.3.10",
|
||||
"@angular/compiler": "~13.3.10",
|
||||
"@angular/core": "~13.3.10",
|
||||
"@angular/forms": "~13.3.10",
|
||||
"@angular/localize": "~13.3.10",
|
||||
"@angular/platform-browser": "~13.3.10",
|
||||
"@angular/platform-browser-dynamic": "~13.3.10",
|
||||
"@angular/platform-server": "~13.3.10",
|
||||
"@angular/router": "~13.3.10",
|
||||
"@angular-devkit/build-angular": "~14.0.5",
|
||||
"@angular/animations": "~14.0.5",
|
||||
"@angular/cli": "~14.0.5",
|
||||
"@angular/common": "~14.0.5",
|
||||
"@angular/compiler": "~14.0.5",
|
||||
"@angular/core": "~14.0.5",
|
||||
"@angular/forms": "~14.0.5",
|
||||
"@angular/localize": "~14.0.5",
|
||||
"@angular/platform-browser": "~14.0.5",
|
||||
"@angular/platform-browser-dynamic": "~14.0.5",
|
||||
"@angular/platform-server": "~14.0.5",
|
||||
"@angular/router": "~14.0.5",
|
||||
"@fortawesome/angular-fontawesome": "~0.10.2",
|
||||
"@fortawesome/fontawesome-common-types": "~6.1.1",
|
||||
"@fortawesome/fontawesome-svg-core": "~6.1.1",
|
||||
@ -87,22 +87,22 @@
|
||||
"browserify": "^17.0.0",
|
||||
"clipboard": "^2.0.10",
|
||||
"domino": "^2.1.6",
|
||||
"echarts": "~5.3.2",
|
||||
"echarts": "~5.3.3",
|
||||
"express": "^4.17.1",
|
||||
"lightweight-charts": "~3.8.0",
|
||||
"ngx-echarts": "8.0.1",
|
||||
"ngx-echarts": "~14.0.0",
|
||||
"ngx-infinite-scroll": "^10.0.1",
|
||||
"qrcode": "1.5.0",
|
||||
"rxjs": "~7.5.5",
|
||||
"tinyify": "^3.0.0",
|
||||
"tlite": "^0.1.9",
|
||||
"tslib": "~2.4.0",
|
||||
"zone.js": "~0.11.5"
|
||||
"zone.js": "~0.11.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular/compiler-cli": "~13.3.10",
|
||||
"@angular/language-service": "~13.3.10",
|
||||
"@nguniversal/builders": "~13.1.1",
|
||||
"@angular/compiler-cli": "~14.0.5",
|
||||
"@angular/language-service": "~14.0.5",
|
||||
"@nguniversal/builders": "~14.0.3",
|
||||
"@types/express": "^4.17.0",
|
||||
"@types/node": "^12.11.1",
|
||||
"@typescript-eslint/eslint-plugin": "^5.30.5",
|
||||
|
||||
@ -529,7 +529,7 @@ if (browserWindowEnv && browserWindowEnv.BASE_MODULE === 'liquid') {
|
||||
|
||||
@NgModule({
|
||||
imports: [RouterModule.forRoot(routes, {
|
||||
initialNavigation: 'enabled',
|
||||
initialNavigation: 'enabledNonBlocking',
|
||||
scrollPositionRestoration: 'enabled',
|
||||
anchorScrolling: 'enabled',
|
||||
preloadingStrategy: PreloadAllModules
|
||||
|
||||
@ -12,6 +12,7 @@ if (browserWindowEnv.BASE_MODULE && (browserWindowEnv.BASE_MODULE === 'bisq' ||
|
||||
routes = [
|
||||
{
|
||||
path: '',
|
||||
pathMatch: 'full',
|
||||
redirectTo: 'api/rest'
|
||||
},
|
||||
{
|
||||
@ -31,6 +32,7 @@ if (browserWindowEnv.BASE_MODULE && (browserWindowEnv.BASE_MODULE === 'bisq' ||
|
||||
routes = [
|
||||
{
|
||||
path: '',
|
||||
pathMatch: 'full',
|
||||
redirectTo: 'faq'
|
||||
},
|
||||
{
|
||||
|
||||
@ -91,6 +91,7 @@ const routes: Routes = [
|
||||
},
|
||||
{
|
||||
path: '',
|
||||
pathMatch: 'full',
|
||||
redirectTo: 'mempool',
|
||||
},
|
||||
{
|
||||
|
||||
@ -1285,7 +1285,25 @@ if [ "${ELEMENTS_LIQUID_ENABLE}" = ON ];then
|
||||
;;
|
||||
|
||||
Debian)
|
||||
osSudo "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/linux/liquid.service" "${DEBIAN_SERVICE_HOME}"
|
||||
osSudo "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/linux/elements-liquid.service" "${DEBIAN_SERVICE_HOME}"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
#######################################
|
||||
# Bitcoin instance for Liquid Testnet #
|
||||
#######################################
|
||||
|
||||
if [ "${ELEMENTS_LIQUID_ENABLE}" = ON ];then
|
||||
echo "[*] Installing Bitcoin Liquid service"
|
||||
case $OS in
|
||||
|
||||
FreeBSD)
|
||||
echo "[*] FIXME: Bitcoin Liquid service must be installed manually on FreeBSD"
|
||||
;;
|
||||
|
||||
Debian)
|
||||
osSudo "${ROOT_USER}" install -c -o "${ROOT_USER}" -g "${ROOT_GROUP}" -m 644 "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/linux/elements-liquidtestnet.service" "${DEBIAN_SERVICE_HOME}"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -1343,7 +1361,7 @@ if [ "${ELEMENTS_LIQUID_ENABLE}" = ON ];then
|
||||
echo "[*] Installing Elements crontab"
|
||||
case $OS in
|
||||
FreeBSD)
|
||||
echo [*] FIXME: must only crontab enabled daemons
|
||||
echo "[*] FIXME: must only crontab enabled daemons"
|
||||
osSudo "${ROOT_USER}" crontab -u "${ELEMENTS_USER}" "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/elements.crontab"
|
||||
;;
|
||||
esac
|
||||
@ -1380,33 +1398,33 @@ fi
|
||||
echo "[*] Installing crontabs"
|
||||
case $OS in
|
||||
FreeBSD)
|
||||
echo [*] FIXME: must only crontab enabled daemons
|
||||
echo "[*] FIXME: must only crontab enabled daemons"
|
||||
osSudo "${ROOT_USER}" crontab -u "${BITCOIN_USER}" "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/bitcoin.crontab"
|
||||
osSudo "${ROOT_USER}" crontab -u "${MINFEE_USER}" "${MEMPOOL_HOME}/${MEMPOOL_REPO_NAME}/production/minfee.crontab"
|
||||
;;
|
||||
Debian)
|
||||
crontab_bitcoin=()
|
||||
if [ "${BITCOIN_MAINNET_ENABLE}" = ON ];then
|
||||
echo [*] Installing Electrs Mainnet Cronjob
|
||||
echo "[*] Installing Electrs Mainnet Cronjob"
|
||||
crontab_bitcoin+="@reboot sleep 30 ; screen -dmS mainnet /bitcoin/electrs/electrs-start-mainnet\n"
|
||||
fi
|
||||
if [ "${BITCOIN_TESTNET_ENABLE}" = ON ];then
|
||||
echo [*] Installing Electrs Testnet Cronjob
|
||||
echo "[*] Installing Electrs Testnet Cronjob"
|
||||
crontab_bitcoin+="@reboot sleep 70 ; screen -dmS testnet /bitcoin/electrs/electrs-start-testnet\n"
|
||||
fi
|
||||
if [ "${BITCOIN_SIGNET_ENABLE}" = ON ];then
|
||||
echo [*] Installing Electrs Signet Cronjob
|
||||
echo "[*] Installing Electrs Signet Cronjob"
|
||||
crontab_bitcoin+="@reboot sleep 90 ; screen -dmS signet /bitcoin/electrs/electrs-start-signet\n"
|
||||
fi
|
||||
echo "${crontab_bitcoin}" | crontab -u "${BITCOIN_USER}" -
|
||||
|
||||
crontab_elements=()
|
||||
if [ "${ELEMENTS_LIQUID_ENABLE}" = ON ];then
|
||||
echo [*] Installing Liquid Asset Mainnet Cronjob
|
||||
echo "[*] Installing Liquid Asset Mainnet Cronjob"
|
||||
crontab_elements+="6 * * * * cd $HOME/asset_registry_db && git pull origin master >/dev/null 2>&1\n"
|
||||
fi
|
||||
if [ "${ELEMENTS_LIQUIDTESTNET_ENABLE}" = ON ];then
|
||||
echo [*] Installing Liquid Asset Testnet Cronjob
|
||||
echo "[*] Installing Liquid Asset Testnet Cronjob"
|
||||
crontab_elements+="6 * * * * cd $HOME/asset_registry_testnet_db && git pull origin master >/dev/null 2>&1\n"
|
||||
fi
|
||||
echo "${crontab_elements}" | crontab -u "${ELEMENTS_USER}" -
|
||||
@ -1568,7 +1586,10 @@ case $OS in
|
||||
osSudo "${ROOT_USER}" systemctl enable bisq.service
|
||||
fi
|
||||
if [ "${ELEMENTS_LIQUID_ENABLE}" = ON ];then
|
||||
osSudo "${ROOT_USER}" systemctl enable liquid.service
|
||||
osSudo "${ROOT_USER}" systemctl enable elements-liquid.service
|
||||
fi
|
||||
if [ "${ELEMENTS_LIQUIDTESTNET_ENABLE}" = ON ];then
|
||||
osSudo "${ROOT_USER}" systemctl enable elements-liquidtestnet.service
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
[Unit]
|
||||
Description=Elementsd
|
||||
Description=Elementsd-liquid
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/local/bin/elementsd -daemon -printtoconsole -chain=liquidtestnet -pid=/elements/elements-testnet.pid
|
||||
ExecStart=/usr/local/bin/elementsd -daemon -printtoconsole -chain=liquidv1 -pid=/elements/elements-liquid.pid
|
||||
ExecStop=/usr/local/bin/elements-cli stop
|
||||
|
||||
Type=forking
|
||||
PIDFile=/elements/elements-testnet.pid
|
||||
PIDFile=/elements/elements-liquid.pid
|
||||
Restart=on-failure
|
||||
|
||||
User=elements
|
||||
@ -1,13 +1,13 @@
|
||||
[Unit]
|
||||
Description=Elementsd
|
||||
Description=Elementsd-liquidtestnet
|
||||
After=network.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/local/bin/elementsd -daemon -printtoconsole -chain=liquidv1 -pid=/elements/elements.pid
|
||||
ExecStart=/usr/local/bin/elementsd -daemon -printtoconsole -chain=liquidtestnet -pid=/elements/elements-liquidtestnet.pid
|
||||
ExecStop=/usr/local/bin/elements-cli stop
|
||||
|
||||
Type=forking
|
||||
PIDFile=/elements/elements.pid
|
||||
PIDFile=/elements/elements-liquidtestnet.pid
|
||||
Restart=on-failure
|
||||
|
||||
User=elements
|
||||
Loading…
x
Reference in New Issue
Block a user