feat: btc-peg-in-endpoint-v2-01 -> btc-peg-in-endpoint-v2-02

CoinFabrik · Aug 7, 2024 · d1916c7 · d1916c7
1 parent 248c430
commit d1916c7
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 147 deletions.
diff --git a/generated/smartContract/contract_xlink_btc-bridge-registry-v2-01.ts b/generated/smartContract/contract_xlink_btc-bridge-registry-v2-01.ts
diff --git a/...ntract_xlink_btc-peg-in-endpoint-v2-01.ts → ...ntract_xlink_btc-peg-in-endpoint-v2-02.ts b/...ntract_xlink_btc-peg-in-endpoint-v2-01.ts → ...ntract_xlink_btc-peg-in-endpoint-v2-02.ts
@@ -11,8 +11,8 @@ listT,
 noneT
 } from "../smartContractHelpers/codegenImport"
 
-export const btcPegInEndpointV201 = defineContract({
-"btc-peg-in-endpoint-v2-01": {
+export const btcPegInEndpointV202 = defineContract({
+"btc-peg-in-endpoint-v2-02": {
   callback: {
     input: [
       { name: 'sender', type: principalT },
@@ -84,7 +84,7 @@ export const btcPegInEndpointV201 = defineContract({
     input: [
       {
         name: 'order',
-        type: tupleT({ 'chain-id': uintT, recipient: bufferT }, )
+        type: tupleT({ 'chain-id': uintT, from: bufferT, to: bufferT }, )
       }
     ],
     output: responseSimpleT(bufferT, ),
@@ -97,7 +97,7 @@ export const btcPegInEndpointV201 = defineContract({
   },
   'decode-order-cross-or-fail': {
     input: [ { name: 'order-script', type: bufferT } ],
-    output: responseSimpleT(tupleT({ 'chain-id': uintT, recipient: bufferT }, ), ),
+    output: responseSimpleT(tupleT({ 'chain-id': uintT, from: bufferT, to: bufferT }, ), ),
     mode: 'readonly'
   },
   'extract-tx-ins-outs': {
@@ -150,7 +150,7 @@ export const btcPegInEndpointV201 = defineContract({
     output: responseSimpleT(tupleT({
       'amount-net': uintT,
       fee: uintT,
-      'order-details': tupleT({ 'chain-id': uintT, recipient: bufferT }, )
+      'order-details': tupleT({ 'chain-id': uintT, from: bufferT, to: bufferT }, )
     }, ), ),
     mode: 'readonly'
   },

diff --git a/generated/smartContract/contracts_xlink.ts b/generated/smartContract/contracts_xlink.ts
@@ -1,14 +1,12 @@
 import { defineContract } from "../smartContractHelpers/codegenImport";
-import { btcBridgeRegistryV201 } from "./contract_xlink_btc-bridge-registry-v2-01"
-import { btcPegInEndpointV201 } from "./contract_xlink_btc-peg-in-endpoint-v2-01"
+import { btcPegInEndpointV202 } from "./contract_xlink_btc-peg-in-endpoint-v2-02"
 import { btcPegOutEndpointV201 } from "./contract_xlink_btc-peg-out-endpoint-v2-01"
 import { crossBridgeRegistryV201 } from "./contract_xlink_cross-bridge-registry-v2-01"
 import { crossPegInEndpointV201 } from "./contract_xlink_cross-peg-in-endpoint-v2-01"
 import { crossPegOutEndpointV201 } from "./contract_xlink_cross-peg-out-endpoint-v2-01"
 
 export const xlinkContracts = defineContract({
-...btcBridgeRegistryV201,
-...btcPegInEndpointV201,
+...btcPegInEndpointV202,
 ...btcPegOutEndpointV201,
 ...crossBridgeRegistryV201,
 ...crossPegInEndpointV201,

diff --git a/scripts/generateClarityTranscoders.ts b/scripts/generateClarityTranscoders.ts
@@ -6,8 +6,7 @@ import { STACKS_CONTRACT_DEPLOYER_MAINNET, STACKS_MAINNET } from "../src/config"
     STACKS_MAINNET.coreApiUrl,
     STACKS_CONTRACT_DEPLOYER_MAINNET,
     [
-      "btc-bridge-registry-v2-01",
-      "btc-peg-in-endpoint-v2-01",
+      "btc-peg-in-endpoint-v2-02",
       "btc-peg-out-endpoint-v2-01",
       "cross-bridge-registry-v2-01",
       "cross-peg-in-endpoint-v2-01",

diff --git a/src/bitcoinUtils/peggingHelpers.ts b/src/bitcoinUtils/peggingHelpers.ts
@@ -36,19 +36,19 @@ export const getBtc2StacksFeeInfo = async (route: {
 
   const resp = await props({
     isPaused: executeReadonlyCallXLINK(
-      "btc-peg-in-endpoint-v2-01",
+      "btc-peg-in-endpoint-v2-02",
       "is-peg-in-paused",
       {},
       executeOptions,
     ),
     feeRate: executeReadonlyCallXLINK(
-      "btc-peg-in-endpoint-v2-01",
+      "btc-peg-in-endpoint-v2-02",
       "get-peg-in-fee",
       {},
       executeOptions,
     ).then(numberFromStacksContractNumber),
     minFeeAmount: executeReadonlyCallXLINK(
-      "btc-peg-in-endpoint-v2-01",
+      "btc-peg-in-endpoint-v2-02",
       "get-peg-in-min-fee",
       {},
       executeOptions,

diff --git a/src/stacksUtils/createBridgeOrder.ts b/src/stacksUtils/createBridgeOrder.ts
@@ -45,7 +45,7 @@ export async function createBridgeOrder_BitcoinToStacks(
 
   if (hasLength(swapRoute, 0)) {
     data = await executeReadonlyCallXLINK(
-      "btc-peg-in-endpoint-v2-01",
+      "btc-peg-in-endpoint-v2-02",
       "create-order-0-or-fail",
       { order: receiverAddr },
       executeOptions,
@@ -106,6 +106,7 @@ export async function createBridgeOrder_BitcoinToEVM(
   },
   info: {
     targetChain: KnownChainId.EVMChain
+    fromBitcoinScriptPubKey: Uint8Array
     receiverAddr: string
     swapRoute: BridgeSwapRoute_FromBitcoin
     swapSlippedAmount?: bigint
@@ -127,11 +128,12 @@ export async function createBridgeOrder_BitcoinToEVM(
 
   if (hasLength(swapRoute, 0)) {
     data = await executeReadonlyCallXLINK(
-      "btc-peg-in-endpoint-v2-01",
+      "btc-peg-in-endpoint-v2-02",
       "create-order-cross-or-fail",
       {
         order: {
-          recipient: decodeHex(receiverAddr),
+          from: info.fromBitcoinScriptPubKey,
+          to: decodeHex(receiverAddr),
           "chain-id": targetChainId,
         },
       },

diff --git a/src/stacksUtils/validateBridgeOrder.ts b/src/stacksUtils/validateBridgeOrder.ts
@@ -30,7 +30,7 @@ export async function validateBridgeOrder_BitcoinToStacks(
 
   if (hasLength(swapRoute, 0)) {
     resp = await executeReadonlyCallXLINK(
-      "btc-peg-in-endpoint-v2-01",
+      "btc-peg-in-endpoint-v2-02",
       "validate-tx-0",
       {
         tx: btcTx,
@@ -114,7 +114,7 @@ export async function validateBridgeOrder_BitcoinToEVM(
 
   if (hasLength(swapRoute, 0)) {
     resp = await executeReadonlyCallXLINK(
-      "btc-peg-in-endpoint-v2-01",
+      "btc-peg-in-endpoint-v2-02",
       "validate-tx-cross",
       {
         tx: btcTx,

diff --git a/src/xlinkSdkUtils/bridgeFromBitcoin.ts b/src/xlinkSdkUtils/bridgeFromBitcoin.ts
@@ -231,6 +231,7 @@ async function bridgeFromBitcoin_toEVM(
     },
     {
       targetChain: info.toChain,
+      fromBitcoinScriptPubKey: info.fromAddressScriptPubKey,
       receiverAddr: info.toAddress,
       swapSlippedAmount: numberToStacksContractNumber(info.amount),
       swapRoute: [],

diff --git a/src/xlinkSdkUtils/estimateBridgeTransactionFromBitcoin.ts b/src/xlinkSdkUtils/estimateBridgeTransactionFromBitcoin.ts
@@ -165,6 +165,7 @@ async function estimateFromBitcoin_toEVM(
     },
     {
       targetChain: info.toChain,
+      fromBitcoinScriptPubKey: info.fromAddressScriptPubKey,
       receiverAddr: info.toAddress,
       swapSlippedAmount: numberToStacksContractNumber(info.amount),
       swapRoute: [],