chore: cleanups after rebase

Author: dtbuchholz

README.md

@@ -186,6 +186,14 @@ Deploy the Bucket Manager contract to the localnet subnet:
 PRIVATE_KEY=<0x...> forge script script/BucketManager.s.sol --tc DeployScript --sig 'run(string)' local --rpc-url localnet_subnet --broadcast -g 100000 -vv
 ```
 
+##### Blobs
+
+Deploy the Blob Manager contract to the localnet subnet:
+
+```shell
+PRIVATE_KEY=<0x...> forge script script/BlobManager.s.sol --tc DeployScript --sig 'run(string)' local --rpc-url testnet_subnet --broadcast -g 100000 -vv
+```
+
 #### Testnet
 
 ##### Hoku ERC20
@@ -209,7 +217,7 @@ PRIVATE_KEY=<0x...> forge script script/Faucet.s.sol --tc DeployScript --sig 'ru
 
 ##### Credit
 
-Deploy the Credit contract to the testnet subnet:
+Deploy the Credit Manager contract to the testnet subnet:
 
 ```shell
 PRIVATE_KEY=<0x...> forge script script/CreditManager.s.sol --tc DeployScript --sig 'run(string)' testnet --rpc-url testnet_subnet --broadcast -g 100000 -vv
@@ -223,6 +231,14 @@ Deploy the Bucket Manager contract to the testnet subnet:
 PRIVATE_KEY=<0x...> forge script script/BucketManager.s.sol --tc DeployScript --sig 'run(string)' testnet --rpc-url testnet_subnet --broadcast -g 100000 -vv
 ```
 
+##### Blobs
+
+Deploy the Blob Manager contract to the testnet subnet:
+
+```shell
+PRIVATE_KEY=<0x...> forge script script/BlobManager.s.sol --tc DeployScript --sig 'run(string)' testnet --rpc-url testnet_subnet --broadcast -g 100000 -vv
+```
+
 #### Devnet
 
 The devnet does not have the concept of a "parent" chain, so all RPCs would use `--rpc-url devnet`
@@ -855,8 +871,8 @@ setting the `BLOBS` environment variable to the deployed address:
 
 ```
 BLOBS=$(PRIVATE_KEY=$PRIVATE_KEY forge script script/BlobManager.s.sol \
---tc DeployScript 0 \
---sig 'run(uint8)' \
+--tc DeployScript \
+--sig 'run(string)' local \
 --rpc-url localnet_subnet \
 --broadcast -g 100000 \
 | grep "0: contract BlobManager" | awk '{print $NF}')

script/BlobManager.s.sol

@@ -1,33 +1,25 @@
 // SPDX-License-Identifier: MIT OR Apache-2.0
 pragma solidity ^0.8.26;
 
+import {Strings} from "@openzeppelin/contracts/utils/Strings.sol";
 import {Script} from "forge-std/Script.sol";
 import {console2 as console} from "forge-std/console2.sol";
 
 import {BlobManager} from "../src/BlobManager.sol";
-import {Environment} from "../src/types/CommonTypes.sol";
 
 contract DeployScript is Script {
     string constant PRIVATE_KEY = "PRIVATE_KEY";
 
     function setUp() public {}
 
-    function run(Environment env) public returns (BlobManager) {
+    function run(string memory network) public returns (BlobManager) {
         if (vm.envExists(PRIVATE_KEY)) {
             uint256 privateKey = vm.envUint(PRIVATE_KEY);
-            if (env == Environment.Local) {
-                console.log("Deploying to local network");
-            } else if (env == Environment.Testnet) {
-                console.log("Deploying to testnet network");
-            } else {
-                revert("Mainnet is not supported");
-            }
             vm.startBroadcast(privateKey);
-        } else if (env == Environment.Foundry) {
-            console.log("Deploying to foundry");
+        } else if (Strings.equal(network, "local")) {
             vm.startBroadcast();
         } else {
-            revert("PRIVATE_KEY not set");
+            revert("PRIVATE_KEY not set in non-local environment");
         }
 
         BlobManager blobs = new BlobManager();

test/BlobManager.t.sol

@@ -7,14 +7,13 @@ import {console2 as console} from "forge-std/console2.sol";
 
 import {DeployScript as BlobDeployer} from "../script/BlobManager.s.sol";
 import {BlobManager} from "../src/BlobManager.sol";
-import {Environment} from "../src/types/CommonTypes.sol";
 
 // TODO: add integration tests once it's possible in CI
 contract BlobManagerTest is Test, BlobManager {
     BlobManager internal blobs;
 
     function setUp() public virtual {
         BlobDeployer blobsDeployer = new BlobDeployer();
-        blobs = blobsDeployer.run(Environment.Foundry);
+        blobs = blobsDeployer.run("local");
     }
 }