Comments resolution

- identity
- deactivated status added
- Appchain bridge setting event emission

src/bridge/interface.cairo

@@ -5,7 +5,7 @@ use starknet_bridge::bridge::types::{TokenStatus, TokenSettings};
 pub trait ITokenBridgeAdmin<TContractState> {
     fn set_appchain_token_bridge(ref self: TContractState, appchain_bridge: ContractAddress);
     fn block_token(ref self: TContractState, token: ContractAddress);
-    fn deactivate_and_block_token(ref self: TContractState, token: ContractAddress);
+    fn deactivate_token(ref self: TContractState, token: ContractAddress);
     fn enable_withdrawal_limit(ref self: TContractState, token: ContractAddress);
     fn disable_withdrawal_limit(ref self: TContractState, token: ContractAddress);
     fn set_max_total_balance(
@@ -16,7 +16,8 @@ pub trait ITokenBridgeAdmin<TContractState> {
 #[starknet::interface]
 pub trait ITokenBridge<TContractState> {
     fn appchain_bridge(self: @TContractState) -> ContractAddress;
-    fn identity(self: @TContractState) -> ByteArray;
+    fn get_identity(self: @TContractState) -> felt252;
+    fn get_version(self: @TContractState) -> felt252;
     fn get_status(self: @TContractState, token: ContractAddress) -> TokenStatus;
     fn is_servicing_token(self: @TContractState, token: ContractAddress) -> bool;
     fn is_withdrawal_limit_applied(self: @TContractState, token: ContractAddress) -> bool;

src/bridge/token_bridge.cairo

@@ -103,6 +103,7 @@ pub mod TokenBridge {
         WithdrawalLimitEnabled: WithdrawalLimitEnabled,
         WithdrawalLimitDisabled: WithdrawalLimitDisabled,
         SetMaxTotalBalance: SetMaxTotalBalance,
+        SetAppchainBridge: SetAppchainBridge,
         #[flat]
         OwnableEvent: OwnableComponent::Event,
         #[flat]
@@ -237,6 +238,12 @@ pub mod TokenBridge {
         value: u256
     }
 
+    #[derive(Drop, starknet::Event)]
+    pub struct SetAppchainBridge {
+        pub appchain_bridge: ContractAddress
+    }
+
+
     #[constructor]
     fn constructor(
         ref self: ContractState,
@@ -308,13 +315,6 @@ pub mod TokenBridge {
                 .read()
                 .consume_message_from_appchain(appchain_bridge, payload.span());
         }
-
-        fn block_token_internal(ref self: ContractState, token: ContractAddress) {
-            let new_settings = TokenSettings {
-                token_status: TokenStatus::Blocked, ..self.token_settings.read(token)
-            };
-            self.token_settings.write(token, new_settings);
-        }
     }
 
 
@@ -365,6 +365,8 @@ pub mod TokenBridge {
         fn set_appchain_token_bridge(ref self: ContractState, appchain_bridge: ContractAddress) {
             self.ownable.assert_only_owner();
             self.appchain_bridge.write(appchain_bridge);
+
+            self.emit(SetAppchainBridge { appchain_bridge: appchain_bridge });
         }
 
         // @param token The address of the token contract to be deactivated.
@@ -375,20 +377,26 @@ pub mod TokenBridge {
             self.ownable.assert_only_owner();
             assert(self.get_status(token) == TokenStatus::Unknown, Errors::CANNOT_BLOCK);
 
-            self.block_token_internal(token);
+            let new_settings = TokenSettings {
+                token_status: TokenStatus::Blocked, ..self.token_settings.read(token)
+            };
+            self.token_settings.write(token, new_settings);
             self.emit(TokenBlocked { token });
         }
 
 
-        fn deactivate_and_block_token(ref self: ContractState, token: ContractAddress) {
+        fn deactivate_token(ref self: ContractState, token: ContractAddress) {
             self.ownable.assert_only_owner();
             let status = self.get_status(token);
             assert(
                 status == TokenStatus::Active || status == TokenStatus::Pending,
                 Errors::CANNOT_DEACTIVATE
             );
 
-            self.block_token_internal(:token);
+            let new_settings = TokenSettings {
+                token_status: TokenStatus::Deactivated, ..self.token_settings.read(token)
+            };
+            self.token_settings.write(token, new_settings);
 
             self.emit(TokenDeactivated { token });
             self.emit(TokenBlocked { token });
@@ -430,10 +438,13 @@ pub mod TokenBridge {
             return self.appchain_bridge.read();
         }
 
-        fn identity(self: @ContractState) -> ByteArray {
-            "STARKNET_BRIDGE_0.1.0"
+        fn get_identity(self: @ContractState) -> felt252 {
+            constants::CONTRACT_IDENTITY
         }
 
+        fn get_version(self: @ContractState) -> felt252 {
+            constants::CONTRACT_VERSION
+        }
 
         fn enroll_token(ref self: ContractState, token: ContractAddress) {
             assert(self.get_status(token) == TokenStatus::Unknown, Errors::ALREADY_ENROLLED);

src/bridge/types.cairo

@@ -7,7 +7,8 @@ pub enum TokenStatus {
     Unknown,
     Pending,
     Active,
-    Blocked
+    Blocked,
+    Deactivated
 }
 
 #[derive(Serde, Drop, starknet::Store)]

src/constants.cairo

@@ -20,3 +20,7 @@ pub const REMAINING_QUOTA_OFFSET: u256 = 1;
 // starknet_keccak('on_receive').
 pub const ON_RECEIVE_SELECTOR: felt252 =
     480768629706071032051132431608482761444818804172389941599997570483678682398;
+
+pub const CONTRACT_IDENTITY: felt252 = 'STARKNET_BRIDGE';
+pub const CONTRACT_VERSION: felt252 = '0.1.0';
+

tests/lib.cairo

@@ -1,3 +1,2 @@
-mod test_contract;
 mod token_bridge_test;