feat: upgrade stacks contracts

src/config.ts

@@ -11,33 +11,38 @@ export const STACKS_TESTNET = new StacksMocknet({
 
 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-07a-swap",
+  "btc-peg-in-endpoint-v2-07-swap": "btc-peg-in-v2-07e-swap",
+  "btc-peg-in-endpoint-v2-07-agg": "btc-peg-in-v2-07b-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-06-swap",
+  "meta-peg-in-endpoint-v2-06-swap": "meta-peg-in-v2-06d-swap",
+  "cross-peg-in-endpoint-v2-04-swap": "cross-peg-in-v2-04-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-01a-agg",
 }
 export const contractNameOverrides_testnet: Record<string, string> = {
-  "token-wliabtc": "token-wliabtc-dd",
-  "token-wvliabtc": "token-wvliabtc-dd",
-  "token-liabtc": "token-liabtc-dd",
-  "token-vliabtc": "token-vliabtc-dd",
+  "token-wliabtc": "token-wliabtc-dk",
+  "token-wvliabtc": "token-wvliabtc-dk",
+  "token-liabtc": "token-liabtc-dk",
+  "token-vliabtc": "token-vliabtc-dk",
 
   // btc bridge
-  "btc-peg-in-endpoint-v2-05": "btc-peg-in-endpoint-v2-05-dd",
-  "btc-peg-in-endpoint-v2-07-swap": "btc-peg-in-v2-07-swap-01",
-  "btc-peg-in-endpoint-v2-05-lisa": "btc-peg-in-endpoint-v2-05-lisa-dd",
-  "btc-peg-in-endpoint-v2-05-launchpad": "btc-peg-in-v2-05-launchpad-dd",
-  "btc-peg-out-endpoint-v2-01": "btc-peg-out-endpoint-v2-01-dd",
+  "btc-peg-in-endpoint-v2-05": "btc-peg-in-endpoint-v2-05-dk",
+  "btc-peg-in-endpoint-v2-07-swap": "btc-peg-in-v2-07-swap-dk",
+  "btc-peg-in-endpoint-v2-07-agg": "btc-peg-in-v2-07b-agg-dk",
+  "btc-peg-in-endpoint-v2-05-lisa": "btc-peg-in-endpoint-v2-05-lisa-dk",
+  "btc-peg-in-endpoint-v2-05-launchpad": "btc-peg-in-v2-05-launchpad-3c-dk",
+  "btc-peg-out-endpoint-v2-01": "btc-peg-out-endpoint-v2-01-dk",
   // meta bridge
-  "meta-peg-in-endpoint-v2-04": "meta-peg-in-endpoint-v2-04-dd",
+  "meta-peg-in-endpoint-v2-04": "meta-peg-in-endpoint-v2-04-dk",
   "meta-peg-in-endpoint-v2-06-swap": "meta-peg-in-v2-06-swap-01",
-  "meta-peg-in-endpoint-v2-04-lisa": "meta-peg-in-endpoint-v2-04-lisa-dd",
-  "meta-peg-out-endpoint-v2-04": "meta-peg-out-endpoint-v2-04-dd",
+  "meta-peg-in-endpoint-v2-04-lisa": "meta-peg-in-endpoint-v2-04-lisa-dk",
+  "meta-peg-out-endpoint-v2-04": "meta-peg-out-endpoint-v2-04-dk",
   // cross bridge
-  "cross-peg-in-endpoint-v2-04": "cross-peg-in-endpoint-v2-04-dd",
-  "cross-peg-in-endpoint-v2-04-swap": "cross-peg-in-v2-04-swap-da",
+  "cross-peg-in-endpoint-v2-04": "cross-peg-in-endpoint-v2-04-dk",
+  "cross-peg-in-endpoint-v2-04-swap": "cross-peg-in-v2-04-swap-dk",
   "cross-peg-in-endpoint-v2-04-launchpad":
-    "cross-peg-in-endpoint-v2-04-launchpad-dd",
+    "cross-peg-in-endpoint-v2-04-launchpad-3c-dk",
+  "cross-peg-out-endpoint-v2-01-agg": "cross-peg-out-v2-01a-agg-dk",
   // cross router
-  "cross-router-v2-03": "cross-router-v2-03-dd",
+  "cross-router-v2-03": "cross-router-v2-03-dk",
 }

src/evmUtils/peggingHelpers.ts

@@ -47,6 +47,10 @@ export const getEvm2StacksFeeInfo = async (
     route.toChain,
     StacksContractName.EVMPegInEndpoint,
   )
+  const stacksSwapContractCallInfo = getStacksContractCallInfo(
+    route.toChain,
+    StacksContractName.EVMPegInEndpointSwap,
+  )
   const evmContractCallInfo = await getEVMContractCallInfo(ctx, route.fromChain)
   const evmTokenContractCallInfo = await getEVMTokenContractInfo(
     ctx,
@@ -55,6 +59,7 @@ export const getEvm2StacksFeeInfo = async (
   )
   if (
     stacksContractCallInfo == null ||
+    stacksSwapContractCallInfo == null ||
     evmContractCallInfo == null ||
     evmTokenContractCallInfo == null
   ) {
@@ -112,11 +117,14 @@ export const getEvm2StacksFeeInfo = async (
       functionName: "maxAmountPerToken",
       args: [tokenContractAddress],
     }).then(numberFromSolidityContractNumber),
+    /**
+     * temp fix, should be back to `stacksContractCallInfo` in the future
+     */
     isPaused: executeReadonlyCallXLINK(
-      stacksContractCallInfo.contractName,
+      stacksSwapContractCallInfo.contractName,
       "get-paused",
       {},
-      stacksContractCallInfo.executeOptions,
+      stacksSwapContractCallInfo.executeOptions,
     ),
   })
 

src/stacksUtils/stxContractAddresses.ts

@@ -61,6 +61,7 @@ export enum StacksContractName {
   MetaPegInEndpointSwap = "meta-peg-in-endpoint-v2-06-swap",
   MetaPegOutEndpoint = "meta-peg-out-endpoint-v2-04",
   EVMPegInEndpoint = "cross-peg-in-endpoint-v2-04",
+  EVMPegInEndpointSwap = "cross-peg-in-endpoint-v2-04-swap",
   EVMPegOutEndpoint = "cross-peg-out-endpoint-v2-01",
 }
 
@@ -115,6 +116,16 @@ export const stxContractAddresses = {
       contractName: StacksContractName.EVMPegInEndpoint,
     }),
   },
+  [StacksContractName.EVMPegInEndpointSwap]: {
+    [KnownChainId.Stacks.Mainnet]: wrapContractAddress("mainnet", {
+      deployerAddress: xlinkContractsMultisigMainnet,
+      contractName: StacksContractName.EVMPegInEndpointSwap,
+    }),
+    [KnownChainId.Stacks.Testnet]: wrapContractAddress("testnet", {
+      deployerAddress: xlinkContractsMultisigTestnet,
+      contractName: StacksContractName.EVMPegInEndpointSwap,
+    }),
+  },
   [StacksContractName.EVMPegOutEndpoint]: {
     [KnownChainId.Stacks.Mainnet]: wrapContractAddress("mainnet", {
       deployerAddress: xlinkContractsDeployerMainnet,