@instadapp/interop-x 0.0.0-dev.99c56eb → 0.0.0-dev.99c6cb0

package/src/abi/interopXContract.json

@@ -2,6 +2,12 @@
   {
     "anonymous": false,
     "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "actionId",
+        "type": "string"
+      },
       {
         "indexed": true,
         "internalType": "address",
@@ -83,6 +89,12 @@
   {
     "anonymous": false,
     "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "actionId",
+        "type": "string"
+      },
       {
         "indexed": true,
         "internalType": "address",
@@ -170,6 +182,12 @@
   {
     "anonymous": false,
     "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "actionId",
+        "type": "string"
+      },
       {
         "indexed": true,
         "internalType": "address",
@@ -245,6 +263,12 @@
   {
     "anonymous": false,
     "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "actionId",
+        "type": "string"
+      },
       {
         "indexed": true,
         "internalType": "address",
@@ -323,20 +347,14 @@
     "name": "LogBridgeRequestSent",
     "type": "event"
   },
-  {
-    "inputs": [],
-    "name": "_vnonce",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "inputs": [
+      { "internalType": "string", "name": "actionId", "type": "string" },
       { "internalType": "address", "name": "to_", "type": "address" },
       { "internalType": "address", "name": "sourceToken_", "type": "address" },
       { "internalType": "address", "name": "targetToken_", "type": "address" },
       { "internalType": "uint256", "name": "amount_", "type": "uint256" },
-      { "internalType": "uint32", "name": "targetChainId_", "type": "uint32" },
+      { "internalType": "uint32", "name": "sourceChainId_", "type": "uint32" },
       {
         "internalType": "bytes32",
         "name": "transactionHash_",
@@ -351,6 +369,27 @@
   },
   {
     "inputs": [
+      { "internalType": "address", "name": "user", "type": "address" },
+      { "internalType": "address[]", "name": "tokens", "type": "address[]" }
+    ],
+    "name": "getBridgeAmounts",
+    "outputs": [
+      {
+        "components": [
+          { "internalType": "uint256", "name": "deposit", "type": "uint256" },
+          { "internalType": "uint256", "name": "withdraw", "type": "uint256" }
+        ],
+        "internalType": "struct InteropXContractBeta.UserData[]",
+        "name": "userData",
+        "type": "tuple[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "string", "name": "actionId", "type": "string" },
       { "internalType": "address", "name": "sourceToken_", "type": "address" },
       { "internalType": "address", "name": "targetToken_", "type": "address" },
       { "internalType": "uint256", "name": "amount_", "type": "uint256" },
@@ -362,15 +401,39 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "token", "type": "address" },
+      { "internalType": "bool", "name": "toggle", "type": "bool" }
+    ],
+    "name": "toggleWhitelist",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      { "internalType": "address", "name": "", "type": "address" },
+      { "internalType": "address", "name": "", "type": "address" }
+    ],
+    "name": "userMapping",
+    "outputs": [
+      { "internalType": "uint256", "name": "deposit", "type": "uint256" },
+      { "internalType": "uint256", "name": "withdraw", "type": "uint256" }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "name": "whitelistedMapping",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+    "name": "whitelistedTokens",
+    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
     "stateMutability": "view",
     "type": "function"
   },
   {
     "inputs": [
+      { "internalType": "string", "name": "actionId", "type": "string" },
       { "internalType": "address", "name": "user_", "type": "address" },
       { "internalType": "address", "name": "sourceToken_", "type": "address" },
       { "internalType": "address", "name": "targetToken_", "type": "address" },

package/src/constants/addresses.ts

@@ -7,11 +7,11 @@ export const addresses = {
   137: {
     gnosisSafe: '0x5635d2910e51da33d9DC0422c893CF4F28B69A25',
     multisend: '0xA238CBeb142c10Ef7Ad8442C6D1f9E89e07e7761',
-    interopXContract: '0x2189741c8cAc1cf51570932817A7d6390646C80e',
+    interopXContract: '0x41bd77583674B3a5c073FBb4922C0C8dA91C43cF',
   },
   43114: {
     gnosisSafe: '0x31d7a5194Fe60AC209Cf1Ce2d539C9A60662Ed6b',
     multisend: '0x998739BFdAAdde7C933B942a68053933098f9EDa',
-    interopXContract: '0x1867DF97Ec24bb0bbD4AD464F0Be9C6713422EAE',
+    interopXContract: '0xCF391A3057eDba541c80307aC5E3Bc1E4a9471b7',
   }
 }

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;
@@ -76,7 +78,7 @@ Transaction.init({
     requestBlockNumber: DataTypes.NUMBER,
 
     transactionHash: DataTypes.STRING,
-    action: DataTypes.STRING,
+    actionId: DataTypes.STRING,
     bridger: DataTypes.STRING,
 
     sourceChainId: DataTypes.NUMBER,

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

@@ -12,8 +12,8 @@ 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') {
@@ -32,30 +32,31 @@ export default async function (transaction: Transaction, type: 'source' | 'targe
         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());
+    const sourceToken = tokens[sourceChainId].find(t => t.address.toLowerCase() === position.withdraw[0].sourceToken.toLowerCase());
 
-    if(!sourceToken) {
+    if (!sourceToken) {
         throw Error('Source token not found')
     }
 
-    const targetToken = tokens[targetChainId].find( t => t.address.toLowerCase() === position.withdraw[0].targetToken.toLowerCase());
+    const targetToken = tokens[targetChainId].find(t => t.address.toLowerCase() === position.withdraw[0].targetToken.toLowerCase());
 
-    if(!targetToken) {
+    if (!targetToken) {
         throw Error('Target token not found')
     }
 
-    if(sourceToken.aliases.some(alias => targetToken.aliases.includes(alias))) {
+    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(),
@@ -63,6 +63,7 @@ class SyncBridgeRequestEvents extends BaseTask {
                     ...uniqueIdentifier,
                     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) => ({