diff options
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | sampleconfig/index.js | 24 | ||||
| -rw-r--r-- | sampleconfig/liquid/elements.conf | 4 | ||||
| -rw-r--r-- | yarn.lock | 16 |
4 files changed, 26 insertions, 20 deletions
diff --git a/package.json b/package.json index c5bef35e..d1d126bd 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ }, "dependencies": { "@asoltys/bitcoin-core": "^3.0.7", - "@asoltys/liquidjs-lib": "^5.1.37", + "@asoltys/liquidjs-lib": "^5.1.38", "@grpc/proto-loader": "^0.5.3", "async-mutex": "^0.2.4", "axios": "^0.21.1", diff --git a/sampleconfig/index.js b/sampleconfig/index.js index 6c4aba57..adc11d24 100644 --- a/sampleconfig/index.js +++ b/sampleconfig/index.js @@ -1,6 +1,13 @@ const debug = require("debug")("test"); -const db = require('./knexfile.js')[process.env.NODE_ENV || 'development'] +const db = { + user: "root", + password: "password", + database: "coinos", + host: "mariadb", + dialect: "mariadb", + dialectOptions: { multipleStatements: true, timezone: "Etc/GMT+7" }, +}; const btcasset = "5ac9f65c0efcc4775e0baec4ec03abdde22473cd3cf33c0419ca290e0751b225"; @@ -8,13 +15,17 @@ const btcasset = module.exports = { db, clientVersion: "3b96359d6a6ce68fe4a32f495fc9a6f78af0aa63", + knex: { + client: "mysql2", + connection: db, + }, jwt: "secret", port: 3119, bitcoin: { masterkey: "tprv8ZgxMBicQKsPdTUoagV41nang9pQUA2DKoVWLmTrWmb2PfsC8pDTHveCMyzUyMguKJCjd5uyHcqg27r7gDzz4TY3MgucpLsSXwCbjn2C3Q1", host: "bitcoin", - wallet: "coinosdev", + wallet: "test", username: "admin1", password: "123", network: "regtest", @@ -31,17 +42,14 @@ module.exports = { username: "admin1", password: "123", network: "regtest", + wallet: "a", port: 7040, - zmqrawblock: "tcp://liquid:18606", - zmqrawtx: "tcp://liquid:18607", + zmqrawblock: "tcp://liquid:18602", + zmqrawtx: "tcp://liquid:18603", btcasset, }, lna: { clightning: true, dir: "/app/config/lightning/regtest", }, - mailgun: { - apiKey: "key-59cd7ea2286ae3553d6b50cf7ddf924e", - domain: "coinos.io" - } }; diff --git a/sampleconfig/liquid/elements.conf b/sampleconfig/liquid/elements.conf index 30909090..bfd01638 100644 --- a/sampleconfig/liquid/elements.conf +++ b/sampleconfig/liquid/elements.conf @@ -7,9 +7,13 @@ rpcuser=admin1 rpcpassword=123 rpcbind=0.0.0.0 rpcallowip=0.0.0.0/0 +rcpwallet=a validatepegin=0 initialfreecoins=2100000000000000 +wallet= +wallet=a +wallet=b zmqpubrawblock=tcp://0.0.0.0:18602 zmqpubrawtx=tcp://0.0.0.0:18603 @@ -13,17 +13,11 @@ semver "^5.1.0" standard-error "^1.1.0" -"@asoltys/blech32@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@asoltys/blech32/-/blech32-1.0.4.tgz#10066fb173b9b426a465504d7418e3d7295d2d58" - integrity sha512-yiiQNRSCqUMCDcFbPvG2QIyBNJsTbZvthq7inIF9RKVd6ei8yuMUXPdO85cwyANLeVvtdFEBpsKBzCETahSk0A== - -"@asoltys/liquidjs-lib@^5.1.37": - version "5.1.37" - resolved "https://registry.yarnpkg.com/@asoltys/liquidjs-lib/-/liquidjs-lib-5.1.37.tgz#8428b57a2e205236d56b5972dd69716e9e1ccd8b" - integrity sha512-F3Lz6A9K5ZXv5RgLynpQaf6rcKKYhaeXYocfVByJZI6O5sqaJXOGV7/OPtNRR8YLkWOreYfoWX0NiFoHauhvHg== +"@asoltys/liquidjs-lib@^5.1.38": + version "5.1.38" + resolved "https://registry.yarnpkg.com/@asoltys/liquidjs-lib/-/liquidjs-lib-5.1.38.tgz#397e91a4ada53e5973b50727e13f529adacf42f4" + integrity sha512-hEP5GdUy5V0NYz7wnc+GLDGNQcpIx/KIfFFK96FiScG990UdRUvgJx/33o+MEmUyyh5zzcr2V7CWNtF8moSxnw== dependencies: - "@asoltys/blech32" "^1.0.4" "@asoltys/secp256k1-zkp" "^2.0.4" axios "^0.21.1" bech32 "^1.1.2" @@ -650,7 +644,7 @@ bip174@^2.0.1: resolved "https://registry.yarnpkg.com/bip174/-/bip174-2.0.1.tgz#39cf8ca99e50ce538fb762589832f4481d07c254" integrity sha512-i3X26uKJOkDTAalYAp0Er+qGMDhrbbh2o93/xiPyAN2s25KrClSpe3VXo/7mNJoqA5qfko8rLS2l3RWZgYmjKQ== -bip174@vulpemventures/bip174.git: +"bip174@github:vulpemventures/bip174": version "1.0.3" resolved "https://codeload.github.com/vulpemventures/bip174/tar.gz/b6d0ffe54e0dfa72e971b68372f89b25f7602502" |