fix: event emits

Author: bishalbikram

contracts/solana/programs/intent/src/connection.rs

@@ -13,11 +13,11 @@ pub fn send_message<'info>(
 ) -> Result<()> {
     let conn_sn = config.increment_conn_sn();
 
-    event::Message {
+    emit!(event::Message {
         targetNetwork: to,
         sn: conn_sn,
         msg,
-    };
+    });
 
     Ok(())
 }

contracts/solana/programs/intent/src/instructions/cancel.rs

@@ -66,10 +66,11 @@ pub fn resolve_cancel<'info>(
     let order_msg = OrderMessage::new(MessageType::FILL, fill.encode());
 
     connection::send_message(config, order.src_nid(), order_msg.encode())?;
-    event::OrderCancelled {
+
+    emit!(event::OrderCancelled {
         id: order.id(),
         srcNID: order.src_nid(),
-    };
+    });
 
     Ok(())
 }

contracts/solana/programs/intent/src/instructions/fill.rs

@@ -15,10 +15,10 @@ use crate::{
     recv_message::*,
     state::*,
     types::{
+        misc::Resolve,
         order_fill::OrderFill,
         order_message::{MessageType, OrderMessage},
         swap_order::SwapOrder,
-        misc::Resolve,
     },
 };
 
@@ -109,10 +109,10 @@ pub fn order_fill<'info>(
     let order_msg = OrderMessage::new(MessageType::FILL, fill.encode());
     connection::send_message(config, order.dst_nid(), order_msg.encode())?;
 
-    event::OrderFilled {
+    emit!(event::OrderFilled {
         id: order.id(),
         srcNID: order.src_nid(),
-    };
+    });
 
     Ok(())
 }
@@ -167,7 +167,7 @@ pub fn resolve_fill(
         )?;
     }
 
-    event::OrderClosed { id: order.id() };
+    emit!(event::OrderClosed { id: order.id() });
 
     Ok(())
 }

contracts/solana/programs/intent/src/instructions/swap.rs

@@ -58,7 +58,7 @@ pub fn swap_order(ctx: Context<SwapCtx>, order: SwapOrder) -> Result<()> {
         )?;
     }
 
-    event::SwapIntent {
+    emit!(event::SwapIntent {
         id: order.id(),
         emitter: order.emitter(),
         srcNID: order.src_nid(),
@@ -70,7 +70,7 @@ pub fn swap_order(ctx: Context<SwapCtx>, order: SwapOrder) -> Result<()> {
         toToken: order.to_token(),
         toAmount: order.to_amount(),
         data: order.data(),
-    };
+    });
 
     Ok(())
 }

contracts/solana/scripts/initialize.ts

@@ -0,0 +1,45 @@
+import { PublicKey } from "@solana/web3.js";
+import { SYSTEM_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/native/system";
+
+import { TxnHelpers } from "./utils/transaction";
+import { IntentPda, intentProgram, wallet, connection } from "./setup";
+
+const txnHelpers = new TxnHelpers(connection, wallet.payer);
+
+const args = process.argv.slice(2);
+if (args.length != 2) throw new Error("Invalid arguments");
+
+const networkId = args[0];
+const feeHandler = new PublicKey(args[1]);
+
+const initializeContract = async () => {
+  let config = await intentProgram.account.config.fetchNullable(
+    IntentPda.config().pda
+  );
+  if (!config) {
+    const initializeIx = await intentProgram.methods
+      .initialize(networkId, feeHandler)
+      .signers([wallet.payer])
+      .accountsStrict({
+        signer: wallet.publicKey,
+        systemProgram: SYSTEM_PROGRAM_ID,
+        config: IntentPda.config().pda,
+        nativeVaultAccount: IntentPda.vaultNative().pda,
+      })
+      .instruction();
+
+    const tx = await txnHelpers.buildV0Txn([initializeIx], [wallet.payer]);
+    const txSig = await connection.sendTransaction(tx);
+    return txSig;
+  }
+};
+
+initializeContract()
+  .then(async (res) => {
+    console.log("Contract initializing");
+    if (res) await txnHelpers.logParsedTx(res);
+    console.log("Contract initialized successfully");
+  })
+  .catch((err) => {
+    console.log(err);
+  });

contracts/solana/scripts/recv-message.ts

@@ -0,0 +1,33 @@
+import { TxnHelpers } from "./utils/transaction";
+import { wallet, connection, getRecvMessageIx } from "./setup";
+
+const txnHelpers = new TxnHelpers(connection, wallet.payer);
+
+const args = process.argv.slice(2);
+if (args.length != 3) throw new Error("Invalid arguments");
+
+const srcNetwork = args[0];
+const connSn = Number(args[1]);
+const msg = Buffer.from(args[2], "hex");
+
+const recvMessage = async () => {
+  const recvMessageIx = await getRecvMessageIx(
+    srcNetwork,
+    connSn,
+    msg,
+    wallet.publicKey
+  );
+  const tx = await txnHelpers.buildV0Txn([recvMessageIx], [wallet.payer]);
+  const txSig = await connection.sendTransaction(tx);
+  return txSig;
+};
+
+recvMessage()
+  .then(async (res) => {
+    console.log("Receive Message");
+    if (res) await txnHelpers.logParsedTx(res);
+    console.log("Message received successfully");
+  })
+  .catch((err) => {
+    console.log(err);
+  });