From c62f8d2a36458fe181d1812d41f76f0c79a3f9e0 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Mon, 13 Nov 2023 16:58:00 -0800 Subject: [PATCH 1/8] fix: add version to CoinbaseTx.toString Signed-off-by: HashEngineering --- core/src/main/java/org/bitcoinj/evolution/CoinbaseTx.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/evolution/CoinbaseTx.java b/core/src/main/java/org/bitcoinj/evolution/CoinbaseTx.java index 321b5899d..890e595dc 100644 --- a/core/src/main/java/org/bitcoinj/evolution/CoinbaseTx.java +++ b/core/src/main/java/org/bitcoinj/evolution/CoinbaseTx.java @@ -93,8 +93,8 @@ public int getCurrentVersion() { } public String toString() { - return String.format("CoinbaseTx(height=%d, merkleRootMNList=%s, merkleRootQuorums=%s)", - height, merkleRootMasternodeList.toString(), merkleRootQuorums); + return String.format("CoinbaseTx(v%d, height=%d, merkleRootMNList=%s, merkleRootQuorums=%s)", + version, height, merkleRootMasternodeList.toString(), merkleRootQuorums); } @Override From 97f7258036601076ad2c59ffb2146dd70bc71a34 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Mon, 13 Nov 2023 16:58:25 -0800 Subject: [PATCH 2/8] fix: add exception handling for bad JSON Signed-off-by: HashEngineering --- .../src/main/java/org/bitcoinj/examples/debug/Report.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/src/main/java/org/bitcoinj/examples/debug/Report.java b/examples/src/main/java/org/bitcoinj/examples/debug/Report.java index 00e039437..3066de8b8 100644 --- a/examples/src/main/java/org/bitcoinj/examples/debug/Report.java +++ b/examples/src/main/java/org/bitcoinj/examples/debug/Report.java @@ -1,6 +1,7 @@ package org.bitcoinj.examples.debug; import org.bitcoinj.core.NetworkParameters; +import org.json.JSONException; import org.json.JSONObject; import java.io.BufferedReader; @@ -48,6 +49,9 @@ JSONObject runRPCCommand(String command) { } catch (IOException e) { return null; + } catch (JSONException e) { + System.out.println("There is a problem parsing the output" + e); + return null; } catch (InterruptedException e) { throw new RuntimeException(e); } From 6334da35a8ce2c70f636faaece0ee22a4e763f3d Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Thu, 16 Nov 2023 17:15:15 -0800 Subject: [PATCH 3/8] fix: reset initial chain tip sync status when mnlist manager is closed Signed-off-by: HashEngineering --- .../bitcoinj/evolution/SimplifiedMasternodeListManager.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/src/main/java/org/bitcoinj/evolution/SimplifiedMasternodeListManager.java b/core/src/main/java/org/bitcoinj/evolution/SimplifiedMasternodeListManager.java index 1c259faff..f73954a37 100644 --- a/core/src/main/java/org/bitcoinj/evolution/SimplifiedMasternodeListManager.java +++ b/core/src/main/java/org/bitcoinj/evolution/SimplifiedMasternodeListManager.java @@ -407,8 +407,12 @@ public void setBlockChain(DualBlockChain blockChain, @Nullable PeerGroup peerGro @Override public void close() { if (shouldProcessMNListDiff()) { + // TODO: refactor the next several lines into AbstractQuorumState.close(...) quorumState.removeEventListeners(blockChain.getBlockChain(), peerGroup); quorumRotationState.removeEventListeners(blockChain.getBlockChain(), peerGroup); + // reset state of chain sync + quorumState.initChainTipSyncComplete = false; + quorumRotationState.initChainTipSyncComplete = false; try { threadPool.shutdown(); From c7d0d276256bfcb5a095eff5927f4e3a6253cbfc Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Wed, 22 Nov 2023 17:31:38 -0800 Subject: [PATCH 4/8] fix: update seed nodes for Mainnet and Testnet Signed-off-by: HashEngineering --- .../org/bitcoinj/params/MainNetParams.java | 100 +++++++++--------- .../org/bitcoinj/params/TestNet3Params.java | 14 ++- tools/src/main/python/nodes_main.txt | 98 +++++++++-------- tools/src/main/python/nodes_test.txt | 9 +- 4 files changed, 106 insertions(+), 115 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/params/MainNetParams.java b/core/src/main/java/org/bitcoinj/params/MainNetParams.java index a1866f10d..e90c43d57 100644 --- a/core/src/main/java/org/bitcoinj/params/MainNetParams.java +++ b/core/src/main/java/org/bitcoinj/params/MainNetParams.java @@ -109,32 +109,37 @@ public MainNetParams() { // If an Http Seeder is set up, add it here. References: HttpDiscovery httpSeeds = null; - // updated with Dash Core 19.2 seed list + // updated with Dash Core 20.0.0 seed list addrSeeds = new int[] { 0xddd53802, - 0x41e02303, + 0xa947d303, + 0xf22be403, + 0xbe430205, 0x22ed0905, + 0x13672305, + 0x19672305, 0x21484e05, + 0xf36d4f05, 0xe12c6505, 0x4f6ea105, 0x077ea105, - 0x38e1af05, 0x12cab505, - 0x6e3fbc05, 0x5091bd05, 0xc06aff05, + 0x788ceb0f, 0x09f48b12, 0x94819d12, - 0xa645cc12, 0x2af65117, 0x0a855317, 0xc4855317, 0xcb00a317, + 0x24610a1f, 0x6863941f, - 0x3204b21f, - 0x2e4de52b, + 0x15e36125, + 0xd663f02c, 0x91f8082d, 0x9afa082d, + 0x40b60b2d, 0x1818212d, 0xf93d212d, 0x40383a2d, @@ -144,40 +149,40 @@ public MainNetParams() { 0x6c9e472d, 0x689f472d, 0x5b534c2d, - 0xcfa94d2d, + 0x33574c2d, + 0x7a7a532d, 0x2d75552d, 0xca75552d, - 0x9aa2562d, 0x2aa3562d, - 0x90a3562d, 0xd95e5b2d, - 0xc9138c2d, 0x7fa2042e, 0xbff10a2e, - 0xbdbd1e2e, 0xd5bd1e2e, + 0xd6bd1e2e, + 0xfbbd1e2e, 0xf228242e, + 0x091f482e, 0x79e7942e, + 0x04f1fe2e, 0x06f1fe2e, - 0x18f1fe2e, + 0x16f1fe2e, 0x1cf1fe2e, 0xa66d6d2f, 0xc538f32f, - 0x5baf1132, 0xb70e7432, 0xce600f33, 0x2a750f33, - 0x5f1e5933, + 0x409b4433, 0xeda99e33, - 0x075bc333, + 0xac092134, 0x3c8dca34, 0x60b9a436, - 0x2bdada36, 0xa6e06e3a, 0x45f3f442, 0x46f3f442, 0xd76b3d45, 0x8307244b, + 0x8407244b, 0x8507244b, 0x0463df4d, 0x0013534e, @@ -186,12 +191,9 @@ public MainNetParams() { 0xc2b85a50, 0xaaead150, 0x8acfd350, + 0x8bddd350, 0xe784f050, 0x76f00251, - 0xe131b151, - 0x098eb151, - 0x64a6b151, - 0x8ea6b151, 0x33fae351, 0x53e6ca52, 0x1715d352, @@ -199,28 +201,34 @@ public MainNetParams() { 0x6919d352, 0xc119d352, 0x2863ef53, + 0x11320954, 0x34743454, 0xccb3f254, 0x5bf81155, - 0xb158c155, 0x23f1d155, 0x47f1d155, - 0xbaf1d155, + 0xbcf1d155, 0xbef1d155, + 0xca6bd755, 0x56fd6257, 0x712cf957, + 0xf3684959, + 0x1f0b895b, + 0xb94c155d, + 0x658cbe5d, 0x6ac0f95e, - 0x80c0f95e, - 0xb7c0f95e, 0x8d33b75f, + 0x6234b75f, 0x2c35b75f, - 0x08c4d35f, 0x20c4d35f, - 0x2ec4d35f, + 0x22c4d35f, 0xdb5fa067, 0xe15fa067, 0xf95fa067, + 0xe89fe168, + 0x5ed8e168, 0x7223ee68, + 0x7423ee68, 0x1609376a, 0x5a18a16b, 0x5f41eb6d, @@ -228,78 +236,68 @@ public MainNetParams() { 0xaa45eb6d, 0x8546eb6d, 0xa640c17b, + 0x9fb5c780, + 0xbae9a282, 0x40e51285, 0x081c448a, 0x22d2ee8c, - 0x6b355f8d, 0x5fcdca8e, 0xa67f5b90, 0xa78e7e90, - 0x421c8391, - 0x441c8391, - 0xd61d8391, - 0x602a8391, + 0xb014ef91, 0x06309e96, - 0xe4454398, + 0x8b487397, 0x4aa2659e, 0x1ca8659e, - 0x87ea16a5, 0x3e4f56a7, 0x045077a8, 0xf155eba8, - 0x315deba8, 0xbe68eba8, - 0x87aa4baa, 0x7a15f9ad, 0xcbe922ae, 0xcce922ae, 0xcee922ae, 0xcfe922ae, - 0xdc115eb0, 0x914166b0, - 0xc6397bb0, - 0xcb397bb0, - 0xcd397bb0, - 0xce397bb0, + 0x75eb3eb2, 0x81793fb2, - 0xccfe80b2, 0x7e5b9db2, 0xb05b9db2, 0xb35b9db2, + 0x0c029fb2, + 0xd557d0b2, + 0xe257d0b2, 0xaa973eb9, 0xae973eb9, 0x90d48eb9, 0x22639bb9, + 0x55a3a4b9, + 0xdaa3a4b9, 0x75aba5b9, 0x289eafb9, - 0xda39c6b9, + 0xc108c9b9, 0x2218d5b9, - 0x7153e4b9, 0x9c53e4b9, + 0xdb73f3b9, 0x5edf44bc, 0x28e67fbc, 0xf3ed7fbc, 0x844fe1bc, - 0xdba634c0, 0x8c5340c0, 0x5706a9c0, - 0x15391dc1, + 0x595ab8c0, 0x603b1dc1, - 0xe051edc1, 0x185287c2, 0xd25f62c3, - 0x11d2b5c3, 0x40d3b5c3, - 0x4cb57ac8, 0xcb1205ca, - 0x7840a7cf, 0x806e18d4, 0xd20034d4, - 0x263f81d4, 0xaef9a8d5, 0x3ed96bd8, 0x089abdd8, 0x3461fad8, + 0x133c12d9, 0xf00f45d9 }; diff --git a/core/src/main/java/org/bitcoinj/params/TestNet3Params.java b/core/src/main/java/org/bitcoinj/params/TestNet3Params.java index 3accdda69..102429bea 100644 --- a/core/src/main/java/org/bitcoinj/params/TestNet3Params.java +++ b/core/src/main/java/org/bitcoinj/params/TestNet3Params.java @@ -80,15 +80,13 @@ public TestNet3Params() { checkpoints.put(850100, Sha256Hash.wrap("000004728b8ff2a16b9d4eebb0fd61eeffadc9c7fe4b0ec0b5a739869401ab5b")); checkpoints.put(899760, Sha256Hash.wrap("000007b169cbf75796ee1147b24f6cdf627c189490d7472187408e0902413a68")); - // updated with Dash Core 0.17.0.3 seed list - addrSeeds = new int[]{ - 0x10a8302d, - 0x4faf4433, - 0x05dacd3c, - 0x939c6e8f, - 0xf9cb3eb2, - 0xf093bdce + // updated with Dash Core 20.0.0 seed list + addrSeeds = new int[] { + 0x2e4de52b, + 0xf7a74d2d, + 0xf9cb3eb2 }; + bip32HeaderP2PKHpub = 0x043587cf; bip32HeaderP2PKHpriv = 0x04358394; diff --git a/tools/src/main/python/nodes_main.txt b/tools/src/main/python/nodes_main.txt index f2bafe786..740779536 100644 --- a/tools/src/main/python/nodes_main.txt +++ b/tools/src/main/python/nodes_main.txt @@ -1,27 +1,32 @@ 2.56.213.221:9999 -3.35.224.65:9999 +3.211.71.169:9999 +3.228.43.242:9999 +5.2.67.190:9999 5.9.237.34:9999 +5.35.103.19:9999 +5.35.103.25:9999 5.78.72.33:9999 +5.79.109.243:9999 5.101.44.225:9999 5.161.110.79:9999 5.161.126.7:9999 -5.175.225.56:9999 5.181.202.18:9999 -5.188.63.110:9999 5.189.145.80:9999 5.255.106.192:9999 +15.235.140.120:9999 18.139.244.9:9999 18.157.129.148:9999 -18.204.69.166:9999 23.81.246.42:9999 23.83.133.10:9999 23.83.133.196:9999 23.163.0.203:9999 +31.10.97.36:9999 31.148.99.104:9999 -31.178.4.50:9999 -43.229.77.46:9999 +37.97.227.21:9999 +44.240.99.214:9999 45.8.248.145:9999 45.8.250.154:9999 +45.11.182.64:9999 45.33.24.24:9999 45.33.61.249:9999 45.58.56.64:9999 @@ -31,40 +36,40 @@ 45.71.158.108:9999 45.71.159.104:9999 45.76.83.91:9999 -45.77.169.207:9999 +45.76.87.51:9999 +45.83.122.122:9999 45.85.117.45:9999 45.85.117.202:9999 -45.86.162.154:9999 45.86.163.42:9999 -45.86.163.144:9999 45.91.94.217:9999 -45.140.19.201:9999 46.4.162.127:9999 46.10.241.191:9999 -46.30.189.189:9999 46.30.189.213:9999 +46.30.189.214:9999 +46.30.189.251:9999 46.36.40.242:9999 +46.72.31.9:9999 46.148.231.121:9999 +46.254.241.4:9999 46.254.241.6:9999 -46.254.241.24:9999 +46.254.241.22:9999 46.254.241.28:9999 47.109.109.166:9999 47.243.56.197:9999 -50.17.175.91:9999 50.116.14.183:9999 51.15.96.206:9999 51.15.117.42:9999 -51.89.30.95:9999 +51.68.155.64:9999 51.158.169.237:9999 -51.195.91.7:9999 +52.33.9.172:9999 52.202.141.60:9999 54.164.185.96:9999 -54.218.218.43:9999 58.110.224.166:9999 66.244.243.69:9999 66.244.243.70:9999 69.61.107.215:9999 75.36.7.131:9999 +75.36.7.132:9999 75.36.7.133:9999 77.223.99.4:9999 78.83.19.0:9999 @@ -73,12 +78,9 @@ 80.90.184.194:9999 80.209.234.170:9999 80.211.207.138:9999 +80.211.221.139:9999 80.240.132.231:9999 81.2.240.118:9999 -81.177.49.225:9999 -81.177.142.9:9999 -81.177.166.100:9999 -81.177.166.142:9999 81.227.250.51:9999 82.202.230.83:9999 82.211.21.23:9999 @@ -86,28 +88,34 @@ 82.211.25.105:9999 82.211.25.193:9999 83.239.99.40:9999 +84.9.50.17:9999 84.52.116.52:9999 84.242.179.204:9999 85.17.248.91:9999 -85.193.88.177:9999 85.209.241.35:9999 85.209.241.71:9999 -85.209.241.186:9999 +85.209.241.188:9999 85.209.241.190:9999 +85.215.107.202:9999 87.98.253.86:9999 87.249.44.113:9999 +89.73.104.243:9999 +91.137.11.31:9999 +93.21.76.185:9999 +93.190.140.101:9999 94.249.192.106:9999 -94.249.192.128:9999 -94.249.192.183:9999 95.183.51.141:9999 +95.183.52.98:9999 95.183.53.44:9999 -95.211.196.8:9999 95.211.196.32:9999 -95.211.196.46:9999 +95.211.196.34:9999 103.160.95.219:9999 103.160.95.225:9999 103.160.95.249:9999 +104.225.159.232:9999 +104.225.216.94:9999 104.238.35.114:9999 +104.238.35.116:9999 106.55.9.22:9999 107.161.24.90:9999 109.235.65.95:9999 @@ -115,76 +123,66 @@ 109.235.69.170:9999 109.235.70.133:9999 123.193.64.166:9999 +128.199.181.159:9999 +130.162.233.186:9999 133.18.229.64:9999 138.68.28.8:9999 140.238.210.34:9999 -141.95.53.107:9999 142.202.205.95:9999 144.91.127.166:9999 144.126.142.167:9999 -145.131.28.66:9999 -145.131.28.68:9999 -145.131.29.214:9999 -145.131.42.96:9999 +145.239.20.176:9999 150.158.48.6:9999 -152.67.69.228:9999 +151.115.72.139:9999 158.101.162.74:9999 158.101.168.28:9999 -165.22.234.135:9999 167.86.79.62:9999 168.119.80.4:9999 168.235.85.241:9999 -168.235.93.49:9999 168.235.104.190:9999 -170.75.170.135:9999 173.249.21.122:9999 174.34.233.203:9999 174.34.233.204:9999 174.34.233.206:9999 174.34.233.207:9999 -176.94.17.220:9999 176.102.65.145:9999 -176.123.57.198:9999 -176.123.57.203:9999 -176.123.57.205:9999 -176.123.57.206:9999 +178.62.235.117:9999 178.63.121.129:9999 -178.128.254.204:9999 178.157.91.126:9999 178.157.91.176:9999 178.157.91.179:9999 +178.159.2.12:9999 +178.208.87.213:9999 +178.208.87.226:9999 185.62.151.170:9999 185.62.151.174:9999 185.142.212.144:9999 185.155.99.34:9999 +185.164.163.85:9999 +185.164.163.218:9999 185.165.171.117:9999 185.175.158.40:9999 -185.198.57.218:9999 +185.201.8.193:9999 185.213.24.34:9999 -185.228.83.113:9999 185.228.83.156:9999 +185.243.115.219:9999 188.68.223.94:9999 188.127.230.40:9999 188.127.237.243:9999 188.225.79.132:9999 -192.52.166.219:9999 192.64.83.140:9999 192.169.6.87:9999 -193.29.57.21:9999 +192.184.90.89:9999 193.29.59.96:9999 -193.237.81.224:9999 194.135.82.24:9999 195.98.95.210:9999 -195.181.210.17:9999 195.181.211.64:9999 -200.122.181.76:9999 202.5.18.203:9999 -207.167.64.120:9999 212.24.110.128:9999 212.52.0.210:9999 -212.129.63.38:9999 213.168.249.174:9999 216.107.217.62:9999 216.189.154.8:9999 216.250.97.52:9999 +217.18.60.19:9999 217.69.15.240:9999 \ No newline at end of file diff --git a/tools/src/main/python/nodes_test.txt b/tools/src/main/python/nodes_test.txt index 87d323e92..4727001d2 100644 --- a/tools/src/main/python/nodes_test.txt +++ b/tools/src/main/python/nodes_test.txt @@ -1,6 +1,3 @@ -45.48.168.16:19999 -51.68.175.79:29999 -60.205.218.5:19999 -143.110.156.147:19999 -178.62.203.249:19999 -206.189.147.240:19999 +43.229.77.46:19999 +45.77.167.247:19999 +178.62.203.249:19999 \ No newline at end of file From 6b91b0566d73516a755ff4d7a3ed3bc404d6e978 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Wed, 22 Nov 2023 17:33:02 -0800 Subject: [PATCH 5/8] fix: update logs in SimplifiedQuorumList and DownloadProgressTracker for mnlistdiff Signed-off-by: HashEngineering --- .../org/bitcoinj/core/listeners/DownloadProgressTracker.java | 2 +- .../main/java/org/bitcoinj/quorums/SimplifiedQuorumList.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java b/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java index 2cc4bfa83..d65ef5f2a 100644 --- a/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java +++ b/core/src/main/java/org/bitcoinj/core/listeners/DownloadProgressTracker.java @@ -141,7 +141,7 @@ protected void progress(double pct, int blocksSoFar, Date date) { if (lastMasternodeListStage.ordinal() > Stage.BeforeStarting.ordinal() && lastMasternodeListStage.ordinal() < Stage.Complete.ordinal()) { - log.info(String.format(Locale.US, "Chain download %d%% done. Processing Masternode Lists...", (int) pct)); + log.info(String.format(Locale.US, "Chain download %d%% done while processing Masternode Lists: %s", (int) pct, lastMasternodeListStage)); } else if (!requiresHeaders || headersCaughtUp) { log.info(String.format(Locale.US, "Chain download %d%% done with %d blocks to go, block date %s", (int) pct, blocksSoFar, Utils.dateTimeFormat(date))); diff --git a/core/src/main/java/org/bitcoinj/quorums/SimplifiedQuorumList.java b/core/src/main/java/org/bitcoinj/quorums/SimplifiedQuorumList.java index 1962fb3d8..e787daaca 100644 --- a/core/src/main/java/org/bitcoinj/quorums/SimplifiedQuorumList.java +++ b/core/src/main/java/org/bitcoinj/quorums/SimplifiedQuorumList.java @@ -146,7 +146,6 @@ public SimplifiedQuorumList applyDiff(SimplifiedMasternodeListDiff diff, boolean Context.get().chainLockHandler.addCoinbaseChainLock(entry.quorumHash, 8, signature); // find a better way to do this - log.info("quorum {}:{} {}", entry.quorumHash, entry.quorumIndex, signature); if ((doDIP24 && entry.llmqType == params.getLlmqDIP0024InstantSend().value) || (!doDIP24 && entry.llmqType != params.getLlmqDIP0024InstantSend().value)) { // for now, don't use the return value verifyQuorum(isLoadingBootstrap, chain, validateOldQuorums, entry); From 5474225ac095a1e2e15e99e7378be9e9a4c1322d Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Mon, 4 Dec 2023 12:56:51 -0500 Subject: [PATCH 6/8] chore: update protobuf to 3.17.3 to support building on mac --- core/build.gradle | 2 +- .../org/bitcoin/crawler/PeerSeedProtos.java | 10 +-- .../org/bitcoin/paymentchannel/Protos.java | 24 +++--- .../bitcoin/protocols/payments/Protos.java | 32 ++++---- .../protocols/channels/ClientState.java | 14 ++-- .../protocols/channels/ServerState.java | 10 +-- .../main/java/org/bitcoinj/wallet/Protos.java | 74 +++++++++---------- 7 files changed, 83 insertions(+), 83 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 9c8ae5d5f..d9a969d2d 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -12,7 +12,7 @@ eclipse.project.name = 'dashj-core' dependencies { compile 'org.bouncycastle:bcprov-jdk15to18:1.68' implementation 'com.google.guava:guava:30.0-jre' - compile 'com.google.protobuf:protobuf-javalite:3.14.0' + compile 'com.google.protobuf:protobuf-javalite:3.17.3' implementation 'com.squareup.okhttp3:okhttp:3.12.8' implementation 'org.slf4j:slf4j-api:1.7.30' implementation 'net.jcip:jcip-annotations:1.0' diff --git a/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java b/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java index fb82be9b5..992d7c39f 100644 --- a/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java +++ b/core/src/main/java/org/bitcoin/crawler/PeerSeedProtos.java @@ -96,7 +96,7 @@ public java.lang.String getIpAddress() { */ private void setIpAddress( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; ipAddress_ = value; } @@ -733,7 +733,7 @@ public java.lang.String getNet() { */ private void setNet( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; net_ = value; } @@ -1215,7 +1215,7 @@ public com.google.protobuf.ByteString getPeerSeeds() { * @param value The peerSeeds to set. */ private void setPeerSeeds(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; peerSeeds_ = value; } @@ -1250,7 +1250,7 @@ public com.google.protobuf.ByteString getSignature() { * @param value The signature to set. */ private void setSignature(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; signature_ = value; } @@ -1285,7 +1285,7 @@ public com.google.protobuf.ByteString getPubkey() { * @param value The pubkey to set. */ private void setPubkey(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000004; pubkey_ = value; } diff --git a/core/src/main/java/org/bitcoin/paymentchannel/Protos.java b/core/src/main/java/org/bitcoin/paymentchannel/Protos.java index 883a153eb..2bcf98be3 100644 --- a/core/src/main/java/org/bitcoin/paymentchannel/Protos.java +++ b/core/src/main/java/org/bitcoin/paymentchannel/Protos.java @@ -1890,7 +1890,7 @@ public com.google.protobuf.ByteString getPreviousChannelContractHash() { * @param value The previousChannelContractHash to set. */ private void setPreviousChannelContractHash(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000004; previousChannelContractHash_ = value; } @@ -2876,7 +2876,7 @@ public com.google.protobuf.ByteString getMultisigKey() { * @param value The multisigKey to set. */ private void setMultisigKey(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; multisigKey_ = value; } @@ -3665,7 +3665,7 @@ public com.google.protobuf.ByteString getMultisigKey() { * @param value The multisigKey to set. */ private void setMultisigKey(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; multisigKey_ = value; } @@ -3738,7 +3738,7 @@ public com.google.protobuf.ByteString getTx() { * @param value The tx to set. */ private void setTx(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; tx_ = value; } @@ -4133,7 +4133,7 @@ public com.google.protobuf.ByteString getSignature() { * @param value The signature to set. */ private void setSignature(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; signature_ = value; } @@ -4541,7 +4541,7 @@ public com.google.protobuf.ByteString getTx() { * @param value The tx to set. */ private void setTx(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; tx_ = value; } @@ -4693,7 +4693,7 @@ public com.google.protobuf.ByteString getClientKey() { * @param value The clientKey to set. */ private void setClientKey(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000004; clientKey_ = value; } @@ -5336,7 +5336,7 @@ public com.google.protobuf.ByteString getSignature() { * @param value The signature to set. */ private void setSignature(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; signature_ = value; } @@ -5390,7 +5390,7 @@ public com.google.protobuf.ByteString getInfo() { * @param value The info to set. */ private void setInfo(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000004; info_ = value; } @@ -5843,7 +5843,7 @@ public com.google.protobuf.ByteString getInfo() { * @param value The info to set. */ private void setInfo(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; info_ = value; } @@ -6160,7 +6160,7 @@ public com.google.protobuf.ByteString getTx() { * @param value The tx to set. */ private void setTx(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; tx_ = value; } @@ -6767,7 +6767,7 @@ public java.lang.String getExplanation() { */ private void setExplanation( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; explanation_ = value; } diff --git a/core/src/main/java/org/bitcoin/protocols/payments/Protos.java b/core/src/main/java/org/bitcoin/protocols/payments/Protos.java index 5e8f12364..6e4d57fdc 100644 --- a/core/src/main/java/org/bitcoin/protocols/payments/Protos.java +++ b/core/src/main/java/org/bitcoin/protocols/payments/Protos.java @@ -151,7 +151,7 @@ public com.google.protobuf.ByteString getScript() { * @param value The script to set. */ private void setScript(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; script_ = value; } @@ -688,7 +688,7 @@ public java.lang.String getNetwork() { */ private void setNetwork( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; network_ = value; } @@ -1004,7 +1004,7 @@ public java.lang.String getMemo() { */ private void setMemo( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000008; memo_ = value; } @@ -1082,7 +1082,7 @@ public java.lang.String getPaymentUrl() { */ private void setPaymentUrl( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000010; paymentUrl_ = value; } @@ -1146,7 +1146,7 @@ public com.google.protobuf.ByteString getMerchantData() { * @param value The merchantData to set. */ private void setMerchantData(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000020; merchantData_ = value; } @@ -2092,7 +2092,7 @@ public java.lang.String getPkiType() { */ private void setPkiType( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; pkiType_ = value; } @@ -2156,7 +2156,7 @@ public com.google.protobuf.ByteString getPkiData() { * @param value The pkiData to set. */ private void setPkiData(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000004; pkiData_ = value; } @@ -2207,7 +2207,7 @@ public com.google.protobuf.ByteString getSerializedPaymentDetails() { * @param value The serializedPaymentDetails to set. */ private void setSerializedPaymentDetails(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000008; serializedPaymentDetails_ = value; } @@ -2258,7 +2258,7 @@ public com.google.protobuf.ByteString getSignature() { * @param value The signature to set. */ private void setSignature(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000010; signature_ = value; } @@ -2826,7 +2826,7 @@ private void ensureCertificateIsMutable() { */ private void setCertificate( int index, com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); ensureCertificateIsMutable(); certificate_.set(index, value); } @@ -2839,7 +2839,7 @@ private void setCertificate( * @param value The certificate to add. */ private void addCertificate(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); ensureCertificateIsMutable(); certificate_.add(value); } @@ -3291,7 +3291,7 @@ public com.google.protobuf.ByteString getMerchantData() { * @param value The merchantData to set. */ private void setMerchantData(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; merchantData_ = value; } @@ -3365,7 +3365,7 @@ private void ensureTransactionsIsMutable() { */ private void setTransactions( int index, com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); ensureTransactionsIsMutable(); transactions_.set(index, value); } @@ -3378,7 +3378,7 @@ private void setTransactions( * @param value The transactions to add. */ private void addTransactions(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); ensureTransactionsIsMutable(); transactions_.add(value); } @@ -3594,7 +3594,7 @@ public java.lang.String getMemo() { */ private void setMemo( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; memo_ = value; } @@ -4359,7 +4359,7 @@ public java.lang.String getMemo() { */ private void setMemo( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; memo_ = value; } diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java b/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java index 2506f4612..bd58ffeef 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/ClientState.java @@ -629,7 +629,7 @@ public com.google.protobuf.ByteString getId() { * @param value The id to set. */ private void setId(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; id_ = value; } @@ -664,7 +664,7 @@ public com.google.protobuf.ByteString getContractTransaction() { * @param value The contractTransaction to set. */ private void setContractTransaction(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; contractTransaction_ = value; } @@ -699,7 +699,7 @@ public com.google.protobuf.ByteString getRefundTransaction() { * @param value The refundTransaction to set. */ private void setRefundTransaction(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000004; refundTransaction_ = value; } @@ -734,7 +734,7 @@ public com.google.protobuf.ByteString getMyPublicKey() { * @param value The myPublicKey to set. */ private void setMyPublicKey(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000008; myPublicKey_ = value; } @@ -781,7 +781,7 @@ public com.google.protobuf.ByteString getMyKey() { * @param value The myKey to set. */ private void setMyKey(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000010; myKey_ = value; } @@ -922,7 +922,7 @@ public com.google.protobuf.ByteString getCloseTransactionHash() { * @param value The closeTransactionHash to set. */ private void setCloseTransactionHash(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000080; closeTransactionHash_ = value; } @@ -1059,7 +1059,7 @@ public com.google.protobuf.ByteString getServerKey() { * @param value The serverKey to set. */ private void setServerKey(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000400; serverKey_ = value; } diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java b/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java index 594d1ea22..7ce7e9186 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/ServerState.java @@ -591,7 +591,7 @@ public com.google.protobuf.ByteString getBestValueSignature() { * @param value The bestValueSignature to set. */ private void setBestValueSignature(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; bestValueSignature_ = value; } @@ -660,7 +660,7 @@ public com.google.protobuf.ByteString getContractTransaction() { * @param value The contractTransaction to set. */ private void setContractTransaction(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000008; contractTransaction_ = value; } @@ -695,7 +695,7 @@ public com.google.protobuf.ByteString getClientOutput() { * @param value The clientOutput to set. */ private void setClientOutput(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000010; clientOutput_ = value; } @@ -730,7 +730,7 @@ public com.google.protobuf.ByteString getMyKey() { * @param value The myKey to set. */ private void setMyKey(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000020; myKey_ = value; } @@ -811,7 +811,7 @@ public com.google.protobuf.ByteString getClientKey() { * @param value The clientKey to set. */ private void setClientKey(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000080; clientKey_ = value; } diff --git a/core/src/main/java/org/bitcoinj/wallet/Protos.java b/core/src/main/java/org/bitcoinj/wallet/Protos.java index 7eb1e6e78..d4c1e6d62 100644 --- a/core/src/main/java/org/bitcoinj/wallet/Protos.java +++ b/core/src/main/java/org/bitcoinj/wallet/Protos.java @@ -80,7 +80,7 @@ public com.google.protobuf.ByteString getIpAddress() { * @param value The ipAddress to set. */ private void setIpAddress(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; ipAddress_ = value; } @@ -533,7 +533,7 @@ public com.google.protobuf.ByteString getInitialisationVector() { * @param value The initialisationVector to set. */ private void setInitialisationVector(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; initialisationVector_ = value; } @@ -584,7 +584,7 @@ public com.google.protobuf.ByteString getEncryptedPrivateKey() { * @param value The encryptedPrivateKey to set. */ private void setEncryptedPrivateKey(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; encryptedPrivateKey_ = value; } @@ -1109,7 +1109,7 @@ public com.google.protobuf.ByteString getBi() { * @param value The bi to set. */ private void setBi(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000010; bi_ = value; } @@ -1691,7 +1691,7 @@ public com.google.protobuf.ByteString getChainCode() { * @param value The chainCode to set. */ private void setChainCode(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; chainCode_ = value; } @@ -3367,7 +3367,7 @@ public com.google.protobuf.ByteString getSecretBytes() { * @param value The secretBytes to set. */ private void setSecretBytes(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; secretBytes_ = value; } @@ -3488,7 +3488,7 @@ public com.google.protobuf.ByteString getPublicKey() { * @param value The publicKey to set. */ private void setPublicKey(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000008; publicKey_ = value; } @@ -3554,7 +3554,7 @@ public java.lang.String getLabel() { */ private void setLabel( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000010; label_ = value; } @@ -3721,7 +3721,7 @@ public com.google.protobuf.ByteString getDeterministicSeed() { * @param value The deterministicSeed to set. */ private void setDeterministicSeed(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000080; deterministicSeed_ = value; } @@ -5097,7 +5097,7 @@ public com.google.protobuf.ByteString getProgram() { * @param value The program to set. */ private void setProgram(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; program_ = value; } @@ -5576,7 +5576,7 @@ public com.google.protobuf.ByteString getTransactionOutPointHash() { * @param value The transactionOutPointHash to set. */ private void setTransactionOutPointHash(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; transactionOutPointHash_ = value; } @@ -5677,7 +5677,7 @@ public com.google.protobuf.ByteString getScriptBytes() { * @param value The scriptBytes to set. */ private void setScriptBytes(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000004; scriptBytes_ = value; } @@ -6384,7 +6384,7 @@ public com.google.protobuf.ByteString getScriptBytes() { * @param value The scriptBytes to set. */ private void setScriptBytes(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; scriptBytes_ = value; } @@ -6435,7 +6435,7 @@ public com.google.protobuf.ByteString getSpentByTransactionHash() { * @param value The spentByTransactionHash to set. */ private void setSpentByTransactionHash(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000004; spentByTransactionHash_ = value; } @@ -7158,7 +7158,7 @@ public java.lang.String getMessage() { */ private void setMessage( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; message_ = value; } @@ -7212,7 +7212,7 @@ public java.lang.String getReason() { */ private void setReason( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000004; reason_ = value; } @@ -7824,7 +7824,7 @@ public com.google.protobuf.ByteString getTxid() { * @param value The txid to set. */ private void setTxid(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; txid_ = value; } @@ -7859,7 +7859,7 @@ public com.google.protobuf.ByteString getSignature() { * @param value The signature to set. */ private void setSignature(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; signature_ = value; } @@ -8974,7 +8974,7 @@ public com.google.protobuf.ByteString getOverridingTransaction() { * @param value The overridingTransaction to set. */ private void setOverridingTransaction(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000004; overridingTransaction_ = value; } @@ -11116,7 +11116,7 @@ public com.google.protobuf.ByteString getHash() { * @param value The hash to set. */ private void setHash(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; hash_ = value; } @@ -11541,7 +11541,7 @@ private void ensureBlockHashIsMutable() { */ private void setBlockHash( int index, com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); ensureBlockHashIsMutable(); blockHash_.set(index, value); } @@ -11555,7 +11555,7 @@ private void setBlockHash( * @param value The blockHash to add. */ private void addBlockHash(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); ensureBlockHashIsMutable(); blockHash_.add(value); } @@ -11876,7 +11876,7 @@ public java.lang.String getMemo() { */ private void setMemo( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000100; memo_ = value; } @@ -11930,7 +11930,7 @@ public com.google.protobuf.ByteString getExtraPayload() { * @param value The extraPayload to set. */ private void setExtraPayload(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000200; extraPayload_ = value; } @@ -13206,7 +13206,7 @@ public com.google.protobuf.ByteString getSalt() { * @param value The salt to set. */ private void setSalt(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; salt_ = value; } @@ -13897,7 +13897,7 @@ public java.lang.String getId() { */ private void setId( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; id_ = value; } @@ -13949,7 +13949,7 @@ public com.google.protobuf.ByteString getData() { * @param value The data to set. */ private void setData(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; data_ = value; } @@ -14460,7 +14460,7 @@ public java.lang.String getTag() { */ private void setTag( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; tag_ = value; } @@ -14504,7 +14504,7 @@ public com.google.protobuf.ByteString getData() { * @param value The data to set. */ private void setData(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; data_ = value; } @@ -14909,7 +14909,7 @@ public java.lang.String getClassName() { */ private void setClassName( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; className_ = value; } @@ -14973,7 +14973,7 @@ public com.google.protobuf.ByteString getData() { * @param value The data to set. */ private void setData(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; data_ = value; } @@ -16361,7 +16361,7 @@ public com.google.protobuf.ByteString getKeyOrKeyId() { * @param value The keyOrKeyId to set. */ private void setKeyOrKeyId(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; keyOrKeyId_ = value; } @@ -16478,7 +16478,7 @@ public com.google.protobuf.ByteString getWhereUsed() { * @param value The whereUsed to set. */ private void setWhereUsed(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000008; whereUsed_ = value; } @@ -18177,7 +18177,7 @@ public java.lang.String getNetworkIdentifier() { */ private void setNetworkIdentifier( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000001; networkIdentifier_ = value; } @@ -18241,7 +18241,7 @@ public com.google.protobuf.ByteString getLastSeenBlockHash() { * @param value The lastSeenBlockHash to set. */ private void setLastSeenBlockHash(com.google.protobuf.ByteString value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000002; lastSeenBlockHash_ = value; } @@ -18905,7 +18905,7 @@ public java.lang.String getDescription() { */ private void setDescription( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000080; description_ = value; } @@ -21115,7 +21115,7 @@ public java.lang.String getFiatCurrencyCode() { */ private void setFiatCurrencyCode( java.lang.String value) { - value.getClass(); + java.lang.Class valueClass = value.getClass(); bitField0_ |= 0x00000004; fiatCurrencyCode_ = value; } From 96d94c5d5cb580532fcf1d91025e3e8f21003f20 Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Tue, 5 Dec 2023 09:53:42 -0500 Subject: [PATCH 7/8] fix: set minimum protocol to 70230 (v20 nodes) with mainnet v20 activation height --- core/src/main/java/org/bitcoinj/core/NetworkParameters.java | 2 +- core/src/main/java/org/bitcoinj/params/MainNetParams.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/bitcoinj/core/NetworkParameters.java b/core/src/main/java/org/bitcoinj/core/NetworkParameters.java index dc9d9260e..2d53c71ec 100644 --- a/core/src/main/java/org/bitcoinj/core/NetworkParameters.java +++ b/core/src/main/java/org/bitcoinj/core/NetworkParameters.java @@ -667,7 +667,7 @@ public EnumSet getTransactionVerificationFlags(final Block bl public abstract int getProtocolVersionNum(final ProtocolVersion version); public static enum ProtocolVersion { - MINIMUM(70228), + MINIMUM(70230), PONG(60001), BLOOM_FILTER(MINIMUM.getBitcoinProtocolVersion()), BLOOM_FILTER_BIP111(MINIMUM.getBitcoinProtocolVersion()+1), diff --git a/core/src/main/java/org/bitcoinj/params/MainNetParams.java b/core/src/main/java/org/bitcoinj/params/MainNetParams.java index e90c43d57..80a501512 100644 --- a/core/src/main/java/org/bitcoinj/params/MainNetParams.java +++ b/core/src/main/java/org/bitcoinj/params/MainNetParams.java @@ -331,6 +331,7 @@ public MainNetParams() { DIP0008BlockHeight = 1088640; DIP0024BlockHeight = 1737792 + 4 * 288; // DIP24 activation time + 4 cycles v19BlockHeight = 1899072; + v20BlockHeight = 1987776; // long living quorum params addLLMQ(LLMQParameters.LLMQType.LLMQ_50_60); From 50ea365db776a1936ca71a5d7942b37e87af25ed Mon Sep 17 00:00:00 2001 From: HashEngineering Date: Wed, 6 Dec 2023 16:14:02 -0500 Subject: [PATCH 8/8] chore: release 20.0.0 --- core/build.gradle | 4 ++-- core/src/main/java/org/bitcoinj/core/VersionMessage.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index d9a969d2d..5f3657f5b 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -5,7 +5,7 @@ apply plugin: 'maven-publish' apply plugin: 'jacoco' apply plugin: 'signing' -version = '20.0.0-SNAPSHOT' +version = '20.0.0' archivesBaseName = 'dashj-core' eclipse.project.name = 'dashj-core' @@ -40,7 +40,7 @@ javadoc.options.encoding = 'UTF-8' protobuf { protoc { - artifact = 'com.google.protobuf:protoc:3.14.0' + artifact = 'com.google.protobuf:protoc:3.17.3' } generateProtoTasks { all().each { task -> diff --git a/core/src/main/java/org/bitcoinj/core/VersionMessage.java b/core/src/main/java/org/bitcoinj/core/VersionMessage.java index 657ebb18e..ee3b6d527 100644 --- a/core/src/main/java/org/bitcoinj/core/VersionMessage.java +++ b/core/src/main/java/org/bitcoinj/core/VersionMessage.java @@ -44,7 +44,7 @@ public class VersionMessage extends Message { /** The version of this library release, as a string. */ - public static final String BITCOINJ_VERSION = "20.0.0-SNAPSHOT"; + public static final String BITCOINJ_VERSION = "20.0.0"; /** The value that is prepended to the subVer field of this application. */ public static final String LIBRARY_SUBVER = "/DashJ:" + BITCOINJ_VERSION + "/";