update

lib/subproviders/geth_api_double.js

@@ -565,6 +565,24 @@ GethApiDouble.prototype.evm_mine = function(timestamp, callback) {
 // indicate that `evm_mine` only requires one argument (the callback)
 GethApiDouble.prototype.evm_mine.minLength = 1;
 
+// Unlocks any account after server start
+GethApiDouble.prototype.evm_unlockUnknownAccount = function(address, callback) {
+  // Checks if given address is already unlocked
+  if (this.state.unlocked_accounts[address.toLowerCase()] !== true) {
+    if (this.state.personal_accounts[address.toLowerCase()] !== true) {
+      // Unlocks the account
+      this.state.unlocked_accounts[address.toLowerCase()] = true;
+      return callback(null, true);
+
+    } else {
+      // Callback if the account has been explicity locked
+      return callback(new Error("cannot unlock known/personal account"))
+    }
+  }
+  // If Account has been unlocked, this is the callback
+  callback(null, false);
+};
+
 GethApiDouble.prototype.debug_traceTransaction = function(txHash, params, callback) {
   if (typeof params === "function") {
     callback = params;
@@ -574,17 +592,6 @@ GethApiDouble.prototype.debug_traceTransaction = function(txHash, params, callba
   this.state.queueTransactionTrace(txHash, params, callback);
 };
 
-// Unlocks any account after server start
-GethApiDouble.prototype.debug_unlockAccount = function(address, callback) {
-  // Checks if given address is already unlocked
-  if (this.state.unlocked_accounts[address.toLowerCase()] !== true) {
-    // Unlocks it
-    this.state.unlocked_accounts[address.toLowerCase()] = true;
-    return callback(null, true);
-  }
-  // If Account exists, this is the callback
-  callback(null, "Account Already Unlocked");
-};
 
 /*
   RPC AUDIT:

test/forking/forking.js

@@ -347,11 +347,19 @@ describe("Forking", function() {
 
   it("should unlock any account after server has been started", async() => {
     const address = "0x742d35Cc6634C0532925a3b844Bc454e4438f44e";
-    forkedWeb3.currentProvider.send({"jsonrpc":"2.0","method":"debug_unlockAccount","params":[address],"id":42}, (err, res) => {
+    forkedWeb3.currentProvider.send({"jsonrpc":"2.0","method":"evm_unlockUnknownAccount","params":[address],"id":42}, (err, res) => {
       assert.strictEqual(res.result, true);
     });
-    forkedWeb3.currentProvider.send({"jsonrpc":"2.0","method":"debug_unlockAccount","params":[address],"id":42}, (err, res) => {
-      assert.strictEqual(res.result, "Account Already Unlocked");
+    forkedWeb3.currentProvider.send({"jsonrpc":"2.0","method":"evm_unlockUnknownAccount","params":[address],"id":42}, (err, res) => {
+      assert.strictEqual(res.result, false);
+    });
+  });
+
+  it("should not unlock any locked personal account", async() => {
+    const address = await mainWeb3.eth.getAccounts()[0];
+    await mainWeb3.eth.personal.lockAccount(address);
+    forkedWeb3.currentProvider.send({"jsonrpc":"2.0","method":"evm_unlockUnknownAccount","params":[address],"id":42}, (err, res) => {
+      assert.strictEqual(err, "cannot unlock known/personal account");
     });
   });