Merge branch 'master' into passkey/ticket-6-remove-passkey-from-account

Author: derranW26

modules/abstract-lightning/package.json

@@ -39,7 +39,7 @@
     ]
   },
   "dependencies": {
-    "@bitgo/public-types": "5.96.2",
+    "@bitgo/public-types": "5.97.0",
     "@bitgo/sdk-core": "^36.42.0",
     "@bitgo/statics": "^58.37.0",
     "@bitgo/utxo-lib": "^11.22.0",

modules/bitgo/package.json

@@ -139,7 +139,7 @@
     "superagent": "^9.0.1"
   },
   "devDependencies": {
-    "@bitgo/public-types": "5.96.2",
+    "@bitgo/public-types": "5.97.0",
     "@bitgo/sdk-opensslbytes": "^2.1.0",
     "@bitgo/sdk-test": "^9.1.40",
     "@openpgp/web-stream-tools": "0.0.14",

modules/express/package.json

@@ -60,7 +60,7 @@
     "superagent": "^9.0.1"
   },
   "devDependencies": {
-    "@bitgo/public-types": "5.96.2",
+    "@bitgo/public-types": "5.97.0",
     "@bitgo/sdk-lib-mpc": "^10.11.1",
     "@bitgo/sdk-test": "^9.1.40",
     "@types/argparse": "^1.0.36",

modules/sdk-coin-canton/src/lib/utils.ts

@@ -247,6 +247,17 @@ export class Utils implements BaseUtils {
             extractFromTransferRecord(transferSum.record?.fields ?? [], 'instrumentId', 'admin');
           }
         }
+        // USDCx/two-step token fallback: TransferRule_TwoStepTransfer exercise node
+        // → transfer.{sender, receiver, amount, instrumentId.{admin, id}}
+        if (!sender) {
+          const twoStepTransferFields = findExerciseNodeFields('TransferRule_TwoStepTransfer');
+          if (twoStepTransferFields) {
+            const transferSum = getField(twoStepTransferFields, 'transfer');
+            if (transferSum?.oneofKind === 'record') {
+              extractFromTransferRecord(transferSum.record?.fields ?? [], 'instrumentId', 'admin');
+            }
+          }
+        }
         break;
       }
 

modules/sdk-coin-canton/test/resources.ts

@@ -9,6 +9,7 @@ import { CantonTransferAcceptRejectRequest } from '../../../../src/lib/iface';
 import {
   CantonTokenAcceptPrepareResponse,
   CBTCTokenAcceptancePrepareResponse,
+  USDCxTokenAcceptancePrepareResponse,
   TransferAcceptance,
   TransferAcceptancePrepareResponse,
 } from '../../../resources';
@@ -72,6 +73,30 @@ describe('Transfer Acceptance Builder', () => {
     assert.equal(txData.token, 'canton:cbtc');
   });
 
+  it('should get the transfer acceptance request object for usdcx token', function () {
+    const txBuilder = new TransferAcceptanceBuilder(coins.get('tcanton'));
+    const transferAcceptanceTx = new Transaction(coins.get('tcanton'));
+    txBuilder.initBuilder(transferAcceptanceTx);
+    txBuilder.setTransaction(USDCxTokenAcceptancePrepareResponse);
+    const commandId = '3935a06d-3b03-41be-99a5-95b2ecaabf7d';
+    const partyId = '1220d::1220dc555fb89a30ab098ffb28b8cf1532053076a736bf6ed3b3c7da6fb4d710b4aa';
+    const { contractId } = TransferAcceptance;
+    txBuilder.commandId(commandId).contractId(contractId).actAs(partyId);
+    const requestObj: CantonTransferAcceptRejectRequest = txBuilder.toRequestObject();
+    const txData = txBuilder.transaction.toJson();
+    should.exist(requestObj);
+    assert.equal(requestObj.commandId, commandId);
+    assert.equal(requestObj.contractId, contractId);
+    assert.equal(requestObj.actAs.length, 1);
+    const actAs = requestObj.actAs[0];
+    assert.equal(actAs, partyId);
+    should.exist(txData);
+    assert.equal(txData.sender, '12201::1220175583b704cbb493393c1dbe17b9909ee4cf55ef345e8147cd6900c5768f861d');
+    assert.equal(txData.receiver, partyId);
+    assert.equal(txData.amount, '10000000000');
+    assert.equal(txData.token, 'canton:usdcx');
+  });
+
   it('should validate raw transaction', function () {
     const txBuilder = new TransferAcceptanceBuilder(coins.get('tcanton'));
     const transferAcceptanceTx = new Transaction(coins.get('tcanton'));

modules/sdk-coin-canton/test/unit/builder/transferAccept/transferAcceptBuilder.ts

@@ -47,7 +47,7 @@
     "@bitgo/sdk-test": "^9.1.40"
   },
   "dependencies": {
-    "@bitgo/public-types": "5.96.2",
+    "@bitgo/public-types": "5.97.0",
     "@bitgo/sdk-core": "^36.42.0",
     "@bitgo/secp256k1": "^1.11.0",
     "@bitgo/statics": "^58.37.0",

modules/sdk-coin-flrp/package.json

@@ -57,7 +57,7 @@
   },
   "dependencies": {
     "@bitgo/logger": "^1.4.0",
-    "@bitgo/public-types": "5.96.2",
+    "@bitgo/public-types": "5.97.0",
     "@bitgo/sdk-core": "^36.42.0",
     "@bitgo/sdk-lib-mpc": "^10.11.1",
     "@bitgo/statics": "^58.37.0",

modules/sdk-coin-sol/package.json

@@ -743,8 +743,8 @@ class XtzEvmTestnet extends Testnet implements EthereumNetwork {
   family = CoinFamily.XTZEVM;
   explorerUrl = 'https://shadownet.explorer.etherlink.com/tx/';
   accountExplorerUrl = 'https://shadownet.explorer.etherlink.com/address/';
-  chainId = 128123;
-  nativeCoinOperationHashPrefix = '128123';
+  chainId = 127823;
+  nativeCoinOperationHashPrefix = '127823';
 }
 
 class Pyrmont extends Testnet implements AccountNetwork {

modules/statics/src/networks.ts

@@ -999,10 +999,10 @@
     "@scure/base" "1.1.5"
     micro-eth-signer "0.7.2"
 
-"@bitgo/public-types@5.96.2":
-  version "5.96.2"
-  resolved "https://registry.npmjs.org/@bitgo/public-types/-/public-types-5.96.2.tgz#ae5ffe68a94742e72def3cec15bf236adaed50f5"
-  integrity sha512-fUwUXP0MLitOyg2blaAxCC04aplrj7XqsTEMFENxJg21ovHyO2mB4vz3IGOnwNipgx6jaCgplZAnPxcKu7N/nw==
+"@bitgo/public-types@5.97.0":
+  version "5.97.0"
+  resolved "https://registry.npmjs.org/@bitgo/public-types/-/public-types-5.97.0.tgz#d75f19e92863cdeed297da9e6fd52b6883207624"
+  integrity sha512-jQiBXMAcc1hSzTtScDaqQGtFIC6hyyQ5ZWhs1IoOHrg8XLQe6BbgZb/t997kXp1i0KIp2EapJFhpmVlVURh62A==
   dependencies:
     fp-ts "^2.0.0"
     io-ts "npm:@bitgo-forks/io-ts@2.1.4"