Use MTP for importmulti "now" timestamps

ryanofsky · ryanofsky · commit 266a8114cbe2 · 2017-02-10T15:40:28.000-05:00
diff --git a/qa/rpc-tests/importmulti.py b/qa/rpc-tests/importmulti.py
@@ -139,7 +139,7 @@ def run_test (self):
         # Address + Private key + !watchonly
         print("Should import an address with private key")
         address = self.nodes[0].validateaddress(self.nodes[0].getnewaddress())
-        timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['time']
+        timestamp = self.nodes[1].getblock(self.nodes[1].getbestblockhash())['mediantime']
         result = self.nodes[1].importmulti([{
             "scriptPubKey": {
                 "address": address['address']
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -1034,7 +1034,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)
     EnsureWalletIsUnlocked();
 
     // Verify all timestamps are present before importing any keys.
-    const int64_t now = chainActive.Tip() ? chainActive.Tip()->GetBlockTime() : 0;
+    const int64_t now = chainActive.Tip() ? chainActive.Tip()->GetMedianTimePast() : 0;
     for (const UniValue& data : requests.getValues()) {
         GetImportTimestamp(data, now);
     }

Original file line number	Diff line number	Diff line change
`@@ -1034,7 +1034,7 @@ UniValue importmulti(const JSONRPCRequest& mainRequest)`
`1034`	`1034`	`EnsureWalletIsUnlocked();`
`1035`	`1035`
`1036`	`1036`	`// Verify all timestamps are present before importing any keys.`
`1037`		`- const int64_t now = chainActive.Tip() ? chainActive.Tip()->GetBlockTime() : 0;`
	`1037`	`+ const int64_t now = chainActive.Tip() ? chainActive.Tip()->GetMedianTimePast() : 0;`
`1038`	`1038`	`for (const UniValue& data : requests.getValues()) {`
`1039`	`1039`	`GetImportTimestamp(data, now);`
`1040`	`1040`	`}`