Change config to use single entry for validation.

This commit is contained in:
Arthur Britto
2012-06-13 15:48:14 -07:00
parent fff4e87090
commit c26d60579a
3 changed files with 11 additions and 18 deletions

View File

@@ -49,18 +49,12 @@
# 0 or 1. 0 only allows RPC connections from 127.0.0.1. [default 0]
#
# [validation_seed]:
# This is the seed used to generate the validation public/private key pair.
# This representation has a checksum and is the recommended form for transmission.
#
# [validation_password]:
# This is the password used to generate the validation public/private key pair.
# This representation is the form for providing a pass phrase.
#
# [validation_key]:
# To perform validation, either this section or the [validation_password] section must be provided.
# This representation is the form for human memorization (RFC 1751).
#
# Example: RASH BUSH MILK LOOK BAD BRIM AVID GAFF BAIT ROT POD LOVE
# To perform validation, this section should contain either a validation seed or key.
# The validation seed is used to generate the validation public/private key pair.
# To obtain a validation seed, use the validation_create command.
# Examples: RASH BUSH MILK LOOK BAD BRIM AVID GAFF BAIT ROT POD LOVE
# shfArahZT9Q9ckTf3s1psJ7C7qzVN
#
[peer_ip]
0.0.0.0

View File

@@ -18,8 +18,7 @@
#define SECTION_RPC_IP "rpc_ip"
#define SECTION_RPC_PORT "rpc_port"
#define SECTION_RPC_ALLOW_REMOTE "rpc_allow_remote"
#define SECTION_VALIDATION_PASSWORD "validation_password"
#define SECTION_VALIDATION_KEY "validation_key"
#define SECTION_VALIDATION_SEED "validation_seed"
#define SECTION_PEER_SSL_CIPHER_LIST "peer_ssl_cipher_list"
#define SECTION_PEER_SCAN_INTERVAL_MIN "peer_scan_interval_min"
#define SECTION_PEER_START_MAX "peer_start_max"
@@ -180,8 +179,8 @@ void Config::load()
if (sectionSingleB(secConfig, SECTION_RPC_ALLOW_REMOTE, strTemp))
RPC_ALLOW_REMOTE = boost::lexical_cast<bool>(strTemp);
(void) sectionSingleB(secConfig, SECTION_VALIDATION_PASSWORD, VALIDATION_PASSWORD);
(void) sectionSingleB(secConfig, SECTION_VALIDATION_KEY, VALIDATION_KEY);
if (sectionSingleB(secConfig, SECTION_VALIDATION_SEED, strTemp))
VALIDATION_SEED.setFamilySeedGeneric(strTemp);
(void) sectionSingleB(secConfig, SECTION_PEER_SSL_CIPHER_LIST, PEER_SSL_CIPHER_LIST);
if (sectionSingleB(secConfig, SECTION_PEER_SCAN_INTERVAL_MIN, strTemp))

View File

@@ -3,6 +3,7 @@
#include "types.h"
#include "SerializedTypes.h"
#include "NewcoinAddress.h"
#include <string>
#include <boost/filesystem.hpp>
@@ -78,8 +79,7 @@ public:
bool RPC_ALLOW_REMOTE;
// Validation
std::string VALIDATION_PASSWORD;
std::string VALIDATION_KEY;
NewcoinAddress VALIDATION_SEED;
// Fees
uint64 FEE_DEFAULT; // Default fee.