Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions contract-derive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@ pub fn event_derive(input: TokenStream) -> TokenStream {
#(#field_names),*
}
}

pub fn emit(#(#field_names: #field_types),*) {
let event = Self::new(#(#field_names),*);
eth_riscv_runtime::log::emit(event);
}
}

impl eth_riscv_runtime::log::Event for #name {
Expand Down
18 changes: 9 additions & 9 deletions examples/erc20/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ impl ERC20 {
self.total_supply += amount;

// Emit event + return `true` to stick to (EVM) ERC20 convention
log::emit(Transfer::new(Address::ZERO, to, amount));
Transfer::emit(Address::ZERO, to, amount);
Ok(true)
}

Expand All @@ -106,8 +106,8 @@ impl ERC20 {
// Update state
self.allowance_of[owner][spender].write(amount);

// Emit event + return
log::emit(Approval::new(owner, spender, amount));
// Emit event + return
Approval::emit(owner, spender, amount);
Ok(true)
}

Expand All @@ -130,8 +130,8 @@ impl ERC20 {
self.balance_of[from].write(from_balance - amount);
self.balance_of[to].write(to_balance + amount);

// Emit event + return
log::emit(Transfer::new(from, to, amount));
// Emit event + return
Transfer::emit(from, to, amount);
Ok(true)
}

Expand All @@ -158,8 +158,8 @@ impl ERC20 {
let to_balance = self.balance_of[to].read();
self.balance_of[to].write(to_balance + amount);

// Emit event + return
log::emit(Transfer::new(from, to, amount));
// Emit event + return
Transfer::emit(from, to, amount);
Ok(true)
}

Expand All @@ -173,8 +173,8 @@ impl ERC20 {
// Update state
self.owner.write(new_owner);

// Emit event + return
log::emit(OwnershipTransferred::new(from, new_owner));
// Emit event + return
OwnershipTransferred::emit(from, new_owner);
Ok(true)
}

Expand Down
10 changes: 5 additions & 5 deletions examples/erc721/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ impl ERC721 {
self.total_supply.write(total_supply + U256::from(1));

// Emit event + return
log::emit(Transfer::new(Address::ZERO, to, id));
Transfer::emit(Address::ZERO, to, id);
Ok(true)
}

Expand All @@ -122,7 +122,7 @@ impl ERC721 {
self.approval_of[id].write(spender);

// Emit event + return
log::emit(Approval::new(owner, spender, id));
Approval::emit(owner, spender, id);
Ok(true)
}

Expand All @@ -133,7 +133,7 @@ impl ERC721 {
self.is_operator[msg_sender][operator].write(approved);

// Emit event + return
log::emit(ApprovalForAll::new(msg_sender, operator, approved));
ApprovalForAll::emit(msg_sender, operator, approved);
Ok(true)
}

Expand Down Expand Up @@ -161,7 +161,7 @@ impl ERC721 {
self.balance_of[to].write(balance_to + U256::from(1));

// Emit event + return
log::emit(Transfer::new(from, to, id));
Transfer::emit(from, to, id);
Ok(true)
}

Expand All @@ -174,7 +174,7 @@ impl ERC721 {
self.owner.write(new_owner);

// Emit event + return
log::emit(OwnershipTransferred::new(from, new_owner));
OwnershipTransferred::emit(from, new_owner);
Ok(true)
}

Expand Down
2 changes: 1 addition & 1 deletion r55/src/test_utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use alloy_core::hex::FromHex;
use alloy_primitives::address;
use revm::Database;
pub use revm::{
primitives::{keccak256, ruint::Uint, AccountInfo, Address, Bytecode, Bytes, U256},
primitives::{keccak256, ruint::Uint, AccountInfo, Address, Bytecode, Bytes, Log, U256},
InMemoryDB,
};
use std::{fs, path::Path, sync::Once};
Expand Down