Merge branch 'feat/zilswap-v2' of https://github.com/switcheo/zilswap-sdk into feat/zilswap-v2

Author: stevenkhong

src/zilswap-v2/ZilSwapV2.ts

@@ -1,6 +1,12 @@
+<<<<<<< HEAD
 import { Transaction, TxReceipt as _TxReceipt, TxStatus as _TxStatus, Wallet } from '@zilliqa-js/account'
 import { CallParams, Contract, Value } from '@zilliqa-js/contract'
 import { Provider } from '@zilliqa-js/core'
+=======
+import { Transaction, TxReceipt as _TxReceipt, Wallet, TxStatus as _TxStatus } from '@zilliqa-js/account'
+import { CallParams, Contract, Value } from '@zilliqa-js/contract'
+import { TransactionError, Provider } from '@zilliqa-js/core'
+>>>>>>> 9aef6cc41b5ba83143da23ec31e29ffbd353d2f0
 import { fromBech32Address, toBech32Address } from '@zilliqa-js/crypto'
 import { MessageType, NewEventSubscription, StatusType } from '@zilliqa-js/subscriptions'
 import { BN, Long, units } from '@zilliqa-js/util'
@@ -1760,7 +1766,10 @@ export class ZilSwapV2 {
       tx = await this.zilliqa.blockchain.createTransactionWithoutConfirm(transaction);
     }
 
-    console.log("obv tx", tx)
+    if (tx.isRejected()) {
+      throw new Error('Submitted transaction was rejected.')
+    }
+
     const observeTxn = {
       hash: tx.id!,
       deadline,