Bitmessage/PyBitmessage-2024-12-17
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

Domob1812 namecoin id2 #409

Merged
Atheros1 merged 19 commits from domob1812-namecoin-id2 into master 2013-08-15 01:19:20 +02:00
Conversation 0 Commits 19 Files Changed 9 +35 -29
3 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 810387df3e - Show all commits

2
src/bitmessageqt/__init__.py
View File

@ -2936,7 +2936,7 @@ class settingsDialog(QtGui.QDialog):
self.ui.labelNamecoinPassword.setEnabled(isNamecoind) self.ui.labelNamecoinPassword.setEnabled(isNamecoind)
if isNamecoind: if isNamecoind:
self.ui.lineEditNamecoinPort.setText("8336") self.ui.lineEditNamecoinPort.setText(shared.namecoinDefaultRpcPort)
else: else:
self.ui.lineEditNamecoinPort.setText("9000") self.ui.lineEditNamecoinPort.setText("9000")

3
src/namecoin.py
View File

@ -247,7 +247,6 @@ def ensureNamecoinOptions ():
hasPass = shared.config.has_option (configSection, "namecoinrpcpassword") hasPass = shared.config.has_option (configSection, "namecoinrpcpassword")
# Try to read user/password from .namecoin configuration file. # Try to read user/password from .namecoin configuration file.
if (not hasUser) or (not hasPass):
try: try:
nmcFolder = lookupNamecoinFolder () nmcFolder = lookupNamecoinFolder ()
nmcConfig = nmcFolder + "namecoin.conf" nmcConfig = nmcFolder + "namecoin.conf"
@ -268,6 +267,8 @@ def ensureNamecoinOptions ():
if key == "rpcpassword" and not hasPass: if key == "rpcpassword" and not hasPass:
shared.config.set (configSection, shared.config.set (configSection,
"namecoinrpcpassword", val) "namecoinrpcpassword", val)
if key == "rpcport":
shared.namecoinDefaultRpcPort = val
nmc.close () nmc.close ()

5
src/shared.py
View File

@ -68,6 +68,11 @@ ackdataForWhichImWatching = {}
networkDefaultProofOfWorkNonceTrialsPerByte = 320 #The amount of work that should be performed (and demanded) per byte of the payload. Double this number to double the work. networkDefaultProofOfWorkNonceTrialsPerByte = 320 #The amount of work that should be performed (and demanded) per byte of the payload. Double this number to double the work.
networkDefaultPayloadLengthExtraBytes = 14000 #To make sending short messages a little more difficult, this value is added to the payload length for use in calculating the proof of work target. networkDefaultPayloadLengthExtraBytes = 14000 #To make sending short messages a little more difficult, this value is added to the payload length for use in calculating the proof of work target.
# Remember here the RPC port read from namecoin.conf so we can restore to
# it as default whenever the user changes the "method" selection for
# namecoin integration to "namecoind".
namecoinDefaultRpcPort = "8336"
def isInSqlInventory(hash): def isInSqlInventory(hash):
t = (hash,) t = (hash,)
shared.sqlLock.acquire() shared.sqlLock.acquire()