v0.8.1

remollemo · remollemo · commit 2c2729d47b9b · 2025-03-03T16:40:22.000+02:00
diff --git a/.dep/starkware-solidity-dependencies.tar b/.dep/starkware-solidity-dependencies.tar
diff --git a/scripts/cairo-format.py b/scripts/cairo-format.py
@@ -7,7 +7,7 @@
 
 ROOT_DIR = os.path.dirname(os.path.dirname(__file__))
 EXECUTABLE = os.path.join(ROOT_DIR, ".downloads", "cairo", "bin", "cairo-format")
-EXPECTED_EXECUTABLE_VERSION = "cairo-format 2.10.0-rc.0"
+EXPECTED_EXECUTABLE_VERSION = "cairo-format 2.10.1"
 
 
 def main():
diff --git a/scripts/cairo-test.py b/scripts/cairo-test.py
@@ -7,7 +7,7 @@
 
 ROOT_DIR = os.path.dirname(os.path.dirname(__file__))
 EXECUTABLE = os.path.join(ROOT_DIR, ".downloads", "cairo", "bin", "cairo-test")
-EXPECTED_EXECUTABLE_VERSION = "cairo-test 2.10.0-rc.0"
+EXPECTED_EXECUTABLE_VERSION = "cairo-test 2.10.1"
 
 
 def main():
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -30,7 +30,7 @@ printf "${COLOR_OFF}"
 mkdir -p .downloads
 cd .downloads
 
-wget -c https://github.com/starkware-libs/cairo/releases/download/v2.10.0-rc.0/release-x86_64-unknown-linux-musl.tar.gz -O - | tar -xz
+wget -c https://github.com/starkware-libs/cairo/releases/download/v2.10.1/release-x86_64-unknown-linux-musl.tar.gz -O - | tar -xz
 curl https://binaries.soliditylang.org/linux-amd64/solc-linux-amd64-v0.8.20+commit.a1b79de6 -o solc-0.8.20 && chmod +x solc-0.8.20
 
 cd ..
diff --git a/scripts/starknet-compile.py b/scripts/starknet-compile.py
@@ -7,7 +7,7 @@
 
 ROOT_DIR = os.path.dirname(os.path.dirname(__file__))
 EXECUTABLE = os.path.join(ROOT_DIR, ".downloads", "cairo", "bin", "starknet-compile")
-EXPECTED_EXECUTABLE_VERSION = "starknet-compile 2.10.0-rc.0"
+EXPECTED_EXECUTABLE_VERSION = "starknet-compile 2.10.1"
 
 
 def main():
diff --git a/src/cairo/err_msg.cairo b/src/cairo/err_msg.cairo
@@ -23,6 +23,7 @@ mod AccessErrors {
     const ONLY_MINTER: felt252 = 'MINTER_ONLY';
     const ONLY_SELF_CAN_RENOUNCE: felt252 = 'ONLY_SELF_CAN_RENOUNCE';
     const GOV_ADMIN_CANNOT_RENOUNCE: felt252 = 'GOV_ADMIN_CANNOT_SELF_REMOVE';
+    const SEC_ADMIN_CANNOT_RENOUNCE: felt252 = 'SEC_ADMIN_CANNOT_SELF_REMOVE';
 }
 
 mod ReplaceErrors {
diff --git a/src/cairo/strk/erc20_lockable.cairo b/src/cairo/strk/erc20_lockable.cairo
@@ -101,9 +101,9 @@ mod ERC20Lockable {
     /// Emitted when tokens are moved from address `from` to address `to`.
     #[derive(Copy, Drop, PartialEq, starknet::Event)]
     struct Transfer {
-        #[key]
+        // #[key] - Not indexed, to maintain backward compatibility.
         from: ContractAddress,
-        #[key]
+        // #[key] - Not indexed, to maintain backward compatibility.
         to: ContractAddress,
         value: u256,
     }
@@ -112,9 +112,9 @@ mod ERC20Lockable {
     /// to [approve](approve). `value` is the new allowance.
     #[derive(Copy, Drop, PartialEq, starknet::Event)]
     struct Approval {
-        #[key]
+        // #[key] - Not indexed, to maintain backward compatibility.
         owner: ContractAddress,
-        #[key]
+        // #[key] - Not indexed, to maintain backward compatibility.
         spender: ContractAddress,
         value: u256,
     }
diff --git a/src/cairo/token_bridge.cairo b/src/cairo/token_bridge.cairo
@@ -9,7 +9,7 @@ mod TokenBridge {
     use super::super::err_msg::AccessErrors::{
         CALLER_MISSING_ROLE, ZERO_ADDRESS, ALREADY_INITIALIZED, ONLY_APP_GOVERNOR, ONLY_OPERATOR,
         ONLY_TOKEN_ADMIN, ONLY_UPGRADE_GOVERNOR, ONLY_SECURITY_ADMIN, ONLY_SECURITY_AGENT,
-        GOV_ADMIN_CANNOT_RENOUNCE,
+        GOV_ADMIN_CANNOT_RENOUNCE, SEC_ADMIN_CANNOT_RENOUNCE,
     };
     use super::super::err_msg::ERC20Errors as ERC20Errors;
     use super::super::err_msg::ReplaceErrors as ReplaceErrors;
@@ -46,10 +46,8 @@ mod TokenBridge {
         OperatorAdded, OperatorRemoved, TokenAdminAdded, TokenAdminRemoved, UpgradeGovernorAdded,
         UpgradeGovernorRemoved,
     };
-    use super::super::erc20_interface::{IERC20Dispatcher, IERC20DispatcherTrait};
-    use super::super::mintable_token_interface::{
-        IMintableTokenDispatcher, IMintableTokenDispatcherTrait,
-    };
+    use src::erc20_interface::{IERC20Dispatcher, IERC20DispatcherTrait};
+    use src::mintable_token_interface::{IMintableTokenDispatcher, IMintableTokenDispatcherTrait};
 
     use super::super::replaceability_interface::{
         ImplementationData, IReplaceable, IReplaceableDispatcher, IReplaceableDispatcherTrait,
@@ -62,7 +60,7 @@ mod TokenBridge {
 
     const WITHDRAW_MESSAGE: felt252 = 0;
     const CONTRACT_IDENTITY: felt252 = 'STARKGATE';
-    const CONTRACT_VERSION: felt252 = 2;
+    const CONTRACT_VERSION: felt252 = '2.0.1';
 
     const DEFAULT_DAILY_WITHDRAW_LIMIT_PCT: u8 = 5;
 
@@ -452,6 +450,11 @@ mod TokenBridge {
         fn get_l1_token(self: @ContractState, l2_token: ContractAddress) -> EthAddress {
             self.l2_l1_token_map.read(l2_token)
         }
+
+        fn get_l1_bridge(self: @ContractState) -> EthAddress {
+            self.l1_bridge.read()
+        }
+
         fn get_l2_token(self: @ContractState, l1_token: EthAddress) -> ContractAddress {
             self.l1_l2_token_map.read(l1_token)
         }
@@ -827,6 +830,7 @@ mod TokenBridge {
             let event = Event::SecurityAdminRemoved(
                 SecurityAdminRemoved { removed_account: account, removed_by: get_caller_address() },
             );
+            self.prevent_self_removal(:account, error: SEC_ADMIN_CANNOT_RENOUNCE);
             self._revoke_role_and_emit(role: SECURITY_ADMIN, :account, :event);
         }
 
@@ -858,6 +862,7 @@ mod TokenBridge {
                     removed_account: account, removed_by: get_caller_address(),
                 },
             );
+            self.prevent_self_removal(:account, error: GOV_ADMIN_CANNOT_RENOUNCE);
             self._revoke_role_and_emit(role: GOVERNANCE_ADMIN, :account, :event);
         }
 
@@ -905,21 +910,20 @@ mod TokenBridge {
             self._revoke_role_and_emit(role: UPGRADE_GOVERNOR, :account, :event);
         }
 
-        // TODO -  change the fn name to renounce_role when we can have modularity.
-        // TODO -  change to GOVERNANCE_ADMIN_CANNOT_SELF_REMOVE when the 32 characters limitations
-        // is off.
         fn renounce(ref self: ContractState, role: RoleId) {
             assert(role != GOVERNANCE_ADMIN, GOV_ADMIN_CANNOT_RENOUNCE);
+            assert(role != SECURITY_ADMIN, SEC_ADMIN_CANNOT_RENOUNCE);
             self.renounce_role(:role, account: get_caller_address())
-            // TODO add another event? Currently there are two events when a role is removed but
-        // only one if it was renounced.
         }
     }
 
 
     #[generate_trait]
     impl RolesInternal of _RolesInternal {
-        // TODO -  change the fn name to _grant_role when we can have modularity.
+        fn prevent_self_removal(self: @ContractState, account: ContractAddress, error: felt252) {
+            assert(account != get_caller_address(), error);
+        }
+
         fn _grant_role_and_emit(
             ref self: ContractState, role: RoleId, account: ContractAddress, event: Event,
         ) {
@@ -930,7 +934,6 @@ mod TokenBridge {
             }
         }
 
-        // TODO -  change the fn name to _revoke_role when we can have modularity.
         fn _revoke_role_and_emit(
             ref self: ContractState, role: RoleId, account: ContractAddress, event: Event,
         ) {
diff --git a/src/cairo/token_bridge_interface.cairo b/src/cairo/token_bridge_interface.cairo
@@ -7,6 +7,7 @@ trait ITokenBridge<TContractState> {
     fn get_version(self: @TContractState) -> felt252;
     fn get_identity(self: @TContractState) -> felt252;
     fn get_l1_token(self: @TContractState, l2_token: ContractAddress) -> EthAddress;
+    fn get_l1_bridge(self: @TContractState) -> EthAddress;
     fn get_l2_token(self: @TContractState, l1_token: EthAddress) -> ContractAddress;
     fn get_remaining_withdrawal_quota(self: @TContractState, l1_token: EthAddress) -> u256;
     fn initiate_withdraw(ref self: TContractState, l1_recipient: EthAddress, amount: u256);
diff --git a/src/cairo/token_bridge_test.cairo b/src/cairo/token_bridge_test.cairo
@@ -58,7 +58,7 @@ mod token_bridge_test {
     };
 
     const EXPECTED_CONTRACT_IDENTITY: felt252 = 'STARKGATE';
-    const EXPECTED_CONTRACT_VERSION: felt252 = 2;
+    const EXPECTED_CONTRACT_VERSION: felt252 = '2.0.1';
 
     const DEFAULT_DEPOSITOR_ETH_ADDRESS: felt252 = 7;
 
diff --git a/src/openzeppelin/token/erc20/erc20.cairo b/src/openzeppelin/token/erc20/erc20.cairo
@@ -34,9 +34,9 @@ mod ERC20 {
     /// Emitted when tokens are moved from address `from` to address `to`.
     #[derive(Copy, Drop, PartialEq, starknet::Event)]
     struct Transfer {
-        #[key]
+        // #[key] - Not indexed, to maintain backward compatibility.
         from: ContractAddress,
-        #[key]
+        // #[key] - Not indexed, to maintain backward compatibility.
         to: ContractAddress,
         value: u256,
     }
@@ -45,9 +45,9 @@ mod ERC20 {
     /// to [approve](approve). `value` is the new allowance.
     #[derive(Copy, Drop, PartialEq, starknet::Event)]
     struct Approval {
-        #[key]
+        // #[key] - Not indexed, to maintain backward compatibility.
         owner: ContractAddress,
-        #[key]
+        // #[key] - Not indexed, to maintain backward compatibility.
         spender: ContractAddress,
         value: u256,
     }
diff --git a/src/openzeppelin/token/erc20_v070/erc20.cairo b/src/openzeppelin/token/erc20_v070/erc20.cairo
@@ -85,9 +85,9 @@ mod ERC20 {
     /// Emitted when tokens are moved from address `from` to address `to`.
     #[derive(Copy, Drop, PartialEq, starknet::Event)]
     struct Transfer {
-        #[key]
+        // #[key] - Not indexed, to maintain backward compatibility.
         from: ContractAddress,
-        #[key]
+        // #[key] - Not indexed, to maintain backward compatibility.
         to: ContractAddress,
         value: u256,
     }
@@ -96,9 +96,9 @@ mod ERC20 {
     /// to [approve](approve). `value` is the new allowance.
     #[derive(Copy, Drop, PartialEq, starknet::Event)]
     struct Approval {
-        #[key]
+        // #[key] - Not indexed, to maintain backward compatibility.
         owner: ContractAddress,
-        #[key]
+        // #[key] - Not indexed, to maintain backward compatibility.
         spender: ContractAddress,
         value: u256,
     }
diff --git a/src/solidity/IStarkgateRegistry.sol b/src/solidity/IStarkgateRegistry.sol
@@ -7,6 +7,11 @@ interface IStarkgateRegistry {
     */
     function getBridge(address token) external view returns (address);
 
+    /**
+      Returns the L2 bridge that handles the given token.
+    */
+    function getL2Bridge(address token) external view returns (uint256);
+
     /**
       Add a mapping between a token and the bridge handling it.
     */
diff --git a/src/solidity/IStarkgateService.sol b/src/solidity/IStarkgateService.sol
@@ -7,4 +7,9 @@ interface IStarkgateService {
     Returns True if the calling contract is providing a service for the token, otherwise false.
    */
     function isServicingToken(address token) external view returns (bool);
+
+    /**
+    Gets the address L2 bridge connected to this bridge.
+     */
+    function getL2Bridge() external view returns (uint256);
 }
diff --git a/src/solidity/SelfRemoveTester.sol b/src/solidity/SelfRemoveTester.sol
@@ -2,11 +2,11 @@
 pragma solidity ^0.8.20;
 
 import "starkware/solidity/interfaces/Identity.sol";
-import "starkware/solidity/interfaces/ProxySupport.sol";
+import "starkware/solidity/upgrade/ProxySupportImpl.sol";
 import "src/solidity/IStarkgateService.sol";
 import "src/solidity/IStarkgateRegistry.sol";
 
-contract SelfRemoveTester is IStarkgateService, Identity, ProxySupport {
+contract SelfRemoveTester is IStarkgateService, Identity, ProxySupportImpl {
     function identify() external pure virtual returns (string memory) {
         return "SelfRemoveTester";
     }
@@ -34,6 +34,10 @@ contract SelfRemoveTester is IStarkgateService, Identity, ProxySupport {
         return true;
     }
 
+    function getL2Bridge() external pure returns (uint256) {
+        return 0;
+    }
+
     function callSelfRemoveInTheRegistry(address token, address registry) external {
         IStarkgateRegistry(registry).selfRemove(token);
     }
diff --git a/src/solidity/StarkgateManager.sol b/src/solidity/StarkgateManager.sol
@@ -3,15 +3,15 @@ pragma solidity ^0.8.20;
 
 import "starkware/solidity/components/Roles.sol";
 import "starkware/solidity/interfaces/Identity.sol";
-import "starkware/solidity/interfaces/ProxySupport.sol";
+import "starkware/solidity/upgrade/ProxySupportImpl.sol";
 import "starkware/solidity/libraries/Addresses.sol";
 import "starkware/solidity/libraries/NamedStorage.sol";
 import "src/solidity/IStarkgateBridge.sol";
 import "src/solidity/IStarkgateManager.sol";
 import "src/solidity/IStarkgateRegistry.sol";
 import "src/solidity/StarkgateConstants.sol";
 
-contract StarkgateManager is Identity, IStarkgateManager, ProxySupport {
+contract StarkgateManager is Identity, IStarkgateManager, ProxySupportImpl, Roles {
     using Addresses for address;
     // Named storage slot tags.
     string internal constant REGISTRY_TAG = "STARKGATE_MANAGER_REGISTRY_SLOT_TAG";
@@ -21,6 +21,8 @@ contract StarkgateManager is Identity, IStarkgateManager, ProxySupport {
     event TokenDeactivated(address indexed token, address indexed sender);
     event TokenBlocked(address indexed token, address indexed sender);
 
+    constructor() Roles(false) {}
+
     function getRegistry() external view returns (address) {
         return registry();
     }
diff --git a/src/solidity/StarkgateRegistry.sol b/src/solidity/StarkgateRegistry.sol
@@ -5,11 +5,11 @@ import "src/solidity/IStarkgateRegistry.sol";
 import "src/solidity/IStarkgateService.sol";
 import "src/solidity/StarkgateConstants.sol";
 import "starkware/solidity/interfaces/Identity.sol";
-import "starkware/solidity/interfaces/ProxySupport.sol";
+import "starkware/solidity/upgrade/ProxySupportImpl.sol";
 import "starkware/solidity/libraries/Addresses.sol";
 import "starkware/solidity/libraries/NamedStorage.sol";
 
-contract StarkgateRegistry is Identity, ProxySupport, IStarkgateRegistry {
+contract StarkgateRegistry is Identity, ProxySupportImpl, IStarkgateRegistry {
     using Addresses for address;
     // Named storage slot tags.
     string internal constant MANAGER_TAG = "STARKGATE_REGISTRY_MANAGER_SLOT_TAG";
@@ -47,7 +47,7 @@ contract StarkgateRegistry is Identity, ProxySupport, IStarkgateRegistry {
     }
 
     function identify() external pure override returns (string memory) {
-        return "StarkWare_StarkgateRegistry_2.0_1";
+        return "StarkWare_StarkgateRegistry_2.0_6";
     }
 
     /*
@@ -81,6 +81,11 @@ contract StarkgateRegistry is Identity, ProxySupport, IStarkgateRegistry {
         return tokenToBridge()[token];
     }
 
+    function getL2Bridge(address token) external view returns (uint256) {
+        IStarkgateService l1Bridge = IStarkgateService(tokenToBridge()[token]);
+        return l1Bridge.getL2Bridge();
+    }
+
     /**
       Add a mapping between a token and the bridge handling it.
       Ensuring unique enrollment.
diff --git a/src/solidity/StarknetERC20Bridge.sol b/src/solidity/StarknetERC20Bridge.sol
@@ -5,6 +5,6 @@ import "src/solidity/LegacyBridge.sol";
 
 contract StarknetERC20Bridge is LegacyBridge {
     function identify() external pure override returns (string memory) {
-        return "StarkWare_StarknetERC20Bridge_2.0_5";
+        return "StarkWare_StarknetERC20Bridge_2.0_6";
     }
 }
diff --git a/src/solidity/StarknetEthBridge.sol b/src/solidity/StarknetEthBridge.sol
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0.
 pragma solidity ^0.8.20;
 
+import "starkware/solidity/components/Roles.sol";
 import "starkware/solidity/libraries/Addresses.sol";
 import "src/solidity/Fees.sol";
 import "src/solidity/LegacyBridge.sol";
@@ -9,7 +10,7 @@ contract StarknetEthBridge is LegacyBridge {
     using Addresses for address;
 
     function identify() external pure override returns (string memory) {
-        return "StarkWare_StarknetEthBridge_2.0_5";
+        return "StarkWare_StarknetEthBridge_2.0_6";
     }
 
     function acceptDeposit(
diff --git a/src/solidity/StarknetTokenBridge.sol b/src/solidity/StarknetTokenBridge.sol
diff --git a/src/solidity/conftest.py b/src/solidity/conftest.py
diff --git a/src/solidity/files_to_compile.txt b/src/solidity/files_to_compile.txt
diff --git a/src/solidity/legacy_token_bridge_test.py b/src/solidity/legacy_token_bridge_test.py

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ mod AccessErrors {`
`23`	`23`	`const ONLY_MINTER: felt252 = 'MINTER_ONLY';`
`24`	`24`	`const ONLY_SELF_CAN_RENOUNCE: felt252 = 'ONLY_SELF_CAN_RENOUNCE';`
`25`	`25`	`const GOV_ADMIN_CANNOT_RENOUNCE: felt252 = 'GOV_ADMIN_CANNOT_SELF_REMOVE';`
	`26`	`+ const SEC_ADMIN_CANNOT_RENOUNCE: felt252 = 'SEC_ADMIN_CANNOT_SELF_REMOVE';`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`mod ReplaceErrors {`