LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Projects Releases 4 Packages Wiki Activity

Separated pay, claim, and change wallet addresses #44

Merged
bones7242 merged 3 commits from separate-wallets into master 2017-06-29 21:38:37 +02:00
Conversation 0 Commits 3 Files changed 10 +20 -8
6 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 94fd907513 - Show all commits

4
config/custom-environment-variables.json
View file

@ -1,6 +1,8 @@
{ {
"WalletConfig": { "WalletConfig": {
"LbryAddress": "LBRY_WALLET_ADDRESS" "LbryPayAddress": "LBRY_PAY_ADDRESS",
"LbryClaimAddress": "LBRY_CLAIM_ADDRESS",
"LbryChangeAddress": "LBRY_CHANGE_ADDRESS"
}, },
"Database": { "Database": {
"MySqlConnectionUri": "MYSQL_CONNECTION_STRING" "MySqlConnectionUri": "MYSQL_CONNECTION_STRING"

4
config/default.json
View file

@ -1,6 +1,8 @@
{ {
"WalletConfig": { "WalletConfig": {
"LbryAddress": "none" "LbryPayAddress": "none",
"LbryClaimAddress": "none",
"LbryChangeAddress": "none"
}, },
"AnalyticsConfig":{ "AnalyticsConfig":{
"GoogleId": "none" "GoogleId": "none"

4
config/development.json
View file

@ -1,6 +1,8 @@
{ {
"WalletConfig": { "WalletConfig": {
"LbryAddress": "none" "LbryPayAddress": "none",
"LbryClaimAddress": "none",
"LbryChangeAddress": "none"
}, },
"AnalyticsConfig":{ "AnalyticsConfig":{
"GoogleId": "UA-100747990-1" "GoogleId": "UA-100747990-1"

4
config/production.json
View file

@ -1,6 +1,8 @@
{ {
"WalletConfig": { "WalletConfig": {
"LbryAddress": "none" "LbryPayAddress": "none",
"LbryClaimAddress": "none",
"LbryChangeAddress": "none"
}, },
"AnalyticsConfig":{ "AnalyticsConfig":{
"GoogleId": "UA-60403362-2" "GoogleId": "UA-60403362-2"

4
config/test.json
View file

@ -1,6 +1,8 @@
{ {
"WalletConfig": { "WalletConfig": {
"LbryAddress": "none" "LbryPayAddress": "none",
"LbryClaimAddress": "none",
"LbryChangeAddress": "none"
}, },
"AnalyticsConfig":{ "AnalyticsConfig":{
"GoogleId": "UA-100747990-1" "GoogleId": "UA-100747990-1"

8
helpers/libraries/publishHelpers.js
View file

@ -1,11 +1,13 @@
const logger = require('winston'); const logger = require('winston');
const config = require('config'); const config = require('config');
const walletAddress = config.get('WalletConfig.LbryAddress');
const fs = require('fs'); const fs = require('fs');
module.exports = { module.exports = {
createPublishParams: (name, filePath, license, nsfw) => { createPublishParams: (name, filePath, license, nsfw) => {
logger.debug(`Creating Publish Parameters for "${name}"`); logger.debug(`Creating Publish Parameters for "${name}"`);
// const payAddress = config.get('WalletConfig.LbryPayAddress');
const claimAddress = config.get('WalletConfig.LbryClaimAddress');
const changeAddress = config.get('WalletConfig.LbryChangeAddress');
// ensure nsfw is a boolean // ensure nsfw is a boolean
if (nsfw === false) { if (nsfw === false) {
nsfw = false; nsfw = false;
@ -32,8 +34,8 @@ module.exports = {
license, license,
nsfw, nsfw,
}, },
claim_address : walletAddress, claim_address : claimAddress,
change_address: walletAddress, change_address: changeAddress,
}; };
logger.debug('publishParams:', publishParams); logger.debug('publishParams:', publishParams);
return publishParams; return publishParams;