ARCHIVE/sashimono
1
0
Fork 0
mirror of https://github.com/EvernodeXRPL/sashimono.git synced 2026-04-29 15:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into release

Browse Source
This commit is contained in:
chalith
2024-08-06 17:52:59 +05:30
parent 226f54655d 18aa50fd94
commit 7a6db2f851
9 changed files with 825 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
installer/jshelper/package-lock.json generated
View File

@@ -6,7 +6,7 @@
"": {
"name": "evernode-setup-helper",
"dependencies": {
"evernode-js-client": "0.6.56",
"evernode-js-client": "0.6.57",
"ip6addr": "0.2.5",
"ripple-keypairs": "1.3.1"
}
@@ -405,9 +405,9 @@
}
},
"node_modules/evernode-js-client": {
"version": "0.6.56",
"resolved": "https://registry.npmjs.org/evernode-js-client/-/evernode-js-client-0.6.56.tgz",
"integrity": "sha512-ur3Vc0QVj6uJ9sZPca/wVA4DPfBqbIcDFPTew12vLVKu7IYCVRwsVI2yrh24XlzfP702LNek41PjKfZE+vKIHw==",
"version": "0.6.57",
"resolved": "https://registry.npmjs.org/evernode-js-client/-/evernode-js-client-0.6.57.tgz",
"integrity": "sha512-kV57OqyyZ8hml722NVdtmvC0FV3Jhr94c9oXFfU9G3Z72byr2KgcoLgLigCwmzG0BIFXNE8vjtPD0MZYxWKuBw==",
"dependencies": {
"elliptic": "6.5.4",
"libsodium-wrappers": "0.7.10",

2
installer/jshelper/package.json
View File

@@ -4,7 +4,7 @@
"build": "ncc build index.js --minify -o dist"
},
"dependencies": {
"evernode-js-client": "0.6.56",
"evernode-js-client": "0.6.57",
"ip6addr": "0.2.5",
"ripple-keypairs": "1.3.1"
}

7
installer/sashimono-install.sh
View File

@@ -256,15 +256,14 @@ function setup_tls_certs() {
-out $SASHIMONO_DATA/contract_template/cfg/tlscert.pem -subj "/C=$country_code/CN=$inetaddr" &&
echo "Error when generating self-signed certificate." && abort
elif [ -f "$tls_key_file" ] && [ -f "$tls_cert_file" ]; then
elif [ -f "$tls_key_file" ] && [ -f "$tls_cert_file" ] && [ -f "$tls_cabundle_file" ]; then
stage "Transferring certificate files"
cp $tls_key_file $SASHIMONO_DATA/contract_template/cfg/tlskey.pem
cp $tls_cert_file $SASHIMONO_DATA/contract_template/cfg/tlscert.pem
# ca bundle is optional.
[ "$tls_cabundle_file" != "-" ] && [ -f "$tls_cabundle_file" ] &&
cat $tls_cabundle_file >>$SASHIMONO_DATA/contract_template/cfg/tlscert.pem
# ca bundle is also required.
cat $tls_cabundle_file >>$SASHIMONO_DATA/contract_template/cfg/tlscert.pem
else
echo "Error when setting up SSL certificate." && abort

11
installer/setup.sh
View File

@@ -465,7 +465,7 @@
resolve_filepath tls_key_file r "Please specify location of the private key (usually ends with .key):"
resolve_filepath tls_cert_file r "Please specify location of the certificate (usually ends with .crt):"
resolve_filepath tls_cabundle_file o "Please specify location of ca bundle (usually ends with .ca-bundle [Optional]):"
resolve_filepath tls_cabundle_file r "Please specify location of ca bundle (usually ends with .ca-bundle):"
fi
return 0
}
@@ -1746,15 +1746,14 @@ WantedBy=timers.target" >/etc/systemd/system/$EVERNODE_AUTO_UPDATE_SERVICE.timer
local tls_cert_file=$2
local tls_cabundle_file=$3
([ ! -f "$tls_key_file" ] || [ ! -f "$tls_cert_file" ] ||
([ "$tls_cabundle_file" != "" ] && [ ! -f "$tls_cabundle_file" ])) &&
echo -e "One or more invalid files provided.\nusage: applyssl <private key file> <cert file> <ca bundle file (optional)>" && exit 1
([ ! -f "$tls_key_file" ] || [ ! -f "$tls_cert_file" ] || [ ! -f "$tls_cabundle_file" ]) &&
echo -e "One or more invalid files provided.\nusage: applyssl <private key file> <cert file> <ca bundle file>" && exit 1
echo "Applying new SSL certificates for $evernode"
echo "Key: $tls_key_file" && cp $tls_key_file $SASHIMONO_DATA/contract_template/cfg/tlskey.pem || exit 1
echo "Cert: $tls_cert_file" && cp $tls_cert_file $SASHIMONO_DATA/contract_template/cfg/tlscert.pem || exit 1
# ca bundle is optional.
[ "$tls_cabundle_file" != "" ] && echo "CA bundle: $tls_cabundle_file" && (cat $tls_cabundle_file >>$SASHIMONO_DATA/contract_template/cfg/tlscert.pem || exit 1)
# ca bundle is also required.
echo "CA bundle: $tls_cabundle_file" && (cat $tls_cabundle_file >>$SASHIMONO_DATA/contract_template/cfg/tlscert.pem || exit 1)
sashi list | jq -rc '.[]' | while read -r inst; do
local instuser=$(echo $inst | jq -r '.user')

2
mb-xrpl/lib/appenv.js
View File

@@ -45,7 +45,7 @@ appenv = {
ORPHAN_PRUNE_SCHEDULER_INTERVAL_HOURS: 2,
SASHIMONO_SCHEDULER_INTERVAL_SECONDS: 2,
SASHI_CLI_PATH: appenv.IS_DEV_MODE ? "../build/sashi" : "/usr/bin/sashi",
MB_VERSION: '0.10.1',
MB_VERSION: '0.11.0',
TOS_HASH: '0801677EBCB2F76EF97D531549D8B27DB2C7A4A8EE7F60032AE40184247F0810', // This is the sha256 hash of EVERNODE-HOSTING-PRINCIPLES.pdf.
NETWORK: 'mainnet',
REPUTATIOND_CONFIG_PATH: path.join(appenv.DATA_DIR, '../') + "reputationd/reputationd.cfg",

1569
mb-xrpl/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

6
mb-xrpl/package.json
View File

@@ -5,9 +5,9 @@
"build": "npm run lint && ncc build app.js --minify -o dist"
},
"dependencies": {
"evernode-js-client": "0.6.56",
"sqlite3": "5.0.2",
"ip6addr": "0.2.5"
"evernode-js-client": "0.6.57",
"ip6addr": "0.2.5",
"sqlite3": "5.1.7"
},
"devDependencies": {
"eslint": "8.3.0"

2
reputationd

Submodule reputationd updated: f266f46ed6...4ad7044df6

2
src/version.hpp
View File

@@ -6,7 +6,7 @@
namespace version
{
// Sashimono agent version. Written to new configs.
constexpr const char *AGENT_VERSION = "0.10.1";
constexpr const char *AGENT_VERSION = "0.11.0";
// Minimum compatible config version (this will be used to validate configs).
constexpr const char *MIN_CONFIG_VERSION = "0.5.0";