bet

djeck1432 · Feb 28, 2025 · f60cb96 · f60cb96
1 parent 80dd370
commit f60cb96
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 8 deletions.
diff --git a/margin/.tool-versions b/margin/.tool-versions
@@ -1 +1,2 @@
 scarb 2.9.4
+starknet-foundry 0.38.0
diff --git a/margin/Scarb.toml b/margin/Scarb.toml
@@ -18,6 +18,7 @@ assert_macros = "2.9.4"
 [[target.starknet-contract]]
 sierra = true
 
+
 [scripts]
 test = "snforge test"
 

diff --git a/margin/src/interface.cairo b/margin/src/interface.cairo
@@ -12,3 +12,10 @@ pub trait IMargin<TContractState> {
 
     fn liquidate(ref self: TContractState, user: ContractAddress);
 }
+
+#[starknet::interface]
+pub trait IERC20MetadataForPragma<TState> {
+    fn name(self: @TState) -> ByteArray;
+    fn symbol(self: @TState) -> felt252;
+    fn decimals(self: @TState) -> felt252;
+}
diff --git a/margin/src/lib.cairo b/margin/src/lib.cairo
@@ -1,7 +1,3 @@
 pub mod margin;
 pub mod types;
 pub mod interface;
-
-pub mod mocks {
-    pub mod erc20_mock;
-}
diff --git a/margin/tests/lib.cairo b/margin/tests/lib.cairo
@@ -1,4 +1,7 @@
-#[cfg(test)]
 mod test_deposit;
 
 mod utils;
+
+mod mocks {
+    pub mod erc20_mock;
+}
diff --git a/margin/src/mocks/erc20_mock.cairo → margin/tests/mocks/erc20_mock.cairo b/margin/src/mocks/erc20_mock.cairo → margin/tests/mocks/erc20_mock.cairo
@@ -2,13 +2,12 @@
 pub mod ERC20Mock {
     use openzeppelin_token::erc20::{ERC20Component, ERC20HooksEmptyImpl};
     use starknet::ContractAddress;
+    use margin::interface::IERC20MetadataForPragma;
 
     component!(path: ERC20Component, storage: erc20, event: ERC20Event);
 
     #[abi(embed_v0)]
     impl ERC20Impl = ERC20Component::ERC20Impl<ContractState>;
-    #[abi(embed_v0)]
-    impl ERC20MetadataImpl = ERC20Component::ERC20MetadataImpl<ContractState>;
     impl InternalImpl = ERC20Component::InternalImpl<ContractState>;
 
     #[storage]
@@ -35,4 +34,22 @@ pub mod ERC20Mock {
         self.erc20.initializer(name, symbol);
         self.erc20.mint(recipient, initial_supply);
     }
+
+    impl IERC20MetadataForPragmaImpl of IERC20MetadataForPragma<ContractState> {
+        fn name(self: @ContractState) -> ByteArray {
+            self.erc20.ERC20_name.read()
+        }
+
+        // Assume symbol is at most 31 bytes
+        fn symbol(self: @ContractState) -> felt252 {
+            let mut output = array![];
+            self.erc20.ERC20_symbol.read().serialize(ref output);
+
+            *output.at(0)
+        }
+
+        fn decimals(self: @ContractState) -> felt252 {
+            18
+        }
+    }
 }
diff --git a/margin/tests/utils.cairo b/margin/tests/utils.cairo
@@ -15,7 +15,7 @@ pub struct MarginTestSuite {
 }
 
 pub fn ERC20_MOCK_CONTRACT() -> ContractAddress {
-    contract_address_const::<'erc20mock'>()
+    contract_address_const::<'ERC20Mock'>()
 }
 
 pub fn deploy_erc20_mock() -> ContractAddress {