Co-authored-by: Polybius93 <[email protected]>

DLC-link · Jun 25, 2024 · 04903f3 · 04903f3
1 parent be7ce26
commit 04903f3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/src/attestor-handlers/attestor-handler.ts b/src/attestor-handlers/attestor-handler.ts
@@ -1,3 +1,5 @@
+import { Transaction } from '@scure/btc-signer';
+
 import { AttestorError } from '../models/errors.js';
 
 export class AttestorHandler {
@@ -14,18 +16,18 @@ export class AttestorHandler {
 
   async createPSBTEvent(
     vaultUUID: string,
-    fundingTransaction: string,
-    closingPSBT: string,
-    userNativeSegwitAddress: string
+    fundingTransactionPsbt: string,
+    mintAddress: string,
+    alicePubkey: string
   ): Promise<void> {
     const createPSBTEndpoints = this.attestorRootURLs.map(url => `${url}/app/create-psbt-event`);
 
     const body = JSON.stringify({
       uuid: vaultUUID,
-      funding_transaction: fundingTransaction,
-      closing_psbt: closingPSBT,
-      mint_address: userNativeSegwitAddress,
+      funding_transaction_psbt: fundingTransactionPsbt,
+      mint_address: mintAddress,
       chain: this.ethereumChainID,
+      alice_pubkey: alicePubkey,
     });
 
     const requests = createPSBTEndpoints.map(async url =>

diff --git a/src/dlc-handlers/private-key-dlc-handler.ts b/src/dlc-handlers/private-key-dlc-handler.ts
@@ -26,7 +26,7 @@ interface RequiredKeyPair {
 }
 
 export class PrivateKeyDLCHandler {
-  private derivedKeyPair: RequiredKeyPair;
+  public derivedKeyPair: RequiredKeyPair;
   public payment: PaymentInformation | undefined;
   private bitcoinNetwork: Network;
   private bitcoinBlockchainAPI: string;

diff --git a/src/dlc-handlers/software-wallet-dlc-handler.ts b/src/dlc-handlers/software-wallet-dlc-handler.ts
@@ -77,6 +77,10 @@ export class SoftwareWalletDLCHandler {
     return this.payment;
   }
 
+  getTaprootDerivedPublicKey(): string {
+    return this.taprootDerivedPublicKey;
+  }
+
   getVaultRelatedAddress(paymentType: 'p2wpkh' | 'p2tr'): string {
     const payment = this.getPayment();
 

diff --git a/src/network-handlers/ethereum-handler.ts b/src/network-handlers/ethereum-handler.ts
@@ -55,11 +55,10 @@ export class EthereumHandler {
     return vault;
   }
 
-  async setupVault(bitcoinDepositAmount: number): Promise<any | undefined> {
+  async setupVault(): Promise<any | undefined> {
     try {
-      await this.ethereumContracts.protocolContract.callStatic.setupVault(bitcoinDepositAmount);
-      const transaction =
-        await this.ethereumContracts.protocolContract.setupVault(bitcoinDepositAmount);
+      await this.ethereumContracts.protocolContract.callStatic.setupVault();
+      const transaction = await this.ethereumContracts.protocolContract.setupVault();
       return await transaction.wait();
     } catch (error: any) {
       throw new EthereumError(`Could not setup Vault: ${error}`);