changes

zink-lang · Dec 4, 2024 · 813d393 · 813d393
1 parent a62d258
commit 813d393
Show file tree

Hide file tree

Showing 5 changed files with 215 additions and 221 deletions.
diff --git a/examples/log.rs b/examples/log.rs
@@ -3,120 +3,96 @@
 
 extern crate zink;
 
-use zink::{primitives::Address, Event};
+use zink::{
+    primitives::{Address, U256},
+    Asm, Event,
+};
 
 /// ERC20 standard events
 #[derive(Event)]
 pub enum ERC20Events {
     /// Emitted when tokens are transferred between addresses
     /// Parameters: from, to, value
-    Transfer(Address, Address, u64),
+    Transfer(Address, Address, U256),
 
     /// Emitted when an address approves another address to spend tokens
     /// Parameters: owner, spender, value
-    Approval(Address, Address, u64),
+    Approval(Address, Address, U256),
 }
 
-// /// Implementation of event logging functions
-// pub trait ERC20EventLogger {
-//     fn log_transfer(&self, from: Address, to: Address, value: U256) ;
-//     fn log_approval(&self, owner: Address, spender: Address, value: U256) ;
-// }
-
-// impl ERC20EventLogger for ERC20Events {
-//     fn log_transfer(&self, from: Address, to: Address, value: U256) {
-//         let event = ERC20Events::Transfer(from, to, value);
-//         let topic = event.topic();
-//         let data = event.encode();
-//         event.log1(&topic);
-//     }
-
-//     fn log_approval(&self, owner: Address, spender: Address, value: U256) {
-//         let event = ERC20Events::Approval(owner, spender, value);
-//         let topic = event.topic();
-//         let data = event.encode();
-//         event.log1(&topic);
-//     }
-// }
-
-// /// Example contract functions demonstrating event logging
-// #[zink::external]
-// pub mod erc20_events {
-//     use super::*;
-
-//     /// Logs a transfer event
-//     pub fn log_transfer(from: Address, to: Address, value: U256) {
-//         let events = ERC20Events::Transfer(from, to, value);
-//         events.log_transfer(from, to, value);
-//     }
-
-//     /// Logs an approval event
-//     pub fn log_approval(owner: Address, spender: Address, value: U256)  {
-//         let events = ERC20Events::Approval(owner, spender, value);
-//         events.log_approval(owner, spender, value);
-//     }
-
-//     /// Example of logging multiple events in a single transaction
-//     pub fn log_transfer_and_approval(
-//         from: Address,
-//         to: Address,
-//         spender: Address,
-//         value: U256,
-//     ) {
-//         // Log transfer first
-//         log_transfer(from, to, value)?;
-//         // Then log approval
-//         log_approval(from, spender, value)?;
-//         Ok(())
-//     }
-// }
-
-// #[cfg(test)]
-// mod tests {
-//     use super::*;
-//     use zink::test_utils::{Address as TestAddress, U256 as TestU256};
-
-//     #[test]
-//     fn test_event_signatures() {
-//         let transfer = ERC20Events::Transfer(
-//             TestAddress::zero(),
-//             TestAddress::zero(),
-//             TestU256::from(0),
-//         );
-//         let approval = ERC20Events::Approval(
-//             TestAddress::zero(),
-//             TestAddress::zero(),
-//             TestU256::from(0),
-//         );
-
-//         assert_eq!(
-//             transfer.abi_signature(),
-//             "Transfer(address,address,uint256)"
-//         );
-//         assert_eq!(
-//             approval.abi_signature(),
-//             "Approval(address,address,uint256)"
-//         );
-//     }
-
-//     #[test]
-//     fn test_event_logging() -> Result<(), EventError> {
-//         let from = TestAddress::from([1u8; 20]);
-//         let to = TestAddress::from([2u8; 20]);
-//         let spender = TestAddress::from([3u8; 20]);
-//         let value = TestU256::from(1000);
-
-//         // Test individual event logging
-//         erc20_events::log_transfer(from, to, value)?;
-//         erc20_events::log_approval(from, spender, value)?;
-
-//         // Test multiple events
-//         erc20_events::log_transfer_and_approval(from, to, spender, value)?;
-
-//         Ok(())
-//     }
-// }
-
-// // Only include main when not targeting wasm32
+impl ERC20Events {
+    /// Log a transfer event
+    pub fn log_transfer(from: Address, to: Address, value: U256) {
+        match Self::Transfer(from, to, value) {
+            event => event.log0(),
+        }
+    }
+
+    /// Log an approval event
+    pub fn log_approval(owner: Address, spender: Address, value: U256) {
+        match Self::Approval(owner, spender, value) {
+            event => event.log0(),
+        }
+    }
+}
+
+pub mod erc20_events {
+    use super::*;
+
+    /// Logs a transfer event
+    /// Example contract functions demonstrating event logging
+    #[zink::external]
+    pub fn log_transfer(from: Address, to: Address, value: U256) {
+        ERC20Events::log_transfer(from, to, value)
+    }
+
+    /// Logs an approval event
+    /// Example contract functions demonstrating event logging
+    #[zink::external]
+    pub fn log_approval(owner: Address, spender: Address, value: U256) {
+        ERC20Events::log_approval(owner, spender, value)
+    }
+
+    /// Example of logging multiple events in a single transaction
+    /// Example contract functions demonstrating event logging
+    #[zink::external]
+    pub fn log_transfer_and_approval(
+        from: Address,
+        to: Address,
+        spender: Address,
+        value: U256,
+    ) -> Result<(), ()> {
+        // Log transfer first
+        log_transfer(from, to, value);
+        // Then log approval
+        log_approval(from, spender, value);
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use zink::EventError;
+
+    #[test]
+    fn test_event_logging() -> Result<(), EventError> {
+        let from = Address([1u8; 20]);
+        let to = Address([2u8; 20]);
+        let spender = Address([3u8; 20]);
+        let value = U256::from(1000u64);
+
+        // Test individual event logging
+        erc20_events::log_transfer(from, to, value)?;
+        erc20_events::log_approval(from, spender, value)?;
+
+        // Test multiple events
+        erc20_events::log_transfer_and_approval(from, to, spender, value)?;
+
+        Ok(())
+    }
+}
+
+// Only include main when not targeting wasm32
 #[cfg(not(target_arch = "wasm32"))]
 fn main() {}