use #[flat] for erc events (#78)

dojoengine · Jun 24, 2024 · 4bb65b8 · 4bb65b8
1 parent c537966
commit 4bb65b8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 0 deletions.
diff --git a/examples/bridge/sn/src/dojo_token.cairo b/examples/bridge/sn/src/dojo_token.cairo
@@ -109,12 +109,19 @@ mod dojo_token {
     #[event]
     #[derive(Copy, Drop, starknet::Event)]
     enum Event {
+        #[flat]
         InitializableEvent: initializable_component::Event,
+        #[flat]
         ERC20MetadataEvent: erc20_metadata_component::Event,
+        #[flat]
         ERC20BalanceEvent: erc20_balance_component::Event,
+        #[flat]
         ERC20AllowanceEvent: erc20_allowance_component::Event,
+        #[flat]
         ERC20MintableEvent: erc20_mintable_component::Event,
+        #[flat]
         ERC20BurnableEvent: erc20_burnable_component::Event,
+        #[flat]
         ERC20BridgeableEvent: erc20_bridgeable_component::Event,
     }
 

diff --git a/token/src/presets/erc20/bridgeable.cairo b/token/src/presets/erc20/bridgeable.cairo
@@ -121,12 +121,19 @@ mod ERC20Bridgeable {
     #[event]
     #[derive(Copy, Drop, starknet::Event)]
     enum Event {
+        #[flat]
         InitializableEvent: initializable_component::Event,
+        #[flat]
         ERC20MetadataEvent: erc20_metadata_component::Event,
+        #[flat]
         ERC20BalanceEvent: erc20_balance_component::Event,
+        #[flat]
         ERC20AllowanceEvent: erc20_allowance_component::Event,
+        #[flat]
         ERC20MintableEvent: erc20_mintable_component::Event,
+        #[flat]
         ERC20BurnableEvent: erc20_burnable_component::Event,
+        #[flat]
         ERC20BridgeableEvent: erc20_bridgeable_component::Event,
     }
 

diff --git a/token/src/presets/erc721/enumerable_mintable_burnable.cairo b/token/src/presets/erc721/enumerable_mintable_burnable.cairo
@@ -175,13 +175,21 @@ mod ERC721EnumMintBurn {
     #[event]
     #[derive(Drop, starknet::Event)]
     enum Event {
+        #[flat]
         InitializableEvent: initializable_component::Event,
+        #[flat]
         ERC721ApprovalEvent: erc721_approval_component::Event,
+        #[flat]
         ERC721BalanceEvent: erc721_balance_component::Event,
+        #[flat]
         ERC721BurnableEvent: erc721_burnable_component::Event,
+        #[flat]
         ERC721EnumerableEvent: erc721_enumerable_component::Event,
+        #[flat]
         ERC721MetadataEvent: erc721_metadata_component::Event,
+        #[flat]
         ERC721MintableEvent: erc721_mintable_component::Event,
+        #[flat]
         ERC721OwnerEvent: erc721_owner_component::Event,
     }
 

diff --git a/token/src/presets/erc721/mintable_burnable.cairo b/token/src/presets/erc721/mintable_burnable.cairo
@@ -139,12 +139,19 @@ mod ERC721MintableBurnable {
     #[event]
     #[derive(Drop, starknet::Event)]
     enum Event {
+        #[flat]
         InitializableEvent: initializable_component::Event,
+        #[flat]
         ERC721ApprovalEvent: erc721_approval_component::Event,
+        #[flat]
         ERC721BalanceEvent: erc721_balance_component::Event,
+        #[flat]
         ERC721BurnableEvent: erc721_burnable_component::Event,
+        #[flat]
         ERC721MetadataEvent: erc721_metadata_component::Event,
+        #[flat]
         ERC721MintableEvent: erc721_mintable_component::Event,
+        #[flat]
         ERC721OwnerEvent: erc721_owner_component::Event,
     }