WP-6380: resolve back-merge conflicts

Dockerfile

@@ -72,6 +72,7 @@ COPY --from=builder /tmp/bitgo/modules/sdk-coin-baby /var/modules/sdk-coin-baby/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-bera /var/modules/sdk-coin-bera/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-bld /var/modules/sdk-coin-bld/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-bsc /var/modules/sdk-coin-bsc/
+COPY --from=builder /tmp/bitgo/modules/sdk-coin-canton /var/modules/sdk-coin-canton/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-celo /var/modules/sdk-coin-celo/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-coredao /var/modules/sdk-coin-coredao/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-coreum /var/modules/sdk-coin-coreum/
@@ -123,7 +124,6 @@ COPY --from=builder /tmp/bitgo/modules/sdk-coin-bsv /var/modules/sdk-coin-bsv/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-btc /var/modules/sdk-coin-btc/
 COPY --from=builder /tmp/bitgo/modules/utxo-ord /var/modules/utxo-ord/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-btg /var/modules/sdk-coin-btg/
-COPY --from=builder /tmp/bitgo/modules/sdk-coin-canton /var/modules/sdk-coin-canton/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-dash /var/modules/sdk-coin-dash/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-doge /var/modules/sdk-coin-doge/
 COPY --from=builder /tmp/bitgo/modules/sdk-coin-eos /var/modules/sdk-coin-eos/
@@ -169,6 +169,7 @@ cd /var/modules/sdk-coin-baby && yarn link && \
 cd /var/modules/sdk-coin-bera && yarn link && \
 cd /var/modules/sdk-coin-bld && yarn link && \
 cd /var/modules/sdk-coin-bsc && yarn link && \
+cd /var/modules/sdk-coin-canton && yarn link && \
 cd /var/modules/sdk-coin-celo && yarn link && \
 cd /var/modules/sdk-coin-coredao && yarn link && \
 cd /var/modules/sdk-coin-coreum && yarn link && \
@@ -220,7 +221,6 @@ cd /var/modules/sdk-coin-bsv && yarn link && \
 cd /var/modules/sdk-coin-btc && yarn link && \
 cd /var/modules/utxo-ord && yarn link && \
 cd /var/modules/sdk-coin-btg && yarn link && \
-cd /var/modules/sdk-coin-canton && yarn link && \
 cd /var/modules/sdk-coin-dash && yarn link && \
 cd /var/modules/sdk-coin-doge && yarn link && \
 cd /var/modules/sdk-coin-eos && yarn link && \
@@ -269,6 +269,7 @@ RUN cd /var/bitgo-express && \
     yarn link @bitgo/sdk-coin-bera && \
     yarn link @bitgo/sdk-coin-bld && \
     yarn link @bitgo/sdk-coin-bsc && \
+    yarn link @bitgo/sdk-coin-canton && \
     yarn link @bitgo/sdk-coin-celo && \
     yarn link @bitgo/sdk-coin-coredao && \
     yarn link @bitgo/sdk-coin-coreum && \
@@ -320,7 +321,6 @@ RUN cd /var/bitgo-express && \
     yarn link @bitgo/sdk-coin-btc && \
     yarn link @bitgo/utxo-ord && \
     yarn link @bitgo/sdk-coin-btg && \
-    yarn link @bitgo/sdk-coin-canton && \
     yarn link @bitgo/sdk-coin-dash && \
     yarn link @bitgo/sdk-coin-doge && \
     yarn link @bitgo/sdk-coin-eos && \

modules/abstract-lightning/package.json

@@ -39,7 +39,7 @@
     ]
   },
   "dependencies": {
-    "@bitgo/public-types": "5.29.0",
+    "@bitgo/public-types": "5.31.0",
     "@bitgo/sdk-core": "^36.13.0",
     "@bitgo/statics": "^58.5.0",
     "@bitgo/utxo-lib": "^11.11.1",

modules/abstract-lightning/src/wallet/lightning.ts

@@ -165,7 +165,8 @@ export interface ILightningWallet {
    * On chain withdrawal
    * @param {LightningOnchainWithdrawParams} params - Withdraw parameters
    * @param {LightningOnchainRecipient[]} params.recipients - The recipients to pay
-   * @param {bigint} params.satsPerVbyte - Value for sats per virtual byte
+   * @param {bigint} [params.satsPerVbyte] - Optional value for sats per virtual byte. If not present, it will be estimated.
+   * @param {number} [params.numBlocks] - Target blocks for the transaction to be confirmed
    * @param {string} params.passphrase - The wallet passphrase
    * @param {string} [params.sequenceId] - Optional sequence ID for the respective withdraw transfer
    * @param {string} [params.comment] - Optional comment for the respective withdraw transfer
@@ -337,6 +338,7 @@ export class LightningWallet implements ILightningWallet {
         onchainRequest: {
           recipients: params.recipients,
           satsPerVbyte: params.satsPerVbyte,
+          numBlocks: params.numBlocks,
         },
         intentType: 'payment',
       },

modules/abstract-utxo/package.json

@@ -42,6 +42,7 @@
     ]
   },
   "dependencies": {
+    "@bitgo/secp256k1": "^1.5.0",
     "@bitgo/blockapis": "^1.12.1",
     "@bitgo/sdk-api": "^1.70.2",
     "@bitgo/sdk-core": "^36.13.0",

modules/abstract-utxo/src/abstractUtxoCoin.ts

@@ -3,7 +3,8 @@ import { randomBytes } from 'crypto';
 
 import _ from 'lodash';
 import * as utxolib from '@bitgo/utxo-lib';
-import { bip32, bitgo, getMainnet, isMainnet, isTestnet } from '@bitgo/utxo-lib';
+import { bip32 } from '@bitgo/secp256k1';
+import { bitgo, getMainnet, isMainnet, isTestnet } from '@bitgo/utxo-lib';
 import {
   AddressCoinSpecific,
   AddressTypeChainMismatchError,
@@ -46,7 +47,6 @@ import {
   Wallet,
   isValidPrv,
   isValidXprv,
-  bitcoin,
 } from '@bitgo/sdk-core';
 
 import {
@@ -1160,7 +1160,7 @@ export abstract class AbstractUtxoCoin extends BaseCoin {
       throw new Error('invalid private key');
     }
     if (publicKey) {
-      const genPubKey = bitcoin.HDNode.fromBase58(prv).neutered().toBase58();
+      const genPubKey = bip32.fromBase58(prv).neutered().toBase58();
       if (genPubKey !== publicKey) {
         throw new Error('public key does not match private key');
       }

modules/abstract-utxo/src/descriptor/builder/parse.ts

@@ -1,5 +1,4 @@
-import { BIP32Interface } from '@bitgo/utxo-lib';
-import * as utxolib from '@bitgo/utxo-lib';
+import { BIP32Interface, bip32 } from '@bitgo/secp256k1';
 import { Descriptor } from '@bitgo/wasm-miniscript';
 
 import { DescriptorBuilder, getDescriptorFromBuilder } from './builder';
@@ -55,7 +54,7 @@ function parseMulti(node: unknown): {
   });
   return {
     threshold,
-    keys: keyWithPath.map((k) => utxolib.bip32.fromBase58(k.xpub)),
+    keys: keyWithPath.map((k) => bip32.fromBase58(k.xpub)),
     path: paths[0],
   };
 }

modules/abstract-utxo/src/descriptor/createWallet/createDescriptorWallet.ts

@@ -1,5 +1,5 @@
 import { BitGoAPI } from '@bitgo/sdk-api';
-import * as utxolib from '@bitgo/utxo-lib';
+import { bip32 } from '@bitgo/secp256k1';
 import { Wallet } from '@bitgo/sdk-core';
 
 import { AbstractUtxoCoin } from '../../abstractUtxoCoin';
@@ -56,12 +56,12 @@ export async function createDescriptorWalletWithWalletPassphrase(
   if (!userKeychain.prv) {
     throw new Error('Missing private key');
   }
-  const userKey = utxolib.bip32.fromBase58(userKeychain.prv);
+  const userKey = bip32.fromBase58(userKeychain.prv);
   const cosigners = [backupKeychain, bitgoKeychain].map((keychain) => {
     if (!keychain.pub) {
       throw new Error('Missing public key');
     }
-    return utxolib.bip32.fromBase58(keychain.pub);
+    return bip32.fromBase58(keychain.pub);
   });
   return createDescriptorWallet(bitgo, coin, {
     ...params,

modules/abstract-utxo/src/keychains.ts

@@ -1,7 +1,7 @@
 import assert from 'assert';
 
 import * as t from 'io-ts';
-import * as utxolib from '@bitgo/utxo-lib';
+import { BIP32Interface, bip32 } from '@bitgo/secp256k1';
 import { IRequestTracer, IWallet, KeyIndices, promiseProps, Triple } from '@bitgo/sdk-core';
 
 import { AbstractUtxoCoin } from './abstractUtxoCoin';
@@ -48,12 +48,12 @@ export function toKeychainTriple(keychains: UtxoNamedKeychains): Triple<UtxoKeyc
 
 export function toBip32Triple(
   keychains: UtxoNamedKeychains | Triple<{ pub: string }> | Triple<string>
-): Triple<utxolib.BIP32Interface> {
+): Triple<BIP32Interface> {
   if (Array.isArray(keychains)) {
     return keychains.map((keychain: { pub: string } | string) => {
       const v = typeof keychain === 'string' ? keychain : keychain.pub;
-      return utxolib.bip32.fromBase58(v);
-    }) as Triple<utxolib.BIP32Interface>;
+      return bip32.fromBase58(v);
+    }) as Triple<BIP32Interface>;
   }
 
   return toBip32Triple(toKeychainTriple(keychains));

modules/abstract-utxo/src/offlineVault/OfflineVaultHalfSigned.ts

@@ -1,5 +1,5 @@
+import { BIP32Interface, bip32 } from '@bitgo/secp256k1';
 import * as utxolib from '@bitgo/utxo-lib';
-import { BIP32Interface } from '@bitgo/utxo-lib';
 import { BaseCoin } from '@bitgo/sdk-core';
 
 import { getNetworkFromChain } from '../names';
@@ -23,7 +23,7 @@ export function createHalfSigned(
 ): OfflineVaultHalfSigned {
   const network = getNetworkFromChain(coin);
   if (typeof prv === 'string') {
-    prv = utxolib.bip32.fromBase58(prv);
+    prv = bip32.fromBase58(prv);
   }
   prv = BaseCoin.deriveKeyWithSeedBip32(prv, derivationId).key;
   if (!OfflineVaultSignable.is(tx)) {

modules/abstract-utxo/src/offlineVault/OfflineVaultSignable.ts

@@ -1,4 +1,4 @@
-import * as utxolib from '@bitgo/utxo-lib';
+import { BIP32Interface, bip32 } from '@bitgo/secp256k1';
 import { Triple } from '@bitgo/sdk-core';
 import * as t from 'io-ts';
 
@@ -28,8 +28,8 @@ export type OfflineVaultUnsigned = t.TypeOf<typeof OfflineVaultSignable>;
 
 type WithXpub = { xpub: string };
 type NamedKeys = { user: WithXpub; backup: WithXpub; bitgo: WithXpub };
-export function toKeyTriple(xpubs: NamedKeys): Triple<utxolib.BIP32Interface> {
+export function toKeyTriple(xpubs: NamedKeys): Triple<BIP32Interface> {
   return [xpubs.user.xpub, xpubs.backup.xpub, xpubs.bitgo.xpub].map((xpub) =>
-    utxolib.bip32.fromBase58(xpub)
-  ) as Triple<utxolib.BIP32Interface>;
+    bip32.fromBase58(xpub)
+  ) as Triple<BIP32Interface>;
 }

modules/abstract-utxo/src/recovery/crossChainRecovery.ts

@@ -1,5 +1,5 @@
 import * as utxolib from '@bitgo/utxo-lib';
-import { bip32, BIP32Interface } from '@bitgo/utxo-lib';
+import { BIP32Interface, bip32 } from '@bitgo/secp256k1';
 import { Dimensions } from '@bitgo/unspents';
 import { BitGoBase, IWallet, Keychain, Triple, Wallet } from '@bitgo/sdk-core';
 import { decrypt } from '@bitgo/sdk-api';

modules/abstract-utxo/src/transaction/fixedScript/explainTransaction.ts

@@ -1,6 +1,7 @@
 import * as utxolib from '@bitgo/utxo-lib';
 import { bip322 } from '@bitgo/utxo-core';
-import { bip32, BIP32Interface, bitgo } from '@bitgo/utxo-lib';
+import { BIP32Interface, bip32 } from '@bitgo/secp256k1';
+import { bitgo } from '@bitgo/utxo-lib';
 import { Triple } from '@bitgo/sdk-core';
 import * as utxocore from '@bitgo/utxo-core';
 
@@ -302,7 +303,7 @@ export function explainPsbt<TNumber extends number | bigint, Tx extends bitgo.Ut
       utxocore.paygo.verifyPayGoAddressProof(
         psbt,
         payGoVerificationInfo.outputIndex,
-        utxolib.bip32.fromBase58(payGoVerificationInfo.verificationPubkey, utxolib.networks.bitcoin).publicKey
+        bip32.fromBase58(payGoVerificationInfo.verificationPubkey, utxolib.networks.bitcoin).publicKey
       );
     } catch (e) {
       if (strict) {

modules/abstract-utxo/src/transaction/fixedScript/signTransaction.ts

@@ -1,7 +1,8 @@
 import assert from 'assert';
 
 import _ from 'lodash';
-import { bip32, BIP32Interface, bitgo } from '@bitgo/utxo-lib';
+import { BIP32Interface, bip32 } from '@bitgo/secp256k1';
+import { bitgo } from '@bitgo/utxo-lib';
 import * as utxolib from '@bitgo/utxo-lib';
 import { isTriple, Triple } from '@bitgo/sdk-core';
 

modules/abstract-utxo/src/transaction/signTransaction.ts

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import { BitGoBase } from '@bitgo/sdk-core';
 import * as utxolib from '@bitgo/utxo-lib';
-import { bip32 } from '@bitgo/utxo-lib';
+import { bip32 } from '@bitgo/secp256k1';
 import buildDebug from 'debug';
 
 import { AbstractUtxoCoin, SignTransactionOptions } from '../abstractUtxoCoin';

modules/abstract-utxo/src/verifyKey.ts

@@ -7,7 +7,7 @@ import assert from 'assert';
 
 import buildDebug from 'debug';
 import * as utxolib from '@bitgo/utxo-lib';
-import { bip32 } from '@bitgo/utxo-lib';
+import { bip32 } from '@bitgo/secp256k1';
 import * as bitcoinMessage from 'bitcoinjs-message';
 import { BitGoBase, decryptKeychainPrivateKey, KeyIndices } from '@bitgo/sdk-core';
 

modules/account-lib/package.json

@@ -40,6 +40,7 @@
     "@bitgo/sdk-coin-bera": "^2.6.5",
     "@bitgo/sdk-coin-bld": "^3.5.5",
     "@bitgo/sdk-coin-bsc": "^22.8.5",
+    "@bitgo/sdk-coin-canton": "^1.3.0",
     "@bitgo/sdk-coin-celo": "^5.3.5",
     "@bitgo/sdk-coin-coredao": "^2.6.5",
     "@bitgo/sdk-coin-coreum": "^21.5.5",

modules/account-lib/src/index.ts

@@ -203,6 +203,9 @@ export { Vet };
 import * as CosmosSharedCoin from '@bitgo/sdk-coin-cosmos';
 export { CosmosSharedCoin };
 
+import * as Canton from '@bitgo/sdk-coin-canton';
+export { Canton };
+
 import { validateAgainstMessageTemplates, MIDNIGHT_TNC_HASH } from './utils';
 export { MIDNIGHT_TNC_HASH };
 
@@ -315,6 +318,8 @@ const coinBuilderMap = {
   tpolyx: Polyx.TransactionBuilderFactory,
   vet: Vet.TransactionBuilderFactory,
   tvet: Vet.TransactionBuilderFactory,
+  canton: Canton.TransactionBuilderFactory,
+  tcanton: Canton.TransactionBuilderFactory,
 };
 
 const coinMessageBuilderFactoryMap = {

modules/bitgo/package.json

@@ -138,7 +138,7 @@
     "superagent": "^9.0.1"
   },
   "devDependencies": {
-    "@bitgo/public-types": "5.29.0",
+    "@bitgo/public-types": "5.31.0",
     "@bitgo/sdk-opensslbytes": "^2.1.0",
     "@bitgo/sdk-test": "^9.1.5",
     "@openpgp/web-stream-tools": "0.0.14",

modules/express/encryptedPrivKeys.json

@@ -1,3 +1,3 @@
 {
-	"61f039aad587c2000745c687373e0fa9": "{\"iv\":\"W14so0ZwIVOO/5y4cl3H3g==\",\"v\":1,\"iter\":10000,\"ks\":256,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"salt\":\"Jeck6aR6egU=\",\"ct\":\"GfqFuIoLp5jOTSTTB1byjWlW4D/8WBTr35P2UDjud0b0nA0WnJVAytbNkTlSIsRemhXQrcwhA74/BwZ14zvU4Frtmt3D3tvqKtb4i1ZVPREpcsIbp9V/RC+E5acNX6+bUCMXVZMEuYEGtkDxNRSIGsRZkAeTFlg=\"}"
+	"61f039aad587c2000745c687373e0fa9": "{\"iv\":\"/Gnh+Ip1G+IOhy+Cms+umQ==\",\"v\":1,\"iter\":10000,\"ks\":256,\"ts\":64,\"mode\":\"ccm\",\"adata\":\"\",\"cipher\":\"aes\",\"salt\":\"FYnd1xwReTw=\",\"ct\":\"vgnCvdJ1Z9sqeV6urYxNsscwnkB/6eSPsZhzaW4Cuc7RKEY1uWNlleR0Tjtd8nlQuhsA5UXFpOID3lHHHjPDvB+jWtRm08I2F+HNGYuklWG12vIiSrY2KnkYRJkyCghn5Pq3iEimQb9M2kkwj5wf4EtfAiz9jsY=\"}"
 }

modules/express/package.json

@@ -58,7 +58,7 @@
     "superagent": "^9.0.1"
   },
   "devDependencies": {
-    "@bitgo/public-types": "5.29.0",
+    "@bitgo/public-types": "5.31.0",
     "@bitgo/sdk-lib-mpc": "^10.8.1",
     "@bitgo/sdk-test": "^9.1.5",
     "@types/argparse": "^1.0.36",

modules/express/src/typedRoutes/api/v1/acceptShare.ts

@@ -22,6 +22,7 @@ export const AcceptShareRequestBody = {
  * When a wallet is shared with a user, they need to accept the share to gain access
  * to the wallet according to the permissions granted by the sharing user.
  *
+ * @tag express
  * @operationId express.v1.wallet.acceptShare
  */
 export const PostAcceptShare = httpRoute({

modules/express/src/typedRoutes/api/v1/consolidateUnspents.ts

@@ -71,10 +71,11 @@ export const ConsolidateUnspentsResponse = t.array(
  * multiple inputs to a single output. This is useful for reducing the number of UTXOs in a wallet,
  * which can improve performance and reduce transaction fees.
  *
+ * @tag express
  * @operationId express.v1.wallet.consolidateunspents
  */
 export const PutConsolidateUnspents = httpRoute({
-  path: '/api/v1/wallet/:id/consolidateunspents',
+  path: '/api/v1/wallet/{id}/consolidateunspents',
   method: 'PUT',
   request: httpRequest({
     params: ConsolidateUnspentsRequestParams,

modules/express/src/typedRoutes/api/v1/constructPendingApprovalTx.ts

@@ -59,10 +59,11 @@ export const ConstructPendingApprovalTxResponse = t.type({
  * For transaction request type approvals, either a wallet passphrase or xprv must be provided to sign the transaction.
  * You can optionally specify fee-related parameters to customize the transaction fee.
  *
+ * @tag express
  * @operationId express.v1.pendingapproval.constructTx
  */
 export const PutConstructPendingApprovalTx = httpRoute({
-  path: '/api/v1/pendingapprovals/:id/constructTx',
+  path: '/api/v1/pendingapprovals/{id}/constructTx',
   method: 'PUT',
   request: httpRequest({
     params: ConstructPendingApprovalTxRequestParams,

modules/express/src/typedRoutes/api/v1/createLocalKeyChain.ts

@@ -33,6 +33,7 @@ export const CreateLocalKeyChainResponse = t.type({
  * For security reasons, it is highly recommended that you encrypt and destroy
  * the original xprv immediately to prevent theft.
  *
+ * @tag express
  * @operationId express.v1.keychain.local
  */
 export const PostCreateLocalKeyChain = httpRoute({

modules/express/src/typedRoutes/api/v1/deriveLocalKeyChain.ts

@@ -44,6 +44,7 @@ export const DeriveLocalKeyChainResponse = t.type({
  * both the derived xprv and xpub are returned. If xpub is provided, only the
  * derived xpub is returned.
  *
+ * @tag express
  * @operationId express.v1.keychain.derive
  */
 export const PostDeriveLocalKeyChain = httpRoute({

modules/express/src/typedRoutes/api/v1/fanoutUnspents.ts

@@ -59,10 +59,11 @@ export const FanoutUnspentsResponse = t.type({
  * multiple inputs to multiple outputs. This is useful for increasing the number of UTXOs
  * in a wallet, which can improve transaction parallelization.
  *
+ * @tag express
  * @operationId express.v1.wallet.fanoutunspents
  */
 export const PutFanoutUnspents = httpRoute({
-  path: '/api/v1/wallet/:id/fanoutunspents',
+  path: '/api/v1/wallet/{id}/fanoutunspents',
   method: 'PUT',
   request: httpRequest({
     params: FanoutUnspentsRequestParams,

modules/express/src/typedRoutes/api/v1/pendingApproval.ts

@@ -28,6 +28,7 @@ export const pendingApprovalRequestBody = {
  * Handles various approval scenarios including transaction approvals, policy rule changes,
  * and user change requests.
  *
+ * @tag express
  * @operationId express.v1.pendingapprovals
  */
 

modules/express/src/typedRoutes/api/v1/signTransaction.ts

@@ -31,6 +31,7 @@ export const signTransactionRequestBody = {
  * signTransaction
  * Sign a previously created transaction with a keychain
  *
+ * @tag express
  * @operationId express.v1.wallet.signTransaction
  */
 export const PostSignTransaction = httpRoute({

modules/express/src/typedRoutes/api/v1/simpleCreate.ts

@@ -31,6 +31,7 @@ export const SimpleCreateRequestBody = {
  * 4. Creates the BitGo key on the service
  * 5. Creates the wallet on BitGo with the 3 public keys above
  *
+ * @tag express
  * @operationId express.v1.wallet.simplecreate
  */
 export const PostSimpleCreate = httpRoute({