@instadapp/interop-x 0.0.0-dev.d2e8d37 → 0.0.0-dev.de23e71

package/src/abi/interopBridgeToken.json

@@ -46,11 +46,17 @@
         "name": "amount",
         "type": "uint256"
       },
+      {
+        "indexed": false,
+        "internalType": "uint32",
+        "name": "sourceChainId",
+        "type": "uint32"
+      },
       {
         "indexed": true,
-        "internalType": "uint256",
-        "name": "chainId",
-        "type": "uint256"
+        "internalType": "uint32",
+        "name": "targetChainId",
+        "type": "uint32"
       }
     ],
     "name": "Burn",
@@ -73,14 +79,20 @@
       },
       {
         "indexed": true,
-        "internalType": "uint256",
-        "name": "chainId",
-        "type": "uint256"
+        "internalType": "uint32",
+        "name": "sourceChainId",
+        "type": "uint32"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint32",
+        "name": "targetChainId",
+        "type": "uint32"
       },
       {
         "indexed": true,
         "internalType": "bytes32",
-        "name": "transactionHash",
+        "name": "submitTransactionHash",
         "type": "bytes32"
       }
     ],
@@ -164,7 +176,7 @@
     "inputs": [
       { "internalType": "address", "name": "to", "type": "address" },
       { "internalType": "uint256", "name": "amount", "type": "uint256" },
-      { "internalType": "uint256", "name": "chainId", "type": "uint256" }
+      { "internalType": "uint32", "name": "chainId", "type": "uint32" }
     ],
     "name": "burn",
     "outputs": [],
@@ -206,7 +218,7 @@
     "inputs": [
       { "internalType": "address", "name": "to", "type": "address" },
       { "internalType": "uint256", "name": "amount", "type": "uint256" },
-      { "internalType": "uint256", "name": "chainId", "type": "uint256" },
+      { "internalType": "uint32", "name": "chainId", "type": "uint32" },
       {
         "internalType": "bytes32",
         "name": "transactionHash",

package/src/abi/interopXGateway.json

@@ -35,15 +35,15 @@
       },
       {
         "indexed": false,
-        "internalType": "uint256",
+        "internalType": "uint32",
         "name": "sourceChainId",
-        "type": "uint256"
+        "type": "uint32"
       },
       {
         "indexed": true,
-        "internalType": "uint256",
+        "internalType": "uint32",
         "name": "targetChainId",
-        "type": "uint256"
+        "type": "uint32"
       }
     ],
     "name": "LogGatewayDeposit",
@@ -72,15 +72,15 @@
       },
       {
         "indexed": true,
-        "internalType": "uint256",
+        "internalType": "uint32",
         "name": "sourceChainId",
-        "type": "uint256"
+        "type": "uint32"
       },
       {
         "indexed": false,
-        "internalType": "uint256",
+        "internalType": "uint32",
         "name": "targetChainId",
-        "type": "uint256"
+        "type": "uint32"
       },
       {
         "indexed": true,
@@ -122,7 +122,7 @@
     "inputs": [
       { "internalType": "address", "name": "token_", "type": "address" },
       { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-      { "internalType": "uint256", "name": "chainId_", "type": "uint256" }
+      { "internalType": "uint32", "name": "chainId_", "type": "uint32" }
     ],
     "name": "deposit",
     "outputs": [],
@@ -134,7 +134,7 @@
       { "internalType": "address", "name": "to_", "type": "address" },
       { "internalType": "address", "name": "token_", "type": "address" },
       { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-      { "internalType": "uint256", "name": "chainId_", "type": "uint256" }
+      { "internalType": "uint32", "name": "chainId_", "type": "uint32" }
     ],
     "name": "depositFor",
     "outputs": [],
@@ -160,7 +160,7 @@
       { "internalType": "uint256", "name": "amount_", "type": "uint256" },
       { "internalType": "address", "name": "user_", "type": "address" },
       { "internalType": "address", "name": "token_", "type": "address" },
-      { "internalType": "uint256", "name": "chainId_", "type": "uint256" },
+      { "internalType": "uint32", "name": "chainId_", "type": "uint32" },
       {
         "internalType": "bytes32",
         "name": "transactionHash_",

package/src/alias.ts

@@ -0,0 +1,6 @@
+import moduleAlias from 'module-alias';
+moduleAlias.addAliases({
+    "@": __dirname,
+})
+
+moduleAlias();

package/src/api/index.ts

@@ -20,6 +20,9 @@ export const startApiServer = async () => {
             return await Transaction.findAndCountAll({
                 limit: 20,
                 offset: 0,
+                order: [
+                    ['createdAt', 'DESC']
+                ]
             })
         })
 

package/src/config/index.ts

@@ -1,5 +1,7 @@
 import { ethers, Wallet } from "ethers"
 import { EventBus, EventBusType } from "@/types"
+import fs from 'fs-extra'
+import expandHomeDir from "expand-home-dir";
 
 class Config {
     public readonly events: EventBusType
@@ -9,15 +11,17 @@ class Config {
     public readonly wallet: Wallet
     public readonly staging: boolean
     public readonly autoUpdate: boolean
+    public readonly baseConfigPath: string
 
     constructor() {
         this.events = new EventBus()  as EventBusType
-        this.maxPeers = 10
+        this.maxPeers = 20
         this.privateKey = process.env.PRIVATE_KEY as string;
         this.staging = !! process.env.STAGING && process.env.STAGING === 'true';
         this.autoUpdate = !! process.env.AUTO_UPDATE && process.env.AUTO_UPDATE === 'true';
         this.wallet = new Wallet(this.privateKey);
         this.leadNodeAddress = '0x910E413DBF3F6276Fe8213fF656726bDc142E08E'
+        this.baseConfigPath = expandHomeDir(`~/.interop-x`);
     }
 
     get publicAddress(){
@@ -27,6 +31,10 @@ class Config {
     isLeadNode() {
         return ethers.utils.getAddress(this.leadNodeAddress) === ethers.utils.getAddress(this.wallet.address)
     }
+
+    isMaintenanceMode(){
+        return fs.existsSync(this.baseConfigPath + '/maintenance')
+    }
 }
 
 export default new Config()

package/src/constants/addresses.ts

@@ -12,6 +12,6 @@ export const addresses = {
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
     multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-    interopXGateway: '0x8D27758751BA488690974B6Ccfcda771D462945f',
+    interopXGateway: '0xF0317C5Bc206F2291dd2f3eE9C4cDB5Bbb25418d',
   }
 }

package/src/constants/itokens.ts

@@ -2,7 +2,7 @@ export const itokens = {
   1: [],
   137: [
     {
-      address: '0xEab02fe1F016eE3e4106c1C6aad35FeEe657268E',
+      address: '0x62C0045f3277E7067cAcad3c8038eEaBB1Bd92D1',
       symbol: 'USDC',
     }
   ],

package/src/db/models/transaction.ts

@@ -17,6 +17,7 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
     declare sourceBlockNumber: CreationOptional<number>;
     declare sourceStatus: string;
     declare sourceErrors: CreationOptional<string[]>;
+    declare sourceLogs: CreationOptional<any[]>;
     declare sourceCreatedAt: CreationOptional<Date>;
     declare sourceDelayUntil: CreationOptional<Date>;
 
@@ -25,6 +26,7 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
     declare targetBlockNumber: CreationOptional<number>;
     declare targetStatus: string;
     declare targetErrors: CreationOptional<string[]>;
+    declare targetLogs: CreationOptional<any[]>;
     declare targetCreatedAt: CreationOptional<Date>;
     declare targetDelayUntil: CreationOptional<Date>;
 
@@ -64,6 +66,10 @@ Transaction.init({
         type: DataTypes.JSON,
         // defaultValue: [],
     },
+    sourceLogs: {
+        type: DataTypes.JSON,
+        // defaultValue: [],
+    },
     sourceCreatedAt: {
         type: DataTypes.DATE,
         defaultValue: Date.now()
@@ -78,6 +84,10 @@ Transaction.init({
         type: DataTypes.JSON,
         // defaultValue: [],
     },
+    targetLogs: {
+        type: DataTypes.JSON,
+        // defaultValue: [],
+    },
     targetCreatedAt: DataTypes.DATE,
     targetDelayUntil: DataTypes.DATE,
 

package/src/gnosis/actions/deposit.ts

@@ -0,0 +1,63 @@
+import abi from "@/abi";
+import config from "@/config";
+import { itokens, tokens } from "@/constants";
+import { Transaction } from "@/db";
+import { InteropBridgeToken } from "@/typechain";
+import { ChainId } from "@/types";
+import { getContract, getRpcProviderUrl } from "@/utils";
+import { ethers } from "ethers";
+import {  MetaTransaction, OperationType } from "ethers-multisend";
+
+export default async function (transaction: Transaction, type: 'source' | 'target') {
+    const transactions: MetaTransaction[] = [];
+    const logs: any[] = [];
+
+    if (transaction.sourceStatus === 'pending') {
+        throw Error('Cannot build data for pending deposit transaction');
+    }
+
+    if (!transaction.submitEvent) {
+        throw Error('Cannot build data for transaction without submitEvent');
+    }
+
+
+    const token = tokens[transaction.sourceChainId].find(token => token.address.toLowerCase() === transaction.submitEvent.token.toLowerCase());
+
+    if (!token) {
+        throw Error(`Unsupported token ${transaction.submitEvent.token}`);
+    }
+
+    const itoken = itokens[transaction.targetChainId].find(t => t.symbol.toLowerCase() === token.symbol.toLowerCase());
+
+    if (!itoken) {
+        throw Error(`Unsupported itoken ${token.symbol}`);
+    }
+
+    const targetChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(transaction.targetChainId as ChainId));
+    const targetWallet = new ethers.Wallet(config.privateKey, targetChainProvider);
+    const interopBridgeContract = getContract<InteropBridgeToken>(itoken.address, abi.interopBridgeToken, targetWallet);
+
+    const { data } = await interopBridgeContract.populateTransaction.mint(
+        transaction.submitEvent.user,
+        ethers.BigNumber.from(transaction.submitEvent.amount.toString()),
+        ethers.BigNumber.from(transaction.submitEvent.sourceChainId.toString()),
+        transaction.submitTransactionHash,
+    );
+
+    transactions.push({
+        to: itoken.address,
+        data: data!,
+        value: '0',
+        operation: OperationType.Call,
+    });
+
+    logs.push({
+        type: 'mint', // mint, approved, burn, transfer, borrow, swap, repay, collected, traded, .....
+        message: `Minted ${transaction.submitEvent.amount / 10 ** token.decimals} ${token.symbol} to ${transaction.submitEvent.user}`,
+    })
+
+    return {
+        transactions,
+        logs,
+    }
+}

package/src/gnosis/actions/index.ts

@@ -0,0 +1,7 @@
+import deposit from "./deposit"
+import withdraw from "./withdraw"
+
+export default {
+    deposit,
+    withdraw,
+}

package/src/gnosis/actions/withdraw.ts

@@ -0,0 +1,67 @@
+import abi from "@/abi";
+import config from "@/config";
+import { addresses, itokens, tokens } from "@/constants";
+import { Transaction } from "@/db";
+import { InteropXGateway } from "@/typechain";
+import { ChainId } from "@/types";
+import { getContract, getRpcProviderUrl } from "@/utils";
+import { ethers } from "ethers";
+import { MetaTransaction, OperationType } from "ethers-multisend";
+
+export default async function (transaction: Transaction, type: 'source' | 'target') {
+    const transactions: MetaTransaction[] = [];
+    const logs: any[] = [];
+
+    if (transaction.action !== 'withdraw') {
+        throw new Error(`Invalid action: ${transaction.action}`)
+    }
+
+    if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
+        throw Error('Cannot build data for pending withdraw transaction');
+    }
+
+    if (!transaction.submitEvent) {
+        throw Error('Cannot build data for transaction without submitEvent');
+    }
+
+    const { to, amount, sourceChainId, targetChainId, itoken: itokenAddress } = transaction.submitEvent;
+
+    const itoken = itokens[sourceChainId].find(token => token.address.toLowerCase() === itokenAddress.toLowerCase());
+
+    if (!itoken) {
+        throw Error(`Unsupported itoken ${itokenAddress}`);
+    }
+
+    const token = tokens[targetChainId].find(t => t.symbol.toLowerCase() === itoken.symbol.toLowerCase());
+
+    if (!token) {
+        throw Error(`Unsupported token ${itoken.symbol}`);
+    }
+
+    const targetChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(targetChainId as ChainId));
+    const targetWallet = new ethers.Wallet(config.privateKey, targetChainProvider);
+    const gatewayAddress = addresses[targetChainId].interopXGateway;
+    const interopBridgeContract = getContract<InteropXGateway>(gatewayAddress, abi.interopXGateway, targetWallet);
+
+    const { data } = await interopBridgeContract.populateTransaction.systemWithdraw(
+        ethers.BigNumber.from(amount.toString()),
+        to,
+        token.address,
+        ethers.BigNumber.from(sourceChainId.toString()),
+        transaction.submitTransactionHash,
+    );
+
+    transactions.push({
+        to: gatewayAddress,
+        data: data!,
+        value: '0',
+        operation: OperationType.Call,
+    });
+
+    logs.push({
+        type: 'transfer',
+        message: `Transfer ${amount / 10 ** token.decimals} ${token.symbol} to ${to}`,
+    })
+
+    return { transactions, logs }
+}

package/src/gnosis/index.ts

@@ -0,0 +1,19 @@
+import { Transaction } from "@/db";
+import { encodeMulti } from "ethers-multisend";
+import actions from "./actions";
+
+export const buildGnosisAction = async (transaction: Transaction, type?: 'source' | 'target') => {
+    type = type || transaction.sourceStatus === 'pending' ? 'source' : 'target';
+
+    if (actions.hasOwnProperty(transaction.action)) {
+
+        const { transactions, logs } = await actions[transaction.action](transaction, type);
+
+        return {
+            data: encodeMulti(transactions).data,
+            logs
+        };
+    }
+
+    throw new Error(`Unknown action: ${transaction.action}`);
+}

package/src/index.ts

@@ -1,21 +1,7 @@
-import moduleAlias from 'module-alias';
-
-moduleAlias.addAliases({
-    "@/": __dirname + "/",
-    "@/logger": __dirname + "/logger",
-    "@/tasks": __dirname + "/tasks",
-    "@/utils": __dirname + "/utils",
-    "@/api": __dirname + "/api",
-    "@/net": __dirname + "/net",
-    "@/db": __dirname + "/db",
-    "@/config": __dirname + "/config",
-    "@/types": __dirname + "/types",
-    "@/abi": __dirname + "/abi",
-    "@/constants": __dirname + "/constants",
-    "@/typechain": __dirname + "/typechain"
-})
+import './alias'
+import expandHomeDir from "expand-home-dir";
+import fs from 'fs-extra'
 
-moduleAlias();
 import dotenv from "dotenv";
 import chalk from 'chalk';
 import { ethers } from "ethers";
@@ -25,12 +11,30 @@ dotenv.config();
 import Logger from "@/logger";
 const logger = new Logger('Process')
 
+const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
+
 const printUsage = () => {
+    console.log()
+    console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
+    console.log()
+
     console.log('Usage:')
-    console.log('   PRIVATE_KEY=abcd1234 interop-x')
-    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x')
-    console.log('   PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x')
-    console.log('   PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x')
+    console.log('   interop-x help                                                              Show this message')
+    console.log('   interop-x version                                                           Print out the installed version of Interop X')
+
+    console.log()
+
+    console.log('   interop-x down                                                              Put the node into maintenance mode')
+    console.log('   interop-x up                                                                Take the node out of maintenance mode')
+
+    console.log()
+
+    console.log('   PRIVATE_KEY=abcd1234 interop-x                                              Start the node with the given private key')
+    console.log('   PRIVATE_KEY=abcd1234 STAGING=true interop-x                                 Start the node in staging mode')
+    console.log('   PRIVATE_KEY=abcd1234 AUTO_UPDATE=true interop-x                             Start the node in auto update mode')
+    console.log('   PRIVATE_KEY=abcd1234 API_HOST=0.0.0.0 API_PORT=8080 interop-x               Start the node with custom API host and port')
+    console.log()
+
 }
 
 if (process.argv.at(-1) === 'help') {
@@ -38,14 +42,27 @@ if (process.argv.at(-1) === 'help') {
     process.exit(0)
 }
 
-const GIT_SHORT_HASH = '@GIT_SHORT_HASH@';
+const basePath = expandHomeDir(`~/.interop-x`);
+
+if (process.argv.at(-1) === 'down') {
+    fs.outputFileSync(basePath + '/maintenance', Date.now().toString())
+    console.log(chalk.red('Maintenance mode enabled'))
+    process.exit(0)
+}
+
+if (process.argv.at(-1) === 'up') {
+    fs.removeSync(basePath + '/maintenance')
+    console.log(chalk.green('Maintenance mode disabled'))
+    process.exit(0)
+}
+
 
 if (process.argv.at(-1) === 'version') {
     console.log(`Interop X Node (v${packageJson.version} - rev.${GIT_SHORT_HASH})`)
     process.exit(0)
 }
 
-if(! process.env.PRIVATE_KEY) {
+if (!process.env.PRIVATE_KEY) {
     console.error(chalk.bgRed.white.bold('Please provide a private key\n'))
     printUsage()
     process.exit(1)
@@ -80,10 +97,10 @@ async function main() {
         if (!peerPool.isLeadNode(payload.peerId)) {
             const peer = peerPool.getPeer(payload.peerId)
 
-            if(! peer) {
+            if (!peer) {
                 return;
             }
-            
+
             logger.info(`ignored transaction status from ${payload.peerId} ${shortenHash(peer.publicAddress)} `)
             return;
         }
@@ -97,10 +114,12 @@ async function main() {
         transaction.sourceStatus = payload.data.sourceStatus
         transaction.sourceTransactionHash = payload.data.sourceTransactionHash
         transaction.sourceErrors = payload.data.sourceErrors
+        transaction.sourceLogs = payload.data.sourceLogs
 
         transaction.targetStatus = payload.data.targetStatus
         transaction.targetTransactionHash = payload.data.targetTransactionHash
         transaction.targetErrors = payload.data.targetErrors
+        transaction.targetLogs = payload.data.targetLogs
 
         transaction.status = payload.data.status
 

package/src/net/protocol/dial/SignatureDialProtocol.ts

@@ -2,12 +2,13 @@ import { BaseDialProtocol } from "./BaseDialProtocol";
 import wait from "waait";
 import config from "@/config";
 import { Transaction } from "@/db";
-import { buildDataForTransaction, signGnosisSafeTx } from "@/utils";
+import { signGnosisSafeTx } from "@/utils";
 import { addresses } from "@/constants";
 import { ChainId } from "@/types";
+import { buildGnosisAction } from "@/gnosis";
 
 export interface ISignatureRequest {
-    type: 'source' | 'target' ,
+    type: 'source' | 'target',
     transactionHash: string
     safeTxGas: string
     safeNonce: string
@@ -46,18 +47,11 @@ export class SignatureDialProtocol extends BaseDialProtocol<ISignatureRequest, I
                 error: 'Event not found'
             };
         }
-
-        console.log("signing:", {
-            to: addresses[transaction.targetChainId].multisend,
-            data: await buildDataForTransaction(transaction, data.type),
-            chainId: transaction.targetChainId as ChainId,
-            safeTxGas: data.safeTxGas,
-            nonce: data.safeNonce,
-        });
+        const { data: gnosisData } = await buildGnosisAction(transaction, data.type);
 
         const signedData = await signGnosisSafeTx({
             to: addresses[transaction.targetChainId].multisend,
-            data: await buildDataForTransaction(transaction, data.type),
+            data: gnosisData,
             chainId: transaction.targetChainId as ChainId,
             safeTxGas: data.safeTxGas,
             nonce: data.safeNonce,

package/src/net/protocol/dial/{SignatureDialProtocol.1.ts → TransactionStatusDialProtocol.ts}

@@ -1,7 +1,7 @@
 import { BaseDialProtocol } from "./BaseDialProtocol";
 import { Transaction } from "@/db";
 
-export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'> | null> {
+export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs'  | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'> | null> {
     protected timeout = 30000;
 
     constructor(libp2p) {
@@ -20,10 +20,12 @@ export class TransactionStatusDialProtocol extends BaseDialProtocol<string, Pick
             sourceStatus: transaction.sourceStatus,
             sourceTransactionHash: transaction.sourceTransactionHash,
             sourceErrors: transaction.sourceErrors,
+            sourceLogs: transaction.sourceLogs,
 
             targetStatus: transaction.targetStatus,
             targetTransactionHash: transaction.targetTransactionHash,
             targetErrors: transaction.targetErrors,
+            targetLogs: transaction.targetLogs,
 
             status: transaction.status,
         }

package/src/net/protocol/index.ts

@@ -6,7 +6,7 @@ import { IPeerInfo, peerPool } from "..";
 import config from "@/config";
 import { Event } from "@/types";
 import { Transaction } from "@/db";
-import { TransactionStatusDialProtocol } from "./dial/SignatureDialProtocol.1";
+import { TransactionStatusDialProtocol } from "./dial/TransactionStatusDialProtocol";
 
 export interface ProtocolOptions {
     /* Handshake timeout in ms (default: 8000) */
@@ -36,7 +36,7 @@ interface PeerInfoEvent extends BaseMessageEvent {
 }
 
 interface TransactionStatusEvent extends BaseMessageEvent {
-    data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'status'>
+    data: Pick<Transaction, 'transactionHash' | 'sourceStatus' | 'sourceTransactionHash' | 'sourceErrors' | 'sourceLogs' | 'targetStatus' | 'targetTransactionHash' | 'targetErrors' | 'targetLogs' | 'status'>
 }
 
 declare interface Protocol {
@@ -66,25 +66,35 @@ class Protocol extends EventEmitter {
                 Buffer.from(transaction.transactionHash),
 
                 Buffer.from(transaction.sourceStatus),
-                Buffer.from(transaction.sourceTransactionHash),
+                Buffer.from(transaction.sourceTransactionHash || ''),
                 transaction.sourceErrors ? transaction.sourceErrors.map((e) => Buffer.from(e)) : [],
+                transaction.sourceLogs ? transaction.sourceLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
 
                 Buffer.from(transaction.targetStatus),
-                Buffer.from(transaction.targetTransactionHash),
+                Buffer.from(transaction.targetTransactionHash || ''),
                 transaction.targetErrors ? transaction.targetErrors.map((e) => Buffer.from(e)) : [],
+                transaction.targetLogs ? transaction.targetLogs.map((e) => [Buffer.from(e.type), Buffer.from(e.message)]) : [],
 
                 Buffer.from(transaction.status),
             ],
-            decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, targetStatus, targetTransactionHash, targetErrors, status]: [Buffer, Buffer, Buffer, Buffer[], Buffer, Buffer, Buffer[], Buffer]) => ({
+            decode: ([transactionHash, sourceStatus, sourceTransactionHash, sourceErrors, sourceLogs, targetStatus, targetTransactionHash, targetErrors, targetLogs, status]: [Buffer, Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer, Buffer, Buffer[],[Buffer,Buffer][], Buffer]) => ({
                 transactionHash: transactionHash.toString(),
 
                 sourceStatus: sourceStatus.toString(),
-                sourceTransactionHash: sourceTransactionHash.toString(),
+                sourceTransactionHash: sourceTransactionHash.toString() || null,
                 sourceErrors: sourceErrors.map((e) => e.toString()),
+                sourceLogs: sourceLogs.map(e => ({
+                    type: e[0].toString(),
+                    message: e[1].toString(),
+                })),
 
                 targetStatus: targetStatus.toString(),
-                targetTransactionHash: targetTransactionHash.toString(),
+                targetTransactionHash: targetTransactionHash.toString() || null,
                 targetErrors: targetErrors.map((e) => e.toString()),
+                targetLogs: targetLogs.map(e => ({
+                    type: e[0].toString(),
+                    message: e[1].toString(),
+                })),
 
                 status: status.toString(),
             }),