Support default wallet access in multiwallet node

ruimarinho · Jul 21, 2022 · b6bbb75 · b6bbb75
1 parent ee4fef0
commit b6bbb75
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -29,6 +29,7 @@ services:
       -rest
       -rpcallowip=::/0
       -rpcpassword=bar
+      -wallet
       -wallet=wallet1
       -wallet=wallet2
       -rpcport=18443

diff --git a/src/index.js b/src/index.js
@@ -44,6 +44,7 @@ const promisify = fn => (...args) => new Promise((resolve, reject) => {
 class Client {
   constructor({
     agentOptions,
+    allowDefaultWallet = false,
     headers = false,
     host = 'localhost',
     logger = debugnyan('bitcoin-core'),
@@ -61,6 +62,7 @@ class Client {
     }
 
     this.agentOptions = agentOptions;
+    this.allowDefaultWallet = allowDefaultWallet;
     this.auth = (password || username) && { pass: password, user: username };
     this.hasNamedParametersSupport = false;
     this.headers = headers;
@@ -144,10 +146,18 @@ class Client {
       body = this.requester.prepare({ method: input, parameters });
     }
 
+    let uri = '/';
+
+    if (multiwallet && this.wallet) {
+      uri = `/wallet/${this.wallet}`;
+    } else if (multiwallet && !this.wallet && this.allowDefaultWallet) {
+      uri = '/wallet/';
+    }
+
     return this.parser.rpc(await this.request.postAsync({
       auth: _.pickBy(this.auth, _.identity),
       body: JSON.stringify(body),
-      uri: `${multiwallet && this.wallet ? `/wallet/${this.wallet}` : '/'}`
+      uri
     }));
   }
 

diff --git a/test/multi_wallet_test.js b/test/multi_wallet_test.js
@@ -7,6 +7,7 @@ import { defaults } from 'lodash';
 import Client from '../src/index';
 import RpcError from '../src/errors/rpc-error';
 import config from './config';
+import should from 'should';
 
 /**
  * Test instance.
@@ -50,7 +51,7 @@ describe('Multi Wallet', () => {
       it('should return a list of currently loaded wallets', async () => {
         const wallets = await client.listWallets();
 
-        wallets.should.eql(['wallet1', 'wallet2']);
+        wallets.should.eql(['', 'wallet1', 'wallet2']);
       });
     });
   });
@@ -230,17 +231,41 @@ describe('Multi Wallet', () => {
 
       const response = await client.command(batch);
 
-      response.should.eql([0, ['wallet1', 'wallet2'], ['wallet1', 'wallet2']]);
+      response.should.eql([0, ['', 'wallet1', 'wallet2'], ['', 'wallet1', 'wallet2']]);
     });
 
     it('should return an error if one of the request fails', async () => {
       const batch = [{ method: 'validateaddress' }, { method: 'listwallets' }];
 
       const [validateAddressError, listWallets] = await client.command(batch);
 
-      listWallets.should.eql(['wallet1', 'wallet2']);
+      listWallets.should.eql(['', 'wallet1', 'wallet2']);
       validateAddressError.should.be.an.instanceOf(RpcError);
       validateAddressError.code.should.equal(-1);
     });
   });
+
+  describe('default wallet', () => {
+    it('should return the balance for the default wallet with multiple wallets loaded if `allowDefaultWallet` is true', async () => {
+      const client = new Client(defaults({ allowDefaultWallet: true, version: '0.17.0' }, config.bitcoinMultiWallet));
+
+      const balance = await client.getBalance();
+
+      balance.should.be.aboveOrEqual(0);
+    });
+
+    it('should fail getting balance for default wallet with `allowDefaultWallet` as `false`', async () => {
+      const client = new Client(defaults({ version: '0.17.0' }, config.bitcoinMultiWallet));
+
+      try {
+        await client.getBalance();
+
+        should.fail();
+      } catch (error) {
+        error.should.be.an.instanceOf(RpcError);
+        error.code.should.be.equal(-19);
+        error.message.should.containEql('Wallet file not specified (must request wallet RPC through /wallet/<filename> uri-path).');
+      }
+    });
+  });
 });