Merge pull request #57 from tangle-network/donovan/pricing

feat: rpc address update event

Author: Tjemmmic

bytecode/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "tnt-core-bytecode"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2021"
 description = "Bytecode exports for TNT Core Solidity contracts"
 license = "MIT"

bytecode/Cargo.toml

@@ -10,6 +10,7 @@ optimizer_runs = 200
 fs_permissions = [{ access = "read-write", path = "./" }]
 solc = "0.8.20"
 evm_version = "shanghai"
+allow_internal_expect_revert = true
 
 [profile.ci]
 verbosity = 4

bytecode/src/lib.rs

@@ -53,7 +53,7 @@ contract BlueprintServiceManagerBase is IBlueprintServiceManager, RootChainEnabl
     function onUnregister(ServiceOperators.OperatorPreferences calldata operator) external virtual onlyFromMaster { }
 
     /// @inheritdoc IBlueprintServiceManager
-    function onUpdatePriceTargets(ServiceOperators.OperatorPreferences calldata operator)
+    function onUpdateRpcAddress(ServiceOperators.OperatorPreferences calldata operator)
         external
         payable
         virtual

foundry.toml

@@ -32,10 +32,9 @@ interface IBlueprintServiceManager {
     /// @param operator The operator's details.
     function onUnregister(ServiceOperators.OperatorPreferences calldata operator) external;
 
-    /// @dev Hook for updating operator's Price Targets. Called when an operator updates
-    /// their price targets.
-    /// @param operator The operator's details with the to be updated price targets.
-    function onUpdatePriceTargets(ServiceOperators.OperatorPreferences calldata operator) external payable;
+    /// @dev Hook for updating RPC address. Called when an operator updates their RPC address.
+    /// @param operator The operator's details with the updated RPC address.
+    function onUpdateRpcAddress(ServiceOperators.OperatorPreferences calldata operator) external payable;
 
     /// @dev Hook for service instance requests. Called when a user requests a service
     /// instance from the blueprint but this does not mean the service is initiated yet.

src/BlueprintServiceManagerBase.sol

@@ -102,10 +102,10 @@ contract MasterBlueprintServiceManager is RootChainEnabled, AccessControl, Pausa
     /// @param operator The operator's preferences.
     event OperatorUnregistered(uint64 indexed blueprintId, ServiceOperators.OperatorPreferences operator);
 
-    /// @dev Emitted when an operator updates their price targets.
+    /// @dev Emitted when an operator updates their RPC address.
     /// @param blueprintId The unique identifier of the blueprint.
     /// @param operator The operator's updated preferences.
-    event PriceTargetsUpdated(uint64 indexed blueprintId, ServiceOperators.OperatorPreferences operator);
+    event RpcAddressUpdated(uint64 indexed blueprintId, ServiceOperators.OperatorPreferences operator);
 
     /// @dev Emitted when a service instance is requested from a blueprint.
     /// @param blueprintId The unique identifier of the blueprint.
@@ -301,10 +301,10 @@ contract MasterBlueprintServiceManager is RootChainEnabled, AccessControl, Pausa
         emit OperatorUnregistered(blueprintId, operator);
     }
 
-    /// @dev Called when an operator updates their price targets.
-    /// @param blueprintId The blueprint unique identifier.
-    /// @param operator The operator's details with the updated price targets.
-    function onUpdatePriceTargets(
+    /// @dev Hook to be called upon a new RPC address update on a blueprint.
+    /// @param blueprintId The unique identifier of the blueprint.
+    /// @param operator The operator's preferences.
+    function onUpdateRpcAddress(
         uint64 blueprintId,
         ServiceOperators.OperatorPreferences calldata operator
     )
@@ -314,8 +314,8 @@ contract MasterBlueprintServiceManager is RootChainEnabled, AccessControl, Pausa
         whenNotPaused
     {
         address manager = blueprints.get(blueprintId);
-        IBlueprintServiceManager(manager).onUpdatePriceTargets(operator);
-        emit PriceTargetsUpdated(blueprintId, operator);
+        IBlueprintServiceManager(manager).onUpdateRpcAddress(operator);
+        emit RpcAddressUpdated(blueprintId, operator);
     }
 
     /// @dev Called when a user requests a service instance from the blueprint.

src/IBlueprintServiceManager.sol

@@ -8,12 +8,12 @@ import { Assets } from "./AssetsLib.sol";
 /// @dev Contains structs and enums related to service operators.
 /// @notice Holds different structs and enums related to service operators.
 library ServiceOperators {
-    /// @dev Represents the preferences of an operator, including their ECDSA public key and price targets.
+    /// @dev Represents the preferences of an operator, including their ECDSA public key and RPC address.
     struct OperatorPreferences {
         /// @notice The ECDSA public key of the operator.
         bytes ecdsaPublicKey;
-        /// @notice The price targets associated with the operator.
-        PriceTargets priceTargets;
+        /// @notice The address of the RPC server the operator is running.
+        string rpcAddress;
     }
 
     /// @dev Defines the pricing targets for various resources such as CPU, memory, and different types of storage.
@@ -36,7 +36,7 @@ library ServiceOperators {
         uint64 requestId;
         /// @notice Address of the requester
         address requester;
-        /// @notice Array of operator preferences containing public keys and price targets
+        /// @notice Array of operator preferences containing ECDSA public keys and RPC addresses
         OperatorPreferences[] operators;
         /// @notice Input parameters for the request encoded as bytes
         bytes requestInputs;

src/MasterBlueprintServiceManager.sol

@@ -8,7 +8,7 @@ contract AssetsLibTest is Test {
     // Test constants
     address constant TEST_ERC20_ADDRESS = address(0x1234567890123456789012345678901234567890);
     bytes32 constant TEST_ASSET_ID = bytes32(uint256(123));
-
+    
     function setUp() public {
         // No setup required as we're testing a library
     }