v0.3

Author: RoeeGross

scripts/build-cairo.sh

@@ -7,5 +7,6 @@ scripts/starknet-compile.py src  --contract-path src::permissioned_erc20::Permis
 scripts/starknet-compile.py src  --contract-path src::token_bridge::TokenBridge cairo_contracts/TokenBridge.sierra
 scripts/starknet-compile.py src  --contract-path openzeppelin::token::erc20::erc20::ERC20 cairo_contracts/ERC20.sierra
 scripts/starknet-compile.py src  --contract-path openzeppelin::token::erc20::presets::erc20votes::ERC20VotesPreset cairo_contracts/ERC20VotesPreset.sierra
+scripts/starknet-compile.py src  --contract-path  openzeppelin::token::erc20_v070::erc20::ERC20 cairo_contracts/ERC20.sierra
 
 popd

scripts/tests.sh

@@ -19,7 +19,7 @@ fi
 
 
 printf "${YELLOW}Check Line Length...\n"
-scripts/line_length.py -l 110
+scripts/line_length.py
 if  [ $? -ne 0 ]; then
     exit 1
 fi

src/cairo/access_control_interface.cairo

@@ -1,10 +1,10 @@
 use starknet::ContractAddress;
 
+
+type RoleId = felt252;
+
 #[starknet::interface]
 trait IAccessControl<TContractState> {
-    fn has_role(self: @TContractState, role: felt252, account: ContractAddress) -> bool;
-    fn get_role_admin(self: @TContractState, role: felt252) -> felt252;
-    fn grant_role(ref self: TContractState, role: felt252, account: ContractAddress);
-    fn revoke_role(ref self: TContractState, role: felt252, account: ContractAddress);
-    fn renounce_role(ref self: TContractState, role: felt252, account: ContractAddress);
+    fn has_role(self: @TContractState, role: RoleId, account: ContractAddress) -> bool;
+    fn get_role_admin(self: @TContractState, role: RoleId) -> RoleId;
 }

src/cairo/erc20_interface.cairo

@@ -21,3 +21,12 @@ trait IERC20<TContractState> {
     ) -> bool;
 }
 
+#[starknet::interface]
+trait IERC20CamelOnly<TState> {
+    fn totalSupply(self: @TState) -> u256;
+    fn balanceOf(self: @TState, account: ContractAddress) -> u256;
+    fn transferFrom(
+        ref self: TState, sender: ContractAddress, recipient: ContractAddress, amount: u256
+    ) -> bool;
+}
+

src/cairo/lib.cairo

@@ -14,3 +14,5 @@ mod permissioned_erc20;
 mod test_utils;
 mod token_bridge_test;
 mod permissioned_token_test;
+mod stub_msg_receiver;
+mod replaceability_test;

src/cairo/permissioned_erc20.cairo

@@ -6,7 +6,10 @@ mod PermissionedERC20 {
         ContractAddress, get_caller_address, contract_address::ContractAddressZeroable,
         contract_address_const
     };
-    use super::super::{erc20_interface::IERC20, mintable_token_interface::IMintableToken};
+    use super::super::{
+        erc20_interface::IERC20, erc20_interface::IERC20CamelOnly,
+        mintable_token_interface::IMintableToken
+    };
 
 
     #[storage]
@@ -225,4 +228,24 @@ mod PermissionedERC20 {
             self._decrease_allowance(spender, subtracted_value)
         }
     }
+
+    #[external(v0)]
+    impl ERC20CamelOnlyImpl of IERC20CamelOnly<ContractState> {
+        fn totalSupply(self: @ContractState) -> u256 {
+            PermissionedERC20::total_supply(self)
+        }
+
+        fn balanceOf(self: @ContractState, account: ContractAddress) -> u256 {
+            PermissionedERC20::balance_of(self, account)
+        }
+
+        fn transferFrom(
+            ref self: ContractState,
+            sender: ContractAddress,
+            recipient: ContractAddress,
+            amount: u256
+        ) -> bool {
+            PermissionedERC20::transfer_from(ref self, sender, recipient, amount)
+        }
+    }
 }

src/cairo/permissioned_token_test.cairo

@@ -14,7 +14,7 @@ mod permissioned_token_test {
         IMintableTokenDispatcher, IMintableTokenDispatcherTrait
     };
     use super::super::erc20_interface::{IERC20Dispatcher, IERC20DispatcherTrait};
-    use super::super::test_utils::{
+    use super::super::test_utils::test_utils::{
         get_erc20_token, deploy_l2_votes_token, deploy_l2_token, get_mintable_token,
         get_l2_token_deployment_calldata
     };

src/cairo/replaceability_interface.cairo

@@ -4,16 +4,40 @@ use option::OptionTrait;
 
 use starknet::class_hash::{ClassHash, Felt252TryIntoClassHash};
 
+// Holds EIC data. 
+// * eic_hash is the EIC class hash.
+// * eic_init_data is a span of the EIC init args.
+#[derive(Copy, Drop, Serde, PartialEq)]
+struct EICData {
+    eic_hash: ClassHash,
+    eic_init_data: Span<felt252>
+}
+
+// Holds implementation data. 
+// * impl_hash is the implementation class hash.
+// * eic_data is the EIC data when applicable, and empty otherwise.
+// * final indicates whether the implementation is finalized.
 #[derive(Copy, Drop, Serde, PartialEq)]
 struct ImplementationData {
     impl_hash: ClassHash,
-    // TODO we don't need init data without eic_hash, so consolidate these into a more meaningful 
-    // data structure.
-    eic_hash: ClassHash,
-    eic_init_data: Span<felt252>,
+    eic_data: Option<EICData>,
     final: bool
 }
 
+
+// starknet_keccak(eic_initialize).
+const EIC_INITIALIZE_SELECTOR: felt252 =
+    1770792127795049777084697565458798191120226931451376769053057094489776256516;
+
+// Duration from implementation is eligible until it expires. (1209600 = 2 weeks).
+const IMPLEMENTATION_EXPIRATION: u64 = 1209600;
+
+#[starknet::interface]
+trait IEICInitializable<TContractState> {
+    fn eic_initialize(ref self: TContractState, eic_init_data: Span<felt252>);
+}
+
+
 #[starknet::interface]
 trait IReplaceable<TContractState> {
     fn get_upgrade_delay(self: @TContractState) -> u64;