From 0c60adf5767d6e0a607babbbf1519488f9946e5a Mon Sep 17 00:00:00 2001
From: Luis Herasme <luis.alberto.herasme.cuevas@gmail.com>
Date: Tue, 23 Jul 2024 12:16:06 -0400
Subject: [PATCH] fix: Fix macro invalid address error

---
 ghost-crab-macros/src/lib.rs | 10 +++++-----
 ghost-crab/src/prelude.rs    |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ghost-crab-macros/src/lib.rs b/ghost-crab-macros/src/lib.rs
index 9629565..ea0934b 100644
--- a/ghost-crab-macros/src/lib.rs
+++ b/ghost-crab-macros/src/lib.rs
@@ -65,11 +65,11 @@ pub fn block_handler(metadata: TokenStream, input: TokenStream) -> TokenStream {
             }
 
             fn network(&self) -> String {
-                #network
+                String::from(#network)
             }
 
             fn rpc_url(&self) -> String {
-                #rpc_url
+                String::from(#rpc_url)
             }
 
             fn start_block(&self) -> u64 {
@@ -162,7 +162,7 @@ fn create_handler(metadata: TokenStream, input: TokenStream, is_template: bool)
         network = source.network.clone();
         execution_mode = source.execution_mode.clone().unwrap_or(ExecutionMode::Parallel);
 
-        let address_literal = Literal::string(&source.address);
+        let address_literal = Literal::string(&source.address[2..]);
 
         address = quote! {
             address!(#address_literal)
@@ -238,12 +238,12 @@ fn create_handler(metadata: TokenStream, input: TokenStream, is_template: bool)
                 #address
             }
 
-            fn network(&self) - String {
+            fn network(&self) -> String {
                 String::from(#network)
             }
 
             fn rpc_url(&self) -> String {
-                #rpc_url
+                String::from(#rpc_url)
             }
 
             fn execution_mode(&self) -> ExecutionMode {
diff --git a/ghost-crab/src/prelude.rs b/ghost-crab/src/prelude.rs
index aa90ff8..d1a2715 100644
--- a/ghost-crab/src/prelude.rs
+++ b/ghost-crab/src/prelude.rs
@@ -5,6 +5,7 @@ pub use alloy::{
     sol_types::{SolEvent, SolEventInterface},
 };
 pub use async_trait::async_trait;
+pub use config::ExecutionMode;
 pub use ghost_crab_macros::block_handler;
 pub use ghost_crab_macros::event_handler;
 pub use ghost_crab_macros::template;