This repository was archived by the owner on Aug 30, 2024. It is now read-only.
forked from drivechain-project/diff-old
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathmainchainUI.diff
2306 lines (2286 loc) · 74.5 KB
/
mainchainUI.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
index 99c1242d8..861516971 100644
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@@ -129,6 +129,16 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ "logging", 1, "exclude" },
{ "disconnectnode", 1, "nodeid" },
{ "addwitnessaddress", 1, "p2sh" },
+ { "createcriticaldatatx", 0, "amount" },
+ { "createcriticaldatatx", 1, "height" },
+ { "createbmmcriticaldatatx", 0, "amount" },
+ { "createbmmcriticaldatatx", 1, "height" },
+ { "createbmmcriticaldatatx", 3, "nsidechain" },
+ { "createbmmcriticaldatatx", 4, "ndag" },
+ { "listsidechaindeposits", 0, "nsidechain" },
+ { "receivewtprime", 0, "nsidechain" },
+ { "receivewtprimeupdate", 0, "height" },
+ { "receivewtprimeupdate", 1, "update" },
// Echo with conversion (For testing only)
{ "echojson", 0, "arg0" },
{ "echojson", 1, "arg1" },
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
old mode 100644
new mode 100755
index e772f5653..9ed4a9267
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -6,20 +6,26 @@
#include <base58.h>
#include <chain.h>
#include <clientversion.h>
+#include <consensus/validation.h>
#include <core_io.h>
#include <crypto/ripemd160.h>
-#include <init.h>
-#include <validation.h>
#include <httpserver.h>
+#include <init.h>
+#include <merkleblock.h>
#include <net.h>
#include <netbase.h>
#include <rpc/blockchain.h>
#include <rpc/server.h>
#include <rpc/util.h>
+#include <sidechain.h>
+#include <sidechaindb.h>
#include <timedata.h>
#include <util.h>
+#include <utilmoneystr.h>
#include <utilstrencodings.h>
+#include <validation.h>
#ifdef ENABLE_WALLET
+#include <wallet/coincontrol.h>
#include <wallet/rpcwallet.h>
#include <wallet/wallet.h>
#include <wallet/walletdb.h>
@@ -600,6 +606,514 @@ UniValue logging(const JSONRPCRequest& request)
return result;
}
+UniValue createcriticaldatatx(const JSONRPCRequest& request)
+{
+ // TODO finish
+ //
+ if (request.fHelp || request.params.size() != 4)
+ throw std::runtime_error(
+ "createcriticaldatatx\n"
+ "Create a critical data transaction\n"
+ "\nArguments:\n"
+ "1. \"amount\" (numeric or string, required) The amount in " + CURRENCY_UNIT + " to be spent.\n"
+ "2. \"height\" (numeric, required) The block height this transaction must be included in.\n"
+ "3. \"criticalhash\" (string, required) h* you want added to a coinbase\n"
+ "\nExamples:\n"
+ + HelpExampleCli("createcriticaldatatx", "\"amount\", \"height\", \"criticalhash\"")
+ + HelpExampleRpc("createcriticaldatatx", "\"amount\", \"height\", \"criticalhash\"")
+ );
+
+ // Amount
+ CAmount nAmount = AmountFromValue(request.params[0]);
+ if (nAmount <= 0)
+ throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send");
+
+ int nHeight = request.params[1].get_int();
+
+ // Critical hash
+ uint256 hashCritical = uint256S(request.params[2].get_str());
+ if (hashCritical.IsNull())
+ throw JSONRPCError(RPC_TYPE_ERROR, "Invalid h*");
+
+#ifdef ENABLE_WALLET
+ // Create and send the transaction
+ std::string strError;
+ if (vpwallets.empty()){
+ strError = "Error: no wallets are available";
+ throw JSONRPCError(RPC_WALLET_ERROR, strError);
+ }
+ std::vector<CRecipient> vecSend;
+ CRecipient recipient = {CScript() << OP_0, nAmount, false};
+ vecSend.push_back(recipient);
+
+ LOCK2(cs_main, vpwallets[0]->cs_wallet);
+
+ CWalletTx wtx;
+ CReserveKey reservekey(vpwallets[0]);
+ CAmount nFeeRequired;
+ int nChangePosRet = -1;
+ //TODO: set this as a real thing
+ CCoinControl cc;
+ if (!vpwallets[0]->CreateTransaction(vecSend, wtx, reservekey, nFeeRequired, nChangePosRet, strError, cc)) {
+ if (nAmount + nFeeRequired > vpwallets[0]->GetBalance())
+ strError = strprintf("Error: This transaction requires a transaction fee of at least %s", FormatMoney(nFeeRequired));
+ throw JSONRPCError(RPC_WALLET_ERROR, strError);
+ }
+ CValidationState state;
+ if (!vpwallets[0]->CommitTransaction(wtx, reservekey, g_connman.get(), state)) {
+ strError = strprintf("Error: The transaction was rejected! Reason given: %s", state.GetRejectReason());
+ throw JSONRPCError(RPC_WALLET_ERROR, strError);
+ }
+#endif
+
+ UniValue ret(UniValue::VOBJ);
+#ifdef ENABLE_WALLET
+ ret.push_back(Pair("txid", wtx.GetHash().GetHex()));
+ ret.push_back(Pair("nChangePos", nChangePosRet));
+#endif
+
+ return ret;
+}
+
+UniValue createbmmcriticaldatatx(const JSONRPCRequest& request)
+{
+ // TODO handle optional height better
+ if (request.fHelp || request.params.size() != 5)
+ throw std::runtime_error(
+ "createbmmcriticaldatatx\n"
+ "Create a BMM request critical data transaction\n"
+ "\nArguments:\n"
+ "1. \"amount\" (numeric or string, required) The amount in " + CURRENCY_UNIT + " to be spent.\n"
+ "2. \"height\" (numeric, required) The block height this transaction must be included in.\n"
+ "Note: If 0 is passed in for height, current block height will be used"
+ "3. \"criticalhash\" (string, required) h* you want added to a coinbase\n"
+ "4. \"nsidechain\" (numeric, required) Sidechain requesting BMM\n"
+ "5. \"ndag\" (numeric, required) DAG number\n"
+ "\nExamples:\n"
+ + HelpExampleCli("createbmmcriticaldatatx", "\"amount\", \"height\", \"criticalhash\", \"nsidechain\", \"ndag\"")
+ + HelpExampleRpc("createbmmcriticaldatatx", "\"amount\", \"height\", \"criticalhash\", \"nsidechain\", \"ndag\"")
+ );
+
+ // Amount
+ CAmount nAmount = AmountFromValue(request.params[0]);
+ if (nAmount <= 0)
+ throw JSONRPCError(RPC_TYPE_ERROR, "Invalid amount for send");
+
+ // Height
+ int nHeight = request.params[1].get_int();
+ if (nHeight == 0) {
+ LOCK(cs_main);
+ nHeight = chainActive.Height();
+ }
+
+ // Critical hash
+ uint256 hashCritical = uint256S(request.params[2].get_str());
+ if (hashCritical.IsNull())
+ throw JSONRPCError(RPC_TYPE_ERROR, "Invalid h*");
+
+ // nSidechain
+ int nSidechain = request.params[3].get_int();
+
+ if (!IsSidechainNumberValid(nSidechain))
+ throw JSONRPCError(RPC_TYPE_ERROR, "Invalid Sidechain number");
+
+ // nDAG
+ int nDAG = request.params[4].get_int();
+
+ // Create critical data
+ CScript bytes;
+ bytes.resize(3);
+ bytes[0] = 0x00;
+ bytes[1] = 0xbf;
+ bytes[2] = 0x00;
+
+ bytes << CScriptNum::serialize(nSidechain);
+ bytes << CScriptNum::serialize(nDAG);
+
+ CCriticalData criticalData;
+ criticalData.bytes = std::vector<unsigned char>(bytes.begin(), bytes.end());
+ criticalData.hashCritical = hashCritical;
+
+ // Create transaction with critical data
+ CMutableTransaction mtx;
+ mtx.nVersion = 1;
+ mtx.vout.resize(1);
+ mtx.vout[0].scriptPubKey = CScript() << OP_TRUE;
+ mtx.vout[0].nValue = nAmount;
+
+ // Set lock time
+ mtx.nLockTime = nHeight;
+
+ // Add critical data
+ mtx.criticalData = criticalData;
+
+#ifdef ENABLE_WALLET
+ // Create and send the transaction
+ std::string strError;
+ if (vpwallets.empty()){
+ strError = "Error: no wallets are available";
+ throw JSONRPCError(RPC_WALLET_ERROR, strError);
+ }
+
+ CCoinControl coinControl;
+ int nChange = -1;
+ CAmount nFeeOut;
+ std::string strFail;
+ std::set<int> setSubtractFeeFromOutputs;
+ setSubtractFeeFromOutputs.insert(0);
+ if (!vpwallets[0]->FundTransaction(mtx, nFeeOut, nChange, strFail, false, setSubtractFeeFromOutputs, coinControl)) {
+ throw JSONRPCError(RPC_WALLET_ERROR, strFail);
+ }
+
+ if (!vpwallets[0]->SignTransaction(mtx)) {
+ throw JSONRPCError(RPC_WALLET_ERROR, "Failed to sign transaction!");
+ }
+
+ CWalletTx wtx;
+ wtx.fTimeReceivedIsTxTime = true;
+ wtx.fFromMe = true;
+ wtx.BindWallet(vpwallets[0]);
+
+ wtx.SetTx(MakeTransactionRef(std::move(mtx)));
+
+ CReserveKey reserveKey(vpwallets[0]);
+ CValidationState state;
+ if (!vpwallets[0]->CommitTransaction(wtx, reserveKey, g_connman.get(), state)) {
+ throw JSONRPCError(RPC_WALLET_ERROR, state.GetRejectReason());
+ }
+#endif
+
+ UniValue ret(UniValue::VOBJ);
+#ifdef ENABLE_WALLET
+ UniValue obj(UniValue::VOBJ);
+ obj.push_back(Pair("txid", wtx.GetHash().ToString()));
+ ret.push_back(Pair("txid", obj));
+#endif
+
+ return ret;
+}
+
+// TODO rename or change return value
+UniValue listsidechaindeposits(const JSONRPCRequest& request)
+{
+ if (request.fHelp || request.params.size() != 1)
+ throw std::runtime_error(
+ "listsidechaindeposits\n"
+ "Called by sidechain, return list of deposits\n"
+ "\nArguments:\n"
+ "1. \"nsidechain\" (numeric, required) The sidechain number\n"
+ "\nExamples:\n"
+ + HelpExampleCli("listsidechaindeposits", "\"nsidechain\"")
+ + HelpExampleRpc("listsidechaindeposits", "\"nsidechain\"")
+ );
+
+#ifdef ENABLE_WALLET
+ // Check for active wallet
+ std::string strError;
+ if (vpwallets.empty()) {
+ strError = "Error: no wallets are available";
+ throw JSONRPCError(RPC_WALLET_ERROR, strError);
+ }
+#endif
+
+ // Is nSidechain valid?
+ uint8_t nSidechain = std::stoi(request.params[0].getValStr());
+ if (!IsSidechainNumberValid(nSidechain))
+ throw std::runtime_error("Invalid sidechain number");
+
+#ifdef ENABLE_WALLET
+ // Get latest deposit from sidechain DB deposit cache
+ std::vector<SidechainDeposit> vDeposit = scdb.GetDeposits(nSidechain);
+ if (!vDeposit.size())
+ throw std::runtime_error("No deposits in cache");
+ const SidechainDeposit& deposit = vDeposit.back();
+
+ // Add deposit txid to set
+ uint256 txid = deposit.tx.GetHash();
+ std::set<uint256> setTxids;
+ setTxids.insert(txid);
+
+ LOCK(cs_main);
+
+ // Get deposit output
+ CBlockIndex* pblockindex = NULL;
+ Coin coin;
+ COutPoint c(txid, deposit.n);
+ if (pcoinsTip->GetCoin(c, coin) && coin.nHeight > 0 && coin.nHeight <= chainActive.Height())
+ pblockindex = chainActive[coin.nHeight];
+
+ if (pblockindex == NULL)
+ throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't get coins");
+
+ // Read block containing deposit output
+ CBlock block;
+ if(!ReadBlockFromDisk(block, pblockindex, Params().GetConsensus()))
+ throw JSONRPCError(RPC_INTERNAL_ERROR, "Can't read block from disk");
+
+ // Look for deposit transaction
+ bool found = false;
+ for (const auto& tx : block.vtx)
+ if (tx->GetHash() == txid)
+ found = true;
+ if (!found)
+ throw JSONRPCError(RPC_INTERNAL_ERROR, "transaction not found in specified block");
+
+ // Serialize and take hex of txout proof
+ CDataStream ssMB(SER_NETWORK, PROTOCOL_VERSION | SERIALIZE_TRANSACTION_NO_WITNESS);
+ CMerkleBlock mb(block, setTxids);
+ ssMB << mb;
+ std::string strProofHex = HexStr(ssMB.begin(), ssMB.end());
+
+ // Calculate user payout
+ CAmount amtSidechainUTXO = CAmount(0);
+ CAmount amtUserInput = CAmount(0);
+ CAmount amtReturning = CAmount(0);
+ CAmount amtWithdrawn = CAmount(0);
+ GetSidechainValues(deposit.tx, amtSidechainUTXO, amtUserInput, amtReturning, amtWithdrawn);
+
+ std::vector<COutput> vSidechainCoins;
+ vpwallets[0]->AvailableSidechainCoins(vSidechainCoins, nSidechain);
+
+ amtSidechainUTXO = 0;
+ for (const COutput& output : vSidechainCoins)
+ amtSidechainUTXO += output.tx->tx->vout[output.i].nValue;
+ CAmount amtUserPayout = amtReturning;
+
+#endif
+
+ UniValue ret(UniValue::VOBJ);
+
+#ifdef ENABLE_WALLET
+ UniValue obj(UniValue::VOBJ);
+ obj.push_back(Pair("nsidechain", deposit.nSidechain));
+ obj.push_back(Pair("keyid", deposit.keyID.ToString()));
+ obj.push_back(Pair("amountuserpayout", ValueFromAmount(amtUserPayout)));
+ obj.push_back(Pair("txhex", EncodeHexTx(deposit.tx)));
+ obj.push_back(Pair("proofhex", strProofHex));
+
+ ret.push_back(Pair("deposit", obj));
+#endif
+
+ return ret;
+}
+
+UniValue receivewtprime(const JSONRPCRequest& request)
+{
+ if (request.fHelp || request.params.size() != 2)
+ throw std::runtime_error(
+ "receivewtprime\n"
+ "Called by sidechain to announce new WT^ for verification\n"
+ "\nArguments:\n"
+ "1. \"nsidechain\" (int, required) The sidechain number\n"
+ "2. \"rawtx\" (string, required) The raw transaction hex\n"
+ "\nExamples:\n"
+ + HelpExampleCli("receivewtprime", "")
+ + HelpExampleRpc("receivewtprime", "")
+ );
+
+ // Is nSidechain valid?
+ int nSidechain = request.params[0].get_int();
+ if (!IsSidechainNumberValid(nSidechain))
+ throw std::runtime_error("Invalid sidechain number!");
+
+ // Create CTransaction from hex
+ CMutableTransaction mtx;
+ std::string hex = request.params[1].get_str();
+ if (!DecodeHexTx(mtx, hex))
+ throw std::runtime_error("Invalid transaction hex!");
+
+ CTransaction wtPrime(mtx);
+
+ if (wtPrime.IsNull())
+ throw std::runtime_error("Invalid WT^ hex");
+
+ // Add WT^ to sidechain DB and start verification
+ if (!scdb.AddWTPrime(nSidechain, wtPrime))
+ throw std::runtime_error("WT^ rejected (duplicate?)");
+
+ // Return WT^ hash to verify it has been received
+ UniValue ret(UniValue::VOBJ);
+ ret.push_back(Pair("wtxid", wtPrime.GetHash().GetHex()));
+ return ret;
+}
+
+UniValue receivewtprimeupdate(const JSONRPCRequest& request)
+{
+ if (request.fHelp || request.params.size() != 2)
+ throw std::runtime_error(
+ "receivewtprimeupdate\n"
+ "Receive an update for a WT^\n"
+ "\nArguments:\n"
+ "1. \"height\" (numeric, required) the block height\n"
+ "2. \"updates\" (array, required) A json array of json objects\n"
+ " [\n"
+ " {\n"
+ " \"sidechainnumber\":n, (numeric, required) The sidechain number\n"
+ " \"hashWTPrime\":id, (string, required) The WT^ hash\n"
+ " \"workscore\":n (numeric, required) The updated workscore\n"
+ " } \n"
+ " ,...\n"
+ " ]\n"
+ "\nExamples:\n"
+ + HelpExampleCli("receivewtprimeupdate", "")
+ + HelpExampleRpc("receivewtprimeupdate", "")
+ );
+
+ RPCTypeCheck(request.params, {UniValue::VNUM, UniValue::VARR}, true);
+ if (request.params[0].isNull() || request.params[1].isNull())
+ throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, arguments 1 and 2 must be non-null");
+
+ int nHeight = request.params[0].get_int();
+ SidechainUpdatePackage updatePackage;
+ updatePackage.nHeight = nHeight;
+
+ UniValue inputs = request.params[1].get_array();
+ for (unsigned int idx = 0; idx < inputs.size(); idx++) {
+ const UniValue& input = inputs[idx];
+ const UniValue& o = input.get_obj();
+
+ // Get sidechain number
+ const UniValue& sidechainnumber_v = find_value(o, "sidechainnumber");
+ if (!sidechainnumber_v.isNum())
+ throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing sidechain number");
+ uint8_t nSidechain = sidechainnumber_v.get_int();
+
+ // Is nSidechain valid?
+ if (!IsSidechainNumberValid(nSidechain))
+ throw std::runtime_error("Invalid sidechain number");
+
+ // Get WT^ hash
+ uint256 hashWTPrime = ParseHashO(o, "hashWTPrime");
+ if (hashWTPrime.IsNull())
+ throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing WT^ hash");
+
+ // Get updated work score
+ const UniValue& workscore_v = find_value(o, "workscore");
+ if (!workscore_v.isNum())
+ throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, missing updated workscore");
+ uint16_t nWorkScore = workscore_v.get_int();
+
+ // create MSG
+ SidechainUpdateMSG update;
+ update.nSidechain = nSidechain;
+ update.hashWTPrime = hashWTPrime;
+ update.nWorkScore = nWorkScore;
+
+ // add to package
+ updatePackage.vUpdate.push_back(update);
+ }
+
+ // Add created package to SCDB WT^ update cache
+ scdb.AddSidechainNetworkUpdatePackage(updatePackage);
+
+ return true;
+}
+
+UniValue getbmmproof(const JSONRPCRequest& request)
+{
+ if (request.fHelp || request.params.size() != 2)
+ throw std::runtime_error(
+ "getbmmproof\n"
+ "Called by sidechain\n"
+ "\nArguments:\n"
+ "1. \"blockhash\" (string, required) mainchain blockhash with h*\n"
+ "2. \"criticalhash\" (string, required) h* to create proof of\n"
+ "\nExamples:\n"
+ + HelpExampleCli("getbmmproof", "\"blockhash\", \"criticalhash\"")
+ + HelpExampleRpc("getbmmproof", "\"blockhash\", \"criticalhash\"")
+ );
+
+ uint256 hashBlock = uint256S(request.params[0].get_str());
+ uint256 hashCritical = uint256S(request.params[1].get_str());
+
+ if (!mapBlockIndex.count(hashBlock))
+ throw JSONRPCError(RPC_INTERNAL_ERROR, "Block not found");
+
+ CBlockIndex* pblockindex = mapBlockIndex[hashBlock];
+ if (pblockindex == NULL)
+ throw JSONRPCError(RPC_INTERNAL_ERROR, "pblockindex null");
+
+ CBlock block;
+ if(!ReadBlockFromDisk(block, pblockindex, Params().GetConsensus()))
+ throw JSONRPCError(RPC_INTERNAL_ERROR, "Failed to read block from disk");
+
+ if (!block.vtx.size())
+ throw JSONRPCError(RPC_INTERNAL_ERROR, "No txns in block");
+
+ bool fCriticalHashFound = false;
+ const CTransaction &txCoinbase = *(block.vtx[0]);
+ for (const CTxOut& out : txCoinbase.vout) {
+ const CScript& scriptPubKey = out.scriptPubKey;
+
+ if (scriptPubKey.size() < sizeof(uint256) + 6)
+ continue;
+ if (scriptPubKey[0] != OP_RETURN)
+ continue;
+
+ // Get h*
+ std::vector<unsigned char> vch (scriptPubKey.begin() + 6, scriptPubKey.begin() + 38);
+
+ // TODO return the bytes
+ // Get Bytes
+ if (scriptPubKey.size() > 38) {
+ std::vector<unsigned char> vchBytes(scriptPubKey.begin() + 38, scriptPubKey.end());
+ }
+
+ if (hashCritical == uint256(vch))
+ fCriticalHashFound = true;
+ }
+
+ if (!fCriticalHashFound)
+ throw JSONRPCError(RPC_INTERNAL_ERROR, "H* not found in block");
+
+ std::string strProof = "";
+ if (!GetTxOutProof(txCoinbase.GetHash(), hashBlock, strProof))
+ throw JSONRPCError(RPC_INTERNAL_ERROR, "Could not get txoutproof...");
+
+ std::string strCoinbaseHex = EncodeHexTx(txCoinbase);
+
+ UniValue ret(UniValue::VOBJ);
+ UniValue obj(UniValue::VOBJ);
+ obj.push_back(Pair("proof", strProof));
+ obj.push_back(Pair("coinbasehex", strCoinbaseHex));
+ ret.push_back(Pair("proof", obj));
+
+ return ret;
+}
+
+UniValue listpreviousblockhashes(const JSONRPCRequest& request)
+{
+ if (request.fHelp || request.params.size() != 0)
+ throw std::runtime_error(
+ "listpreviousblockhashes\n"
+ "Called by sidechain\n"
+ "\nArguments:\n"
+ "\nExamples:\n"
+ + HelpExampleCli("listpreviousblockhashes", "")
+ + HelpExampleRpc("listpreviousblockhashes", "")
+ );
+
+ int nHeight = chainActive.Height();
+ int nStart = nHeight - 4;
+ if (!(nHeight > 0) || !(nStart > 0))
+ throw JSONRPCError(RPC_INTERNAL_ERROR, "Insufficient blocks connected to complete request!");
+
+ std::vector<uint256> vHash;
+ for (int i = nStart; i <= nHeight; i++) {
+ uint256 hashBlock = chainActive[i]->GetBlockHash();
+ vHash.push_back(hashBlock);
+ }
+
+ UniValue ret(UniValue::VARR);
+ for (const uint256& hash : vHash) {
+ UniValue obj(UniValue::VOBJ);
+ obj.push_back(Pair("hash", hash.ToString()));
+ ret.push_back(obj);
+ }
+
+ return ret;
+}
+
UniValue echo(const JSONRPCRequest& request)
{
if (request.fHelp)
@@ -640,6 +1154,15 @@ static const CRPCCommand commands[] =
{ "hidden", "echo", &echo, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
{ "hidden", "echojson", &echo, {"arg0","arg1","arg2","arg3","arg4","arg5","arg6","arg7","arg8","arg9"}},
{ "hidden", "getinfo", &getinfo_deprecated, {}},
+
+ /* Used by sidechain (not shown in help) */
+ { "hidden", "createcriticaldatatx", &createcriticaldatatx, {"amount", "height", "criticalhash"}},
+ { "hidden", "createbmmcriticaldatatx", &createbmmcriticaldatatx, {"amount", "height", "criticalhash", "nsidechain", "ndag"}},
+ { "hidden", "listsidechaindeposits", &listsidechaindeposits, {"nsidechain"}},
+ { "hidden", "receivewtprime", &receivewtprime, {"nsidechain","rawtx"}},
+ { "hidden", "receivewtprimeupdate", &receivewtprimeupdate, {"height","update"}},
+ { "hidden", "getbmmproof", &getbmmproof, {"blockhash", "criticalhash"}},
+ { "hidden", "listpreviousblockhashes", &listpreviousblockhashes, {}},
};
void RegisterMiscRPCCommands(CRPCTable &t)
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
old mode 100644
new mode 100755
index 4e868b7c1..d1736dc8c
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -17,6 +17,7 @@
#include <qt/platformstyle.h>
#include <qt/rpcconsole.h>
#include <qt/utilitydialog.h>
+#include <qt/sidechaintabledialog.h>
#ifdef ENABLE_WALLET
#include <qt/walletframe.h>
@@ -109,6 +110,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
openRPCConsoleAction(0),
openAction(0),
showHelpMessageAction(0),
+ showSidechainTableDialogAction(0),
trayIcon(0),
trayIconMenu(0),
notificator(0),
@@ -158,6 +160,8 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
/** Create wallet frame and make it the central widget */
walletFrame = new WalletFrame(_platformStyle, this);
setCentralWidget(walletFrame);
+
+ sidechainTableDialog = new SidechainTableDialog(this);
} else
#endif // ENABLE_WALLET
{
@@ -377,6 +381,9 @@ void BitcoinGUI::createActions()
showHelpMessageAction->setMenuRole(QAction::NoRole);
showHelpMessageAction->setStatusTip(tr("Show the %1 help message to get a list with possible Bitcoin command-line options").arg(tr(PACKAGE_NAME)));
+ showSidechainTableDialogAction = new QAction(platformStyle->TextColorIcon(":/icons/history"), tr("&Sidechain Tables"), this);
+ showSidechainTableDialogAction->setStatusTip(tr("Show Sidechain tables"));
+
connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));
connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
@@ -398,6 +405,7 @@ void BitcoinGUI::createActions()
connect(usedSendingAddressesAction, SIGNAL(triggered()), walletFrame, SLOT(usedSendingAddresses()));
connect(usedReceivingAddressesAction, SIGNAL(triggered()), walletFrame, SLOT(usedReceivingAddresses()));
connect(openAction, SIGNAL(triggered()), this, SLOT(openClicked()));
+ connect(showSidechainTableDialogAction, SIGNAL(triggered()), this, SLOT(showSidechainTableDialog()));
}
#endif // ENABLE_WALLET
@@ -443,6 +451,7 @@ void BitcoinGUI::createMenuBar()
if(walletFrame)
{
help->addAction(openRPCConsoleAction);
+ help->addAction(showSidechainTableDialogAction);
}
help->addAction(showHelpMessageAction);
help->addSeparator();
@@ -498,13 +507,13 @@ void BitcoinGUI::setClientModel(ClientModel *_clientModel)
}
#endif // ENABLE_WALLET
unitDisplayControl->setOptionsModel(_clientModel->getOptionsModel());
-
+
OptionsModel* optionsModel = _clientModel->getOptionsModel();
if(optionsModel)
{
// be aware of the tray icon disable state change reported by the OptionsModel object.
connect(optionsModel,SIGNAL(hideTrayIconChanged(bool)),this,SLOT(setTrayIconVisible(bool)));
-
+
// initialize the disable state of the tray icon with the current value in the model.
setTrayIconVisible(optionsModel->getHideTrayIcon());
}
@@ -614,6 +623,7 @@ void BitcoinGUI::createTrayIconMenu()
trayIconMenu->addSeparator();
trayIconMenu->addAction(optionsAction);
trayIconMenu->addAction(openRPCConsoleAction);
+ trayIconMenu->addAction(showSidechainTableDialogAction);
#ifndef Q_OS_MAC // This is built-in on Mac
trayIconMenu->addSeparator();
trayIconMenu->addAction(quitAction);
@@ -670,6 +680,11 @@ void BitcoinGUI::showHelpMessageClicked()
}
#ifdef ENABLE_WALLET
+void BitcoinGUI::showSidechainTableDialog()
+{
+ sidechainTableDialog->exec();
+}
+
void BitcoinGUI::openClicked()
{
OpenURIDialog dlg(this);
@@ -1046,7 +1061,7 @@ void BitcoinGUI::setHDStatus(int hdEnabled)
labelWalletHDStatusIcon->setPixmap(platformStyle->SingleColorIcon(hdEnabled ? ":/icons/hd_enabled" : ":/icons/hd_disabled").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
labelWalletHDStatusIcon->setToolTip(hdEnabled ? tr("HD key generation is <b>enabled</b>") : tr("HD key generation is <b>disabled</b>"));
- // eventually disable the QLabel to set its opacity to 50%
+ // eventually disable the QLabel to set its opacity to 50%
labelWalletHDStatusIcon->setEnabled(hdEnabled);
}
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
old mode 100644
new mode 100755
index ddb7ecb76..9e8fd6e2a
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -25,6 +25,7 @@ class OptionsModel;
class PlatformStyle;
class RPCConsole;
class SendCoinsRecipient;
+class SidechainTableDialog;
class UnitDisplayStatusBarControl;
class WalletFrame;
class WalletModel;
@@ -111,6 +112,7 @@ private:
QAction *openRPCConsoleAction;
QAction *openAction;
QAction *showHelpMessageAction;
+ QAction *showSidechainTableDialogAction;
QSystemTrayIcon *trayIcon;
QMenu *trayIconMenu;
@@ -119,6 +121,11 @@ private:
HelpMessageDialog *helpMessageDialog;
ModalOverlay *modalOverlay;
+#ifdef ENABLE_WALLET
+ /** Sidechain table dialog (for testing) */
+ SidechainTableDialog *sidechainTableDialog;
+#endif
+
/** Keep track of previous number of blocks, to detect progress */
int prevBlocks;
int spinnerFrame;
@@ -207,6 +214,9 @@ private Q_SLOTS:
/** Show open dialog */
void openClicked();
+
+ /** Show sidechain table dialog */
+ void showSidechainTableDialog();
#endif // ENABLE_WALLET
/** Show configuration dialog */
void optionsClicked();
@@ -233,7 +243,7 @@ private Q_SLOTS:
/** Show progress dialog e.g. for verifychain */
void showProgress(const QString &title, int nProgress);
-
+
/** When hideTrayIcon setting is changed in OptionsModel hide or show the icon accordingly. */
void setTrayIconVisible(bool);
diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
old mode 100644
new mode 100755
index 195a5560f..fb937df68
--- a/src/qt/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>850</width>
- <height>526</height>
+ <width>1051</width>
+ <height>706</height>
</rect>
</property>
<property name="windowTitle">
@@ -587,8 +587,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>830</width>
- <height>104</height>
+ <width>1029</width>
+ <height>70</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1">
@@ -761,15 +761,15 @@
</item>
<item>
<widget class="QLabel" name="fallbackFeeWarningLabel">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
<property name="toolTip">
<string>Using the fallbackfee can result in sending a transaction that will take several hours or days (or never) to confirm. Consider choosing your fee manually or wait until you have validated the complete chain.</string>
</property>
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
<property name="text">
<string>Warning: Fee estimation is currently not possible.</string>
</property>
@@ -851,10 +851,23 @@
<string>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</string>
</property>
<property name="text">
- <string>per kilobyte</string>
+ <string>per &kilobyte</string>
</property>
</widget>
</item>
+ <item>
+ <widget class="QRadioButton" name="radioCustomAtLeast">
+ <property name="toolTip">
+ <string>If the custom fee is set to 1000 satoshis and the transaction is only 250 bytes, then "per kilobyte" only pays 250 satoshis in fee, while "total at least" pays 1000 satoshis. For transactions bigger than a kilobyte both pay by kilobyte.</string>
+ </property>
+ <property name="text">
+ <string>total at &least</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string notr="true">groupCustomFee</string>
+ </attribute>
+ </widget>
+ </item>
<item>
<widget class="BitcoinAmountField" name="customFee"/>
</item>
@@ -923,7 +936,7 @@
<item>
<widget class="QRadioButton" name="radioSmartFee">
<property name="text">
- <string>Recommended:</string>
+ <string>&Recommended:</string>
</property>
<property name="checked">
<bool>true</bool>
@@ -953,7 +966,7 @@
<item>
<widget class="QRadioButton" name="radioCustomFee">
<property name="text">
- <string>Custom:</string>
+ <string>C&ustom:</string>
</property>
<attribute name="buttonGroup">
<string notr="true">groupFee</string>
@@ -1113,6 +1126,9 @@
<property name="toolTip">
<string>With Replace-By-Fee (BIP-125) you can increase a transaction's fee after it is sent. Without this, a higher fee may be recommended to compensate for increased transaction delay risk.</string>
</property>
+ <property name="text">
+ <string>Request Replace-By-Fee</string>
+ </property>
</widget>
</item>
</layout>
@@ -1204,6 +1220,47 @@
</property>
</widget>
</item>
+ <item>
+ <spacer name="horizontalSpacer_8">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Maximum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="sidechainDepositButton">
+ <property name="text">
+ <string>Sidechain Deposit</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../bitcoin.qrc">
+ <normaloff>:/icons/tx_inout</normaloff>:/icons/tx_inout</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
@@ -1278,6 +1335,7 @@
</resources>
<connections/>
<buttongroups>
+ <buttongroup name="groupCustomFee"/>
<buttongroup name="groupFee"/>
</buttongroups>
</ui>
diff --git a/src/qt/forms/sidechaindepositdialog.ui b/src/qt/forms/sidechaindepositdialog.ui
new file mode 100755
index 000000000..11a15e9b5
--- /dev/null
+++ b/src/qt/forms/sidechaindepositdialog.ui
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SidechainDepositDialog</class>
+ <widget class="QDialog" name="SidechainDepositDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>594</width>
+ <height>149</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Sidechain Deposit</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="4" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayoutAmount" stretch="0">
+ <item>
+ <widget class="BitcoinAmountField" name="payAmount">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="5" column="0" colspan="3">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="3" column="0">
+ <layout class="QHBoxLayout" name="payToLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QValidatedLineEdit" name="payTo">
+ <property name="toolTip">
+ <string>The Bitcoin address to send the payment to</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="placeholderText">
+ <string>Sidechain address (deposit recipient)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButtonPaste">
+ <property name="text">
+ <string>Paste</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../bitcoin.qrc">
+ <normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButtonClear">
+ <property name="text">
+ <string>Clear</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../bitcoin.qrc">
+ <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Deposit to sidechain:</string>
+ </property>