Skip to content

Instantly share code, notes, and snippets.

--- qiosurfacegraphicsbuffer.h 2020-03-27 18:49:31.000000000 +0900
+++ qiosurfacegraphicsbuffer-new.h 2022-02-09 10:37:34.000000000 +0900
@@ -43,6 +43,8 @@
#include <qpa/qplatformgraphicsbuffer.h>
#include <private/qcore_mac_p.h>
+#include "/Library/Developer/CommandLineTools/SDKs/MacOSX11.sdk/System/Library/Frameworks/CoreGraphics.framework/Versions/A/Headers/CGColorSpace.h"
+
QT_BEGIN_NAMESPACE
from test_framework.daemon import Daemon
import sys
import datetime
import json
import requests
if __name__ == '__main__':
local_node = Daemon(port=sys.argv[1])
local_height = None
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index f8b548991..f55b20075 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -1596,6 +1596,8 @@ bool Blockchain::handle_alternative_block(const block& b, const crypto::hash& id
bei.cumulative_difficulty = m_db->get_block_cumulative_difficulty(m_db->get_block_height(b.prev_id));
}
bei.cumulative_difficulty += current_diff;
+ if (bei.height == 126600 && m_nettype == TESTNET)
+ bei.cumulative_difficulty = ((uint64_t)-1) - 5*240*3000000000;

Upstream 1 PR aeon#30 (merged on Aug 9):

  • Revert "Merge pull request #3775" /monero#3841 ...
  • device_ledger: fix bad memory access on connect error /monero#3977

Monero PRs after 3977 (merged on Jun 25) already included in aeon/#30:

  • 3997 (merged on Jul 3)
  • abstract_tcp_server2: restart async accept on error
gitianuser@stoffu-virtual-machine:~$ ./gitian-build.py --setup stoffu 0.13.0.4
HEAD is now at 963322d Merge #197: Do not overwrite var/install.log
I: Retrieving InRelease
I: Checking Release signature
I: Valid Release signature (key id 790BC7277767219C42C86F933B4FE6ACC0B21F32)
I: Retrieving Packages
I: Validating Packages
I: Retrieving Packages
I: Validating Packages
I: Resolving dependencies of required packages...
1005000 1538007624 2688742232
1005001 1538007681 2692552274
1005002 1538007967 2688887114
1005003 1538008565 2689848510
1005004 1538008628 2687615099
1005005 1538008676 2697814111
1005006 1538009460 2700914420
1005007 1538009462 2697775749
1005008 1538009514 2696450507
1005009 1538009643 2699535475
1005000 1538007624 2688742232
1005001 1538007681 2692552274
1005002 1538007967 2688887114
1005003 1538008565 2689848510
1005004 1538008628 2687615099
1005005 1538008676 2697814111
1005006 1538009460 2700914420
1005007 1538009462 2697775749
1005008 1538009514 2696450507
1005009 1538009643 2699535475
10000 afb0c3d1ba39c8eba13513e08b3fb77173953812d8860cae469179b84b4d2a7a
20000 d98bde7a92a7f703ccfab7750e5d2fdf31a490fb561b797a8842a75c2e212547
10000 04d23f0e903d32b94d43c508daad1c2c095986ac36b62bad5ff747237160c686
30000 cbe173369c3fef04e79c2a0acf3a5f739ff469da1bfc0607f0fbd9507d2faaba
20000 a0bd44b9fa7064cc82f7e46478505a8d0f9052fdc3d92f73cc7b077398388b9a
def get_num_bits(idx):
result = 0
while idx > 0:
if idx & 1:
result += 1
idx = idx >> 1
return result
def has_one_more_bit(idx, idx_more):
if get_num_bits(idx) + 1 != get_num_bits(idx_more):
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index fdeaab8bd..cd4ab0ae8 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -133,7 +133,8 @@ static const struct {
//------------------------------------------------------------------
Blockchain::Blockchain(tx_memory_pool& tx_pool) :
m_db(), m_tx_pool(tx_pool), m_hardfork(NULL), m_timestamps_and_difficulties_height(0), m_current_block_cumul_sz_limit(0), m_current_block_cumul_sz_median(0),
- m_enforce_dns_checkpoints(false), m_max_prepare_blocks_threads(4), m_db_blocks_per_sync(1), m_db_sync_mode(db_async), m_db_default_sync(false), m_fast_sync(true), m_show_time_stats(false), m_sync_counter(0), m_cancel(false)
+ m_enforce_dns_checkpoints(false), m_max_prepare_blocks_threads(4), m_db_blocks_per_sync(1), m_db_sync_mode(db_async), m_db_default_sync(false), m_fast_sync(true), m_show_time_stats(false), m_sync_counter(0), m_cancel(false),