Expose a transaction's weight via RPC

TheBlueMatt · TheBlueMatt · commit 2874709a9f23 · 2018-04-13T15:18:26.000-04:00
diff --git a/src/core_write.cpp b/src/core_write.cpp
@@ -161,6 +161,7 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry,
     entry.pushKV("version", tx.nVersion);
     entry.pushKV("size", (int)::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION));
     entry.pushKV("vsize", (GetTransactionWeight(tx) + WITNESS_SCALE_FACTOR - 1) / WITNESS_SCALE_FACTOR);
+    entry.pushKV("weight", GetTransactionWeight(tx));
     entry.pushKV("locktime", (int64_t)tx.nLockTime);
 
     UniValue vin(UniValue::VARR);
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
@@ -94,6 +94,7 @@ UniValue getrawtransaction(const JSONRPCRequest& request)
             "  \"hash\" : \"id\",        (string) The transaction hash (differs from txid for witness transactions)\n"
             "  \"size\" : n,             (numeric) The serialized transaction size\n"
             "  \"vsize\" : n,            (numeric) The virtual transaction size (differs from size for witness transactions)\n"
+            "  \"weight\" : n,           (numeric) The transaction's weight (between vsize*4-3 and vsize*4)\n"
             "  \"version\" : n,          (numeric) The version\n"
             "  \"locktime\" : ttt,       (numeric) The lock time\n"
             "  \"vin\" : [               (array of json objects)\n"
@@ -494,6 +495,7 @@ UniValue decoderawtransaction(const JSONRPCRequest& request)
             "  \"hash\" : \"id\",        (string) The transaction hash (differs from txid for witness transactions)\n"
             "  \"size\" : n,             (numeric) The transaction size\n"
             "  \"vsize\" : n,            (numeric) The virtual transaction size (differs from size for witness transactions)\n"
+            "  \"weight\" : n,           (numeric) The transaction's weight (between vsize*4 - 3 and vsize*4)\n"
             "  \"version\" : n,          (numeric) The version\n"
             "  \"locktime\" : ttt,       (numeric) The lock time\n"
             "  \"vin\" : [               (array of json objects)\n"
diff --git a/test/util/data/blanktxv1.json b/test/util/data/blanktxv1.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 10,
     "vsize": 10,
+    "weight": 40,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/blanktxv2.json b/test/util/data/blanktxv2.json
@@ -4,6 +4,7 @@
     "version": 2,
     "size": 10,
     "vsize": 10,
+    "weight": 40,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/tt-delin1-out.json b/test/util/data/tt-delin1-out.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 3040,
     "vsize": 3040,
+    "weight": 12160,
     "locktime": 0,
     "vin": [
         {
diff --git a/test/util/data/tt-delout1-out.json b/test/util/data/tt-delout1-out.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 3155,
     "vsize": 3155,
+    "weight": 12620,
     "locktime": 0,
     "vin": [
         {
diff --git a/test/util/data/tt-locktime317000-out.json b/test/util/data/tt-locktime317000-out.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 3189,
     "vsize": 3189,
+    "weight": 12756,
     "locktime": 317000,
     "vin": [
         {
diff --git a/test/util/data/txcreate1.json b/test/util/data/txcreate1.json
@@ -4,6 +4,7 @@
     "version": 2,
     "size": 201,
     "vsize": 201,
+    "weight": 804,
     "locktime": 0,
     "vin": [
         {
diff --git a/test/util/data/txcreate2.json b/test/util/data/txcreate2.json
@@ -4,6 +4,7 @@
     "version": 2,
     "size": 19,
     "vsize": 19,
+    "weight": 76,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreatedata1.json b/test/util/data/txcreatedata1.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 176,
     "vsize": 176,
+    "weight": 704,
     "locktime": 0,
     "vin": [
         {
diff --git a/test/util/data/txcreatedata2.json b/test/util/data/txcreatedata2.json
@@ -4,6 +4,7 @@
     "version": 2,
     "size": 176,
     "vsize": 176,
+    "weight": 704,
     "locktime": 0,
     "vin": [
         {
diff --git a/test/util/data/txcreatedata_seq0.json b/test/util/data/txcreatedata_seq0.json
@@ -4,6 +4,7 @@
     "version": 2,
     "size": 85,
     "vsize": 85,
+    "weight": 340,
     "locktime": 0,
     "vin": [
         {
diff --git a/test/util/data/txcreatedata_seq1.json b/test/util/data/txcreatedata_seq1.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 126,
     "vsize": 126,
+    "weight": 504,
     "locktime": 0,
     "vin": [
         {
diff --git a/test/util/data/txcreatemultisig1.json b/test/util/data/txcreatemultisig1.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 124,
     "vsize": 124,
+    "weight": 496,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreatemultisig2.json b/test/util/data/txcreatemultisig2.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 42,
     "vsize": 42,
+    "weight": 168,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreatemultisig3.json b/test/util/data/txcreatemultisig3.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 53,
     "vsize": 53,
+    "weight": 212,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreatemultisig4.json b/test/util/data/txcreatemultisig4.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 42,
     "vsize": 42,
+    "weight": 168,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreatemultisig5.json b/test/util/data/txcreatemultisig5.json
@@ -4,6 +4,7 @@
     "version": 2,
     "size": 42,
     "vsize": 42,
+    "weight": 168,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreateoutpubkey1.json b/test/util/data/txcreateoutpubkey1.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 54,
     "vsize": 54,
+    "weight": 216,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreateoutpubkey2.json b/test/util/data/txcreateoutpubkey2.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 41,
     "vsize": 41,
+    "weight": 164,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreateoutpubkey3.json b/test/util/data/txcreateoutpubkey3.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 42,
     "vsize": 42,
+    "weight": 168,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreatescript1.json b/test/util/data/txcreatescript1.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 20,
     "vsize": 20,
+    "weight": 80,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreatescript2.json b/test/util/data/txcreatescript2.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 42,
     "vsize": 42,
+    "weight": 168,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreatescript3.json b/test/util/data/txcreatescript3.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 53,
     "vsize": 53,
+    "weight": 212,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreatescript4.json b/test/util/data/txcreatescript4.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 42,
     "vsize": 42,
+    "weight": 168,
     "locktime": 0,
     "vin": [
     ],
diff --git a/test/util/data/txcreatesignv1.json b/test/util/data/txcreatesignv1.json
@@ -4,6 +4,7 @@
     "version": 1,
     "size": 224,
     "vsize": 224,
+    "weight": 896,
     "locktime": 0,
     "vin": [
         {

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"version": 1,`
`5`	`5`	`"size": 3040,`
`6`	`6`	`"vsize": 3040,`
	`7`	`+ "weight": 12160,`
`7`	`8`	`"locktime": 0,`
`8`	`9`	`"vin": [`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"version": 1,`
`5`	`5`	`"size": 3155,`
`6`	`6`	`"vsize": 3155,`
	`7`	`+ "weight": 12620,`
`7`	`8`	`"locktime": 0,`
`8`	`9`	`"vin": [`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"version": 1,`
`5`	`5`	`"size": 3189,`
`6`	`6`	`"vsize": 3189,`
	`7`	`+ "weight": 12756,`
`7`	`8`	`"locktime": 317000,`
`8`	`9`	`"vin": [`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"version": 2,`
`5`	`5`	`"size": 201,`
`6`	`6`	`"vsize": 201,`
	`7`	`+ "weight": 804,`
`7`	`8`	`"locktime": 0,`
`8`	`9`	`"vin": [`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"version": 1,`
`5`	`5`	`"size": 176,`
`6`	`6`	`"vsize": 176,`
	`7`	`+ "weight": 704,`
`7`	`8`	`"locktime": 0,`
`8`	`9`	`"vin": [`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"version": 2,`
`5`	`5`	`"size": 85,`
`6`	`6`	`"vsize": 85,`
	`7`	`+ "weight": 340,`
`7`	`8`	`"locktime": 0,`
`8`	`9`	`"vin": [`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"version": 1,`
`5`	`5`	`"size": 126,`
`6`	`6`	`"vsize": 126,`
	`7`	`+ "weight": 504,`
`7`	`8`	`"locktime": 0,`
`8`	`9`	`"vin": [`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`"version": 1,`
`5`	`5`	`"size": 224,`
`6`	`6`	`"vsize": 224,`
	`7`	`+ "weight": 896,`
`7`	`8`	`"locktime": 0,`
`8`	`9`	`"vin": [`
`9`	`10`	`{`