fixed broken waitforshare
parent
0b34951423
commit
c8a50c5956
|
@ -123,7 +123,7 @@ Note: probably not tax deductible
|
|||
|
||||
Email: beardog [ at ] mailbox.org
|
||||
|
||||
Onionr Mail: TRH763JURNY47QPBTTQ4LLPYCYQK6Q5YA33R6GANKZK5C5DKCIGQ====
|
||||
Onionr Mail: TRH763JURNY47QPBTTQ4LLPYCYQK6Q5YA33R6GANKZK5C5DKCIGQ
|
||||
|
||||
## Disclaimers and legal
|
||||
|
||||
|
|
|
@ -17,12 +17,12 @@
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
'''
|
||||
import os, sys, time, json, uuid
|
||||
import os, sys, json
|
||||
import logger, netcontroller, config
|
||||
from onionrblockapi import Block
|
||||
import coredb
|
||||
import deadsimplekv as simplekv
|
||||
import onionrutils, onionrcrypto, onionrproofs, onionrevents as events, onionrexceptions
|
||||
import onionrcrypto, onionrproofs, onionrevents as events, onionrexceptions
|
||||
import onionrblacklist
|
||||
from onionrusers import onionrusers
|
||||
from onionrstorage import removeblock, setdata
|
||||
|
@ -436,7 +436,7 @@ class Core:
|
|||
else:
|
||||
# Tell the api server through localCommand to wait for the daemon to upload this block to make statistical analysis more difficult
|
||||
if localcommand.local_command(self, '/ping', maxWait=10) == 'pong!':
|
||||
if self.config.get('general.security_level', 1) > 0:
|
||||
if self.config.get('general.security_level', 1) == 0:
|
||||
localcommand.local_command(self, '/waitforshare/' + retData, post=True, maxWait=5)
|
||||
self.daemonQueueAdd('uploadBlock', retData)
|
||||
else:
|
||||
|
|
|
@ -43,7 +43,7 @@ def process_block_metadata(core_inst, blockHash):
|
|||
myBlock.decrypt()
|
||||
if (myBlock.isEncrypted and myBlock.decrypted) or (not myBlock.isEncrypted):
|
||||
blockType = myBlock.getMetadata('type') # we would use myBlock.getType() here, but it is bugged with encrypted blocks
|
||||
print('blockType', blockType)
|
||||
|
||||
signer = bytesconverter.bytes_to_str(myBlock.signer)
|
||||
valid = myBlock.verifySig()
|
||||
if myBlock.getMetadata('newFSKey') is not None:
|
||||
|
|
Loading…
Reference in New Issue