Merge PR #885 from 'nodech/wallet-lockup'

handshake-org · Feb 28, 2024 · f749f5c · f749f5c
2 parents 5f94317 + 4fa9c79
commit f749f5c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/lib/wallet/node.js b/lib/wallet/node.js
@@ -52,7 +52,7 @@ class WalletNode extends Node {
       wipeNoReally: this.config.bool('wipe-no-really'),
       spv: this.config.bool('spv'),
       walletMigrate: this.config.uint('migrate'),
-      icannlockup: this.config.bool('icannlockup', false),
+      icannlockup: this.config.bool('icannlockup', true),
       migrateNoRescan: this.config.bool('migrate-no-rescan', false),
       preloadAll: this.config.bool('preload-all', false)
     });

diff --git a/lib/wallet/plugin.js b/lib/wallet/plugin.js
@@ -57,7 +57,7 @@ class Plugin extends EventEmitter {
       wipeNoReally: this.config.bool('wipe-no-really'),
       spv: node.spv,
       walletMigrate: this.config.uint('migrate'),
-      icannlockup: this.config.bool('icannlockup', false),
+      icannlockup: this.config.bool('icannlockup', true),
       migrateNoRescan: this.config.bool('migrate-no-rescan', false),
       preloadAll: this.config.bool('preload-all', false)
     });

diff --git a/lib/wallet/walletdb.js b/lib/wallet/walletdb.js
@@ -2578,7 +2578,7 @@ class WalletOptions {
     this.spv = false;
     this.wipeNoReally = false;
     this.walletMigrate = -1;
-    this.icannlockup = false;
+    this.icannlockup = true;
     this.migrateNoRescan = false;
     this.preloadAll = false;
 

diff --git a/test/chain-icann-lockup-test.js b/test/chain-icann-lockup-test.js
@@ -204,6 +204,8 @@ describe('BIP9 - ICANN lockup (integration)', function() {
       node = new FullNode({
         memory: true,
         network: network.type,
+        // We don't want wallet to check lockup names for this test.
+        walletIcannlockup: false,
         plugins: [require('../lib/wallet/plugin')]
       });
 
@@ -617,6 +619,8 @@ describe('BIP9 - ICANN lockup (integration)', function() {
       node = new FullNode({
         memory: true,
         network: network.type,
+        // We don't want wallet to check lockup names for this test.
+        walletIcannlockup: false,
         plugins: [require('../lib/wallet/plugin')]
       });