sync: main to staging

apps/explorer/src/components/Bridge.tsx

@@ -15,6 +15,8 @@ export const getTransferTypeLabel = (transferType: TransferType | OperationType
       return "Axelar";
     case TransferType.cctpTransfer:
       return "CCTP";
+    case TransferType.cctpTransferV2:
+      return "CCTP v2";
     case TransferType.hyperlaneTransfer:
       return "Hyperlane";
     case TransferType.opInitTransfer:

packages/client/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @skip-go/client
 
+## 1.5.17
+
+### Patch Changes
+
+- 90d1ef5: Handle `cctp_transfer_v2` entries in transaction status responses. They previously fell through the transfer type checks, leaving the event without a type, chain ids or explorer links, and reporting a `failed` status while the transfer was still pending.
+
 ## 1.5.16
 
 ### Patch Changes

packages/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@skip-go/client",
   "description": "JavaScript SDK for Skip Go API",
-  "version": "1.5.16",
+  "version": "1.5.17",
   "repository": "https://github.com/skip-mev/skip-go",
   "type": "module",
   "main": "./dist/cjs/index.cjs",

packages/client/src/types/swaggerTypes.ts

@@ -1377,6 +1377,8 @@ export interface TransferEvent {
   ibcTransfer?: IBCTransferInfo;
   axelarTransfer?: AxelarTransferInfo;
   cctpTransfer?: CCTPTransferInfo;
+  /** Status of a transfer facilitated by the CCTP V2 bridge, which is reported in the same shape as CCTP V1 */
+  cctpTransferV2?: CCTPTransferInfo;
   hyperlaneTransfer?: HyperlaneTransferInfo;
   opInitTransfer?: OPInitTransferInfo;
   stargateTransfer?: StargateTransferInfo;

packages/client/src/utils/clientType.ts

@@ -259,6 +259,8 @@ function getClientTransferEvent(transferEvent: TransferEvent) {
     combinedTransferEvent?.axelarTransfer as AxelarTransferInfo;
   const ibcTransfer = combinedTransferEvent?.ibcTransfer as IBCTransferInfo;
   const cctpTransfer = combinedTransferEvent?.cctpTransfer as CCTPTransferInfo;
+  const cctpTransferV2 =
+    combinedTransferEvent?.cctpTransferV2 as CCTPTransferInfo;
   const hyperlaneTransfer =
     combinedTransferEvent?.hyperlaneTransfer as HyperlaneTransferInfo;
   const opInitTransfer =
@@ -279,6 +281,8 @@ function getClientTransferEvent(transferEvent: TransferEvent) {
     transferType = TransferType.ibcTransfer;
   } else if (cctpTransfer) {
     transferType = TransferType.cctpTransfer;
+  } else if (cctpTransferV2) {
+    transferType = TransferType.cctpTransferV2;
   } else if (hyperlaneTransfer) {
     transferType = TransferType.hyperlaneTransfer;
   } else if (opInitTransfer) {
@@ -424,6 +428,7 @@ function getClientTransferEvent(transferEvent: TransferEvent) {
     ...ibcTransfer,
     ...axelarTransfer,
     ...cctpTransfer,
+    ...cctpTransferV2,
     ...hyperlaneTransfer,
     ...stargateTransfer,
     ...hyperlaneTransfer,
@@ -516,6 +521,7 @@ type CombinedTransferEvent = {
   [TransferType.ibcTransfer]: IBCTransferInfo;
   [TransferType.axelarTransfer]: AxelarTransferInfo;
   [TransferType.cctpTransfer]: CCTPTransferInfo;
+  [TransferType.cctpTransferV2]: CCTPTransferInfo;
   [TransferType.hyperlaneTransfer]: HyperlaneTransferInfo;
   [TransferType.opInitTransfer]: OPInitTransferInfo;
   [TransferType.goFastTransfer]: GoFastTransferInfo;
@@ -528,6 +534,7 @@ export enum TransferType {
   ibcTransfer = "ibcTransfer",
   axelarTransfer = "axelarTransfer",
   cctpTransfer = "cctpTransfer",
+  cctpTransferV2 = "cctpTransferV2",
   hyperlaneTransfer = "hyperlaneTransfer",
   opInitTransfer = "opInitTransfer",
   goFastTransfer = "goFastTransfer",

packages/widget/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## 0.0.15
 
+## 3.16.1
+
+### Patch Changes
+
+- 90d1ef5: Handle `cctp_transfer_v2` entries in transaction status responses. They previously fell through the transfer type checks, leaving the event without a type, chain ids or explorer links, and reporting a `failed` status while the transfer was still pending.
+- Updated dependencies [90d1ef5]
+  - @skip-go/client@1.5.17
+
 ## 3.16.0
 
 ### Minor Changes

packages/widget/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@skip-go/widget",
   "description": "Swap widget",
-  "version": "3.16.0",
+  "version": "3.16.1",
   "repository": {
     "url": "https://github.com/skip-mev/skip-go",
     "directory": "packages/widget"