Merge branch '81-remove-leading-zero-txid-check-in-cardanochain' into…

… 'dev' remove leading zero tx id check in CardanoChain Closes #81 See merge request ergo/rosen-bridge/rosen-chains!87
rosen-bridge · Jan 27, 2024 · daf9e51 · daf9e51
2 parents aa3125a + 76ca688
commit daf9e51
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 50 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/chains/cardano/lib/CardanoChain.ts b/packages/chains/cardano/lib/CardanoChain.ts
@@ -247,7 +247,6 @@ class CardanoChain extends AbstractUtxoChain<CardanoUtxo> {
     const txId = Buffer.from(
       CardanoWasm.hash_transaction(txBody).to_bytes()
     ).toString('hex');
-    if (!CardanoUtils.isTxIdValid(txId)) throw Error(`Invalid txId: [${txId}]`);
 
     const cardanoTx = new CardanoTransaction(
       txId,
@@ -451,9 +450,6 @@ class CardanoChain extends AbstractUtxoChain<CardanoUtxo> {
     transaction: PaymentTransaction,
     _signingStatus: SigningStatus = SigningStatus.Signed
   ): Promise<boolean> => {
-    // check if txId is valid
-    if (!CardanoUtils.isTxIdValid(transaction.txId)) return false;
-
     const tx = Serializer.deserialize(transaction.txBytes);
     const txBody = tx.body();
 

diff --git a/packages/chains/cardano/lib/CardanoUtils.ts b/packages/chains/cardano/lib/CardanoUtils.ts
@@ -161,13 +161,6 @@ class CardanoUtils {
       changeAmount
     );
   };
-
-  /**
-   * verifies that txId doesn't start with zero
-   * @param txId
-   * @returns
-   */
-  static isTxIdValid = (txId: string): boolean => txId[0] !== '0';
 }
 
 export default CardanoUtils;
diff --git a/packages/chains/cardano/package.json b/packages/chains/cardano/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rosen-chains/cardano",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "this project contains cardano chain for Rosen-bridge",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",

diff --git a/packages/chains/cardano/tests/CardanoChain.spec.ts b/packages/chains/cardano/tests/CardanoChain.spec.ts
@@ -939,31 +939,6 @@ describe('CardanoChain', () => {
       // check returned value
       expect(result).toEqual(false);
     });
-
-    /**
-     * @target CardanoChain.isTxValid should return false when
-     * txId is invalid
-     * @dependencies
-     * @scenario
-     * - mock PaymentTransaction
-     * - call the function
-     * - check returned value
-     * @expected
-     * - it should return false
-     */
-    it('should return false when txId is invalid', async () => {
-      // mock PaymentTransaction
-      const payment1 = CardanoTransaction.fromJson(
-        TestData.transaction7PaymentTransaction
-      );
-
-      // call the function
-      const cardanoChain = generateChainObject(network);
-      const result = await cardanoChain.isTxValid(payment1);
-
-      // check returned value
-      expect(result).toEqual(false);
-    });
   });
 
   describe('verifyTransactionFee', () => {

diff --git a/packages/networks/cardano-blockfrost/package.json b/packages/networks/cardano-blockfrost/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rosen-chains/cardano-blockfrost-network",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "a package to be used as network api provider for @rosen-chains/cardano package",
   "repository": "@rosen-chains/cardano-blockfrost-network",
   "license": "GPL-3.0",
@@ -37,6 +37,6 @@
     "@rosen-bridge/abstract-logger": "^1.0.0",
     "@rosen-bridge/rosen-extractor": "^3.0.0",
     "@rosen-chains/abstract-chain": "^3.2.2",
-    "@rosen-chains/cardano": "^3.2.2"
+    "@rosen-chains/cardano": "^3.2.3"
   }
 }
diff --git a/packages/networks/cardano-graphql/package.json b/packages/networks/cardano-graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rosen-chains/cardano-graphql-network",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "a package to be used as network api provider for @rosen-chains/cardano package",
   "repository": "@rosen-chains/cardano-graphql-network",
   "license": "GPL-3.0",
@@ -41,6 +41,6 @@
     "@rosen-bridge/abstract-logger": "^1.0.0",
     "@rosen-bridge/rosen-extractor": "^3.0.0",
     "@rosen-chains/abstract-chain": "^3.2.2",
-    "@rosen-chains/cardano": "^3.2.2"
+    "@rosen-chains/cardano": "^3.2.3"
   }
 }
diff --git a/packages/networks/cardano-koios/package.json b/packages/networks/cardano-koios/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rosen-chains/cardano-koios-network",
-  "version": "4.2.3",
+  "version": "4.2.4",
   "description": "cardano koios network package for rosen cardano chain",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",
@@ -26,7 +26,7 @@
     "@rosen-bridge/rosen-extractor": "^3.0.0",
     "@rosen-bridge/tokens": "^1.0.0",
     "@rosen-chains/abstract-chain": "^3.2.2",
-    "@rosen-chains/cardano": "^3.2.2",
+    "@rosen-chains/cardano": "^3.2.3",
     "@rosen-clients/cardano-koios": "^2.0.1"
   },
   "devDependencies": {