Skip to content

Commit

Permalink
3.3.5.4
Browse files Browse the repository at this point in the history
Gridcoin Research 3.3.5.4/18.4
Mandatory Upgrade

- Control Runaway Difficulty
- Starts @114175

Earlier today:

- Fixed retally problem during reorganizations
- 90 Second block targets
- 8 hour coin maturity (increased from 4 hours - TheLostBoy)
- 1000 block lookback in Tally Network Averages
- Removed PoW
- Consolidated PoR RSA_WEIGHT into PoS2.0 Algorithm for the new
homogenized PoR algorithm
- Added linux support
- Added Org messages to every decrypted message in the coin in the log,
to allow banning misbehaving nodes
- Restored ability to self compile using the last set of keys that I
PM'ed : NOTE * Any user who wants to self-compile must PM me for a key.
  • Loading branch information
gridcoin committed Jan 11, 2015
1 parent d41eef6 commit 5448bd9
Show file tree
Hide file tree
Showing 18 changed files with 648 additions and 72 deletions.
2 changes: 1 addition & 1 deletion Makefile.Debug
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: gridcoinresearch
# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Jan 11 11:38:06 2015
# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Jan 11 15:49:29 2015
# Project: gridcoinstake.pro
# Template: app
#############################################################################
Expand Down
2 changes: 1 addition & 1 deletion Makefile.Release
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: gridcoinresearch
# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Jan 11 11:38:06 2015
# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Jan 11 15:49:29 2015
# Project: gridcoinstake.pro
# Template: app
#############################################################################
Expand Down
31 changes: 23 additions & 8 deletions contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,13 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_5644D8F767F33372E534FBD5A2384D12"
"OwnerKey" = "8:_D0966638AB084779AFD69795C33FC8EB"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625"
"OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
Expand All @@ -184,13 +184,13 @@
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9"
"OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625"
"MsmSig" = "8:_UNDEFINED"
}
"Entry"
{
"MsmKey" = "8:_UNDEFINED"
"OwnerKey" = "8:_D0966638AB084779AFD69795C33FC8EB"
"OwnerKey" = "8:_5644D8F767F33372E534FBD5A2384D12"
"MsmSig" = "8:_UNDEFINED"
}
}
Expand Down Expand Up @@ -416,6 +416,11 @@
"AssemblyAsmDisplayName" = "8:OpenPop, Version=2.0.5.0, Culture=neutral, processorArchitecture=MSIL"
"ScatterAssemblies"
{
"_5644D8F767F33372E534FBD5A2384D12"
{
"Name" = "8:openpopstake.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:openpopstake.dll"
"TargetName" = "8:"
Expand All @@ -442,6 +447,11 @@
"AssemblyAsmDisplayName" = "8:SQLite.NET, Version=0.21.1869.3794, Culture=neutral, PublicKeyToken=c273bd375e695f9c"
"ScatterAssemblies"
{
"_6AEABB5004EC4B57225B51B085DB5625"
{
"Name" = "8:sqlitestake.net.dll"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:sqlitestake.net.dll"
"TargetName" = "8:"
Expand Down Expand Up @@ -659,6 +669,11 @@
"AssemblyAsmDisplayName" = "8:ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73"
"ScatterAssemblies"
{
"_DEB886DE05C496A5AD26B43C4B1B90B9"
{
"Name" = "8:ICSharpCode.SharpZipLib.DLL"
"Attributes" = "3:512"
}
}
"SourcePath" = "8:ICSharpCode.SharpZipLib.DLL"
"TargetName" = "8:"
Expand Down Expand Up @@ -844,16 +859,16 @@
"Product"
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Gridcoin Research 18.2"
"ProductCode" = "8:{718F2C63-B1CA-408D-B51F-2CCE33BB10B3}"
"PackageCode" = "8:{2FE0548D-8992-4A61-876D-7673AA8F3908}"
"ProductName" = "8:Gridcoin Research 18.4"
"ProductCode" = "8:{E199A4E4-877E-46C2-9FBF-C5516CF6F5C7}"
"PackageCode" = "8:{0792A521-07C4-4F74-8D5D-5A4D2BF63A7E}"
"UpgradeCode" = "8:{9617E9EA-252F-43CE-B53E-B48C85F71192}"
"AspNetVersion" = "8:4.0.30319.0"
"RestartWWWService" = "11:FALSE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:FALSE"
"InstallAllUsers" = "11:TRUE"
"ProductVersion" = "8:18.2"
"ProductVersion" = "8:18.4"
"Manufacturer" = "8:GridcoinResearch"
"ARPHELPTELEPHONE" = "8:"
"ARPHELPLINK" = "8:"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,12 @@ Public Class Form1
End Function
Private Sub Button1_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Button1.Click
Dim x As New Utilization
x.ShowTicker()

'x.UpdateConfirm("085e0b60fd229e1ce8a28c8d32a17b081e9810793ab4879dfbe34beda454dc5d")
'Dim l As Long = x.TrackConfirm("085e0b60fd229e1ce8a28c8d32a17b081e9810793ab4879dfbe34beda454dc5d")
'l = x.TrackConfirm("085e0b60fd229e1ce8a28c8d32a17b081e9810793ab4879dfbe34beda454dc5d")
x.ShowTicketList()


End Sub




Public Sub RewriteSourceFile(sPATHH As String, sSFileIn As String)
Dim sFileIn As String
sFileIn = sPATHH + sSFileIn
Expand Down
1 change: 1 addition & 0 deletions contrib/Installer/boinc/boinc/Sql.vb
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ Public Class Sql
sHost = GetMasterNodeURL()
sData = SQLQuery(sHost, sCommand)
If sData = "" Then Return sData
If sData <> "" And x = 9 Then Return sData

Catch ex As Exception
Log(ex.Message)
Expand Down
108 changes: 108 additions & 0 deletions contrib/Installer/boinc/boinc/TicketList.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

120 changes: 120 additions & 0 deletions contrib/Installer/boinc/boinc/TicketList.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
Loading

0 comments on commit 5448bd9

Please sign in to comment.