dxs/onionr
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge import

Browse source
This commit is contained in:
Kevin Froman 2018-06-04 15:24:02 -05:00
commit a25eca2818
No known key found for this signature in database
GPG key ID: 0D414D0FE405B63B
15 changed files with 1228 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

10
onionr/core.py
View file

@ -109,7 +109,7 @@ class Core:
'''
Add an address to the address database (only tor currently)
'''
if address == config.get('i2p')['ownAddr']:
if (not (config.is_set('i2p') and 'ownAddr' in config.get('i2p'))) or address == config.get('i2p')['ownAddr']:
return False
if self._utils.validateID(address):
conn = sqlite3.connect(self.addressDB)
@ -654,7 +654,7 @@ class Core:
conn.close()
return True
def insertBlock(self, data, header='txt', sign=False):
def insertBlock(self, data, header='txt', sign=False, metadata = {}):
'''
Inserts a block into the network
'''
@ -687,7 +687,11 @@ class Core:
data = data.encode()
retData = ''
metadata = {'type': header, 'powHash': powHash, 'powToken': powToken}
metadata['type'] = header
metadata['powHash'] = powHash
metadata['powToken'] = powToken
sig = {}
metadata = json.dumps(metadata)