Merge branch '75-fix-tx-deserialization-on-ergochain-istxvalid' into …

…'dev' fix tx deserialization on isTxValid for ergo Closes #75 See merge request ergo/rosen-bridge/rosen-chains!84
rosen-bridge · Dec 31, 2023 · bfa80d4 · bfa80d4
2 parents 786a703 + 482f488
commit bfa80d4
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/chains/ergo/lib/ErgoChain.ts b/packages/chains/ergo/lib/ErgoChain.ts
@@ -591,10 +591,15 @@ class ErgoChain extends AbstractUtxoChain<wasm.ErgoBox> {
     signingStatus: SigningStatus = SigningStatus.Signed
   ): Promise<boolean> => {
     // deserialize transaction
-    const tx =
-      signingStatus === SigningStatus.Signed
-        ? Serializer.signedDeserialize(transaction.txBytes)
-        : Serializer.deserialize(transaction.txBytes).unsigned_tx();
+    let tx: wasm.Transaction | wasm.UnsignedTransaction;
+    try {
+      tx =
+        signingStatus === SigningStatus.Signed
+          ? Serializer.signedDeserialize(transaction.txBytes)
+          : Serializer.deserialize(transaction.txBytes).unsigned_tx();
+    } catch (e) {
+      tx = Serializer.deserialize(transaction.txBytes).unsigned_tx();
+    }
     // check if any input is spent or invalid
     let valid = true;
     const inputs = tx.inputs();

diff --git a/packages/chains/ergo/package.json b/packages/chains/ergo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rosen-chains/ergo",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "this project contains ergo chain for Rosen-bridge",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",

diff --git a/packages/networks/ergo-explorer/package.json b/packages/networks/ergo-explorer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rosen-chains/ergo-explorer-network",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "ergo explorer network package for rosen ergo chain",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",
@@ -25,7 +25,7 @@
     "@rosen-bridge/rosen-extractor": "^3.0.0",
     "@rosen-bridge/tokens": "^1.0.0",
     "@rosen-chains/abstract-chain": "^3.2.1",
-    "@rosen-chains/ergo": "^3.2.2",
+    "@rosen-chains/ergo": "^3.2.3",
     "@rosen-clients/ergo-explorer": "^1.0.3",
     "ergo-lib-wasm-nodejs": "^0.24.1",
     "it-all": "^3.0.1"

diff --git a/packages/networks/ergo-node/package.json b/packages/networks/ergo-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rosen-chains/ergo-node-network",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "description": "ergo node network package for rosen ergo chain",
   "main": "dist/lib/index.js",
   "types": "dist/lib/index.d.ts",
@@ -25,7 +25,7 @@
     "@rosen-bridge/rosen-extractor": "^3.0.0",
     "@rosen-bridge/tokens": "^1.0.0",
     "@rosen-chains/abstract-chain": "^3.2.1",
-    "@rosen-chains/ergo": "^3.2.2",
+    "@rosen-chains/ergo": "^3.2.3",
     "@rosen-clients/ergo-node": "^1.0.4",
     "ergo-lib-wasm-nodejs": "^0.24.1",
     "it-all": "^3.0.1"