@instadapp/interop-x 0.0.0-dev.d71f27e → 0.0.0-dev.e33810b

package/src/db/models/transaction.ts

@@ -17,7 +17,7 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
 
     declare transactionHash: string;
     
-    declare action: string;
+    declare actionId: string;
     declare bridger: string;
     declare requestTransactionHash: string;
 
@@ -42,6 +42,7 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
     declare targetDelayUntil: CreationOptional<Date>;
 
     declare requestEvent: {
+        actionId: string;
         bridger: string;
         metadata: string;
         position: IPosition;
@@ -49,6 +50,7 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
         targetChainId: number;
     };
     declare requestSentEvent: CreationOptional<{
+        actionId: string;
         bridger: string;
         metadata: string;
         position: IPosition;
@@ -59,9 +61,6 @@ export class Transaction extends Model<InferAttributes<Transaction>, InferCreati
     declare committedEvent: CreationOptional<any>;
     declare completedEvent: CreationOptional<any>;
 
-    declare position: any;
-    declare metadata: CreationOptional<any>;
-
     declare status: CreationOptional<string>;
 
     declare createdAt: CreationOptional<Date>;
@@ -79,7 +78,7 @@ Transaction.init({
     requestBlockNumber: DataTypes.NUMBER,
 
     transactionHash: DataTypes.STRING,
-    action: DataTypes.STRING,
+    actionId: DataTypes.STRING,
     bridger: DataTypes.STRING,
 
     sourceChainId: DataTypes.NUMBER,
@@ -129,9 +128,6 @@ Transaction.init({
     committedEvent: DataTypes.JSON,
     completedEvent: DataTypes.JSON,
 
-    position: DataTypes.JSON,
-    metadata: DataTypes.JSON,
-
     status: {
         type: DataTypes.STRING,
         defaultValue: 'pending'

package/src/gnosis/actions/withdraw/index.ts

@@ -12,30 +12,51 @@ export default async function (transaction: Transaction, type: 'source' | 'targe
     const transactions: MetaTransaction[] = [];
     const logs: any[] = [];
 
-    if (transaction.action !== 'withdraw') {
-        throw new Error(`Invalid action: ${transaction.action}`)
+    if (transaction.actionId !== 'withdraw') {
+        throw new Error(`Invalid action: ${transaction.actionId}`)
     }
 
     if (type !== 'source') {
-        throw new Error(`Type not supported: ${type}`)
+        throw new Error(`[WIP] Type not supported: ${type}`)
     }
 
-    if (transaction.action === 'withdraw' && transaction.sourceStatus === 'pending') {
-        throw Error('Cannot build data for pending withdraw transaction');
+    if (transaction.sourceStatus === 'pending') {
+        throw Error('Source transaction already processesing')
+    }
+
+    if (transaction.sourceStatus === 'pending') {
+        throw Error('Source transaction already processed')
     }
 
     if (!transaction.requestEvent) {
-        throw Error('Cannot build data for transaction without requestEvent');
+        throw Error('Something went wrong, source transaction has no request event')
     }
 
-    const { bridger, position, sourceChainId, targetChainId, metadata, } = transaction.requestEvent;
+    const { actionId, bridger, position, sourceChainId, targetChainId, metadata} = transaction.requestEvent;
 
     const sourceChainProvider = new ethers.providers.JsonRpcProvider(getRpcProviderUrl(targetChainId as ChainId));
     const sourceWallet = new ethers.Wallet(config.privateKey, sourceChainProvider);
     const contractAddress = addresses[sourceChainId].interopXContract;
     const contract = getContract<InteropXContract>(contractAddress, abi.interopXContract, sourceWallet);
 
+    const sourceToken = tokens[sourceChainId].find(t => t.address.toLowerCase() === position.withdraw[0].sourceToken.toLowerCase());
+
+    if (!sourceToken) {
+        throw Error('Source token not found')
+    }
+
+    const targetToken = tokens[targetChainId].find(t => t.address.toLowerCase() === position.withdraw[0].targetToken.toLowerCase());
+
+    if (!targetToken) {
+        throw Error('Target token not found')
+    }
+
+    if (!sourceToken.aliases.some(alias => targetToken.aliases.includes(alias))) {
+        throw Error('Source and target token must be the same')
+    }
+
     const { data } = await contract.populateTransaction.withdrawRequested(
+        actionId,
         bridger,
         position.withdraw[0].sourceToken,
         position.withdraw[0].targetToken,

package/src/gnosis/index.ts

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

package/src/tasks/InteropXContract/SyncBridgeRequestEvents.ts

@@ -40,10 +40,10 @@ class SyncBridgeRequestEvents extends BaseTask {
                     continue;
                 }
 
-                const { bridger, position, sourceChainId, targetChainId, metadata } = event.args;
+                const { actionId, bridger, position, sourceChainId, targetChainId, metadata } = event.args;
 
                 const uniqueIdentifier = {
-                    action: 'withdraw', //todo
+                    actionId,
                     bridger,
                     requestTransactionHash: event.transactionHash,
                     sourceChainId: sourceChainId.toNumber(),
@@ -61,10 +61,9 @@ class SyncBridgeRequestEvents extends BaseTask {
                 await Transaction.create({
                     transactionHash,
                     ...uniqueIdentifier,
-                    position,
-                    metadata,
                     requestBlockNumber: event.blockNumber,
                     requestEvent: {
+                        actionId,
                         bridger,
                         position: {
                             withdraw: position.withdraw.map((v) => ({

package/src/tasks/InteropXContract/SyncBridgeRequestSentEvents.ts

@@ -41,10 +41,10 @@ class SyncBridgeRequestSentEvents extends BaseTask {
                     continue;
                 }
 
-                const { bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
+                const { actionId, bridger, position, sourceChainId, targetChainId, requestTransactionHash, metadata } = event.args;
 
                 const uniqueIdentifier = {
-                    action: 'withdraw',
+                    actionId,
                     bridger,
                     requestTransactionHash,
                     sourceChainId: sourceChainId,
@@ -68,6 +68,7 @@ class SyncBridgeRequestSentEvents extends BaseTask {
                 transaction.sourceBlockNumber = event.blockNumber;
                 transaction.sourceTransactionHash = event.transactionHash
                 transaction.requestSentEvent = {
+                    actionId,
                     bridger,
                     position: {
                         withdraw: position.withdraw.map((v) => ({