Skip to content

Commit 3774323

Browse files
authored
Merge pull request #2 from ElectraProtocol/dev
Release v1.0.1.0 final
2 parents 4301f7a + 09a0bc6 commit 3774323

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+4971
-1607
lines changed

.appveyor.yml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
version: '{branch}.{build}'
22
skip_tags: true
3-
image: Previous Visual Studio 2019
3+
image: Visual Studio 2019
44
configuration: Release
55
platform: x64
66
clone_depth: 5
77
environment:
88
PATH: 'C:\Python37-x64;C:\Python37-x64\Scripts;%PATH%'
99
PYTHONUTF8: 1
10-
QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/v1.6/Qt5.9.8_x64_static_vs2019.zip'
11-
QT_DOWNLOAD_HASH: '9a8c6eb20967873785057fdcd329a657c7f922b0af08c5fde105cc597dd37e21'
10+
QT_DOWNLOAD_URL: 'https://github.com/sipsorcery/qt_win_binary/releases/download/qt598x64_vs2019_v1681/qt598_x64_vs2019_1681.zip'
11+
QT_DOWNLOAD_HASH: '00cf7327818c07d74e0b1a4464ffe987c2728b00d49d4bf333065892af0515c3'
1212
QT_LOCAL_PATH: 'C:\Qt5.9.8_x64_static_vs2019'
13-
VCPKG_INSTALL_PATH: 'C:\tools\vcpkg\installed'
14-
VCPKG_COMMIT_ID: '40230b8e3f6368dcb398d649331be878ca1e9007'
13+
VCPKG_TAG: '2020.11-1'
1514
install:
1615
# Disable zmq test for now since python zmq library on Windows would cause Access violation sometimes.
1716
# - cmd: pip install zmq
18-
# Powershell block below is to install the c++ dependencies via vcpkg. The pseudo code is:
17+
# The powershell block below is to set up vcpkg to install the c++ dependencies. The pseudo code is:
1918
# a. Checkout the vcpkg source (including port files) for the specific checkout and build the vcpkg binary,
20-
# b. Install the missing packages using the vcpkg manifest.
19+
# b. Append a setting to the vcpkg cmake config file to only do release builds of dependencies (skipping deubg builds saves ~5 mins).
20+
# Note originally this block also installed the dependencies using 'vcpkg install'. Dependencies are now installed
21+
# as part of the msbuild command using vcpkg mainfests.
2122
- ps: |
2223
cd c:\tools\vcpkg
2324
$env:GIT_REDIRECT_STDERR = '2>&1' # git is writing non-errors to STDERR when doing git pull. Send to STDOUT instead.
24-
git pull origin master > $null
25-
git -c advice.detachedHead=false checkout $env:VCPKG_COMMIT_ID
25+
git -c advice.detachedHead=false checkout $env:VCPKG_TAG
2626
.\bootstrap-vcpkg.bat > $null
27+
Add-Content "C:\tools\vcpkg\triplets\$env:PLATFORM-windows-static.cmake" "set(VCPKG_BUILD_TYPE release)"
2728
cd "$env:APPVEYOR_BUILD_FOLDER"
2829
before_build:
2930
# Powershell block below is to download and extract the Qt static libraries. The pseudo code is:

build_msvc/common.init.vcxproj

Lines changed: 18 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
<PropertyGroup Label="Globals">
66
<VCProjectVersion>16.0</VCProjectVersion>
7-
<VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet>
8-
<VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
97
<UseNativeEnvironment>true</UseNativeEnvironment>
108
</PropertyGroup>
119

@@ -16,6 +14,8 @@
1614
<VcpkgUseStatic>true</VcpkgUseStatic>
1715
<VcpkgAutoLink>true</VcpkgAutoLink>
1816
<VcpkgConfiguration>$(Configuration)</VcpkgConfiguration>
17+
<VcpkgTriplet Condition="'$(Platform)'=='Win32'">x86-windows-static</VcpkgTriplet>
18+
<VcpkgTriplet Condition="'$(Platform)'=='x64'">x64-windows-static</VcpkgTriplet>
1919
</PropertyGroup>
2020

2121
<PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' and !Exists('$(WindowsSdkDir)\DesignTime\CommonConfiguration\Neutral\Windows.props')">
@@ -45,66 +45,46 @@
4545
</ProjectConfiguration>
4646
</ItemGroup>
4747

48-
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
49-
<LinkIncremental>true</LinkIncremental>
50-
<WholeProgramOptimization>false</WholeProgramOptimization>
51-
<UseDebugLibraries>true</UseDebugLibraries>
48+
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
49+
<LinkIncremental>false</LinkIncremental>
50+
<UseDebugLibraries>false</UseDebugLibraries>
5251
<PlatformToolset>v142</PlatformToolset>
5352
<CharacterSet>Unicode</CharacterSet>
53+
<GenerateManifest>No</GenerateManifest>
5454
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
5555
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
5656
</PropertyGroup>
57-
<PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
58-
<LinkIncremental>false</LinkIncremental>
59-
<WholeProgramOptimization>true</WholeProgramOptimization>
60-
<UseDebugLibraries>false</UseDebugLibraries>
57+
58+
<PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
59+
<LinkIncremental>true</LinkIncremental>
60+
<UseDebugLibraries>true</UseDebugLibraries>
6161
<PlatformToolset>v142</PlatformToolset>
6262
<CharacterSet>Unicode</CharacterSet>
6363
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
6464
<IntDir>$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
6565
</PropertyGroup>
6666

67-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
68-
<ClCompile>
69-
<Optimization>MaxSpeed</Optimization>
70-
<FunctionLevelLinking>true</FunctionLevelLinking>
71-
<IntrinsicFunctions>true</IntrinsicFunctions>
72-
<SDLCheck>true</SDLCheck>
73-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
74-
</ClCompile>
75-
<Link>
76-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
77-
<OptimizeReferences>true</OptimizeReferences>
78-
</Link>
79-
</ItemDefinitionGroup>
80-
81-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
8268
<ClCompile>
8369
<Optimization>Disabled</Optimization>
84-
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
85-
<SDLCheck>true</SDLCheck>
86-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
87-
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
88-
</ClCompile>
89-
</ItemDefinitionGroup>
90-
91-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
92-
<ClCompile>
93-
<Optimization>MaxSpeed</Optimization>
70+
<WholeProgramOptimization>false</WholeProgramOptimization>
9471
<FunctionLevelLinking>true</FunctionLevelLinking>
9572
<IntrinsicFunctions>true</IntrinsicFunctions>
9673
<SDLCheck>true</SDLCheck>
9774
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
75+
<DebugInformationFormat>None</DebugInformationFormat>
9876
</ClCompile>
9977
<Link>
100-
<EnableCOMDATFolding>true</EnableCOMDATFolding>
101-
<OptimizeReferences>true</OptimizeReferences>
78+
<EnableCOMDATFolding>false</EnableCOMDATFolding>
79+
<OptimizeReferences>false</OptimizeReferences>
80+
<AdditionalOptions>/LTCG:OFF</AdditionalOptions>
10281
</Link>
10382
</ItemDefinitionGroup>
10483

105-
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
84+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
10685
<ClCompile>
10786
<Optimization>Disabled</Optimization>
87+
<WholeProgramOptimization>false</WholeProgramOptimization>
10888
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
10989
<SDLCheck>true</SDLCheck>
11090
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -124,7 +104,6 @@
124104
</ClCompile>
125105
<Link>
126106
<SubSystem>Console</SubSystem>
127-
<GenerateDebugInformation>true</GenerateDebugInformation>
128107
<AdditionalDependencies>Iphlpapi.lib;ws2_32.lib;Shlwapi.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
129108
</Link>
130109
<Lib>

build_msvc/common.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Target Name="CopyBuildArtifacts" Condition="'$(ConfigurationType)' != 'StaticLibrary'">
55
<ItemGroup>
66
<BuildArtifacts Include="$(OutDir)$(TargetName)$(TargetExt)"></BuildArtifacts>
7-
<BuildArtifacts Include="$(OutDir)$(TargetName).pdb"></BuildArtifacts>
7+
<BuildArtifacts Include="$(OutDir)$(TargetName).pdb" Condition="Exists('$(OutDir)$(TargetName).pdb')"></BuildArtifacts>
88
</ItemGroup>
99
<Copy SourceFiles="@(BuildArtifacts)" SkipUnchangedFiles="true" DestinationFolder="..\..\src\" Condition="'$(OutDir)' != ''"></Copy>
1010
</Target>

build_msvc/test_xep-qt/test_xep-qt.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
</ClCompile>
7474
<Link>
7575
<AdditionalDependencies>$(QtLibraryDir)\Qt5Test.lib;$(QtReleaseLibraries);%(AdditionalDependencies)</AdditionalDependencies>
76-
<AdditionalOptions>/ignore:4206</AdditionalOptions>
76+
<AdditionalOptions>/ignore:4206 /LTCG:OFF</AdditionalOptions>
7777
</Link>
7878
</ItemDefinitionGroup>
7979

@@ -83,7 +83,7 @@
8383
</ClCompile>
8484
<Link>
8585
<AdditionalDependencies>$(QtDebugLibraries);%(AdditionalDependencies)</AdditionalDependencies>
86-
<AdditionalOptions>/ignore:4206</AdditionalOptions>
86+
<AdditionalOptions>/ignore:4206</AdditionalOptions>
8787
</Link>
8888
</ItemDefinitionGroup>
8989
<ItemGroup>

build_msvc/xep-qt/xep-qt.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
</ClCompile>
5757
<Link>
5858
<AdditionalDependencies>$(QtReleaseLibraries);%(AdditionalDependencies)</AdditionalDependencies>
59-
<AdditionalOptions>/ignore:4206</AdditionalOptions>
59+
<AdditionalOptions>/ignore:4206 /LTCG:OFF</AdditionalOptions>
6060
</Link>
6161
<ResourceCompile>
6262
<AdditionalIncludeDirectories>..\..\src;</AdditionalIncludeDirectories>

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ define(_CLIENT_VERSION_MAJOR, 1)
33
define(_CLIENT_VERSION_MINOR, 0)
44
define(_CLIENT_VERSION_REVISION, 1)
55
define(_CLIENT_VERSION_BUILD, 0)
6-
define(_CLIENT_VERSION_RC, 1)
6+
define(_CLIENT_VERSION_RC, 0)
77
define(_CLIENT_VERSION_IS_RELEASE, true)
88
define(_COPYRIGHT_YEAR, 2021)
99
define(_COPYRIGHT_HOLDERS,[The %s developers])

doc/JSON-RPC-interface.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,3 +127,14 @@ However, the wallet may not be up-to-date with the current state of the mempool
127127
or the state of the mempool by an RPC that returned before this RPC. For
128128
example, a wallet transaction that was BIP-125-replaced in the mempool prior to
129129
this RPC may not yet be reflected as such in this RPC response.
130+
131+
## Limitations
132+
133+
There is a known issue in the JSON-RPC interface that can cause a node to crash if
134+
too many http connections are being opened at the same time because the system runs
135+
out of available file descriptors. To prevent this from happening you might
136+
want to increase the number of maximum allowed file descriptors in your system
137+
and try to prevent opening too many connections to your JSON-RPC interface at the
138+
same time if this is under your control. It is hard to give general advice
139+
since this depends on your system but if you make several hundred requests at
140+
once you are definitely at risk of encountering this issue.

doc/REST-interface.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,18 @@ REST Interface consistency guarantees
1212
The [same guarantees as for the RPC Interface](/doc/JSON-RPC-interface.md#rpc-consistency-guarantees)
1313
apply.
1414

15+
Limitations
16+
-----------
17+
18+
There is a known issue in the REST interface that can cause a node to crash if
19+
too many http connections are being opened at the same time because the system runs
20+
out of available file descriptors. To prevent this from happening you might
21+
want to increase the number of maximum allowed file descriptors in your system
22+
and try to prevent opening too many connections to your rest interface at the
23+
same time if this is under your control. It is hard to give general advice
24+
since this depends on your system but if you make several hundred requests at
25+
once you are definitely at risk of encountering this issue.
26+
1527
Supported API
1628
-------------
1729

doc/man/xep-cli.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
2-
.TH BITCOIN-CLI "1" "November 2020" "xep-cli v0.21.0.0" "User Commands"
2+
.TH BITCOIN-CLI "1" "January 2021" "xep-cli v0.21.0.0" "User Commands"
33
.SH NAME
44
xep-cli \- manual page for xep-cli v0.21.0.0
55
.SH SYNOPSIS

doc/man/xep-qt.1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13.
2-
.TH BITCOIN-QT "1" "November 2020" "xep-qt v0.21.0.0" "User Commands"
2+
.TH BITCOIN-QT "1" "January 2021" "xep-qt v0.21.0.0" "User Commands"
33
.SH NAME
44
xep-qt \- manual page for xep-qt v0.21.0.0
55
.SH SYNOPSIS
@@ -286,8 +286,9 @@ Relay non\-P2SH multisig (default: 1)
286286
.HP
287287
\fB\-port=\fR<port>
288288
.IP
289-
Listen for connections on <port> (default: 8333, testnet: 18333 signet:
290-
38333, regtest: 18444)
289+
Listen for connections on <port>. Nodes not using the default ports
290+
(default: 8333, testnet: 18333, signet: 38333, regtest: 18444)
291+
are unlikely to get incoming connections.
291292
.HP
292293
\fB\-proxy=\fR<ip:port>
293294
.IP

0 commit comments

Comments
 (0)