From eb5cc3398587702e5b4a4c70f0ac0334d6a6314a Mon Sep 17 00:00:00 2001 From: pankcuf Date: Tue, 26 Sep 2023 18:57:44 +0700 Subject: [PATCH 1/4] chore: bump up version 7.1.0 (+ set disconnect reason for DashSync's PeerManager) --- DashSyncCurrentCommit | 2 +- DashWallet.xcodeproj/project.pbxproj | 32 +++++++++---------- .../UI/Menu/Settings/About/DWAboutModel.m | 2 +- Podfile.lock | 26 +++++++-------- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/DashSyncCurrentCommit b/DashSyncCurrentCommit index de8178d51..6979d2ba7 100644 --- a/DashSyncCurrentCommit +++ b/DashSyncCurrentCommit @@ -1 +1 @@ -af75b12a4dd613335bbec63f7380c59bd257e41e +c553d04f5806c6c2cc600e03910378a87fcd9320 diff --git a/DashWallet.xcodeproj/project.pbxproj b/DashWallet.xcodeproj/project.pbxproj index c79684a3f..1db013bf3 100644 --- a/DashWallet.xcodeproj/project.pbxproj +++ b/DashWallet.xcodeproj/project.pbxproj @@ -7436,7 +7436,7 @@ INFOPLIST_KEY_CFBundleDisplayName = Dash; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -7492,7 +7492,7 @@ INFOPLIST_KEY_CFBundleDisplayName = Dash; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "DashWallet/dashwallet-Bridging-Header.h"; @@ -7577,7 +7577,7 @@ EXCLUDED_ARCHS = ""; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; @@ -7599,7 +7599,7 @@ EXCLUDED_ARCHS = ""; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; @@ -7620,7 +7620,7 @@ EXCLUDED_ARCHS = ""; INFOPLIST_FILE = "WatchApp Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -7643,7 +7643,7 @@ EXCLUDED_ARCHS = ""; INFOPLIST_FILE = "WatchApp Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -7671,7 +7671,7 @@ INFOPLIST_FILE = TodayExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.TodayExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -7696,7 +7696,7 @@ INFOPLIST_FILE = TodayExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.TodayExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -7811,7 +7811,7 @@ INFOPLIST_KEY_CFBundleDisplayName = Dash; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "DashWallet/dashwallet-Bridging-Header.h"; @@ -7839,7 +7839,7 @@ INFOPLIST_FILE = TodayExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.TodayExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -7891,7 +7891,7 @@ EXCLUDED_ARCHS = ""; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; @@ -7912,7 +7912,7 @@ EXCLUDED_ARCHS = ""; INFOPLIST_FILE = "WatchApp Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; @@ -8026,7 +8026,7 @@ INFOPLIST_KEY_CFBundleDisplayName = Dash; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "DashWallet/dashwallet-Bridging-Header.h"; @@ -8053,7 +8053,7 @@ INFOPLIST_FILE = TodayExtension/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.TodayExtension; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -8104,7 +8104,7 @@ EXCLUDED_ARCHS = ""; IBSC_MODULE = WatchApp_Extension; INFOPLIST_FILE = WatchApp/Info.plist; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = watchos; @@ -8125,7 +8125,7 @@ EXCLUDED_ARCHS = ""; INFOPLIST_FILE = "WatchApp Extension/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks"; - MARKETING_VERSION = 7.0.5; + MARKETING_VERSION = 7.1.0; PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension; PRODUCT_NAME = "${TARGET_NAME}"; SDKROOT = watchos; diff --git a/DashWallet/Sources/UI/Menu/Settings/About/DWAboutModel.m b/DashWallet/Sources/UI/Menu/Settings/About/DWAboutModel.m index 76583318c..6a0812dc7 100644 --- a/DashWallet/Sources/UI/Menu/Settings/About/DWAboutModel.m +++ b/DashWallet/Sources/UI/Menu/Settings/About/DWAboutModel.m @@ -203,7 +203,7 @@ - (void)setFixedPeer:(NSString *)fixedPeer { host = @(inet_ntop(AF_INET6, &addr, s, sizeof(s))); } [[DWEnvironment sharedInstance].currentChainManager.peerManager setTrustedPeerHost:[NSString stringWithFormat:@"%@:%d", host, port]]; - [[DWEnvironment sharedInstance].currentChainManager.peerManager disconnect]; + [[DWEnvironment sharedInstance].currentChainManager.peerManager disconnect:DSDisconnectReason_TrustedPeerSet]; [[DWEnvironment sharedInstance].currentChainManager.peerManager connect]; break; } diff --git a/Podfile.lock b/Podfile.lock index eaa1659b8..528278415 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -565,7 +565,7 @@ PODS: - abseil/base/base_internal - abseil/base/config - abseil/meta/type_traits - - Alamofire (5.7.1) + - Alamofire (5.8.0) - BlueCryptor (1.0.32) - BlueECC (1.2.5) - BlueRSA (1.0.200) @@ -591,11 +591,11 @@ PODS: - "!ProtoCompiler-gRPCPlugin (~> 1.0)" - DAPI-GRPC/Messages - gRPC-ProtoRPC - - DashSharedCore (0.4.10) + - DashSharedCore (0.4.11) - DashSync (0.1.0): - CocoaLumberjack (= 3.7.2) - DAPI-GRPC (= 0.22.0-dev.8) - - DashSharedCore (= 0.4.10) + - DashSharedCore (= 0.4.11) - DSDynamicOptions (= 0.1.2) - DWAlertController (= 0.2.1) - TinyCborObjc (= 0.4.6) @@ -620,13 +620,13 @@ PODS: - FirebaseStorage (8.15.0): - FirebaseCore (~> 8.0) - GTMSessionFetcher/Core (~> 1.5) - - GoogleDataTransport (9.2.3): + - GoogleDataTransport (9.2.5): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30910.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Environment (7.11.4): + - GoogleUtilities/Environment (7.11.5): - PromisesObjC (< 3.0, >= 1.2) - - GoogleUtilities/Logger (7.11.4): + - GoogleUtilities/Logger (7.11.5): - GoogleUtilities/Environment - gRPC-Core (1.49.0): - gRPC-Core/Implementation (= 1.49.0) @@ -707,7 +707,7 @@ PODS: - nanopb/decode (2.30908.0) - nanopb/encode (2.30908.0) - PromisesObjC (2.3.1) - - Protobuf (3.23.4) + - Protobuf (3.24.3) - SDWebImage (5.13.2): - SDWebImage/Core (= 5.13.2) - SDWebImage/Core (5.13.2) @@ -816,7 +816,7 @@ SPEC CHECKSUMS: "!ProtoCompiler": e9c09244955a8565817aa59a4787b6bb849a63c6 "!ProtoCompiler-gRPCPlugin": 755f0ee414a0d5f0028e0dcfe98c23bdbc3e6fa3 abseil: 926fb7a82dc6d2b8e1f2ed7f3a718bce691d1e46 - Alamofire: 0123a34370cb170936ae79a8df46cc62b2edeb88 + Alamofire: 0e92e751b3e9e66d7982db43919d01f313b8eb91 BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24 BlueECC: 0d18e93347d3ec6d41416de21c1ffa4d4cd3c2cc BlueRSA: dfeef51db96bcc4edec654956c1581adbda4e6a3 @@ -825,8 +825,8 @@ SPEC CHECKSUMS: CocoaImageHashing: 8656031d0899abe6c1c415827de43e9798189c53 CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da DAPI-GRPC: 138d62523bbfe7e88a39896f1053c0bc12390d9f - DashSharedCore: d107a64758acebc53edacc160ad450f539ff33ee - DashSync: 4a9504583105eb2ace98f38f377cb44fe62f5021 + DashSharedCore: d4dc11749f3555702dbe10c563087e6b48399394 + DashSync: 2d80784e399b869aede6d5bd476a149733451651 DSDynamicOptions: 347cc5d2c4e080eb3de6a86719ad3d861b82adfc DWAlertController: 5f4cd8adf90336331c054857f709f5f8d4b16a5b Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d @@ -834,8 +834,8 @@ SPEC CHECKSUMS: FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb FirebaseDynamicLinks: 1dc816ef789c5adac6fede0b46d11478175c70e4 FirebaseStorage: 8019af461599b2c3bc61c6a5dbdfa3d2de66a4d9 - GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd - GoogleUtilities: c63691989bf362ba0505507da00eeb326192e83e + GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2 + GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084 gRPC: 64f36d689b2ecd99c4351f74e6f91347cdc65d9f gRPC-Core: 3a9fdb5967d42211e875826f3f6fc163ea02c2a1 gRPC-ProtoRPC: 1c223e0f1732bb8d0b9e9e0ea60cc0fe995b8e2d @@ -850,7 +850,7 @@ SPEC CHECKSUMS: Moya: 138f0573e53411fb3dc17016add0b748dfbd78ee nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 - Protobuf: c6bc59bbab3d38a71c67f62d7cb7ca8f8ea4eca1 + Protobuf: 970f7ee93a3a08e3cf64859b8efd95ee32b4f87f SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866 SQLite.swift: 903bfa3bc9ab06345fdfbb578e34f47cfcf417da SQLiteMigrationManager.swift: 5383578f5bc8955c06695e8bf04835ee0e6673a8 From f2d9911686ddf559b443a1d73dd297fbf85f0837 Mon Sep 17 00:00:00 2001 From: Andrei Ashikhmin Date: Mon, 30 Oct 2023 17:37:31 +0700 Subject: [PATCH 2/4] fix: crowdnode apy --- DashSyncCurrentCommit | 2 +- Podfile.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/DashSyncCurrentCommit b/DashSyncCurrentCommit index 6979d2ba7..1d0026475 100644 --- a/DashSyncCurrentCommit +++ b/DashSyncCurrentCommit @@ -1 +1 @@ -c553d04f5806c6c2cc600e03910378a87fcd9320 +4a31f8faee244e0df1e776291d3b7388c2f8dc29 diff --git a/Podfile.lock b/Podfile.lock index 528278415..5b170b53b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -565,7 +565,7 @@ PODS: - abseil/base/base_internal - abseil/base/config - abseil/meta/type_traits - - Alamofire (5.8.0) + - Alamofire (5.8.1) - BlueCryptor (1.0.32) - BlueECC (1.2.5) - BlueRSA (1.0.200) @@ -591,11 +591,11 @@ PODS: - "!ProtoCompiler-gRPCPlugin (~> 1.0)" - DAPI-GRPC/Messages - gRPC-ProtoRPC - - DashSharedCore (0.4.11) + - DashSharedCore (0.4.12) - DashSync (0.1.0): - CocoaLumberjack (= 3.7.2) - DAPI-GRPC (= 0.22.0-dev.8) - - DashSharedCore (= 0.4.11) + - DashSharedCore (= 0.4.12) - DSDynamicOptions (= 0.1.2) - DWAlertController (= 0.2.1) - TinyCborObjc (= 0.4.6) @@ -707,7 +707,7 @@ PODS: - nanopb/decode (2.30908.0) - nanopb/encode (2.30908.0) - PromisesObjC (2.3.1) - - Protobuf (3.24.3) + - Protobuf (3.24.4) - SDWebImage (5.13.2): - SDWebImage/Core (= 5.13.2) - SDWebImage/Core (5.13.2) @@ -816,7 +816,7 @@ SPEC CHECKSUMS: "!ProtoCompiler": e9c09244955a8565817aa59a4787b6bb849a63c6 "!ProtoCompiler-gRPCPlugin": 755f0ee414a0d5f0028e0dcfe98c23bdbc3e6fa3 abseil: 926fb7a82dc6d2b8e1f2ed7f3a718bce691d1e46 - Alamofire: 0e92e751b3e9e66d7982db43919d01f313b8eb91 + Alamofire: 3ca42e259043ee0dc5c0cdd76c4bc568b8e42af7 BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24 BlueECC: 0d18e93347d3ec6d41416de21c1ffa4d4cd3c2cc BlueRSA: dfeef51db96bcc4edec654956c1581adbda4e6a3 @@ -825,8 +825,8 @@ SPEC CHECKSUMS: CocoaImageHashing: 8656031d0899abe6c1c415827de43e9798189c53 CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da DAPI-GRPC: 138d62523bbfe7e88a39896f1053c0bc12390d9f - DashSharedCore: d4dc11749f3555702dbe10c563087e6b48399394 - DashSync: 2d80784e399b869aede6d5bd476a149733451651 + DashSharedCore: 842f752df2a9cdb357b377c1a1abebdac5c0cefa + DashSync: 86a678ae3bc1600245ade93c22acd90377ffb3b6 DSDynamicOptions: 347cc5d2c4e080eb3de6a86719ad3d861b82adfc DWAlertController: 5f4cd8adf90336331c054857f709f5f8d4b16a5b Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d @@ -850,7 +850,7 @@ SPEC CHECKSUMS: Moya: 138f0573e53411fb3dc17016add0b748dfbd78ee nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96 PromisesObjC: c50d2056b5253dadbd6c2bea79b0674bd5a52fa4 - Protobuf: 970f7ee93a3a08e3cf64859b8efd95ee32b4f87f + Protobuf: 351e9022fe13a6e2af00e9aefc22077cb88520f8 SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866 SQLite.swift: 903bfa3bc9ab06345fdfbb578e34f47cfcf417da SQLiteMigrationManager.swift: 5383578f5bc8955c06695e8bf04835ee0e6673a8 From 9e33ed12b8f7fa24094a277d589edc33ccbff93b Mon Sep 17 00:00:00 2001 From: Andrei Ashikhmin Date: Tue, 31 Oct 2023 11:54:37 +0700 Subject: [PATCH 3/4] chore: change reward calculaion for v20 --- .../Sources/Categories/DSChain+DashWallet.m | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/DashWallet/Sources/Categories/DSChain+DashWallet.m b/DashWallet/Sources/Categories/DSChain+DashWallet.m index 1a624e167..1ebe65ebf 100644 --- a/DashWallet/Sources/Categories/DSChain+DashWallet.m +++ b/DashWallet/Sources/Categories/DSChain+DashWallet.m @@ -174,6 +174,14 @@ - (uint64_t)calculateMasternodePaymentWithHeight:(uint64_t)height blockReward:(u // Activated but we have to wait for the next cycle to start realocation, nothing to do return ret; } + + if (height >= [self v20BlockHeight]) { + // Once MNRewardReallocated activates, block reward is 80% of block subsidy (+ tx fees) since treasury is 20% + // Since the MN reward needs to be equal to 60% of the block subsidy (according to the proposal), MN reward is set to 75% of the block reward. + // Previous reallocation periods are dropped. + return blockReward * 3 / 4; + } + NSUInteger reallocCycle = superblockCycle * 3; NSUInteger nCurrentPeriod = MIN((height - reallocStart) / reallocCycle, periodsCount - 1); return (blockReward * periods[nCurrentPeriod]) / 1000; @@ -311,6 +319,17 @@ - (uint64_t)budgetPaymentsStartBlock { } } +- (uint64_t)v20BlockHeight { + switch (self.chainType.tag) { + case ChainType_MainNet: + return LLONG_MAX; + case ChainType_TestNet: + return 900700; + case ChainType_DevNet: + return LLONG_MAX; + } +} + @end From 3aab5b7ce6ed12b32f9df0a1ab1413aa2b977f15 Mon Sep 17 00:00:00 2001 From: Andrei Ashikhmin Date: Tue, 7 Nov 2023 17:05:42 +0700 Subject: [PATCH 4/4] fix: use binding for v20 activation height --- DashWallet/Sources/Categories/DSChain+DashWallet.m | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/DashWallet/Sources/Categories/DSChain+DashWallet.m b/DashWallet/Sources/Categories/DSChain+DashWallet.m index 1ebe65ebf..df937bee6 100644 --- a/DashWallet/Sources/Categories/DSChain+DashWallet.m +++ b/DashWallet/Sources/Categories/DSChain+DashWallet.m @@ -175,7 +175,7 @@ - (uint64_t)calculateMasternodePaymentWithHeight:(uint64_t)height blockReward:(u return ret; } - if (height >= [self v20BlockHeight]) { + if (height >= chain_core20_activation_height(self.chainType)) { // Once MNRewardReallocated activates, block reward is 80% of block subsidy (+ tx fees) since treasury is 20% // Since the MN reward needs to be equal to 60% of the block subsidy (according to the proposal), MN reward is set to 75% of the block reward. // Previous reallocation periods are dropped. @@ -319,18 +319,6 @@ - (uint64_t)budgetPaymentsStartBlock { } } -- (uint64_t)v20BlockHeight { - switch (self.chainType.tag) { - case ChainType_MainNet: - return LLONG_MAX; - case ChainType_TestNet: - return 900700; - case ChainType_DevNet: - return LLONG_MAX; - } -} - - @end NS_ASSUME_NONNULL_END