diff --git a/Makefile.am b/Makefile.am index 68af0a8..9e67d97 100755 --- a/Makefile.am +++ b/Makefile.am @@ -92,7 +92,7 @@ $(OSX_APP)/Contents/Resources/ion.icns: $(OSX_INSTALLER_ICONS) $(MKDIR_P) $(@D) $(INSTALL_DATA) $< $@ -$(OSX_APP)/Contents/MacOS/Ion-Qt: $(ION_QT_BIN) +$(OSX_APP)/Contents/MacOS/ion-Qt: $(ION_QT_BIN) $(MKDIR_P) $(@D) STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@ @@ -102,7 +102,7 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings: OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \ $(OSX_APP)/Contents/Resources/ion.icns $(OSX_APP)/Contents/Info.plist \ - $(OSX_APP)/Contents/MacOS/Ion-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings + $(OSX_APP)/Contents/MacOS/ion-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings osx_volname: echo $(OSX_VOLNAME) >$@ @@ -127,7 +127,7 @@ $(APP_DIST_DIR)/Applications: @rm -f $@ @cd $(@D); $(LN_S) /Applications $(@F) -$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Ion-Qt +$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/ion-Qt $(OSX_DMG): $(APP_DIST_EXTRAS) $(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist @@ -142,7 +142,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF $(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN) $(PYTHON) $< "$@" "$(OSX_VOLNAME)" -$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Ion-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) +$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/ion-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING) INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2 deploydir: $(APP_DIST_EXTRAS) diff --git a/contrib/debian/control b/contrib/debian/control index 0925447..c991911 100755 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -53,7 +53,7 @@ Description: peer-to-peer network based digital currency - Qt GUI transact directly with each other, with the help of a P2P network to check for double-spending. . - This package provides Ion-Qt, a GUI for Ion based on Qt. + This package provides ion-Qt, a GUI for Ion based on Qt. Package: ion-tx Architecture: any diff --git a/contrib/debian/examples/ioncoin.conf b/contrib/debian/examples/ioncoin.conf index 33728d5..33f3a21 100755 --- a/contrib/debian/examples/ioncoin.conf +++ b/contrib/debian/examples/ioncoin.conf @@ -1,7 +1,7 @@ ## ## ioncoin.conf configuration file. Lines beginning with # are comments. ## - + # Network-related settings: # Run on the test network instead of the real ion network. @@ -60,7 +60,7 @@ # JSON-RPC options (for controlling a running Ion/iond process) # -# server=1 tells Ion-Qt and iond to accept JSON-RPC commands +# server=1 tells ion-Qt and iond to accept JSON-RPC commands #server=0 # Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. @@ -93,7 +93,7 @@ # rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99 # How many seconds ion will wait for a complete RPC HTTP request. -# after the HTTP connection is established. +# after the HTTP connection is established. #rpcclienttimeout=30 # By default, only RPC connections from localhost are allowed. @@ -103,8 +103,8 @@ # NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED, # because the rpcpassword is transmitted over the network unencrypted. -# server=1 tells Ion-Qt to accept JSON-RPC commands. -# it is also read by iond to determine if RPC should be enabled +# server=1 tells ion-Qt to accept JSON-RPC commands. +# it is also read by iond to determine if RPC should be enabled #rpcallowip=10.1.1.34/255.255.255.0 #rpcallowip=1.2.3.4/24 #rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96 @@ -131,11 +131,11 @@ # be validated sooner. #paytxfee=0.00 -# Enable pruning to reduce storage requirements by deleting old blocks. +# Enable pruning to reduce storage requirements by deleting old blocks. # This mode is incompatible with -txindex and -rescan. # 0 = default (no pruning). # 1 = allows manual pruning via RPC. -# >=550 = target to stay under in MiB. +# >=550 = target to stay under in MiB. #prune=550 # User interface options diff --git a/contrib/macdeploy/README.md b/contrib/macdeploy/README.md index 1db154e..e100554 100755 --- a/contrib/macdeploy/README.md +++ b/contrib/macdeploy/README.md @@ -1,7 +1,7 @@ ### MacDeploy ### For Snow Leopard (which uses [Python 2.6](http://www.python.org/download/releases/2.6/)), you will need the param_parser package: - + sudo easy_install argparse This script should not be run manually, instead, after building as usual: @@ -11,5 +11,4 @@ This script should not be run manually, instead, after building as usual: During the process, the disk image window will pop up briefly where the fancy settings are applied. This is normal, please do not interfere. -When finished, it will produce `Ion-Core.dmg`. - +When finished, it will produce `ion-Core.dmg`. diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py index 5359270..e4d4910 100755 --- a/contrib/macdeploy/custom_dsstore.py +++ b/contrib/macdeploy/custom_dsstore.py @@ -54,7 +54,7 @@ ds['.']['vSrn'] = ('long', 1) ds['Applications']['Iloc'] = (370, 156) -ds['Ion-Qt.app']['Iloc'] = (128, 156) +ds['ion-Qt.app']['Iloc'] = (128, 156) ds.flush() ds.close() diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 1ae7367..0b53734 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -41,13 +41,13 @@ class FrameworkInfo(object): self.sourceContentsDirectory = "" self.destinationResourcesDirectory = "" self.destinationVersionContentsDirectory = "" - + def __eq__(self, other): if self.__class__ == other.__class__: return self.__dict__ == other.__dict__ else: return False - + def __str__(self): return """ Framework name: %s Framework directory: %s @@ -71,51 +71,51 @@ class FrameworkInfo(object): self.deployedInstallName, self.sourceFilePath, self.destinationDirectory) - + def isDylib(self): return self.frameworkName.endswith(".dylib") - + def isQtFramework(self): if self.isDylib(): return self.frameworkName.startswith("libQt") else: return self.frameworkName.startswith("Qt") - + reOLine = re.compile(r'^(.+) \(compatibility version [0-9.]+, current version [0-9.]+\)$') bundleFrameworkDirectory = "Contents/Frameworks" bundleBinaryDirectory = "Contents/MacOS" - + @classmethod def fromOtoolLibraryLine(cls, line): # Note: line must be trimmed if line == "": return None - + # Don't deploy system libraries (exception for libQtuitools and libQtlucene). if line.startswith("/System/Library/") or line.startswith("@executable_path") or (line.startswith("/usr/lib/") and "libQt" not in line): return None - + m = cls.reOLine.match(line) if m is None: raise RuntimeError("otool line could not be parsed: " + line) - + path = m.group(1) - + info = cls() info.sourceFilePath = path info.installName = path - + if path.endswith(".dylib"): dirname, filename = os.path.split(path) info.frameworkName = filename info.frameworkDirectory = dirname info.frameworkPath = path - + info.binaryDirectory = dirname info.binaryName = filename info.binaryPath = path info.version = "-" - + info.installName = path info.deployedInstallName = "@executable_path/../Frameworks/" + info.binaryName info.sourceFilePath = path @@ -130,32 +130,32 @@ class FrameworkInfo(object): i += 1 if i == len(parts): raise RuntimeError("Could not find .framework or .dylib in otool line: " + line) - + info.frameworkName = parts[i] info.frameworkDirectory = "/".join(parts[:i]) info.frameworkPath = os.path.join(info.frameworkDirectory, info.frameworkName) - + info.binaryName = parts[i+3] info.binaryDirectory = "/".join(parts[i+1:i+3]) info.binaryPath = os.path.join(info.binaryDirectory, info.binaryName) info.version = parts[i+2] - + info.deployedInstallName = "@executable_path/../Frameworks/" + os.path.join(info.frameworkName, info.binaryPath) info.destinationDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, info.binaryDirectory) - + info.sourceResourcesDirectory = os.path.join(info.frameworkPath, "Resources") info.sourceContentsDirectory = os.path.join(info.frameworkPath, "Contents") info.sourceVersionContentsDirectory = os.path.join(info.frameworkPath, "Versions", info.version, "Contents") info.destinationResourcesDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, "Resources") info.destinationContentsDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, "Contents") info.destinationVersionContentsDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, "Versions", info.version, "Contents") - + return info class ApplicationBundleInfo(object): def __init__(self, path): self.path = path - appName = "Ion-Qt" + appName = "ion-Qt" self.binaryPath = os.path.join(path, "Contents", "MacOS", appName) if not os.path.exists(self.binaryPath): raise RuntimeError("Could not find bundle binary for " + path) @@ -167,7 +167,7 @@ class DeploymentInfo(object): self.qtPath = None self.pluginPath = None self.deployedFrameworks = [] - + def detectQtPath(self, frameworkDirectory): parentDir = os.path.dirname(frameworkDirectory) if os.path.exists(os.path.join(parentDir, "translations")): @@ -186,7 +186,7 @@ class DeploymentInfo(object): pluginPath = os.path.join(self.qtPath, "plugins") if os.path.exists(pluginPath): self.pluginPath = pluginPath - + def usesFramework(self, name): nameDot = "%s." % name libNameDot = "lib%s." % name @@ -215,7 +215,7 @@ def getFrameworks(binaryPath, verbose): otoolLines.pop(0) # First line is the inspected binary if ".framework" in binaryPath or binaryPath.endswith(".dylib"): otoolLines.pop(0) # Frameworks and dylibs list themselves as a dependency. - + libraries = [] for line in otoolLines: line = line.replace("@loader_path", os.path.dirname(binaryPath)) @@ -225,7 +225,7 @@ def getFrameworks(binaryPath, verbose): print("Found framework:") print(info) libraries.append(info) - + return libraries def runInstallNameTool(action, *args): @@ -262,16 +262,16 @@ def copyFramework(framework, path, verbose): fromPath = framework.sourceFilePath toDir = os.path.join(path, framework.destinationDirectory) toPath = os.path.join(toDir, framework.binaryName) - + if not os.path.exists(fromPath): raise RuntimeError("No file at " + fromPath) - + if os.path.exists(toPath): return None # Already there - + if not os.path.exists(toDir): os.makedirs(toDir) - + shutil.copy2(fromPath, toPath) if verbose >= 3: print("Copied:", fromPath) @@ -313,53 +313,53 @@ def copyFramework(framework, path, verbose): if verbose >= 3: print("Copied for libQtGui:", qtMenuNibSourcePath) print(" to:", qtMenuNibDestinationPath) - + return toPath def deployFrameworks(frameworks, bundlePath, binaryPath, strip, verbose, deploymentInfo=None): if deploymentInfo is None: deploymentInfo = DeploymentInfo() - + while len(frameworks) > 0: framework = frameworks.pop(0) deploymentInfo.deployedFrameworks.append(framework.frameworkName) - + if verbose >= 2: print("Processing", framework.frameworkName, "...") - + # Get the Qt path from one of the Qt frameworks if deploymentInfo.qtPath is None and framework.isQtFramework(): deploymentInfo.detectQtPath(framework.frameworkDirectory) - + if framework.installName.startswith("@executable_path") or framework.installName.startswith(bundlePath): if verbose >= 2: print(framework.frameworkName, "already deployed, skipping.") continue - + # install_name_tool the new id into the binary changeInstallName(framework.installName, framework.deployedInstallName, binaryPath, verbose) - + # Copy framework to app bundle. deployedBinaryPath = copyFramework(framework, bundlePath, verbose) # Skip the rest if already was deployed. if deployedBinaryPath is None: continue - + if strip: runStrip(deployedBinaryPath, verbose) - + # install_name_tool it a new id. changeIdentification(framework.deployedInstallName, deployedBinaryPath, verbose) # Check for framework dependencies dependencies = getFrameworks(deployedBinaryPath, verbose) - + for dependency in dependencies: changeInstallName(dependency.installName, dependency.deployedInstallName, deployedBinaryPath, verbose) - + # Deploy framework if necessary. if dependency.frameworkName not in deploymentInfo.deployedFrameworks and dependency not in frameworks: frameworks.append(dependency) - + return deploymentInfo def deployFrameworksForAppBundle(applicationBundle, strip, verbose): @@ -440,30 +440,30 @@ def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose): continue plugins.append((pluginDirectory, pluginName)) - + for pluginDirectory, pluginName in plugins: if verbose >= 2: print("Processing plugin", os.path.join(pluginDirectory, pluginName), "...") - + sourcePath = os.path.join(deploymentInfo.pluginPath, pluginDirectory, pluginName) destinationDirectory = os.path.join(appBundleInfo.pluginPath, pluginDirectory) if not os.path.exists(destinationDirectory): os.makedirs(destinationDirectory) - + destinationPath = os.path.join(destinationDirectory, pluginName) shutil.copy2(sourcePath, destinationPath) if verbose >= 3: print("Copied:", sourcePath) print(" to:", destinationPath) - + if strip: runStrip(destinationPath, verbose) - + dependencies = getFrameworks(destinationPath, verbose) - + for dependency in dependencies: changeInstallName(dependency.installName, dependency.deployedInstallName, destinationPath, verbose) - + # Deploy framework if necessary. if dependency.frameworkName not in deploymentInfo.deployedFrameworks: deployFrameworks([dependency], appBundleInfo.path, destinationPath, strip, verbose, deploymentInfo) @@ -541,7 +541,7 @@ if len(config.fancy) == 1: if verbose >= 1: sys.stderr.write("Error: Could not import plistlib which is required for fancy disk images.\n") sys.exit(1) - + p = config.fancy[0] if verbose >= 3: print("Fancy: Loading \"%s\"..." % p) @@ -549,14 +549,14 @@ if len(config.fancy) == 1: if verbose >= 1: sys.stderr.write("Error: Could not find fancy disk image plist at \"%s\"\n" % (p)) sys.exit(1) - + try: fancy = plistlib.readPlist(p) except: if verbose >= 1: sys.stderr.write("Error: Could not parse fancy disk image plist at \"%s\"\n" % (p)) sys.exit(1) - + try: assert "window_bounds" not in fancy or (isinstance(fancy["window_bounds"], list) and len(fancy["window_bounds"]) == 4) assert "background_picture" not in fancy or isinstance(fancy["background_picture"], str) @@ -570,7 +570,7 @@ if len(config.fancy) == 1: if verbose >= 1: sys.stderr.write("Error: Bad format of fancy disk image plist at \"%s\"\n" % (p)) sys.exit(1) - + if "background_picture" in fancy: bp = fancy["background_picture"] if verbose >= 3: @@ -591,7 +591,7 @@ else: if os.path.exists("dist"): if verbose >= 2: print("+ Removing old dist folder +") - + shutil.rmtree("dist") # ------------------------------------------------ @@ -603,7 +603,7 @@ else: # ------------------------------------------------ -target = os.path.join("dist", "Ion-Qt.app") +target = os.path.join("dist", "ion-Qt.app") if verbose >= 2: print("+ Copying source bundle +") @@ -638,7 +638,7 @@ except RuntimeError as e: if config.plugins: if verbose >= 2: print("+ Deploying plugins +") - + try: deployPlugins(applicationBundle, deploymentInfo, config.strip, verbose) except RuntimeError as e: @@ -741,26 +741,26 @@ if config.dmg is not None: elif verbose >= 3: hdiutil_args.append("-verbose") run = subprocess.check_call - + for key, value in kwargs.items(): hdiutil_args.append("-" + key) if not value is True: hdiutil_args.append(str(value)) - + return run(hdiutil_args) - + if verbose >= 2: if fancy is None: print("+ Creating .dmg disk image +") else: print("+ Preparing .dmg disk image +") - + if config.dmg != "": dmg_name = config.dmg else: spl = app_bundle_name.split(" ") dmg_name = spl[0] + "".join(p.capitalize() for p in spl[1:]) - + if fancy is None: try: runHDIUtil("create", dmg_name, srcfolder="dist", format="UDBZ", volname=volname, ov=True) @@ -774,28 +774,28 @@ if config.dmg is not None: for file in files: size += os.path.getsize(os.path.join(path, file)) size += int(size * 0.15) - + if verbose >= 3: print("Creating temp image for modification...") try: runHDIUtil("create", dmg_name + ".temp", srcfolder="dist", format="UDRW", size=size, volname=volname, ov=True) except subprocess.CalledProcessError as e: sys.exit(e.returncode) - + if verbose >= 3: print("Attaching temp image...") try: output = runHDIUtil("attach", dmg_name + ".temp", readwrite=True, noverify=True, noautoopen=True, capture_stdout=True) except subprocess.CalledProcessError as e: sys.exit(e.returncode) - + m = re.search("/Volumes/(.+$)", output.decode()) disk_root = m.group(0) disk_name = m.group(1) - + if verbose >= 2: print("+ Applying fancy settings +") - + if "background_picture" in fancy: bg_path = os.path.join(disk_root, ".background", os.path.basename(fancy["background_picture"])) os.mkdir(os.path.dirname(bg_path)) @@ -804,10 +804,10 @@ if config.dmg is not None: shutil.copy2(fancy["background_picture"], bg_path) else: bg_path = None - + if fancy.get("applications_symlink", False): os.symlink("/Applications", os.path.join(disk_root, "Applications")) - + # The Python appscript package broke with OSX 10.8 and isn't being fixed. # So we now build up an AppleScript string and use the osascript command # to make the .dmg file pretty: @@ -873,12 +873,12 @@ if config.dmg is not None: if verbose >= 2: print("+ Finalizing .dmg disk image +") time.sleep(5) - + try: runHDIUtil("convert", dmg_name + ".temp", format="UDBZ", o=dmg_name + ".dmg", ov=True) except subprocess.CalledProcessError as e: sys.exit(e.returncode) - + os.unlink(dmg_name + ".temp.dmg") # ------------------------------------------------ diff --git a/contrib/rpm/README.md b/contrib/rpm/README.md index 74ff4a7..0558e0a 100755 --- a/contrib/rpm/README.md +++ b/contrib/rpm/README.md @@ -1,7 +1,7 @@ RPM Spec File Notes ------------------- -The RPM spec file provided here is for Ion-Core 0.12.0 and builds on CentOS +The RPM spec file provided here is for ion-Core 0.12.0 and builds on CentOS 7 with either the CentOS provided OpenSSL library or with LibreSSL as packaged at [LibreLAMP.com](https://librelamp.com/). It should hopefully not be too difficult to port the RPM spec file to most RPM based Linux distributions. @@ -137,7 +137,7 @@ want the OpenSSL development files. LibreSSL (and some newer builds of OpenSSL) do not have support for SSLv3. This can cause issues with the Boost package if the Boost package has not been patched accordingly. On those distributions, you will either need to build -Ion-Core against OpenSSL or use a patched version of Boost in the build +ion-Core against OpenSSL or use a patched version of Boost in the build system. As SSLv3 is no longer safe, distributions that have not patched Boost to work diff --git a/doc/README.md b/doc/README.md index 4b5756b..f978c24 100755 --- a/doc/README.md +++ b/doc/README.md @@ -24,7 +24,7 @@ Unpack the files into a directory, and then run ion-qt.exe. ### OS X -Drag Ion-Core to your applications folder, and then run Ion-Core. +Drag ion-Core to your applications folder, and then run ion-Core. ### Need Help? diff --git a/doc/build-unix.md b/doc/build-unix.md index 7a49a27..f3bef7b 100755 --- a/doc/build-unix.md +++ b/doc/build-unix.md @@ -107,7 +107,7 @@ ZMQ dependencies (provides ZMQ API 4.x): Dependencies for the GUI: Ubuntu & Debian ----------------------------------------- -If you want to build Ion-Qt, make sure that the required packages for Qt development +If you want to build ion-Qt, make sure that the required packages for Qt development are installed. Either Qt 5 or Qt 4 are necessary to build the GUI. If both Qt 4 and Qt 5 are installed, Qt 5 will be used. Pass `--with-gui=qt4` to configure to choose Qt4. To build without GUI pass `--without-gui`. diff --git a/ioncoin.conf b/ioncoin.conf index 3417ed3..65db2f0 100644 --- a/ioncoin.conf +++ b/ioncoin.conf @@ -1,7 +1,7 @@ ## ## ioncoin.conf configuration file. Lines beginning with # are comments. ## - + # Network-related settings: # Run on the test network instead of the real ion network. @@ -43,22 +43,22 @@ ############################################################## # Use as many addnode= settings as you like to connect to specific peers -addnode=37.235.56.156 # -addnode=80.234.173.63 # -addnode=101.179.57.80 # -addnode=51.15.136.185 # -addnode=45.76.38.60 # -addnode=107.92.57.36 # -addnode=92.25.67.139 # +addnode=37.235.56.156 # +addnode=80.234.173.63 # +addnode=101.179.57.80 # +addnode=51.15.136.185 # +addnode=45.76.38.60 # +addnode=107.92.57.36 # +addnode=92.25.67.139 # # Alternatively use as many connect= settings as you like to connect ONLY to specific peers -#connect=37.235.56.156 # -#connect=80.234.173.63 # -#connect=101.179.57.80 # -#connect=51.15.136.185 # -#connect=45.76.38.60 # -#connect=107.92.57.36 # -#connect=92.25.67.139 # +#connect=37.235.56.156 # +#connect=80.234.173.63 # +#connect=101.179.57.80 # +#connect=51.15.136.185 # +#connect=45.76.38.60 # +#connect=107.92.57.36 # +#connect=92.25.67.139 # # Listening mode, enabled by default except when 'connect' is being used listen=1 @@ -70,7 +70,7 @@ maxconnections=12 # JSON-RPC options (for controlling a running Ion/iond process) # -# server=1 tells Ion-Qt and iond to accept JSON-RPC commands +# server=1 tells ion-Qt and iond to accept JSON-RPC commands server=1 # Bind to given address to listen for JSON-RPC connections. Use [host]:port notation for IPv6. @@ -104,7 +104,7 @@ rpcpassword=somepassword # rpcauth=bob:b2dd077cb54591a2f3139e69a897ac$4e71f08d48b4347cf8eff3815c0e25ae2e9a4340474079f55705f40574f4ec99 # How many seconds ion will wait for a complete RPC HTTP request. -# after the HTTP connection is established. +# after the HTTP connection is established. rpcclienttimeout=30 # By default, only RPC connections from localhost are allowed. @@ -114,8 +114,8 @@ rpcclienttimeout=30 # NOTE: opening up the RPC port to hosts outside your local trusted network is NOT RECOMMENDED, # because the rpcpassword is transmitted over the network unencrypted. -# server=1 tells Ion-Qt to accept JSON-RPC commands. -# it is also read by iond to determine if RPC should be enabled +# server=1 tells ion-Qt to accept JSON-RPC commands. +# it is also read by iond to determine if RPC should be enabled #rpcallowip=10.1.1.34/255.255.255.0 #rpcallowip=1.2.3.4/24 #rpcallowip=2001:db8:85a3:0:0:8a2e:370:7334/96 @@ -142,11 +142,11 @@ rpcport=12705 # be validated sooner. #paytxfee=0.00 -# Enable pruning to reduce storage requirements by deleting old blocks. +# Enable pruning to reduce storage requirements by deleting old blocks. # This mode is incompatible with -txindex and -rescan. # 0 = default (no pruning). # 1 = allows manual pruning via RPC. -# >=550 = target to stay under in MiB. +# >=550 = target to stay under in MiB. #prune=550 # User interface options diff --git a/share/certs/PrivateKeyNotes.md b/share/certs/PrivateKeyNotes.md index 2d264a7..4d08176 100755 --- a/share/certs/PrivateKeyNotes.md +++ b/share/certs/PrivateKeyNotes.md @@ -7,7 +7,7 @@ signing requests. For OSX, the private key was generated by Keychain.app on Gavin's main work machine. The key and certificate is in a separate, passphrase-protected keychain file that is -unlocked to sign the Ion-Qt.app bundle. +unlocked to sign the ion-Qt.app bundle. For Windows, the private key was generated by Firefox running on Gavin's main work machine. The key and certificate were exported into a separate, passphrase-protected PKCS#12 file, and @@ -17,7 +17,7 @@ Threat analysis -- Gavin is a single point of failure. He could be coerced to divulge the secret signing keys, -allowing somebody to distribute a Ion-Qt.app or ion-qt-setup.exe with a valid +allowing somebody to distribute a ion-Qt.app or ion-qt-setup.exe with a valid signature but containing a malicious binary. Or the machine Gavin uses to sign the binaries could be compromised, either remotely or diff --git a/share/qt/Info.plist b/share/qt/Info.plist index 40e2e91..8216dd4 100644 --- a/share/qt/Info.plist +++ b/share/qt/Info.plist @@ -29,16 +29,16 @@ ???? CFBundleExecutable - Ion-Qt - + ion-Qt + CFBundleName - Ion-Qt + ion-Qt LSHasLocalizedDisplayName CFBundleIdentifier - org.ionfoundation.Ion-Qt + org.ionfoundation.ion-Qt CFBundleURLTypes @@ -99,7 +99,7 @@ LSAppNapIsDisabled True - + LSApplicationCategoryType public.app-category.finance diff --git a/share/qt/Info.plist.in b/share/qt/Info.plist.in index 0a78f3b..58b9859 100755 --- a/share/qt/Info.plist.in +++ b/share/qt/Info.plist.in @@ -29,16 +29,16 @@ ???? CFBundleExecutable - Ion-Qt - + ion-Qt + CFBundleName - Ion-Qt + ion-Qt LSHasLocalizedDisplayName CFBundleIdentifier - org.ionfoundation.Ion-Qt + org.ionfoundation.ion-Qt CFBundleURLTypes @@ -99,7 +99,7 @@ LSAppNapIsDisabled True - + LSApplicationCategoryType public.app-category.finance diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h index ab5dae9..4d7d10c 100755 --- a/src/qt/guiutil.h +++ b/src/qt/guiutil.h @@ -90,7 +90,7 @@ namespace GUIUtil // Open debug.log void openDebugLogfile(); - + // Browse backup folder void showBackups(); @@ -176,7 +176,7 @@ namespace GUIUtil QString formatTimeOffset(int64_t nTimeOffset); - /** Help message for Ion-Qt, shown with --help. */ + /** Help message for ion-Qt, shown with --help. */ class HelpMessageBox : public QMessageBox { Q_OBJECT diff --git a/src/qt/ion.cpp b/src/qt/ion.cpp index 85f5ac6..32d2a46 100755 --- a/src/qt/ion.cpp +++ b/src/qt/ion.cpp @@ -299,7 +299,7 @@ int main(int argc, char *argv[]) window.setWalletModel(0); guiref = 0; } - // Shutdown the core and its threads, but don't exit Ion-Qt here + // Shutdown the core and its threads, but don't exit ion-Qt here threadGroup.interrupt_all(); threadGroup.join_all(); Shutdown();