Merged
Conversation
kallewoof
approved these changes
Jan 13, 2021
Contributor
kallewoof
left a comment
kallewoof
left a comment
There was a problem hiding this comment.
tested ACK f30c348be188b32a32f758c7e01b3bb0010e3125
Running this code on my side as of a minute ago.
maflcko
reviewed
Jan 13, 2021
Member
|
The gitian builds are broken right now: |
Member
This will fix the reloc section issue (same as in #18702): diff --git a/src/bitcoin-util.cpp b/src/bitcoin-util.cpp
index b702a68bd..30b809871 100644
--- a/src/bitcoin-util.cpp
+++ b/src/bitcoin-util.cpp
@@ -181,7 +181,16 @@ static int CommandLineUtil(int argc, char* argv[])
return nRet;
}
+#ifdef WIN32
+// Export main() and ensure working ASLR on Windows.
+// Exporting a symbol will prevent the linker from stripping
+// the .reloc section from the binary, which is a requirement
+// for ASLR. This is a temporary workaround until a fixed
+// version of binutils is used for releases.
+__declspec(dllexport) int main(int argc, char* argv[])
+#else
int main(int argc, char* argv[])
+#endif
{
SetupEnvironment(); |
Contributor
Gitian builds
|
Contributor
Thanks to muxator, JeremyRubin, and gruve-p for spotting.
Thanks to muxator for spotting.
When mining the first block of a new signet chain, pick a timestamp for the first block so that after mining 100 blocks the timestamp will be back to the current time -- this prevents an unnecessary delay before any miner rewards have matured enough to be spent. This takes into account that the delta between blocks may be shorter than 10 minutes due to attempting to increase the difficulty to match --nbits, but does not take into account the time spent actually generating the 100 blocks.
ajtowns
force-pushed
the
202101-signet-tweak
branch
from
f30c348 to
b3c712c
Compare
Contributor
Author
|
Rebased on top of #20715 and updated to use GetCommand, also removed some commented-out debug code. |
Member
|
Forgot about this because it wasn't tagged 22.0 |
Member
|
Code review ACK b3c712c |
Contributor
|
Post-merge ACK |
gwillen
pushed a commit
to ElementsProject/elements
that referenced
this pull request
Jun 1, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Followups from #19937