chore(protocol): replace hardcode "bridge" with B_BRIDGE (#16976)

taikoxyz · May 4, 2024 · 2d6468f · 2d6468f
1 parent f769e77
commit 2d6468f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/packages/protocol/contracts/bridge/Bridge.sol b/packages/protocol/contracts/bridge/Bridge.sol
@@ -387,7 +387,7 @@ contract Bridge is EssentialContract, IBridge {
         view
         returns (bool enabled_, address destBridge_)
     {
-        destBridge_ = resolve(_chainId, "bridge", true);
+        destBridge_ = resolve(_chainId, LibStrings.B_BRIDGE, true);
         enabled_ = destBridge_ != address(0);
     }
 
@@ -538,7 +538,7 @@ contract Bridge is EssentialContract, IBridge {
         returns (bool success_, uint32 numCacheOps_)
     {
         try ISignalService(_signalService).proveSignalReceived(
-            _chainId, resolve(_chainId, "bridge", false), _signal, _proof
+            _chainId, resolve(_chainId, LibStrings.B_BRIDGE, false), _signal, _proof
         ) returns (uint256 numCacheOps) {
             numCacheOps_ = uint32(numCacheOps);
             success_ = true;
@@ -565,7 +565,7 @@ contract Bridge is EssentialContract, IBridge {
         returns (bool)
     {
         try ISignalService(_signalService).verifySignalReceived(
-            _chainId, resolve(_chainId, "bridge", false), _signal, _proof
+            _chainId, resolve(_chainId, LibStrings.B_BRIDGE, false), _signal, _proof
         ) {
             return true;
         } catch {

diff --git a/packages/protocol/contracts/signal/SignalService.sol b/packages/protocol/contracts/signal/SignalService.sol
@@ -323,7 +323,7 @@ contract SignalService is EssentialContract, ISignalService {
         address app = _app;
         bytes32 signal = _signal;
         bytes32 value = _signal;
-        address signalService = resolve(chainId, "signal_service", false);
+        address signalService = resolve(chainId, LibStrings.B_SIGNAL_SERVICE, false);
 
         HopProof memory hop;
         bytes32 signalRoot;
@@ -348,7 +348,7 @@ contract SignalService is EssentialContract, ISignalService {
                 if (hop.chainId == 0 || hop.chainId == block.chainid) {
                     revert SS_INVALID_MID_HOP_CHAINID();
                 }
-                signalService = resolve(hop.chainId, "signal_service", false);
+                signalService = resolve(hop.chainId, LibStrings.B_SIGNAL_SERVICE, false);
             }
 
             isFullProof = hop.accountProof.length != 0;

diff --git a/packages/protocol/contracts/tokenvault/ERC1155Vault.sol b/packages/protocol/contracts/tokenvault/ERC1155Vault.sol
@@ -4,6 +4,7 @@ pragma solidity 0.8.24;
 import "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
 import "@openzeppelin/contracts-upgradeable/token/ERC1155/utils/ERC1155ReceiverUpgradeable.sol";
 import "../libs/LibAddress.sol";
+import "../common/LibStrings.sol";
 import "./BaseNFTVault.sol";
 import "./BridgedERC1155.sol";
 
@@ -207,7 +208,7 @@ contract ERC1155Vault is BaseNFTVault, ERC1155ReceiverUpgradeable {
 
     /// @inheritdoc BaseVault
     function name() public pure override returns (bytes32) {
-        return "erc1155_vault";
+        return LibStrings.B_ERC1155_VAULT;
     }
 
     /// @dev Transfers ERC1155 tokens to the `to` address.

diff --git a/packages/protocol/contracts/tokenvault/ERC20Vault.sol b/packages/protocol/contracts/tokenvault/ERC20Vault.sol
@@ -5,6 +5,7 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import "../libs/LibAddress.sol";
+import "../common/LibStrings.sol";
 import "./BridgedERC20.sol";
 import "./BaseVault.sol";
 
@@ -316,7 +317,7 @@ contract ERC20Vault is BaseVault {
 
     /// @inheritdoc BaseVault
     function name() public pure override returns (bytes32) {
-        return "erc20_vault";
+        return LibStrings.B_ERC20_VAULT;
     }
 
     function _transferTokens(

diff --git a/packages/protocol/contracts/tokenvault/ERC721Vault.sol b/packages/protocol/contracts/tokenvault/ERC721Vault.sol
@@ -4,6 +4,7 @@ pragma solidity 0.8.24;
 import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
 import "../libs/LibAddress.sol";
+import "../common/LibStrings.sol";
 import "./BaseNFTVault.sol";
 import "./BridgedERC721.sol";
 
@@ -158,7 +159,7 @@ contract ERC721Vault is BaseNFTVault, IERC721Receiver {
 
     /// @inheritdoc BaseVault
     function name() public pure override returns (bytes32) {
-        return "erc721_vault";
+        return LibStrings.B_ERC721_VAULT;
     }
 
     function _transferTokens(