Merge branch '98-update-tss-sign-function-interface' into 'dev'

Resolve "update tss sign function interface" Closes #98 and #95 See merge request ergo/rosen-bridge/rosen-chains!107
rosen-bridge · Apr 5, 2024 · ca36479 · ca36479
2 parents 57c41dd + a20f147
commit ca36479
Show file tree

Hide file tree

Showing 45 changed files with 250 additions and 150 deletions.
diff --git a/.changeset/big-pumpkins-grab.md b/.changeset/big-pumpkins-grab.md
diff --git a/.changeset/clean-insects-wink.md b/.changeset/clean-insects-wink.md
diff --git a/.changeset/eighty-jokes-warn.md b/.changeset/eighty-jokes-warn.md
diff --git a/.changeset/hot-chairs-march.md b/.changeset/hot-chairs-march.md
diff --git a/.changeset/large-ants-double.md b/.changeset/large-ants-double.md
diff --git a/.changeset/lazy-cameras-perform.md b/.changeset/lazy-cameras-perform.md
diff --git a/.changeset/little-otters-hide.md b/.changeset/little-otters-hide.md
diff --git a/.changeset/red-games-switch.md b/.changeset/red-games-switch.md
diff --git a/.changeset/angry-countries-pump.md → .changeset/rude-pets-pretend.md b/.changeset/angry-countries-pump.md → .changeset/rude-pets-pretend.md
diff --git a/.changeset/soft-mayflies-hug.md b/.changeset/soft-mayflies-hug.md
diff --git a/.changeset/spicy-papayas-argue.md b/.changeset/spicy-papayas-argue.md
diff --git a/.changeset/thirty-maps-swim.md b/.changeset/thirty-maps-swim.md
diff --git a/.changeset/tidy-boats-yawn.md b/.changeset/tidy-boats-yawn.md
diff --git a/.changeset/wild-tips-share.md b/.changeset/wild-tips-share.md
diff --git a/.changeset/young-walls-whisper.md b/.changeset/young-walls-whisper.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/abstract-chain/CHANGELOG.md b/packages/abstract-chain/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @rosen-chains/abstract-chain
 
+## 6.0.0
+
+### Major Changes
+
+- add generateMultipleTransactions to AbstractChain and implement generateTransaction
+- implement verifyEvent and add verifyLockTransactionExtraConditions to be implemented in child classes
+
+### Minor Changes
+
+- Introduced new error types for EvmChain
+
+### Patch Changes
+
+- allow undefined extractor
+- Updated rosen-extractor version
+
 ## 5.0.0
 
 ### Major Changes

diff --git a/packages/abstract-chain/package.json b/packages/abstract-chain/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rosen-chains/abstract-chain",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "description": "this project contains abstract classes to implement any chain for Rosen-bridge",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",

diff --git a/packages/chains/bitcoin/CHANGELOG.md b/packages/chains/bitcoin/CHANGELOG.md
@@ -0,0 +1,18 @@
+# @rosen-chains/bitcoin
+
+## 1.0.0
+
+### Major Changes
+
+- init rosen-extractor in chain and remove it from its network
+- add signatureRecovery to return data of required signFunction
+
+### Minor Changes
+
+- change generateTransaction to generateMultipleTransaction due to its update in AbstractChain
+
+### Patch Changes
+
+- Updated rosen-extractor version
+- Updated dependencies
+  - @rosen-chains/abstract-chain@6.0.0
diff --git a/packages/chains/bitcoin/lib/BitcoinChain.ts b/packages/chains/bitcoin/lib/BitcoinChain.ts
@@ -18,7 +18,12 @@ import {
 } from '@rosen-chains/abstract-chain';
 import AbstractBitcoinNetwork from './network/AbstractBitcoinNetwork';
 import BitcoinTransaction from './BitcoinTransaction';
-import { BitcoinConfigs, BitcoinTx, BitcoinUtxo } from './types';
+import {
+  BitcoinConfigs,
+  BitcoinTx,
+  BitcoinUtxo,
+  TssSignFunction,
+} from './types';
 import Serializer from './Serializer';
 import { Psbt, Transaction, address, payments, script } from 'bitcoinjs-lib';
 import JsonBigInt from '@rosen-bridge/json-bigint';
@@ -33,7 +38,7 @@ class BitcoinChain extends AbstractUtxoChain<BitcoinTx, BitcoinUtxo> {
   declare configs: BitcoinConfigs;
   CHAIN = BITCOIN_CHAIN;
   extractor: BitcoinRosenExtractor;
-  protected signFunction: (txHash: Uint8Array) => Promise<string>;
+  protected signFunction: TssSignFunction;
   protected lockScript: string;
   protected signingScript: Buffer;
 
@@ -42,7 +47,7 @@ class BitcoinChain extends AbstractUtxoChain<BitcoinTx, BitcoinUtxo> {
     configs: BitcoinConfigs,
     feeRatioDivisor: bigint,
     tokens: RosenTokens,
-    signFunction: (txHash: Uint8Array) => Promise<string>,
+    signFunction: TssSignFunction,
     logger?: AbstractLogger
   ) {
     super(network, configs, feeRatioDivisor, logger);
@@ -398,14 +403,12 @@ class BitcoinChain extends AbstractUtxoChain<BitcoinTx, BitcoinUtxo> {
         Transaction.SIGHASH_ALL
       );
 
-      const signatureHex = this.signFunction(signMessage).then(
-        (signatureHex: string) => {
-          this.logger.debug(
-            `Input [${i}] of tx [${bitcoinTx.txId}] is signed. signature: ${signatureHex}`
-          );
-          return signatureHex;
-        }
-      );
+      const signatureHex = this.signFunction(signMessage).then((response) => {
+        this.logger.debug(
+          `Input [${i}] of tx [${bitcoinTx.txId}] is signed. signature: ${response.signature}`
+        );
+        return response.signature;
+      });
       signaturePromises.push(signatureHex);
     }
 

diff --git a/packages/chains/bitcoin/lib/types.ts b/packages/chains/bitcoin/lib/types.ts
@@ -35,3 +35,8 @@ export interface BitcoinTx {
   inputs: BitcoinTxInput[];
   outputs: BitcoinTxOutput[];
 }
+
+export type TssSignFunction = (txHash: Uint8Array) => Promise<{
+  signature: string;
+  signatureRecovery: string;
+}>;
diff --git a/packages/chains/bitcoin/package.json b/packages/chains/bitcoin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rosen-chains/bitcoin",
-  "version": "0.1.0",
+  "version": "1.0.0",
   "description": "this project contains bitcoin chain for Rosen-bridge",
   "repository": "https://github.com/rosen-bridge/rosen-chains",
   "license": "GPL-3.0",
@@ -41,6 +41,6 @@
     "bitcoinjs-lib": "^6.1.5"
   },
   "peerDependencies": {
-    "@rosen-chains/abstract-chain": "^5.0.0"
+    "@rosen-chains/abstract-chain": "^6.0.0"
   }
 }