Merge branch '109-consider-transaction-failure-in-evmchain' into 'dev'

consider transaction failure Closes #109 See merge request ergo/rosen-bridge/rosen-chains!126
rosen-bridge · Aug 4, 2024 · 87df5f6 · 87df5f6
2 parents 2a0a667 + 9729309
commit 87df5f6
Show file tree

Hide file tree

Showing 23 changed files with 535 additions and 76 deletions.
diff --git a/.changeset/khaki-countries-act.md b/.changeset/khaki-countries-act.md
@@ -0,0 +1,6 @@
+---
+'@rosen-chains/evm-rpc': major
+'@rosen-chains/evm': major
+---
+
+consider transaction failure
diff --git a/.changeset/quick-parrots-prove.md b/.changeset/quick-parrots-prove.md
@@ -0,0 +1,9 @@
+---
+'@rosen-chains/abstract-chain': major
+'@rosen-chains/bitcoin': major
+'@rosen-chains/cardano': major
+'@rosen-chains/ergo': major
+'@rosen-chains/evm': major
+---
+
+change `verifyLockTransactionExtraConditions` to async
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/abstract-chain/lib/AbstractChain.ts b/packages/abstract-chain/lib/AbstractChain.ts
@@ -228,7 +228,7 @@ abstract class AbstractChain<TxType> {
             `Failed in comparing event amount to fees: ${e}`
           );
         }
-        if (this.verifyLockTransactionExtraConditions(tx, blockInfo)) {
+        if (await this.verifyLockTransactionExtraConditions(tx, blockInfo)) {
           this.logger.info(
             `Event [${eventId}] has been successfully validated`
           );
@@ -270,10 +270,10 @@ abstract class AbstractChain<TxType> {
    * @param blockInfo
    * @returns true if the transaction is verified
    */
-  verifyLockTransactionExtraConditions = (
+  verifyLockTransactionExtraConditions = async (
     transaction: TxType,
     blockInfo: BlockInfo
-  ): boolean => {
+  ): Promise<boolean> => {
     throw Error(
       `You must implement 'verifyLockTransactionExtraConditions' or override 'verifyEvent' implementation`
     );

diff --git a/packages/abstract-chain/package.json b/packages/abstract-chain/package.json
@@ -23,7 +23,7 @@
     "@rosen-bridge/abstract-logger": "^1.0.0",
     "@rosen-bridge/json-bigint": "^0.1.0",
     "@rosen-bridge/minimum-fee": "^2.1.0",
-    "@rosen-bridge/rosen-extractor": "^6.0.1",
+    "@rosen-bridge/rosen-extractor": "^6.1.0",
     "@rosen-bridge/tokens": "^1.2.1",
     "blakejs": "^1.2.1"
   },

diff --git a/packages/abstract-chain/tests/AbstractChain.spec.ts b/packages/abstract-chain/tests/AbstractChain.spec.ts
@@ -273,7 +273,7 @@ describe('AbstractChain', () => {
         chain,
         'verifyLockTransactionExtraConditions'
       );
-      verifyLockTxSpy.mockReturnValueOnce(true);
+      verifyLockTxSpy.mockResolvedValueOnce(true);
 
       // run test
       const result = await chain.verifyEvent(event, feeConfig);
@@ -517,7 +517,7 @@ describe('AbstractChain', () => {
         chain,
         'verifyLockTransactionExtraConditions'
       );
-      verifyLockTxSpy.mockReturnValueOnce(true);
+      verifyLockTxSpy.mockResolvedValueOnce(true);
 
       // run test
       const result = await chain.verifyEvent(event, feeConfig);
@@ -597,7 +597,7 @@ describe('AbstractChain', () => {
         chain,
         'verifyLockTransactionExtraConditions'
       );
-      verifyLockTxSpy.mockReturnValueOnce(true);
+      verifyLockTxSpy.mockResolvedValueOnce(true);
 
       // run test
       const result = await chain.verifyEvent(event, fee);
@@ -677,7 +677,7 @@ describe('AbstractChain', () => {
         chain,
         'verifyLockTransactionExtraConditions'
       );
-      verifyLockTxSpy.mockReturnValueOnce(true);
+      verifyLockTxSpy.mockResolvedValueOnce(true);
 
       // run test
       const result = await chain.verifyEvent(event, fee);
@@ -746,7 +746,7 @@ describe('AbstractChain', () => {
         chain,
         'verifyLockTransactionExtraConditions'
       );
-      verifyLockTxSpy.mockReturnValueOnce(false);
+      verifyLockTxSpy.mockResolvedValueOnce(false);
 
       // run test
       const result = await chain.verifyEvent(event, feeConfig);

diff --git a/packages/chains/bitcoin/lib/BitcoinChain.ts b/packages/chains/bitcoin/lib/BitcoinChain.ts
@@ -361,10 +361,10 @@ class BitcoinChain extends AbstractUtxoChain<BitcoinTx, BitcoinUtxo> {
    * @param blockInfo
    * @returns true if the transaction is verified
    */
-  verifyLockTransactionExtraConditions = (
+  verifyLockTransactionExtraConditions = async (
     transaction: BitcoinTx,
     blockInfo: BlockInfo
-  ): boolean => {
+  ): Promise<boolean> => {
     return true;
   };
 

diff --git a/packages/chains/bitcoin/package.json b/packages/chains/bitcoin/package.json
@@ -36,7 +36,7 @@
     "@rosen-bridge/abstract-logger": "^1.0.0",
     "@rosen-bridge/bitcoin-utxo-selection": "^0.2.0",
     "@rosen-bridge/json-bigint": "^0.1.0",
-    "@rosen-bridge/rosen-extractor": "^6.0.1",
+    "@rosen-bridge/rosen-extractor": "^6.1.0",
     "@rosen-bridge/tokens": "^1.2.1",
     "bitcoinjs-lib": "^6.1.5"
   },

diff --git a/packages/chains/cardano/lib/CardanoChain.ts b/packages/chains/cardano/lib/CardanoChain.ts
@@ -544,10 +544,10 @@ class CardanoChain extends AbstractUtxoChain<CardanoTx, CardanoUtxo> {
    * @param blockInfo
    * @returns true if the transaction is verified
    */
-  verifyLockTransactionExtraConditions = (
+  verifyLockTransactionExtraConditions = async (
     transaction: CardanoTx,
     blockInfo: BlockInfo
-  ): boolean => {
+  ): Promise<boolean> => {
     return true;
   };
 

diff --git a/packages/chains/cardano/package.json b/packages/chains/cardano/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@emurgo/cardano-serialization-lib-nodejs": "^11.3.1",
     "@rosen-bridge/abstract-logger": "^1.0.0",
-    "@rosen-bridge/rosen-extractor": "^6.0.1",
+    "@rosen-bridge/rosen-extractor": "^6.1.0",
     "@rosen-bridge/json-bigint": "^0.1.0",
     "@rosen-bridge/tokens": "^1.2.1",
     "bech32": "^2.0.0"

diff --git a/packages/chains/ergo/lib/ErgoChain.ts b/packages/chains/ergo/lib/ErgoChain.ts
@@ -534,10 +534,10 @@ class ErgoChain extends AbstractUtxoChain<wasm.Transaction, wasm.ErgoBox> {
    * @param blockInfo
    * @returns true if the transaction is verified
    */
-  verifyLockTransactionExtraConditions = (
+  verifyLockTransactionExtraConditions = async (
     transaction: wasm.Transaction,
     blockInfo: BlockInfo
-  ): boolean => {
+  ): Promise<boolean> => {
     const outputs = transaction.outputs();
     for (let i = 0; i < outputs.len(); i++) {
       const box = outputs.get(i);

diff --git a/packages/chains/ergo/package.json b/packages/chains/ergo/package.json
@@ -22,7 +22,7 @@
   "dependencies": {
     "@rosen-bridge/abstract-logger": "^1.0.0",
     "@rosen-bridge/json-bigint": "^0.1.0",
-    "@rosen-bridge/rosen-extractor": "^6.0.1",
+    "@rosen-bridge/rosen-extractor": "^6.1.0",
     "@rosen-bridge/tokens": "^1.2.1",
     "ergo-lib-wasm-nodejs": "^0.24.1"
   },

diff --git a/packages/chains/ergo/tests/ErgoChain.spec.ts b/packages/chains/ergo/tests/ErgoChain.spec.ts
@@ -1097,7 +1097,7 @@ describe('ErgoChain', () => {
      * @expected
      * - it should return false
      */
-    it('should return false when output box creation height is more than a year ago', () => {
+    it('should return false when output box creation height is more than a year ago', async () => {
       const blockInfo: BlockInfo = {
         hash: ergoTestUtils.generateRandomId(),
         parentHash: ergoTestUtils.generateRandomId(),
@@ -1108,7 +1108,7 @@ describe('ErgoChain', () => {
       );
 
       const ergoChain = ergoTestUtils.generateChainObject(network);
-      const result = ergoChain.verifyLockTransactionExtraConditions(
+      const result = await ergoChain.verifyLockTransactionExtraConditions(
         mockedTx,
         blockInfo
       );
@@ -1127,7 +1127,7 @@ describe('ErgoChain', () => {
      * @expected
      * - it should return true
      */
-    it('should return true when all output boxes creation heights are fresh', () => {
+    it('should return true when all output boxes creation heights are fresh', async () => {
       const blockInfo: BlockInfo = {
         hash: ergoTestUtils.generateRandomId(),
         parentHash: ergoTestUtils.generateRandomId(),
@@ -1138,7 +1138,7 @@ describe('ErgoChain', () => {
       );
 
       const ergoChain = ergoTestUtils.generateChainObject(network);
-      const result = ergoChain.verifyLockTransactionExtraConditions(
+      const result = await ergoChain.verifyLockTransactionExtraConditions(
         mockedTx,
         blockInfo
       );