diff --git a/generated/smartContract/contract_bro_btc-peg-in-endpoint-v2-07-agg.ts b/generated/smartContract/contract_bro_btc-peg-in-endpoint-v2-07-agg.ts
index 9322ecf..98ce87f 100644
--- a/generated/smartContract/contract_bro_btc-peg-in-endpoint-v2-07-agg.ts
+++ b/generated/smartContract/contract_bro_btc-peg-in-endpoint-v2-07-agg.ts
@@ -85,6 +85,7 @@ export const btcPegInEndpointV207Agg = defineContract({
         type: tupleT({
           'chain-id': optionalT(uintT, ),
           'dest-chain-id': uintT,
+          expiry: uintT,
           from: bufferT,
           'min-amount-out': optionalT(uintT, ),
           'swap-token-in': principalT,
@@ -115,6 +116,7 @@ export const btcPegInEndpointV207Agg = defineContract({
       'order-details': tupleT({
         'chain-id': optionalT(uintT, ),
         'dest-chain-id': uintT,
+        expiry: uintT,
         from: bufferT,
         'min-amount-out': optionalT(uintT, ),
         'swap-token-in': principalT,
@@ -133,6 +135,7 @@ export const btcPegInEndpointV207Agg = defineContract({
     output: responseSimpleT(tupleT({
       'chain-id': optionalT(uintT, ),
       'dest-chain-id': uintT,
+      expiry: uintT,
       from: bufferT,
       'min-amount-out': optionalT(uintT, ),
       'swap-token-in': principalT,
@@ -197,6 +200,7 @@ export const btcPegInEndpointV207Agg = defineContract({
     output: responseSimpleT(tupleT({
       'amount-in-fixed': uintT,
       'dest-chain-id': uintT,
+      expiry: uintT,
       'fail-settle': tupleT({ address: bufferT, 'chain-id': optionalT(uintT, ), token: principalT }, ),
       'min-amount-out': optionalT(uintT, ),
       'success-settle': tupleT({ address: bufferT, 'chain-id': optionalT(uintT, ), token: principalT }, ),
diff --git a/generated/smartContract/contract_bro_cross-peg-out-endpoint-v2-01-agg.ts b/generated/smartContract/contract_bro_cross-peg-out-endpoint-v2-01-agg.ts
index 03603ca..106c9c0 100644
--- a/generated/smartContract/contract_bro_cross-peg-out-endpoint-v2-01-agg.ts
+++ b/generated/smartContract/contract_bro_cross-peg-out-endpoint-v2-01-agg.ts
@@ -27,6 +27,7 @@ export const crossPegOutEndpointV201Agg = defineContract({
       { name: 'token-out', type: principalT },
       { name: 'min-amount-out', type: optionalT(uintT, ) },
       { name: 'dest-chain-id', type: uintT },
+      { name: 'expiry', type: uintT },
       {
         name: 'success-settle',
         type: tupleT({ address: bufferT, 'chain-id': optionalT(uintT, ), token: principalT }, )
diff --git a/generated/smartContract/contract_bro_meta-peg-in-endpoint-v2-06-agg.ts b/generated/smartContract/contract_bro_meta-peg-in-endpoint-v2-06-agg.ts
index 4a5ab9c..777cc35 100644
--- a/generated/smartContract/contract_bro_meta-peg-in-endpoint-v2-06-agg.ts
+++ b/generated/smartContract/contract_bro_meta-peg-in-endpoint-v2-06-agg.ts
@@ -125,6 +125,7 @@ export const metaPegInEndpointV206Agg = defineContract({
         type: tupleT({
           'chain-id': optionalT(uintT, ),
           'dest-chain-id': uintT,
+          expiry: uintT,
           from: bufferT,
           'min-amount-out': optionalT(uintT, ),
           'swap-token-in': principalT,
@@ -147,6 +148,7 @@ export const metaPegInEndpointV206Agg = defineContract({
       'order-details': tupleT({
         'chain-id': optionalT(uintT, ),
         'dest-chain-id': uintT,
+        expiry: uintT,
         from: bufferT,
         'min-amount-out': optionalT(uintT, ),
         'swap-token-in': principalT,
@@ -165,6 +167,7 @@ export const metaPegInEndpointV206Agg = defineContract({
     output: responseSimpleT(tupleT({
       'chain-id': optionalT(uintT, ),
       'dest-chain-id': uintT,
+      expiry: uintT,
       from: bufferT,
       'min-amount-out': optionalT(uintT, ),
       'swap-token-in': principalT,
@@ -278,6 +281,7 @@ export const metaPegInEndpointV206Agg = defineContract({
     output: responseSimpleT(tupleT({
       'amount-in-fixed': uintT,
       'dest-chain-id': uintT,
+      expiry: uintT,
       'fail-settle': tupleT({ address: bufferT, 'chain-id': optionalT(uintT, ), token: principalT }, ),
       'min-amount-out': optionalT(uintT, ),
       'success-settle': tupleT({ address: bufferT, 'chain-id': optionalT(uintT, ), token: principalT }, ),
diff --git a/src/config.ts b/src/config.ts
index 3b9d2c3..984551f 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -24,13 +24,13 @@ export const STACKS_TESTNET: StacksNetwork = {
 export const contractNameOverrides_mainnet: Record<string, string> = {
   "btc-peg-in-endpoint-v2-07": "btc-peg-in-v2-07a",
   "btc-peg-in-endpoint-v2-07-swap": "btc-peg-in-v2-07e-swap",
-  "btc-peg-in-endpoint-v2-07-agg": "btc-peg-in-v2-07f-agg",
+  "btc-peg-in-endpoint-v2-07-agg": "btc-peg-in-v2-07h-agg",
   "btc-peg-in-endpoint-v2-05-launchpad": "btc-peg-in-v2-05-launchpad-3c",
   "meta-peg-in-endpoint-v2-06-swap": "meta-peg-in-v2-06e-swap",
-  "meta-peg-in-endpoint-v2-06-agg": "meta-peg-in-v2-06g-agg",
+  "meta-peg-in-endpoint-v2-06-agg": "meta-peg-in-v2-06i-agg",
   "cross-peg-in-endpoint-v2-04-swap": "cross-peg-in-v2-04b-swap",
   "cross-peg-in-endpoint-v2-04-launchpad": "cross-peg-in-v2-04-launchpad-3c",
-  "cross-peg-out-endpoint-v2-01-agg": "cross-peg-out-v2-01b-agg",
+  "cross-peg-out-endpoint-v2-01-agg": "cross-peg-out-v2-01c-agg",
 }
 export const contractNameOverrides_testnet: Record<string, string> = {
   "token-wliabtc": "token-wliabtc-dk",
diff --git a/src/stacksUtils/createBridgeOrderFromBitcoin.ts b/src/stacksUtils/createBridgeOrderFromBitcoin.ts
index ce06ae1..bf1e2ca 100644
--- a/src/stacksUtils/createBridgeOrderFromBitcoin.ts
+++ b/src/stacksUtils/createBridgeOrderFromBitcoin.ts
@@ -345,6 +345,10 @@ async function createBridgeOrderFromBitcoinImpl(
           "swap-token-in": `${swapFromTokenStacksAddress.deployerAddress}.${swapFromTokenStacksAddress.contractName}`,
           "swap-token-out": `${swapToTokenStacksAddress.deployerAddress}.${swapToTokenStacksAddress.contractName}`,
           "token-out": `${tokenOutStacksAddress.deployerAddress}.${tokenOutStacksAddress.contractName}`,
+          expiry:
+            swapInfo.expiredAt == null
+              ? 0n
+              : BigInt(Math.ceil(swapInfo.expiredAt.getTime() / 1000)),
         },
       },
       contractAggCallInfo.executeOptions,
diff --git a/src/stacksUtils/createBridgeOrderFromMeta.ts b/src/stacksUtils/createBridgeOrderFromMeta.ts
index 616f5a5..20304d2 100644
--- a/src/stacksUtils/createBridgeOrderFromMeta.ts
+++ b/src/stacksUtils/createBridgeOrderFromMeta.ts
@@ -341,6 +341,10 @@ async function createBridgeOrderFromMetaImpl(
           "swap-token-in": `${swapFromTokenStacksAddress.deployerAddress}.${swapFromTokenStacksAddress.contractName}`,
           "swap-token-out": `${swapToTokenStacksAddress.deployerAddress}.${swapToTokenStacksAddress.contractName}`,
           "token-out": `${tokenOutStacksAddress.deployerAddress}.${tokenOutStacksAddress.contractName}`,
+          expiry:
+            swapInfo.expiredAt == null
+              ? 0n
+              : BigInt(Math.ceil(swapInfo.expiredAt.getTime() / 1000)),
         },
       },
       contractAggCallInfo.executeOptions,
diff --git a/src/utils/SwapRouteHelpers.ts b/src/utils/SwapRouteHelpers.ts
index 30720e0..ffd8bd2 100644
--- a/src/utils/SwapRouteHelpers.ts
+++ b/src/utils/SwapRouteHelpers.ts
@@ -58,6 +58,7 @@ export interface SwapRouteViaEVMDexAggregator {
   evmChain: KnownChainId.EVMChain
   fromEVMToken: KnownTokenId.EVMToken
   toEVMToken: KnownTokenId.EVMToken
+  expiredAt?: null | Date
 }
 
 export interface SwapRouteViaEVMDexAggregator_WithExchangeRate