chore: unify and cleanup script types

examples/sandbox/index.ts

@@ -667,19 +667,19 @@ $getXpubs.each(function () {
         coin: "Bitcoin",
         addressNList: [2147483732, 2147483648, 2147483648],
         curve: "secp256k1",
-        scriptType: core.BTCInputScriptType.SpendWitness,
+        scriptType: core.BTCScriptType.SegwitNative,
       },
       {
         coin: "Bitcoin",
         addressNList: [2147483697, 2147483648, 2147483648],
         curve: "secp256k1",
-        scriptType: core.BTCInputScriptType.SpendP2SHWitness,
+        scriptType: core.BTCScriptType.Segwit,
       },
       {
         coin: "Bitcoin",
         addressNList: [2147483692, 2147483648, 2147483648],
         curve: "secp256k1",
-        scriptType: core.BTCInputScriptType.SpendAddress,
+        scriptType: core.BTCScriptType.Legacy,
       },
     ];
     const bchGetPublicKeysInput = [
@@ -688,7 +688,7 @@ $getXpubs.each(function () {
         curve: "secp256k1",
         showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "BitcoinCash",
-        scriptType: core.BTCInputScriptType.SpendAddress,
+        scriptType: core.BTCScriptType.Legacy,
       },
     ];
     const ltcGetPublicKeysInput = [
@@ -698,23 +698,23 @@ $getXpubs.each(function () {
         curve: "secp256k1",
         showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "Litecoin",
-        scriptType: core.BTCInputScriptType.SpendWitness,
+        scriptType: core.BTCScriptType.SegwitNative,
       },
       // SegwitP2sh
       {
         addressNList: [2147483697, 2147483650, 2147483648],
         curve: "secp256k1",
         showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "Litecoin",
-        scriptType: core.BTCInputScriptType.SpendP2SHWitness,
+        scriptType: core.BTCScriptType.Segwit,
       },
       // P2Pksh
       {
         addressNList: [2147483692, 2147483650, 2147483648],
         curve: "secp256k1",
         showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "Litecoin",
-        scriptType: core.BTCInputScriptType.SpendAddress,
+        scriptType: core.BTCScriptType.Legacy,
       },
     ];
     const dogeGetPublicKeysInput = [
@@ -723,7 +723,7 @@ $getXpubs.each(function () {
         curve: "secp256k1",
         showDisplay: true, // Not supported by TrezorConnect or Ledger, but KeepKey should do it
         coin: "Dogecoin",
-        scriptType: core.BTCInputScriptType.SpendAddress,
+        scriptType: core.BTCScriptType.Legacy,
       },
     ];
     const hardenedPathGetPublicKeysInput = [
@@ -1380,7 +1380,7 @@ $thorchainSignSwap.on("click", async (e) => {
         const inputs = [
           {
             addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 0, 0, 0],
-            scriptType: core.BTCInputScriptType.SpendAddress as const,
+            scriptType: core.BTCScriptType.Legacy as const,
             amount: String(10000),
             vout: 1,
             txid: txid,
@@ -1532,7 +1532,7 @@ $thorchainSignAddLiquidity.on("click", async (e) => {
         const inputs = [
           {
             addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 0, 0, 0],
-            scriptType: core.BTCInputScriptType.SpendAddress,
+            scriptType: core.BTCScriptType.Legacy,
             amount: String(10000),
             vout: 1,
             txid: txid,
@@ -2940,7 +2940,7 @@ $btcAddr.on("click", async (e) => {
     const res = await wallet.btcGetAddress({
       addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 0, 0, 0],
       coin: "Bitcoin",
-      scriptType: core.BTCInputScriptType.SpendAddress,
+      scriptType: core.BTCScriptType.Legacy,
       showDisplay: true,
     });
     $btcResults.val(res);
@@ -2965,7 +2965,7 @@ $btcTx.on("click", async (e) => {
     const inputs = [
       {
         addressNList: [0x80000000 + 44, 0x80000000 + 0, 0x80000000 + 0, 0, 0],
-        scriptType: core.BTCInputScriptType.SpendAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(10000),
         vout: 1,
         txid: txid,
@@ -2978,7 +2978,7 @@ $btcTx.on("click", async (e) => {
       {
         address: "1MJ2tj2ThBE62zXbBYA5ZaN3fdve5CPAz1",
         addressType: core.BTCOutputAddressType.Spend,
-        scriptType: core.BTCOutputScriptType.PayToAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(10000 - 1000),
         isChange: false,
       },
@@ -3009,7 +3009,7 @@ $btcSign.on("click", async (e) => {
     const res = await wallet.btcSignMessage({
       addressNList: core.bip32ToAddressNList("m/44'/0'/0'/0/0"),
       coin: "Bitcoin",
-      scriptType: core.BTCInputScriptType.SpendAddress,
+      scriptType: core.BTCScriptType.Legacy,
       message: "Hello World",
     });
     $btcResults.val(res.address + " " + res.signature);
@@ -3052,7 +3052,7 @@ const $ltcSign = $("#ltcSign");
 const $ltcResults = $("#ltcResults");
 
 const ltcBip44 = {
-  scriptType: core.BTCInputScriptType.SpendAddress,
+  scriptType: core.BTCScriptType.Legacy,
   addressNList: [0x80000000 + 44, 0x80000000 + 2, 0x80000000 + 0, 0, 0],
 };
 
@@ -3090,7 +3090,7 @@ $ltcTx.on("click", async (e) => {
     const inputs = [
       {
         addressNList: ltcBip44.addressNList,
-        scriptType: core.BTCInputScriptType.SpendAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(2160258),
         vout: 0,
         txid,
@@ -3104,7 +3104,7 @@ $ltcTx.on("click", async (e) => {
       {
         address: "LLe4PciAJgMMJSAtQQ5nkC13t6SSMmERJ3",
         addressType: core.BTCOutputAddressType.Spend,
-        scriptType: core.BTCOutputScriptType.PayToAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(261614),
         isChange: false,
       },
@@ -3134,7 +3134,7 @@ $ltcSign.on("click", async (e) => {
     const res = await wallet.btcSignMessage({
       addressNList: ltcBip44.addressNList,
       coin: "Litecoin",
-      scriptType: core.BTCInputScriptType.SpendAddress,
+      scriptType: core.BTCScriptType.Legacy,
       message: "Hello World",
     });
     $ltcResults.val(res.address + " " + res.signature);
@@ -3158,7 +3158,7 @@ const $dogeTx = $("#dogeTx");
 const $dogeResults = $("#dogeResults");
 
 const dogeBip44 = {
-  scriptType: core.BTCInputScriptType.SpendAddress,
+  scriptType: core.BTCScriptType.Legacy,
   addressNList: [0x80000000 + 44, 0x80000000 + 3, 0x80000000 + 0],
 };
 $dogeAddr.on("click", async (e) => {
@@ -3195,7 +3195,7 @@ $dogeTx.on("click", async (e) => {
     const inputs = [
       {
         addressNList: dogeBip44.addressNList.concat([0, 0]),
-        scriptType: core.BTCInputScriptType.SpendAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(35577380098),
         vout: 1,
         txid: txid,
@@ -3209,7 +3209,7 @@ $dogeTx.on("click", async (e) => {
       {
         address: "DMEHVGRsELY5zyYbfgta3pAhedKGeaDeJd",
         addressType: core.BTCOutputAddressType.Spend,
-        scriptType: core.BTCOutputScriptType.PayToAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(35577380098),
         isChange: false,
       },
@@ -3241,7 +3241,7 @@ const $bchTx = $("#bchTx");
 const $bchResults = $("#bchResults");
 
 const bchBip44 = {
-  scriptType: core.BTCInputScriptType.SpendAddress,
+  scriptType: core.BTCScriptType.Legacy,
   addressNList: [0x80000000 + 44, 0x80000000 + 145, 0x80000000 + 0],
 };
 
@@ -3279,7 +3279,7 @@ $bchTx.on("click", async (e) => {
     const inputs = [
       {
         addressNList: bchBip44.addressNList.concat([0, 0]),
-        scriptType: core.BTCInputScriptType.SpendAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(13813640),
         vout: 0,
         txid: txid,
@@ -3290,11 +3290,9 @@ $bchTx.on("click", async (e) => {
 
     const outputs = [
       {
-        address: (await wallet.btcSupportsScriptType("BitcoinCash", core.BTCInputScriptType.CashAddr))
-          ? "bitcoincash:qq5mg2xtp9y5pvvgy7m4k2af5a7s5suulueyywgvnf"
-          : "14oWXZFPhgP9DA3ggPzhHpUUaikDSjAuMC",
+        address: "bitcoincash:qq5mg2xtp9y5pvvgy7m4k2af5a7s5suulueyywgvnf",
         addressType: core.BTCOutputAddressType.Spend,
-        scriptType: core.BTCOutputScriptType.PayToAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(13813640),
         isChange: false,
       },
@@ -3326,7 +3324,7 @@ const $dashTx = $("#dashTx");
 const $dashResults = $("#dashResults");
 
 const dashBip44 = {
-  scriptType: core.BTCInputScriptType.SpendAddress,
+  scriptType: core.BTCScriptType.Legacy,
   addressNList: [0x80000000 + 44, 0x80000000 + 5, 0x80000000 + 0],
 };
 
@@ -3364,7 +3362,7 @@ $dashTx.on("click", async (e) => {
     const inputs = [
       {
         addressNList: dashBip44.addressNList.concat([0, 0]),
-        scriptType: core.BTCInputScriptType.SpendAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(4954359),
         vout: 0,
         txid: txid,
@@ -3378,7 +3376,7 @@ $dashTx.on("click", async (e) => {
       {
         address: "XexybzTUtH9V9eY4UJN2aCcBT3utan5C8N",
         addressType: core.BTCOutputAddressType.Spend,
-        scriptType: core.BTCOutputScriptType.PayToAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(4000000),
         isChange: false,
       },
@@ -3409,7 +3407,7 @@ const $dgbTx = $("#dgbTx");
 const $dgbResults = $("#dgbResults");
 
 const dgbBip44 = {
-  scriptType: core.BTCInputScriptType.SpendAddress,
+  scriptType: core.BTCScriptType.Legacy,
   addressNList: [0x80000000 + 44, 0x80000000 + 20, 0x80000000 + 0],
 };
 
@@ -3449,7 +3447,7 @@ $dgbTx.on("click", async (e) => {
     const inputs = [
       {
         addressNList: dgbBip44.addressNList.concat([0, 0]),
-        scriptType: core.BTCInputScriptType.SpendAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(480000000),
         vout: 15,
         txid: "be150359df4123b379f1f12de978bfced92644645da17b97c7613879f4306a90",
@@ -3458,7 +3456,7 @@ $dgbTx.on("click", async (e) => {
       },
       {
         addressNList: dgbBip44.addressNList.concat([0, 0]),
-        scriptType: core.BTCInputScriptType.SpendAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(10000000),
         vout: 0,
         txid: "528ec23eaf123282e9bce297ebb3edfb05e8b4d5875cbc9c271a98d72a202340",
@@ -3471,14 +3469,14 @@ $dgbTx.on("click", async (e) => {
       {
         address: "SWpe93hQL2pLUDLy7swsDPWQJGCHSsgmun",
         addressType: null,
-        scriptType: core.BTCOutputScriptType.PayToMultisig,
+        scriptType: core.BTCScriptType.LegacyMultisig,
         amount: String(400000000),
         isChange: false,
       },
       {
         address: "DNLcBry65dHehGExGYjBkM8kxDYr7mZ3BT",
         addressType: null,
-        scriptType: core.BTCOutputScriptType.PayToAddress,
+        scriptType: core.BTCScriptType.Legacy,
         relpath: "1/9",
         amount: String(90000000),
         isChange: true,
@@ -3527,7 +3525,7 @@ $btcAddrSegWit.on("click", async (e) => {
     const res = await wallet.btcGetAddress({
       addressNList: [0x80000000 + 49, 0x80000000 + 0, 0x80000000 + 0, 0, 0],
       coin: "Bitcoin",
-      scriptType: core.BTCInputScriptType.SpendP2SHWitness,
+      scriptType: core.BTCScriptType.Segwit,
       showDisplay: true,
     });
 
@@ -3550,7 +3548,7 @@ $btcAddrSegWitNative.on("click", async (e) => {
     const res = await wallet.btcGetAddress({
       addressNList: [0x80000000 + 84, 0x80000000 + 0, 0x80000000 + 0, 0, 0],
       coin: "Bitcoin",
-      scriptType: core.BTCInputScriptType.SpendWitness,
+      scriptType: core.BTCScriptType.SegwitNative,
       showDisplay: true,
     });
     $btcResultsSegWit.val(res);
@@ -3577,7 +3575,7 @@ $btcTxSegWit.on("click", async (e) => {
         amount: String(100000),
         vout: 0,
         txid: txid,
-        scriptType: core.BTCInputScriptType.SpendP2SHWitness,
+        scriptType: core.BTCScriptType.Segwit,
         tx: btcSegWitTxJson,
         hex,
       },
@@ -3587,7 +3585,7 @@ $btcTxSegWit.on("click", async (e) => {
       {
         address: "3Eq3agTHEhMCC8sZHnJJcCcZFB7BBSJKWr",
         addressType: core.BTCOutputAddressType.Spend,
-        scriptType: core.BTCOutputScriptType.PayToAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(89869),
         isChange: false,
       },
@@ -3629,7 +3627,7 @@ $btcTxSegWitNative.on("click", async (e) => {
         amount: String(9426),
         vout: 0,
         txid: txid,
-        scriptType: core.BTCInputScriptType.SpendWitness,
+        scriptType: core.BTCScriptType.SegwitNative,
         tx: btcBech32TxJson,
         hex,
       },
@@ -3639,7 +3637,7 @@ $btcTxSegWitNative.on("click", async (e) => {
       {
         address: "bc1qc5dgazasye0yrzdavnw6wau5up8td8gdqh7t6m",
         addressType: core.BTCOutputAddressType.Spend,
-        scriptType: core.BTCOutputScriptType.PayToAddress,
+        scriptType: core.BTCScriptType.Legacy,
         amount: String(1337),
         isChange: false,
       },