GlcoinCore/squeaknode
1
0
Fork 0
mirror of https://github.com/yzernik/squeaknode.git synced 2026-08-13 12:33:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move tor configs to separate section (#1629)

Browse source 
* Move tor configs to separate section

* Update readme with new tor config section
This commit is contained in:
Jonathan Zernik 2021-10-17 23:11:22 -07:00 • committed by GitHub
parent d1477b0b99
commit c53fe89096
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -20,8 +20,6 @@ Node for [Squeak protocol](https://github.com/yzernik/squeak/blob/master/docs/PR
```
[node]
network=mainnet
tor_proxy_ip=localhost
tor_proxy_port=9150
[lnd]
host=localhost
@ -35,6 +33,10 @@ Node for [Squeak protocol](https://github.com/yzernik/squeak/blob/master/docs/PR
rpc_pass=devpass
zeromq_hashblock_port=28334
[tor]
proxy_ip=localhost
proxy_port=9150
[webadmin]
enabled=true
username=devuser

4
config.ini
View file

@ -13,6 +13,10 @@ rpc_user=devuser
rpc_pass=devpass
zeromq_hashblock_port=28334
[tor]
proxy_ip=localhost
proxy_port=9150
[webadmin]
enabled=true
username=devuser

6
docker/config.ini
View file

@ -1,7 +1,5 @@
[node]
network=testnet
tor_proxy_ip=tor-socks-proxy
tor_proxy_port=9150
[lnd]
host=lnd
@ -15,6 +13,10 @@ rpc_user=devuser
rpc_pass=devpass
zeromq_hashblock_port=28334
[tor]
proxy_ip=tor-socks-proxy
proxy_port=9150
[webadmin]
enabled=true
username=devuser

11
squeaknode/config/config.py
View file

@ -88,6 +88,12 @@ class LndConfig(Config):
macaroon_path = key(cast=str, required=False, default="")
@section('tor')
class TorConfig(Config):
proxy_ip = key(cast=str, required=False, default="")
proxy_port = key(cast=int, required=False, default=0)
@section('server')
class ServerConfig(Config):
rpc_enabled = key(cast=bool, required=False, default=True)
@ -140,10 +146,6 @@ class NodeConfig(Config):
cast=int, required=False, default=DEFAULT_OFFER_DELETION_INTERVAL_S)
interest_block_interval = key(
cast=int, required=False, default=DEFAULT_INTEREST_BLOCK_INTERVAL)
tor_proxy_ip = key(
cast=str, required=False, default="")
tor_proxy_port = key(
cast=int, required=False, default=0)
external_address = key(
cast=str, required=False, default="")
@ -156,6 +158,7 @@ class DbConfig(Config):
class SqueaknodeConfig(Config):
bitcoin = group_key(BitcoinConfig)
lnd = group_key(LndConfig)
tor = group_key(TorConfig)
server = group_key(ServerConfig)
admin = group_key(AdminConfig)
webadmin = group_key(WebadminConfig)

4
squeaknode/network/network_manager.py
View file

@ -57,8 +57,8 @@ class NetworkManager(object):
self.local_port = self.config.server.rpc_port or squeak.params.params.DEFAULT_PORT
self.peer_server = None
self.peer_client = None
self.tor_proxy_ip = self.config.node.tor_proxy_ip
self.tor_proxy_port = self.config.node.tor_proxy_port
self.tor_proxy_ip = self.config.tor.proxy_ip
self.tor_proxy_port = self.config.tor.proxy_port
self.connection_manager = ConnectionManager(self.local_address)
def start(self, squeak_controller):