author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
234,915 | 09.11.2022 20:21:49 | -19,620 | f5deb100541b61422e7de04915d9b5c099956e47 | Implemented `formats.ExcelControl.stringified`
* Fixed casting int to string
* Converts cell data to string while reading as done by csv reader
* Added stringified param to excel parser
Revised the code adding stringified param
Fixed the test accordingly' | [
{
"change_type": "ADD",
"old_path": "data/cast-int-to-string-issue-1251.xls",
"new_path": "data/cast-int-to-string-issue-1251.xls",
"diff": "Binary files /dev/null and b/data/cast-int-to-string-issue-1251.xls differ\n"
},
{
"change_type": "ADD",
"old_path": "data/cast-int-to-string-issue-1251.xlsx",
"new_path": "data/cast-int-to-string-issue-1251.xlsx",
"diff": "Binary files /dev/null and b/data/cast-int-to-string-issue-1251.xlsx differ\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/formats/excel/control.py",
"new_path": "frictionless/formats/excel/control.py",
"diff": "@@ -46,6 +46,12 @@ class ExcelControl(Control):\nFor example: 274.65999999999997 -> 274.66 (When True).\n\"\"\"\n+ stringified: bool = False\n+ \"\"\"\n+ Stringifies all the cell values. Default value\n+ is False.\n+ \"\"\"\n+\n# Metadata\nmetadata_profile_patch = {\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/formats/excel/parsers/xlsx.py",
"new_path": "frictionless/formats/excel/parsers/xlsx.py",
"diff": "@@ -120,6 +120,7 @@ class XlsxParser(Parser):\ncells,\ncontrol.preserve_formatting,\ncontrol.adjust_floating_point_error,\n+ stringified=control.stringified,\n)\n# Calculate stats\n@@ -161,7 +162,9 @@ class XlsxParser(Parser):\n# Internal\n-def extract_row_values(row, preserve_formatting=False, adjust_floating_point_error=False):\n+def extract_row_values(\n+ row, preserve_formatting=False, adjust_floating_point_error=False, stringified=True\n+):\nif preserve_formatting:\nvalues = []\nfor cell in row:\n@@ -191,7 +194,9 @@ def extract_row_values(row, preserve_formatting=False, adjust_floating_point_err\nvalue = new_value\nvalues.append(value)\nreturn values\n- return list(cell.value for cell in row)\n+ return list(\n+ str(cell.value) if (stringified and cell.value) else cell.value for cell in row\n+ )\ndef convert_excel_number_format_string(excel_number, value):\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/actions/describe/test_resource.py",
"new_path": "tests/actions/describe/test_resource.py",
"diff": "import pytest\n-from frictionless import Resource, Detector, Dialect, describe, platform\n+from frictionless import formats, Resource, Detector, Dialect, describe, platform\n# General\n@@ -128,11 +128,14 @@ def test_describe_resource_schema_check_type_boolean_string_tie():\ndef test_describe_resource_schema_xlsx_file_with_boolean_column_issue_203():\n- resource = describe(\"data/table-infer-boolean.xlsx\")\n+ resource = describe(\n+ \"data/table-infer-boolean.xlsx\", control=formats.ExcelControl(stringified=True)\n+ )\nassert isinstance(resource, Resource)\n+ print(resource.schema.to_descriptor())\nassert resource.schema.to_descriptor() == {\n\"fields\": [\n- {\"name\": \"number\", \"type\": \"integer\"},\n+ {\"name\": \"number\", \"type\": \"number\"},\n{\"name\": \"string\", \"type\": \"string\"},\n{\"name\": \"boolean\", \"type\": \"boolean\"},\n],\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/resource/describe/test_general.py",
"new_path": "tests/resource/describe/test_general.py",
"diff": "import pytest\n-from frictionless import Resource, Dialect, Detector, platform\n+from frictionless import formats, Resource, Dialect, Detector, platform\n# General\n@@ -135,10 +135,12 @@ def test_describe_resource_schema_summary():\ndef test_describe_resource_schema_xlsx_file_with_boolean_column_issue_203():\n- resource = Resource.describe(\"data/table-infer-boolean.xlsx\")\n+ resource = Resource.describe(\n+ \"data/table-infer-boolean.xlsx\", control=formats.ExcelControl(stringified=True)\n+ )\nassert resource.schema.to_descriptor() == {\n\"fields\": [\n- {\"name\": \"number\", \"type\": \"integer\"},\n+ {\"name\": \"number\", \"type\": \"number\"},\n{\"name\": \"string\", \"type\": \"string\"},\n{\"name\": \"boolean\", \"type\": \"boolean\"},\n],\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Implemented `formats.ExcelControl.stringified` (#1259)
* Fixed casting int to string
* Converts cell data to string while reading as done by csv reader
* Added stringified param to excel parser
Revised the code adding stringified param
Fixed the test accordingly' |
234,915 | 09.11.2022 21:04:33 | -19,620 | 6182dbae2d6549dee2b97f130f042a538892fabd | Fixes compatability of tabular data profile
* Fixed serialization error of descriptor with profile
* Changed resource.py file
* Fixed the flow based on the feedback
Ignore "data-package"
Set resource type="table" if profile is "tabular-data-package"
* Temporary fix for type error | [
{
"change_type": "MODIFY",
"old_path": "frictionless/package/package.py",
"new_path": "frictionless/package/package.py",
"diff": "@@ -832,10 +832,12 @@ class Package(Metadata):\n# Profiles\nprofiles = descriptor.get(\"profiles\", [])\nfor profile in profiles:\n+ if profile in [\"data-package\", \"tabular-data-package\"]:\n+ continue\nyield from Metadata.metadata_validate(\ndescriptor,\nprofile=profile,\n- error_class=errors.PackageError,\n+ error_class=cls.metadata_Error,\n)\n# Misleading\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/resource/resource.py",
"new_path": "frictionless/resource/resource.py",
"diff": "@@ -1227,6 +1227,11 @@ class Resource(Metadata):\n# Profiles\nprofiles = descriptor.get(\"profiles\", [])\nfor profile in profiles:\n+ if profile in [\"data-resource\"]:\n+ continue\n+ if profile == \"tabular-data-resource\":\n+ descriptor[\"type\"] = \"table\"\n+ break\nyield from Metadata.metadata_validate(\ndescriptor,\nprofile=profile,\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/package/test_profiles.py",
"new_path": "tests/package/test_profiles.py",
"diff": "@@ -57,6 +57,14 @@ def test_package_external_profile_invalid_remote_from_descriptor():\nassert \"required\" in error.message\[email protected](\"profile\", [\"data-package\", \"tabular-data-package\"])\n+def test_package_profile_type(profile):\n+ resource = Resource(name=\"table\", path=\"data/table.csv\")\n+ package = Package(resources=[resource], profiles=[profile])\n+ descriptor = package.to_descriptor()\n+ assert descriptor[\"profiles\"] == [profile]\n+\n+\n# Legacy\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/resource/test_profiles.py",
"new_path": "tests/resource/test_profiles.py",
"diff": "@@ -28,3 +28,10 @@ def test_resource_profiles_from_descriptor():\nassert error.note == \"descriptor is not valid\"\nassert reasons[0].type == \"resource-error\"\nassert reasons[0].note == \"'requiredProperty' is a required property\"\n+\n+\[email protected](\"profile\", [\"data-resource\", \"tabular-data-resource\"])\n+def test_resource_profile_type(profile):\n+ resource = Resource(name=\"table\", path=\"data/table.csv\", profiles=[profile])\n+ descriptor = resource.to_descriptor()\n+ assert descriptor[\"profiles\"] == [profile]\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Fixes compatability of tabular data profile (#1275)
* Fixed serialization error of descriptor with profile
* Changed resource.py file
* Fixed the flow based on the feedback
Ignore "data-package"
Set resource type="table" if profile is "tabular-data-package"
* Temporary fix for type error
Co-authored-by: roll <[email protected]> |
234,904 | 14.11.2022 04:41:47 | 10,800 | de095a6984eb544545172f6c8d409bc4cf96c596 | Link top bar to v4 docs directly
fix | [
{
"change_type": "MODIFY",
"old_path": "livemark.yaml",
"new_path": "livemark.yaml",
"diff": "@@ -17,7 +17,7 @@ topics:\nnews:\ntext: |\nIt's a beta version of Frictionless Framework (v5).\n- Read <a href=\"https://v4.framework.frictionlessdata.io/\">Frictionless Framework (v4)</a>\n+ Read <a href=\"https://v4.framework.frictionlessdata.io/docs/guides/guides-overview\">Frictionless Framework (v4)</a>\ndocs for a version that is currently installed by default by pip.\nlinks:\nitems:\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Link top bar to v4 docs directly (#1295)
fix #1294 |
234,915 | 17.11.2022 12:02:20 | -19,620 | a935d27fe5f210f0024fc102a74971e2a520fcc2 | Added api endpoints for move file feature
Added function to list folders, create directory and move file | [
{
"change_type": "MODIFY",
"old_path": "frictionless/server/project.py",
"new_path": "frictionless/server/project.py",
"diff": "@@ -79,6 +79,11 @@ class Project:\nhelpers.write_file(path, body, mode=\"wb\")\nreturn file.filename\n+ def create_directory(self, path: str):\n+ path = str(self.public / path)\n+ Path(path).mkdir(parents=True, exist_ok=True)\n+ return path\n+\ndef delete_file(self, path: str):\n# TODO: ensure that path is safe\nos.remove(self.public / path)\n@@ -94,6 +99,25 @@ class Project:\npaths = list(sorted(paths))\nreturn paths\n+ def list_folders(self):\n+ folders = []\n+ for basepath, names, _ in os.walk(self.public):\n+ for name in names:\n+ if name.startswith(\".\"):\n+ continue\n+ path = os.path.join(basepath, name)\n+ path = os.path.relpath(path, start=self.public)\n+ folders.append(path)\n+ folders = list(sorted(folders))\n+ return folders\n+\n+ def move_file(self, filename: str, destination: str):\n+ source = str(self.public / filename)\n+ destination = str(self.public / destination)\n+ newpath = os.path.join(destination, filename)\n+ helpers.move_file(source, newpath)\n+ return newpath\n+\n# Links\n# Packages\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/server/projects/__init__.py",
"new_path": "frictionless/server/projects/__init__.py",
"diff": "@@ -6,3 +6,6 @@ from . import create_record\nfrom . import delete_file\nfrom . import list_files\nfrom . import update_record\n+from . import list_folders\n+from . import create_directory\n+from . import move_file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "frictionless/server/projects/create_directory.py",
"diff": "+from typing import Optional\n+from pydantic import BaseModel\n+from fastapi import Request\n+from ..project import Project\n+from ..router import router\n+\n+\n+class ProjectCreateDirectoryProps(BaseModel):\n+ session: Optional[str]\n+ directoryname: str\n+\n+\[email protected](\"/project/create-directory\")\n+def server_project_create_directory(request: Request, props: ProjectCreateDirectoryProps):\n+ print(\"props\", props)\n+ config = request.app.config\n+ project = Project(config, session=props.session)\n+ newdirectory = project.create_directory(props.directoryname)\n+ return {\"path\": newdirectory}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "frictionless/server/projects/list_folders.py",
"diff": "+from typing import Optional\n+from pydantic import BaseModel\n+from fastapi import Request\n+from ..project import Project\n+from ..router import router\n+\n+\n+class ProjectListFoldersProps(BaseModel):\n+ session: Optional[str]\n+\n+\[email protected](\"/project/list-folders\")\n+def server_project_list_folders(request: Request, props: ProjectListFoldersProps):\n+ config = request.app.config\n+ project = Project(config, session=props.session)\n+ directories = project.list_folders()\n+ return {\"directories\": directories}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "frictionless/server/projects/move_file.py",
"diff": "+from typing import Optional\n+from pydantic import BaseModel\n+from fastapi import Request\n+from ..project import Project\n+from ..router import router\n+\n+\n+class ProjectMoveFileProps(BaseModel):\n+ session: Optional[str]\n+ filename: str\n+ destination: str\n+\n+\[email protected](\"/project/move-file\")\n+def server_project_move_file(request: Request, props: ProjectMoveFileProps):\n+ config = request.app.config\n+ project = Project(config, session=props.session)\n+ filepath = project.move_file(props.filename, props.destination)\n+ return {\"path\": filepath}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/server/projects/test_create_directory.py",
"diff": "+import pytest\n+\n+\n+# General\n+\n+\[email protected]\n+def test_server_project_create_directory(api_client):\n+ session = api_client.post(\"/project/create\").json()[\"session\"]\n+\n+ # Create Dir\n+ response = api_client.post(\n+ \"/project/create-directory\", data=dict(session=session, directoryname=\"test\")\n+ )\n+ assert response.status_code == 200\n+ assert response.json()[\"path\"] == \"test\"\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/server/projects/test_list_folders.py",
"diff": "+import pytest\n+\n+\n+# General\n+\n+\[email protected]\n+def test_server_project_list_folders(api_client):\n+ session = api_client.post(\"/project/create\").json()[\"session\"]\n+\n+ # Create Dir\n+ response = api_client.post(\n+ \"/project/create-directory\", data=dict(session=session, directoryname=\"test\")\n+ )\n+\n+ # List Dir\n+ response = api_client.post(\"/project/list-folders\", json=dict(session=session))\n+ assert response.status_code == 200\n+ assert response.json()[\"paths\"] == [\"test\"]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/server/projects/test_move_file.py",
"diff": "+import pytest\n+\n+\n+# General\n+\n+\[email protected]\n+def test_server_project_move_file(api_client):\n+ session = api_client.post(\"/project/create\").json()[\"session\"]\n+\n+ # Create File\n+ with open(\"data/table.csv\", \"rb\") as file:\n+ files = {\"file\": (\"table.csv\", file, \"text/csv\")}\n+ response = api_client.post(\n+ \"/project/create-file\", files=files, data=dict(session=session)\n+ )\n+\n+ # Create Dir\n+ response = api_client.post(\n+ \"/project/create-directory\", data=dict(session=session, directoryname=\"folder\")\n+ )\n+\n+ response = api_client.post(\n+ \"/project/move-file\", data=dict(session=session, directoryname=\"folder\")\n+ )\n+ assert response.status_code == 200\n+ assert response.json()[\"path\"] == \"test\"\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Added api endpoints for move file feature (#1300)
Added function to list folders, create directory and move file |
234,915 | 18.11.2022 12:41:01 | -19,620 | 96897016ccd08305109eb9ab1d14993bdee4511f | Updated documentation for sample_size and buffer_size | [
{
"change_type": "MODIFY",
"old_path": "docs/framework/detector.md",
"new_path": "docs/framework/detector.md",
"diff": "@@ -38,7 +38,7 @@ You just need to create a Detector instance using desired options and pass to th\n## Buffer Size\n-By default, Frictionless will use the first 10000 bytes to detect encoding. The following code will be slower but the encoding detection will be more accurate:\n+By default, Frictionless will use the first 10000 bytes to detect encoding. Including more bytes by increasing buffer_size can improve the inference. However, it will be slower, but the encoding detection will be more accurate.\n```python script tabs=Python\nfrom frictionless import Detector, describe\n@@ -50,7 +50,7 @@ print(resource.encoding)\n## Sample Size\n-By default, Frictionless will use the first 100 rows to detect field types. This can be customized. The following code will be slower but the result can be more accurate\n+By default, Frictionless will use the first 100 rows to detect field types. Including more samples by increasing sample_size can improve the inference. However, it will be slower, but the result will be more accurate.\n```python script tabs=Python\nfrom frictionless import Detector, describe\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/detector/detector.py",
"new_path": "frictionless/detector/detector.py",
"diff": "@@ -50,14 +50,16 @@ class Detector(Metadata):\nbuffer_size: int = settings.DEFAULT_BUFFER_SIZE\n\"\"\"\n- The amount of bytes to be extracted as a buffer.\n- It defaults to 10000\n+ The amount of bytes to be extracted as a buffer. It defaults to 10000.\n+ The buffer_size can be increased to improve the inference accuracy to\n+ detect file encoding.\n\"\"\"\nsample_size: int = settings.DEFAULT_SAMPLE_SIZE\n\"\"\"\n- The amount of rows to be extracted as a sample.\n- It defaults to 100\n+ The amount of rows to be extracted as a sample for dialect/schema infering.\n+ It defaults to 100. The sample_size can be increased to improve the inference\n+ accuracy.\n\"\"\"\nencoding_function: Optional[IEncodingFunction] = None\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Updated documentation for sample_size and buffer_size (#1303) |
234,915 | 18.11.2022 14:15:34 | -19,620 | fe8c1ee5121ba5f88ebe598bfd1e63143c983945 | Replaced pandas' deprecated iteritems with items | [
{
"change_type": "MODIFY",
"old_path": "frictionless/formats/pandas/parser.py",
"new_path": "frictionless/formats/pandas/parser.py",
"diff": "@@ -63,7 +63,7 @@ class PandasParser(Parser):\nschema.primary_key.append(name)\n# Fields\n- for name, dtype in dataframe.dtypes.iteritems(): # type: ignore\n+ for name, dtype in dataframe.dtypes.items(): # type: ignore\nsample = dataframe[name].iloc[0] if len(dataframe) else None # type: ignore\ntype = self.__read_convert_type(dtype, sample=sample)\nfield = Field.from_descriptor({\"name\": name, \"type\": type})\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Replaced pandas' deprecated iteritems with items (#1301) |
234,912 | 22.11.2022 16:52:03 | -10,800 | 5abb635bb8f355643eeb80e0ca1be814d935ab37 | Moved erd format to its own module | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/formats/erd.md",
"diff": "+# Erd Format\n+\n+```markdown remark type=warning\n+This documentation page is work-in-progress\n+```\n+\n+Frictionless supports exporting a data package as an ER-diagram `dot` file. For example:\n+\n+```python\n+package = Package('datapackage.zip')\n+package.to_er_diagram(path='erd.dot')\n+```\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/formats/__init__.py",
"new_path": "frictionless/formats/__init__.py",
"diff": "from .csv import *\n+from .erd import *\nfrom .excel import *\nfrom .gsheets import *\nfrom .html import *\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "frictionless/formats/erd/__init__.py",
"diff": "+from .mapper import ErdMapper\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "frictionless/formats/erd/mapper.py",
"diff": "+from __future__ import annotations\n+import os\n+from typing import TYPE_CHECKING\n+from ...platform import platform\n+\n+if TYPE_CHECKING:\n+ from ...package import Package\n+\n+\n+class ErdMapper:\n+ \"\"\"ERD Mapper\"\"\"\n+\n+ # Write\n+\n+ def write_package(self, package: Package) -> str:\n+ package.infer()\n+ template_dir = os.path.join(\n+ os.path.dirname(__file__), \"../../assets/templates/erd\"\n+ )\n+ environ = platform.jinja2.Environment(\n+ loader=platform.jinja2.FileSystemLoader(template_dir),\n+ lstrip_blocks=True,\n+ trim_blocks=True,\n+ )\n+ table_template = environ.get_template(\"table.html\")\n+ field_template = environ.get_template(\"field.html\")\n+ primary_key_template = environ.get_template(\"primary_key_field.html\")\n+ graph = environ.get_template(\"graph.html\")\n+ edges = []\n+ nodes = []\n+ for t_name in package.resource_names:\n+ resource = package.get_resource(t_name) # type: ignore\n+ templates = {k: primary_key_template for k in resource.schema.primary_key}\n+ t_fields = [\n+ templates.get(f.name, field_template).render(name=f.name, type=f.type) # type: ignore\n+ for f in resource.schema.fields\n+ ]\n+ nodes.append(table_template.render(name=t_name, rows=\"\".join(t_fields)))\n+ child_table = t_name\n+ for fk in resource.schema.foreign_keys:\n+ for foreign_key in fk[\"fields\"]:\n+ if fk[\"reference\"][\"resource\"] == \"\":\n+ continue\n+ parent_table = fk[\"reference\"][\"resource\"]\n+ for parent_primary_key in fk[\"reference\"][\"fields\"]:\n+ edges.append(\n+ f'\"{parent_table}\":{parent_primary_key}n -> \"{child_table}\":{foreign_key}n;'\n+ )\n+ return graph.render(\n+ name=package.name,\n+ tables=\"\\n\\t\".join(nodes),\n+ edges=\"\\n\\t\".join(edges),\n+ )\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/package/package.py",
"new_path": "frictionless/package/package.py",
"diff": "@@ -393,8 +393,7 @@ class Package(Metadata):\nresources=[resource.to_copy() for resource in self.resources]\n)\n- # TODO: if path is not provided return as a string\n- def to_er_diagram(self, path=None) -> str:\n+ def to_er_diagram(self, path: Optional[str] = None) -> str:\n\"\"\"Generate ERD(Entity Relationship Diagram) from package resources\nand exports it as .dot file\n@@ -406,50 +405,9 @@ class Package(Metadata):\nReturns:\npath(str): location of the .dot file\n-\n\"\"\"\n-\n- # Infer\n- self.infer()\n-\n- # Render\n- template_dir = os.path.join(os.path.dirname(__file__), \"../assets/templates/erd\")\n- environ = platform.jinja2.Environment(\n- loader=platform.jinja2.FileSystemLoader(template_dir),\n- lstrip_blocks=True,\n- trim_blocks=True,\n- )\n- table_template = environ.get_template(\"table.html\")\n- field_template = environ.get_template(\"field.html\")\n- primary_key_template = environ.get_template(\"primary_key_field.html\")\n- graph = environ.get_template(\"graph.html\")\n- edges = []\n- nodes = []\n- for t_name in self.resource_names:\n- resource = self.get_resource(t_name) # type: ignore\n- templates = {k: primary_key_template for k in resource.schema.primary_key}\n- t_fields = [\n- templates.get(f.name, field_template).render(name=f.name, type=f.type) # type: ignore\n- for f in resource.schema.fields\n- ]\n- nodes.append(table_template.render(name=t_name, rows=\"\".join(t_fields)))\n- child_table = t_name\n- for fk in resource.schema.foreign_keys:\n- for foreign_key in fk[\"fields\"]:\n- if fk[\"reference\"][\"resource\"] == \"\":\n- continue\n- parent_table = fk[\"reference\"][\"resource\"]\n- for parent_primary_key in fk[\"reference\"][\"fields\"]:\n- edges.append(\n- f'\"{parent_table}\":{parent_primary_key}n -> \"{child_table}\":{foreign_key}n;'\n- )\n- text = graph.render(\n- name=self.name,\n- tables=\"\\n\\t\".join(nodes),\n- edges=\"\\n\\t\".join(edges),\n- )\n-\n- # Output\n+ mapper = platform.frictionless_formats.erd.ErdMapper()\n+ text = mapper.write_package(self)\nif path:\ntry:\nhelpers.write_file(path, text)\n"
},
{
"change_type": "MODIFY",
"old_path": "livemark.yaml",
"new_path": "livemark.yaml",
"diff": "@@ -164,6 +164,8 @@ pages:\nitems:\n- path: docs/formats/csv\nname: Csv\n+ - path: docs/formats/erd\n+ name: Erd\n- path: docs/formats/excel\nname: Excel\n- path: docs/formats/gsheets\n"
},
{
"change_type": "ADD",
"old_path": "tests/formats/erd/__init__.py",
"new_path": "tests/formats/erd/__init__.py",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/formats/erd/test_mapper.py",
"diff": "+import os\n+from frictionless import Package\n+\n+\n+# General\n+\n+\n+def test_erd_mapper_package_to_erd():\n+ package = Package(\"data/package-storage.json\")\n+\n+ # Read\n+ with open(\"data/fixtures/dot-files/package.dot\") as file:\n+ assert package.to_er_diagram().strip() == file.read().strip()\n+\n+\n+def test_erd_mapper_package_to_erd_table_names_with_dash(tmpdir):\n+ # graphviz shows error if the table/field name has \"-\" so need to\n+ # wrap names with quotes \"\"\n+ package = Package(\"data/datapackage.json\")\n+ expected_file_path = (\n+ \"data/fixtures/dot-files/package-resource-names-including-dash.dot\"\n+ )\n+ output_file_path = os.path.join(tmpdir, \"output.dot\")\n+\n+ # Read - expected\n+ with open(expected_file_path) as file:\n+ expected = file.read()\n+\n+ # Write\n+ package.to_er_diagram(output_file_path)\n+\n+ # Read - output\n+ with open(output_file_path) as file:\n+ output = file.read()\n+ assert expected.strip() == output.strip()\n+ assert output.count('\"number-two\"')\n+\n+\n+def test_erd_mapper_package_to_erd_without_table_relationships(tmpdir):\n+ package = Package(\"data/datapackage.json\")\n+ expected_file_path = (\n+ \"data/fixtures/dot-files/package-resource-names-including-dash.dot\"\n+ )\n+ output_file_path = os.path.join(tmpdir, \"output.dot\")\n+\n+ # Read - expected\n+ with open(expected_file_path) as file:\n+ expected = file.read()\n+\n+ # Write\n+ package.to_er_diagram(output_file_path)\n+\n+ # Read - soutput\n+ with open(output_file_path) as file:\n+ output = file.read()\n+ assert expected.strip() == output.strip()\n+ assert output.count(\"->\") == 0\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/package/test_convert.py",
"new_path": "tests/package/test_convert.py",
"diff": "@@ -114,58 +114,3 @@ def test_package_to_markdown_table():\n# Read\nwith open(expected_file_path, encoding=\"utf-8\") as file:\nassert package.to_markdown(table=True).strip() == file.read()\n-\n-\n-# ER Diagram\n-\n-\n-def test_package_to_erd():\n- package = Package(\"data/package-storage.json\")\n-\n- # Read\n- with open(\"data/fixtures/dot-files/package.dot\") as file:\n- assert package.to_er_diagram().strip() == file.read().strip()\n-\n-\n-def test_package_to_erd_table_names_with_dash(tmpdir):\n- # graphviz shows error if the table/field name has \"-\" so need to\n- # wrap names with quotes \"\"\n- package = Package(\"data/datapackage.json\")\n- expected_file_path = (\n- \"data/fixtures/dot-files/package-resource-names-including-dash.dot\"\n- )\n- output_file_path = os.path.join(tmpdir, \"output.dot\")\n-\n- # Read - expected\n- with open(expected_file_path) as file:\n- expected = file.read()\n-\n- # Write\n- package.to_er_diagram(output_file_path)\n-\n- # Read - output\n- with open(output_file_path) as file:\n- output = file.read()\n- assert expected.strip() == output.strip()\n- assert output.count('\"number-two\"')\n-\n-\n-def test_package_to_erd_without_table_relationships(tmpdir):\n- package = Package(\"data/datapackage.json\")\n- expected_file_path = (\n- \"data/fixtures/dot-files/package-resource-names-including-dash.dot\"\n- )\n- output_file_path = os.path.join(tmpdir, \"output.dot\")\n-\n- # Read - expected\n- with open(expected_file_path) as file:\n- expected = file.read()\n-\n- # Write\n- package.to_er_diagram(output_file_path)\n-\n- # Read - soutput\n- with open(output_file_path) as file:\n- output = file.read()\n- assert expected.strip() == output.strip()\n- assert output.count(\"->\") == 0\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Moved erd format to its own module (#1326) |
234,912 | 22.11.2022 17:24:14 | -10,800 | f1d2f0405b481efd9d340e657c2d90d7dde6314a | Moved jsonschema to its own module | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/formats/jsonschema.md",
"diff": "+# JsonSchema Format\n+\n+```markdown remark type=warning\n+This documentation page is work-in-progress\n+```\n+\n+Frictionless supports importing a JsonSchema profile as a Table Schema. For example:\n+\n+```python\n+schema = Schema.from_jsonschema('table.jsonschema')\n+```\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/formats/__init__.py",
"new_path": "frictionless/formats/__init__.py",
"diff": "@@ -5,6 +5,7 @@ from .gsheets import *\nfrom .html import *\nfrom .inline import *\nfrom .json import *\n+from .jsonschema import *\nfrom .ods import *\nfrom .pandas import *\nfrom .parquet import *\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "frictionless/formats/jsonschema/__init__.py",
"diff": "+from .mapper import JsonschemaMapper\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "frictionless/formats/jsonschema/mapper.py",
"diff": "+from __future__ import annotations\n+from typing import Dict, Any\n+from ...schema import Schema, Field\n+\n+\n+class JsonschemaMapper:\n+ \"\"\"ERD Mapper\"\"\"\n+\n+ # Write\n+\n+ def read_schema(self, profile: Dict[str, Any]) -> Schema:\n+ schema = Schema()\n+ required = profile.get(\"required\", [])\n+ assert isinstance(required, list)\n+ properties = profile.get(\"properties\", {})\n+ assert isinstance(properties, dict)\n+ for name, prop in properties.items():\n+\n+ # Type\n+ type = prop.get(\"type\", \"any\")\n+ assert isinstance(type, str)\n+ if type not in [\"string\", \"integer\", \"number\", \"boolean\", \"object\", \"array\"]:\n+ type = \"any\"\n+\n+ # Field\n+ assert isinstance(name, str)\n+ assert isinstance(prop, dict)\n+ field = Field.from_descriptor({\"type\": type, \"name\": name})\n+ schema.add_field(field)\n+\n+ # Description\n+ description = prop.get(\"description\")\n+ if description:\n+ assert isinstance(description, str)\n+ field.description = description\n+\n+ # Required\n+ if name in required:\n+ field.required = True\n+\n+ return schema\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/schema/schema.py",
"new_path": "frictionless/schema/schema.py",
"diff": "@@ -233,37 +233,9 @@ class Schema(Metadata):\nReturns:\nSchema: schema instance\n\"\"\"\n- schema = Schema()\nprofile = cls.metadata_retrieve(profile)\n- required = profile.get(\"required\", [])\n- assert isinstance(required, list)\n- properties = profile.get(\"properties\", {})\n- assert isinstance(properties, dict)\n- for name, prop in properties.items():\n-\n- # Type\n- type = prop.get(\"type\", \"any\")\n- assert isinstance(type, str)\n- if type not in [\"string\", \"integer\", \"number\", \"boolean\", \"object\", \"array\"]:\n- type = \"any\"\n-\n- # Field\n- assert isinstance(name, str)\n- assert isinstance(prop, dict)\n- field = Field.from_descriptor({\"type\": type, \"name\": name})\n- schema.add_field(field)\n-\n- # Description\n- description = prop.get(\"description\")\n- if description:\n- assert isinstance(description, str)\n- field.description = description\n-\n- # Required\n- if name in required:\n- field.required = True\n-\n- return schema\n+ mapper = platform.frictionless_formats.jsonschema.JsonschemaMapper()\n+ return mapper.read_schema(profile)\ndef to_excel_template(self, path: str):\n\"\"\"Export schema as an excel template\n"
},
{
"change_type": "MODIFY",
"old_path": "livemark.yaml",
"new_path": "livemark.yaml",
"diff": "@@ -176,6 +176,8 @@ pages:\nname: Inline\n- path: docs/formats/json\nname: Json\n+ - path: docs/formats/jsonschema\n+ name: JsonSchema\n- path: docs/formats/ods\nname: Ods\n- path: docs/formats/pandas\n"
},
{
"change_type": "ADD",
"old_path": "tests/formats/jsonschema/__init__.py",
"new_path": "tests/formats/jsonschema/__init__.py",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "tests/formats/jsonschema/test_mapper.py",
"diff": "+from frictionless import Schema\n+\n+\n+# General\n+\n+\n+def test_jsonschema_mapper_schema_from_jsonschema():\n+ schema = Schema.from_jsonschema(\"data/ecrin.json\")\n+ assert schema.to_descriptor() == {\n+ \"fields\": [\n+ {\"name\": \"file_type\", \"type\": \"string\", \"description\": \"always 'study'\"},\n+ {\n+ \"name\": \"id\",\n+ \"type\": \"integer\",\n+ \"description\": \"Internal accession number of the study within the MDR database\",\n+ \"constraints\": {\"required\": True},\n+ },\n+ {\n+ \"name\": \"display_title\",\n+ \"type\": \"string\",\n+ \"description\": \"By default the public or brief study title. If that is missing then the full scientific title, as used on the protocol document\",\n+ \"constraints\": {\"required\": True},\n+ },\n+ {\n+ \"name\": \"brief_description\",\n+ \"type\": \"object\",\n+ \"description\": \"Brief description, usually a few lines, of the study\",\n+ },\n+ {\n+ \"name\": \"data_sharing_statement\",\n+ \"type\": \"object\",\n+ \"description\": \"A statement from the sponsor and / or study leads about their intentions for IPD sharing\",\n+ },\n+ {\n+ \"name\": \"study_type\",\n+ \"type\": \"object\",\n+ \"description\": \"Categorisation of study type, e.g. 'Interventional', or 'Observational'\",\n+ },\n+ {\n+ \"name\": \"study_status\",\n+ \"type\": \"object\",\n+ \"description\": \"Categorisation of study status, e.g. 'Active, not recruiting', or 'Completed'\",\n+ },\n+ {\n+ \"name\": \"study_enrolment\",\n+ \"type\": \"integer\",\n+ \"description\": \"The anticipated or actual total number of participants in the clinical study.\",\n+ },\n+ {\n+ \"name\": \"study_gender_elig\",\n+ \"type\": \"object\",\n+ \"description\": \"Whether the study is open to all genders, or just male or female\",\n+ },\n+ {\n+ \"name\": \"min_age\",\n+ \"type\": \"object\",\n+ \"description\": \"The minimum age, if any, for a study participant\",\n+ },\n+ {\n+ \"name\": \"max_age\",\n+ \"type\": \"object\",\n+ \"description\": \"The maximum age, if any, for a study participant\",\n+ },\n+ {\"name\": \"study_identifiers\", \"type\": \"array\"},\n+ {\"name\": \"study_titles\", \"type\": \"array\"},\n+ {\"name\": \"study_features\", \"type\": \"array\"},\n+ {\"name\": \"study_topics\", \"type\": \"array\"},\n+ {\"name\": \"study_relationships\", \"type\": \"array\"},\n+ {\"name\": \"linked_data_objects\", \"type\": \"array\"},\n+ {\n+ \"name\": \"provenance_string\",\n+ \"type\": \"string\",\n+ \"description\": \"A listing of the source or sources (usually a trial registry) from which the data for the study has been drawn, and the date-time(s) when the data was last downloaded\",\n+ },\n+ ]\n+ }\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/schema/test_convert.py",
"new_path": "tests/schema/test_convert.py",
"diff": "@@ -174,81 +174,6 @@ def test_schema_to_markdown_file(tmpdir):\nassert expected == file.read()\n-# JSONSchema\n-\n-\n-def test_schema_from_jsonschema():\n- schema = Schema.from_jsonschema(\"data/ecrin.json\")\n- assert schema.to_descriptor() == {\n- \"fields\": [\n- {\"name\": \"file_type\", \"type\": \"string\", \"description\": \"always 'study'\"},\n- {\n- \"name\": \"id\",\n- \"type\": \"integer\",\n- \"description\": \"Internal accession number of the study within the MDR database\",\n- \"constraints\": {\"required\": True},\n- },\n- {\n- \"name\": \"display_title\",\n- \"type\": \"string\",\n- \"description\": \"By default the public or brief study title. If that is missing then the full scientific title, as used on the protocol document\",\n- \"constraints\": {\"required\": True},\n- },\n- {\n- \"name\": \"brief_description\",\n- \"type\": \"object\",\n- \"description\": \"Brief description, usually a few lines, of the study\",\n- },\n- {\n- \"name\": \"data_sharing_statement\",\n- \"type\": \"object\",\n- \"description\": \"A statement from the sponsor and / or study leads about their intentions for IPD sharing\",\n- },\n- {\n- \"name\": \"study_type\",\n- \"type\": \"object\",\n- \"description\": \"Categorisation of study type, e.g. 'Interventional', or 'Observational'\",\n- },\n- {\n- \"name\": \"study_status\",\n- \"type\": \"object\",\n- \"description\": \"Categorisation of study status, e.g. 'Active, not recruiting', or 'Completed'\",\n- },\n- {\n- \"name\": \"study_enrolment\",\n- \"type\": \"integer\",\n- \"description\": \"The anticipated or actual total number of participants in the clinical study.\",\n- },\n- {\n- \"name\": \"study_gender_elig\",\n- \"type\": \"object\",\n- \"description\": \"Whether the study is open to all genders, or just male or female\",\n- },\n- {\n- \"name\": \"min_age\",\n- \"type\": \"object\",\n- \"description\": \"The minimum age, if any, for a study participant\",\n- },\n- {\n- \"name\": \"max_age\",\n- \"type\": \"object\",\n- \"description\": \"The maximum age, if any, for a study participant\",\n- },\n- {\"name\": \"study_identifiers\", \"type\": \"array\"},\n- {\"name\": \"study_titles\", \"type\": \"array\"},\n- {\"name\": \"study_features\", \"type\": \"array\"},\n- {\"name\": \"study_topics\", \"type\": \"array\"},\n- {\"name\": \"study_relationships\", \"type\": \"array\"},\n- {\"name\": \"linked_data_objects\", \"type\": \"array\"},\n- {\n- \"name\": \"provenance_string\",\n- \"type\": \"string\",\n- \"description\": \"A listing of the source or sources (usually a trial registry) from which the data for the study has been drawn, and the date-time(s) when the data was last downloaded\",\n- },\n- ]\n- }\n-\n-\n# Excel template\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Moved jsonschema to its own module (#1327) |
234,912 | 24.11.2022 17:32:51 | -10,800 | 2adee7f18f45a2a36274808c59da4d3b6624fc87 | Stricter "package.licenses" validation | [
{
"change_type": "MODIFY",
"old_path": "frictionless/package/package.py",
"new_path": "frictionless/package/package.py",
"diff": "@@ -529,6 +529,12 @@ class Package(Metadata):\nnote = 'property \"created\" is not valid \"datetime\"'\nyield errors.PackageError(note=note)\n+ # Licenses\n+ for item in descriptor.get(\"licenses\", []):\n+ if not item.get(\"path\") or not item.get(\"name\"):\n+ note = f'license requires \"path\" or \"name\": {item}'\n+ yield errors.PackageError(note=note)\n+\n# Contributors/Sources\nfor name in [\"contributors\", \"sources\"]:\nfor item in descriptor.get(name, []):\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/package/validate/test_general.py",
"new_path": "tests/package/validate/test_general.py",
"diff": "@@ -296,3 +296,9 @@ def test_validate_package_metadata_errors_with_fields_993():\nassert error.note == \"descriptor is not valid\"\nassert reasons[0].type == \"package-error\"\nassert reasons[0].note == '\"fields\" should be set as \"resource.schema.fields\"'\n+\n+\n+def test_package_licenses_required_path_or_name_issue_1290():\n+ descriptor = {\"resources\": [], \"licenses\": [{\"title\": \"title\"}]}\n+ report = Package.validate_descriptor(descriptor)\n+ assert report.errors[0].note.count('license requires \"path\" or \"name\"')\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Stricter "package.licenses" validation (#1333) |
234,912 | 24.11.2022 18:06:40 | -10,800 | 775b753aec2cd3788273abe187833aa7b1bac01c | Fixed BooleanField bug while reading an array | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "data/issue-1293/datapackage.json",
"diff": "+{\n+ \"name\": \"sample\",\n+ \"resources\": [\n+ {\n+ \"name\": \"sample\",\n+ \"path\": \"sample.json\",\n+ \"format\": \"json\",\n+ \"schema\": {\n+ \"fields\": [\n+ {\n+ \"name\": \"field\",\n+ \"type\": \"array\"\n+ }\n+ ]\n+ },\n+ \"profile\": \"tabular-data-resource\"\n+ }\n+ ],\n+ \"profile\": \"tabular-data-package\"\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "data/issue-1293/sample.json",
"diff": "+[\n+ {\n+ \"field\": [\"aaa\", \"bbb\"]\n+ },\n+ {\n+ \"field\": []\n+ }\n+]\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/fields/boolean.py",
"new_path": "frictionless/fields/boolean.py",
"diff": "@@ -43,6 +43,7 @@ class BooleanField(Field):\ndef value_reader(cell):\nif cell is True or cell is False:\nreturn cell\n+ if isinstance(cell, str):\nreturn mapping.get(cell)\nreturn value_reader\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/fields/test_array.py",
"new_path": "tests/fields/test_array.py",
"diff": "import pytest\n-from frictionless import Field, fields\n+from frictionless import Field, Package, fields\n# General\n@@ -61,3 +61,14 @@ def test_array_read_cell_array_item_with_constraint_error():\ncell, notes = field.read_cell('[\"val1\", \"val2\"]')\nassert cell == [\"val1\", \"val2\"]\nassert notes == {\"enum\": 'array item constraint \"enum\" is \"[\\'val1\\']\"'}\n+\n+\n+# Bugs\n+\n+\n+def test_array_unhashable_type_list_issue_1293():\n+ package = Package(\"data/issue-1293/datapackage.json\")\n+ assert package.get_resource(\"sample\").extract() == [\n+ {\"field\": [\"aaa\", \"bbb\"]},\n+ {\"field\": []},\n+ ]\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Fixed BooleanField bug while reading an array (#1334) |
234,915 | 01.12.2022 17:59:03 | -19,620 | 88d83a21c656a595c6f78d7d20c58bdfd974290e | Formatting error in resource file due to version mismatch | [
{
"change_type": "MODIFY",
"old_path": "frictionless/formats/pandas/parser.py",
"new_path": "frictionless/formats/pandas/parser.py",
"diff": "@@ -198,12 +198,12 @@ class PandasParser(Parser):\n# Mapping\nmapping = {\n- \"array\": np.dtype(list),\n+ \"array\": np.dtype(list), # type: ignore\n\"boolean\": np.dtype(bool),\n\"datetime\": pd.DatetimeTZDtype(tz=\"UTC\"),\n\"integer\": np.dtype(int),\n\"number\": np.dtype(float),\n- \"object\": np.dtype(dict),\n+ \"object\": np.dtype(dict), # type: ignore\n\"year\": np.dtype(int),\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/resource/resource.py",
"new_path": "frictionless/resource/resource.py",
"diff": "@@ -836,12 +836,15 @@ class Resource(Metadata):\ncontinue\nmatch = cells in group_lookup.get(group[\"sourceKey\"], set())\nif not match:\n- note = 'for \"%s\": values \"%s\" not found in the lookup table \"%s\" as \"%s\"' % (\n+ note = (\n+ 'for \"%s\": values \"%s\" not found in the lookup table \"%s\" as \"%s\"'\n+ % (\n\", \".join(group[\"targetKey\"]),\n\", \".join(str(d) for d in cells),\ngroup[\"sourceName\"],\n\", \".join(group[\"sourceKey\"]),\n)\n+ )\nerror = errors.ForeignKeyError.from_row(\nrow,\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Formatting error in resource file due to version mismatch (#1340) |
234,915 | 01.12.2022 18:01:57 | -19,620 | 9e8cd3815b05da7e817b51b1108764e0aea3be22 | Added sheet param to describe command
Added tests | [
{
"change_type": "MODIFY",
"old_path": "frictionless/program/describe.py",
"new_path": "frictionless/program/describe.py",
"diff": "@@ -7,6 +7,7 @@ from ..actions import describe\nfrom ..dialect import Dialect\nfrom ..system import system\nfrom .program import program\n+from .. import formats\nfrom .. import helpers\nfrom . import common\n@@ -29,6 +30,8 @@ def program_describe(\nheader_join: str = common.header_join,\ncomment_char: str = common.comment_char,\ncomment_rows: str = common.comment_rows,\n+ sheet: str = common.sheet,\n+ table: str = common.table,\n# Detector\nbuffer_size: int = common.buffer_size,\nsample_size: int = common.sample_size,\n@@ -82,11 +85,17 @@ def program_describe(\ndescriptor = helpers.parse_json_string(dialect)\nif descriptor:\nreturn Dialect.from_descriptor(descriptor)\n+ controls = []\n+ if sheet:\n+ controls.append(formats.ExcelControl(sheet=sheet))\n+ elif table:\n+ controls.append(formats.SqlControl(table=table))\nreturn Dialect.from_options(\nheader_rows=helpers.parse_csv_string(header_rows, convert=int),\nheader_join=header_join,\ncomment_char=comment_char,\ncomment_rows=helpers.parse_csv_string(comment_rows, convert=int),\n+ controls=controls,\n)\n# Prepare detector\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/program/test_describe.py",
"new_path": "tests/program/test_describe.py",
"diff": "@@ -2,7 +2,7 @@ import json\nimport yaml\nimport pytest\nfrom typer.testing import CliRunner\n-from frictionless import describe, Dialect, Detector, platform\n+from frictionless import describe, Dialect, Detector, platform, formats\nfrom frictionless.program import program\n@@ -121,6 +121,21 @@ def test_program_describe_basepath():\nassert yaml.safe_load(result.stdout) == expect.to_descriptor()\n+def test_program_describe_extract_dialect_sheet_option():\n+ actual = runner.invoke(program, \"describe data/sheet2.xls --sheet Sheet2 --json\")\n+ expect = describe(\"data/sheet2.xls\", control=formats.ExcelControl(sheet=\"Sheet2\"))\n+ assert actual.exit_code == 0\n+ assert json.loads(actual.stdout) == expect.to_descriptor()\n+\n+\[email protected](platform.type == \"windows\", reason=\"Fix on Windows\")\n+def test_program_describe_extract_dialect_table_option_sql(database_url):\n+ actual = runner.invoke(program, f\"describe {database_url} --table fruits --json\")\n+ expect = describe(database_url, control=formats.SqlControl(table=\"fruits\"))\n+ assert actual.exit_code == 0\n+ assert json.loads(actual.stdout) == expect.to_descriptor()\n+\n+\n# Bugs\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Added sheet param to describe command (#1337)
Added tests |
234,912 | 12.01.2023 10:20:14 | 0 | b515147789ffade6533b187835c9e57549a326e9 | Allow leading zeroes to `fields.Integer/NumberField` | [
{
"change_type": "MODIFY",
"old_path": "frictionless/fields/integer.py",
"new_path": "frictionless/fields/integer.py",
"diff": "@@ -44,11 +44,6 @@ class IntegerField(Field):\nif pattern:\ncell = pattern.sub(\"\", cell)\n- # Forbid leading zeroes (e.g. 001, 00, 01)\n- if self.bare_number:\n- if len(cell) > 1 and cell[0] == \"0\":\n- return None\n-\n# Cast the cell\ntry:\nreturn int(cell)\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/fields/number.py",
"new_path": "frictionless/fields/number.py",
"diff": "@@ -83,11 +83,6 @@ class NumberField(Field):\nif cell is None:\nreturn None\n- # Forbid leading zeroes (e.g. 001, 00, 01)\n- if self.bare_number:\n- if len(cell) > 1 and cell[0] == \"0\" and cell[1] != \".\":\n- return None\n-\n# Cast the cell\ntry:\nreturn Primary(cell) # type: ignore\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/actions/describe/test_resource.py",
"new_path": "tests/actions/describe/test_resource.py",
"diff": "@@ -151,13 +151,18 @@ def test_describe_resource_schema_increase_limit_issue_212():\n}\n-def test_describe_resource_values_with_leading_zeros_issue_492():\n+def test_describe_resource_values_with_leading_zeros_issue_492_1232_1364():\nresource = describe(\"data/leading-zeros.csv\")\nassert isinstance(resource, Resource)\n+ # The behaviour has been reverted in #1364 to follow Table Schema standard\n+ # assert resource.schema.to_descriptor() == {\n+ # \"fields\": [{\"name\": \"value\", \"type\": \"string\"}]\n+ # }\n+ # assert resource.read_rows() == [{\"value\": \"01\"}, {\"value\": \"002\"}, {\"value\": \"00003\"}]\nassert resource.schema.to_descriptor() == {\n- \"fields\": [{\"name\": \"value\", \"type\": \"string\"}]\n+ \"fields\": [{\"name\": \"value\", \"type\": \"integer\"}]\n}\n- assert resource.read_rows() == [{\"value\": \"01\"}, {\"value\": \"002\"}, {\"value\": \"00003\"}]\n+ assert resource.read_rows() == [{\"value\": 1}, {\"value\": 2}, {\"value\": 3}]\ndef test_describe_schema_proper_quote_issue_493():\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/actions/describe/test_schema.py",
"new_path": "tests/actions/describe/test_schema.py",
"diff": "@@ -4,7 +4,9 @@ from frictionless import Schema, describe\n# General\n-def test_describe_schema():\n+def test_describe_schema_issue_1232_1364():\nschema = describe(\"data/leading-zeros.csv\", type=\"schema\")\nassert isinstance(schema, Schema)\n- assert schema.to_descriptor() == {\"fields\": [{\"name\": \"value\", \"type\": \"string\"}]}\n+ # The behaviour has been reverted in #1364 to follow Table Schema standard\n+ # assert schema.to_descriptor() == {\"fields\": [{\"name\": \"value\", \"type\": \"string\"}]}\n+ assert schema.to_descriptor() == {\"fields\": [{\"name\": \"value\", \"type\": \"integer\"}]}\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/conftest.py",
"new_path": "tests/conftest.py",
"diff": "@@ -8,6 +8,9 @@ from dotenv import load_dotenv\nload_dotenv(\".env\")\n+# TODO: stop using the Bugs section in the tests and split them among themed categories?\n+\n+\n# Cleanups\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/fields/test_integer.py",
"new_path": "tests/fields/test_integer.py",
"diff": "@@ -13,11 +13,11 @@ from frictionless import Field\n(\"default\", 1 << 63, 1 << 63, {}),\n(\"default\", \"1\", 1, {}),\n(\"default\", 1.0, 1, {}),\n- (\"default\", \"000835\", None, {}),\n+ (\"default\", \"000835\", 835, {}),\n(\"default\", \"0\", 0, {}),\n- (\"default\", \"00\", None, {}),\n- (\"default\", \"01\", None, {}),\n- (\"default\", \" 01 \", None, {}),\n+ (\"default\", \"00\", 0, {}),\n+ (\"default\", \"01\", 1, {}),\n+ (\"default\", \" 01 \", 1, {}),\n(\"default\", \"0.0003\", None, {}),\n(\"default\", \"00\", 0, {\"bareNumber\": False}),\n(\"default\", \"01\", 1, {\"bareNumber\": False}),\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/resource/describe/test_general.py",
"new_path": "tests/resource/describe/test_general.py",
"diff": "@@ -158,12 +158,17 @@ def test_describe_resource_schema_increase_limit_issue_212():\n}\n-def test_describe_resource_values_with_leading_zeros_issue_492():\n+def test_describe_resource_values_with_leading_zeros_issue_492_1232_1364():\nresource = Resource.describe(\"data/leading-zeros.csv\")\n+ # The behaviour has been reverted in #1364 to follow Table Schema standard\n+ # assert resource.schema.to_descriptor() == {\n+ # \"fields\": [{\"name\": \"value\", \"type\": \"string\"}]\n+ # }\n+ # assert resource.read_rows() == [{\"value\": \"01\"}, {\"value\": \"002\"}, {\"value\": \"00003\"}]\nassert resource.schema.to_descriptor() == {\n- \"fields\": [{\"name\": \"value\", \"type\": \"string\"}]\n+ \"fields\": [{\"name\": \"value\", \"type\": \"integer\"}]\n}\n- assert resource.read_rows() == [{\"value\": \"01\"}, {\"value\": \"002\"}, {\"value\": \"00003\"}]\n+ assert resource.read_rows() == [{\"value\": 1}, {\"value\": 2}, {\"value\": 3}]\ndef test_describe_file_with_different_characters_name_issue_600():\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/resource/extract/test_general.py",
"new_path": "tests/resource/extract/test_general.py",
"diff": "@@ -113,14 +113,14 @@ def test_extract_resource_basepath_and_abspath_issue_856():\n]\n-def test_extract_resource_string_with_leading_zeros():\n+def test_extract_resource_string_with_leading_zeros_issue_1232_1364():\nresource = Resource(\"data/issue-1232.csv\")\nrows = resource.extract(limit_rows=1)\nassert rows == [\n{\n- \"comune\": \"030151360\",\n- \"codice_regione\": \"03\",\n- \"codice_provincia\": \"015\",\n+ \"comune\": 30151360,\n+ \"codice_regione\": 3,\n+ \"codice_provincia\": 15,\n\"codice_comune\": 1360,\n\"denominazione_comune\": \"POLPENAZZE DEL GARDA\",\n\"sigla_provincia\": \"BS\",\n"
},
{
"change_type": "MODIFY",
"old_path": "tests/schema/test_describe.py",
"new_path": "tests/schema/test_describe.py",
"diff": "@@ -4,6 +4,7 @@ from frictionless import Schema\n# General\n-def test_describe_schema():\n+def test_describe_schema_issue_1232_1364():\nschema = Schema.describe(\"data/leading-zeros.csv\")\n- assert schema.to_descriptor() == {\"fields\": [{\"name\": \"value\", \"type\": \"string\"}]}\n+ # The behaviour has been reverted in #1364 to follow Table Schema standard\n+ assert schema.to_descriptor() == {\"fields\": [{\"name\": \"value\", \"type\": \"integer\"}]}\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Allow leading zeroes to `fields.Integer/NumberField` (#1377) |
234,916 | 23.01.2023 12:42:25 | -3,600 | d8206e6184b7b8fe6fab3e4486de71f451f4df25 | Typos on parquet doc | [
{
"change_type": "MODIFY",
"old_path": "docs/formats/parquet.md",
"new_path": "docs/formats/parquet.md",
"diff": "@@ -14,7 +14,7 @@ pip install 'frictionless[parquet]' # for zsh shell\n## Reading Data\n-You can read a Pandas dataframe:\n+You can read a Parquet file:\n```python script tabs=Python\nfrom frictionless import Resource\n@@ -25,7 +25,7 @@ print(resource.read_rows())\n## Writing Data\n-You can write a dataset to Pandas:\n+You can write a dataset to Parquet:\n```python script tabs=Python\nfrom frictionless import Resource\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Typos on parquet doc (#1391) |
234,893 | 30.01.2023 13:06:06 | -3,600 | 82b7162210d25a83e8e2cd10587be194f5c8614a | Update a CKAN dataset using the package name | [
{
"change_type": "MODIFY",
"old_path": "frictionless/portals/ckan/adapter.py",
"new_path": "frictionless/portals/ckan/adapter.py",
"diff": "@@ -142,11 +142,16 @@ class CkanAdapter(Adapter):\n# Assure that the package has a name\nif \"name\" not in package_data:\n- note = \"Your package has no name. CKAN requires a name to publish a package\"\n+ if not self.control.dataset:\n+ note = (\n+ \"Your package has no name. CKAN requires a name to publish a package\"\n+ )\nraise FrictionlessException(note)\n+ else:\n+ package_data[\"name\"] = self.control.dataset\n# if \"id\" exist and control is set to allow updates, try to update dataset\n- if \"id\" in package_data and self.control.allow_update:\n+ if self.control.allow_update:\nendpoint = f\"{baseurl}/api/action/package_update\"\ntry:\n"
},
{
"change_type": "MODIFY",
"old_path": "frictionless/portals/ckan/control.py",
"new_path": "frictionless/portals/ckan/control.py",
"diff": "@@ -19,7 +19,7 @@ class CkanControl(Control):\ndataset: Optional[str] = None\n\"\"\"\n- Unique identifier of the dataset to read.\n+ Unique identifier of the dataset to read or write.\n\"\"\"\napikey: Optional[str] = None\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Update a CKAN dataset using the package name (#1403) |
234,915 | 03.02.2023 22:24:56 | -19,620 | c95ce156ef776962d13bbbbb9beed9d1548ccebe | Skip test for index feature | [
{
"change_type": "MODIFY",
"old_path": "tests/resource/index/test_general.py",
"new_path": "tests/resource/index/test_general.py",
"diff": "@@ -26,6 +26,7 @@ def test_resource_index_sqlite(database_url):\n# Fast\[email protected](reason=\"issue-1408\")\[email protected](\"database_url\", database_urls)\ndef test_resource_index_sqlite_fast(database_url):\nresource = Resource(\"data/table.csv\")\n@@ -39,6 +40,7 @@ def test_resource_index_sqlite_fast(database_url):\n# Fallback\[email protected](reason=\"issue-1408\")\[email protected](\"database_url\", database_urls)\ndef test_resource_index_sqlite_fast_with_use_fallback(database_url):\nresource = Resource(\"data/table.csv\")\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Skip test for index feature (#1409) |
234,915 | 03.02.2023 22:27:44 | -19,620 | a04c710de0d252a91ecb0e6fe7a88d9849d7700b | Replace to_sql with publish in documentation | [
{
"change_type": "MODIFY",
"old_path": "docs/formats/sql.md",
"new_path": "docs/formats/sql.md",
"diff": "@@ -41,7 +41,7 @@ You can write SQL databases:\nfrom frictionless import Package\npackage = Package('path/to/datapackage.json')\n-package.to_sql('postgresql://database')\n+package.publish('postgresql://database')\n```\n## Configuration\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Replace to_sql with publish in documentation (#1412) |
234,915 | 07.02.2023 23:48:05 | -19,620 | bcc8a1f9c64743b65e7a104556dd52648342927b | Update contributing document
* Update contributing document
Add info about reproducing the cassettes locally
* Added steps to reproduce cassettes | [
{
"change_type": "MODIFY",
"old_path": "CONTRIBUTING.md",
"new_path": "CONTRIBUTING.md",
"diff": "@@ -90,3 +90,57 @@ To release a new version:\n- add changes to `CHANGELOG.md` if it's not a patch release (major or micro)\n- run `make release` which create a release commit and tag and push it to Github\n- an actual release will happen on the Travis CI platform after running the tests\n+\n+## Running tests offline(HTTP requests) with VCR\n+VCR library records the response from HTTP requests locally as cassette in its first run. All subsequent calls are run using recorded metadata\n+from previous HTTP request, so it speeds up the testing process. To record a unit test(as cassette), we mark it with a decorator:\n+\n+```python\[email protected]\n+def test_connect_with_server():\n+ pass\n+```\n+\n+Cassettee will be recorded as \"test_connect_with_server.yaml\". A new call is made when params change. To skip sensitive data,\n+we can use filters:\n+\n+```python\[email protected](scope=\"module\")\n+def vcr_config():\n+ return {\"filter_headers\": [\"authorization\"]}\n+```\n+\n+### Regenerating cassettes for CKAN\n+- Setup CKAN local instance.\n+- Create a sysadmin account and generate api token.\n+- Set apikey token in .env file\n+```\n+CKAN_APIKEY=***************************\n+```\n+### Regenerating cassettes for Zenodo\n+**Read**\n+- To read, we need to use live site, the api library uses it by default.\n+- Login to zenodo if you have an account and create an access token.\n+- Set access token in .env file.\n+```\n+ZENODO_ACCESS_TOKEN=***************************\n+```\n+**Write**\n+- To write we can use either live site or sandbox. We recommend to use sandbox (https://sandbox.zenodo.org/api/).\n+- Login to zenodo(sandbox) if you have an account and create an access token.\n+- Set access token in .env file.\n+```\n+ZENODO_SANDBOX_ACCESS_TOKEN=***************************\n+```\n+- Set base_url in the control params\n+```\n+base_url='base_url=\"https://sandbox.zenodo.org/api/'\n+```\n+### Regenerating cassettes for Github\n+- Login to github if you have an account and create an access token(Developer settings > Personal access tokens > Tokens).\n+- Set access token and other details in .env file. If email/name of the user is hidden we need to provide those details as well.\n+```\n+GITHUB_NAME=FD\[email protected]\n+GITHUB_ACCESS_TOKEN=***************************\n+```\n"
}
]
| Python | MIT License | frictionlessdata/frictionless-py | Update contributing document (#1415)
* Update contributing document
Add info about reproducing the cassettes locally
* Added steps to reproduce cassettes |
714,133 | 15.04.2017 20:22:08 | 14,400 | 5f4f23167240f6323b51133dc4f777cb65759892 | added some checkpoints. | [
{
"change_type": "MODIFY",
"old_path": "src/checkpoints.cpp",
"new_path": "src/checkpoints.cpp",
"diff": "@@ -37,6 +37,14 @@ namespace Checkpoints\n( 219912, uint256(\"0x00000000010751365b77b28dc6af3c33e6c620e45a166c659a2056dc7cb3af0a\"))\n( 222222, uint256(\"0x00000000003c92cf2938d35cf4006fc21a251d82456780cafb43ab908eef9aff\"))\n( 244219, uint256(\"0x000000000139613d26f7436ecc568feb566c22d9a664359e53f0d0a542d5bdba\"))\n+ ( 400000, uint256(\"0x0000000001d45af6613024ad5668bfa4909ac63e2b29c28042013d77a216830d\"))\n+ ( 500000, uint256(\"0x0000000003700a4e9d81a67036d7647361086527e985cdf764648c5e61d07303\"))\n+ ( 600000, uint256(\"0x30fa1eab961c99f6222f9925a27136c34ea27182c92e4f8c48ea3a90c7c2eb25\"))\n+ ( 700000, uint256(\"0x3e4f3319706870bb149d1a976202c2a5e973384d181a600e7be59cbab5b63132\"))\n+ ( 800000, uint256(\"0xf6b5f222bcc2f4e2439ccf6050d4ea3e9517c3752c3247302f039822ac9cc870\"))\n+ ( 900000, uint256(\"0xc4d8b4079da888985854eda0200fb57045c2c70b29f10e98543f7c4076129e91\"))\n+ ( 1000000, uint256(\"0x000000000049eaba3d6c29d9f45bc2a944b46eec005e2b038f1ee924f2f9c029\"))\n+ ( 1100000, uint256(\"0xc766387a2e0cd6af995ea432518614824fe313e988598ea8b26f58efb99ebcdc\"))\n;\nstatic MapCheckpoints mapCheckpointsTestnet =\n"
}
]
| C++ | MIT License | vergecurrency/verge | added some checkpoints. |
714,098 | 17.04.2017 03:09:25 | 14,400 | b95e156812ed9f3840860537f47dface7c8f19af | mac updates for travis build
c/o | [
{
"change_type": "MODIFY",
"old_path": ".travis.yml",
"new_path": ".travis.yml",
"diff": "@@ -19,7 +19,7 @@ matrix:\nfile: 'release_windows.zip'\n- os: osx\n- osx_image: xcode7.2\n+ osx_image: xcode7.3\nenv: VERGE_PLATFORM='mac'\ncompiler: clang\nfile: 'release_mac.zip'\n"
},
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "____ _________________________ ________ ___________\n\\ \\ / /\\_ _____/\\______ \\ / _____/ \\_ _____/\n\\ Y / | __)_ | _// \\ ___ | __)_\n- \\ / | \\ | | \\\\ \\_\\ \\ | \\ 2016 VERGE/XVG\n+ \\ / | \\ | | \\\\ \\_\\ \\ | \\ 2017 VERGE/XVG\n\\___/ /_______ / |____|_ / \\______ //_______ /\n\\/ \\/ \\/ \\/\n```\n"
},
{
"change_type": "MODIFY",
"old_path": "building/mac/requirements.sh",
"new_path": "building/mac/requirements.sh",
"diff": "-brew install protobuf boost miniupnpc openssl qrencode berkeley-db4\n-brew uninstall qt qt5 qt55 qt52 > /dev/null 2>&1\n-\n-# This next part is to \"install\" just the necessary parts of the qt5 library\n-cd /tmp\n-wget -q https://download.qt.io/official_releases/qt/5.4/5.4.2/qt-opensource-mac-x64-clang-5.4.2.dmg\n-hdiutil attach -nobrowse /tmp/qt-opensource-mac-x64-clang-5.4.2.dmg\n-cd /Volumes/qt-opensource-mac-x64-clang-5.4.2/qt-opensource-mac-x64-clang-5.4.2.app/Contents/MacOS/\n-mkdir -p /usr/local/qt5\n-./qt-opensource-mac-x64-clang-5.4.2 --runoperation Extract installer://qt.54.clang_64/5.4.2-0qt5_addons.7z /usr/local/qt5 > /dev/null\n-./qt-opensource-mac-x64-clang-5.4.2 --runoperation Extract installer://qt.54.clang_64/5.4.2-0qt5_essentials.7z /usr/local/qt5 > /dev/null\n-./qt-opensource-mac-x64-clang-5.4.2 --runoperation Extract installer://qt.54.qtwebengine.clang_64/5.4.2-0qt5_qtwebengine.7z /usr/local/qt5 > /dev/null\n-./qt-opensource-mac-x64-clang-5.4.2 --runoperation Extract installer://qt.extras.qtcanvas3d.10.src/1.0.0-2qtcanvas3d-opensource-src-1.0.0.7z /usr/local/qt5 > /dev/null\n-./qt-opensource-mac-x64-clang-5.4.2 --runoperation Extract installer://qt.extras.qtwebview.10.src/1.0.0-2qtwebview-opensource-src-1.0.0.7z /usr/local/qt5 > /dev/null\n-./qt-opensource-mac-x64-clang-5.4.2 --runoperation Extract installer://qt.extras.qtwebview.qt54.clang_64/1.0.0-2qt5_qtwebview.7z /usr/local/qt5 > /dev/null\n-./qt-opensource-mac-x64-clang-5.4.2 --runoperation Extract installer://qt.license.thirdparty/1.0.0ThirdPartySoftware_Listing.7z /usr/local/qt5 > /dev/null\n-./qt-opensource-mac-x64-clang-5.4.2 --runoperation Extract installer://qt.license.thirdparty/1.0.0fdl_license.7z /usr/local/qt5 > /dev/null\n-./qt-opensource-mac-x64-clang-5.4.2 --runoperation QtPatch mac /usr/local/qt5/5.4/clang_64 qt5 > /dev/null\n-cd /tmp\n-# unmount volume\n-hdiutil detach /Volumes/qt-opensource-mac-x64-clang-5.4.2\n+#brew install boost pkg-config\n+brew uninstall qt5\n+brew install protobuf miniupnpc openssl qrencode berkeley-db4\n+# Might need these later: libevent librsvg\n+curl -O https://raw.githubusercontent.com/Homebrew/homebrew-core/fdfc724dd532345f5c6cdf47dc43e99654e6a5fd/Formula/qt5.rb\n+brew install ./qt5.rb\n+brew link --force qt5\n"
}
]
| C++ | MIT License | vergecurrency/verge | mac updates for travis build
c/o @mkinney |
714,098 | 23.04.2017 21:34:35 | 14,400 | 8d61a73cac6cb129786987130c86e7e82ff4a6e3 | cleaned up
wasn't accurate. | [
{
"change_type": "MODIFY",
"old_path": "src/main.h",
"new_path": "src/main.h",
"diff": "@@ -36,7 +36,7 @@ static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100;\nstatic const unsigned int MAX_INV_SZ = 50000;\nstatic const int64 MIN_TX_FEE = 10 * CENT;\nstatic const int64 MIN_RELAY_TX_FEE = 10 * CENT;\n-static const int64 MAX_MONEY = 16555000000 * COIN; // 50,000,000 initial coins, no effecive limit\n+static const int64 MAX_MONEY = 16555000000 * COIN; //\nstatic const int DISABLE_POS_BLOCK = 1;\nstatic const int64 MIN_TXOUT_AMOUNT = MIN_TX_FEE;\n"
}
]
| C++ | MIT License | vergecurrency/verge | cleaned up
wasn't accurate. |
714,098 | 30.04.2017 22:59:32 | 14,400 | 696201614acccf8fe84404552e36ed8e7cf3c2bb | add swap file info | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -42,7 +42,7 @@ Binary (pre-compiled) wallets are available on all platforms at [http://vergecur\nCompiling Linux Wallet on Ubuntu/Debian\n----------------------\n-Step 1. Install the depencies.\n+Step 1. Install the dependencies.\n```sudo add-apt-repository ppa:bitcoin/bitcoin```\n@@ -56,6 +56,7 @@ Step 2. Clone the git repository and compile the daemon and gui wallet:\n```git clone https://github.com/vergecurrency/verge && cd verge && ./autogen.sh && ./configure && make```\n+**Note**: If you get a \"memory exhausted\" error, make a swap file. (https://www.digitalocean.com/community/tutorials/how-to-add-swap-space-on-ubuntu-16-04)\nUsing the wallet:\n----\n"
}
]
| C++ | MIT License | vergecurrency/verge | add swap file info |
714,098 | 06.05.2017 19:15:17 | 14,400 | 6319fe1796b19dcfda8a00d0e86e14c8a684025c | added blockchain download link | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -179,6 +179,9 @@ Want to use Docker?\nCheck out the [readme](https://github.com/vergecurrency/VERGE/tree/master/contrib/docker) for more information. [Official VERGE docker images](https://hub.docker.com/r/vergecurrency/verge/)\n+Want to to download the blockchain instead of waiting/syncing? (quicker)\n+------------\n+download this .zip file, and extract it to your verge data directory: http://108.61.216.160/cryptochainer.chains/chains/Verge_blockchain.zip\nWant to 'solo-mine' from the wallet?\n----------\n"
}
]
| C++ | MIT License | vergecurrency/verge | added blockchain download link |
714,098 | 01.06.2017 01:37:17 | 14,400 | ad111d0530174d536326308572edff52361f40df | some ui tweaks for next release | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/addressbookpage.ui",
"new_path": "src/qt/forms/addressbookpage.ui",
"diff": "<property name=\"toolTip\">\n<string>Double-click to edit address or label</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;</string>\n+ </property>\n<property name=\"tabKeyNavigation\">\n<bool>false</bool>\n</property>\n<property name=\"toolTip\">\n<string>Create a new address</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-width: 95px;\n+max-width: 95px;</string>\n+ </property>\n<property name=\"text\">\n<string>&New Address</string>\n</property>\n<property name=\"toolTip\">\n<string>Copy the currently selected address to the system clipboard</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-width: 95px;\n+max-width: 95px;</string>\n+ </property>\n<property name=\"text\">\n<string>&Copy Address</string>\n</property>\n</item>\n<item>\n<widget class=\"QPushButton\" name=\"showQRCode\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-width: 95px;\n+max-width: 95px;</string>\n+ </property>\n<property name=\"text\">\n<string>Show &QR Code</string>\n</property>\n<property name=\"toolTip\">\n<string>Sign a message to prove you own a VERGE address</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-width: 95px;\n+max-width: 95px;</string>\n+ </property>\n<property name=\"text\">\n<string>Sign &Message</string>\n</property>\n<property name=\"toolTip\">\n<string>Verify a message to ensure it was signed with a specified VERGE address</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-width: 95px;\n+max-width: 95px;</string>\n+ </property>\n<property name=\"text\">\n<string>&Verify Message</string>\n</property>\n<property name=\"toolTip\">\n<string>Delete the currently selected address from the list</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-width: 95px;\n+max-width: 95px;</string>\n+ </property>\n<property name=\"text\">\n<string>&Delete</string>\n</property>\n<verstretch>0</verstretch>\n</sizepolicy>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-width: 85px;\n+max-width: 85px;</string>\n+ </property>\n<property name=\"standardButtons\">\n<set>QDialogButtonBox::Ok</set>\n</property>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/askpassphrasedialog.ui",
"new_path": "src/qt/forms/askpassphrasedialog.ui",
"diff": "</item>\n<item row=\"0\" column=\"1\">\n<widget class=\"QLineEdit\" name=\"passEdit1\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"echoMode\">\n<enum>QLineEdit::Password</enum>\n</property>\n</item>\n<item row=\"1\" column=\"1\">\n<widget class=\"QLineEdit\" name=\"passEdit2\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"echoMode\">\n<enum>QLineEdit::Password</enum>\n</property>\n</item>\n<item row=\"2\" column=\"1\">\n<widget class=\"QLineEdit\" name=\"passEdit3\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"echoMode\">\n<enum>QLineEdit::Password</enum>\n</property>\n</item>\n<item>\n<widget class=\"QDialogButtonBox\" name=\"buttonBox\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+</string>\n+ </property>\n<property name=\"orientation\">\n<enum>Qt::Horizontal</enum>\n</property>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/blockbrowser.ui",
"new_path": "src/qt/forms/blockbrowser.ui",
"diff": "</item>\n<item row=\"12\" column=\"1\">\n<widget class=\"QPushButton\" name=\"txButton\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"text\">\n<string>Decode Transaction</string>\n</property>\n<verstretch>0</verstretch>\n</sizepolicy>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"maximum\">\n<number>99999999</number>\n</property>\n</item>\n<item row=\"1\" column=\"1\">\n<widget class=\"QPushButton\" name=\"blockButton\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"text\">\n<string>Jump to Block</string>\n</property>\n<verstretch>0</verstretch>\n</sizepolicy>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"inputMask\">\n<string comment=\"Transaction id\" extracomment=\"Transaction id\"/>\n</property>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/chatwindow.ui",
"new_path": "src/qt/forms/chatwindow.ui",
"diff": "<verstretch>0</verstretch>\n</sizepolicy>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 175px;\n+max-width: 175px;</string>\n+ </property>\n<property name=\"text\">\n<string/>\n</property>\n</property>\n<property name=\"minimumSize\">\n<size>\n- <width>100</width>\n- <height>20</height>\n+ <width>129</width>\n+ <height>29</height>\n</size>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 125px;\n+max-width: 125px;</string>\n+ </property>\n<property name=\"text\">\n<string>Connect</string>\n</property>\n</property>\n<property name=\"minimumSize\">\n<size>\n- <width>0</width>\n- <height>30</height>\n+ <width>154</width>\n+ <height>29</height>\n</size>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 150px;\n+max-width: 150px;</string>\n+ </property>\n<property name=\"text\">\n<string>Disconnect</string>\n</property>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/editaddressdialog.ui",
"new_path": "src/qt/forms/editaddressdialog.ui",
"diff": "<property name=\"toolTip\">\n<string>The label associated with this address book entry</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n</widget>\n</item>\n<item row=\"1\" column=\"0\">\n<property name=\"toolTip\">\n<string>The address associated with this address book entry. This can only be modified for sending addresses.</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n</widget>\n</item>\n</layout>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/i2poptionswidget.ui",
"new_path": "src/qt/forms/i2poptionswidget.ui",
"diff": "<verstretch>0</verstretch>\n</sizepolicy>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 125px;\n+max-width: 125px;</string>\n+ </property>\n<property name=\"text\">\n<string>127.0.0.1</string>\n</property>\n</property>\n<property name=\"minimumSize\">\n<size>\n- <width>0</width>\n- <height>0</height>\n+ <width>129</width>\n+ <height>29</height>\n</size>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 125px;\n+max-width: 125px;</string>\n+ </property>\n<property name=\"text\">\n<string>Verge-client</string>\n</property>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/optionsdialog.ui",
"new_path": "src/qt/forms/optionsdialog.ui",
"diff": "<enum>QTabWidget::North</enum>\n</property>\n<property name=\"currentIndex\">\n- <number>0</number>\n+ <number>3</number>\n</property>\n<widget class=\"QWidget\" name=\"tabMain\">\n<attribute name=\"title\">\n</widget>\n</item>\n<item>\n- <widget class=\"BitcoinAmountField\" name=\"transactionFee\"/>\n+ <widget class=\"BitcoinAmountField\" name=\"transactionFee\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 15px;\n+max-height: 15px;\n+min-width: 50px;\n+max-width: 50px;</string>\n+ </property>\n+ </widget>\n</item>\n<item>\n<spacer name=\"horizontalSpacer_Main\">\n<widget class=\"QValidatedLineEdit\" name=\"proxyIp\">\n<property name=\"maximumSize\">\n<size>\n- <width>140</width>\n- <height>16777215</height>\n+ <width>154</width>\n+ <height>29</height>\n</size>\n</property>\n<property name=\"toolTip\">\n<string>IP address of the proxy (e.g. 127.0.0.1)</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 150px;\n+max-width: 150px;</string>\n+ </property>\n</widget>\n</item>\n<item>\n<widget class=\"QLineEdit\" name=\"proxyPort\">\n<property name=\"maximumSize\">\n<size>\n- <width>55</width>\n- <height>16777215</height>\n+ <width>84</width>\n+ <height>29</height>\n</size>\n</property>\n<property name=\"toolTip\">\n<string>Port of the proxy (e.g. 9050)</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 80px;\n+max-width: 80px;</string>\n+ </property>\n</widget>\n</item>\n<item>\n<property name=\"toolTip\">\n<string>SOCKS version of the proxy (e.g. 5)</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 80px;\n+max-width: 80px;</string>\n+ </property>\n</widget>\n</item>\n<item>\n<property name=\"toolTip\">\n<string>The user interface language can be set here. This setting will take effect after restarting VERGE.</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 300px;\n+max-width: 300px;</string>\n+ </property>\n</widget>\n</item>\n</layout>\n<property name=\"toolTip\">\n<string>Choose the default subdivision unit to show in the interface and when sending coins.</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 100px;\n+max-width: 100px;</string>\n+ </property>\n</widget>\n</item>\n</layout>\n</item>\n<item>\n<widget class=\"QPushButton\" name=\"okButton\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 100px;\n+max-width: 100px;</string>\n+ </property>\n<property name=\"text\">\n<string>&OK</string>\n</property>\n</item>\n<item>\n<widget class=\"QPushButton\" name=\"cancelButton\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 100px;\n+max-width: 100px;</string>\n+ </property>\n<property name=\"text\">\n<string>&Cancel</string>\n</property>\n</item>\n<item>\n<widget class=\"QPushButton\" name=\"applyButton\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 100px;\n+max-width: 100px;</string>\n+ </property>\n<property name=\"text\">\n<string>&Apply</string>\n</property>\n<class>BitcoinAmountField</class>\n<extends>QSpinBox</extends>\n<header>bitcoinamountfield.h</header>\n+ <container>1</container>\n</customwidget>\n<customwidget>\n<class>QValueComboBox</class>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/qrcodedialog.ui",
"new_path": "src/qt/forms/qrcodedialog.ui",
"diff": "<property name=\"minimumSize\">\n<size>\n<width>0</width>\n- <height>50</height>\n+ <height>49</height>\n</size>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 45px;\n+max-height: 45px;</string>\n+ </property>\n<property name=\"tabChangesFocus\">\n<bool>true</bool>\n</property>\n</widget>\n</item>\n<item row=\"1\" column=\"1\">\n- <widget class=\"QLineEdit\" name=\"lnLabel\"/>\n+ <widget class=\"QLineEdit\" name=\"lnLabel\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n+ </widget>\n</item>\n<item row=\"2\" column=\"0\">\n<widget class=\"QLabel\" name=\"lblMessage\">\n</widget>\n</item>\n<item row=\"2\" column=\"1\">\n- <widget class=\"QLineEdit\" name=\"lnMessage\"/>\n+ <widget class=\"QLineEdit\" name=\"lnMessage\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n+ </widget>\n</item>\n<item row=\"0\" column=\"0\">\n<widget class=\"QLabel\" name=\"lblAmount\">\n<property name=\"minimumSize\">\n<size>\n<width>80</width>\n- <height>0</height>\n+ <height>29</height>\n</size>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n</widget>\n</item>\n</layout>\n</item>\n<item>\n<widget class=\"QPushButton\" name=\"btnSaveAs\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+min-width: 100px;\n+max-width: 100px;</string>\n+ </property>\n<property name=\"text\">\n<string>&Save As...</string>\n</property>\n<class>BitcoinAmountField</class>\n<extends>QSpinBox</extends>\n<header>bitcoinamountfield.h</header>\n+ <container>1</container>\n</customwidget>\n</customwidgets>\n<resources/>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/rpcconsole.ui",
"new_path": "src/qt/forms/rpcconsole.ui",
"diff": "<item>\n<widget class=\"QTabWidget\" name=\"tabWidget\">\n<property name=\"currentIndex\">\n- <number>0</number>\n+ <number>1</number>\n</property>\n<widget class=\"QWidget\" name=\"tab_info\">\n<attribute name=\"title\">\n<property name=\"toolTip\">\n<string>Open the VERGE debug log file from the current data directory. This can take a few seconds for large log files.</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"text\">\n<string>&Open</string>\n</property>\n<height>100</height>\n</size>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;</string>\n+ </property>\n<property name=\"readOnly\">\n<bool>true</bool>\n</property>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/sendcoinsentry.ui",
"new_path": "src/qt/forms/sendcoinsentry.ui",
"diff": "</widget>\n</item>\n<item row=\"5\" column=\"1\">\n- <widget class=\"BitcoinAmountField\" name=\"payAmount\"/>\n+ <widget class=\"BitcoinAmountField\" name=\"payAmount\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n+ </widget>\n</item>\n<item row=\"4\" column=\"1\">\n<layout class=\"QHBoxLayout\" name=\"horizontalLayout_2\">\n<property name=\"toolTip\">\n<string>Enter a label for this address to add it to your address book</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n</widget>\n</item>\n</layout>\n<property name=\"toolTip\">\n<string>The address to send the payment to (e.g. 4Zo1ga6xuKuQ7JV7M9rGDoxdbYwV5zgQJ5)</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"maxLength\">\n<number>34</number>\n</property>\n<property name=\"toolTip\">\n<string>Choose address from address book</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"text\">\n<string/>\n</property>\n<property name=\"toolTip\">\n<string>Paste address from clipboard</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"text\">\n<string/>\n</property>\n<property name=\"toolTip\">\n<string>Remove this recipient</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"text\">\n<string/>\n</property>\n</layout>\n</widget>\n<customwidgets>\n- <customwidget>\n- <class>QValidatedLineEdit</class>\n- <extends>QLineEdit</extends>\n- <header>qvalidatedlineedit.h</header>\n- </customwidget>\n<customwidget>\n<class>BitcoinAmountField</class>\n- <extends>QLineEdit</extends>\n+ <extends>QSpinBox</extends>\n<header>bitcoinamountfield.h</header>\n<container>1</container>\n</customwidget>\n+ <customwidget>\n+ <class>QValidatedLineEdit</class>\n+ <extends>QLineEdit</extends>\n+ <header>qvalidatedlineedit.h</header>\n+ </customwidget>\n</customwidgets>\n<resources>\n<include location=\"../bitcoin.qrc\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/showi2paddresses.ui",
"new_path": "src/qt/forms/showi2paddresses.ui",
"diff": "<verstretch>3</verstretch>\n</sizepolicy>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 1px solid #000000;\n+min-height: 150px;\n+max-height: 150px;</string>\n+ </property>\n<property name=\"readOnly\">\n<bool>true</bool>\n</property>\n<verstretch>2</verstretch>\n</sizepolicy>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 1px solid #000000;\n+min-height: 125px;\n+max-height: 125px;</string>\n+ </property>\n<property name=\"readOnly\">\n<bool>true</bool>\n</property>\n<property name=\"acceptDrops\">\n<bool>false</bool>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"readOnly\">\n<bool>true</bool>\n</property>\n<layout class=\"QHBoxLayout\" name=\"horizontalLayout\">\n<item>\n<widget class=\"QPushButton\" name=\"privButton\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border: 1px solid #000000;\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+min-width: 100px;\n+max-height: 100px;</string>\n+ </property>\n<property name=\"text\">\n<string>Copy "mydestination" parameter\nto the clipboard</string>\n@@ -105,6 +141,15 @@ to the clipboard</string>\n</item>\n<item>\n<widget class=\"QPushButton\" name=\"pubButton\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border: 1px solid #000000;\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+min-width: 100px;\n+max-height: 100px;</string>\n+ </property>\n<property name=\"text\">\n<string>Copy public address\nto the clipboard</string>\n@@ -113,6 +158,15 @@ to the clipboard</string>\n</item>\n<item>\n<widget class=\"QPushButton\" name=\"b32Button\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border: 1px solid #000000;\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+min-width: 100px;\n+max-height: 100px;</string>\n+ </property>\n<property name=\"text\">\n<string>Copy b32-address\nto the clipboard</string>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/signverifymessagedialog.ui",
"new_path": "src/qt/forms/signverifymessagedialog.ui",
"diff": "<property name=\"toolTip\">\n<string>The address to sign the message with (e.g. 4Zo1ga6xuKuQ7JV7M9rGDoxdbYwV5zgQJ5)</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"maxLength\">\n<number>34</number>\n</property>\n<property name=\"toolTip\">\n<string>Choose an address from the address book</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+</string>\n+ </property>\n<property name=\"text\">\n<string/>\n</property>\n<property name=\"toolTip\">\n<string>Paste address from clipboard</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;</string>\n+ </property>\n<property name=\"text\">\n<string/>\n</property>\n<property name=\"toolTip\">\n<string>Enter the message you want to sign here</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 150px;\n+max-height: 150px;</string>\n+ </property>\n</widget>\n</item>\n<item>\n<italic>true</italic>\n</font>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n<property name=\"readOnly\">\n<bool>true</bool>\n</property>\n<property name=\"toolTip\">\n<string>Copy the current signature to the system clipboard</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+\n+\n+</string>\n+ </property>\n<property name=\"text\">\n<string/>\n</property>\n<property name=\"toolTip\">\n<string>Sign the message to prove you own this VERGE address</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 1px solid #000000;\n+min-width: 100px;\n+max-width: 100px;\n+</string>\n+ </property>\n<property name=\"text\">\n<string>&Sign Message</string>\n</property>\n<property name=\"toolTip\">\n<string>Reset all sign message fields</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 1px solid #000000;\n+min-width: 90px;\n+max-width: 90px;</string>\n+ </property>\n<property name=\"text\">\n<string>Clear &All</string>\n</property>\n<property name=\"toolTip\">\n<string>The address the message was signed with (e.g. 4Zo1ga6xuKuQ7JV7M9rGDoxdbYwV5zgQJ5)</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;\n+</string>\n+ </property>\n<property name=\"maxLength\">\n<number>34</number>\n</property>\n<property name=\"toolTip\">\n<string>Choose an address from the address book</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+\n+\n+</string>\n+ </property>\n<property name=\"text\">\n<string/>\n</property>\n</layout>\n</item>\n<item>\n- <widget class=\"QPlainTextEdit\" name=\"messageIn_VM\"/>\n+ <widget class=\"QPlainTextEdit\" name=\"messageIn_VM\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 150px;\n+max-height: 150px;</string>\n+ </property>\n+ </widget>\n</item>\n<item>\n- <widget class=\"QValidatedLineEdit\" name=\"signatureIn_VM\"/>\n+ <widget class=\"QValidatedLineEdit\" name=\"signatureIn_VM\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n+ </widget>\n</item>\n<item>\n<layout class=\"QHBoxLayout\" name=\"horizontalLayout_2_VM\">\n<property name=\"toolTip\">\n<string>Verify the message to ensure it was signed with the specified VERGE address</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 1px solid #000000;\n+min-width: 100px;\n+max-width: 100px;\n+</string>\n+ </property>\n<property name=\"text\">\n<string>&Verify Message</string>\n</property>\n<property name=\"toolTip\">\n<string>Reset all verify message fields</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 1px solid #000000;\n+min-width: 100px;\n+max-width: 100px;\n+</string>\n+ </property>\n<property name=\"text\">\n<string>Clear &All</string>\n</property>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/transactiondescdialog.ui",
"new_path": "src/qt/forms/transactiondescdialog.ui",
"diff": "<property name=\"toolTip\">\n<string>This pane shows a detailed description of the transaction</string>\n</property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 1px solid #000000;\n+min-height: 225px;\n+max-height: 225px;\n+</string>\n+ </property>\n<property name=\"readOnly\">\n<bool>true</bool>\n</property>\n"
}
]
| C++ | MIT License | vergecurrency/verge | some ui tweaks for next release |
714,133 | 17.06.2017 20:48:25 | 14,400 | 042ebaee6e6e1917c0c09a7e34bd7642c73f2203 | edit
edit and test for discord repository announcements | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -34,7 +34,7 @@ Specifications:\nTotal Supply\n------------\n-Approximately total reward: 16.5 Billion\n+Approximately total reward cap: 16.5 Billion\nBinary (pre-compiled) wallets are available on all platforms at [http://vergecurrency.com](http://vergecurrency.com/#wallets-top)\n"
}
]
| C++ | MIT License | vergecurrency/verge | edit
edit and test for discord repository announcements |
714,133 | 18.06.2017 21:49:30 | 14,400 | 1372f52dd7c0f63c8af095001c16e83952e50d1c | added vergecurrency.de | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -181,7 +181,9 @@ Check out the [readme](https://github.com/vergecurrency/VERGE/tree/master/contri\nWant to to download the blockchain instead of waiting/syncing? (quicker)\n------------\n-download this .zip file, and extract it to your verge data directory: http://108.61.216.160/cryptochainer.chains/chains/Verge_blockchain.zip\n+download this .zip file, and extract it to your verge data directory:\n+http://vergecurrency.de (follow the easy HOW TO instructions!)\n+http://108.61.216.160/cryptochainer.chains/chains/Verge_blockchain.zip\nWant to 'solo-mine' from the wallet?\n----------\n"
}
]
| C++ | MIT License | vergecurrency/verge | added vergecurrency.de |
714,133 | 20.06.2017 02:14:35 | 14,400 | 84aa905631edb133143bb56f3e6deb17f782f71f | update binary locations. | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -36,7 +36,7 @@ Total Supply\nApproximately total reward cap: 16.5 Billion\n-Binary (pre-compiled) wallets are available on all platforms at [http://vergecurrency.com](http://vergecurrency.com/#wallets-top)\n+Binary (pre-compiled) wallets are available on all platforms at [https://vergecurrency.com](https://vergecurrency.com/#wallets)\nCompiling Linux Wallet on Ubuntu/Debian\n"
}
]
| C++ | MIT License | vergecurrency/verge | update binary locations. |
714,108 | 21.07.2017 07:32:35 | 14,400 | f2f84091273119e799d8e89a26f8e0bbbd2d942c | Create go.sh
same deployement than raspi but adapted for linux desktop | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "go.sh",
"diff": "+#// full deployement : run sh go.sh\n+cd ~\n+sudo dd if=/dev/zero of=/swapfile1 bs=1024 count=524288\n+sudo mkswap /swapfile1\n+sudo chown root:root /swapfile1\n+sudo chmod 0600 /swapfile1\n+sudo swapon /swapfile1\n+\n+sudo apt-get -y install software-properties-common\n+\n+sudo add-apt-repository ppa:bitcoin/bitcoin\n+\n+sudo apt-get update\n+\n+sudo apt-get install libcanberra-gtk-module\n+\n+sudo apt-get -y install git libdb4.8-dev libdb4.8++-dev\n+\n+sudo apt-get -y install git build-essential libtool autotools-dev autoconf automake pkg-config libssl-dev libevent-dev bsdmainutils git libprotobuf-dev protobuf-compiler libqrencode-dev\n+\n+sudo apt-get -y install libqt5gui5 libqt5core5a libqt5webkit5-dev libqt5dbus5 qttools5-dev qttools5-dev-tools\n+\n+sudo apt-get -y install libminiupnpc-dev\n+\n+sudo apt-get -y install libboost-all-dev\n+\n+sudo apt-get -y install --no-install-recommends gnome-panel\n+\n+sudo apt-get -y install lynx\n+\n+sudo apt-get -y install unzip\n+\n+#// Compile Berkeley\n+cd ~\n+wget http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz\n+tar -xzvf db-4.8.30.NC.tar.gz\n+rm db-4.8.30.NC.tar.gz\n+cd db-4.8.30.NC/build_unix\n+../dist/configure --enable-cxx\n+make\n+sudo make install\n+sudo ln -s /usr/local/BerkeleyDB.4.8/lib/libdb-4.8.so /usr/lib/libdb-4.8.so\n+sudo ln -s /usr/local/BerkeleyDB.4.8/lib/libdb_cxx-4.8.so /usr/lib/libdb_cxx-4.8.so\n+\n+#// Clone files from repo, Permissions and make\n+cd ~\n+sudo rm -Rf db-4.8.30.NC\n+git clone https://github.com/vergecurrency/VERGE\n+cd VERGE\n+sudo sh autogen.sh\n+chmod 777 ~/VERGE/share/genbuild.sh\n+chmod 777 ~/VERGE/src/leveldb/build_detect_platform\n+cd ~/raspi\n+./configure CPPFLAGS=\"-I/usr/local/BerkeleyDB.4.8/include -O2\" LDFLAGS=\"-L/usr/local/BerkeleyDB.4.8/lib\" --with-gui=qt5\n+make -j4\n+sudo strip ~/VERGE/src/VERGEd\n+sudo strip ~/VERGE/src/qt/VERGE-qt\n+sudo make install\n+cd ~\n+\n+#// Create the config file with random user and password\n+\n+mkdir ~/.VERGE\n+echo \"rpcuser=\"$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 26 ; echo '') '\\n'\"rpcpassword=\"$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 26 ; echo '') '\\n'\"rpcport=20102\" '\\n'\"port=21102\" '\\n'\"daemon=1\" '\\n'\"listen=1\" > ~/.VERGE/VERGE.conf\n+\n+#// Extract http link, download blockchain and install it.\n+\n+echo \"wget\" $(lynx --dump --listonly http://vergecurrency.de | grep -o \"http:*.*zip\") > link.sh\n+sh link.sh\n+unzip -o Verge-Blockchain*.zip -d ~/.VERGE\n+sudo rm Verge-Blockchain*.zip\n+\n+# Create Icon on Desktop and in menu\n+\n+sudo cp ~/raspi/vergepi.png /usr/share/icons/\n+echo '#!/usr/bin/env xdg-open''\\n'\"[Desktop Entry]\"'\\n'\"Version=1.0\"'\\n'\"Type=Application\"'\\n'\"Terminal=false\"'\\n'\"Icon[en]=/usr/share/icons/vergepi.png\"'\\n'\"Name[en]=VERGE\"'\\n'\"Exec=VERGE-qt\"'\\n'\"Name=VERGE\"'\\n'\"Icon=/usr/share/icons/vergepi.png\"'\\n'\"Categories=Network;Internet;\" > ~/Desktop/VERGE.desktop\n+sudo chmod +x ~/Desktop/VERGE.desktop\n+sudo cp ~/Desktop/VERGE.desktop /usr/share/applications/VERGE.desktop\n+sudo chmod +x /usr/share/applications/VERGE.desktop\n+\n+# Erase all VERGE compilation directory , cleaning\n+\n+cd ~\n+sudo rm -Rf ~/VERGE\n+\n+#// Start Verge\n+\n+VERGE-qt\n"
}
]
| C++ | MIT License | vergecurrency/verge | Create go.sh
same deployement than raspi but adapted for linux desktop |
714,098 | 23.07.2017 21:34:16 | 14,400 | 3fa1d1a535da178b38fc0171379cef6f02f68f48 | update clearnet seeds | [
{
"change_type": "MODIFY",
"old_path": "src/net.cpp",
"new_path": "src/net.cpp",
"diff": "@@ -1151,8 +1151,11 @@ void MapPort()\n// The first name is used as information source for addrman.\n// The second name should resolve to a list of seed addresses.\nstatic const char *strDNSSeed[][2] = {\n- {\"162.243.30.96\", \"104.131.144.82\"},\n- {\"192.241.187.222\", \"162.243.14.59\"},\n+ {\"185.162.9.97\", \"104.131.144.82\"},\n+ {\"192.241.187.222\", \"105.228.198.44\"},\n+ {\"46.127.57.167\", \"98.5.123.15\"},\n+ {\"81.147.68.236\", \"77.67.46.100\"},\n+ {\"95.46.99.96\", \"138.201.91.159\"},\n};\nvoid ThreadDNSAddressSeed(void* parg)\n"
}
]
| C++ | MIT License | vergecurrency/verge | update clearnet seeds |
714,098 | 26.07.2017 15:32:16 | 14,400 | 734a50ccb6bfce0d46d475829c8e6776db07aaab | update radio source | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/radio.ui",
"new_path": "src/qt/forms/radio.ui",
"diff": "<widget class=\"QWebView\" name=\"webView\" native=\"true\">\n<property name=\"url\" stdset=\"0\">\n<url>\n- <string>http://vergecurrency.com/radio/wallet.html</string>\n+ <string>http://radiocrypto.com/index.html</string>\n</url>\n</property>\n</widget>\n"
}
]
| C++ | MIT License | vergecurrency/verge | update radio source |
714,098 | 27.07.2017 15:03:15 | 14,400 | 79ab62c2de731c05457ea49de6151099d9b79874 | faster syncing | [
{
"change_type": "MODIFY",
"old_path": "src/main.cpp",
"new_path": "src/main.cpp",
"diff": "@@ -283,10 +283,7 @@ bool CTransaction::ReadFromDisk(CTxDB& txdb, const uint256& hash, CTxIndex& txin\nbool CTransaction::ReadFromDisk(CTxDB& txdb, COutPoint prevout, CTxIndex& txindexRet)\n{\n- SetNull();\n- if (!txdb.ReadTxIndex(prevout.hash, txindexRet))\n- return false;\n- if (!ReadFromDisk(txindexRet.pos))\n+ if (!ReadFromDisk(txdb, prevout.hash, txindexRet))\nreturn false;\nif (prevout.n >= vout.size())\n{\n"
}
]
| C++ | MIT License | vergecurrency/verge | faster syncing |
714,098 | 13.10.2017 01:54:13 | 14,400 | 6e9620a84957d5d2909dcd32f1f609bb64a5b82f | updates to leveldb | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.am",
"new_path": "src/Makefile.am",
"diff": "@@ -137,6 +137,8 @@ libbitcoin_server_a_SOURCES = \\\nalert.cpp \\\ncheckpoints.cpp \\\ninit.cpp \\\n+ db.cpp \\\n+ txdb-leveldb \\\nbitcoinrpc.cpp \\\nkeystore.cpp \\\nmain.cpp \\\n@@ -153,8 +155,6 @@ libbitcoin_server_a_SOURCES = \\\n# when wallet enabled\nlibbitcoin_wallet_a_CPPFLAGS = $(BITCOIN_INCLUDES)\nlibbitcoin_wallet_a_SOURCES = \\\n- db.cpp \\\n- txdb-leveldb.cpp \\\ncrypter.cpp \\\nrpcdump.cpp \\\nrpcwallet.cpp \\\n"
},
{
"change_type": "MODIFY",
"old_path": "src/kernel.cpp",
"new_path": "src/kernel.cpp",
"diff": "@@ -338,7 +338,6 @@ bool CheckProofOfStake(const CTransaction& tx, unsigned int nBits, uint256& hash\nCTxIndex txindex;\nif (!txPrev.ReadFromDisk(txdb, txin.prevout, txindex))\nreturn tx.DoS(1, error(\"CheckProofOfStake() : INFO: read txPrev failed\")); // previous transaction not in main chain, may occur during initial download\n- txdb.Close();\n// Verify signature\nif (!VerifySignature(txPrev, tx, 0, true, 0))\n"
},
{
"change_type": "MODIFY",
"old_path": "src/main.cpp",
"new_path": "src/main.cpp",
"diff": "@@ -2109,7 +2109,6 @@ bool CBlock::AddToBlockIndex(unsigned int nFile, unsigned int nBlockPos)\nif (!SetBestChain(txdb, pindexNew))\nreturn false;\n- txdb.Close();\nif (pindexNew == pindexBest)\n{\n@@ -2624,7 +2623,6 @@ bool LoadBlockIndex(bool fAllowNew)\nCTxDB txdb(\"cr\");\nif (!txdb.LoadBlockIndex())\nreturn false;\n- txdb.Close();\n//\n// Init with genesis block\n@@ -2721,7 +2719,6 @@ bool LoadBlockIndex(bool fAllowNew)\nCheckpoints::ResetSyncCheckpoint();\n}\n- txdb.Close();\n}\nreturn true;\n"
}
]
| C++ | MIT License | vergecurrency/verge | updates to leveldb |
714,098 | 13.10.2017 01:57:06 | 14,400 | 6bc7f45aa769a665dbdae52d12c9f91323284d91 | was missing stake modifier checksum calculation | [
{
"change_type": "MODIFY",
"old_path": "src/main.cpp",
"new_path": "src/main.cpp",
"diff": "@@ -2156,14 +2156,14 @@ bool CBlock::CheckBlock(bool fCheckPOW, bool fCheckMerkleRoot, bool fCheckSig) c\nif (vtx[i].IsCoinStake())\nreturn DoS(100, error(\"CheckBlock() : coinstake in wrong position\"));\n- // Check coinbase timestamp\n- if (GetBlockTime() > (int64)vtx[0].nTime + nMaxClockDrift)\n- return DoS(50, error(\"CheckBlock() : coinbase timestamp is too early\"));\n-\n// ppcoin: coinbase output should be empty if proof-of-stake block\nif (IsProofOfStake() && (vtx[0].vout.size() != 1 || !vtx[0].vout[0].IsEmpty()))\nreturn error(\"CheckBlock() : coinbase output not empty for proof-of-stake block\");\n+ // Check coinbase timestamp\n+ if (GetBlockTime() > (int64)vtx[0].nTime + nMaxClockDrift)\n+ return DoS(50, error(\"CheckBlock() : coinbase timestamp is too early\"));\n+\n// Check coinstake timestamp\nif (IsProofOfStake() && !CheckCoinStakeTimestamp(GetBlockTime(), (int64)vtx[1].nTime))\nreturn DoS(50, error(\"CheckBlock() : coinstake timestamp violation nTimeBlock=%\" PRI64d\" nTimeTx=%u\", GetBlockTime(), vtx[1].nTime));\n"
}
]
| C++ | MIT License | vergecurrency/verge | was missing stake modifier checksum calculation |
714,098 | 13.10.2017 02:18:50 | 14,400 | 150c7a90c0bcba4f29b45aeb8a166976c0a6bcf5 | forgot a milli
a milli a milli a milli milli | [
{
"change_type": "MODIFY",
"old_path": "src/main.cpp",
"new_path": "src/main.cpp",
"diff": "@@ -4661,7 +4661,7 @@ void GenerateBitcoins(bool fGenerate, CWallet* pwallet)\n{\nif (!NewThread(ThreadVERGEMiner, pwallet))\nprintf(\"Error: NewThread(ThreadVERGEMiner) failed\\n\");\n- Sleep(10);\n+ MilliSleep(10);\n}\n}\n}\n"
}
]
| C++ | MIT License | vergecurrency/verge | forgot a milli
a milli a milli a milli milli |
714,098 | 13.10.2017 02:58:13 | 14,400 | 73a3618c9046ab59feeb93e300edab11ce352e44 | relay tx update | [
{
"change_type": "MODIFY",
"old_path": "src/db.h",
"new_path": "src/db.h",
"diff": "@@ -24,7 +24,7 @@ class CWallet;\nextern unsigned int nWalletDBUpdated;\n-void ThreadFlushWalletDB(const std::string& strWalletFile);\n+void ThreadFlushWalletDB(void* parg);\nbool BackupWallet(const CWallet& wallet, const std::string& strDest);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/wallet.cpp",
"new_path": "src/wallet.cpp",
"diff": "@@ -1677,7 +1677,7 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)\nreturn nLoadWalletRet;\nfFirstRunRet = !vchDefaultKey.IsValid();\n- //NewThread(ThreadFlushWalletDB, &strWalletFile);\n+ NewThread(ThreadFlushWalletDB, &strWalletFile);\nreturn DB_LOAD_OK;\n}\n"
}
]
| C++ | MIT License | vergecurrency/verge | relay tx update |
714,098 | 13.10.2017 22:00:27 | 14,400 | 3e6867f332926f46404516535ecd88d192469d46 | multisig 2/2 | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.am",
"new_path": "src/Makefile.am",
"diff": "@@ -91,6 +91,7 @@ BITCOIN_CORE_H = \\\nblake2.h \\\nblake2-impl.h \\\ndb.h \\\n+ txdb.h \\\ntxdb-leveldb.h \\\ninit.h \\\nkernel.h \\\n"
},
{
"change_type": "MODIFY",
"old_path": "src/Makefile.qt.include",
"new_path": "src/Makefile.qt.include",
"diff": "@@ -11,6 +11,9 @@ QT_FORMS_UI = \\\nqt/forms/addressbookpage.ui \\\nqt/forms/askpassphrasedialog.ui \\\nqt/forms/optionsdialog.ui \\\n+ qt/forms/multisigaddressentry.ui \\\n+ qt/forms/multisiginputentry.ui \\\n+ qt/forms/multisigdialog.ui \\\nqt/forms/editaddressdialog.ui \\\nqt/forms/overviewpage.ui \\\nqt/forms/qrcodedialog.ui \\\n@@ -20,11 +23,8 @@ QT_FORMS_UI = \\\nqt/forms/signverifymessagedialog.ui \\\nqt/forms/chatwindow.ui \\\nqt/forms/radio.ui \\\n- qt/forms/transactiondescdialog.ui \\\n- qt/forms/multisigaddressentry.ui \\\n- qt/forms/multisiginputentry.ui \\\n- qt/forms/multisigdialog.ui \\\n- qt/forms/blockbrowser.ui\n+ qt/forms/blockbrowser.ui \\\n+ qt/forms/transactiondescdialog.ui\nQT_MOC_CPP = \\\nqt/moc_aboutdialog.cpp \\\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/multisigaddressentry.ui",
"new_path": "src/qt/forms/multisigaddressentry.ui",
"diff": "<property name=\"toolTip\">\n<string>The public key of an address</string>\n</property>\n- <property name=\"placeholderText\">\n- <string>Enter a public key</string>\n- </property>\n</widget>\n</item>\n<item>\n<property name=\"toolTip\">\n<string>Address associated to the public key</string>\n</property>\n- <property name=\"placeholderText\">\n- <string>Enter one of your addresses to get its public key</string>\n- </property>\n</widget>\n</item>\n<item>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/multisigdialog.ui",
"new_path": "src/qt/forms/multisigdialog.ui",
"diff": "<property name=\"alignment\">\n<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>\n</property>\n- <property name=\"placeholderText\">\n- <string>Enter a number</string>\n- </property>\n</widget>\n</item>\n<item>\n<verstretch>0</verstretch>\n</sizepolicy>\n</property>\n- <property name=\"placeholderText\">\n- <string>Enter a raw transaction or create a new one</string>\n- </property>\n</widget>\n</item>\n<item>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/multisiginputentry.ui",
"new_path": "src/qt/forms/multisiginputentry.ui",
"diff": "<property name=\"toolTip\">\n<string/>\n</property>\n- <property name=\"placeholderText\">\n- <string>Enter a transaction id</string>\n- </property>\n</widget>\n</item>\n<item>\n<property name=\"toolTip\">\n<string/>\n</property>\n- <property name=\"placeholderText\">\n- <string>Enter the redeem script of the address in the transaction output</string>\n- </property>\n</widget>\n</item>\n<item>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/multisigaddressentry.cpp",
"new_path": "src/qt/multisigaddressentry.cpp",
"diff": "@@ -17,6 +17,12 @@ MultisigAddressEntry::MultisigAddressEntry(QWidget *parent) : QFrame(parent), ui\n{\nui->setupUi(this);\nGUIUtil::setupAddressWidget(ui->address, this);\n+\n+#if QT_VERSION >= 0x040700\n+ /* Do not move this to the XML file, Qt before 4.7 will choke on it */\n+ ui->pubkey->setPlaceholderText(tr(\"The public key of an address\"));\n+ ui->address->setPlaceholderText(tr(\"Enter one of your addresses to get its public key\"));\n+#endif\n}\nMultisigAddressEntry::~MultisigAddressEntry()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/multisigdialog.cpp",
"new_path": "src/qt/multisigdialog.cpp",
"diff": "-#include <QClipboard>\n-#include <QDialog>\n-#include <QMessageBox>\n-#include <QScrollBar>\n-#include <vector>\n-\n#include \"addresstablemodel.h\"\n+#include \"ui_multisigdialog.h\"\n#include \"base58.h\"\n#include \"key.h\"\n#include \"main.h\"\n#include \"multisigaddressentry.h\"\n#include \"multisiginputentry.h\"\n#include \"multisigdialog.h\"\n-#include \"ui_multisigdialog.h\"\n+\n#include \"script.h\"\n#include \"sendcoinsentry.h\"\n#include \"util.h\"\n#include \"wallet.h\"\n#include \"walletmodel.h\"\n+#include <QClipboard>\n+#include <QDialog>\n+#include <QMessageBox>\n+#include <QScrollBar>\n+#include <vector>\n+\nMultisigDialog::MultisigDialog(QWidget *parent) : QDialog(parent), ui(new Ui::MultisigDialog), model(0)\n{\n@@ -41,13 +42,18 @@ MultisigDialog::MultisigDialog(QWidget *parent) : QDialog(parent), ui(new Ui::Mu\naddInput();\naddOutput();\n- updateAmounts();\nconnect(ui->addInputButton, SIGNAL(clicked()), this, SLOT(addInput()));\nconnect(ui->addOutputButton, SIGNAL(clicked()), this, SLOT(addOutput()));\nui->signTransactionButton->setEnabled(false);\nui->sendTransactionButton->setEnabled(false);\n+\n+#if QT_VERSION >= 0x040700\n+ /* Do not move this to the XML file, Qt before 4.7 will choke on it */\n+ ui->requiredSignatures->setPlaceholderText(tr(\"Enter a number\"));\n+ ui->transaction->setPlaceholderText(tr(\"Enter a raw transaction or create a new one\"));\n+#endif\n}\nMultisigDialog::~MultisigDialog()\n@@ -81,6 +87,8 @@ void MultisigDialog::setModel(WalletModel *model)\nif(entry)\nentry->setModel(model);\n}\n+\n+ updateAmounts();\n}\nvoid MultisigDialog::updateRemoveEnabled()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/multisiginputentry.cpp",
"new_path": "src/qt/multisiginputentry.cpp",
"diff": "MultisigInputEntry::MultisigInputEntry(QWidget *parent) : QFrame(parent), ui(new Ui::MultisigInputEntry), model(0)\n{\nui->setupUi(this);\n+\n+#if QT_VERSION >= 0x040700\n+ /* Do not move this to the XML file, Qt before 4.7 will choke on it */\n+ ui->transactionId->setPlaceholderText(tr(\"Enter a transaction id\"));\n+ ui->redeemScript->setPlaceholderText(tr(\"Enter the redeem script of the address in the transaction output\"));\n+#endif\n}\nMultisigInputEntry::~MultisigInputEntry()\n"
}
]
| C++ | MIT License | vergecurrency/verge | multisig 2/2 |
714,098 | 14.10.2017 01:20:50 | 14,400 | 9ff2fb8f2807fe4f1a04be12bd60e0019804447a | remove ip validation | [
{
"change_type": "MODIFY",
"old_path": "src/net.cpp",
"new_path": "src/net.cpp",
"diff": "@@ -356,7 +356,7 @@ bool GetMyExternalIP(CNetAddr& ipRet)\nconst char* pszKeyword;\nfor (int nLookup = 0; nLookup <= 1; nLookup++)\n- for (int nHost = 1; nHost <= 2; nHost++)\n+ for (int nHost = 1; nHost <= 1; nHost++)\n{\n// We should be phasing out our use of sites like these. If we need\n// replacements, we should ask for volunteers to put this simple\n@@ -381,25 +381,6 @@ bool GetMyExternalIP(CNetAddr& ipRet)\npszKeyword = \"Address:\";\n}\n- else if (nHost == 2)\n- {\n- addrConnect = CService(\"74.208.43.192\", 80); // www.showmyip.com\n-\n- if (nLookup == 1)\n- {\n- CService addrIP(\"www.showmyip.com\", 80, true);\n- if (addrIP.IsValid())\n- addrConnect = addrIP;\n- }\n-\n- pszGet = \"GET /simple/ HTTP/1.1\\r\\n\"\n- \"Host: www.showmyip.com\\r\\n\"\n- \"User-Agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)\\r\\n\"\n- \"Connection: close\\r\\n\"\n- \"\\r\\n\";\n-\n- pszKeyword = NULL; // Returns just IP address\n- }\nif (GetMyExternalIP2(addrConnect, pszGet, pszKeyword, ipRet))\nreturn true;\n"
}
]
| C++ | MIT License | vergecurrency/verge | remove ip validation |
714,098 | 14.10.2017 01:34:55 | 14,400 | cb514b52c8935a9e0e3608aeed4e6d2f4672725a | remove git heads from wallet model header | [
{
"change_type": "MODIFY",
"old_path": "src/qt/walletmodel.h",
"new_path": "src/qt/walletmodel.h",
"diff": "@@ -9,22 +9,14 @@ class OptionsModel;\nclass AddressTableModel;\nclass TransactionTableModel;\nclass CWallet;\n-<<<<<<< HEAD\n-<<<<<<< HEAD\nclass CKeyID;\nclass CPubKey;\nclass COutput;\nclass COutPoint;\nclass uint256;\nclass CCoinControl;\n-\n-\n-=======\n->>>>>>> parent of bf2abfb... bloom filters\n-=======\nclass CPubKey;\nclass CKeyID;\n->>>>>>> parent of fbb8249... finished coin control\nQT_BEGIN_NAMESPACE\nclass QTimer;\n@@ -124,9 +116,6 @@ public:\n};\nUnlockContext requestUnlock();\n-<<<<<<< HEAD\n-<<<<<<< HEAD\n-<<<<<<< HEAD\nbool getPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const;\nvoid getOutputs(const std::vector<COutPoint>& vOutpoints, std::vector<COutput>& vOutputs);\n@@ -136,15 +125,10 @@ public:\nvoid lockCoin(COutPoint& output);\nvoid unlockCoin(COutPoint& output);\nvoid listLockedCoins(std::vector<COutPoint>& vOutpts);\n-=======\n->>>>>>> parent of 2859757... multi sig\n-=======\nCWallet * getWallet();\n->>>>>>> parent of bf2abfb... bloom filters\n-=======\n+\nbool getPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const;\nCWallet * getWallet();\n->>>>>>> parent of fbb8249... finished coin control\nprivate:\nCWallet *wallet;\n"
}
]
| C++ | MIT License | vergecurrency/verge | remove git heads from wallet model header |
714,098 | 14.10.2017 01:38:54 | 14,400 | 29fd5c10af8145eb1ba180f9b7ea370886cd07c7 | remove overloading | [
{
"change_type": "MODIFY",
"old_path": "src/qt/walletmodel.h",
"new_path": "src/qt/walletmodel.h",
"diff": "@@ -127,9 +127,6 @@ public:\nvoid listLockedCoins(std::vector<COutPoint>& vOutpts);\nCWallet * getWallet();\n- bool getPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const;\n- CWallet * getWallet();\n-\nprivate:\nCWallet *wallet;\n"
}
]
| C++ | MIT License | vergecurrency/verge | remove overloading |
714,098 | 14.10.2017 01:41:56 | 14,400 | 7a0287bc4758c50f432dedbca731a1e6671ac469 | remove git headers from wallet model | [
{
"change_type": "MODIFY",
"old_path": "src/qt/walletmodel.cpp",
"new_path": "src/qt/walletmodel.cpp",
"diff": "@@ -377,18 +377,13 @@ void WalletModel::UnlockContext::CopyFrom(const UnlockContext& rhs)\n*this = rhs;\nrhs.relock = false;\n}\n-<<<<<<< HEAD\n-<<<<<<< HEAD\n+\nbool WalletModel::getPubKey(const CKeyID &address, CPubKey& vchPubKeyOut) const\n{\nreturn wallet->GetPubKey(address, vchPubKeyOut);\n}\n-=======\n->>>>>>> parent of fbb8249... finished coin control\nCWallet * WalletModel::getWallet()\n{\nreturn wallet;\n}\n\\ No newline at end of file\n-=======\n->>>>>>> parent of 2859757... multi sig\n"
}
]
| C++ | MIT License | vergecurrency/verge | remove git headers from wallet model |
714,098 | 16.10.2017 20:41:10 | 14,400 | e973c74eee1e89a6739ed0984d89b564a8605485 | better boost detection | [
{
"change_type": "MODIFY",
"old_path": "src/m4/ax_boost_base.m4",
"new_path": "src/m4/ax_boost_base.m4",
"diff": "@@ -112,6 +112,12 @@ if test \"x$want_boost\" = \"xyes\"; then\n;;\nesac\n+ dnl some arches may advertise a cpu type that doesn't line up with their\n+ dnl prefix's cpu type. For example, uname may report armv7l while libs are\n+ dnl installed to /usr/lib/arm-linux-gnueabihf. Try getting the compiler's\n+ dnl value for an extra chance of finding the correct path.\n+ libsubdirs=\"lib/`$CXX -dumpmachine 2>/dev/null` $libsubdirs\"\n+\ndnl first we check the system location for boost libraries\ndnl this location ist chosen if boost libraries are installed with the --layout=system option\ndnl or if you install boost with RPM\n"
}
]
| C++ | MIT License | vergecurrency/verge | better boost detection |
714,098 | 16.10.2017 20:58:46 | 14,400 | e6af7408fb536ce21f9c91aeeac0d40804035c12 | prevent invalid memory access on crafted sig | [
{
"change_type": "MODIFY",
"old_path": "src/key.cpp",
"new_path": "src/key.cpp",
"diff": "@@ -378,6 +378,10 @@ bool CKey::Verify(uint256 hash, const std::vector<unsigned char>& vchSigParam)\nif (vchSig.size() > 1 && vchSig[1] & 0x80)\n{\nunsigned char nLengthBytes = vchSig[1] & 0x7f;\n+\n+ if (vchSig.size() < 2 + nLengthBytes)\n+ return false;\n+\nif (nLengthBytes > 4)\n{\nunsigned char nExtraBytes = nLengthBytes - 4;\n"
}
]
| C++ | MIT License | vergecurrency/verge | prevent invalid memory access on crafted sig |
714,098 | 16.10.2017 21:28:24 | 14,400 | 3de5ea95f254a3c1d37d73067fa95632982592fc | normalize sig lengths
for openssl 32/64 compat | [
{
"change_type": "MODIFY",
"old_path": "src/key.cpp",
"new_path": "src/key.cpp",
"diff": "@@ -370,29 +370,90 @@ bool CKey::SetCompactSignature(uint256 hash, const std::vector<unsigned char>& v\nreturn false;\n}\n-bool CKey::Verify(uint256 hash, const std::vector<unsigned char>& vchSigParam)\n+static bool ParseLength(\n+ const std::vector<unsigned char>::iterator& begin,\n+ const std::vector<unsigned char>::iterator& end,\n+ size_t& nLengthRet,\n+ size_t& nLengthSizeRet)\n+{\n+ std::vector<unsigned char>::iterator it = begin;\n+ if (it == end)\n+ return false;\n+\n+ nLengthRet = *it;\n+ nLengthSizeRet = 1;\n+\n+ if (!(nLengthRet & 0x80))\n+ return true;\n+\n+ unsigned char nLengthBytes = nLengthRet & 0x7f;\n+\n+ nLengthRet = 0;\n+ for (unsigned char i = 0; i < nLengthBytes; i++)\n+ {\n+ it++;\n+ if (it == end)\n+ return false;\n+ nLengthRet = (nLengthRet << 8) | *it;\n+ if (nLengthRet > 0x7f)\n+ return false;\n+ nLengthSizeRet++;\n+ }\n+ return true;\n+}\n+\n+static bool NormalizeSignature(std::vector<unsigned char>& vchSig)\n{\n// Prevent the problem described here: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-July/009697.html\n// by removing the extra length bytes\n- std::vector<unsigned char> vchSig(vchSigParam.begin(), vchSigParam.end());\n- if (vchSig.size() > 1 && vchSig[1] & 0x80)\n- {\n- unsigned char nLengthBytes = vchSig[1] & 0x7f;\n+ if (vchSig.size() < 2 || vchSig[0] != 0x30)\n+ return false;\n- if (vchSig.size() < 2 + nLengthBytes)\n+ size_t nTotalLength, nTotalLengthSize;\n+ if (!ParseLength(vchSig.begin() + 1, vchSig.end(), nTotalLength, nTotalLengthSize))\nreturn false;\n- if (nLengthBytes > 4)\n- {\n- unsigned char nExtraBytes = nLengthBytes - 4;\n- for (unsigned char i = 0; i < nExtraBytes; i++)\n- if (vchSig[2 + i])\n+ size_t nRStart = 1 + nTotalLengthSize;\n+ if (vchSig.size() < nRStart + 2 || vchSig[nRStart] != 0x02)\nreturn false;\n- vchSig.erase(vchSig.begin() + 2, vchSig.begin() + 2 + nExtraBytes);\n- vchSig[1] = 0x80 | (nLengthBytes - nExtraBytes);\n- }\n+\n+ size_t nRLength, nRLengthSize;\n+ if (!ParseLength(vchSig.begin() + nRStart + 1, vchSig.end(), nRLength, nRLengthSize))\n+ return false;\n+ const size_t nRDataStart = nRStart + 1 + nRLengthSize;\n+ std::vector<unsigned char> R(vchSig.begin() + nRDataStart, vchSig.begin() + nRDataStart + nRLength);\n+\n+ size_t nSStart = nRStart + 1 + nRLengthSize + nRLength;\n+ if (vchSig.size() < nSStart + 2 || vchSig[nSStart] != 0x02)\n+ return false;\n+\n+ size_t nSLength, nSLengthSize;\n+ if (!ParseLength(vchSig.begin() + nSStart + 1, vchSig.end(), nSLength, nSLengthSize))\n+ return false;\n+ const size_t nSDataStart = nSStart + 1 + nSLengthSize;\n+ std::vector<unsigned char> S(vchSig.begin() + nSDataStart, vchSig.begin() + nSDataStart + nSLength);\n+\n+ vchSig.clear();\n+ vchSig.reserve(2 + 2 + R.size() + 2 + S.size());\n+ vchSig.push_back(0x30);\n+ vchSig.push_back(2 + R.size() + 2 + S.size());\n+ vchSig.push_back(0x02);\n+ vchSig.push_back(R.size());\n+ vchSig.insert(vchSig.end(), R.begin(), R.end());\n+ vchSig.push_back(0x02);\n+ vchSig.push_back(S.size());\n+ vchSig.insert(vchSig.end(), S.begin(), S.end());\n+\n+ return true;\n}\n+bool CKey::Verify(uint256 hash, const std::vector<unsigned char>& vchSigParam)\n+{\n+ std::vector<unsigned char> vchSig(vchSigParam.begin(), vchSigParam.end());\n+\n+ if (!NormalizeSignature(vchSig))\n+ return false;\n+\nif (vchSig.empty())\nreturn false;\n"
}
]
| C++ | MIT License | vergecurrency/verge | normalize sig lengths
for openssl 32/64 compat |
714,098 | 18.10.2017 21:22:48 | 14,400 | d6f971c5073c11eec5f2979f7768ed5a9e649b1d | set minimum size of qt | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -80,7 +80,8 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\nnotificator(0),\nrpcConsole(0)\n{\n- resize(900, 450);\n+ setMinimumSize(970,500);\n+ resize(970, 500);\nsetWindowTitle(tr(\"VERGE\") + \" - \" + tr(\"Wallet\"));\nqApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(12,12,12);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(249,221,131); } #toolbar2 { border:none;width:5px; background-color:rgb(249,221,131); } #toolbar { border:none;height:100%;padding-top:20px; background: rgb(12,12,12); text-align: left; color: white;} QToolBar QToolButton:hover {background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1,stop: 0 rgb(12,12,12), stop: 1 rgb(216,252,251),stop: 2 rgb(59,62,65));} QToolBar QToolButton { font-family:Century Gothic;padding-left:5px;padding-right:5px;padding-top:10px;padding-bottom:10px; color: white; text-align: left; background-color: rgb(12,12,12) } #labelMiningIcon { padding-left:5px;font-family:Century Gothic;font-size:10px;text-align:center;color:white; } QMenu { background: rgb(12,12,12); color:white; padding-bottom:10px; } QMenu::item { color:white; background-color: transparent; } QMenu::item:selected { background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(12,12,12), stop: 1 rgb(149,204,244)); } QMenuBar { background: rgb(12,12,12); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; background-color: transparent; } QMenuBar::item:selected { background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(12,12,12), stop: 1 rgb(149,204,244)); }\");\n#ifndef Q_OS_MAC\n"
}
]
| C++ | MIT License | vergecurrency/verge | set minimum size of qt |
714,116 | 10.11.2017 09:18:13 | -3,600 | 0a3153a9e2cace0b21292d52bd1246231798042b | README.md change domain blockchain-zip | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -189,7 +189,7 @@ Check out the [readme](https://github.com/vergecurrency/VERGE/tree/master/contri\nWant to to download the blockchain instead of waiting/syncing? (quicker)\n------------\ndownload this .zip file, and extract it to your verge data directory:\n-http://vergecurrency.de (follow the easy HOW TO instructions!)\n+https://verge-blockchain.dom (follow the easy HOW TO instructions!)\nhttp://108.61.216.160/cryptochainer.chains/chains/Verge_blockchain.zip\nWant to 'solo-mine' from the wallet?\n"
}
]
| C++ | MIT License | vergecurrency/verge | README.md change domain blockchain-zip |
714,116 | 10.11.2017 10:17:05 | -3,600 | cbfabd7eccb40f34b585be14d0063f82c2c4ba70 | simplify go.sh by using static download link
verge-blockchain.com provides a static link now to download the latest Blockchain | [
{
"change_type": "MODIFY",
"old_path": "go.sh",
"new_path": "go.sh",
"diff": "@@ -214,19 +214,14 @@ echo \"rpcuser=\"$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 26 ; echo '') '\\\necho -n \"Do you wish to download the complete VERGE Blockchain (y/n)?\"\nread answer\nif echo \"$answer\" | grep -iq \"^y\" ;then\n- sudo rm Verge-Blockchain*.zip\n- until [ -e Verge*.zip ]\n- do\n- sleep 1\n- echo \"wget\" $(lynx --dump --listonly https://vergecurrency.de | grep -o \"https:*.*zip\") > link.sh\n- sleep 1\n- sh link.sh\n- done\n+ sudo rm go.sh-Verge-Blockchain.zip\n+\n+ wget --no-check-certificate https://verge-blockchain.com/blockchain/go.sh-Verge-Blockchain.zip\n#checksum\nsudo rm blockchain\nwget https://www.vergecurrency.com/checksums/blockchain\n- md5sum Verge-Blockchain*.zip > md5\n+ md5sum go.sh-Verge-Blockchain.zip > md5\nchecksum=\"$(grep $(cat md5) blockchain)\"\nif [ -z \"$checksum\" ];\nthen\n@@ -235,8 +230,8 @@ if echo \"$answer\" | grep -iq \"^y\" ;then\necho \"MD5 is matching...Success\"\nfi\n- unzip -o Verge-Blockchain*.zip -d ~/.VERGE\n- sudo rm Verge-Blockchain*.zip\n+ unzip -o go.sh-Verge-Blockchain.zip -d ~/.VERGE\n+ sudo rm go.sh-Verge-Blockchain.zip\nelse\necho \"Blockchain will not be installed sync may be long\"\nfi\n"
}
]
| C++ | MIT License | vergecurrency/verge | simplify go.sh by using static download link
verge-blockchain.com provides a static link now to download the latest Blockchain |
714,113 | 15.12.2017 20:53:19 | -7,200 | aa94cb083854f063660d01d69593c2df66d60a82 | ubuntu14_container - working for windows (dec 2017), with compose example and config files | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "contrib/docker/ubuntu14_container/Dockerfile",
"diff": "+FROM ubuntu:14.04\n+\n+RUN apt-get update\n+\n+RUN apt-get install -y build-essential\n+RUN apt-get install -y git\n+RUN apt-get install -y software-properties-common python-software-properties\n+\n+RUN add-apt-repository ppa:bitcoin/bitcoin\n+RUN apt-get update\n+\n+RUN apt-get install -y libdb4.8-dev libdb4.8++-dev libtool autotools-dev automake pkg-config libssl-dev libevent-dev \\\n+ bsdmainutils git libboost-all-dev libminiupnpc-dev libqt5gui5 libqt5core5a libqt5webkit5-dev libqt5dbus5 qttools5-dev qttools5-dev-tools \\\n+ libprotobuf-dev protobuf-compiler libqrencode-dev\n+\n+#verge\n+RUN mkdir /root/VERGE\n+RUN git clone https://github.com/vergecurrency/VERGE /root/VERGE\n+RUN cd /root/VERGE/ ; /root/VERGE/autogen.sh\n+RUN cd /root/VERGE/ ; /root/VERGE/configure\n+RUN cd /root/VERGE/ ; make\n+\n+RUN chmod 0777 /root/VERGE/src/*\n+\n+ADD ./conf/VERGE.conf /root/.VERGE/VERGE.conf\n+\n+WORKDIR /root/VERGE\n+\n+EXPOSE 21102 20102\n+\n+#CMD printenv | grep -v \"yyyyyxxxx\" >> /etc/environment && tail -f /dev/null\n+\n+CMD /root/VERGE/src/VERGEd -printtoconsole\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "contrib/docker/ubuntu14_container/README.md",
"diff": "+## Build and start with any other you need\n+\n+docker build -t my/container_verge .\n+\n+docker-compose stop && docker-compose down && docker-compose up -d\n+\n+docker-compose ps\n+\n+## Docker settings for Internet from containers (windows)\n+\n+{\n+ \"registry-mirrors\": [],\n+ \"insecure-registries\": [],\n+ \"debug\": true,\n+ \"experimental\": true,\n+ \"iptables\" : true,\n+ \"ip-forward\" : true,\n+ \"ip-masq\" : true,\n+ \"icc\" : true\n+}\n+\n+## Docker direct access\n+\n+docker exec -i -t container_verge /bin/bash\n+\n+\n+\n+\n+\n+\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "contrib/docker/ubuntu14_container/conf/VERGE.conf",
"diff": "+rpcuser=put_your_username\n+rpcpassword=put_your_pass\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "contrib/docker/ubuntu14_container/docker-compose.yml",
"diff": "+version: '2.1'\n+services:\n+ container_verge:\n+ image: my/container_verge\n+ container_name: container_verge\n+ ports:\n+ - \"20102:20102\"\n+ - \"21102:21102\"\n+ volumes:\n+ - ./conf/VERGE.conf:/root/.VERGE/VERGE.conf\n"
}
]
| C++ | MIT License | vergecurrency/verge | ubuntu14_container - working for windows (dec 2017), with compose example and config files |
714,113 | 15.12.2017 21:03:45 | -7,200 | d01e862ca9eb0f0b8dbd162460bfe50cd0278e63 | centos7/Dockerfile updated (working now) | [
{
"change_type": "MODIFY",
"old_path": "contrib/docker/centos7/Dockerfile",
"new_path": "contrib/docker/centos7/Dockerfile",
"diff": "@@ -4,14 +4,13 @@ MAINTAINER Mike Kinney <[email protected]>\nRUN yum upgrade -y\nRUN yum install -y wget\n-RUN wget http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-6.noarch.rpm\n-RUN rpm -ivh epel-release-7-6.noarch.rpm\n+RUN yum install -y epel-release\nRUN yum install -y autoconf automake gcc-c++ libdb4-cxx libdb4-cxx-devel boost-devel openssl-devel git bzip2 make file sudo\nRUN cd /tmp && \\\n- wget http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2 && \\\n- tar xf protobuf-2.5.0.tar.bz2 && \\\n- cd /tmp/protobuf-2.5.0 && \\\n+ wget https://github.com/google/protobuf/releases/download/v2.6.0/protobuf-2.6.0.tar.bz2 && \\\n+ tar xf protobuf-2.6.0.tar.bz2 && \\\n+ cd /tmp/protobuf-2.6.0 && \\\n./configure && \\\nmake -Wall -Wwrite-strings -Woverloaded-virtual -Wno-sign-compare && \\\nmake install\n"
}
]
| C++ | MIT License | vergecurrency/verge | centos7/Dockerfile updated (working now) |
714,113 | 15.12.2017 22:31:38 | -7,200 | 6d5f55266f173030b985efa345c0a2a1c5cf672f | added nodes to conf | [
{
"change_type": "MODIFY",
"old_path": "contrib/docker/centos7/Dockerfile",
"new_path": "contrib/docker/centos7/Dockerfile",
"diff": "@@ -29,6 +29,8 @@ WORKDIR /coin/git\nRUN ./autogen.sh && ./configure --with-gui=qt5 && make && mv src/VERGEd /coin/VERGEd\n+ADD ./conf/VERGE.conf /root/.VERGE/VERGE.conf\n+\nWORKDIR /coin\nVOLUME [\"/coin/home\"]\n"
},
{
"change_type": "MODIFY",
"old_path": "contrib/docker/ubuntu14_container/conf/VERGE.conf",
"new_path": "contrib/docker/ubuntu14_container/conf/VERGE.conf",
"diff": "rpcuser=put_your_username\nrpcpassword=put_your_pass\n+addnode=104.131.144.82:21102\n+addnode=104.236.107.27:21102\n+addnode=104.237.2.189:21102\n+addnode=116.251.193.36:21102\n+addnode=138.197.68.130:21102\n+addnode=138.68.108.250:21102\n+addnode=159.203.121.202:21102\n+addnode=167.114.208.68:21102\n+addnode=172.104.157.38:21102\n+addnode=216.15.40.124:21102\n+addnode=45.32.129.168:21102\n+addnode=45.32.242.173:21102\n+addnode=45.55.209.243:21102\n+addnode=45.55.59.206:21102\n+addnode=46.4.64.68:21102\n+addnode=61.164.253.37:21102\n+addnode=68.66.193.48:21102\n+addnode=69.197.128.125:21102\n+addnode=78.46.190.152:21102\n+addnode=80.98.74.43:21102\n+addnode=91.121.82.47:21102\n+addnode=94.130.19.114:21102\n\\ No newline at end of file\n"
}
]
| C++ | MIT License | vergecurrency/verge | added nodes to conf https://bitcointalk.org/index.php?topic=1365894.6700 |
714,127 | 20.12.2017 13:08:49 | 25,200 | 0ba9b24928d371dffb9a87a11507ac0f1177dc86 | Updated icons
Moved new icons on to branch. Removed unused icons | [
{
"change_type": "MODIFY",
"old_path": "src/qt/res/icons/address-book.png",
"new_path": "src/qt/res/icons/address-book.png",
"diff": "Binary files a/src/qt/res/icons/address-book.png and b/src/qt/res/icons/address-book.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/res/icons/block.png",
"new_path": "src/qt/res/icons/block.png",
"diff": "Binary files a/src/qt/res/icons/block.png and b/src/qt/res/icons/block.png differ\n"
},
{
"change_type": "DELETE",
"old_path": "src/qt/res/icons/chat.png",
"new_path": "src/qt/res/icons/chat.png",
"diff": "Binary files a/src/qt/res/icons/chat.png and /dev/null differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/res/icons/export.png",
"new_path": "src/qt/res/icons/export.png",
"diff": "Binary files a/src/qt/res/icons/export.png and b/src/qt/res/icons/export.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/res/icons/history.png",
"new_path": "src/qt/res/icons/history.png",
"diff": "Binary files a/src/qt/res/icons/history.png and b/src/qt/res/icons/history.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/res/icons/overview.png",
"new_path": "src/qt/res/icons/overview.png",
"diff": "Binary files a/src/qt/res/icons/overview.png and b/src/qt/res/icons/overview.png differ\n"
},
{
"change_type": "DELETE",
"old_path": "src/qt/res/icons/radio.png",
"new_path": "src/qt/res/icons/radio.png",
"diff": "Binary files a/src/qt/res/icons/radio.png and /dev/null differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/res/icons/receive.png",
"new_path": "src/qt/res/icons/receive.png",
"diff": "Binary files a/src/qt/res/icons/receive.png and b/src/qt/res/icons/receive.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/res/icons/send.png",
"new_path": "src/qt/res/icons/send.png",
"diff": "Binary files a/src/qt/res/icons/send.png and b/src/qt/res/icons/send.png differ\n"
}
]
| C++ | MIT License | vergecurrency/verge | Updated icons
Moved new icons on to branch. Removed unused icons |
714,127 | 20.12.2017 13:24:12 | 25,200 | b851f2a18b7f8b71ba73570e3bfaf4df92eda69d | updated stylesheet
Updated styles to match comps. Removed gradient hovers and selected states for now. More exploration is needed if that is a pattern to use going forward with the QT wallet.
Removed button labels. Will only be using icons. | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -83,7 +83,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\nsetMinimumSize(970,500);\nresize(970, 500);\nsetWindowTitle(tr(\"VERGE\") + \" - \" + tr(\"Wallet\"));\n- qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(12,12,12);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(249,221,131); } #toolbar2 { border:none;width:5px; background-color:rgb(249,221,131); } #toolbar { border:none;height:100%;padding-top:20px; background: rgb(12,12,12); text-align: left; color: white;} QToolBar QToolButton:hover {background-color:qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1,stop: 0 rgb(12,12,12), stop: 1 rgb(216,252,251),stop: 2 rgb(59,62,65));} QToolBar QToolButton { font-family:Century Gothic;padding-left:5px;padding-right:5px;padding-top:10px;padding-bottom:10px; color: white; text-align: left; background-color: rgb(12,12,12) } #labelMiningIcon { padding-left:5px;font-family:Century Gothic;font-size:10px;text-align:center;color:white; } QMenu { background: rgb(12,12,12); color:white; padding-bottom:10px; } QMenu::item { color:white; background-color: transparent; } QMenu::item:selected { background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(12,12,12), stop: 1 rgb(149,204,244)); } QMenuBar { background: rgb(12,12,12); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; background-color: transparent; } QMenuBar::item:selected { background-color:qlineargradient(x1: 0, y1: 0, x2: 0.5, y2: 0.5,stop: 0 rgb(12,12,12), stop: 1 rgb(149,204,244)); }\");\n+ qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(249,221,131); } #toolbar2 { border:none;width:5px; background-color:rgb(249,221,131); } #toolbar { border:none;height:100%;padding-top:20px; background: rgb(57,85,95); text-align: left; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); color:white; padding-bottom:10px; } QMenu::item { color:white; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; background-color: transparent; }\");\n#ifndef Q_OS_MAC\nqApp->setWindowIcon(QIcon(\":icons/bitcoin\"));\nsetWindowIcon(QIcon(\":icons/bitcoin\"));\n"
}
]
| C++ | MIT License | vergecurrency/verge | updated stylesheet
Updated styles to match comps. Removed gradient hovers and selected states for now. More exploration is needed if that is a pattern to use going forward with the QT wallet.
Removed button labels. Will only be using icons. |
714,127 | 20.12.2017 13:38:13 | 25,200 | 7b83094447ffdb1b9297e424b9f1dac4feef96f9 | Removed button labels
For this release the nav will only use icons and not have associating labels next to them. | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -211,53 +211,42 @@ void BitcoinGUI::createActions()\n{\nQActionGroup *tabGroup = new QActionGroup(this);\n- overviewAction = new QAction(QIcon(\":/icons/overview\"), tr(\"&Overview\"), this);\n+ overviewAction = new QAction(QIcon(\":/icons/overview\"), this);\noverviewAction->setToolTip(tr(\"Show general overview of wallet\"));\noverviewAction->setCheckable(true);\noverviewAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_1));\ntabGroup->addAction(overviewAction);\n- chatAction = new QAction(QIcon(\":/icons/social\"), tr(\"&Chat\"), this);\n- chatAction->setToolTip(tr(\"View chat\"));\n- chatAction->setCheckable(true);\n- tabGroup->addAction(chatAction);\n-\n- sendCoinsAction = new QAction(QIcon(\":/icons/send\"), tr(\"&Send coins\"), this);\n+ sendCoinsAction = new QAction(QIcon(\":/icons/send\"), this);\nsendCoinsAction->setToolTip(tr(\"Send coins to a VERGE address\"));\nsendCoinsAction->setCheckable(true);\nsendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));\ntabGroup->addAction(sendCoinsAction);\n- receiveCoinsAction = new QAction(QIcon(\":/icons/receiving_addresses\"), tr(\"&Receive coins\"), this);\n+ receiveCoinsAction = new QAction(QIcon(\":/icons/receiving_addresses\"), this);\nreceiveCoinsAction->setToolTip(tr(\"Show the list of addresses for receiving payments\"));\nreceiveCoinsAction->setCheckable(true);\nreceiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));\ntabGroup->addAction(receiveCoinsAction);\n- historyAction = new QAction(QIcon(\":/icons/history\"), tr(\"&Transactions\"), this);\n+ historyAction = new QAction(QIcon(\":/icons/history\"), this);\nhistoryAction->setToolTip(tr(\"Browse transaction history\"));\nhistoryAction->setCheckable(true);\nhistoryAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4));\ntabGroup->addAction(historyAction);\n- addressBookAction = new QAction(QIcon(\":/icons/address-book\"), tr(\"&Address Book\"), this);\n+ addressBookAction = new QAction(QIcon(\":/icons/address-book\"), this);\naddressBookAction->setToolTip(tr(\"Edit the list of stored addresses and labels\"));\naddressBookAction->setCheckable(true);\naddressBookAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_5));\ntabGroup->addAction(addressBookAction);\n- blockAction = new QAction(QIcon(\":/icons/block\"), tr(\"&Block Explorer\"), this);\n+ blockAction = new QAction(QIcon(\":/icons/block\"), this);\nblockAction->setToolTip(tr(\"Explore the BlockChain\"));\nblockAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_6));\nblockAction->setCheckable(true);\ntabGroup->addAction(blockAction);\n- radioAction = new QAction(QIcon(\":/icons/radio\"), tr(\"&Radio\"), this);\n- radioAction->setToolTip(tr(\"Verge Radio\"));\n- radioAction->setCheckable(true);\n- radioAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_0));\n- tabGroup->addAction(radioAction);\n-\nconnect(blockAction, SIGNAL(triggered()), this, SLOT(gotoBlockBrowser()));\nconnect(overviewAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\nconnect(overviewAction, SIGNAL(triggered()), this, SLOT(gotoOverviewPage()));\n@@ -297,7 +286,7 @@ void BitcoinGUI::createActions()\nsignMessageAction = new QAction(QIcon(\":/icons/edit\"), tr(\"Sign &message...\"), this);\nverifyMessageAction = new QAction(QIcon(\":/icons/transaction_0\"), tr(\"&Verify message...\"), this);\n- exportAction = new QAction(QIcon(\":/icons/export\"), tr(\"&Export...\"), this);\n+ exportAction = new QAction(QIcon(\":/icons/export\"), this);\nexportAction->setToolTip(tr(\"Export the data in the current tab to a file\"));\nopenRPCConsoleAction = new QAction(QIcon(\":/icons/debugwindow\"), tr(\"&Debug window\"), this);\nopenRPCConsoleAction->setToolTip(tr(\"Open debugging and diagnostic console\"));\n"
}
]
| C++ | MIT License | vergecurrency/verge | Removed button labels
For this release the nav will only use icons and not have associating labels next to them. |
714,127 | 23.12.2017 08:17:33 | 25,200 | 2babe69c132f1f33014bc03d0a86400c6f3c8300 | updated splash screen
new clock icons | [
{
"change_type": "MODIFY",
"old_path": "src/qt/res/icons/clock1.png",
"new_path": "src/qt/res/icons/clock1.png",
"diff": "Binary files a/src/qt/res/icons/clock1.png and b/src/qt/res/icons/clock1.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/res/icons/clock2.png",
"new_path": "src/qt/res/icons/clock2.png",
"diff": "Binary files a/src/qt/res/icons/clock2.png and b/src/qt/res/icons/clock2.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/res/icons/clock3.png",
"new_path": "src/qt/res/icons/clock3.png",
"diff": "Binary files a/src/qt/res/icons/clock3.png and b/src/qt/res/icons/clock3.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/res/icons/clock4.png",
"new_path": "src/qt/res/icons/clock4.png",
"diff": "Binary files a/src/qt/res/icons/clock4.png and b/src/qt/res/icons/clock4.png differ\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/res/icons/clock5.png",
"new_path": "src/qt/res/icons/clock5.png",
"diff": "Binary files a/src/qt/res/icons/clock5.png and b/src/qt/res/icons/clock5.png differ\n"
}
]
| C++ | MIT License | vergecurrency/verge | updated splash screen
new clock icons |
714,127 | 23.12.2017 08:37:08 | 25,200 | bf935e0ffa80684eb7b5169a67e16206e9dcfe4a | updated CSS
Blockbrowser / block explorer | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/blockbrowser.ui",
"new_path": "src/qt/forms/blockbrowser.ui",
"diff": "</font>\n</property>\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" font-size:20px; font-weight:600; color:#000000;">Block Explorer </span></p></body></html></string>\n+ <string><html><head/><body><p><span style=" font-size:20px; font-weight:400; color:#0b3b47;">Block Explorer </span></p></body></html></string>\n</property>\n</widget>\n</item>\n@@ -126,7 +126,7 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n+border: 1px solid #0b3b47;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n@@ -218,7 +218,7 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n+border: 1px solid #0b3b47;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n@@ -249,7 +249,7 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n+border: 1px solid #0b3b47;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n@@ -404,7 +404,7 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n+border: 1px solid #0b3b47;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n"
}
]
| C++ | MIT License | vergecurrency/verge | updated CSS
Blockbrowser / block explorer |
714,127 | 23.12.2017 08:52:44 | 25,200 | be4ee49304a660d8df6d2afee1602d1772bad120 | updated CSS
changed border px width and color | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/rpcconsole.ui",
"new_path": "src/qt/forms/rpcconsole.ui",
"diff": "border-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n+border: 1px solid #0b3b47;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n@@ -404,7 +404,7 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;</string>\n+border: 1px solid #0b3b47;</string>\n</property>\n<property name=\"readOnly\">\n<bool>true</bool>\n"
}
]
| C++ | MIT License | vergecurrency/verge | updated CSS
changed border px width and color |
714,127 | 23.12.2017 08:54:15 | 25,200 | 19755d8d2e698e0e440547ed02f874351b52c29e | updated CSS
changed border width and color | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/aboutdialog.ui",
"new_path": "src/qt/forms/aboutdialog.ui",
"diff": "@@ -146,7 +146,7 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n+border: 1px solid #0b3b47;\nmin-height: 25px;\nmax-height: 25px;\nmin-width: 100px;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/askpassphrasedialog.ui",
"new_path": "src/qt/forms/askpassphrasedialog.ui",
"diff": "@@ -56,7 +56,7 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n+border: 1px solid #0b3b47;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n@@ -80,7 +80,7 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n+border: 1px solid #0b3b47;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n@@ -104,7 +104,7 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n+border: 1px solid #0b3b47;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n@@ -139,7 +139,7 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n+border: 1px solid #0b3b47;\n</string>\n</property>\n<property name=\"orientation\">\n"
}
]
| C++ | MIT License | vergecurrency/verge | updated CSS
changed border width and color |
714,127 | 23.12.2017 13:57:38 | 25,200 | 67940e8ec7b982d74f3d884e43ac68e09f583a93 | made boxes on overview white
needs to be reviewed | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/overviewpage.ui",
"new_path": "src/qt/forms/overviewpage.ui",
"diff": "<string>Form</string>\n</property>\n<layout class=\"QHBoxLayout\" name=\"horizontalLayout\" stretch=\"1,1\">\n+border: 1px solid #ffffff;\n<item>\n<layout class=\"QVBoxLayout\" name=\"verticalLayout_2\">\n+border: 1px solid #ffffff;\n<item>\n<widget class=\"QFrame\" name=\"frame\">\n<property name=\"frameShape\">\n<enum>QFrame::StyledPanel</enum>\n+border: 1px solid #ffffff;\n</property>\n<property name=\"frameShadow\">\n<enum>QFrame::Raised</enum>\n"
}
]
| C++ | MIT License | vergecurrency/verge | made boxes on overview white
needs to be reviewed |
714,128 | 23.12.2017 22:37:28 | 0 | 734a90c9b577179fbfe4aa33778bfb572878b87c | Add Stealth and SMessage RPC Files | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.am",
"new_path": "src/Makefile.am",
"diff": "@@ -156,6 +156,7 @@ libbitcoin_server_a_SOURCES = \\\nrpcmining.cpp \\\nrpcnet.cpp \\\nrpcrawtransaction.cpp \\\n+ rpcsmessage.cpp \\\n$(JSON_H) \\\n$(BITCOIN_CORE_H)\n@@ -166,6 +167,7 @@ libbitcoin_wallet_a_SOURCES = \\\ncrypter.cpp \\\nrpcdump.cpp \\\nrpcwallet.cpp \\\n+ rpcsmessage.cpp \\\nwallet.cpp \\\nwalletdb.cpp \\\n$(BITCOIN_CORE_H)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/bitcoinrpc.cpp",
"new_path": "src/bitcoinrpc.cpp",
"diff": "@@ -270,6 +270,27 @@ static const CRPCCommand vRPCCommands[] =\n{ \"resendtx\", &resendtx, false, true},\n{ \"makekeypair\", &makekeypair, false, true},\n{ \"sendalert\", &sendalert, false, false},\n+\n+ { \"getnewstealthaddress\", &getnewstealthaddress, false, false},\n+ { \"liststealthaddresses\", &liststealthaddresses, false, false},\n+ { \"importstealthaddress\", &importstealthaddress, false, false},\n+ { \"sendtostealthaddress\", &sendtostealthaddress, false, false},\n+ { \"scanforalltxns\", &scanforalltxns, false, false},\n+ { \"scanforstealthtxns\", &scanforstealthtxns, false, false},\n+\n+ { \"smsgenable\", &smsgenable, false, false},\n+ { \"smsgdisable\", &smsgdisable, false, false},\n+ { \"smsglocalkeys\", &smsglocalkeys, false, false},\n+ { \"smsgoptions\", &smsgoptions, false, false},\n+ { \"smsgscanchain\", &smsgscanchain, false, false},\n+ { \"smsgscanbuckets\", &smsgscanbuckets, false, false},\n+ { \"smsgaddkey\", &smsgaddkey, false, false},\n+ { \"smsggetpubkey\", &smsggetpubkey, false, false},\n+ { \"smsgsend\", &smsgsend, false, false},\n+ { \"smsgsendanon\", &smsgsendanon, false, false},\n+ { \"smsginbox\", &smsginbox, false, false},\n+ { \"smsgoutbox\", &smsgoutbox, false, false},\n+ { \"smsgbuckets\", &smsgbuckets, false, false},\n};\nCRPCTable::CRPCTable()\n"
},
{
"change_type": "MODIFY",
"old_path": "src/bitcoinrpc.h",
"new_path": "src/bitcoinrpc.h",
"diff": "@@ -204,4 +204,26 @@ extern json_spirit::Value getblockbynumber(const json_spirit::Array& params, boo\nextern json_spirit::Value getrawblockbynumber(const json_spirit::Array& params, bool fHelp);\nextern json_spirit::Value getcheckpoint(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value getnewstealthaddress(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value liststealthaddresses(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value importstealthaddress(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value sendtostealthaddress(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value clearwallettransactions(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value scanforalltxns(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value scanforstealthtxns(const json_spirit::Array& params, bool fHelp);\n+\n+extern json_spirit::Value smsgenable(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value smsgdisable(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value smsglocalkeys(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value smsgoptions(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value smsgscanchain(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value smsgscanbuckets(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value smsgaddkey(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value smsggetpubkey(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value smsgsend(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value smsgsendanon(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value smsginbox(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value smsgoutbox(const json_spirit::Array& params, bool fHelp);\n+extern json_spirit::Value smsgbuckets(const json_spirit::Array& params, bool fHelp);\n+\n#endif\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "src/rpcsmessage.cpp",
"diff": "+// Copyright (c) 2014 The ShadowCoin developers\n+// Distributed under the MIT/X11 software license, see the accompanying\n+// file COPYING or http://www.opensource.org/licenses/mit-license.php.\n+\n+#include \"main.h\"\n+#include \"bitcoinrpc.h\"\n+\n+#include <boost/lexical_cast.hpp>\n+\n+#include \"smessage.h\"\n+#include \"init.h\" // pwalletMain\n+\n+using namespace json_spirit;\n+using namespace std;\n+\n+extern void TxToJSON(const CTransaction& tx, const uint256 hashBlock, json_spirit::Object& entry);\n+\n+\n+\n+Value smsgenable(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() != 0)\n+ throw runtime_error(\n+ \"smsgenable \\n\"\n+ \"Enable secure messaging.\");\n+\n+ if (fSecMsgEnabled)\n+ throw runtime_error(\"Secure messaging is already enabled.\");\n+\n+ Object result;\n+ if (!SecureMsgEnable())\n+ {\n+ result.push_back(Pair(\"result\", \"Failed to enable secure messaging.\"));\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Enabled secure messaging.\"));\n+ }\n+ return result;\n+}\n+\n+Value smsgdisable(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() != 0)\n+ throw runtime_error(\n+ \"smsgdisable \\n\"\n+ \"Disable secure messaging.\");\n+ if (!fSecMsgEnabled)\n+ throw runtime_error(\"Secure messaging is already disabled.\");\n+\n+ Object result;\n+ if (!SecureMsgDisable())\n+ {\n+ result.push_back(Pair(\"result\", \"Failed to disable secure messaging.\"));\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Disabled secure messaging.\"));\n+ }\n+ return result;\n+}\n+\n+Value smsgoptions(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() > 3)\n+ throw runtime_error(\n+ \"smsgoptions [list|set <optname> <value>]\\n\"\n+ \"List and manage options.\");\n+\n+ std::string mode = \"list\";\n+ if (params.size() > 0)\n+ {\n+ mode = params[0].get_str();\n+ };\n+\n+ Object result;\n+\n+ if (mode == \"list\")\n+ {\n+ result.push_back(Pair(\"option\", std::string(\"newAddressRecv = \") + (smsgOptions.fNewAddressRecv ? \"true\" : \"false\")));\n+ result.push_back(Pair(\"option\", std::string(\"newAddressAnon = \") + (smsgOptions.fNewAddressAnon ? \"true\" : \"false\")));\n+\n+ result.push_back(Pair(\"result\", \"Success.\"));\n+ } else\n+ if (mode == \"set\")\n+ {\n+ if (params.size() < 3)\n+ {\n+ result.push_back(Pair(\"result\", \"Too few parameters.\"));\n+ result.push_back(Pair(\"expected\", \"set <optname> <value>\"));\n+ return result;\n+ };\n+\n+ std::string optname = params[1].get_str();\n+ std::string value = params[2].get_str();\n+\n+ if (optname == \"newAddressRecv\")\n+ {\n+ if (value == \"+\" || value == \"on\" || value == \"true\" || value == \"1\")\n+ {\n+ smsgOptions.fNewAddressRecv = true;\n+ } else\n+ if (value == \"-\" || value == \"off\" || value == \"false\" || value == \"0\")\n+ {\n+ smsgOptions.fNewAddressRecv = false;\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Unknown value.\"));\n+ return result;\n+ };\n+ result.push_back(Pair(\"set option\", std::string(\"newAddressRecv = \") + (smsgOptions.fNewAddressRecv ? \"true\" : \"false\")));\n+ } else\n+ if (optname == \"newAddressAnon\")\n+ {\n+ if (value == \"+\" || value == \"on\" || value == \"true\" || value == \"1\")\n+ {\n+ smsgOptions.fNewAddressAnon = true;\n+ } else\n+ if (value == \"-\" || value == \"off\" || value == \"false\" || value == \"0\")\n+ {\n+ smsgOptions.fNewAddressAnon = false;\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Unknown value.\"));\n+ return result;\n+ };\n+ result.push_back(Pair(\"set option\", std::string(\"newAddressAnon = \") + (smsgOptions.fNewAddressAnon ? \"true\" : \"false\")));\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Option not found.\"));\n+ return result;\n+ };\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Unknown Mode.\"));\n+ result.push_back(Pair(\"expected\", \"smsgoption [list|set <optname> <value>]\"));\n+ };\n+ return result;\n+}\n+\n+Value smsglocalkeys(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() > 3)\n+ throw runtime_error(\n+ \"smsglocalkeys [whitelist|all|wallet|recv <+/-> <address>|anon <+/-> <address>]\\n\"\n+ \"List and manage keys.\");\n+\n+ if (!fSecMsgEnabled)\n+ throw runtime_error(\"Secure messaging is disabled.\");\n+\n+ Object result;\n+\n+ std::string mode = \"whitelist\";\n+ if (params.size() > 0)\n+ {\n+ mode = params[0].get_str();\n+ };\n+\n+ char cbuf[256];\n+\n+ if (mode == \"whitelist\"\n+ || mode == \"all\")\n+ {\n+ uint32_t nKeys = 0;\n+ int all = mode == \"all\" ? 1 : 0;\n+ for (std::vector<SecMsgAddress>::iterator it = smsgAddresses.begin(); it != smsgAddresses.end(); ++it)\n+ {\n+ if (!all\n+ && !it->fReceiveEnabled)\n+ continue;\n+\n+ CBitcoinAddress coinAddress(it->sAddress);\n+ if (!coinAddress.IsValid())\n+ continue;\n+\n+ std::string sPublicKey;\n+\n+ CKeyID keyID;\n+ if (!coinAddress.GetKeyID(keyID))\n+ continue;\n+\n+ CPubKey pubKey;\n+ if (!pwalletMain->GetPubKey(keyID, pubKey))\n+ continue;\n+ if (!pubKey.IsValid()\n+ || !pubKey.IsCompressed())\n+ {\n+ continue;\n+ };\n+\n+\n+ sPublicKey = EncodeBase58(pubKey.Raw());\n+\n+ std::string sLabel = pwalletMain->mapAddressBook[keyID];\n+ std::string sInfo;\n+ if (all)\n+ sInfo = std::string(\"Receive \") + (it->fReceiveEnabled ? \"on, \" : \"off, \");\n+ sInfo += std::string(\"Anon \") + (it->fReceiveAnon ? \"on\" : \"off\");\n+ result.push_back(Pair(\"key\", it->sAddress + \" - \" + sPublicKey + \" \" + sInfo + \" - \" + sLabel));\n+\n+ nKeys++;\n+ };\n+\n+\n+ snprintf(cbuf, sizeof(cbuf), \"%u keys listed.\", nKeys);\n+ result.push_back(Pair(\"result\", std::string(cbuf)));\n+\n+ } else\n+ if (mode == \"recv\")\n+ {\n+ if (params.size() < 3)\n+ {\n+ result.push_back(Pair(\"result\", \"Too few parameters.\"));\n+ result.push_back(Pair(\"expected\", \"recv <+/-> <address>\"));\n+ return result;\n+ };\n+\n+ std::string op = params[1].get_str();\n+ std::string addr = params[2].get_str();\n+\n+ std::vector<SecMsgAddress>::iterator it;\n+ for (it = smsgAddresses.begin(); it != smsgAddresses.end(); ++it)\n+ {\n+ if (addr != it->sAddress)\n+ continue;\n+ break;\n+ };\n+\n+ if (it == smsgAddresses.end())\n+ {\n+ result.push_back(Pair(\"result\", \"Address not found.\"));\n+ return result;\n+ };\n+\n+ if (op == \"+\" || op == \"on\" || op == \"add\" || op == \"a\")\n+ {\n+ it->fReceiveEnabled = true;\n+ } else\n+ if (op == \"-\" || op == \"off\" || op == \"rem\" || op == \"r\")\n+ {\n+ it->fReceiveEnabled = false;\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Unknown operation.\"));\n+ return result;\n+ };\n+\n+ std::string sInfo;\n+ sInfo = std::string(\"Receive \") + (it->fReceiveEnabled ? \"on, \" : \"off,\");\n+ sInfo += std::string(\"Anon \") + (it->fReceiveAnon ? \"on\" : \"off\");\n+ result.push_back(Pair(\"result\", \"Success.\"));\n+ result.push_back(Pair(\"key\", it->sAddress + \" \" + sInfo));\n+ return result;\n+\n+ } else\n+ if (mode == \"anon\")\n+ {\n+ if (params.size() < 3)\n+ {\n+ result.push_back(Pair(\"result\", \"Too few parameters.\"));\n+ result.push_back(Pair(\"expected\", \"anon <+/-> <address>\"));\n+ return result;\n+ };\n+\n+ std::string op = params[1].get_str();\n+ std::string addr = params[2].get_str();\n+\n+ std::vector<SecMsgAddress>::iterator it;\n+ for (it = smsgAddresses.begin(); it != smsgAddresses.end(); ++it)\n+ {\n+ if (addr != it->sAddress)\n+ continue;\n+ break;\n+ };\n+\n+ if (it == smsgAddresses.end())\n+ {\n+ result.push_back(Pair(\"result\", \"Address not found.\"));\n+ return result;\n+ };\n+\n+ if (op == \"+\" || op == \"on\" || op == \"add\" || op == \"a\")\n+ {\n+ it->fReceiveAnon = true;\n+ } else\n+ if (op == \"-\" || op == \"off\" || op == \"rem\" || op == \"r\")\n+ {\n+ it->fReceiveAnon = false;\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Unknown operation.\"));\n+ return result;\n+ };\n+\n+ std::string sInfo;\n+ sInfo = std::string(\"Receive \") + (it->fReceiveEnabled ? \"on, \" : \"off,\");\n+ sInfo += std::string(\"Anon \") + (it->fReceiveAnon ? \"on\" : \"off\");\n+ result.push_back(Pair(\"result\", \"Success.\"));\n+ result.push_back(Pair(\"key\", it->sAddress + \" \" + sInfo));\n+ return result;\n+\n+ } else\n+ if (mode == \"wallet\")\n+ {\n+ uint32_t nKeys = 0;\n+ BOOST_FOREACH(const PAIRTYPE(CTxDestination, std::string)& entry, pwalletMain->mapAddressBook)\n+ {\n+ if (!IsMine(*pwalletMain, entry.first))\n+ continue;\n+\n+ CBitcoinAddress coinAddress(entry.first);\n+ if (!coinAddress.IsValid())\n+ continue;\n+\n+ std::string address;\n+ std::string sPublicKey;\n+ address = coinAddress.ToString();\n+\n+ CKeyID keyID;\n+ if (!coinAddress.GetKeyID(keyID))\n+ continue;\n+\n+ CPubKey pubKey;\n+ if (!pwalletMain->GetPubKey(keyID, pubKey))\n+ continue;\n+ if (!pubKey.IsValid()\n+ || !pubKey.IsCompressed())\n+ {\n+ continue;\n+ };\n+\n+ sPublicKey = EncodeBase58(pubKey.Raw());\n+\n+ result.push_back(Pair(\"key\", address + \" - \" + sPublicKey + \" - \" + entry.second));\n+ nKeys++;\n+ };\n+\n+ snprintf(cbuf, sizeof(cbuf), \"%u keys listed from wallet.\", nKeys);\n+ result.push_back(Pair(\"result\", std::string(cbuf)));\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Unknown Mode.\"));\n+ result.push_back(Pair(\"expected\", \"smsglocalkeys [whitelist|all|wallet|recv <+/-> <address>|anon <+/-> <address>]\"));\n+ };\n+\n+ return result;\n+};\n+\n+Value smsgscanchain(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() != 0)\n+ throw runtime_error(\n+ \"smsgscanchain \\n\"\n+ \"Look for public keys in the block chain.\");\n+\n+ if (!fSecMsgEnabled)\n+ throw runtime_error(\"Secure messaging is disabled.\");\n+\n+ Object result;\n+ if (!SecureMsgScanBlockChain())\n+ {\n+ result.push_back(Pair(\"result\", \"Scan Chain Failed.\"));\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Scan Chain Completed.\"));\n+ }\n+ return result;\n+}\n+\n+Value smsgscanbuckets(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() != 0)\n+ throw runtime_error(\n+ \"smsgscanbuckets \\n\"\n+ \"Force rescan of all messages in the bucket store.\");\n+\n+ if (!fSecMsgEnabled)\n+ throw runtime_error(\"Secure messaging is disabled.\");\n+\n+ if (pwalletMain->IsLocked())\n+ throw runtime_error(\"Wallet is locked.\");\n+\n+ Object result;\n+ if (!SecureMsgScanBuckets())\n+ {\n+ result.push_back(Pair(\"result\", \"Scan Buckets Failed.\"));\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Scan Buckets Completed.\"));\n+ }\n+ return result;\n+}\n+\n+Value smsgaddkey(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() != 2)\n+ throw runtime_error(\n+ \"smsgaddkey <address> <pubkey>\\n\"\n+ \"Add address, pubkey pair to database.\");\n+\n+ if (!fSecMsgEnabled)\n+ throw runtime_error(\"Secure messaging is disabled.\");\n+\n+ std::string addr = params[0].get_str();\n+ std::string pubk = params[1].get_str();\n+\n+ Object result;\n+ int rv = SecureMsgAddAddress(addr, pubk);\n+ if (rv != 0)\n+ {\n+ result.push_back(Pair(\"result\", \"Public key not added to db.\"));\n+ switch (rv)\n+ {\n+ case 2: result.push_back(Pair(\"reason\", \"publicKey is invalid.\")); break;\n+ case 3: result.push_back(Pair(\"reason\", \"publicKey does not match address.\")); break;\n+ case 4: result.push_back(Pair(\"reason\", \"address is already in db.\")); break;\n+ case 5: result.push_back(Pair(\"reason\", \"address is invalid.\")); break;\n+ default: result.push_back(Pair(\"reason\", \"error.\")); break;\n+ };\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Added public key to db.\"));\n+ };\n+\n+ return result;\n+}\n+\n+Value smsggetpubkey(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() != 1)\n+ throw runtime_error(\n+ \"smsggetpubkey <address>\\n\"\n+ \"Return the base58 encoded compressed public key for an address.\\n\"\n+ \"Tests localkeys first, then looks in public key db.\\n\");\n+\n+ if (!fSecMsgEnabled)\n+ throw runtime_error(\"Secure messaging is disabled.\");\n+\n+\n+ std::string address = params[0].get_str();\n+ std::string publicKey;\n+\n+ Object result;\n+ int rv = SecureMsgGetLocalPublicKey(address, publicKey);\n+ switch (rv)\n+ {\n+ case 0:\n+ result.push_back(Pair(\"result\", \"Success.\"));\n+ result.push_back(Pair(\"address in wallet\", address));\n+ result.push_back(Pair(\"compressed public key\", publicKey));\n+ return result; // success, don't check db\n+ case 2:\n+ case 3:\n+ result.push_back(Pair(\"result\", \"Failed.\"));\n+ result.push_back(Pair(\"message\", \"Invalid address.\"));\n+ return result;\n+ case 4:\n+ break; // check db\n+ //case 1:\n+ default:\n+ result.push_back(Pair(\"result\", \"Failed.\"));\n+ result.push_back(Pair(\"message\", \"Error.\"));\n+ return result;\n+ };\n+\n+ CBitcoinAddress coinAddress(address);\n+\n+\n+ CKeyID keyID;\n+ if (!coinAddress.GetKeyID(keyID))\n+ {\n+ result.push_back(Pair(\"result\", \"Failed.\"));\n+ result.push_back(Pair(\"message\", \"Invalid address.\"));\n+ return result;\n+ };\n+\n+ CPubKey cpkFromDB;\n+ rv = SecureMsgGetStoredKey(keyID, cpkFromDB);\n+\n+ switch (rv)\n+ {\n+ case 0:\n+ if (!cpkFromDB.IsValid()\n+ || !cpkFromDB.IsCompressed())\n+ {\n+ result.push_back(Pair(\"result\", \"Failed.\"));\n+ result.push_back(Pair(\"message\", \"Invalid address.\"));\n+ } else\n+ {\n+ //cpkFromDB.SetCompressedPubKey(); // make sure key is compressed\n+ publicKey = EncodeBase58(cpkFromDB.Raw());\n+\n+ result.push_back(Pair(\"result\", \"Success.\"));\n+ result.push_back(Pair(\"peer address in DB\", address));\n+ result.push_back(Pair(\"compressed public key\", publicKey));\n+ };\n+ break;\n+ case 2:\n+ result.push_back(Pair(\"result\", \"Failed.\"));\n+ result.push_back(Pair(\"message\", \"Address not found in wallet or db.\"));\n+ return result;\n+ //case 1:\n+ default:\n+ result.push_back(Pair(\"result\", \"Failed.\"));\n+ result.push_back(Pair(\"message\", \"Error, GetStoredKey().\"));\n+ return result;\n+ };\n+\n+ return result;\n+}\n+\n+Value smsgsend(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() != 3)\n+ throw runtime_error(\n+ \"smsgsend <addrFrom> <addrTo> <message>\\n\"\n+ \"Send an encrypted message from addrFrom to addrTo.\");\n+\n+ if (!fSecMsgEnabled)\n+ throw runtime_error(\"Secure messaging is disabled.\");\n+\n+ std::string addrFrom = params[0].get_str();\n+ std::string addrTo = params[1].get_str();\n+ std::string msg = params[2].get_str();\n+\n+\n+ Object result;\n+\n+ std::string sError;\n+ if (SecureMsgSend(addrFrom, addrTo, msg, sError) != 0)\n+ {\n+ result.push_back(Pair(\"result\", \"Send failed.\"));\n+ result.push_back(Pair(\"error\", sError));\n+ } else\n+ result.push_back(Pair(\"result\", \"Sent.\"));\n+\n+ return result;\n+}\n+\n+Value smsgsendanon(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() != 2)\n+ throw runtime_error(\n+ \"smsgsendanon <addrTo> <message>\\n\"\n+ \"Send an anonymous encrypted message to addrTo.\");\n+\n+ if (!fSecMsgEnabled)\n+ throw runtime_error(\"Secure messaging is disabled.\");\n+\n+ std::string addrFrom = \"anon\";\n+ std::string addrTo = params[0].get_str();\n+ std::string msg = params[1].get_str();\n+\n+\n+ Object result;\n+ std::string sError;\n+ if (SecureMsgSend(addrFrom, addrTo, msg, sError) != 0)\n+ {\n+ result.push_back(Pair(\"result\", \"Send failed.\"));\n+ result.push_back(Pair(\"error\", sError));\n+ } else\n+ result.push_back(Pair(\"result\", \"Sent.\"));\n+\n+ return result;\n+}\n+\n+Value smsginbox(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() > 1) // defaults to read\n+ throw runtime_error(\n+ \"smsginbox [all|unread|clear]\\n\"\n+ \"Decrypt and display all received messages.\\n\"\n+ \"Warning: clear will delete all messages.\");\n+\n+ if (!fSecMsgEnabled)\n+ throw runtime_error(\"Secure messaging is disabled.\");\n+\n+ if (pwalletMain->IsLocked())\n+ throw runtime_error(\"Wallet is locked.\");\n+\n+ std::string mode = \"unread\";\n+ if (params.size() > 0)\n+ {\n+ mode = params[0].get_str();\n+ }\n+\n+\n+ Object result;\n+\n+ std::vector<unsigned char> vchKey;\n+ vchKey.resize(16);\n+ memset(&vchKey[0], 0, 16);\n+\n+ {\n+ LOCK(cs_smsgDB);\n+\n+ SecMsgDB dbInbox;\n+\n+ if (!dbInbox.Open(\"cr+\"))\n+ throw runtime_error(\"Could not open DB.\");\n+\n+ uint32_t nMessages = 0;\n+ char cbuf[256];\n+\n+ std::string sPrefix(\"im\");\n+ unsigned char chKey[18];\n+\n+ if (mode == \"clear\")\n+ {\n+ dbInbox.TxnBegin();\n+\n+ leveldb::Iterator* it = dbInbox.pdb->NewIterator(leveldb::ReadOptions());\n+ while (dbInbox.NextSmesgKey(it, sPrefix, chKey))\n+ {\n+ dbInbox.EraseSmesg(chKey);\n+ nMessages++;\n+ };\n+ delete it;\n+ dbInbox.TxnCommit();\n+\n+ snprintf(cbuf, sizeof(cbuf), \"Deleted %u messages.\", nMessages);\n+ result.push_back(Pair(\"result\", std::string(cbuf)));\n+ } else\n+ if (mode == \"all\"\n+ || mode == \"unread\")\n+ {\n+ int fCheckReadStatus = mode == \"unread\" ? 1 : 0;\n+\n+ SecMsgStored smsgStored;\n+ MessageData msg;\n+\n+ dbInbox.TxnBegin();\n+\n+ leveldb::Iterator* it = dbInbox.pdb->NewIterator(leveldb::ReadOptions());\n+ while (dbInbox.NextSmesg(it, sPrefix, chKey, smsgStored))\n+ {\n+ if (fCheckReadStatus\n+ && !(smsgStored.status & SMSG_MASK_UNREAD))\n+ continue;\n+\n+ uint32_t nPayload = smsgStored.vchMessage.size() - SMSG_HDR_LEN;\n+ if (SecureMsgDecrypt(false, smsgStored.sAddrTo, &smsgStored.vchMessage[0], &smsgStored.vchMessage[SMSG_HDR_LEN], nPayload, msg) == 0)\n+ {\n+ Object objM;\n+ objM.push_back(Pair(\"received\", getTimeString(smsgStored.timeReceived, cbuf, sizeof(cbuf))));\n+ objM.push_back(Pair(\"sent\", getTimeString(msg.timestamp, cbuf, sizeof(cbuf))));\n+ objM.push_back(Pair(\"from\", msg.sFromAddress));\n+ objM.push_back(Pair(\"to\", smsgStored.sAddrTo));\n+ objM.push_back(Pair(\"text\", std::string((char*)&msg.vchMessage[0]))); // ugh\n+\n+ result.push_back(Pair(\"message\", objM));\n+ } else\n+ {\n+ result.push_back(Pair(\"message\", \"Could not decrypt.\"));\n+ };\n+\n+ if (fCheckReadStatus)\n+ {\n+ smsgStored.status &= ~SMSG_MASK_UNREAD;\n+ dbInbox.WriteSmesg(chKey, smsgStored);\n+ };\n+ nMessages++;\n+ };\n+ delete it;\n+ dbInbox.TxnCommit();\n+\n+ snprintf(cbuf, sizeof(cbuf), \"%u messages shown.\", nMessages);\n+ result.push_back(Pair(\"result\", std::string(cbuf)));\n+\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Unknown Mode.\"));\n+ result.push_back(Pair(\"expected\", \"[all|unread|clear].\"));\n+ };\n+ }\n+\n+ return result;\n+};\n+\n+Value smsgoutbox(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() > 1) // defaults to read\n+ throw runtime_error(\n+ \"smsgoutbox [all|clear]\\n\"\n+ \"Decrypt and display all sent messages.\\n\"\n+ \"Warning: clear will delete all sent messages.\");\n+\n+ if (!fSecMsgEnabled)\n+ throw runtime_error(\"Secure messaging is disabled.\");\n+\n+ if (pwalletMain->IsLocked())\n+ throw runtime_error(\"Wallet is locked.\");\n+\n+ std::string mode = \"all\";\n+ if (params.size() > 0)\n+ {\n+ mode = params[0].get_str();\n+ }\n+\n+\n+ Object result;\n+\n+ std::string sPrefix(\"sm\");\n+ unsigned char chKey[18];\n+ memset(&chKey[0], 0, 18);\n+\n+ {\n+ LOCK(cs_smsgDB);\n+\n+ SecMsgDB dbOutbox;\n+\n+ if (!dbOutbox.Open(\"cr+\"))\n+ throw runtime_error(\"Could not open DB.\");\n+\n+ uint32_t nMessages = 0;\n+ char cbuf[256];\n+\n+ if (mode == \"clear\")\n+ {\n+ dbOutbox.TxnBegin();\n+\n+ leveldb::Iterator* it = dbOutbox.pdb->NewIterator(leveldb::ReadOptions());\n+ while (dbOutbox.NextSmesgKey(it, sPrefix, chKey))\n+ {\n+ dbOutbox.EraseSmesg(chKey);\n+ nMessages++;\n+ };\n+ delete it;\n+ dbOutbox.TxnCommit();\n+\n+\n+ snprintf(cbuf, sizeof(cbuf), \"Deleted %u messages.\", nMessages);\n+ result.push_back(Pair(\"result\", std::string(cbuf)));\n+ } else\n+ if (mode == \"all\")\n+ {\n+ SecMsgStored smsgStored;\n+ MessageData msg;\n+ leveldb::Iterator* it = dbOutbox.pdb->NewIterator(leveldb::ReadOptions());\n+ while (dbOutbox.NextSmesg(it, sPrefix, chKey, smsgStored))\n+ {\n+ uint32_t nPayload = smsgStored.vchMessage.size() - SMSG_HDR_LEN;\n+\n+ if (SecureMsgDecrypt(false, smsgStored.sAddrOutbox, &smsgStored.vchMessage[0], &smsgStored.vchMessage[SMSG_HDR_LEN], nPayload, msg) == 0)\n+ {\n+ Object objM;\n+ objM.push_back(Pair(\"sent\", getTimeString(msg.timestamp, cbuf, sizeof(cbuf))));\n+ objM.push_back(Pair(\"from\", msg.sFromAddress));\n+ objM.push_back(Pair(\"to\", smsgStored.sAddrTo));\n+ objM.push_back(Pair(\"text\", std::string((char*)&msg.vchMessage[0]))); // ugh\n+\n+ result.push_back(Pair(\"message\", objM));\n+ } else\n+ {\n+ result.push_back(Pair(\"message\", \"Could not decrypt.\"));\n+ };\n+ nMessages++;\n+ };\n+ delete it;\n+\n+ snprintf(cbuf, sizeof(cbuf), \"%u sent messages shown.\", nMessages);\n+ result.push_back(Pair(\"result\", std::string(cbuf)));\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Unknown Mode.\"));\n+ result.push_back(Pair(\"expected\", \"[all|clear].\"));\n+ };\n+ }\n+\n+ return result;\n+};\n+\n+\n+Value smsgbuckets(const Array& params, bool fHelp)\n+{\n+ if (fHelp || params.size() > 1)\n+ throw runtime_error(\n+ \"smsgbuckets [stats|dump]\\n\"\n+ \"Display some statistics.\");\n+\n+ if (!fSecMsgEnabled)\n+ throw runtime_error(\"Secure messaging is disabled.\");\n+\n+ std::string mode = \"stats\";\n+ if (params.size() > 0)\n+ {\n+ mode = params[0].get_str();\n+ };\n+\n+ Object result;\n+\n+ char cbuf[256];\n+ if (mode == \"stats\")\n+ {\n+ uint32_t nBuckets = 0;\n+ uint32_t nMessages = 0;\n+ uint64_t nBytes = 0;\n+ {\n+ LOCK(cs_smsg);\n+ std::map<int64_t, SecMsgBucket>::iterator it;\n+ it = smsgBuckets.begin();\n+\n+ for (it = smsgBuckets.begin(); it != smsgBuckets.end(); ++it)\n+ {\n+ std::set<SecMsgToken>& tokenSet = it->second.setTokens;\n+\n+ std::string sBucket = boost::lexical_cast<std::string>(it->first);\n+ std::string sFile = sBucket + \"_01.dat\";\n+\n+ snprintf(cbuf, sizeof(cbuf), \"%\"PRIszu, tokenSet.size());\n+ std::string snContents(cbuf);\n+\n+ std::string sHash = boost::lexical_cast<std::string>(it->second.hash);\n+\n+ nBuckets++;\n+ nMessages += tokenSet.size();\n+\n+ Object objM;\n+ objM.push_back(Pair(\"bucket\", sBucket));\n+ objM.push_back(Pair(\"time\", getTimeString(it->first, cbuf, sizeof(cbuf))));\n+ objM.push_back(Pair(\"no. messages\", snContents));\n+ objM.push_back(Pair(\"hash\", sHash));\n+ objM.push_back(Pair(\"last changed\", getTimeString(it->second.timeChanged, cbuf, sizeof(cbuf))));\n+\n+ boost::filesystem::path fullPath = GetDataDir() / \"smsgStore\" / sFile;\n+\n+\n+ if (!boost::filesystem::exists(fullPath))\n+ {\n+ // -- If there is a file for an empty bucket something is wrong.\n+ if (tokenSet.size() == 0)\n+ objM.push_back(Pair(\"file size\", \"Empty bucket.\"));\n+ else\n+ objM.push_back(Pair(\"file size, error\", \"File not found.\"));\n+ } else\n+ {\n+ try {\n+\n+ uint64_t nFBytes = 0;\n+ nFBytes = boost::filesystem::file_size(fullPath);\n+ nBytes += nFBytes;\n+ objM.push_back(Pair(\"file size\", fsReadable(nFBytes)));\n+ } catch (const boost::filesystem::filesystem_error& ex)\n+ {\n+ objM.push_back(Pair(\"file size, error\", ex.what()));\n+ };\n+ };\n+\n+ result.push_back(Pair(\"bucket\", objM));\n+ };\n+ }; // LOCK(cs_smsg);\n+\n+\n+ std::string snBuckets = boost::lexical_cast<std::string>(nBuckets);\n+ std::string snMessages = boost::lexical_cast<std::string>(nMessages);\n+\n+ Object objM;\n+ objM.push_back(Pair(\"buckets\", snBuckets));\n+ objM.push_back(Pair(\"messages\", snMessages));\n+ objM.push_back(Pair(\"size\", fsReadable(nBytes)));\n+ result.push_back(Pair(\"total\", objM));\n+\n+ } else\n+ if (mode == \"dump\")\n+ {\n+ {\n+ LOCK(cs_smsg);\n+ std::map<int64_t, SecMsgBucket>::iterator it;\n+ it = smsgBuckets.begin();\n+\n+ for (it = smsgBuckets.begin(); it != smsgBuckets.end(); ++it)\n+ {\n+ std::string sFile = boost::lexical_cast<std::string>(it->first) + \"_01.dat\";\n+\n+ try {\n+ boost::filesystem::path fullPath = GetDataDir() / \"smsgStore\" / sFile;\n+ boost::filesystem::remove(fullPath);\n+ } catch (const boost::filesystem::filesystem_error& ex)\n+ {\n+ //objM.push_back(Pair(\"file size, error\", ex.what()));\n+ printf(\"Error removing bucket file %s.\\n\", ex.what());\n+ };\n+ };\n+ smsgBuckets.clear();\n+ }; // LOCK(cs_smsg);\n+\n+ result.push_back(Pair(\"result\", \"Removed all buckets.\"));\n+\n+ } else\n+ {\n+ result.push_back(Pair(\"result\", \"Unknown Mode.\"));\n+ result.push_back(Pair(\"expected\", \"[stats|dump].\"));\n+ };\n+\n+\n+ return result;\n+};\n"
}
]
| C++ | MIT License | vergecurrency/verge | Add Stealth and SMessage RPC Files |
714,128 | 24.12.2017 00:05:58 | 0 | b28d3a69a04dd81321f705ee547b8bfe9ab12b1f | Swap back to int64 | [
{
"change_type": "MODIFY",
"old_path": "src/rpcwallet.cpp",
"new_path": "src/rpcwallet.cpp",
"diff": "@@ -766,6 +766,7 @@ Value sendmany(const Array& params, bool fHelp)\nCReserveKey keyChange(pwalletMain);\nint64 nFeeRequired = 0;\nint nChangePos;\n+\nbool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired, nChangePos);\nif (!fCreated)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/util.h",
"new_path": "src/util.h",
"diff": "typedef long long int64;\ntypedef unsigned long long uint64;\n+typedef int32_t int32;\nstatic const int64 COIN = 1000000;\nstatic const int64 CENT = 10000;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/wallet.cpp",
"new_path": "src/wallet.cpp",
"diff": "@@ -1449,8 +1449,7 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int\nreturn true;\n}\n-\n-bool CWallet::CreateTransaction(const vector<pair<CScript, int64_t> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, int32_t& nChangePos, const CCoinControl* coinControl)\n+bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, int32& nChangePos, const CCoinControl* coinControl)\n{\nint64 nValue = 0;\nBOOST_FOREACH (const PAIRTYPE(CScript, int64)& s, vecSend)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/wallet.h",
"new_path": "src/wallet.h",
"diff": "@@ -185,8 +185,9 @@ public:\nint64 GetStake() const;\nint64 GetNewMint() const;\n- bool CreateTransaction(const std::vector<std::pair<CScript, int64_t> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, int32_t& nChangePos, const CCoinControl *coinControl=NULL);\n- bool CreateTransaction(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, const CCoinControl *coinControl=NULL);\n+ bool CreateTransaction(const std::vector<std::pair<CScript, int64> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, int32& nChangePos, const CCoinControl *coinControl=NULL);\n+ bool CreateTransaction(CScript scriptPubKey, int64 nValue, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, const CCoinControl *coinControl=NULL);\n+\nbool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey);\nbool CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int64 nSearchInterval, CTransaction& txNew);\nstd::string SendMoney(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee=false);\n"
}
]
| C++ | MIT License | vergecurrency/verge | Swap back to int64 |
714,128 | 24.12.2017 00:44:15 | 0 | 707f925e5b356aee704441f69a77c852dc5d01b8 | Switch to int64 | [
{
"change_type": "MODIFY",
"old_path": "src/rpcsmessage.cpp",
"new_path": "src/rpcsmessage.cpp",
"diff": "@@ -795,7 +795,7 @@ Value smsgbuckets(const Array& params, bool fHelp)\nuint64_t nBytes = 0;\n{\nLOCK(cs_smsg);\n- std::map<int64_t, SecMsgBucket>::iterator it;\n+ std::map<int64, SecMsgBucket>::iterator it;\nit = smsgBuckets.begin();\nfor (it = smsgBuckets.begin(); it != smsgBuckets.end(); ++it)\n@@ -863,7 +863,7 @@ Value smsgbuckets(const Array& params, bool fHelp)\n{\n{\nLOCK(cs_smsg);\n- std::map<int64_t, SecMsgBucket>::iterator it;\n+ std::map<int64, SecMsgBucket>::iterator it;\nit = smsgBuckets.begin();\nfor (it = smsgBuckets.begin(); it != smsgBuckets.end(); ++it)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/rpcwallet.cpp",
"new_path": "src/rpcwallet.cpp",
"diff": "@@ -1966,7 +1966,7 @@ Value sendtostealthaddress(const Array& params, bool fHelp)\nthrow JSONRPCError(RPC_WALLET_UNLOCK_NEEDED, \"Error: Please enter the wallet passphrase with walletpassphrase first.\");\nstd::string sEncoded = params[0].get_str();\n- int64_t nAmount = AmountFromValue(params[1]);\n+ int64 nAmount = AmountFromValue(params[1]);\nstd::string sNarr;\nif (params.size() > 2 && params[2].type() != null_type && !params[2].get_str().empty())\n"
},
{
"change_type": "MODIFY",
"old_path": "src/wallet.cpp",
"new_path": "src/wallet.cpp",
"diff": "@@ -1583,9 +1583,9 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW\nreturn true;\n}\n-bool CWallet::CreateTransaction(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, const CCoinControl* coinControl)\n+bool CWallet::CreateTransaction(CScript scriptPubKey, int64 nValue, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, const CCoinControl* coinControl)\n{\n- vector< pair<CScript, int64_t> > vecSend;\n+ vector< pair<CScript, int64> > vecSend;\nvecSend.push_back(make_pair(scriptPubKey, nValue));\nif (sNarr.length() > 0)\n@@ -1935,7 +1935,7 @@ bool CWallet::UpdateStealthAddress(std::string &addr, std::string &label, bool a\nreturn true;\n}\n-bool CWallet::CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, const CCoinControl* coinControl)\n+bool CWallet::CreateStealthTransaction(CScript scriptPubKey, int64 nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, const CCoinControl* coinControl)\n{\nvector< pair<CScript, int64> > vecSend;\nvecSend.push_back(make_pair(scriptPubKey, nValue));\n@@ -1975,10 +1975,10 @@ bool CWallet::CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std\nreturn rv;\n}\n-string CWallet::SendStealthMoney(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee)\n+string CWallet::SendStealthMoney(CScript scriptPubKey, int64 nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee)\n{\nCReserveKey reservekey(this);\n- int64_t nFeeRequired;\n+ int64 nFeeRequired;\nif (IsLocked())\n{\n@@ -2012,7 +2012,7 @@ string CWallet::SendStealthMoney(CScript scriptPubKey, int64_t nValue, std::vect\nreturn \"\";\n}\n-bool CWallet::SendStealthMoneyToDestination(CStealthAddress& sxAddress, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, std::string& sError, bool fAskFee)\n+bool CWallet::SendStealthMoneyToDestination(CStealthAddress& sxAddress, int64 nValue, std::string& sNarr, CWalletTx& wtxNew, std::string& sError, bool fAskFee)\n{\n// -- Check amount\nif (nValue <= 0)\n@@ -2387,7 +2387,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)\n-string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee)\n+string CWallet::SendMoney(CScript scriptPubKey, int64 nValue, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee)\n{\nCReserveKey reservekey(this);\nint64 nFeeRequired;\n@@ -2426,7 +2426,7 @@ string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, std::string& sNa\n-string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee)\n+string CWallet::SendMoneyToDestination(const CTxDestination& address, int64 nValue, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee)\n{\n// Check amount\nif (nValue <= 0)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/wallet.h",
"new_path": "src/wallet.h",
"diff": "@@ -190,16 +190,16 @@ public:\nbool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey);\nbool CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int64 nSearchInterval, CTransaction& txNew);\n- std::string SendMoney(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee=false);\n+ std::string SendMoney(CScript scriptPubKey, int64 nValue, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee=false);\nstd::string SendMoneyToDestination(const CTxDestination& address, int64 nValue, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee=false);\nbool AddStealthAddress(CStealthAddress& sxAddr);\nbool NewStealthAddress(std::string& sError, std::string& sLabel, CStealthAddress& sxAddr);\nbool UnlockStealthAddresses(const CKeyingMaterial& vMasterKeyIn);\nbool UpdateStealthAddress(std::string &addr, std::string &label, bool addIfNotExist);\n- bool CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, const CCoinControl* coinControl=NULL);\n- std::string SendStealthMoney(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee);\n- bool SendStealthMoneyToDestination(CStealthAddress& sxAddress, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, std::string& sError, bool fAskFee=false);\n+ bool CreateStealthTransaction(CScript scriptPubKey, int64 nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, const CCoinControl* coinControl=NULL);\n+ std::string SendStealthMoney(CScript scriptPubKey, int64 nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee);\n+ bool SendStealthMoneyToDestination(CStealthAddress& sxAddress, int64 nValue, std::string& sNarr, CWalletTx& wtxNew, std::string& sError, bool fAskFee=false);\nbool FindStealthTransactions(const CTransaction& tx, mapValue_t& mapNarr);\nbool NewKeyPool();\n"
}
]
| C++ | MIT License | vergecurrency/verge | Switch to int64 |
714,128 | 24.12.2017 21:06:29 | 0 | 8104bc1d4f7a4f7d1e11799cef3e870048a9adbb | Fix Var types to fix linux compiling | [
{
"change_type": "MODIFY",
"old_path": "src/rpcwallet.cpp",
"new_path": "src/rpcwallet.cpp",
"diff": "@@ -765,7 +765,7 @@ Value sendmany(const Array& params, bool fHelp)\n// Send\nCReserveKey keyChange(pwalletMain);\nint64 nFeeRequired = 0;\n- int nChangePos;\n+ int32_t nChangePos;\nbool fCreated = pwalletMain->CreateTransaction(vecSend, wtx, keyChange, nFeeRequired, nChangePos);\nif (!fCreated)\n{\n"
},
{
"change_type": "MODIFY",
"old_path": "src/wallet.cpp",
"new_path": "src/wallet.cpp",
"diff": "@@ -1450,7 +1450,7 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int\n}\n-bool CWallet::CreateTransaction(const vector<pair<CScript, int64_t> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, int32_t& nChangePos, const CCoinControl* coinControl)\n+bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, int32_t& nChangePos, const CCoinControl* coinControl)\n{\nint64 nValue = 0;\nBOOST_FOREACH (const PAIRTYPE(CScript, int64)& s, vecSend)\n@@ -1584,9 +1584,9 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64_t> >& vecSend,\nreturn true;\n}\n-bool CWallet::CreateTransaction(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, const CCoinControl* coinControl)\n+bool CWallet::CreateTransaction(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, const CCoinControl* coinControl)\n{\n- vector< pair<CScript, int64_t> > vecSend;\n+ vector< pair<CScript, int64> > vecSend;\nvecSend.push_back(make_pair(scriptPubKey, nValue));\nif (sNarr.length() > 0)\n@@ -1936,7 +1936,7 @@ bool CWallet::UpdateStealthAddress(std::string &addr, std::string &label, bool a\nreturn true;\n}\n-bool CWallet::CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, const CCoinControl* coinControl)\n+bool CWallet::CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, const CCoinControl* coinControl)\n{\nvector< pair<CScript, int64> > vecSend;\nvecSend.push_back(make_pair(scriptPubKey, nValue));\n@@ -1979,7 +1979,7 @@ bool CWallet::CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std\nstring CWallet::SendStealthMoney(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee)\n{\nCReserveKey reservekey(this);\n- int64_t nFeeRequired;\n+ int64 nFeeRequired;\nif (IsLocked())\n{\n@@ -2427,7 +2427,7 @@ string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, std::string& sNa\n-string CWallet::SendMoneyToDestination(const CTxDestination& address, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee)\n+string CWallet::SendMoneyToDestination(const CTxDestination& address, int64 nValue, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee)\n{\n// Check amount\nif (nValue <= 0)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/wallet.h",
"new_path": "src/wallet.h",
"diff": "@@ -185,8 +185,8 @@ public:\nint64 GetStake() const;\nint64 GetNewMint() const;\n- bool CreateTransaction(const std::vector<std::pair<CScript, int64_t> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, int32_t& nChangePos, const CCoinControl *coinControl=NULL);\n- bool CreateTransaction(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, const CCoinControl *coinControl=NULL);\n+ bool CreateTransaction(const std::vector<std::pair<CScript, int64> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, int32_t& nChangePos, const CCoinControl *coinControl=NULL);\n+ bool CreateTransaction(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, const CCoinControl *coinControl=NULL);\nbool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey);\nbool CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int64 nSearchInterval, CTransaction& txNew);\nstd::string SendMoney(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee=false);\n@@ -196,7 +196,7 @@ public:\nbool UnlockStealthAddresses(const CKeyingMaterial& vMasterKeyIn);\nbool UpdateStealthAddress(std::string &addr, std::string &label, bool addIfNotExist);\n- bool CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64_t& nFeeRet, const CCoinControl* coinControl=NULL);\n+ bool CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, const CCoinControl* coinControl=NULL);\nstd::string SendStealthMoney(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee);\nbool SendStealthMoneyToDestination(CStealthAddress& sxAddress, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, std::string& sError, bool fAskFee=false);\nbool FindStealthTransactions(const CTransaction& tx, mapValue_t& mapNarr);\n"
}
]
| C++ | MIT License | vergecurrency/verge | Fix Var types to fix linux compiling |
714,103 | 24.12.2017 23:27:40 | 14,400 | be6f5662697abb18445cead83d13dd2fabf7f2b7 | Fix for invalid constructor method arguments for QIcon, just added blank strings. | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -211,37 +211,37 @@ void BitcoinGUI::createActions()\n{\nQActionGroup *tabGroup = new QActionGroup(this);\n- overviewAction = new QAction(QIcon(\":/icons/overview\"), this);\n+ overviewAction = new QAction(QIcon(\":/icons/overview\"), \"\", this);\noverviewAction->setToolTip(tr(\"Show general overview of wallet\"));\noverviewAction->setCheckable(true);\noverviewAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_1));\ntabGroup->addAction(overviewAction);\n- sendCoinsAction = new QAction(QIcon(\":/icons/send\"), this);\n+ sendCoinsAction = new QAction(QIcon(\":/icons/send\"), \"\", this);\nsendCoinsAction->setToolTip(tr(\"Send coins to a VERGE address\"));\nsendCoinsAction->setCheckable(true);\nsendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));\ntabGroup->addAction(sendCoinsAction);\n- receiveCoinsAction = new QAction(QIcon(\":/icons/receiving_addresses\"), this);\n+ receiveCoinsAction = new QAction(QIcon(\":/icons/receiving_addresses\"), \"\", this);\nreceiveCoinsAction->setToolTip(tr(\"Show the list of addresses for receiving payments\"));\nreceiveCoinsAction->setCheckable(true);\nreceiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));\ntabGroup->addAction(receiveCoinsAction);\n- historyAction = new QAction(QIcon(\":/icons/history\"), this);\n+ historyAction = new QAction(QIcon(\":/icons/history\"), \"\", this);\nhistoryAction->setToolTip(tr(\"Browse transaction history\"));\nhistoryAction->setCheckable(true);\nhistoryAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4));\ntabGroup->addAction(historyAction);\n- addressBookAction = new QAction(QIcon(\":/icons/address-book\"), this);\n+ addressBookAction = new QAction(QIcon(\":/icons/address-book\"), \"\", this);\naddressBookAction->setToolTip(tr(\"Edit the list of stored addresses and labels\"));\naddressBookAction->setCheckable(true);\naddressBookAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_5));\ntabGroup->addAction(addressBookAction);\n- blockAction = new QAction(QIcon(\":/icons/block\"), this);\n+ blockAction = new QAction(QIcon(\":/icons/block\"), \"\", this);\nblockAction->setToolTip(tr(\"Explore the BlockChain\"));\nblockAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_6));\nblockAction->setCheckable(true);\n@@ -286,7 +286,7 @@ void BitcoinGUI::createActions()\nsignMessageAction = new QAction(QIcon(\":/icons/edit\"), tr(\"Sign &message...\"), this);\nverifyMessageAction = new QAction(QIcon(\":/icons/transaction_0\"), tr(\"&Verify message...\"), this);\n- exportAction = new QAction(QIcon(\":/icons/export\"), this);\n+ exportAction = new QAction(QIcon(\":/icons/export\"), \"\", this);\nexportAction->setToolTip(tr(\"Export the data in the current tab to a file\"));\nopenRPCConsoleAction = new QAction(QIcon(\":/icons/debugwindow\"), tr(\"&Debug window\"), this);\nopenRPCConsoleAction->setToolTip(tr(\"Open debugging and diagnostic console\"));\n"
}
]
| C++ | MIT License | vergecurrency/verge | Fix for invalid constructor method arguments for QIcon, just added blank strings. |
714,103 | 25.12.2017 00:03:48 | 14,400 | 1650016549302cabfaafb2db7b1f63db28af6965 | Add missing enum, fix undefined var references and some syntax errors to get this working with C++11 | [
{
"change_type": "MODIFY",
"old_path": "src/qt/addresstablemodel.h",
"new_path": "src/qt/addresstablemodel.h",
"diff": "@@ -18,6 +18,14 @@ public:\nexplicit AddressTableModel(CWallet *wallet, WalletModel *parent = 0);\n~AddressTableModel();\n+ enum EAddressType {\n+ AT_Unknown = 0, /**< User specified label */\n+ AT_Normal = 1, /**< Bitcoin address */\n+ AT_Stealth = 2, /**< Stealth address */\n+ AT_BIP32 = 3, /**< BIP32 address */\n+ AT_Group = 4, /**< BIP32 address */\n+ };\n+\nenum ColumnIndex {\nLabel = 0, /**< User specified label */\nAddress = 1 /**< Bitcoin address */\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/walletmodel.cpp",
"new_path": "src/qt/walletmodel.cpp",
"diff": "#include \"wallet.h\"\n#include \"walletdb.h\" // for BackupWallet\n#include \"base58.h\"\n+#include \"smessage.h\"\n#include <QSet>\n#include <QTimer>\n@@ -141,6 +142,10 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie\nreturn OK;\n}\n+ std::vector<std::pair<CScript, int64_t> > vecSend;\n+\n+ std::map<int, std::string> mapStealthNarr;\n+\n// Pre-check input data for validity\nforeach(const SendCoinsRecipient &rcp, recipients)\n{\n@@ -268,8 +273,6 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(const QList<SendCoinsRecipie\nreturn SendCoinsReturn(AmountWithFeeExceedsBalance, nTransactionFee);\n}\n- std::map<int, std::string> mapStealthNarr;\n-\n{\nLOCK2(cs_main, wallet->cs_wallet);\n"
}
]
| C++ | MIT License | vergecurrency/verge | Add missing enum, fix undefined var references and some syntax errors to get this working with C++11 |
714,103 | 25.12.2017 01:17:48 | 14,400 | efa30d90f24b293d2b6f2eb7f48fcad78dd2c52a | chatAction and radioAction are not set, and causing segfaults. | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -250,7 +250,7 @@ void BitcoinGUI::createActions()\nconnect(blockAction, SIGNAL(triggered()), this, SLOT(gotoBlockBrowser()));\nconnect(overviewAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\nconnect(overviewAction, SIGNAL(triggered()), this, SLOT(gotoOverviewPage()));\n- connect(chatAction, SIGNAL(triggered()), this, SLOT(gotoChatPage()));\n+ // connect(chatAction, SIGNAL(triggered()), this, SLOT(gotoChatPage()));\nconnect(sendCoinsAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\nconnect(sendCoinsAction, SIGNAL(triggered()), this, SLOT(gotoSendCoinsPage()));\nconnect(receiveCoinsAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\n@@ -259,7 +259,7 @@ void BitcoinGUI::createActions()\nconnect(historyAction, SIGNAL(triggered()), this, SLOT(gotoHistoryPage()));\nconnect(addressBookAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\nconnect(addressBookAction, SIGNAL(triggered()), this, SLOT(gotoAddressBookPage()));\n- connect(radioAction, SIGNAL(triggered()), this, SLOT(gotoRadioPage()));\n+ // connect(radioAction, SIGNAL(triggered()), this, SLOT(gotoRadioPage()));\nquitAction = new QAction(QIcon(\":/icons/quit\"), tr(\"E&xit\"), this);\nquitAction->setToolTip(tr(\"Quit application\"));\n@@ -353,8 +353,8 @@ void BitcoinGUI::createToolBars()\ntoolbar->addAction(historyAction);\ntoolbar->addAction(addressBookAction);\ntoolbar->addAction(blockAction);\n- toolbar->addAction(chatAction);\n- toolbar->addAction(radioAction);\n+ // toolbar->addAction(chatAction);\n+ // toolbar->addAction(radioAction);\nQToolBar *toolbar2 = addToolBar(tr(\"Actions toolbar\"));\n"
}
]
| C++ | MIT License | vergecurrency/verge | chatAction and radioAction are not set, and causing segfaults. |
714,096 | 26.12.2017 18:59:13 | -3,600 | 6b2fb961c6fc6ed39228e918c3a6da35d21743a3 | Fix typos in stealth.cpp | [
{
"change_type": "MODIFY",
"old_path": "src/stealth.cpp",
"new_path": "src/stealth.cpp",
"diff": "@@ -22,14 +22,14 @@ bool CStealthAddress::SetEncoded(const std::string& encodedAddress)\nif (!DecodeBase58(encodedAddress, raw))\n{\nif (fDebug)\n- printf(\"CStealthAddress::SetEncoded DecodeBase58 falied.\\n\");\n+ printf(\"CStealthAddress::SetEncoded DecodeBase58 failed.\\n\");\nreturn false;\n};\nif (!VerifyChecksum(raw))\n{\nif (fDebug)\n- printf(\"CStealthAddress::SetEncoded verify_checksum falied.\\n\");\n+ printf(\"CStealthAddress::SetEncoded verify_checksum failed.\\n\");\nreturn false;\n};\n@@ -653,13 +653,13 @@ bool IsStealthAddress(const std::string& encodedAddress)\nif (!DecodeBase58(encodedAddress, raw))\n{\n- //printf(\"IsStealthAddress DecodeBase58 falied.\\n\");\n+ //printf(\"IsStealthAddress DecodeBase58 failed.\\n\");\nreturn false;\n};\nif (!VerifyChecksum(raw))\n{\n- //printf(\"IsStealthAddress verify_checksum falied.\\n\");\n+ //printf(\"IsStealthAddress verify_checksum failed.\\n\");\nreturn false;\n};\n"
}
]
| C++ | MIT License | vergecurrency/verge | Fix typos in stealth.cpp |
714,106 | 27.12.2017 01:49:22 | 0 | d60a55e25cc460584750ad0f2c66da2adfd63c93 | Removed all instances of radio.png and chat.png from project | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.qt.include",
"new_path": "src/Makefile.qt.include",
"diff": "@@ -113,9 +113,7 @@ BITCOIN_QT_H = \\\nRES_ICONS = \\\nqt/res/icons/add.png \\\n- qt/res/icons/chat.png \\\nqt/res/icons/social.png \\\n- qt/res/icons/radio.png \\\nqt/res/icons/block.png \\\nqt/res/icons/address-book.png \\\nqt/res/icons/verge.ico \\\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoin.qrc",
"new_path": "src/qt/bitcoin.qrc",
"diff": "<file alias=\"toolbar_testnet\">res/icons/toolbar_verge_testnet.png</file>\n<file alias=\"edit\">res/icons/edit.png</file>\n<file alias=\"history\">res/icons/history.png</file>\n- <file alias=\"radio\">res/icons/radio.png</file>\n<file alias=\"overview\">res/icons/overview.png</file>\n- <file alias=\"social\">res/icons/chat.png</file>\n<file alias=\"export\">res/icons/export.png</file>\n<file alias=\"synced\">res/icons/synced.png</file>\n<file alias=\"remove\">res/icons/remove.png</file>\n"
}
]
| C++ | MIT License | vergecurrency/verge | Removed all instances of radio.png and chat.png from project |
714,106 | 27.12.2017 01:50:25 | 0 | c986cf5049827d694be9fe8d4db409a52bbc4d56 | Removed CWallet::Lock() prototype declaration | [
{
"change_type": "MODIFY",
"old_path": "src/wallet.h",
"new_path": "src/wallet.h",
"diff": "@@ -151,7 +151,7 @@ public:\nbool AddCScript(const CScript& redeemScript);\nbool LoadCScript(const CScript& redeemScript) { return CCryptoKeyStore::AddCScript(redeemScript); }\n- bool Lock();\n+ // bool Lock();\nbool Unlock(const SecureString& strWalletPassphrase);\nbool ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, const SecureString& strNewWalletPassphrase);\nbool EncryptWallet(const SecureString& strWalletPassphrase);\n"
}
]
| C++ | MIT License | vergecurrency/verge | Removed CWallet::Lock() prototype declaration |
714,106 | 27.12.2017 01:51:13 | 0 | 38744245bc060b00391bd5a1877717a8ae639ee7 | Added creation of Desktop directory to go.sh in case it doesn't exist | [
{
"change_type": "MODIFY",
"old_path": "go.sh",
"new_path": "go.sh",
"diff": "@@ -237,7 +237,7 @@ else\nfi\n# Create Icon on Desktop and in menu\n-\n+mkdir -p ~/Desktop/\nsudo cp ~/VERGE/src/qt/res/icons/verge.png /usr/share/icons/\necho '#!/usr/bin/env xdg-open''\\n'\"[Desktop Entry]\"'\\n'\"Version=1.0\"'\\n'\"Type=Application\"'\\n'\"Terminal=false\"'\\n'\"Icon[en]=/usr/share/icons/verge.png\"'\\n'\"Name[en]=VERGE\"'\\n'\"Exec=VERGE-qt\"'\\n'\"Name=VERGE\"'\\n'\"Icon=/usr/share/icons/verge.png\"'\\n'\"Categories=Network;Internet;\" > ~/Desktop/VERGE.desktop\nsudo chmod +x ~/Desktop/VERGE.desktop\n"
}
]
| C++ | MIT License | vergecurrency/verge | Added creation of Desktop directory to go.sh in case it doesn't exist |
714,106 | 27.12.2017 02:08:16 | 0 | 0b6ec38a0e2384bbe885feede0ae6a8d533e50b3 | Added check for file exist before backup | [
{
"change_type": "MODIFY",
"old_path": "go.sh",
"new_path": "go.sh",
"diff": "@@ -205,8 +205,10 @@ cd ~\n#// Create the config file with random user and password\n-mkdir ~/.VERGE\n-cp ~/.VERGE/VERGE.conf ~/.VERGE/VERGE.bak\n+mkdir -p ~/.VERGE\n+if [ -e ~/.VERGE/VERGE.conf ]; then\n+ cp -a ~/.VERGE/VERGE.conf ~/.VERGE/VERGE.bak\n+fi\necho \"rpcuser=\"$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 26 ; echo '') '\\n'\"rpcpassword=\"$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 26 ; echo '') '\\n'\"rpcport=20102\" '\\n'\"port=21102\" '\\n'\"daemon=1\" '\\n'\"listen=1\" '\\n'\"server=1\" '\\n'\"addnode=103.18.40.125:21102\" '\\n'\"addnode=104.131.144.82:21102\" '\\n'\"addnode=138.197.68.130:21102\" '\\n'\"addnode=144.76.167.66:21102\" '\\n'\"addnode=152.186.36.86:21102\" '\\n'\"addnode=159.203.121.202:21102\" '\\n'\"addnode=172.104.157.38:21102\" '\\n'\"addnode=192.99.7.127:21102\" '\\n'\"addnode=219.89.84.46:21102\" '\\n'\"addnode=45.32.129.168:21102\" '\\n'\"addnode=45.55.59.206:21102\" '\\n'\"addnode=46.4.64.68:21102\" '\\n'\"addnode=51.15.46.1:21102\" '\\n'\"addnode=52.9.109.214:21102\" '\\n'\"addnode=66.55.64.183:21102\" '\\n'\"addnode=67.167.207.164:21102\" '\\n'\"addnode=78.46.190.152:21102\"> ~/.VERGE/VERGE.conf\n#// Extract http link, download blockchain and install it.\n@@ -252,4 +254,6 @@ cd ~\n#// Start Verge\nVERGE-qt\n+if [ -e ~/.VERGE/wallet.dat ]; then\ncp ~/.VERGE/wallet.dat ~/vergewallet.bak\n+fi\n"
}
]
| C++ | MIT License | vergecurrency/verge | Added check for file exist before backup |
714,101 | 26.12.2017 16:51:49 | 18,000 | 7f003d018c1aca9a3c67912f832cf495d907cb1a | tidy up the readme
Just cleaned up the snippets to make the markdown consistant.
Fan of the project. Cheers! | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -41,9 +41,10 @@ Binary (pre-compiled) wallets are available on all platforms at [https://vergecu\nCompiling Linux Wallet on Ubuntu/Debian (faster)\n----------------------\n-```sudo rm -Rf ~/VERGE #(if you already have it) ```\n-\n-```sudo apt-get -y install git && cd ~ && git clone https://github.com/vergecurrency/VERGE && cd VERGE && sh go.sh```\n+```shell\n+sudo rm -Rf ~/VERGE #(if you already have it)\n+sudo apt-get -y install git && cd ~ && git clone https://github.com/vergecurrency/VERGE && cd VERGE && sh go.sh\n+```\nCompiling Linux Wallet on Ubuntu/Debian\n@@ -51,49 +52,58 @@ Compiling Linux Wallet on Ubuntu/Debian\nStep 1. Install the dependencies.\n-```sudo add-apt-repository ppa:bitcoin/bitcoin```\n-\n-```sudo apt-get update```\n-\n-```sudo apt-get install libdb4.8-dev libdb4.8++-dev build-essential libtool autotools-dev automake pkg-config libssl-dev libevent-dev bsdmainutils git libboost-all-dev libminiupnpc-dev libqt5gui5 libqt5core5a libqt5webkit5-dev libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev protobuf-compiler libqrencode-dev```\n+```shell\n+sudo add-apt-repository ppa:bitcoin/bitcoin\n+sudo apt-get update\n+sudo apt-get install \\\n+ libdb4.8-dev libdb4.8++-dev build-essential \\\n+ libtool autotools-dev automake pkg-config libssl-dev libevent-dev \\\n+ bsdmainutils git libboost-all-dev libminiupnpc-dev libqt5gui5 \\\n+ libqt5core5a libqt5webkit5-dev libqt5dbus5 qttools5-dev \\\n+ qttools5-dev-tools libprotobuf-dev protobuf-compiler libqrencode-dev\n+```\n**Note**: If you are on debian, you will also need to `apt-get install libcanberra-gtk-module`.\nStep 2. Clone the git repository and compile the daemon and gui wallet:\n-```git clone https://github.com/vergecurrency/verge && cd verge && ./autogen.sh && ./configure && make```\n+```shell\n+git clone https://github.com/vergecurrency/verge && cd verge && ./autogen.sh && ./configure && make\n+```\n**Note**: If you get a \"memory exhausted\" error, make a swap file. (https://www.digitalocean.com/community/tutorials/how-to-add-swap-space-on-ubuntu-16-04)\nUsing the wallet:\n----\n-The gui wallet is in ./verge/src/qt and the daemon in ./verge/src directories.\n+The gui wallet is in `./verge/src/qt` and the daemon in `./verge/src` directories.\n**Note**: If you see something like 'Killed (program cc1plus)' run ```dmesg``` to see the error(s)/problems(s). This is most likely caused by running out of resources. You may need to add some RAM or add some swap space.\n**Optional**:\nIf you want to copy the binaries for use by all users, run the following commands:\n-```sudo cp src/VERGEd /usr/bin/```\n-\n-```sudo cp src/qt/VERGE-qt /usr/bin/```\n+```shell\n+sudo cp src/VERGEd /usr/bin/\n+sudo cp src/qt/VERGE-qt /usr/bin/\n+```\n-Step 3. Creating a configuration file. Type ```cd ~``` to get back to the home folder and type:\n+Step 3. Creating a configuration file. Type `cd ~` to get back to the home folder and type:\n-```VERGEd.exe``` (or ```./VERGEd``` if on mac or linux)\n+`VERGEd.exe` (or `./VERGEd` if on mac or linux)\nthe output from this command will tell you that you need to make a VERGE.conf and will suggest some good starting values.\nFor Linux users, type:\n-```nano ~/.VERGE/VERGE.conf```\n-(For Windows users, see below. For mac users, the command is ```nano ~/Library/Application\\ Support\\VERGE\\VERGE.conf```)\n+`nano ~/.VERGE/VERGE.conf`\n+(For Windows users, see below. For mac users, the command is `nano ~/Library/Application\\ Support\\VERGE\\VERGE.conf`)\nPaste the output from the `VERGEd` command into the VERGE.conf like this: (It is recommended to change the password to something unique.)\n+```\nrpcuser=vergerpcusername\nrpcpassword=85CpSuCNvDcYsdQU8w621mkQqJAimSQwCSJL5dPT9wQX\n-\n+```\n**Optional**: Add `rpcport=20102`, `port=21102`, or `algo=groestl` to the configuration file.\n@@ -101,16 +111,18 @@ Add `daemon=1`.\nYour config may look something like this:\n+```\nrpcuser=vergerpcusername\nrpcpassword=85CpSuCNvDcYsdQU8w621mkQqJAimSQwCSJL5dPT9wQX\nrpcport=20102\nport=21102\ndaemon=1\nalgo=groestl\n+```\nExit the VERGE.conf by pressing `ctrl + x` on your keyboard then pressing `y` and hitting enter. This should have created a VERGE.conf file with what you just added.\n-Type ```VERGEd.exe``` (or ```./VERGEd``` if on mac or linux) and your verge daemon should start.\n+Type `VERGEd.exe` (or `./VERGEd` if on mac or linux) and your verge daemon should start.\nTo check the status of how much of the blockchain has been downloaded (aka synced) type `VERGEd.exe getinfo` (or `./VERGEd getinfo` if on mac or linux).\n@@ -124,20 +136,18 @@ To compile on Mac (OSX El Capitan, but test compiled on Mountain Lion v10.8):\n2. Download [qt5.4.2](https://download.qt.io/official_releases/qt/5.4/5.4.2/qt-opensource-mac-x64-clang-5.4.2.dmg)\n-3. Install qt5 into /usr/local/qt5\n+3. Install qt5 into `/usr/local/qt5`\n- Note: Change the installation folder from \"xxx/Qt5.4.2\" to \"/usr/local/qt5\"\n+ Note: Change the installation folder from `xxx/Qt5.4.2` to `/usr/local/qt5`\n4. Run these commands:\n- `export PKG_CONFIG_PATH=/usr/local/qt5/5.4/clang_64/lib/pkgconfig`\n-\n- `export PATH=/usr/local/qt5/5.4/clang_64/bin:$PATH`\n-\n- `export QT_CFLAGS=\"-I/usr/local/qt5/5.4/clang_64/lib/QtWebKitWidgets.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtWebView.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtDBus.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtWidgets.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtWebKit.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtNetwork.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtGui.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtCore.framework/Versions/5/Headers -I. -I/usr/local/qt5/5.4/clang_64/mkspecs/macx-clang -F/usr/local/qt5/5.4/clang_64/lib\"`\n-\n- `export QT_LIBS=\"-F/usr/local/qt5/5.4/clang_64/lib -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL -framework QtNetwork -framework QtWebKit -framework QtWebKitWidgets -framework QtDBus -framework QtWebView\"`\n-\n+ ```shell\n+ export PKG_CONFIG_PATH=/usr/local/qt5/5.4/clang_64/lib/pkgconfig\n+ export PATH=/usr/local/qt5/5.4/clang_64/bin:$PATH\n+ export QT_CFLAGS=\"-I/usr/local/qt5/5.4/clang_64/lib/QtWebKitWidgets.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtWebView.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtDBus.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtWidgets.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtWebKit.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtNetwork.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtGui.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtCore.framework/Versions/5/Headers -I. -I/usr/local/qt5/5.4/clang_64/mkspecs/macx-clang -F/usr/local/qt5/5.4/clang_64/lib\"\n+ export QT_LIBS=\"-F/usr/local/qt5/5.4/clang_64/lib -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL -framework QtNetwork -framework QtWebKit -framework QtWebKitWidgets -framework QtDBus -framework QtWebView\"\n+ ```\n5. Install the other required items:\n@@ -145,16 +155,13 @@ To compile on Mac (OSX El Capitan, but test compiled on Mountain Lion v10.8):\n6. Download the wallet source and build:\n- `git clone https://github.com/vergecurrency/verge`\n-\n- `cd verge`\n-\n- `./autogen.sh`\n-\n- `./configure --with-gui=qt5`\n-\n- `make -j4`\n-\n+ ```shell\n+ git clone https://github.com/vergecurrency/verge\n+ cd verge\n+ ./autogen.sh\n+ ./configure --with-gui=qt5\n+ make -j4\n+ ```\nBuilding the Mac installer (.dmg) file\n-----\n@@ -162,24 +169,25 @@ Run `make deploy`\nIf you are building the .dmg (by running 'mac deploy') you may need to run these commands if you get an error regarding mysql:\n+```shell\nbrew install mysql\n-\ncd /usr/local/qt5/5.4/clang_64/plugins/sqldrivers\n-\notool -L libqsqlmysql.dylib\n+```\nNote: This may be pointing to an version of mysql that you do not have installed (like mysql55) - Alternatively, you may be able to remove the library from the sqldrivers folder.\n+```\ninstall_name_tool -change /opt/local/lib/mysql55/mysql/libmysqlclient.18.dylib /usr/local/Cellar/mysql/5.7.12/lib/libmysqlclient.20.dylib libqsqlmysql.dylib\n+```\nTrying to build .dmg on 10.8? You will need to run this:\n+```shell\nexport CFLAGS=-Qunused-arguments\n-\nexport CPPFLAGS=-Qunused-arguments\n-\nsudo -E easy_install appscript\n-\n+```\nWant to use Docker?\n------------\n@@ -194,7 +202,7 @@ http://108.61.216.160/cryptochainer.chains/chains/Verge_blockchain.zip\nWant to 'solo-mine' from the wallet?\n----------\n-You can use the wallet to mine. You need to specify the algorithm (see below) and set the \"gen\" flag. For instance, in the configuration specify ```gen=1```.\n+You can use the wallet to mine. You need to specify the algorithm (see below) and set the \"gen\" flag. For instance, in the configuration specify `gen=1`.\nUsing different algorithms (for mining)\n@@ -202,11 +210,13 @@ Using different algorithms (for mining)\nTo use a specific mining algorithm use the `algo` switch in your configuration file (.conf file) or from the command line (like this `--algo=x17`) Here are the possible values:\n+```\nalgo=x17\nalgo=scrypt\nalgo=groestl\nalgo=lyra\nalgo=blake\n+```\nUsing VERGE on Windows\n-------------\n"
}
]
| C++ | MIT License | vergecurrency/verge | tidy up the readme
Just cleaned up the snippets to make the markdown consistant.
Fan of the project. Cheers! |
714,131 | 29.12.2017 22:03:03 | -3,600 | bbcbffc089a68f40eae71bae36ec291777d2e3a6 | initial support for openssl1.1 | [
{
"change_type": "MODIFY",
"old_path": "contrib/easywinbuilder/set_vars.bat",
"new_path": "contrib/easywinbuilder/set_vars.bat",
"diff": "@set LANG=en_US.UTF8\n@set LC_ALL=en_US.UTF8\n-@set OPENSSL=openssl-1.0.1e\n+@set OPENSSL=openssl-1.1.0g\n@set BERKELEYDB=db-4.8.30.NC\n@set BOOST=boost_1_54_0\n@set BOOSTVERSION=1.54.0\n"
},
{
"change_type": "MODIFY",
"old_path": "contrib/gitian-descriptors/deps-linux.yml",
"new_path": "contrib/gitian-descriptors/deps-linux.yml",
"diff": "@@ -16,7 +16,7 @@ packages:\nreference_datetime: \"2013-06-01 00:00:00\"\nremotes: []\nfiles:\n-- \"openssl-1.0.1h.tar.gz\"\n+- \"openssl-1.1.0g.tar.gz\"\n- \"miniupnpc-1.9.tar.gz\"\n- \"qrencode-3.4.3.tar.bz2\"\n- \"protobuf-2.5.0.tar.bz2\"\n@@ -30,15 +30,15 @@ script: |\nexport TZ=UTC\nexport LIBRARY_PATH=\"$STAGING/lib\"\n# Integrity Check\n- echo \"9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 openssl-1.0.1h.tar.gz\" | sha256sum -c\n+ echo \"de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af openssl-1.1.0g.tar.gz\" | sha256sum -c\necho \"2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464 miniupnpc-1.9.tar.gz\" | sha256sum -c\necho \"dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2\" | sha256sum -c\necho \"13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 protobuf-2.5.0.tar.bz2\" | sha256sum -c\necho \"12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz\" | sha256sum -c\n#\n- tar xzf openssl-1.0.1h.tar.gz\n- cd openssl-1.0.1h\n+ tar xzf openssl-1.1.0g.tar.gz\n+ cd openssl-1.1.0g\n# need -fPIC to avoid relocation error in 64 bit builds\n./config no-shared no-zlib no-dso no-krb5 --openssldir=$STAGING -fPIC\n# need to build OpenSSL with faketime because a timestamp is embedded into cversion.o\n"
},
{
"change_type": "MODIFY",
"old_path": "contrib/gitian-descriptors/deps-win.yml",
"new_path": "contrib/gitian-descriptors/deps-win.yml",
"diff": "@@ -14,7 +14,7 @@ packages:\nreference_datetime: \"2011-01-30 00:00:00\"\nremotes: []\nfiles:\n-- \"openssl-1.0.1h.tar.gz\"\n+- \"openssl-1.1.0g.tar.gz\"\n- \"db-4.8.30.NC.tar.gz\"\n- \"miniupnpc-1.9.tar.gz\"\n- \"zlib-1.2.8.tar.gz\"\n@@ -28,7 +28,7 @@ script: |\nINDIR=$HOME/build\nTEMPDIR=$HOME/tmp\n# Input Integrity Check\n- echo \"9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 openssl-1.0.1h.tar.gz\" | sha256sum -c\n+ echo \"de4d501267da39310905cb6dc8c6121f7a2cad45a7707f76df828fe1b85073af openssl-1.1.0g.tar.gz\" | sha256sum -c\necho \"12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz\" | sha256sum -c\necho \"2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464 miniupnpc-1.9.tar.gz\" | sha256sum -c\necho \"36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d zlib-1.2.8.tar.gz\" | sha256sum -c\n@@ -48,8 +48,8 @@ script: |\nmkdir -p $INSTALLPREFIX $BUILDDIR\ncd $BUILDDIR\n#\n- tar xzf $INDIR/openssl-1.0.1h.tar.gz\n- cd openssl-1.0.1h\n+ tar xzf $INDIR/openssl-1.1.0g.tar.gz\n+ cd openssl-1.1.0g\nif [ \"$BITS\" == \"32\" ]; then\nOPENSSL_TGT=mingw\nelse\n"
},
{
"change_type": "MODIFY",
"old_path": "contrib/gitian-descriptors/gitian-osx-depends.yml",
"new_path": "contrib/gitian-descriptors/gitian-osx-depends.yml",
"diff": "@@ -16,7 +16,7 @@ files:\n- \"boost_1_55_0.tar.bz2\"\n- \"db-4.8.30.NC.tar.gz\"\n- \"miniupnpc-1.9.tar.gz\"\n-- \"openssl-1.0.1g.tar.gz\"\n+- \"openssl-1.1.0g.tar.gz\"\n- \"protobuf-2.5.0.tar.bz2\"\n- \"qrencode-3.4.3.tar.bz2\"\n- \"MacOSX10.6.pkg\"\n"
},
{
"change_type": "MODIFY",
"old_path": "doc/build-unix.txt",
"new_path": "doc/build-unix.txt",
"diff": "@@ -54,7 +54,7 @@ Licenses of statically linked libraries:\nVersions used in this release:\nGCC 4.3.3\n- OpenSSL 0.9.8g\n+ OpenSSL 1.1.0g\nBerkeley DB 4.8.30.NC\nBoost 1.37\nminiupnpc 1.6\n"
},
{
"change_type": "MODIFY",
"old_path": "doc/build-verge.sh",
"new_path": "doc/build-verge.sh",
"diff": "@@ -98,7 +98,7 @@ cd gitian-builder/inputs\nif $DOWNLOAD\nthen\nwget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.9.tar.gz' -O miniupnpc-1.9.tar.gz\n- wget 'https://www.openssl.org/source/openssl-1.0.1h.tar.gz'\n+ wget 'https://www.openssl.org/source/openssl-1.1.0g.tar.gz'\nwget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'\nwget 'http://zlib.net/zlib-1.2.8.tar.gz'\nwget 'ftp://ftp.simplesystems.org/pub/png/src/history/libpng16/libpng-1.6.8.tar.gz'\n"
},
{
"change_type": "MODIFY",
"old_path": "src/base58.h",
"new_path": "src/base58.h",
"diff": "@@ -48,7 +48,7 @@ inline std::string EncodeBase58(const unsigned char* pbegin, const unsigned char\nCBigNum rem;\nwhile (bn > bn0)\n{\n- if (!BN_div(&dv, &rem, &bn, &bn58, pctx))\n+ if (!BN_div(dv.get(), rem.get(), bn.getc(), bn58.getc(), pctx))\nthrow bignum_error(\"EncodeBase58 : BN_div failed\");\nbn = dv;\nunsigned int c = rem.getulong();\n@@ -95,7 +95,7 @@ inline bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet)\nbreak;\n}\nbnChar.setulong(p1 - pszBase58);\n- if (!BN_mul(&bn, &bn, &bn58, pctx))\n+ if (!BN_mul(bn.get(), bn.getc(), bn58.getc(), pctx))\nthrow bignum_error(\"DecodeBase58 : BN_mul failed\");\nbn += bnChar;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "src/bignum.h",
"new_path": "src/bignum.h",
"diff": "@@ -48,75 +48,90 @@ public:\n/** C++ wrapper for BIGNUM (OpenSSL bignum) */\n-class CBigNum : public BIGNUM\n+class CBigNum\n{\n+private:\n+ BIGNUM *self = NULL;\n+\n+ void init()\n+ {\n+ if (self)\n+ BN_clear_free(self);\n+ self = BN_new();\n+ if (!self)\n+ throw bignum_error(\"CBigNum::init(): BN_new() returned NULL\");\n+ }\n+\npublic:\n+ BIGNUM *get() { return self; }\n+ const BIGNUM *getc() const { return self; }\n+\nCBigNum()\n{\n- BN_init(this);\n+ init();\n}\nCBigNum(const CBigNum& b)\n{\n- BN_init(this);\n- if (!BN_copy(this, &b))\n+ init();\n+ if (!BN_copy(self, b.getc()))\n{\n- BN_clear_free(this);\n+ BN_clear_free(self);\nthrow bignum_error(\"CBigNum::CBigNum(const CBigNum&) : BN_copy failed\");\n}\n}\nCBigNum& operator=(const CBigNum& b)\n{\n- if (!BN_copy(this, &b))\n+ if (!BN_copy(self, b.getc()))\nthrow bignum_error(\"CBigNum::operator= : BN_copy failed\");\nreturn (*this);\n}\n~CBigNum()\n{\n- BN_clear_free(this);\n+ BN_clear_free(self);\n}\n//CBigNum(char n) is not portable. Use 'signed char' or 'unsigned char'.\n- CBigNum(signed char n) { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }\n- CBigNum(short n) { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }\n- CBigNum(int n) { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }\n- CBigNum(long n) { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }\n- CBigNum(int64 n) { BN_init(this); setint64(n); }\n- CBigNum(unsigned char n) { BN_init(this); setulong(n); }\n- CBigNum(unsigned short n) { BN_init(this); setulong(n); }\n- CBigNum(unsigned int n) { BN_init(this); setulong(n); }\n- CBigNum(unsigned long n) { BN_init(this); setulong(n); }\n- CBigNum(uint64 n) { BN_init(this); setuint64(n); }\n- explicit CBigNum(uint256 n) { BN_init(this); setuint256(n); }\n+ CBigNum(signed char n) { init(); if (n >= 0) setulong(n); else setint64(n); }\n+ CBigNum(short n) { init(); if (n >= 0) setulong(n); else setint64(n); }\n+ CBigNum(int n) { init(); if (n >= 0) setulong(n); else setint64(n); }\n+ CBigNum(long n) { init(); if (n >= 0) setulong(n); else setint64(n); }\n+ CBigNum(int64 n) { init(); setint64(n); }\n+ CBigNum(unsigned char n) { init(); setulong(n); }\n+ CBigNum(unsigned short n) { init(); setulong(n); }\n+ CBigNum(unsigned int n) { init(); setulong(n); }\n+ CBigNum(unsigned long n) { init(); setulong(n); }\n+ CBigNum(uint64 n) { init(); setuint64(n); }\n+ explicit CBigNum(uint256 n) { init(); setuint256(n); }\nexplicit CBigNum(const std::vector<unsigned char>& vch)\n{\n- BN_init(this);\n+ init();\nsetvch(vch);\n}\nvoid setulong(unsigned long n)\n{\n- if (!BN_set_word(this, n))\n+ if (!BN_set_word(self, n))\nthrow bignum_error(\"CBigNum conversion from unsigned long : BN_set_word failed\");\n}\nunsigned long getulong() const\n{\n- return BN_get_word(this);\n+ return BN_get_word(self);\n}\nunsigned int getuint() const\n{\n- return BN_get_word(this);\n+ return BN_get_word(self);\n}\nint getint() const\n{\n- unsigned long n = BN_get_word(this);\n- if (!BN_is_negative(this))\n+ unsigned long n = BN_get_word(self);\n+ if (!BN_is_negative(self))\nreturn (n > (unsigned long)std::numeric_limits<int>::max() ? std::numeric_limits<int>::max() : n);\nelse\nreturn (n > (unsigned long)std::numeric_limits<int>::max() ? std::numeric_limits<int>::min() : -(int)n);\n@@ -162,16 +177,16 @@ public:\npch[1] = (nSize >> 16) & 0xff;\npch[2] = (nSize >> 8) & 0xff;\npch[3] = (nSize) & 0xff;\n- BN_mpi2bn(pch, p - pch, this);\n+ BN_mpi2bn(pch, p - pch, self);\n}\nuint64 getuint64()\n{\n- unsigned int nSize = BN_bn2mpi(this, NULL);\n+ unsigned int nSize = BN_bn2mpi(self, NULL);\nif (nSize < 4)\nreturn 0;\nstd::vector<unsigned char> vch(nSize);\n- BN_bn2mpi(this, &vch[0]);\n+ BN_bn2mpi(self, &vch[0]);\nif (vch.size() > 4)\nvch[4] &= 0x7f;\nuint64 n = 0;\n@@ -204,7 +219,7 @@ public:\npch[1] = (nSize >> 16) & 0xff;\npch[2] = (nSize >> 8) & 0xff;\npch[3] = (nSize) & 0xff;\n- BN_mpi2bn(pch, p - pch, this);\n+ BN_mpi2bn(pch, p - pch, self);\n}\nvoid setuint256(uint256 n)\n@@ -232,16 +247,16 @@ public:\npch[1] = (nSize >> 16) & 0xff;\npch[2] = (nSize >> 8) & 0xff;\npch[3] = (nSize >> 0) & 0xff;\n- BN_mpi2bn(pch, p - pch, this);\n+ BN_mpi2bn(pch, p - pch, self);\n}\nuint256 getuint256()\n{\n- unsigned int nSize = BN_bn2mpi(this, NULL);\n+ unsigned int nSize = BN_bn2mpi(self, NULL);\nif (nSize < 4)\nreturn 0;\nstd::vector<unsigned char> vch(nSize);\n- BN_bn2mpi(this, &vch[0]);\n+ BN_bn2mpi(self, &vch[0]);\nif (vch.size() > 4)\nvch[4] &= 0x7f;\nuint256 n = 0;\n@@ -263,16 +278,16 @@ public:\nvch2[3] = (nSize >> 0) & 0xff;\n// swap data to big endian\nreverse_copy(vch.begin(), vch.end(), vch2.begin() + 4);\n- BN_mpi2bn(&vch2[0], vch2.size(), this);\n+ BN_mpi2bn(&vch2[0], vch2.size(), self);\n}\nstd::vector<unsigned char> getvch() const\n{\n- unsigned int nSize = BN_bn2mpi(this, NULL);\n+ unsigned int nSize = BN_bn2mpi(self, NULL);\nif (nSize <= 4)\nreturn std::vector<unsigned char>();\nstd::vector<unsigned char> vch(nSize);\n- BN_bn2mpi(this, &vch[0]);\n+ BN_bn2mpi(self, &vch[0]);\nvch.erase(vch.begin(), vch.begin() + 4);\nreverse(vch.begin(), vch.end());\nreturn vch;\n@@ -286,16 +301,16 @@ public:\nif (nSize >= 1) vch[4] = (nCompact >> 16) & 0xff;\nif (nSize >= 2) vch[5] = (nCompact >> 8) & 0xff;\nif (nSize >= 3) vch[6] = (nCompact >> 0) & 0xff;\n- BN_mpi2bn(&vch[0], vch.size(), this);\n+ BN_mpi2bn(&vch[0], vch.size(), self);\nreturn *this;\n}\nunsigned int GetCompact() const\n{\n- unsigned int nSize = BN_bn2mpi(this, NULL);\n+ unsigned int nSize = BN_bn2mpi(self, NULL);\nstd::vector<unsigned char> vch(nSize);\nnSize -= 4;\n- BN_bn2mpi(this, &vch[0]);\n+ BN_bn2mpi(self, &vch[0]);\nunsigned int nCompact = nSize << 24;\nif (nSize >= 1) nCompact |= (vch[4] << 16);\nif (nSize >= 2) nCompact |= (vch[5] << 8);\n@@ -340,20 +355,20 @@ public:\nCBigNum bn0 = 0;\nstd::string str;\nCBigNum bn = *this;\n- BN_set_negative(&bn, false);\n+ BN_set_negative(bn.get(), false);\nCBigNum dv;\nCBigNum rem;\n- if (BN_cmp(&bn, &bn0) == 0)\n+ if (BN_cmp(bn.getc(), bn0.getc()) == 0)\nreturn \"0\";\n- while (BN_cmp(&bn, &bn0) > 0)\n+ while (BN_cmp(bn.getc(), bn0.getc()) > 0)\n{\n- if (!BN_div(&dv, &rem, &bn, &bnBase, pctx))\n+ if (!BN_div(dv.get(), rem.get(), bn.getc(), bnBase.getc(), pctx))\nthrow bignum_error(\"CBigNum::ToString() : BN_div failed\");\nbn = dv;\nunsigned int c = rem.getulong();\nstr += \"0123456789abcdef\"[c];\n}\n- if (BN_is_negative(this))\n+ if (BN_is_negative(self))\nstr += \"-\";\nreverse(str.begin(), str.end());\nreturn str;\n@@ -386,12 +401,12 @@ public:\nbool operator!() const\n{\n- return BN_is_zero(this);\n+ return BN_is_zero(self);\n}\nCBigNum& operator+=(const CBigNum& b)\n{\n- if (!BN_add(this, this, &b))\n+ if (!BN_add(self, self, b.getc()))\nthrow bignum_error(\"CBigNum::operator+= : BN_add failed\");\nreturn *this;\n}\n@@ -405,7 +420,7 @@ public:\nCBigNum& operator*=(const CBigNum& b)\n{\nCAutoBN_CTX pctx;\n- if (!BN_mul(this, this, &b, pctx))\n+ if (!BN_mul(self, self, b.getc(), pctx))\nthrow bignum_error(\"CBigNum::operator*= : BN_mul failed\");\nreturn *this;\n}\n@@ -424,7 +439,7 @@ public:\nCBigNum& operator<<=(unsigned int shift)\n{\n- if (!BN_lshift(this, this, shift))\n+ if (!BN_lshift(self, self, shift))\nthrow bignum_error(\"CBigNum:operator<<= : BN_lshift failed\");\nreturn *this;\n}\n@@ -435,13 +450,13 @@ public:\n// if built on ubuntu 9.04 or 9.10, probably depends on version of OpenSSL\nCBigNum a = 1;\na <<= shift;\n- if (BN_cmp(&a, this) > 0)\n+ if (BN_cmp(a.getc(), self) > 0)\n{\n*this = 0;\nreturn *this;\n}\n- if (!BN_rshift(this, this, shift))\n+ if (!BN_rshift(self, self, shift))\nthrow bignum_error(\"CBigNum:operator>>= : BN_rshift failed\");\nreturn *this;\n}\n@@ -450,7 +465,7 @@ public:\nCBigNum& operator++()\n{\n// prefix operator\n- if (!BN_add(this, this, BN_value_one()))\n+ if (!BN_add(self, self, BN_value_one()))\nthrow bignum_error(\"CBigNum::operator++ : BN_add failed\");\nreturn *this;\n}\n@@ -467,7 +482,7 @@ public:\n{\n// prefix operator\nCBigNum r;\n- if (!BN_sub(&r, this, BN_value_one()))\n+ if (!BN_sub(r.get(), self, BN_value_one()))\nthrow bignum_error(\"CBigNum::operator-- : BN_sub failed\");\n*this = r;\nreturn *this;\n@@ -492,7 +507,7 @@ public:\ninline const CBigNum operator+(const CBigNum& a, const CBigNum& b)\n{\nCBigNum r;\n- if (!BN_add(&r, &a, &b))\n+ if (!BN_add(r.get(), a.getc(), b.getc()))\nthrow bignum_error(\"CBigNum::operator+ : BN_add failed\");\nreturn r;\n}\n@@ -500,7 +515,7 @@ inline const CBigNum operator+(const CBigNum& a, const CBigNum& b)\ninline const CBigNum operator-(const CBigNum& a, const CBigNum& b)\n{\nCBigNum r;\n- if (!BN_sub(&r, &a, &b))\n+ if (!BN_sub(r.get(), a.getc(), b.getc()))\nthrow bignum_error(\"CBigNum::operator- : BN_sub failed\");\nreturn r;\n}\n@@ -508,7 +523,7 @@ inline const CBigNum operator-(const CBigNum& a, const CBigNum& b)\ninline const CBigNum operator-(const CBigNum& a)\n{\nCBigNum r(a);\n- BN_set_negative(&r, !BN_is_negative(&r));\n+ BN_set_negative(r.get(), !BN_is_negative(r.getc()));\nreturn r;\n}\n@@ -516,7 +531,7 @@ inline const CBigNum operator*(const CBigNum& a, const CBigNum& b)\n{\nCAutoBN_CTX pctx;\nCBigNum r;\n- if (!BN_mul(&r, &a, &b, pctx))\n+ if (!BN_mul(r.get(), a.getc(), b.getc(), pctx))\nthrow bignum_error(\"CBigNum::operator* : BN_mul failed\");\nreturn r;\n}\n@@ -525,7 +540,7 @@ inline const CBigNum operator/(const CBigNum& a, const CBigNum& b)\n{\nCAutoBN_CTX pctx;\nCBigNum r;\n- if (!BN_div(&r, NULL, &a, &b, pctx))\n+ if (!BN_div(r.get(), NULL, a.getc(), b.getc(), pctx))\nthrow bignum_error(\"CBigNum::operator/ : BN_div failed\");\nreturn r;\n}\n@@ -534,7 +549,7 @@ inline const CBigNum operator%(const CBigNum& a, const CBigNum& b)\n{\nCAutoBN_CTX pctx;\nCBigNum r;\n- if (!BN_mod(&r, &a, &b, pctx))\n+ if (!BN_mod(r.get(), a.getc(), b.getc(), pctx))\nthrow bignum_error(\"CBigNum::operator% : BN_div failed\");\nreturn r;\n}\n@@ -542,7 +557,7 @@ inline const CBigNum operator%(const CBigNum& a, const CBigNum& b)\ninline const CBigNum operator<<(const CBigNum& a, unsigned int shift)\n{\nCBigNum r;\n- if (!BN_lshift(&r, &a, shift))\n+ if (!BN_lshift(r.get(), a.getc(), shift))\nthrow bignum_error(\"CBigNum:operator<< : BN_lshift failed\");\nreturn r;\n}\n@@ -554,11 +569,11 @@ inline const CBigNum operator>>(const CBigNum& a, unsigned int shift)\nreturn r;\n}\n-inline bool operator==(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) == 0); }\n-inline bool operator!=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) != 0); }\n-inline bool operator<=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) <= 0); }\n-inline bool operator>=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) >= 0); }\n-inline bool operator<(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) < 0); }\n-inline bool operator>(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) > 0); }\n+inline bool operator==(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.getc(), b.getc()) == 0); }\n+inline bool operator!=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.getc(), b.getc()) != 0); }\n+inline bool operator<=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.getc(), b.getc()) <= 0); }\n+inline bool operator>=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.getc(), b.getc()) >= 0); }\n+inline bool operator<(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.getc(), b.getc()) < 0); }\n+inline bool operator>(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.getc(), b.getc()) > 0); }\n#endif\n"
},
{
"change_type": "MODIFY",
"old_path": "src/crypter.cpp",
"new_path": "src/crypter.cpp",
"diff": "@@ -56,15 +56,14 @@ bool CCrypter::Encrypt(const CKeyingMaterial& vchPlaintext, std::vector<unsigned\nint nCLen = nLen + AES_BLOCK_SIZE, nFLen = 0;\nvchCiphertext = std::vector<unsigned char> (nCLen);\n- EVP_CIPHER_CTX ctx;\n+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();\n- bool fOk = true;\n+ bool fOk = (ctx != NULL);\n- EVP_CIPHER_CTX_init(&ctx);\n- if (fOk) fOk = EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV);\n- if (fOk) fOk = EVP_EncryptUpdate(&ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen);\n- if (fOk) fOk = EVP_EncryptFinal_ex(&ctx, (&vchCiphertext[0])+nCLen, &nFLen);\n- EVP_CIPHER_CTX_cleanup(&ctx);\n+ if (fOk) fOk = EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, chKey, chIV);\n+ if (fOk) fOk = EVP_EncryptUpdate(ctx, &vchCiphertext[0], &nCLen, &vchPlaintext[0], nLen);\n+ if (fOk) fOk = EVP_EncryptFinal_ex(ctx, (&vchCiphertext[0])+nCLen, &nFLen);\n+ EVP_CIPHER_CTX_free(ctx);\nif (!fOk) return false;\n@@ -83,15 +82,14 @@ bool CCrypter::Decrypt(const std::vector<unsigned char>& vchCiphertext, CKeyingM\nvchPlaintext = CKeyingMaterial(nPLen);\n- EVP_CIPHER_CTX ctx;\n+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();\n- bool fOk = true;\n+ bool fOk = (ctx != NULL);\n- EVP_CIPHER_CTX_init(&ctx);\n- if (fOk) fOk = EVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, chKey, chIV);\n- if (fOk) fOk = EVP_DecryptUpdate(&ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen);\n- if (fOk) fOk = EVP_DecryptFinal_ex(&ctx, (&vchPlaintext[0])+nPLen, &nFLen);\n- EVP_CIPHER_CTX_cleanup(&ctx);\n+ if (fOk) fOk = EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, chKey, chIV);\n+ if (fOk) fOk = EVP_DecryptUpdate(ctx, &vchPlaintext[0], &nPLen, &vchCiphertext[0], nLen);\n+ if (fOk) fOk = EVP_DecryptFinal_ex(ctx, (&vchPlaintext[0])+nPLen, &nFLen);\n+ EVP_CIPHER_CTX_free(ctx);\nif (!fOk) return false;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/key.cpp",
"new_path": "src/key.cpp",
"diff": "@@ -67,6 +67,8 @@ int ECDSA_SIG_recover_key_GFp(EC_KEY *eckey, ECDSA_SIG *ecsig, const unsigned ch\nEC_POINT *Q = NULL;\nBIGNUM *rr = NULL;\nBIGNUM *zero = NULL;\n+ const BIGNUM *ecsig_r = NULL;\n+ const BIGNUM *ecsig_s = NULL;\nint n = 0;\nint i = recid / 2;\n@@ -78,7 +80,10 @@ int ECDSA_SIG_recover_key_GFp(EC_KEY *eckey, ECDSA_SIG *ecsig, const unsigned ch\nx = BN_CTX_get(ctx);\nif (!BN_copy(x, order)) { ret=-1; goto err; }\nif (!BN_mul_word(x, i)) { ret=-1; goto err; }\n- if (!BN_add(x, x, ecsig->r)) { ret=-1; goto err; }\n+\n+ ECDSA_SIG_get0(ecsig, &ecsig_r, &ecsig_s);\n+\n+ if (!BN_add(x, x, ecsig_r)) { ret=-1; goto err; }\nfield = BN_CTX_get(ctx);\nif (!EC_GROUP_get_curve_GFp(group, field, NULL, NULL, ctx)) { ret=-2; goto err; }\nif (BN_cmp(x, field) >= 0) { ret=0; goto err; }\n@@ -99,9 +104,9 @@ int ECDSA_SIG_recover_key_GFp(EC_KEY *eckey, ECDSA_SIG *ecsig, const unsigned ch\nif (!BN_zero(zero)) { ret=-1; goto err; }\nif (!BN_mod_sub(e, zero, e, order, ctx)) { ret=-1; goto err; }\nrr = BN_CTX_get(ctx);\n- if (!BN_mod_inverse(rr, ecsig->r, order, ctx)) { ret=-1; goto err; }\n+ if (!BN_mod_inverse(rr, ecsig_r, order, ctx)) { ret=-1; goto err; }\nsor = BN_CTX_get(ctx);\n- if (!BN_mod_mul(sor, ecsig->s, rr, order, ctx)) { ret=-1; goto err; }\n+ if (!BN_mod_mul(sor, ecsig_s, rr, order, ctx)) { ret=-1; goto err; }\neor = BN_CTX_get(ctx);\nif (!BN_mod_mul(eor, e, rr, order, ctx)) { ret=-1; goto err; }\nif (!EC_POINT_mul(group, Q, eor, R, sor, ctx)) { ret=-2; goto err; }\n@@ -313,8 +318,13 @@ bool CKey::SignCompact(uint256 hash, std::vector<unsigned char>& vchSig)\nreturn false;\nvchSig.clear();\nvchSig.resize(65,0);\n- int nBitsR = BN_num_bits(sig->r);\n- int nBitsS = BN_num_bits(sig->s);\n+\n+ const BIGNUM *ecsig_r = NULL;\n+ const BIGNUM *ecsig_s = NULL;\n+ ECDSA_SIG_get0(sig, &ecsig_r, &ecsig_s);\n+\n+ int nBitsR = BN_num_bits(ecsig_r);\n+ int nBitsS = BN_num_bits(ecsig_s);\nif (nBitsR <= 256 && nBitsS <= 256)\n{\nint nRecId = -1;\n@@ -336,8 +346,8 @@ bool CKey::SignCompact(uint256 hash, std::vector<unsigned char>& vchSig)\nthrow key_error(\"CKey::SignCompact() : unable to construct recoverable key\");\nvchSig[0] = nRecId+27+(fCompressedPubKey ? 4 : 0);\n- BN_bn2bin(sig->r,&vchSig[33-(nBitsR+7)/8]);\n- BN_bn2bin(sig->s,&vchSig[65-(nBitsS+7)/8]);\n+ BN_bn2bin(ecsig_r,&vchSig[33-(nBitsR+7)/8]);\n+ BN_bn2bin(ecsig_s,&vchSig[65-(nBitsS+7)/8]);\nfOk = true;\n}\nECDSA_SIG_free(sig);\n@@ -356,9 +366,11 @@ bool CKey::SetCompactSignature(uint256 hash, const std::vector<unsigned char>& v\nif (nV<27 || nV>=35)\nreturn false;\nECDSA_SIG *sig = ECDSA_SIG_new();\n- BN_bin2bn(&vchSig[1],32,sig->r);\n- BN_bin2bn(&vchSig[33],32,sig->s);\n-\n+ BIGNUM *ecsig_r = NULL;\n+ BIGNUM *ecsig_s = NULL;\n+ BN_bin2bn(&vchSig[1],32,ecsig_r);\n+ BN_bin2bn(&vchSig[33],32,ecsig_s);\n+ ECDSA_SIG_set0(sig, ecsig_r, ecsig_s);\nEC_KEY_free(pkey);\npkey = EC_KEY_new_by_curve_name(NID_secp256k1);\nif (nV >= 31)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/m4/bitcoin_qt.m4",
"new_path": "src/m4/bitcoin_qt.m4",
"diff": "@@ -236,8 +236,8 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG],[\nQT_LIB_PREFIX=Qt\nbitcoin_qt_got_major_vers=4\nfi\n- qt5_modules=\"Qt5Core Qt5Gui Qt5Network Qt5Widgets Qt5WebKitWidgets\"\n- qt4_modules=\"QtCore QtGui QtNetwork QtWebkit QtWidgets\"\n+ qt5_modules=\"Qt5Core Qt5Gui Qt5Network Qt5Widgets QtWebKit Qt5WebKitWidgets\"\n+ qt4_modules=\"QtCore QtGui QtNetwork QtWebKit QtWidgets\"\nBITCOIN_QT_CHECK([\nif test x$bitcoin_qt_want_version == xqt5 || ( test x$bitcoin_qt_want_version == xauto && test x$auto_priority_version == xqt5 ); then\nPKG_CHECK_MODULES([QT], [$qt5_modules], [QT_INCLUDES=\"$QT_CFLAGS\"; have_qt=yes],[have_qt=no])\n"
},
{
"change_type": "MODIFY",
"old_path": "src/script.cpp",
"new_path": "src/script.cpp",
"diff": "@@ -809,17 +809,17 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co\nbreak;\ncase OP_MUL:\n- if (!BN_mul(&bn, &bn1, &bn2, pctx))\n+ if (!BN_mul(bn.get(), bn1.getc(), bn2.getc(), pctx))\nreturn false;\nbreak;\ncase OP_DIV:\n- if (!BN_div(&bn, NULL, &bn1, &bn2, pctx))\n+ if (!BN_div(bn.get(), NULL, bn1.getc(), bn2.getc(), pctx))\nreturn false;\nbreak;\ncase OP_MOD:\n- if (!BN_mod(&bn, &bn1, &bn2, pctx))\n+ if (!BN_mod(bn.get(), bn1.getc(), bn2.getc(), pctx))\nreturn false;\nbreak;\n"
},
{
"change_type": "MODIFY",
"old_path": "src/smessage.cpp",
"new_path": "src/smessage.cpp",
"diff": "@@ -125,15 +125,14 @@ bool SecMsgCrypter::Encrypt(unsigned char* chPlaintext, uint32_t nPlain, std::ve\nint nCLen = nLen + AES_BLOCK_SIZE, nFLen = 0;\nvchCiphertext = std::vector<unsigned char> (nCLen);\n- EVP_CIPHER_CTX ctx;\n+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();\n- bool fOk = true;\n+ bool fOk = (ctx != NULL);\n- EVP_CIPHER_CTX_init(&ctx);\n- if (fOk) fOk = EVP_EncryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, &chKey[0], &chIV[0]);\n- if (fOk) fOk = EVP_EncryptUpdate(&ctx, &vchCiphertext[0], &nCLen, chPlaintext, nLen);\n- if (fOk) fOk = EVP_EncryptFinal_ex(&ctx, (&vchCiphertext[0])+nCLen, &nFLen);\n- EVP_CIPHER_CTX_cleanup(&ctx);\n+ if (fOk) fOk = EVP_EncryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, &chKey[0], &chIV[0]);\n+ if (fOk) fOk = EVP_EncryptUpdate(ctx, &vchCiphertext[0], &nCLen, chPlaintext, nLen);\n+ if (fOk) fOk = EVP_EncryptFinal_ex(ctx, (&vchCiphertext[0])+nCLen, &nFLen);\n+ EVP_CIPHER_CTX_cleanup(ctx);\nif (!fOk)\nreturn false;\n@@ -153,15 +152,14 @@ bool SecMsgCrypter::Decrypt(unsigned char* chCiphertext, uint32_t nCipher, std::\nvchPlaintext.resize(nCipher);\n- EVP_CIPHER_CTX ctx;\n+ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();\n- bool fOk = true;\n+ bool fOk = (ctx != NULL);\n- EVP_CIPHER_CTX_init(&ctx);\n- if (fOk) fOk = EVP_DecryptInit_ex(&ctx, EVP_aes_256_cbc(), NULL, &chKey[0], &chIV[0]);\n- if (fOk) fOk = EVP_DecryptUpdate(&ctx, &vchPlaintext[0], &nPLen, &chCiphertext[0], nCipher);\n- if (fOk) fOk = EVP_DecryptFinal_ex(&ctx, (&vchPlaintext[0])+nPLen, &nFLen);\n- EVP_CIPHER_CTX_cleanup(&ctx);\n+ if (fOk) fOk = EVP_DecryptInit_ex(ctx, EVP_aes_256_cbc(), NULL, &chKey[0], &chIV[0]);\n+ if (fOk) fOk = EVP_DecryptUpdate(ctx, &vchPlaintext[0], &nPLen, &chCiphertext[0], nCipher);\n+ if (fOk) fOk = EVP_DecryptFinal_ex(ctx, (&vchPlaintext[0])+nPLen, &nFLen);\n+ EVP_CIPHER_CTX_free(ctx);\nif (!fOk)\nreturn false;\n@@ -3154,15 +3152,14 @@ int SecureMsgValidate(unsigned char *pHeader, unsigned char *pPayload, uint32_t\nfor (int i = 0; i < 32; i+=4)\nmemcpy(civ+i, &nonse, 4);\n- HMAC_CTX ctx;\n- HMAC_CTX_init(&ctx);\n+ HMAC_CTX *ctx = HMAC_CTX_new();\nunsigned int nBytes;\n- if (!HMAC_Init_ex(&ctx, &civ[0], 32, EVP_sha256(), NULL)\n- || !HMAC_Update(&ctx, (unsigned char*) pHeader+4, SMSG_HDR_LEN-4)\n- || !HMAC_Update(&ctx, (unsigned char*) pPayload, nPayload)\n- || !HMAC_Update(&ctx, pPayload, nPayload)\n- || !HMAC_Final(&ctx, sha256Hash, &nBytes)\n+ if (!HMAC_Init_ex(ctx, &civ[0], 32, EVP_sha256(), NULL)\n+ || !HMAC_Update(ctx, (unsigned char*) pHeader+4, SMSG_HDR_LEN-4)\n+ || !HMAC_Update(ctx, (unsigned char*) pPayload, nPayload)\n+ || !HMAC_Update(ctx, pPayload, nPayload)\n+ || !HMAC_Final(ctx, sha256Hash, &nBytes)\n|| nBytes != 32)\n{\nif (fDebug)\n@@ -3186,7 +3183,8 @@ int SecureMsgValidate(unsigned char *pHeader, unsigned char *pPayload, uint32_t\nrv = 3; // checksum mismatch\n}\n}\n- HMAC_CTX_cleanup(&ctx);\n+\n+ HMAC_CTX_free(ctx);\nreturn rv;\n};\n@@ -3214,8 +3212,7 @@ int SecureMsgSetHash(unsigned char *pHeader, unsigned char *pPayload, uint32_t n\n//vchHash.resize(32);\nbool found = false;\n- HMAC_CTX ctx;\n- HMAC_CTX_init(&ctx);\n+ HMAC_CTX *ctx = HMAC_CTX_new();\nuint32_t nonse = 0;\n@@ -3236,11 +3233,11 @@ int SecureMsgSetHash(unsigned char *pHeader, unsigned char *pPayload, uint32_t n\nmemcpy(civ+i, &nonse, 4);\nunsigned int nBytes;\n- if (!HMAC_Init_ex(&ctx, &civ[0], 32, EVP_sha256(), NULL)\n- || !HMAC_Update(&ctx, (unsigned char*) pHeader+4, SMSG_HDR_LEN-4)\n- || !HMAC_Update(&ctx, (unsigned char*) pPayload, nPayload)\n- || !HMAC_Update(&ctx, pPayload, nPayload)\n- || !HMAC_Final(&ctx, sha256Hash, &nBytes)\n+ if (!HMAC_Init_ex(ctx, &civ[0], 32, EVP_sha256(), NULL)\n+ || !HMAC_Update(ctx, (unsigned char*) pHeader+4, SMSG_HDR_LEN-4)\n+ || !HMAC_Update(ctx, (unsigned char*) pPayload, nPayload)\n+ || !HMAC_Update(ctx, pPayload, nPayload)\n+ || !HMAC_Final(ctx, sha256Hash, &nBytes)\n//|| !HMAC_Final(&ctx, &vchHash[0], &nBytes)\n|| nBytes != 32)\nbreak;\n@@ -3277,7 +3274,7 @@ int SecureMsgSetHash(unsigned char *pHeader, unsigned char *pPayload, uint32_t n\nnonse++;\n};\n- HMAC_CTX_cleanup(&ctx);\n+ HMAC_CTX_free(ctx);\nif (!fSecMsgEnabled)\n{\n@@ -3423,7 +3420,7 @@ int SecureMsgEncrypt(SecureMessage& smsg, std::string& addressFrom, std::string&\n//printf(\"secret_len %d.\\n\", secret_len);\n// -- ECDH_compute_key returns the same P if fed compressed or uncompressed public keys\n- ECDH_set_method(pkeyr, ECDH_OpenSSL());\n+ EC_KEY_set_method(pkeyr, EC_KEY_OpenSSL());\nint lenP = ECDH_compute_key(&vchP[0], 32, EC_KEY_get0_public_key(pkeyK), pkeyr, NULL);\nif (lenP != 32)\n@@ -3556,17 +3553,16 @@ int SecureMsgEncrypt(SecureMessage& smsg, std::string& addressFrom, std::string&\n// Message authentication code, (hash of timestamp + destination + payload)\nbool fHmacOk = true;\nunsigned int nBytes = 32;\n- HMAC_CTX ctx;\n- HMAC_CTX_init(&ctx);\n+ HMAC_CTX *ctx = HMAC_CTX_new();\n- if (!HMAC_Init_ex(&ctx, &key_m[0], 32, EVP_sha256(), NULL)\n- || !HMAC_Update(&ctx, (unsigned char*) &smsg.timestamp, sizeof(smsg.timestamp))\n- || !HMAC_Update(&ctx, &vchCiphertext[0], vchCiphertext.size())\n- || !HMAC_Final(&ctx, smsg.mac, &nBytes)\n+ if (!HMAC_Init_ex(ctx, &key_m[0], 32, EVP_sha256(), NULL)\n+ || !HMAC_Update(ctx, (unsigned char*) &smsg.timestamp, sizeof(smsg.timestamp))\n+ || !HMAC_Update(ctx, &vchCiphertext[0], vchCiphertext.size())\n+ || !HMAC_Final(ctx, smsg.mac, &nBytes)\n|| nBytes != 32)\nfHmacOk = false;\n- HMAC_CTX_cleanup(&ctx);\n+ HMAC_CTX_free(ctx);\nif (!fHmacOk)\n{\n@@ -3835,7 +3831,7 @@ int SecureMsgDecrypt(bool fTestOnly, std::string& address, unsigned char *pHeade\nEC_KEY* pkeyk = keyDest.GetECKey();\nEC_KEY* pkeyR = keyR.GetECKey();\n- ECDH_set_method(pkeyk, ECDH_OpenSSL());\n+ EC_KEY_set_method(pkeyk, EC_KEY_OpenSSL());\nint lenPdec = ECDH_compute_key(&vchP[0], 32, EC_KEY_get0_public_key(pkeyR), pkeyk, NULL);\nif (lenPdec != 32)\n@@ -3858,17 +3854,16 @@ int SecureMsgDecrypt(bool fTestOnly, std::string& address, unsigned char *pHeade\nunsigned char MAC[32];\nbool fHmacOk = true;\nunsigned int nBytes = 32;\n- HMAC_CTX ctx;\n- HMAC_CTX_init(&ctx);\n+ HMAC_CTX *ctx = HMAC_CTX_new();\n- if (!HMAC_Init_ex(&ctx, &key_m[0], 32, EVP_sha256(), NULL)\n- || !HMAC_Update(&ctx, (unsigned char*) &psmsg->timestamp, sizeof(psmsg->timestamp))\n- || !HMAC_Update(&ctx, pPayload, nPayload)\n- || !HMAC_Final(&ctx, MAC, &nBytes)\n+ if (!HMAC_Init_ex(ctx, &key_m[0], 32, EVP_sha256(), NULL)\n+ || !HMAC_Update(ctx, (unsigned char*) &psmsg->timestamp, sizeof(psmsg->timestamp))\n+ || !HMAC_Update(ctx, pPayload, nPayload)\n+ || !HMAC_Final(ctx, MAC, &nBytes)\n|| nBytes != 32)\nfHmacOk = false;\n- HMAC_CTX_cleanup(&ctx);\n+ HMAC_CTX_free(ctx);\nif (!fHmacOk)\n{\n"
}
]
| C++ | MIT License | vergecurrency/verge | initial support for openssl1.1 |
714,127 | 29.12.2017 22:32:04 | 25,200 | da918fa8ee7db34b3ce91b572a8c444b8f0b4262 | Update to QLabel on Overview and revised background image
1. Changed Qlabel to be white from the default red.
2. Updated background image to show more the mountain | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/overviewpage.ui",
"new_path": "src/qt/forms/overviewpage.ui",
"diff": "@@ -50,7 +50,7 @@ border: 1px solid #ffffff;\n<string>The displayed information may be out of date. Your wallet automatically synchronizes with the VERGE network after a connection is established, but this process has not completed yet.</string>\n</property>\n<property name=\"styleSheet\">\n- <string notr=\"true\">QLabel { color: red; }</string>\n+ <string notr=\"true\">QLabel { color: white; }</string>\n</property>\n<property name=\"text\">\n<string notr=\"true\">(out of sync)</string>\n@@ -252,7 +252,7 @@ border: 1px solid #ffffff;\n<string>The displayed information may be out of date. Your wallet automatically synchronizes with the VERGE network after a connection is established, but this process has not completed yet.</string>\n</property>\n<property name=\"styleSheet\">\n- <string notr=\"true\">QLabel { color: red; }</string>\n+ <string notr=\"true\">QLabel { color: white; }</string>\n</property>\n<property name=\"text\">\n<string notr=\"true\">(out of sync)</string>\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/res/images/bkg.png",
"new_path": "src/qt/res/images/bkg.png",
"diff": "Binary files a/src/qt/res/images/bkg.png and b/src/qt/res/images/bkg.png differ\n"
}
]
| C++ | MIT License | vergecurrency/verge | Update to QLabel on Overview and revised background image
1. Changed Qlabel to be white from the default red.
2. Updated background image to show more the mountain |
714,127 | 29.12.2017 22:41:16 | 25,200 | af053f9a6ef088e98e3876b5c374457e7ff1735c | Updated toolbar to center align icons
Icons in the toolbar should now be centered and the background is transparent | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -83,7 +83,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\nsetMinimumSize(970,500);\nresize(970, 500);\nsetWindowTitle(tr(\"VERGE\") + \" - \" + tr(\"Wallet\"));\n- qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(249,221,131); } #toolbar2 { border:none;width:5px; background-color:rgb(249,221,131); } #toolbar { border:none;height:100%;padding-top:20px; background: rgb(57,85,95); text-align: left; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); color:white; padding-bottom:10px; } QMenu::item { color:white; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; background-color: transparent; }\");\n+ qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(249,221,131); } #toolbar2 { border:none;width:5px; background-color:rgb(249,221,131); } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); color:white; padding-bottom:10px; } QMenu::item { color:white; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; background-color: transparent; }\");\n#ifndef Q_OS_MAC\nqApp->setWindowIcon(QIcon(\":icons/bitcoin\"));\nsetWindowIcon(QIcon(\":icons/bitcoin\"));\n"
}
]
| C++ | MIT License | vergecurrency/verge | Updated toolbar to center align icons
Icons in the toolbar should now be centered and the background is transparent |
714,127 | 29.12.2017 23:18:55 | 25,200 | f04cebb7c30cc6fca147058e0267e8b60cd84a9d | Update to text color on Block Explorer
Changed to white | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/blockbrowser.ui",
"new_path": "src/qt/forms/blockbrowser.ui",
"diff": "</font>\n</property>\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" font-size:20px; font-weight:400; color:#0b3b47;">Block Explorer </span></p></body></html></string>\n+ <string><html><head/><body><p><span style=" font-size:20px; font-weight:400; color:#ffffff;">Block Explorer </span></p></body></html></string>\n</property>\n</widget>\n</item>\n@@ -126,19 +126,19 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 1px solid #0b3b47;\n+border: 1px solid #ffffff;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n<property name=\"text\">\n- <string>Decode Transaction</string>\n+ <string>color:#ffffff; Decode Transaction</string>\n</property>\n</widget>\n</item>\n<item row=\"17\" column=\"0\">\n<widget class=\"QLabel\" name=\"inputLabel\">\n<property name=\"text\">\n- <string>Inputs:</string>\n+ <string>color:#ffffff; Inputs:</string>\n</property>\n<property name=\"alignment\">\n<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>\n@@ -148,35 +148,35 @@ max-height: 25px;</string>\n<item row=\"10\" column=\"1\">\n<widget class=\"QLabel\" name=\"pawBox\">\n<property name=\"text\">\n- <string>0000 KH/s</string>\n+ <string>color:#ffffff; 0000 KH/s</string>\n</property>\n</widget>\n</item>\n<item row=\"14\" column=\"0\">\n<widget class=\"QLabel\" name=\"valueLabel\">\n<property name=\"text\">\n- <string>Value out:</string>\n+ <string>color:#ffffff; Value out:</string>\n</property>\n</widget>\n</item>\n<item row=\"13\" column=\"0\">\n<widget class=\"QLabel\" name=\"txLabel\">\n<property name=\"text\">\n- <string>Transaction ID:</string>\n+ <string>color:#ffffff; Transaction ID:</string>\n</property>\n</widget>\n</item>\n<item row=\"9\" column=\"1\">\n<widget class=\"QLabel\" name=\"hardBox\">\n<property name=\"text\">\n- <string>0.00</string>\n+ <string>color:#ffffff; 0.00</string>\n</property>\n</widget>\n</item>\n<item row=\"13\" column=\"1\">\n<widget class=\"QLabel\" name=\"txID\">\n<property name=\"text\">\n- <string>000</string>\n+ <string>color:#ffffff; 000</string>\n</property>\n</widget>\n</item>\n@@ -200,7 +200,7 @@ max-height: 25px;</string>\n<item row=\"9\" column=\"0\">\n<widget class=\"QLabel\" name=\"hardLabel\">\n<property name=\"text\">\n- <string>Block Difficulty:</string>\n+ <string>color:#ffffff; Block Difficulty:</string>\n</property>\n</widget>\n</item>\n@@ -230,7 +230,7 @@ max-height: 25px;</string>\n<item row=\"3\" column=\"0\">\n<widget class=\"QLabel\" name=\"heightLabel_2\">\n<property name=\"text\">\n- <string>Block Height:</string>\n+ <string>color:#ffffff; Block Height:</string>\n</property>\n</widget>\n</item>\n@@ -249,26 +249,26 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 1px solid #0b3b47;\n+border: 1px solid #ffffff;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n<property name=\"text\">\n- <string>Jump to Block</string>\n+ <string>color:#ffffff; Jump to Block</string>\n</property>\n</widget>\n</item>\n<item row=\"5\" column=\"0\">\n<widget class=\"QLabel\" name=\"merkleLabel\">\n<property name=\"text\">\n- <string>Block Merkle:</string>\n+ <string>color:#ffffff; Block Merkle:</string>\n</property>\n</widget>\n</item>\n<item row=\"4\" column=\"0\">\n<widget class=\"QLabel\" name=\"hashLabel\">\n<property name=\"text\">\n- <string>Block Hash:</string>\n+ <string>color:#ffffff; Block Hash:</string>\n</property>\n</widget>\n</item>\n@@ -282,7 +282,7 @@ max-height: 25px;</string>\n<item row=\"10\" column=\"0\">\n<widget class=\"QLabel\" name=\"pawLabel\">\n<property name=\"text\">\n- <string>Block Hashrate:</string>\n+ <string>color:#ffffff; Block Hashrate:</string>\n</property>\n</widget>\n</item>\n@@ -296,14 +296,14 @@ max-height: 25px;</string>\n<item row=\"15\" column=\"0\">\n<widget class=\"QLabel\" name=\"feesLabel\">\n<property name=\"text\">\n- <string>Fees:</string>\n+ <string>color:#ffffff; Fees:</string>\n</property>\n</widget>\n</item>\n<item row=\"7\" column=\"0\">\n<widget class=\"QLabel\" name=\"bitsLabel\">\n<property name=\"text\">\n- <string>Block nBits:</string>\n+ <string>color:#ffffff; Block nBits:</string>\n</property>\n</widget>\n</item>\n@@ -330,7 +330,7 @@ max-height: 25px;</string>\n<item row=\"16\" column=\"0\">\n<widget class=\"QLabel\" name=\"outputLabel\">\n<property name=\"text\">\n- <string>Outputs:</string>\n+ <string>color:#ffffff; Outputs:</string>\n</property>\n<property name=\"alignment\">\n<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>\n@@ -350,7 +350,7 @@ max-height: 25px;</string>\n<item row=\"6\" column=\"0\">\n<widget class=\"QLabel\" name=\"nonceLabel\">\n<property name=\"text\">\n- <string>Block nNonce:</string>\n+ <string>color:#ffffff; Block nNonce:</string>\n</property>\n</widget>\n</item>\n@@ -364,7 +364,7 @@ max-height: 25px;</string>\n<item row=\"8\" column=\"0\">\n<widget class=\"QLabel\" name=\"timeLabel\">\n<property name=\"text\">\n- <string>Block Timestamp:</string>\n+ <string>color:#ffffff; Block Timestamp:</string>\n</property>\n</widget>\n</item>\n"
}
]
| C++ | MIT License | vergecurrency/verge | Update to text color on Block Explorer
Changed to white |
714,127 | 29.12.2017 23:23:40 | 25,200 | a56e01bc44625077632b8228163ef7cb8d465e93 | Update to text color on Overview
Changed to white | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/overviewpage.ui",
"new_path": "src/qt/forms/overviewpage.ui",
"diff": "@@ -40,7 +40,7 @@ border: 1px solid #ffffff;\n</font>\n</property>\n<property name=\"text\">\n- <string>Wallet</string>\n+ <string>color:#ffffff; Wallet</string>\n</property>\n</widget>\n</item>\n@@ -89,7 +89,7 @@ border: 1px solid #ffffff;\n<item row=\"0\" column=\"0\">\n<widget class=\"QLabel\" name=\"label\">\n<property name=\"text\">\n- <string>Balance:</string>\n+ <string>color:#ffffff; Balance:</string>\n</property>\n</widget>\n</item>\n@@ -118,7 +118,7 @@ border: 1px solid #ffffff;\n<item row=\"1\" column=\"0\">\n<widget class=\"QLabel\" name=\"label_3\">\n<property name=\"text\">\n- <string>Unconfirmed:</string>\n+ <string>color:#ffffff; Unconfirmed:</string>\n</property>\n</widget>\n</item>\n@@ -173,7 +173,7 @@ border: 1px solid #ffffff;\n<item row=\"3\" column=\"0\">\n<widget class=\"QLabel\" name=\"label_2\">\n<property name=\"text\">\n- <string>Number of transactions:</string>\n+ <string>color:#ffffff; Number of transactions:</string>\n</property>\n</widget>\n</item>\n@@ -242,7 +242,7 @@ border: 1px solid #ffffff;\n<item>\n<widget class=\"QLabel\" name=\"label_4\">\n<property name=\"text\">\n- <string><b>Recent transactions</b></string>\n+ <string><b>color:#ffffff; Recent transactions</b></string>\n</property>\n</widget>\n</item>\n"
}
]
| C++ | MIT License | vergecurrency/verge | Update to text color on Overview
Changed to white |
714,127 | 30.12.2017 06:31:32 | 25,200 | 426ff938704a3f6648410c6fd7b838a4b669c4dc | Update to text color on Address Book
Updates.
1. Changed text color to white
2. Removed icon in buttona
3. Mad buttons flat with branded Verge colors | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/addressbookpage.ui",
"new_path": "src/qt/forms/addressbookpage.ui",
"diff": "<item>\n<widget class=\"QLabel\" name=\"labelExplanation\">\n<property name=\"text\">\n- <string>These are your VERGE addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</string>\n+ <string>color:#ffffff; These are your VERGE addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</string>\n</property>\n<property name=\"textFormat\">\n<enum>Qt::PlainText</enum>\n@@ -41,7 +41,7 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;</string>\n+border: 1px solid #000000;</string>\n</property>\n<property name=\"tabKeyNavigation\">\n<bool>false</bool>\n@@ -75,16 +75,13 @@ border: 2px solid #000000;</string>\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n-min-width: 95px;\n-max-width: 95px;</string>\n+border: 1px solid #00CBFF;\n+background: #00CBFF;\n+min-width: 125px;\n+max-width: 125px;</string>\n</property>\n<property name=\"text\">\n- <string>&New Address</string>\n- </property>\n- <property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n- <normaloff>:/icons/add</normaloff>:/icons/add</iconset>\n+ <string>#ffffff; New Address</string>\n</property>\n</widget>\n</item>\n@@ -98,16 +95,13 @@ max-width: 95px;</string>\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n-min-width: 95px;\n-max-width: 95px;</string>\n+border: 1px solid #00CBFF;\n+background: #00CBFF;\n+min-width: 125px;\n+max-width: 125px;</string>\n</property>\n<property name=\"text\">\n- <string>&Copy Address</string>\n- </property>\n- <property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n- <normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>\n+ <string>#ffffff; Copy Address</string>\n</property>\n</widget>\n</item>\n@@ -118,16 +112,13 @@ max-width: 95px;</string>\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n-min-width: 95px;\n-max-width: 95px;</string>\n+border: 1px solid #00CBFF;\n+background: #00CBFF;\n+min-width: 125px;\n+max-width: 125px;</string>\n</property>\n<property name=\"text\">\n- <string>Show &QR Code</string>\n- </property>\n- <property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n- <normaloff>:/icons/qrcode</normaloff>:/icons/qrcode</iconset>\n+ <string>#ffffff; Show &QR Code</string>\n</property>\n</widget>\n</item>\n@@ -141,16 +132,13 @@ max-width: 95px;</string>\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n-min-width: 95px;\n-max-width: 95px;</string>\n+border: 1px solid #00CBFF;\n+background: #00CBFF;\n+min-width: 125px;\n+max-width: 125px;</string>\n</property>\n<property name=\"text\">\n- <string>Sign &Message</string>\n- </property>\n- <property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n- <normaloff>:/icons/edit</normaloff>:/icons/edit</iconset>\n+ <string>#ffffff; Sign &Message</string>\n</property>\n</widget>\n</item>\n@@ -164,16 +152,13 @@ max-width: 95px;</string>\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n-min-width: 95px;\n-max-width: 95px;</string>\n+border: 1px solid #00CBFF;\n+background: #00CBFF;\n+min-width: 125px;\n+max-width: 125px;</string>\n</property>\n<property name=\"text\">\n- <string>&Verify Message</string>\n- </property>\n- <property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n- <normaloff>:/icons/transaction_0</normaloff>:/icons/transaction_0</iconset>\n+ <string>#ffffff; Verify Message</string>\n</property>\n</widget>\n</item>\n@@ -187,9 +172,10 @@ max-width: 95px;</string>\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n-min-width: 95px;\n-max-width: 95px;</string>\n+border: 1px solid #00CBFF;\n+background: #00CBFF;\n+min-width: 125px;\n+max-width: 125px;</string>\n</property>\n<property name=\"text\">\n<string>&Delete</string>\n"
}
]
| C++ | MIT License | vergecurrency/verge | Update to text color on Address Book
Updates.
1. Changed text color to white
2. Removed icon in buttona
3. Mad buttons flat with branded Verge colors |
714,127 | 30.12.2017 07:16:44 | 25,200 | 3eb28c992c00d17e1d496c4189c29275fd38f3a6 | final ui updates | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -83,7 +83,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\nsetMinimumSize(970,500);\nresize(970, 500);\nsetWindowTitle(tr(\"VERGE\") + \" - \" + tr(\"Wallet\"));\n- qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(249,221,131); } #toolbar2 { border:none;width:5px; background-color:rgb(249,221,131); } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); color:white; padding-bottom:10px; } QMenu::item { color:white; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; background-color: transparent; }\");\n+ qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(255,255,255); } #toolbar2 { border:none;width:5px; background-color:rgb(255,255,255); } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); color:white; padding-bottom:10px; } QMenu::item { color:white; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; background-color: transparent; }\");\n#ifndef Q_OS_MAC\nqApp->setWindowIcon(QIcon(\":icons/bitcoin\"));\nsetWindowIcon(QIcon(\":icons/bitcoin\"));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/sendcoinsdialog.ui",
"new_path": "src/qt/forms/sendcoinsdialog.ui",
"diff": "<property name=\"text\">\n<string>Add &Recipient</string>\n</property>\n- <property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n- <normaloff>:/icons/add</normaloff>:/icons/add</iconset>\n- </property>\n<property name=\"autoDefault\">\n<bool>false</bool>\n</property>\n<property name=\"text\">\n<string>Clear &All</string>\n</property>\n- <property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n- <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>\n- </property>\n<property name=\"autoRepeatDelay\">\n<number>300</number>\n</property>\n<item>\n<widget class=\"QLabel\" name=\"label\">\n<property name=\"text\">\n- <string>Balance:</string>\n+ <string>color:#ffffff; Balance:</string>\n</property>\n</widget>\n</item>\n<cursorShape>IBeamCursor</cursorShape>\n</property>\n<property name=\"text\">\n- <string>123.456 BTC</string>\n+ <string>color:#ffffff; 123.456 BTC</string>\n</property>\n<property name=\"textInteractionFlags\">\n<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>\n<property name=\"text\">\n<string>S&end</string>\n</property>\n- <property name=\"icon\">\n- <iconset resource=\"../bitcoin.qrc\">\n- <normaloff>:/icons/send</normaloff>:/icons/send</iconset>\n- </property>\n<property name=\"default\">\n<bool>true</bool>\n</property>\n"
}
]
| C++ | MIT License | vergecurrency/verge | final ui updates |
714,127 | 30.12.2017 07:29:02 | 25,200 | 361762d4664f977c1fa3ecc80b1b57e5fa7732dc | Cleanup on Send | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/sendcoinsentry.ui",
"new_path": "src/qt/forms/sendcoinsentry.ui",
"diff": "</property>\n<property name=\"icon\">\n<iconset resource=\"../bitcoin.qrc\">\n- <normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>\n+ <normaloff>:/icons/address-book_filled</normaloff>:/icons/address-book_filled</iconset>\n</property>\n<property name=\"shortcut\">\n<string>Alt+A</string>\n"
},
{
"change_type": "ADD",
"old_path": "src/qt/res/icons/address-book_filled .png",
"new_path": "src/qt/res/icons/address-book_filled .png",
"diff": "Binary files /dev/null and b/src/qt/res/icons/address-book_filled .png differ\n"
}
]
| C++ | MIT License | vergecurrency/verge | Cleanup on Send |
714,127 | 30.12.2017 13:21:39 | 25,200 | 50a48222381e09f9523a1a861ca8ce79ddbcd8c5 | update width&height button | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/addressbookpage.ui",
"new_path": "src/qt/forms/addressbookpage.ui",
"diff": "@@ -78,10 +78,10 @@ border-bottom-right-radius: 5px;\nborder: 1px solid #00CBFF;\ncolor: #266779;\nbackground: #00CBFF;\n-min-width: 40px;\n-max-width: 40px;\n-min-height: 40px;\n-max-height: 40px;</string>\n+min-width: 125px;\n+max-width: 125px;\n+min-height: 30px;\n+max-height: 30px;</string>\n</property>\n<property name=\"text\">\n<string>New Address</string>\n@@ -101,10 +101,10 @@ max-height: 40px;</string>\nborder: 1px solid #00CBFF;\ncolor: #266779;\nbackground: #00CBFF;\n- min-width: 40px;\n- max-width: 40px;\n- min-height: 40px;\n- max-height: 40px;</string>\n+ min-width: 125px;\n+ max-width: 125px;\n+ min-height: 30px;\n+ max-height: 30px;</string>\n</property>\n<property name=\"text\">\n<string>Copy Address</string>\n@@ -121,10 +121,10 @@ border-bottom-right-radius: 5px;\nborder: 1px solid #00CBFF;\ncolor: #266779;\nbackground: #00CBFF;\n-min-width: 40px;\n-max-width: 40px;\n-min-height: 40px;\n-max-height: 40px;</string>\n+min-width: 125px;\n+max-width: 125px;\n+min-height: 30px;\n+max-height: 30px;</string>\n</property>\n<property name=\"text\">\n<string>Show &QR Code</string>\n@@ -144,10 +144,10 @@ border-bottom-right-radius: 5px;\nborder: 1px solid #00CBFF;\ncolor: #266779;\nbackground: #00CBFF;\n-min-width: 40px;\n-max-width: 40px;\n-min-height: 40px;\n-max-height: 40px;</string>\n+min-width: 125px;\n+max-width: 125px;\n+min-height: 30px;\n+max-height: 30px;</string>\n</property>\n<property name=\"text\">\n<string>Sign &Message</string>\n@@ -167,10 +167,10 @@ border-bottom-right-radius: 5px;\nborder: 1px solid #00CBFF;\ncolor: #266779;\nbackground: #00CBFF;\n-min-width: 40px;\n-max-width: 40px;\n-min-height: 40px;\n-max-height: 40px;</string>\n+min-width: 125px;\n+max-width: 125px;\n+min-height: 30px;\n+max-height: 30px;</string>\n</property>\n<property name=\"text\">\n<string>Verify Message</string>\n@@ -190,10 +190,10 @@ border-bottom-right-radius: 5px;\nborder: 1px solid #00CBFF;\ncolor: #266779;\nbackground: #00CBFF;\n-min-width: 40px;\n-max-width: 40px;\n-min-height: 40px;\n-max-height: 40px;</string>\n+min-width: 125px;\n+max-width: 125px;\n+min-height: 30px;\n+max-height: 30px;</string>\n</property>\n<property name=\"text\">\n<string>Delete</string>\n"
}
]
| C++ | MIT License | vergecurrency/verge | update width&height button |
714,127 | 30.12.2017 21:02:07 | 25,200 | ee1f5b33d587a9198dd8af978536b097b99a957e | block exploerer update | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/blockbrowser.ui",
"new_path": "src/qt/forms/blockbrowser.ui",
"diff": "@@ -127,11 +127,12 @@ border-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\nborder: 1px solid #ffffff;\n+color: #ffffff;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">Decode Transaction </span></p></body></html></string>\n+ <string>Decode Transaction</string>\n</property>\n</widget>\n</item>\n@@ -219,6 +220,7 @@ border-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\nborder: 1px solid #0b3b47;\n+color: #ffffff;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n@@ -254,7 +256,7 @@ min-height: 25px;\nmax-height: 25px;</string>\n</property>\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">Jump to Block </span></p></body></html></string>\n+ <string>Jump to Block</string>\n</property>\n</widget>\n</item>\n"
}
]
| C++ | MIT License | vergecurrency/verge | block exploerer update |
714,127 | 30.12.2017 23:01:25 | 25,200 | 7e0646a57f73423b68497700a618f58c1432ba8c | address book/send updates | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/addressbookpage.ui",
"new_path": "src/qt/forms/addressbookpage.ui",
"diff": "<layout class=\"QVBoxLayout\" name=\"verticalLayout\">\n<item>\n<widget class=\"QLabel\" name=\"labelExplanation\">\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+ color: #ffffff;</string>\n+ </property>\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#ffffff;">These are your VERGE addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. </span></p></body></html></string>\n+ <string>These are your VERGE addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</string>\n</property>\n<property name=\"textFormat\">\n<enum>Qt::PlainText</enum>\n@@ -71,13 +75,14 @@ border: 1px solid #000000;</string>\n<string>Create a new address</string>\n</property>\n<property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #00CBFF;\n-color: #266779;\n-background: #00CBFF;\n+ <string notr=\"true\">\n+border-top-left-radius: 3px;\n+border-top-right-radius: 3px;\n+border-bottom-left-radius: 3px;\n+border-bottom-right-radius: 3px;\n+border: 1px solid #10829F;\n+color: #ffffff;\n+background: #00C2F3;\nmin-width: 125px;\nmax-width: 125px;\nmin-height: 30px;\n@@ -94,13 +99,14 @@ max-height: 30px;</string>\n<string>Copy the currently selected address to the system clipboard</string>\n</property>\n<property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n- border-top-right-radius: 5px;\n- border-bottom-left-radius: 5px;\n- border-bottom-right-radius: 5px;\n- border: 1px solid #00CBFF;\n- color: #266779;\n- background: #00CBFF;\n+ <string notr=\"true\">\n+border-top-left-radius: 3px;\n+border-top-right-radius: 3px;\n+border-bottom-left-radius: 3px;\n+border-bottom-right-radius: 3px;\n+border: 1px solid #10829F;\n+color: #ffffff;\n+background: #00C2F3;\nmin-width: 125px;\nmax-width: 125px;\nmin-height: 30px;\n@@ -114,13 +120,14 @@ max-height: 30px;</string>\n<item>\n<widget class=\"QPushButton\" name=\"showQRCode\">\n<property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #00CBFF;\n-color: #266779;\n-background: #00CBFF;\n+ <string notr=\"true\">\n+border-top-left-radius: 3px;\n+border-top-right-radius: 3px;\n+border-bottom-left-radius: 3px;\n+border-bottom-right-radius: 3px;\n+border: 1px solid #10829F;\n+color: #ffffff;\n+background: #00C2F3;\nmin-width: 125px;\nmax-width: 125px;\nmin-height: 30px;\n@@ -137,13 +144,14 @@ max-height: 30px;</string>\n<string>Sign a message to prove you own a VERGE address</string>\n</property>\n<property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #00CBFF;\n-color: #266779;\n-background: #00CBFF;\n+ <string notr=\"true\">\n+border-top-left-radius: 3px;\n+border-top-right-radius: 3px;\n+border-bottom-left-radius: 3px;\n+border-bottom-right-radius: 3px;\n+border: 1px solid #10829F;\n+color: #ffffff;\n+background: #00C2F3;\nmin-width: 125px;\nmax-width: 125px;\nmin-height: 30px;\n@@ -160,13 +168,14 @@ max-height: 30px;</string>\n<string>Verify a message to ensure it was signed with a specified VERGE address</string>\n</property>\n<property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #00CBFF;\n-color: #266779;\n-background: #00CBFF;\n+ <string notr=\"true\">\n+border-top-left-radius: 3px;\n+border-top-right-radius: 3px;\n+border-bottom-left-radius: 3px;\n+border-bottom-right-radius: 3px;\n+border: 1px solid #10829F;\n+color: #ffffff;\n+background: #00C2F3;\nmin-width: 125px;\nmax-width: 125px;\nmin-height: 30px;\n@@ -183,13 +192,14 @@ max-height: 30px;</string>\n<string>Delete the currently selected address from the list</string>\n</property>\n<property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #00CBFF;\n-color: #266779;\n-background: #00CBFF;\n+ <string notr=\"true\">\n+border-top-left-radius: 3px;\n+border-top-right-radius: 3px;\n+border-bottom-left-radius: 3px;\n+border-bottom-right-radius: 3px;\n+border: 1px solid #10829F;\n+color: #ffffff;\n+background: #00C2F3;\nmin-width: 125px;\nmax-width: 125px;\nmin-height: 30px;\n@@ -224,11 +234,12 @@ max-height: 30px;</string>\n</sizepolicy>\n</property>\n<property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n+border: 1px solid #000000;\nmin-width: 85px;\nmax-width: 85px;</string>\n</property>\n"
}
]
| C++ | MIT License | vergecurrency/verge | address book/send updates |
714,129 | 31.12.2017 01:56:05 | 28,800 | 26cdb2cc72c380da9675adb3f6730c358a868f64 | fix for issue
fix mac qt download link
update qt version to match version in build.sh
remove extra trailing whitespaces | [
{
"change_type": "MODIFY",
"old_path": "README.md",
"new_path": "README.md",
"diff": "@@ -134,19 +134,19 @@ To compile on Mac (OSX El Capitan, but test compiled on Mountain Lion v10.8):\n`brew uninstall qt qt5 qt55 qt52`\n-2. Download [qt5.4.2](https://download.qt.io/official_releases/qt/5.4/5.4.2/qt-opensource-mac-x64-clang-5.4.2.dmg)\n+2. Download [qt5.5.0](https://download.qt.io/archive/qt/5.5/5.5.0/qt-opensource-mac-x64-clang-5.5.0.dmg)\n3. Install qt5 into `/usr/local/qt5`\n- Note: Change the installation folder from `xxx/Qt5.4.2` to `/usr/local/qt5`\n+ Note: Change the installation folder from `xxx/Qt5.5.0` to `/usr/local/qt5`\n4. Run these commands:\n```shell\n- export PKG_CONFIG_PATH=/usr/local/qt5/5.4/clang_64/lib/pkgconfig\n- export PATH=/usr/local/qt5/5.4/clang_64/bin:$PATH\n- export QT_CFLAGS=\"-I/usr/local/qt5/5.4/clang_64/lib/QtWebKitWidgets.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtWebView.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtDBus.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtWidgets.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtWebKit.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtNetwork.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtGui.framework/Versions/5/Headers -I/usr/local/qt5/5.4/clang_64/lib/QtCore.framework/Versions/5/Headers -I. -I/usr/local/qt5/5.4/clang_64/mkspecs/macx-clang -F/usr/local/qt5/5.4/clang_64/lib\"\n- export QT_LIBS=\"-F/usr/local/qt5/5.4/clang_64/lib -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL -framework QtNetwork -framework QtWebKit -framework QtWebKitWidgets -framework QtDBus -framework QtWebView\"\n+ export PKG_CONFIG_PATH=/usr/local/qt5/5.5/clang_64/lib/pkgconfig\n+ export PATH=/usr/local/qt5/5.5/clang_64/bin:$PATH\n+ export QT_CFLAGS=\"-I/usr/local/qt5/5.5/clang_64/lib/QtWebKitWidgets.framework/Versions/5/Headers -I/usr/local/qt5/5.5/clang_64/lib/QtWebView.framework/Versions/5/Headers -I/usr/local/qt5/5.5/clang_64/lib/QtDBus.framework/Versions/5/Headers -I/usr/local/qt5/5.5/clang_64/lib/QtWidgets.framework/Versions/5/Headers -I/usr/local/qt5/5.5/clang_64/lib/QtWebKit.framework/Versions/5/Headers -I/usr/local/qt5/5.5/clang_64/lib/QtNetwork.framework/Versions/5/Headers -I/usr/local/qt5/5.5/clang_64/lib/QtGui.framework/Versions/5/Headers -I/usr/local/qt5/5.5/clang_64/lib/QtCore.framework/Versions/5/Headers -I. -I/usr/local/qt5/5.5/clang_64/mkspecs/macx-clang -F/usr/local/qt5/5.5/clang_64/lib\"\n+ export QT_LIBS=\"-F/usr/local/qt5/5.5/clang_64/lib -framework QtWidgets -framework QtGui -framework QtCore -framework DiskArbitration -framework IOKit -framework OpenGL -framework AGL -framework QtNetwork -framework QtWebKit -framework QtWebKitWidgets -framework QtDBus -framework QtWebView\"\n```\n5. Install the other required items:\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix for issue #166
- fix mac qt download link
- update qt version to match version in build.sh
- remove extra trailing whitespaces |
714,127 | 31.12.2017 05:48:12 | 25,200 | 67fb97ccc53394f822c22bbdd9e3aae873af05e9 | fix to text color on Address | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/addressbookpage.ui",
"new_path": "src/qt/forms/addressbookpage.ui",
"diff": "<layout class=\"QVBoxLayout\" name=\"verticalLayout\">\n<item>\n<widget class=\"QLabel\" name=\"labelExplanation\">\n- <property name=\"styleSheet\">\n- <string notr=\"true\">\n- color: #ffffff;</string>\n- </property>\n<property name=\"text\">\n- <string>These are your VERGE addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you.</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">These are your VERGE addresses for receiving payments. You may want to give a different one to each sender so you can keep track of who is paying you. </span></p></body></html></string>\n</property>\n<property name=\"textFormat\">\n<enum>Qt::PlainText</enum>\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix to text color on Address |
714,127 | 31.12.2017 05:53:28 | 25,200 | 1ebf39530af4b8b2ace211a08da90dd357f390be | update to Block explorer | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/blockbrowser.ui",
"new_path": "src/qt/forms/blockbrowser.ui",
"diff": "<widget class=\"QPushButton\" name=\"txButton\">\n<property name=\"styleSheet\">\n<string notr=\"true\">\n-border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #ffffff;\n+border-top-left-radius: 3px;\n+border-top-right-radius: 3px;\n+border-bottom-left-radius: 3px;\n+border-bottom-right-radius: 3px;\n+border: 1px solid #10829F;\ncolor: #ffffff;\n-min-height: 25px;\n-max-height: 25px;</string>\n+background: #00C2F3;\n+min-width: 125px;\n+max-width: 125px;\n+min-height: 30px;\n+max-height: 30px;</string>\n</property>\n<property name=\"text\">\n<string>Decode Transaction</string>\n@@ -220,7 +223,6 @@ border-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\nborder: 1px solid #0b3b47;\n-color: #ffffff;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n@@ -247,13 +249,17 @@ max-height: 25px;</string>\n<widget class=\"QPushButton\" name=\"blockButton\">\n<property name=\"styleSheet\">\n<string notr=\"true\">\n-border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #ffffff;\n-min-height: 25px;\n-max-height: 25px;</string>\n+border-top-left-radius: 3px;\n+border-top-right-radius: 3px;\n+border-bottom-left-radius: 3px;\n+border-bottom-right-radius: 3px;\n+border: 1px solid #10829F;\n+color: #ffffff;\n+background: #00C2F3;\n+min-width: 125px;\n+max-width: 125px;\n+min-height: 30px;\n+max-height: 30px;</string>\n</property>\n<property name=\"text\">\n<string>Jump to Block</string>\n"
}
]
| C++ | MIT License | vergecurrency/verge | update to Block explorer |
714,127 | 31.12.2017 06:43:41 | 25,200 | 4306878bc96d0941e0c2485aa044bbca3d3acb7c | Update to Actions Toolbar
Changed the setToolButtonStyle to display icon only. removed some unused code in QAction next to the icon. Center aligned icons in toolbar. | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -83,7 +83,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\nsetMinimumSize(970,500);\nresize(970, 500);\nsetWindowTitle(tr(\"VERGE\") + \" - \" + tr(\"Wallet\"));\n- qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(255,255,255); } #toolbar2 { border:none;width:5px; background-color:rgb(255,255,255); } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); color:white; padding-bottom:10px; } QMenu::item { color:white; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; background-color: transparent; }\");\n+ qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(255,255,255); } #toolbar2 { border:none;width:5px; background-color:rgb(255,255,255); } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); text-align: center; color:white; padding-bottom:10px; } QMenu::item { color:white; text-align: center; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; text-align: center; background-color: transparent; }\");\n#ifndef Q_OS_MAC\nqApp->setWindowIcon(QIcon(\":icons/bitcoin\"));\nsetWindowIcon(QIcon(\":icons/bitcoin\"));\n@@ -211,42 +211,47 @@ void BitcoinGUI::createActions()\n{\nQActionGroup *tabGroup = new QActionGroup(this);\n- overviewAction = new QAction(QIcon(\":/icons/overview\"), \"\", this);\n+ overviewAction = new QAction(QIcon(\":/icons/overview\"), this);\noverviewAction->setToolTip(tr(\"Show general overview of wallet\"));\noverviewAction->setCheckable(true);\noverviewAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_1));\ntabGroup->addAction(overviewAction);\n- sendCoinsAction = new QAction(QIcon(\":/icons/send\"), \"\", this);\n+ sendCoinsAction = new QAction(QIcon(\":/icons/send\"), this);\nsendCoinsAction->setToolTip(tr(\"Send coins to a VERGE address\"));\nsendCoinsAction->setCheckable(true);\nsendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));\ntabGroup->addAction(sendCoinsAction);\n- receiveCoinsAction = new QAction(QIcon(\":/icons/receiving_addresses\"), \"\", this);\n+ receiveCoinsAction = new QAction(QIcon(\":/icons/receiving_addresses\"), this);\nreceiveCoinsAction->setToolTip(tr(\"Show the list of addresses for receiving payments\"));\nreceiveCoinsAction->setCheckable(true);\nreceiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));\ntabGroup->addAction(receiveCoinsAction);\n- historyAction = new QAction(QIcon(\":/icons/history\"), \"\", this);\n+ historyAction = new QAction(QIcon(\":/icons/history\"), this);\nhistoryAction->setToolTip(tr(\"Browse transaction history\"));\nhistoryAction->setCheckable(true);\nhistoryAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4));\ntabGroup->addAction(historyAction);\n- addressBookAction = new QAction(QIcon(\":/icons/address-book\"), \"\", this);\n+ addressBookAction = new QAction(QIcon(\":/icons/address-book\"), this);\naddressBookAction->setToolTip(tr(\"Edit the list of stored addresses and labels\"));\naddressBookAction->setCheckable(true);\naddressBookAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_5));\ntabGroup->addAction(addressBookAction);\n- blockAction = new QAction(QIcon(\":/icons/block\"), \"\", this);\n+ blockAction = new QAction(QIcon(\":/icons/block\"), this);\nblockAction->setToolTip(tr(\"Explore the BlockChain\"));\nblockAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_6));\nblockAction->setCheckable(true);\ntabGroup->addAction(blockAction);\n+ exportAction = new QAction(QIcon(\":/icons/export\"), this);\n+ exportAction->setToolTip(tr(\"Export the data in the current tab to a file\"));\n+ openRPCConsoleAction = new QAction(QIcon(\":/icons/debugwindow\"), tr(\"&Debug window\"), this);\n+ openRPCConsoleAction->setToolTip(tr(\"Open debugging and diagnostic console\"));\n+\nconnect(blockAction, SIGNAL(triggered()), this, SLOT(gotoBlockBrowser()));\nconnect(overviewAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\nconnect(overviewAction, SIGNAL(triggered()), this, SLOT(gotoOverviewPage()));\n@@ -286,11 +291,6 @@ void BitcoinGUI::createActions()\nsignMessageAction = new QAction(QIcon(\":/icons/edit\"), tr(\"Sign &message...\"), this);\nverifyMessageAction = new QAction(QIcon(\":/icons/transaction_0\"), tr(\"&Verify message...\"), this);\n- exportAction = new QAction(QIcon(\":/icons/export\"), \"\", this);\n- exportAction->setToolTip(tr(\"Export the data in the current tab to a file\"));\n- openRPCConsoleAction = new QAction(QIcon(\":/icons/debugwindow\"), tr(\"&Debug window\"), this);\n- openRPCConsoleAction->setToolTip(tr(\"Open debugging and diagnostic console\"));\n-\nconnect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));\nconnect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));\nconnect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));\n@@ -358,7 +358,7 @@ void BitcoinGUI::createToolBars()\nQToolBar *toolbar2 = addToolBar(tr(\"Actions toolbar\"));\n- toolbar2->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);\n+ toolbar2->setToolButtonStyle(Qt::ToolButtonIconOnly);\naddToolBar(Qt::LeftToolBarArea,toolbar2);\ntoolbar2->setOrientation(Qt::Vertical);\ntoolbar2->addAction(exportAction);\n"
}
]
| C++ | MIT License | vergecurrency/verge | Update to Actions Toolbar
Changed the setToolButtonStyle to display icon only. removed some unused code in QAction next to the icon. Center aligned icons in toolbar. |
714,127 | 31.12.2017 06:52:09 | 25,200 | 962fb22dc7a917635e3df0d44fe48fdde10fbbd9 | removed #toolbar2 and 3 bg colors
Made transparent. Controlling hover states? | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -83,7 +83,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\nsetMinimumSize(970,500);\nresize(970, 500);\nsetWindowTitle(tr(\"VERGE\") + \" - \" + tr(\"Wallet\"));\n- qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(255,255,255); } #toolbar2 { border:none;width:5px; background-color:rgb(255,255,255); } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); text-align: center; color:white; padding-bottom:10px; } QMenu::item { color:white; text-align: center; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; text-align: center; background-color: transparent; }\");\n+ qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: transparent; } #toolbar2 { border:none;width:5px; background-color:transparent; } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); text-align: center; color:white; padding-bottom:10px; } QMenu::item { color:white; text-align: center; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; text-align: center; background-color: transparent; }\");\n#ifndef Q_OS_MAC\nqApp->setWindowIcon(QIcon(\":icons/bitcoin\"));\nsetWindowIcon(QIcon(\":icons/bitcoin\"));\n"
}
]
| C++ | MIT License | vergecurrency/verge | removed #toolbar2 and 3 bg colors
Made transparent. Controlling hover states? |
714,127 | 31.12.2017 09:45:32 | 25,200 | 274c21cdd05bcd7b5494ff843dfcf6fbca769dbd | Recommit "Update to Actions Toolbar" | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -83,7 +83,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\nsetMinimumSize(970,500);\nresize(970, 500);\nsetWindowTitle(tr(\"VERGE\") + \" - \" + tr(\"Wallet\"));\n- qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: transparent; } #toolbar2 { border:none;width:5px; background-color:transparent; } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); text-align: center; color:white; padding-bottom:10px; } QMenu::item { color:white; text-align: center; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; text-align: center; background-color: transparent; }\");\n+ qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px;text-align: center; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: transparent; } #toolbar2 { border:none;width:5px; background-color:transparent; } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); text-align: center; color:white; padding-bottom:10px; } QMenu::item { color:white; text-align: center; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; text-align: center; background-color: transparent; }\");\n#ifndef Q_OS_MAC\nqApp->setWindowIcon(QIcon(\":icons/bitcoin\"));\nsetWindowIcon(QIcon(\":icons/bitcoin\"));\n"
}
]
| C++ | MIT License | vergecurrency/verge | Recommit "Update to Actions Toolbar" |
714,127 | 31.12.2017 09:51:05 | 25,200 | 6a03c553ccbae4ca141e082b31cb9e1e98aa61ea | seperated CSS for Qlabel and Qtoolbar
Needed additional styling on Qtoolbar that did not apply to Qlabel | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -83,7 +83,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\nsetMinimumSize(970,500);\nresize(970, 500);\nsetWindowTitle(tr(\"VERGE\") + \" - \" + tr(\"Wallet\"));\n- qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px;text-align: center; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: transparent; } #toolbar2 { border:none;width:5px; background-color:transparent; } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); text-align: center; color:white; padding-bottom:10px; } QMenu::item { color:white; text-align: center; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; text-align: center; background-color: transparent; }\");\n+ qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar { padding-top:15px;padding-bottom:10px;margin:0px;text-align:center;} QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: transparent; } #toolbar2 { border:none;width:5px; background-color:transparent; } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); text-align: center; color:white; padding-bottom:10px; } QMenu::item { color:white; text-align: center; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; text-align: center; background-color: transparent; }\");\n#ifndef Q_OS_MAC\nqApp->setWindowIcon(QIcon(\":icons/bitcoin\"));\nsetWindowIcon(QIcon(\":icons/bitcoin\"));\n"
}
]
| C++ | MIT License | vergecurrency/verge | seperated CSS for Qlabel and Qtoolbar
Needed additional styling on Qtoolbar that did not apply to Qlabel |
714,127 | 31.12.2017 10:05:50 | 25,200 | 441b4d123a772a7f258cb150e0910ae09fc53664 | quick fix to QAction link | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -211,43 +211,43 @@ void BitcoinGUI::createActions()\n{\nQActionGroup *tabGroup = new QActionGroup(this);\n- overviewAction = new QAction(QIcon(\":/icons/overview\"), this);\n+ overviewAction = new QAction(QIcon(\":/icons/overview\"), \"\", this);\noverviewAction->setToolTip(tr(\"Show general overview of wallet\"));\noverviewAction->setCheckable(true);\noverviewAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_1));\ntabGroup->addAction(overviewAction);\n- sendCoinsAction = new QAction(QIcon(\":/icons/send\"), this);\n+ sendCoinsAction = new QAction(QIcon(\":/icons/send\"), \"\", this);\nsendCoinsAction->setToolTip(tr(\"Send coins to a VERGE address\"));\nsendCoinsAction->setCheckable(true);\nsendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));\ntabGroup->addAction(sendCoinsAction);\n- receiveCoinsAction = new QAction(QIcon(\":/icons/receiving_addresses\"), this);\n+ receiveCoinsAction = new QAction(QIcon(\":/icons/receiving_addresses\"), \"\", this);\nreceiveCoinsAction->setToolTip(tr(\"Show the list of addresses for receiving payments\"));\nreceiveCoinsAction->setCheckable(true);\nreceiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));\ntabGroup->addAction(receiveCoinsAction);\n- historyAction = new QAction(QIcon(\":/icons/history\"), this);\n+ historyAction = new QAction(QIcon(\":/icons/history\"), \"\", this);\nhistoryAction->setToolTip(tr(\"Browse transaction history\"));\nhistoryAction->setCheckable(true);\nhistoryAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4));\ntabGroup->addAction(historyAction);\n- addressBookAction = new QAction(QIcon(\":/icons/address-book\"), this);\n+ addressBookAction = new QAction(QIcon(\":/icons/address-book\"), \"\", this);\naddressBookAction->setToolTip(tr(\"Edit the list of stored addresses and labels\"));\naddressBookAction->setCheckable(true);\naddressBookAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_5));\ntabGroup->addAction(addressBookAction);\n- blockAction = new QAction(QIcon(\":/icons/block\"), this);\n+ blockAction = new QAction(QIcon(\":/icons/block\"), \"\", this);\nblockAction->setToolTip(tr(\"Explore the BlockChain\"));\nblockAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_6));\nblockAction->setCheckable(true);\ntabGroup->addAction(blockAction);\n- exportAction = new QAction(QIcon(\":/icons/export\"), this);\n+ exportAction = new QAction(QIcon(\":/icons/export\"), \"\", this);\nexportAction->setToolTip(tr(\"Export the data in the current tab to a file\"));\nopenRPCConsoleAction = new QAction(QIcon(\":/icons/debugwindow\"), tr(\"&Debug window\"), this);\nopenRPCConsoleAction->setToolTip(tr(\"Open debugging and diagnostic console\"));\n"
}
]
| C++ | MIT License | vergecurrency/verge | quick fix to QAction link |
714,098 | 31.12.2017 16:43:12 | 18,000 | 1514a8bbef18dd0c4e08e873fa762d9c112ebcd3 | update send page
update for stealth transaction sending | [
{
"change_type": "MODIFY",
"old_path": "src/qt/sendcoinsentry.cpp",
"new_path": "src/qt/sendcoinsentry.cpp",
"diff": "#include \"walletmodel.h\"\n#include \"optionsmodel.h\"\n#include \"addresstablemodel.h\"\n+#include \"stealth.h\"\n#include <QApplication>\n#include <QClipboard>\n+#include <QDebug>\nSendCoinsEntry::SendCoinsEntry(QWidget *parent) :\nQFrame(parent),\n@@ -132,6 +134,12 @@ SendCoinsRecipient SendCoinsEntry::getValue()\nrv.label = ui->addAsLabel->text();\nrv.amount = ui->payAmount->value();\n+ if (rv.address.length() > 75\n+ && IsStealthAddress(rv.address.toStdString()))\n+ rv.typeInd = AddressTableModel::AT_Stealth;\n+ else\n+ rv.typeInd = AddressTableModel::AT_Normal;\n+\nreturn rv;\n}\n"
}
]
| C++ | MIT License | vergecurrency/verge | update send page
update for stealth transaction sending |
714,098 | 31.12.2017 17:14:28 | 18,000 | 1d1d564e9b9a8eaeed02c9ef42521c06d7db3372 | edit ui for stealth addr display | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/editaddressdialog.ui",
"new_path": "src/qt/forms/editaddressdialog.ui",
"diff": "@@ -69,6 +69,23 @@ border-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\nborder: 2px solid #000000;\nmin-height: 25px;\n+max-height: 25px;</string>\n+ </property>\n+ </widget>\n+ </item>\n+ <item row=\"2\" column=\"0\">\n+ <widget class=\"QCheckBox\" name=\"stealthCB\">\n+ <property name=\"text\">\n+ <string>Stealth Address</string>\n+ </property>\n+ <property name=\"styleSheet\">\n+ <string notr=\"true\">\n+border-top-left-radius: 5px;\n+border-top-right-radius: 5px;\n+border-bottom-left-radius: 5px;\n+border-bottom-right-radius: 5px;\n+border: 2px solid #000000;\n+min-height: 25px;\nmax-height: 25px;</string>\n</property>\n</widget>\n"
}
]
| C++ | MIT License | vergecurrency/verge | edit ui for stealth addr display |
714,098 | 31.12.2017 17:19:46 | 18,000 | 2adeecf3d82364fc5db3d0827bea895519ef2cc4 | more stealth updates | [
{
"change_type": "MODIFY",
"old_path": "src/qt/editaddressdialog.cpp",
"new_path": "src/qt/editaddressdialog.cpp",
"diff": "@@ -19,16 +19,24 @@ EditAddressDialog::EditAddressDialog(Mode mode, QWidget *parent) :\ncase NewReceivingAddress:\nsetWindowTitle(tr(\"New receiving address\"));\nui->addressEdit->setEnabled(false);\n+ ui->addressEdit->setVisible(false);\n+ ui->stealthCB->setEnabled(true);\n+ ui->stealthCB->setVisible(true);\nbreak;\ncase NewSendingAddress:\nsetWindowTitle(tr(\"New sending address\"));\n+ ui->stealthCB->setVisible(false);\nbreak;\ncase EditReceivingAddress:\nsetWindowTitle(tr(\"Edit receiving address\"));\nui->addressEdit->setDisabled(true);\n+ ui->addressEdit->setVisible(true);\n+ ui->stealthCB->setEnabled(false);\n+ ui->stealthCB->setVisible(true);\nbreak;\ncase EditSendingAddress:\nsetWindowTitle(tr(\"Edit sending address\"));\n+ ui->stealthCB->setVisible(false);\nbreak;\n}\n@@ -47,6 +55,7 @@ void EditAddressDialog::setModel(AddressTableModel *model)\nmapper->setModel(model);\nmapper->addMapping(ui->labelEdit, AddressTableModel::Label);\nmapper->addMapping(ui->addressEdit, AddressTableModel::Address);\n+ mapper->addMapping(ui->stealthCB, AddressTableModel::Type);\n}\nvoid EditAddressDialog::loadRow(int row)\n@@ -62,10 +71,14 @@ bool EditAddressDialog::saveCurrentRow()\n{\ncase NewReceivingAddress:\ncase NewSendingAddress:\n+ {\n+ int typeInd = ui->stealthCB->isChecked() ? AddressTableModel::AT_Stealth : AddressTableModel::AT_Normal;\naddress = model->addRow(\nmode == NewSendingAddress ? AddressTableModel::Send : AddressTableModel::Receive,\nui->labelEdit->text(),\n- ui->addressEdit->text());\n+ ui->addressEdit->text(),\n+ typeInd);\n+ }\nbreak;\ncase EditReceivingAddress:\ncase EditSendingAddress:\n"
}
]
| C++ | MIT License | vergecurrency/verge | more stealth updates |
714,098 | 31.12.2017 18:16:06 | 18,000 | 8cc595518063ce8715f5bb687dd64da65ffda2f4 | update addresstablemodel
for stealth | [
{
"change_type": "MODIFY",
"old_path": "src/qt/addresstablemodel.cpp",
"new_path": "src/qt/addresstablemodel.cpp",
"diff": "#include \"wallet.h\"\n#include \"base58.h\"\n+#include \"stealth.h\"\n#include <QFont>\n#include <QColor>\n@@ -21,10 +22,11 @@ struct AddressTableEntry\nType type;\nQString label;\nQString address;\n+ bool stealth;\nAddressTableEntry() {}\n- AddressTableEntry(Type type, const QString &label, const QString &address):\n- type(type), label(label), address(address) {}\n+ AddressTableEntry(Type type, const QString &label, const QString &address, const bool &stealth = false):\n+ type(type), label(label), address(address), stealth(stealth) {}\n};\nstruct AddressTableEntryLessThan\n@@ -68,6 +70,15 @@ public:\nQString::fromStdString(strName),\nQString::fromStdString(address.ToString())));\n}\n+ std::set<CStealthAddress>::iterator it;\n+ for (it = wallet->stealthAddresses.begin(); it != wallet->stealthAddresses.end(); ++it)\n+ {\n+ bool fMine = !(it->scan_secret.size() < 1);\n+ cachedAddressTable.append(AddressTableEntry(fMine ? AddressTableEntry::Receiving : AddressTableEntry::Sending,\n+ QString::fromStdString(it->label),\n+ QString::fromStdString(it->Encoded()),\n+ true));\n+ };\n}\n}\n@@ -213,20 +224,46 @@ bool AddressTableModel::setData(const QModelIndex & index, const QVariant & valu\nif(!index.isValid())\nreturn false;\nAddressTableEntry *rec = static_cast<AddressTableEntry*>(index.internalPointer());\n-\neditStatus = OK;\n-\n+ std::string strTemp, strValue;\nif(role == Qt::EditRole)\n{\nswitch(index.column())\n{\ncase Label:\n- wallet->SetAddressBookName(CBitcoinAddress(rec->address.toStdString()).Get(), value.toString().toStdString());\n- rec->label = value.toString();\n+ // Do nothing, if old label == new label\n+ if(rec->label == value.toString())\n+ {\n+ editStatus = NO_CHANGES;\n+ return false;\n+ }\n+\n+ strTemp = rec->address.toStdString();\n+ if (IsStealthAddress(strTemp))\n+ {\n+ strValue = value.toString().toStdString();\n+ wallet->UpdateStealthAddress(strTemp, strValue, false);\n+ } else\n+ {\n+ wallet->SetAddressBookName(CBitcoinAddress(strTemp).Get(), value.toString().toStdString());\n+ }\nbreak;\ncase Address:\n+ std::string sTemp = value.toString().toStdString();\n+ if (IsStealthAddress(sTemp))\n+ {\n+ printf(\"TODO\\n\");\n+ editStatus = INVALID_ADDRESS;\n+ return false;\n+ }\n+ // Do nothing, if old address == new address\n+ if(CBitcoinAddress(rec->address.toStdString()) == CBitcoinAddress(value.toString().toStdString()))\n+ {\n+ editStatus = NO_CHANGES;\n+ return false;\n+ }\n// Refuse to set invalid address, set error status and return false\n- if(!walletModel->validateAddress(value.toString()))\n+ else if(!walletModel->validateAddress(value.toString()))\n{\neditStatus = INVALID_ADDRESS;\nreturn false;\n@@ -299,7 +336,7 @@ void AddressTableModel::updateEntry(const QString &address, const QString &label\npriv->updateEntry(address, label, isMine, status);\n}\n-QString AddressTableModel::addRow(const QString &type, const QString &label, const QString &address)\n+QString AddressTableModel::addRow(const QString &type, const QString &label, const QString &address, int addressType)\n{\nstd::string strLabel = label.toStdString();\nstd::string strAddress = address.toStdString();\n@@ -308,6 +345,43 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con\nif(type == Send)\n{\n+ /* if(!walletModel->validateAddress(address))\n+ {\n+ editStatus = INVALID_ADDRESS;\n+ return QString();\n+ }\n+ // Check for duplicate addresses\n+ {\n+ LOCK(wallet->cs_wallet);\n+ if(wallet->mapAddressBook.count(CBitcoinAddress(strAddress).Get()))\n+ {\n+ editStatus = DUPLICATE_ADDRESS;\n+ return QString();\n+ }\n+ }*/\n+ if (strAddress.length() > 75)\n+ {\n+ CStealthAddress sxAddr;\n+ if (!sxAddr.SetEncoded(strAddress))\n+ {\n+ editStatus = INVALID_ADDRESS;\n+ return QString();\n+ }\n+\n+ // Check for duplicate addresses\n+ {\n+ LOCK(wallet->cs_wallet);\n+\n+ if (wallet->stealthAddresses.count(sxAddr))\n+ {\n+ editStatus = DUPLICATE_ADDRESS;\n+ return QString();\n+ };\n+\n+ sxAddr.label = strLabel;\n+ wallet->AddStealthAddress(sxAddr);\n+ }\n+ } else {\nif (!walletModel->validateAddress(address))\n{\neditStatus = INVALID_ADDRESS;\n@@ -320,6 +394,9 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con\n{\neditStatus = DUPLICATE_ADDRESS;\nreturn QString();\n+ };\n+ //wallet->SetAddressBookName(CBitcoinAddress(strAddress).Get(), strLabel);\n+ wallet->SetAddressBook(CBitcoinAddress(strAddress).Get(), strLabel,(type == Send ? \"send\" : \"receive\"));\n}\n}\n}\n@@ -333,23 +410,58 @@ QString AddressTableModel::addRow(const QString &type, const QString &label, con\neditStatus = WALLET_UNLOCK_FAILURE;\nreturn QString();\n}\n- CPubKey newKey;\n+ /* CPubKey newKey;\nif(!wallet->GetKeyFromPool(newKey, true))\n{\neditStatus = KEY_GENERATION_FAILURE;\nreturn QString();\n}\nstrAddress = CBitcoinAddress(newKey.GetID()).ToString();\n+ */\n+ WalletModel::UnlockContext ctx(walletModel->requestUnlock());\n+ if(!ctx.isValid())\n+ {\n+ // Unlock wallet failed or was cancelled\n+ editStatus = WALLET_UNLOCK_FAILURE;\n+ return QString();\n+ }\n+ if (addressType == AT_Stealth)\n+ {\n+ CStealthAddress newStealthAddr;\n+ std::string sError;\n+ if (!wallet->NewStealthAddress(sError, strLabel, newStealthAddr)\n+ || !wallet->AddStealthAddress(newStealthAddr))\n+ {\n+ editStatus = KEY_GENERATION_FAILURE;\n+ return QString();\n+ }\n+ strAddress = newStealthAddr.Encoded();\n+ } else {\n+ CPubKey newKey;\n+ //if(!wallet->GetKeyFromPool(newKey, true))\n+ if(!wallet->GetKeyFromPool(newKey))\n+ {\n+ editStatus = KEY_GENERATION_FAILURE;\n+ return QString();\n+ }\n+ strAddress = CBitcoinAddress(newKey.GetID()).ToString();\n+\n+ {\n+ LOCK(wallet->cs_wallet);\n+ //wallet->SetAddressBookName(CBitcoinAddress(strAddress).Get(), strLabel);\n+ wallet->SetAddressBook(CBitcoinAddress(strAddress).Get(), strLabel,(type == Send ? \"send\" : \"receive\"));\n+ }\n+ }\n}\nelse\n{\nreturn QString();\n}\n// Add entry\n- {\n+ /*{\nLOCK(wallet->cs_wallet);\nwallet->SetAddressBookName(CBitcoinAddress(strAddress).Get(), strLabel);\n- }\n+ }*/\nreturn QString::fromStdString(strAddress);\n}\n@@ -374,7 +486,7 @@ bool AddressTableModel::removeRows(int row, int count, const QModelIndex & paren\n*/\nQString AddressTableModel::labelForAddress(const QString &address) const\n{\n- {\n+ /*{\nLOCK(wallet->cs_wallet);\nCBitcoinAddress address_parsed(address.toStdString());\nstd::map<CTxDestination, std::string>::iterator mi = wallet->mapAddressBook.find(address_parsed.Get());\n@@ -382,6 +494,32 @@ QString AddressTableModel::labelForAddress(const QString &address) const\n{\nreturn QString::fromStdString(mi->second);\n}\n+ }*/\n+ {\n+ LOCK(wallet->cs_wallet);\n+ std::string sAddr = address.toStdString();\n+\n+ if (sAddr.length() > 75)\n+ {\n+ CStealthAddress sxAddr;\n+ if (!sxAddr.SetEncoded(sAddr))\n+ return QString();\n+\n+ std::set<CStealthAddress>::iterator it;\n+ it = wallet->stealthAddresses.find(sxAddr);\n+ if (it == wallet->stealthAddresses.end())\n+ return QString();\n+\n+ return QString::fromStdString(it->label);\n+ } else\n+ {\n+ CBitcoinAddress address_parsed(sAddr);\n+ std::map<CTxDestination, CAddressBookData>::iterator mi = wallet->mapAddressBook.find(address_parsed.Get());\n+ if (mi != wallet->mapAddressBook.end())\n+ {\n+ return QString::fromStdString(mi->second.name);\n+ }\n+ }\n}\nreturn QString();\n}\n"
}
]
| C++ | MIT License | vergecurrency/verge | update addresstablemodel
for stealth |
714,098 | 31.12.2017 21:59:25 | 18,000 | 508dcfca96d22a0225e7eb350c0dea1b667fdc28 | fix fee issue | [
{
"change_type": "MODIFY",
"old_path": "src/wallet.cpp",
"new_path": "src/wallet.cpp",
"diff": "@@ -1465,11 +1465,13 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW\nwtxNew.BindWallet(this);\n{\n+ CTxDB txdb(\"r\");\nLOCK2(cs_main, cs_wallet);\n// txdb must be opened before the mapWallet lock\n- CTxDB txdb(\"r\");\n+\n{\n- nFeeRet = nTransactionFee;\n+ nFeeRet = 0.01*COIN;\n+ int64_t nFee = 0.01*COIN;\nwhile (true)\n{\nwtxNew.vin.clear();\n@@ -1480,8 +1482,15 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW\ndouble dPriority = 0;\n// vouts to the payees\nBOOST_FOREACH (const PAIRTYPE(CScript, int64)& s, vecSend)\n- wtxNew.vout.push_back(CTxOut(s.second, s.first));\n-\n+ {\n+ CTxOut txout(s.second, s.first);\n+ if (txout.IsDust(MIN_RELAY_TX_FEE))\n+ {\n+ strFailReason = _(\"Transaction amount too small\");\n+ return false;\n+ }\n+ wtxNew.vout.push_back(txout);\n+ }\n// Choose coins to use\nset<pair<const CWalletTx*,unsigned int> > setCoins;\nint64 nValueIn = 0;\n@@ -1607,7 +1616,8 @@ bool CWallet::CreateTransaction(CScript scriptPubKey, int64_t nValue, std::strin\n// narration output will be for preceding output\nint nChangePos;\n- bool rv = CreateTransaction(vecSend, wtxNew, reservekey, nFeeRet, nChangePos, coinControl);\n+ std::string strFailReason;\n+ bool rv = CreateTransaction(vecSend, wtxNew, reservekey, nFeeRet, nChangePos, strFailReason, coinControl);\n// -- narration will be added to mapValue later in FindStealthTransactions From CommitTransaction\nreturn rv;\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix fee issue |
714,131 | 01.01.2018 04:54:46 | -3,600 | 34ca69b2df18649c7a366a2f8e0474c2a90becc0 | fix for fee issue | [
{
"change_type": "MODIFY",
"old_path": "src/wallet.cpp",
"new_path": "src/wallet.cpp",
"diff": "@@ -1450,7 +1450,7 @@ bool CWallet::CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int\n}\n-bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, int32_t& nChangePos, const CCoinControl* coinControl)\n+bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, int32_t& nChangePos)\n{\nint64 nValue = 0;\nBOOST_FOREACH (const PAIRTYPE(CScript, int64)& s, vecSend)\n@@ -1471,7 +1471,6 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW\n{\nnFeeRet = 0.01*COIN;\n- int64_t nFee = 0.01*COIN;\nwhile (true)\n{\nwtxNew.vin.clear();\n@@ -1484,11 +1483,9 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW\nBOOST_FOREACH (const PAIRTYPE(CScript, int64)& s, vecSend)\n{\nCTxOut txout(s.second, s.first);\n- if (txout.IsDust(MIN_RELAY_TX_FEE))\n- {\n- strFailReason = _(\"Transaction amount too small\");\n+ if (txout.nValue <= MIN_RELAY_TX_FEE)\nreturn false;\n- }\n+\nwtxNew.vout.push_back(txout);\n}\n// Choose coins to use\n@@ -1593,7 +1590,7 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW\nreturn true;\n}\n-bool CWallet::CreateTransaction(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, const CCoinControl* coinControl)\n+bool CWallet::CreateTransaction(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet)\n{\nvector< pair<CScript, int64> > vecSend;\nvecSend.push_back(make_pair(scriptPubKey, nValue));\n@@ -1616,8 +1613,7 @@ bool CWallet::CreateTransaction(CScript scriptPubKey, int64_t nValue, std::strin\n// narration output will be for preceding output\nint nChangePos;\n- std::string strFailReason;\n- bool rv = CreateTransaction(vecSend, wtxNew, reservekey, nFeeRet, nChangePos, strFailReason, coinControl);\n+ bool rv = CreateTransaction(vecSend, wtxNew, reservekey, nFeeRet, nChangePos);\n// -- narration will be added to mapValue later in FindStealthTransactions From CommitTransaction\nreturn rv;\n@@ -1946,7 +1942,7 @@ bool CWallet::UpdateStealthAddress(std::string &addr, std::string &label, bool a\nreturn true;\n}\n-bool CWallet::CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, const CCoinControl* coinControl)\n+bool CWallet::CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet)\n{\nvector< pair<CScript, int64> > vecSend;\nvecSend.push_back(make_pair(scriptPubKey, nValue));\n@@ -1961,7 +1957,7 @@ bool CWallet::CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std\nstd::random_shuffle(vecSend.begin(), vecSend.end());\nint nChangePos;\n- bool rv = CreateTransaction(vecSend, wtxNew, reservekey, nFeeRet, nChangePos, coinControl);\n+ bool rv = CreateTransaction(vecSend, wtxNew, reservekey, nFeeRet, nChangePos);\n// -- the change txn is inserted in a random pos, check here to match narr to output\nif (rv && narr.size() > 0)\n"
},
{
"change_type": "MODIFY",
"old_path": "src/wallet.h",
"new_path": "src/wallet.h",
"diff": "@@ -185,8 +185,8 @@ public:\nint64 GetStake() const;\nint64 GetNewMint() const;\n- bool CreateTransaction(const std::vector<std::pair<CScript, int64> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, int32_t& nChangePos, const CCoinControl *coinControl=NULL);\n- bool CreateTransaction(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, const CCoinControl *coinControl=NULL);\n+ bool CreateTransaction(const std::vector<std::pair<CScript, int64> >& vecSend, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, int32_t& nChangePos);\n+ bool CreateTransaction(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet);\nbool CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey);\nbool CreateCoinStake(const CKeyStore& keystore, unsigned int nBits, int64 nSearchInterval, CTransaction& txNew);\nstd::string SendMoney(CScript scriptPubKey, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee=false);\n@@ -196,7 +196,7 @@ public:\nbool UnlockStealthAddresses(const CKeyingMaterial& vMasterKeyIn);\nbool UpdateStealthAddress(std::string &addr, std::string &label, bool addIfNotExist);\n- bool CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet, const CCoinControl* coinControl=NULL);\n+ bool CreateStealthTransaction(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, CReserveKey& reservekey, int64& nFeeRet);\nstd::string SendStealthMoney(CScript scriptPubKey, int64_t nValue, std::vector<uint8_t>& P, std::vector<uint8_t>& narr, std::string& sNarr, CWalletTx& wtxNew, bool fAskFee);\nbool SendStealthMoneyToDestination(CStealthAddress& sxAddress, int64_t nValue, std::string& sNarr, CWalletTx& wtxNew, std::string& sError, bool fAskFee=false);\nbool FindStealthTransactions(const CTransaction& tx, mapValue_t& mapNarr);\n"
}
]
| C++ | MIT License | vergecurrency/verge | fix for fee issue |
714,098 | 31.12.2017 23:15:32 | 18,000 | a48591e4e475d0392ba9fafb53dc955560108767 | update ver and year | [
{
"change_type": "MODIFY",
"old_path": "src/clientversion.h",
"new_path": "src/clientversion.h",
"diff": "// client versioning and copyright year\n//\n// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it\n-#define CLIENT_VERSION_MAJOR 2\n-#define CLIENT_VERSION_MINOR 1\n+#define CLIENT_VERSION_MAJOR 4\n+#define CLIENT_VERSION_MINOR 0\n#define CLIENT_VERSION_REVISION 0\n#define CLIENT_VERSION_BUILD 0\n// Copyright year (2014-this)\n// Todo: update this when changing our copyright comments in the source\n-#define COPYRIGHT_YEAR 2016\n+#define COPYRIGHT_YEAR 2018\n#endif //HAVE_CONFIG_H\n"
}
]
| C++ | MIT License | vergecurrency/verge | update ver and year |
714,127 | 01.01.2018 02:08:28 | 25,200 | ed5009af67d4ad36b6dd5acb299f7c3cf5fb6372 | Fix CSS
This should fix the issues for Block Explorer. Does not look right currently. | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -83,7 +83,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\nsetMinimumSize(970,500);\nresize(970, 500);\nsetWindowTitle(tr(\"VERGE\") + \" - \" + tr(\"Wallet\"));\n- qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: rgb(249,221,131); } #toolbar2 { border:none;width:5px; background-color:rgb(249,221,131); } #toolbar { border:none;height:100%;padding-top:20px; background: rgb(57,85,95); text-align: left; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); color:white; padding-bottom:10px; } QMenu::item { color:white; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; background-color: transparent; }\");\n+ qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar { text-align:center; } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: transparent; } #toolbar2 { border:none;width:5px; background-color:transparent; } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); text-align: center; color:white; padding-bottom:10px; } QMenu::item { color:white; text-align: center; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; text-align: center; background-color: transparent; }\");\n#ifndef Q_OS_MAC\nqApp->setWindowIcon(QIcon(\":icons/bitcoin\"));\nsetWindowIcon(QIcon(\":icons/bitcoin\"));\n@@ -211,46 +211,51 @@ void BitcoinGUI::createActions()\n{\nQActionGroup *tabGroup = new QActionGroup(this);\n- overviewAction = new QAction(QIcon(\":/icons/overview\"), this);\n+ overviewAction = new QAction(QIcon(\":/icons/overview\"), \"\", this);\noverviewAction->setToolTip(tr(\"Show general overview of wallet\"));\noverviewAction->setCheckable(true);\noverviewAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_1));\ntabGroup->addAction(overviewAction);\n- sendCoinsAction = new QAction(QIcon(\":/icons/send\"), this);\n+ sendCoinsAction = new QAction(QIcon(\":/icons/send\"), \"\", this);\nsendCoinsAction->setToolTip(tr(\"Send coins to a VERGE address\"));\nsendCoinsAction->setCheckable(true);\nsendCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_2));\ntabGroup->addAction(sendCoinsAction);\n- receiveCoinsAction = new QAction(QIcon(\":/icons/receiving_addresses\"), this);\n+ receiveCoinsAction = new QAction(QIcon(\":/icons/receiving_addresses\"), \"\", this);\nreceiveCoinsAction->setToolTip(tr(\"Show the list of addresses for receiving payments\"));\nreceiveCoinsAction->setCheckable(true);\nreceiveCoinsAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_3));\ntabGroup->addAction(receiveCoinsAction);\n- historyAction = new QAction(QIcon(\":/icons/history\"), this);\n+ historyAction = new QAction(QIcon(\":/icons/history\"), \"\", this);\nhistoryAction->setToolTip(tr(\"Browse transaction history\"));\nhistoryAction->setCheckable(true);\nhistoryAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_4));\ntabGroup->addAction(historyAction);\n- addressBookAction = new QAction(QIcon(\":/icons/address-book\"), this);\n+ addressBookAction = new QAction(QIcon(\":/icons/address-book\"), \"\", this);\naddressBookAction->setToolTip(tr(\"Edit the list of stored addresses and labels\"));\naddressBookAction->setCheckable(true);\naddressBookAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_5));\ntabGroup->addAction(addressBookAction);\n- blockAction = new QAction(QIcon(\":/icons/block\"), this);\n+ blockAction = new QAction(QIcon(\":/icons/block\"), \"\", this);\nblockAction->setToolTip(tr(\"Explore the BlockChain\"));\nblockAction->setShortcut(QKeySequence(Qt::ALT + Qt::Key_6));\nblockAction->setCheckable(true);\ntabGroup->addAction(blockAction);\n+ exportAction = new QAction(QIcon(\":/icons/export\"), \"\", this);\n+ exportAction->setToolTip(tr(\"Export the data in the current tab to a file\"));\n+ openRPCConsoleAction = new QAction(QIcon(\":/icons/debugwindow\"), tr(\"&Debug window\"), this);\n+ openRPCConsoleAction->setToolTip(tr(\"Open debugging and diagnostic console\"));\n+\nconnect(blockAction, SIGNAL(triggered()), this, SLOT(gotoBlockBrowser()));\nconnect(overviewAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\nconnect(overviewAction, SIGNAL(triggered()), this, SLOT(gotoOverviewPage()));\n- connect(chatAction, SIGNAL(triggered()), this, SLOT(gotoChatPage()));\n+ // connect(chatAction, SIGNAL(triggered()), this, SLOT(gotoChatPage()));\nconnect(sendCoinsAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\nconnect(sendCoinsAction, SIGNAL(triggered()), this, SLOT(gotoSendCoinsPage()));\nconnect(receiveCoinsAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\n@@ -259,7 +264,7 @@ void BitcoinGUI::createActions()\nconnect(historyAction, SIGNAL(triggered()), this, SLOT(gotoHistoryPage()));\nconnect(addressBookAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));\nconnect(addressBookAction, SIGNAL(triggered()), this, SLOT(gotoAddressBookPage()));\n- connect(radioAction, SIGNAL(triggered()), this, SLOT(gotoRadioPage()));\n+ // connect(radioAction, SIGNAL(triggered()), this, SLOT(gotoRadioPage()));\nquitAction = new QAction(QIcon(\":/icons/quit\"), tr(\"E&xit\"), this);\nquitAction->setToolTip(tr(\"Quit application\"));\n@@ -286,11 +291,6 @@ void BitcoinGUI::createActions()\nsignMessageAction = new QAction(QIcon(\":/icons/edit\"), tr(\"Sign &message...\"), this);\nverifyMessageAction = new QAction(QIcon(\":/icons/transaction_0\"), tr(\"&Verify message...\"), this);\n- exportAction = new QAction(QIcon(\":/icons/export\"), this);\n- exportAction->setToolTip(tr(\"Export the data in the current tab to a file\"));\n- openRPCConsoleAction = new QAction(QIcon(\":/icons/debugwindow\"), tr(\"&Debug window\"), this);\n- openRPCConsoleAction->setToolTip(tr(\"Open debugging and diagnostic console\"));\n-\nconnect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));\nconnect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));\nconnect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));\n@@ -345,7 +345,7 @@ void BitcoinGUI::createToolBars()\naddToolBar(Qt::LeftToolBarArea,toolbar);\ntoolbar->setOrientation(Qt::Vertical);\ntoolbar->setMovable( false );\n- toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);\n+ toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly);\ntoolbar->setIconSize(QSize(50,25));\ntoolbar->addAction(overviewAction);\ntoolbar->addAction(sendCoinsAction);\n@@ -353,12 +353,12 @@ void BitcoinGUI::createToolBars()\ntoolbar->addAction(historyAction);\ntoolbar->addAction(addressBookAction);\ntoolbar->addAction(blockAction);\n- toolbar->addAction(chatAction);\n- toolbar->addAction(radioAction);\n+ // toolbar->addAction(chatAction);\n+ // toolbar->addAction(radioAction);\nQToolBar *toolbar2 = addToolBar(tr(\"Actions toolbar\"));\n- toolbar2->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);\n+ toolbar2->setToolButtonStyle(Qt::ToolButtonIconOnly);\naddToolBar(Qt::LeftToolBarArea,toolbar2);\ntoolbar2->setOrientation(Qt::Vertical);\ntoolbar2->addAction(exportAction);\n"
}
]
| C++ | MIT License | vergecurrency/verge | Fix CSS
This should fix the issues for Block Explorer. Does not look right currently. |
714,127 | 01.01.2018 02:53:21 | 25,200 | 610b045410b94a9d31785a43187df71a529fdbfc | Quick fix (necessary) Block Explorer | [
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/blockbrowser.ui",
"new_path": "src/qt/forms/blockbrowser.ui",
"diff": "</font>\n</property>\n<property name=\"text\">\n- <string><html><head/><body><p><span style=" font-size:20px; font-weight:400; color:#0b3b47;">Block Explorer </span></p></body></html></string>\n+ <string><html><head/><body><p><span style=" font-size:20px; font-weight:400; color:#ffffff;">Block Explorer </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<widget class=\"QPushButton\" name=\"txButton\">\n<property name=\"styleSheet\">\n<string notr=\"true\">\n-border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #0b3b47;\n-min-height: 25px;\n-max-height: 25px;</string>\n+border-top-left-radius: 3px;\n+border-top-right-radius: 3px;\n+border-bottom-left-radius: 3px;\n+border-bottom-right-radius: 3px;\n+border: 1px solid #10829F;\n+color: #ffffff;\n+background: #00C2F3;\n+min-height: 30px;\n+max-height: 30px;</string>\n</property>\n<property name=\"text\">\n<string>Decode Transaction</string>\n@@ -138,7 +140,7 @@ max-height: 25px;</string>\n<item row=\"17\" column=\"0\">\n<widget class=\"QLabel\" name=\"inputLabel\">\n<property name=\"text\">\n- <string>Inputs:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Inputs: </span></p></body></html></string>\n</property>\n<property name=\"alignment\">\n<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>\n@@ -148,35 +150,35 @@ max-height: 25px;</string>\n<item row=\"10\" column=\"1\">\n<widget class=\"QLabel\" name=\"pawBox\">\n<property name=\"text\">\n- <string>0000 KH/s</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0000 KH/s </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"14\" column=\"0\">\n<widget class=\"QLabel\" name=\"valueLabel\">\n<property name=\"text\">\n- <string>Value out:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Value out: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"13\" column=\"0\">\n<widget class=\"QLabel\" name=\"txLabel\">\n<property name=\"text\">\n- <string>Transaction ID:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Transaction ID: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"9\" column=\"1\">\n<widget class=\"QLabel\" name=\"hardBox\">\n<property name=\"text\">\n- <string>0.00</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0.00 </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"13\" column=\"1\">\n<widget class=\"QLabel\" name=\"txID\">\n<property name=\"text\">\n- <string>000</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">000 </span></p></body></html></string>\n</property>\n</widget>\n</item>\n@@ -200,7 +202,7 @@ max-height: 25px;</string>\n<item row=\"9\" column=\"0\">\n<widget class=\"QLabel\" name=\"hardLabel\">\n<property name=\"text\">\n- <string>Block Difficulty:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Block Difficulty: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n@@ -219,6 +221,7 @@ border-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\nborder: 1px solid #0b3b47;\n+color: #ffffff;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n@@ -230,14 +233,14 @@ max-height: 25px;</string>\n<item row=\"3\" column=\"0\">\n<widget class=\"QLabel\" name=\"heightLabel_2\">\n<property name=\"text\">\n- <string>Block Height:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Block Height: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"8\" column=\"1\">\n<widget class=\"QLabel\" name=\"timeBox\">\n<property name=\"text\">\n- <string>0</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0 </span></p></body></html></string>\n</property>\n</widget>\n</item>\n@@ -245,13 +248,15 @@ max-height: 25px;</string>\n<widget class=\"QPushButton\" name=\"blockButton\">\n<property name=\"styleSheet\">\n<string notr=\"true\">\n-border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 1px solid #0b3b47;\n-min-height: 25px;\n-max-height: 25px;</string>\n+border-top-left-radius: 3px;\n+border-top-right-radius: 3px;\n+border-bottom-left-radius: 3px;\n+border-bottom-right-radius: 3px;\n+border: 1px solid #10829F;\n+color: #ffffff;\n+background: #00C2F3;\n+min-height: 30px;\n+max-height: 30px;</string>\n</property>\n<property name=\"text\">\n<string>Jump to Block</string>\n@@ -261,14 +266,14 @@ max-height: 25px;</string>\n<item row=\"5\" column=\"0\">\n<widget class=\"QLabel\" name=\"merkleLabel\">\n<property name=\"text\">\n- <string>Block Merkle:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Block Merkle: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"4\" column=\"0\">\n<widget class=\"QLabel\" name=\"hashLabel\">\n<property name=\"text\">\n- <string>Block Hash:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Block Hash: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n@@ -282,35 +287,35 @@ max-height: 25px;</string>\n<item row=\"10\" column=\"0\">\n<widget class=\"QLabel\" name=\"pawLabel\">\n<property name=\"text\">\n- <string>Block Hashrate:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Block Hashrate: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"3\" column=\"1\">\n<widget class=\"QLabel\" name=\"heightLabel\">\n<property name=\"text\">\n- <string>0</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0 </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"15\" column=\"0\">\n<widget class=\"QLabel\" name=\"feesLabel\">\n<property name=\"text\">\n- <string>Fees:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Fees: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"7\" column=\"0\">\n<widget class=\"QLabel\" name=\"bitsLabel\">\n<property name=\"text\">\n- <string>Block nBits:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Block nBits: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"7\" column=\"1\">\n<widget class=\"QLabel\" name=\"bitsBox\">\n<property name=\"text\">\n- <string>0</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0 </span></p></body></html></string>\n</property>\n</widget>\n</item>\n@@ -323,14 +328,14 @@ max-height: 25px;</string>\n</size>\n</property>\n<property name=\"text\">\n- <string>0x0</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0x0 </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"16\" column=\"0\">\n<widget class=\"QLabel\" name=\"outputLabel\">\n<property name=\"text\">\n- <string>Outputs:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Outputs: </span></p></body></html></string>\n</property>\n<property name=\"alignment\">\n<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>\n@@ -350,21 +355,21 @@ max-height: 25px;</string>\n<item row=\"6\" column=\"0\">\n<widget class=\"QLabel\" name=\"nonceLabel\">\n<property name=\"text\">\n- <string>Block nNonce:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Block nNonce: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"6\" column=\"1\">\n<widget class=\"QLabel\" name=\"nonceBox\">\n<property name=\"text\">\n- <string>0</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0 </span></p></body></html></string>\n</property>\n</widget>\n</item>\n<item row=\"8\" column=\"0\">\n<widget class=\"QLabel\" name=\"timeLabel\">\n<property name=\"text\">\n- <string>Block Timestamp:</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">Block Timestamp: </span></p></body></html></string>\n</property>\n</widget>\n</item>\n@@ -386,7 +391,7 @@ max-height: 25px;</string>\n</size>\n</property>\n<property name=\"text\">\n- <string>0x0</string>\n+ <string><html><head/><body><p><span style=" color:#ffffff;">0x0 </span></p></body></html></string>\n</property>\n</widget>\n</item>\n"
}
]
| C++ | MIT License | vergecurrency/verge | Quick fix (necessary) Block Explorer |
714,127 | 01.01.2018 08:38:19 | 25,200 | 7908f64167662f1852e82c855a00e4a66510fc74 | quick fixess for Block Explorer | [
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -83,11 +83,7 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\nsetMinimumSize(970,500);\nresize(970, 500);\nsetWindowTitle(tr(\"VERGE\") + \" - \" + tr(\"Wallet\"));\n-<<<<<<< HEAD\nqApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar { text-align:center; } QToolBar QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: transparent; } #toolbar2 { border:none;width:5px; background-color:transparent; } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); text-align: center; color:white; padding-bottom:10px; } QMenu::item { color:white; text-align: center; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; text-align: center; background-color: transparent; }\");\n-=======\n- qApp->setStyleSheet(\"QMainWindow { background-image:url(:images/bkg);border:none;font-family:'Open Sans,sans-serif'; } #frame { } QToolBar { padding-top:15px;padding-bottom:10px;margin:0px;text-align:center;} QLabel { padding-top:15px;padding-bottom:10px;margin:0px; } #spacer { background:rgb(57,85,95);border:none; } #toolbar3 { border:none;width:1px; background-color: transparent; } #toolbar2 { border:none;width:5px; background-color:transparent; } #toolbar { border:none;height:100%;padding-top:20px; background: transparent; text-align: center; color: white;} #labelMiningIcon { padding-left:5px;font-family:'Open Sans,sans-serif';font-size:10px;text-align:center;color:white; } QMenu { background: rgb(57,85,95); text-align: center; color:white; padding-bottom:10px; } QMenu::item { color:white; text-align: center; background-color: transparent; } QMenuBar { background: rgb(57,85,95); color:white; } QMenuBar::item { font-size:12px;padding-bottom:8px;padding-top:5px;padding-left:5px;padding-right:5px;color:white; text-align: center; background-color: transparent; }\");\n->>>>>>> master\n#ifndef Q_OS_MAC\nqApp->setWindowIcon(QIcon(\":icons/bitcoin\"));\nsetWindowIcon(QIcon(\":icons/bitcoin\"));\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/forms/blockbrowser.ui",
"new_path": "src/qt/forms/blockbrowser.ui",
"diff": "@@ -409,7 +409,7 @@ border-top-left-radius: 5px;\nborder-top-right-radius: 5px;\nborder-bottom-left-radius: 5px;\nborder-bottom-right-radius: 5px;\n-border: 1px solid #0b3b47;\n+border: 1px solid #0b3b46;\nmin-height: 25px;\nmax-height: 25px;</string>\n</property>\n"
}
]
| C++ | MIT License | vergecurrency/verge | quick fixess for Block Explorer |
714,098 | 01.01.2018 11:21:04 | 18,000 | 814784f2c9ad72e3752759835bbbdcfe45490b3f | remove radio and chat completely | [
{
"change_type": "MODIFY",
"old_path": "src/Makefile.qt.include",
"new_path": "src/Makefile.qt.include",
"diff": "@@ -18,8 +18,6 @@ QT_FORMS_UI = \\\nqt/forms/sendcoinsdialog.ui \\\nqt/forms/sendcoinsentry.ui \\\nqt/forms/signverifymessagedialog.ui \\\n- qt/forms/chatwindow.ui \\\n- qt/forms/radio.ui \\\nqt/forms/transactiondescdialog.ui \\\nqt/forms/blockbrowser.ui\n@@ -34,8 +32,6 @@ QT_MOC_CPP = \\\nqt/moc_blockbrowser.cpp \\\nqt/moc_clientmodel.cpp \\\nqt/moc_csvmodelwriter.cpp \\\n- qt/moc_chatwindow.cpp \\\n- qt/moc_radio.cpp \\\nqt/moc_serveur.cpp \\\nqt/moc_editaddressdialog.cpp \\\nqt/moc_guiutil.cpp \\\n@@ -81,7 +77,6 @@ BITCOIN_QT_H = \\\nqt/bitcoingui.h \\\nqt/bitcoinunits.h \\\nqt/blockbrowser.h \\\n- qt/radio.h \\\nqt/clientmodel.h \\\nqt/csvmodelwriter.h \\\nqt/editaddressdialog.h \\\n@@ -107,7 +102,6 @@ BITCOIN_QT_H = \\\nqt/transactionrecord.h \\\nqt/transactiontablemodel.h \\\nqt/transactionview.h \\\n- qt/chatwindow.h \\\nqt/serveur.h \\\nqt/walletmodel.h\n@@ -168,8 +162,6 @@ BITCOIN_QT_CPP = \\\nqt/blockbrowser.cpp \\\nqt/clientmodel.cpp \\\nqt/csvmodelwriter.cpp \\\n- qt/chatwindow.cpp \\\n- qt/radio.cpp \\\nqt/serveur.cpp \\\nqt/guiutil.cpp \\\nqt/monitoreddatamapper.cpp \\\n@@ -189,9 +181,7 @@ BITCOIN_QT_CPP += \\\nqt/blockbrowser.cpp \\\nqt/editaddressdialog.cpp \\\nqt/overviewpage.cpp \\\n- qt/chatwindow.cpp \\\nqt/serveur.cpp \\\n- qt/radio.cpp \\\nqt/sendcoinsdialog.cpp \\\nqt/sendcoinsentry.cpp \\\nqt/signverifymessagedialog.cpp \\\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.cpp",
"new_path": "src/qt/bitcoingui.cpp",
"diff": "@@ -108,14 +108,12 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\n// Create tabs\noverviewPage = new OverviewPage();\n- chatWindow = new ChatWindow(this);\nblockBrowser = new BlockBrowser(this);\ntransactionsPage = new QWidget(this);\nQVBoxLayout *vbox = new QVBoxLayout();\ntransactionView = new TransactionView(this);\nvbox->addWidget(transactionView);\ntransactionsPage->setLayout(vbox);\n- radioPage = new Radio(this);\naddressBookPage = new AddressBookPage(AddressBookPage::ForEditing, AddressBookPage::SendingTab);\n@@ -127,13 +125,11 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):\ncentralWidget = new QStackedWidget(this);\ncentralWidget->addWidget(overviewPage);\n- centralWidget->addWidget(chatWindow);\ncentralWidget->addWidget(blockBrowser);\ncentralWidget->addWidget(transactionsPage);\ncentralWidget->addWidget(addressBookPage);\ncentralWidget->addWidget(receiveCoinsPage);\ncentralWidget->addWidget(sendCoinsPage);\n- centralWidget->addWidget(radioPage);\nsetCentralWidget(centralWidget);\n// Create status bar\n@@ -737,24 +733,6 @@ void BitcoinGUI::gotoBlockBrowser()\ndisconnect(exportAction, SIGNAL(triggered()), 0, 0);\n}\n-void BitcoinGUI::gotoChatPage()\n-{\n- chatAction->setChecked(true);\n- centralWidget->setCurrentWidget(chatWindow);\n-\n- exportAction->setEnabled(false);\n- disconnect(exportAction, SIGNAL(triggered()), 0, 0);\n-}\n-\n-void BitcoinGUI::gotoRadioPage()\n-{\n- radioAction->setChecked(true);\n- centralWidget->setCurrentWidget(radioPage);\n-\n- exportAction->setEnabled(false);\n- disconnect(exportAction, SIGNAL(triggered()), 0, 0);\n-}\n-\nvoid BitcoinGUI::gotoHistoryPage()\n{\nhistoryAction->setChecked(true);\n"
},
{
"change_type": "MODIFY",
"old_path": "src/qt/bitcoingui.h",
"new_path": "src/qt/bitcoingui.h",
"diff": "#include <QMainWindow>\n#include <QSystemTrayIcon>\n-#include \"radio.h\"\nclass TransactionTableModel;\n@@ -12,8 +11,6 @@ class WalletModel;\nclass TransactionView;\nclass OverviewPage;\nclass BlockBrowser;\n-class Radio;\n-class ChatWindow;\nclass AddressBookPage;\nclass SendCoinsDialog;\nclass SignVerifyMessageDialog;\n@@ -66,8 +63,6 @@ private:\nOverviewPage *overviewPage;\nBlockBrowser *blockBrowser;\n- ChatWindow *chatWindow;\n- Radio *radioPage;\nQWidget *transactionsPage;\nAddressBookPage *addressBookPage;\nAddressBookPage *receiveCoinsPage;\n@@ -83,8 +78,6 @@ private:\nQMenuBar *appMenuBar;\nQAction *overviewAction;\nQAction *blockAction;\n- QAction *chatAction;\n- QAction *radioAction;\nQAction *historyAction;\nQAction *quitAction;\nQAction *sendCoinsAction;\n@@ -150,10 +143,6 @@ private slots:\nvoid gotoOverviewPage();\n/** Switch to block explorer*/\nvoid gotoBlockBrowser();\n- /** Switch to chat page */\n- void gotoChatPage();\n- /** Switch to radio page */\n- void gotoRadioPage();\n/** Switch to history (transactions) page */\nvoid gotoHistoryPage();\n/** Switch to address book page */\n"
},
{
"change_type": "DELETE",
"old_path": "src/qt/chatwindow.cpp",
"new_path": null,
"diff": "-/*Copyright (C) 2009 Cleriot Simon\n-* 2016 Verge\n-*\n-* This program is free software; you can redistribute it and/or\n-* modify it under the terms of the GNU Lesser General Public\n-* License as published by the Free Software Foundation; either\n-* version 2.1 of the License, or (at your option) any later version.\n-*\n-* This program is distributed in the hope that it will be useful,\n-* but WITHOUT ANY WARRANTY; without even the implied warranty of\n-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n-* Lesser General Public License for more details.\n-*\n-* You should have received a copy of the GNU Lesser General Public\n-* License along with this program; if not, write to the Free Software\n-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA*/\n-\n-#include \"chatwindow.h\"\n-#include \"ui_chatwindow.h\"\n-\n-ChatWindow::ChatWindow(QWidget *parent)\n- : QWidget(parent), ui(new Ui::ChatWindowClass)\n-{\n- ui->setupUi(this);\n- setFixedSize(750,575);\n- ui->splitter->hide();\n-\n- connect(ui->buttonConnect, SIGNAL(clicked()), this, SLOT(connecte()));\n-\n- connect(ui->actionQuit, SIGNAL(triggered()), this, SLOT(close()));\n- connect(ui->actionCloseTab, SIGNAL(triggered()), this, SLOT(closeTab()));\n-\n- connect(ui->lineEdit, SIGNAL(returnPressed()), this, SLOT(sendCommande()));\n-\n-\n-\n-\n-\n- connect(ui->disconnect, SIGNAL(clicked()), this, SLOT(disconnectFromServer()));\n- connect(ui->tab, SIGNAL(currentChanged(int)), this, SLOT(tabChanged(int)) );\n- connect(ui->tab, SIGNAL(tabCloseRequested(int)), this, SLOT(tabClosing(int)) );\n-\n-}\n-\n-\n-\n-void ChatWindow::tabChanged(int index)\n-{\n- if(index!=0 && joining == false)\n- currentTab()->updateUsersList(ui->tab->tabText(index));\n-}\n-\n-void ChatWindow::tabClosing(int index)\n-{\n- currentTab()->leave(ui->tab->tabText(index));\n-}\n-/*void ChatWindow::tabRemoved(int index)\n-{\n- currentTab()->leave(ui->tab->tabText(index));\n-}*/\n-\n-void ChatWindow::disconnectFromServer() {\n-\n- QMapIterator<QString, Serveur*> i(serveurs);\n-\n- while(i.hasNext())\n- {\n- i.next();\n- QMapIterator<QString, QTextEdit*> i2(i.value()->conversations);\n- while(i2.hasNext())\n- {\n- i2.next();\n- i.value()->sendData(\"QUIT \"+i2.key() + \" \");\n- }\n- }\n-\n-\n- ui->splitter->hide();\n- ui->hide3->show();\n-\n-}\n-\n-Serveur *ChatWindow::currentTab()\n-{\n- QString tooltip=ui->tab->tabToolTip(ui->tab->currentIndex());\n- return serveurs[tooltip];\n- //return ui->tab->currentWidget()->findChild<Serveur *>();\n-}\n-\n-void ChatWindow::closeTab()\n-{\n- QString tooltip=ui->tab->tabToolTip(ui->tab->currentIndex());\n- QString txt=ui->tab->tabText(ui->tab->currentIndex());\n-\n- if(txt==tooltip)\n- {\n- QMapIterator<QString, QTextEdit*> i(serveurs[tooltip]->conversations);\n-\n- int count=ui->tab->currentIndex()+1;\n-\n- while(i.hasNext())\n- {\n- i.next();\n- ui->tab->removeTab(count);\n- }\n-\n- currentTab()->abort();\n- ui->tab->removeTab(ui->tab->currentIndex());\n- }\n- else\n- {\n-\n- ui->tab->removeTab(ui->tab->currentIndex());\n- currentTab()->conversations.remove(txt);\n- }\n-}\n-\n-void ChatWindow::sendCommande()\n-{\n- QString tooltip=ui->tab->tabToolTip(ui->tab->currentIndex());\n- QString txt=ui->tab->tabText(ui->tab->currentIndex());\n- if(txt==tooltip)\n- {\n- currentTab()->sendData(currentTab()->parseCommande(ui->lineEdit->text(),true) );\n- }\n- else\n- {\n- currentTab()->sendData(currentTab()->parseCommande(ui->lineEdit->text()) );\n- }\n- ui->lineEdit->clear();\n- ui->lineEdit->setFocus();\n-}\n-\n-void ChatWindow::tabJoined()\n-{\n- joining=true;\n-}\n-void ChatWindow::tabJoining()\n-{\n- joining=false;\n-}\n-\n-void ChatWindow::connecte()\n-{\n-\n- ui->splitter->show();\n- Serveur *serveur=new Serveur;\n- QTextEdit *textEdit=new QTextEdit;\n- ui->hide3->hide();\n-\n- ui->tab->addTab(textEdit,\"Console/PM\");\n- ui->tab->setTabToolTip(ui->tab->count()-1,\"irc.freenode.net\");\n- // current tab is now the last, therefore remove all but the last\n- for (int i = ui->tab->count(); i > 1; --i) {\n- ui->tab->removeTab(0);\n- }\n-\n- serveurs.insert(\"irc.freenode.net\",serveur);\n-\n- serveur->pseudo=ui->editPseudo->text();\n- serveur->serveur=\"irc.freenode.net\";\n- serveur->port=6667;\n- serveur->affichage=textEdit;\n- serveur->tab=ui->tab;\n- serveur->userList=ui->userView;\n- serveur->parent=this;\n-\n- textEdit->setReadOnly(true);\n-\n- connect(serveur, SIGNAL(joinTab()),this, SLOT(tabJoined() ));\n- connect(serveur, SIGNAL(tabJoined()),this, SLOT(tabJoining() ));\n-\n- serveur->connectToHost(\"irc.freenode.net\",6667);\n-\n- ui->tab->setCurrentIndex(ui->tab->count()-1);\n-}\n-\n-void ChatWindow::closeEvent(QCloseEvent *event)\n-{\n- (void) event;\n-\n- QMapIterator<QString, Serveur*> i(serveurs);\n-\n- while(i.hasNext())\n- {\n- i.next();\n- QMapIterator<QString, QTextEdit*> i2(i.value()->conversations);\n- while(i2.hasNext())\n- {\n- i2.next();\n- i.value()->sendData(\"QUIT \"+i2.key() + \" \");\n- }\n- }\n-}\n-void ChatWindow ::setModel(ClientModel *model)\n-{\n- this->model = model;\n-}\n-\n-\n-ChatWindow::~ChatWindow()\n-{\n- delete ui;\n- QMapIterator<QString, Serveur*> i(serveurs);\n-\n- while(i.hasNext())\n- {\n- i.next();\n- QMapIterator<QString, QTextEdit*> i2(i.value()->conversations);\n- while(i2.hasNext())\n- {\n- i2.next();\n- i.value()->sendData(\"QUIT \"+i2.key() + \" \");\n- }\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "src/qt/chatwindow.h",
"new_path": null,
"diff": "-/*Copyright (C) 2009 Cleriot Simon\n-*\n-* This program is free software; you can redistribute it and/or\n-* modify it under the terms of the GNU Lesser General Public\n-* License as published by the Free Software Foundation; either\n-* version 2.1 of the License, or (at your option) any later version.\n-*\n-* This program is distributed in the hope that it will be useful,\n-* but WITHOUT ANY WARRANTY; without even the implied warranty of\n-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n-* Lesser General Public License for more details.\n-*\n-* You should have received a copy of the GNU Lesser General Public\n-* License along with this program; if not, write to the Free Software\n-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA*/\n-\n-#ifndef CHATWINDOW_H\n-#define CHATWINDOW_H\n-\n-#include <QtGui>\n-#include <QtNetwork>\n-#include \"clientmodel.h\"\n-#include \"serveur.h\"\n-\n-\n-\n-namespace Ui\n-{\n- class ChatWindowClass;\n-}\n-\n-class ChatWindow : public QWidget\n-{\n- Q_OBJECT\n-\n-public:\n- ChatWindow(QWidget *parent = 0);\n- ~ChatWindow();\n- void setModel(ClientModel *model);\n- Serveur * currentTab();\n- signals:\n- void changeTab();\n-\n- public slots:\n- void sendCommande();\n- void connecte();\n- void closeTab();\n-\n- void tabChanged(int index);\n-\n- void tabJoined();\n- void tabJoining();\n- void disconnectFromServer();\n- void tabClosing(int index);\n-\n-\n-private:\n- Ui::ChatWindowClass *ui;\n- ClientModel *model;\n- QMap<QString,Serveur *> serveurs;\n- bool joining;\n- void closeEvent(QCloseEvent *event);\n-\n-};\n-\n-#endif // CHATWINDOW_H\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "src/qt/forms/chatwindow.ui",
"new_path": null,
"diff": "-<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n-<ui version=\"4.0\">\n- <class>ChatWindowClass</class>\n- <widget class=\"QWidget\" name=\"ChatWindowClass\">\n- <property name=\"geometry\">\n- <rect>\n- <x>0</x>\n- <y>0</y>\n- <width>747</width>\n- <height>514</height>\n- </rect>\n- </property>\n- <layout class=\"QGridLayout\" name=\"gridLayout_2\">\n- <item row=\"0\" column=\"0\">\n- <widget class=\"QWidget\" name=\"widget_2\" native=\"true\">\n- <layout class=\"QGridLayout\" name=\"gridLayout_3\">\n- <item row=\"0\" column=\"0\">\n- <widget class=\"QWidget\" name=\"hide3\" native=\"true\">\n- <property name=\"sizePolicy\">\n- <sizepolicy hsizetype=\"Maximum\" vsizetype=\"Preferred\">\n- <horstretch>0</horstretch>\n- <verstretch>0</verstretch>\n- </sizepolicy>\n- </property>\n- <layout class=\"QFormLayout\" name=\"formLayout\">\n- <property name=\"fieldGrowthPolicy\">\n- <enum>QFormLayout::AllNonFixedFieldsGrow</enum>\n- </property>\n- <item row=\"0\" column=\"0\" colspan=\"2\">\n- <widget class=\"QLabel\" name=\"label_9\">\n- <property name=\"sizePolicy\">\n- <sizepolicy hsizetype=\"Preferred\" vsizetype=\"Preferred\">\n- <horstretch>0</horstretch>\n- <verstretch>0</verstretch>\n- </sizepolicy>\n- </property>\n- <property name=\"font\">\n- <font>\n- <family>Open Sans,sans-serif</family>\n- </font>\n- </property>\n- <property name=\"text\">\n- <string><html><head/><body><p><span style=" font-size:20px; font-weight:600; color:#000000;">VERGE Chat</span></p></body></html></string>\n- </property>\n- </widget>\n- </item>\n- <item row=\"2\" column=\"0\" colspan=\"2\">\n- <widget class=\"QLabel\" name=\"label_10\">\n- <property name=\"text\">\n- <string><html><head/><body><p><span style=" font-weight:600; color:#000000;">Connect to IRC:</span></p></body></html></string>\n- </property>\n- </widget>\n- </item>\n- <item row=\"3\" column=\"0\">\n- <widget class=\"QLabel\" name=\"label_5\">\n- <property name=\"text\">\n- <string><html><head/><body><p><span style=" color:#000000;">Nickname</span></p></body></html></string>\n- </property>\n- </widget>\n- </item>\n- <item row=\"3\" column=\"1\">\n- <widget class=\"QLineEdit\" name=\"editPseudo\">\n- <property name=\"sizePolicy\">\n- <sizepolicy hsizetype=\"Fixed\" vsizetype=\"Fixed\">\n- <horstretch>0</horstretch>\n- <verstretch>0</verstretch>\n- </sizepolicy>\n- </property>\n- <property name=\"styleSheet\">\n- <string notr=\"true\">\n-border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n-min-height: 25px;\n-max-height: 25px;\n-min-width: 175px;\n-max-width: 175px;</string>\n- </property>\n- <property name=\"text\">\n- <string/>\n- </property>\n- </widget>\n- </item>\n- <item row=\"5\" column=\"0\" colspan=\"2\">\n- <widget class=\"QPushButton\" name=\"buttonConnect\">\n- <property name=\"sizePolicy\">\n- <sizepolicy hsizetype=\"Fixed\" vsizetype=\"Fixed\">\n- <horstretch>0</horstretch>\n- <verstretch>0</verstretch>\n- </sizepolicy>\n- </property>\n- <property name=\"minimumSize\">\n- <size>\n- <width>129</width>\n- <height>29</height>\n- </size>\n- </property>\n- <property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n-min-height: 25px;\n-max-height: 25px;\n-min-width: 125px;\n-max-width: 125px;</string>\n- </property>\n- <property name=\"text\">\n- <string>Connect</string>\n- </property>\n- </widget>\n- </item>\n- <item row=\"1\" column=\"0\">\n- <spacer name=\"verticalSpacer\">\n- <property name=\"orientation\">\n- <enum>Qt::Vertical</enum>\n- </property>\n- <property name=\"sizeHint\" stdset=\"0\">\n- <size>\n- <width>20</width>\n- <height>10</height>\n- </size>\n- </property>\n- </spacer>\n- </item>\n- <item row=\"6\" column=\"0\">\n- <spacer name=\"verticalSpacer_2\">\n- <property name=\"orientation\">\n- <enum>Qt::Vertical</enum>\n- </property>\n- <property name=\"sizeHint\" stdset=\"0\">\n- <size>\n- <width>20</width>\n- <height>10</height>\n- </size>\n- </property>\n- </spacer>\n- </item>\n- <item row=\"7\" column=\"0\" colspan=\"2\">\n- <widget class=\"QLabel\" name=\"label\">\n- <property name=\"text\">\n- <string><html><head/><body><p>A few IRC commands :</p><ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 7px; margin-right: 0px; -qt-list-indent: 0;"><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">/JOIN #channel <span style=" color:#9a9a9a;">Join a channel</span></li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">/NICK nickname <span style=" color:#9a9a9a;">Change nickname</span></li><li style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">/PRIVMSG nickname message <span style=" color:#9a9a9a;">Send PM </span></li></ul><p>If userlist gets buggy, switch tabs to fix</p></body></html></string>\n- </property>\n- </widget>\n- </item>\n- </layout>\n- <zorder>label_9</zorder>\n- <zorder>editPseudo</zorder>\n- <zorder>label_5</zorder>\n- <zorder>buttonConnect</zorder>\n- <zorder>label_10</zorder>\n- <zorder>label</zorder>\n- </widget>\n- </item>\n- <item row=\"0\" column=\"1\">\n- <widget class=\"QWidget\" name=\"splitter\" native=\"true\">\n- <property name=\"enabled\">\n- <bool>true</bool>\n- </property>\n- <property name=\"sizePolicy\">\n- <sizepolicy hsizetype=\"Preferred\" vsizetype=\"Preferred\">\n- <horstretch>0</horstretch>\n- <verstretch>0</verstretch>\n- </sizepolicy>\n- </property>\n- <property name=\"styleSheet\">\n- <string notr=\"true\"/>\n- </property>\n- <layout class=\"QGridLayout\" name=\"gridLayout_4\">\n- <property name=\"sizeConstraint\">\n- <enum>QLayout::SetDefaultConstraint</enum>\n- </property>\n- <item row=\"3\" column=\"0\" colspan=\"2\">\n- <widget class=\"QLineEdit\" name=\"lineEdit\">\n- <property name=\"sizePolicy\">\n- <sizepolicy hsizetype=\"Minimum\" vsizetype=\"Fixed\">\n- <horstretch>0</horstretch>\n- <verstretch>0</verstretch>\n- </sizepolicy>\n- </property>\n- <property name=\"maximumSize\">\n- <size>\n- <width>16777215</width>\n- <height>30</height>\n- </size>\n- </property>\n- </widget>\n- </item>\n- <item row=\"0\" column=\"1\">\n- <widget class=\"QListView\" name=\"userView\">\n- <property name=\"sizePolicy\">\n- <sizepolicy hsizetype=\"Minimum\" vsizetype=\"Expanding\">\n- <horstretch>0</horstretch>\n- <verstretch>0</verstretch>\n- </sizepolicy>\n- </property>\n- <property name=\"minimumSize\">\n- <size>\n- <width>0</width>\n- <height>300</height>\n- </size>\n- </property>\n- <property name=\"maximumSize\">\n- <size>\n- <width>150</width>\n- <height>16777215</height>\n- </size>\n- </property>\n- <property name=\"styleSheet\">\n- <string notr=\"true\">border-radius:40px;border:1px solid grey</string>\n- </property>\n- </widget>\n- </item>\n- <item row=\"0\" column=\"0\" rowspan=\"3\">\n- <widget class=\"QTabWidget\" name=\"tab\">\n- <property name=\"styleSheet\">\n- <string notr=\"true\"/>\n- </property>\n- <property name=\"tabShape\">\n- <enum>QTabWidget::Rounded</enum>\n- </property>\n- <property name=\"currentIndex\">\n- <number>1</number>\n- </property>\n- <property name=\"tabsClosable\">\n- <bool>false</bool>\n- </property>\n- <widget class=\"QWidget\" name=\"widget_4\">\n- <attribute name=\"title\">\n- <string>Tab 1</string>\n- </attribute>\n- </widget>\n- <widget class=\"QWidget\" name=\"tab_5\">\n- <attribute name=\"title\">\n- <string>Tab 2</string>\n- </attribute>\n- </widget>\n- </widget>\n- </item>\n- <item row=\"1\" column=\"1\" rowspan=\"2\">\n- <widget class=\"QPushButton\" name=\"disconnect\">\n- <property name=\"sizePolicy\">\n- <sizepolicy hsizetype=\"Minimum\" vsizetype=\"Preferred\">\n- <horstretch>0</horstretch>\n- <verstretch>0</verstretch>\n- </sizepolicy>\n- </property>\n- <property name=\"minimumSize\">\n- <size>\n- <width>154</width>\n- <height>29</height>\n- </size>\n- </property>\n- <property name=\"styleSheet\">\n- <string notr=\"true\">border-top-left-radius: 5px;\n-border-top-right-radius: 5px;\n-border-bottom-left-radius: 5px;\n-border-bottom-right-radius: 5px;\n-border: 2px solid #000000;\n-min-height: 25px;\n-max-height: 25px;\n-min-width: 150px;\n-max-width: 150px;</string>\n- </property>\n- <property name=\"text\">\n- <string>Disconnect</string>\n- </property>\n- </widget>\n- </item>\n- </layout>\n- <zorder>tab</zorder>\n- <zorder>lineEdit</zorder>\n- <zorder>userView</zorder>\n- <zorder>disconnect</zorder>\n- </widget>\n- </item>\n- </layout>\n- </widget>\n- </item>\n- </layout>\n- <action name=\"actionQuit\">\n- <property name=\"text\">\n- <string>Quitter</string>\n- </property>\n- <property name=\"shortcut\">\n- <string>Ctrl+Q</string>\n- </property>\n- </action>\n- <action name=\"actionCloseTab\">\n- <property name=\"text\">\n- <string>Fermer l'onglet</string>\n- </property>\n- </action>\n- </widget>\n- <layoutdefault spacing=\"6\" margin=\"11\"/>\n- <resources/>\n- <connections/>\n-</ui>\n"
},
{
"change_type": "DELETE",
"old_path": "src/qt/forms/radio.ui",
"new_path": null,
"diff": "-<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n- <ui version=\"4.0\">\n- <class>Radio</class>\n- <widget class=\"QWidget\" name=\"Radio\">\n- <property name=\"geometry\">\n- <rect>\n- <x>0</x>\n- <y>0</y>\n- <width>1066</width>\n- <height>600</height>\n- </rect>\n- </property>\n- <property name=\"windowTitle\">\n- <string>Form</string>\n- </property>\n- <layout class=\"QVBoxLayout\" name=\"verticalLayout\">\n- <item>\n- <widget class=\"QWebView\" name=\"webView\" native=\"true\">\n- <property name=\"url\" stdset=\"0\">\n- <url>\n- <string>http://radiocrypto.com/index.html</string>\n- </url>\n- </property>\n- </widget>\n- </item>\n- </layout>\n- </widget>\n- <customwidgets>\n- <customwidget>\n- <class>QWebView</class>\n- <extends>QWidget</extends>\n- <header>QtWebKitWidgets/QWebView</header>\n- </customwidget>\n- </customwidgets>\n- <resources/>\n- <connections/>\n- </ui>\n"
},
{
"change_type": "DELETE",
"old_path": "src/qt/radio.cpp",
"new_path": null,
"diff": "-#include \"ui_radio.h\"\n-#include \"guiutil.h\"\n-#include \"bitcoingui.h\"\n-#include \"util.h\"\n-#include \"main.h\"\n-#include <QtCore>\n-#include <QtGui>\n-#include <QtWebKit>\n-#include <QtWidgets>\n-#include <QtWebKit/QtWebKit>\n-#include <QtWebKitWidgets/QtWebKitWidgets>\n-\n-Radio::Radio(QWidget *parent) :\n- QWidget(parent),\n- ui(new Ui::Radio),\n- model(0)\n-{\n- ui->setupUi(this);\n-}\n- void Radio::setModel(WalletModel *model)\n-{\n- this->model = model;\n- if(!model)\n- return;\n-}\n-\n-Radio::~Radio()\n-{\n- delete ui;\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "src/qt/radio.h",
"new_path": null,
"diff": "-#ifndef RADIO_H\n-#define RADIO_H\n-\n-#include <QWidget>\n-\n-namespace Ui {\n- class Radio;\n-}\n-class WalletModel;\n-\n-class Radio : public QWidget\n-{\n- Q_OBJECT\n-\n-public:\n- explicit Radio(QWidget *parent = 0);\n- void setModel(WalletModel *model);\n-\n-\n-virtual ~Radio();\n-\n-\n-private:\n- Ui::Radio *ui;\n- WalletModel *model;\n-};\n-\n-#endif // RADIO_H\n"
}
]
| C++ | MIT License | vergecurrency/verge | remove radio and chat completely |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.