fix: add from param to AddBlobParams (#75)

Should fix #65

---------

Co-authored-by: Dan Buchholz <[email protected]>

Author: ukstv

README.md

@@ -67,8 +67,10 @@ subnet):
 | CreditManager  | Subnet      | `0xTODO`                                     |
 | ValidatorGater | Subnet      | `0x880126f3134EdFBa4f1a65827D5870f021bb7124` |
 
-To get testnet tokens, visit: [https://faucet.node-0.testnet.recall.network](https://faucet.node-0.testnet.recall.network). Also, you can check
-out the `foundry.toml` file to see the RPC URLs for each network (described in more detail below).
+To get testnet tokens, visit:
+[https://faucet.node-0.testnet.recall.network](https://faucet.node-0.testnet.recall.network). Also,
+you can check out the `foundry.toml` file to see the RPC URLs for each network (described in more
+detail below).
 
 ## Usage
 
@@ -665,11 +667,12 @@ export BUCKETS=0x314512a8692245cf507ac6E9d0eB805EA820d9a8
 The account you use to create buckets should have the following:
 
 - A RECALL token balance in the subnet (e.g., from the faucet at:
-  [https://faucet.node-0.testnet.recall.network](https://faucet.node-0.testnet.recall.network)). You can verify this with the
-  [Recall CLI](https://github.com/recallnet/rust-recall): `recall account info`
-- A credit balance in the subnet. You can verify this with `recall credit balance`. If you don't have
-  credits, you can buy them with the Credits contract above, or run the `recall credit buy <amount>`
-  command.
+  [https://faucet.node-0.testnet.recall.network](https://faucet.node-0.testnet.recall.network)). You
+  can verify this with the [Recall CLI](https://github.com/recallnet/rust-recall):
+  `recall account info`
+- A credit balance in the subnet. You can verify this with `recall credit balance`. If you don't
+  have credits, you can buy them with the Credits contract above, or run the
+  `recall credit buy <amount>` command.
 
 Creating a bucket will cost native RECALL tokens, and writing to it will cost credit.
 
@@ -979,6 +982,7 @@ In the example below, we've already staged this data offchain and are using the
   string).
 - `ttl`: Blob time-to-live epochs. If specified as `0`, the auto-debitor maintains about one hour of
   credits as an ongoing commitment.
+- `from`: The address of the account to use for the transaction.
 
 This all gets passed as a single `AddBlobParams` struct to the `addBlob` method:
 
@@ -991,17 +995,18 @@ struct AddBlobParams {
     string subscriptionId; // use `""` for the default, or pass a string value
     uint64 size; // 6
     uint64 ttl; // 0 (which is interpreted as null)
+    address from; // 0x90F79bf6EB2c4f870365E785982E1f101E93b906
 }
 ```
 
 We then pass this as a single parameter to the `add` method:
 
 ```sh
-cast send --rpc-url $ETH_RPC_URL $BLOBS "addBlob((address,string,string,string,string,uint64,uint64))" '(0x0000000000000000000000000000000000000000,"cydkrslhbj4soqppzc66u6lzwxgjwgbhdlxmyeahytzqrh65qtjq","rzghyg4z3p6vbz5jkgc75lk64fci7kieul65o6hk6xznx7lctkmq","","",6,0)' --private-key $PRIVATE_KEY
+cast send --rpc-url $ETH_RPC_URL $BLOBS "addBlob((address,string,string,string,string,uint64,uint64,address))" "(0x0000000000000000000000000000000000000000,"cydkrslhbj4soqppzc66u6lzwxgjwgbhdlxmyeahytzqrh65qtjq","rzghyg4z3p6vbz5jkgc75lk64fci7kieul65o6hk6xznx7lctkmq",\"\",\"\",6,0,$EVM_ADDRESS)" --private-key $PRIVATE_KEY
 ```
 
-To include a custom subscription ID, you would replace the empty string (which indicates `Default`)
-in the call above, like so: `(...,"rzgh...","","my_custom_id",6,0)`.
+To include a custom subscription ID, you would replace the empty string (which indicates `default`)
+in the call above, like so: `(...,"rzgh...","","my_custom_id",6,0,...)`.
 
 If you're wondering where to get the `source` storage bucket's node ID (the example's
 `cydkrslhbj4soqppzc66u6lzwxgjwgbhdlxmyeahytzqrh65qtjq`), you can find it with a `curl` request. On
@@ -1032,7 +1037,7 @@ You can overwrite a blob you've created with the following, passing the old blob
 the new blob's parameters.
 
 ```sh
-cast send --rpc-url $ETH_RPC_URL $BLOBS "overwriteBlob(string,(address,string,string,string,string,uint64,uint64))" "rzghyg4z3p6vbz5jkgc75lk64fci7kieul65o6hk6xznx7lctkmq" '(0x0000000000000000000000000000000000000000,"cydkrslhbj4soqppzc66u6lzwxgjwgbhdlxmyeahytzqrh65qtjq","rzghyg4z3p6vbz5jkgc75lk64fci7kieul65o6hk6xznx7lctkmq","","",6,0)' --private-key $PRIVATE_KEY
+cast send --rpc-url $ETH_RPC_URL $BLOBS "overwriteBlob(string,(address,string,string,string,string,uint64,uint64,adderss))" "rzghyg4z3p6vbz5jkgc75lk64fci7kieul65o6hk6xznx7lctkmq" '(0x0000000000000000000000000000000000000000,"cydkrslhbj4soqppzc66u6lzwxgjwgbhdlxmyeahytzqrh65qtjq","rzghyg4z3p6vbz5jkgc75lk64fci7kieul65o6hk6xznx7lctkmq","","",6,0,0x90F79bf6EB2c4f870365E785982E1f101E93b906)' --private-key $PRIVATE_KEY
 ```
 
 This will emit an `OverwriteBlob` event and overwrite the blob in the network.

src/types/BlobTypes.sol

@@ -149,6 +149,7 @@ struct AddBlobParams {
     string subscriptionId;
     uint64 size;
     uint64 ttl;
+    address from;
 }
 
 /// @dev Blob information and status.

src/wrappers/LibBlob.sol

@@ -317,7 +317,7 @@ library LibBlob {
     /// @param params The parameters for adding a blob.
     /// @return encoded The encoded parameters.
     function encodeAddBlobParams(AddBlobParams memory params) internal pure returns (bytes memory) {
-        bytes[] memory encoded = new bytes[](7);
+        bytes[] memory encoded = new bytes[](8);
         encoded[0] = params.sponsor == address(0) ? LibWasm.encodeCborNull() : params.sponsor.encodeCborAddress();
         encoded[1] = params.source.encodeCborBlobHashOrNodeId();
         encoded[2] = params.blobHash.encodeCborBlobHashOrNodeId();
@@ -328,6 +328,7 @@ library LibBlob {
         encoded[4] = encodeSubscriptionId(params.subscriptionId);
         encoded[5] = params.size.encodeCborUint64();
         encoded[6] = params.ttl == 0 ? LibWasm.encodeCborNull() : params.ttl.encodeCborUint64();
+        encoded[7] = params.from.encodeCborAddress();
         return encoded.encodeCborArray();
     }
 

test/LibBlob.t.sol

@@ -127,12 +127,13 @@ contract LibBlobTest is Test {
             metadataHash: "",
             subscriptionId: "",
             size: 6,
-            ttl: 0 // Null value
+            ttl: 0, // Null value
+            from: address(0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045) // vitalik.eth
         });
         bytes memory encoded = LibBlob.encodeAddBlobParams(params);
         assertEq(
             encoded,
-            hex"87f69820184518b61888181a18c01848184b1875188418ce18aa18e01838181c1833187218c118b3187118a418a818ea18e9184215189b18aa189a18e618d40e18e49820188e184c187c181b189918db18fd185018e718a91851188518fe18ad185e18e11844188f18a90418a218fd18d7187818ea18f518f218db18fd1862189a189998200000000000000000000000000000000000000000000000000000000000000000a165696e6e65726006f6"
+            hex"88f69820184518b61888181a18c01848184b1875188418ce18aa18e01838181c1833187218c118b3187118a418a818ea18e9184215189b18aa189a18e618d40e18e49820188e184c187c181b189918db18fd185018e718a91851188518fe18ad185e18e11844188f18a90418a218fd18d7187818ea18f518f218db18fd1862189a189998200000000000000000000000000000000000000000000000000000000000000000a165696e6e65726006f656040ad8da6bf26964af9d7eed9e03e53415d37aa96045"
         );
     }
 

test/scripts/wrapper_integration_test.sh

@@ -12,6 +12,7 @@ PRIVATE_KEY="${PRIVATE_KEY:-0x7c852118294e51e653712a81e05800f419141751be58f605c3
 OBJECT_API_URL="${OBJECT_API_URL:-http://localhost:8001}"
 EVM_ADDRESS=$(cast wallet address $PRIVATE_KEY)
 SOURCE=$(curl -X GET $OBJECT_API_URL/v1/node | jq '.node_id' | tr -d '"')
+ZERO_ADDR="0x0000000000000000000000000000000000000000"
 DIVIDER=$'\n============================\n'
 
 echo "Running tests with environment:"
@@ -28,8 +29,8 @@ echo "hello" > $TEMP_FILE
 OBJECT_KEY="hello/world"
 BUCKET_ADDR=$(RECALL_PRIVATE_KEY=$PRIVATE_KEY RECALL_NETWORK=localnet recall bucket create | jq '.address' | tr -d '"')
 create_object_response=$(RECALL_PRIVATE_KEY=$PRIVATE_KEY RECALL_NETWORK=localnet recall bu add --address $BUCKET_ADDR --key $OBJECT_KEY $TEMP_FILE)
-SIZE=$(echo $create_object_response | jq '.object.size')
-BLOB_HASH=$(echo $create_object_response | jq '.object.hash' | tr -d '"')
+SIZE=6
+BLOB_HASH="rzghyg4z3p6vbz5jkgc75lk64fci7kieul65o6hk6xznx7lctkmq"
 
 echo -e "$DIVIDER"
 echo "Running BlobManager integration tests..."
@@ -47,8 +48,8 @@ echo "Using BlobManager: $BLOBS"
 # Test addBlob
 echo
 echo "Testing addBlob..."
-output=$(cast send --rpc-url $ETH_RPC_URL $BLOBS "addBlob((address,string,string,string,string,uint64,uint64))" \
-    "(0x0000000000000000000000000000000000000000,$SOURCE,$BLOB_HASH,\"\",\"\",$SIZE,0)" \
+output=$(cast send --rpc-url $ETH_RPC_URL $BLOBS "addBlob((address,string,string,string,string,uint64,uint64,address))" \
+    "($ZERO_ADDR,$SOURCE,$BLOB_HASH,\"\",\"\",$SIZE,0,$EVM_ADDRESS)" \
     --private-key $PRIVATE_KEY)
 if [ "$output" = "0x" ]; then
     echo "addBlob failed"
@@ -71,7 +72,7 @@ echo "Output: $DECODED_BLOB"
 echo
 echo "Testing getBlobStatus..."
 output=$(cast call --rpc-url $ETH_RPC_URL $BLOBS "getBlobStatus(address,string,string)" \
-    "0x0000000000000000000000000000000000000000" "$BLOB_HASH" "")
+    "$ZERO_ADDR" "$BLOB_HASH" "")
 if [ "$output" = "0x" ]; then
     echo "getBlobStatus failed"
     exit 1
@@ -160,9 +161,9 @@ echo "Output: $DECODED_SUBNET_STATS"
 # Test overwriteBlob
 echo
 echo "Testing overwriteBlob..."
-output=$(cast send --rpc-url $ETH_RPC_URL $BLOBS "overwriteBlob(string,(address,string,string,string,string,uint64,uint64))" \
+output=$(cast send --rpc-url $ETH_RPC_URL $BLOBS "overwriteBlob(string,(address,string,string,string,string,uint64,uint64,address))" \
     "$BLOB_HASH" \
-    "(0x0000000000000000000000000000000000000000,$SOURCE,$BLOB_HASH,\"\",\"\",$SIZE,0)" \
+    "($ZERO_ADDR,$SOURCE,$BLOB_HASH,\"\",\"\",$SIZE,0,$EVM_ADDRESS)" \
     --private-key $PRIVATE_KEY)
 if [ "$output" = "0x" ]; then
     echo "overwriteBlob failed"
@@ -174,7 +175,7 @@ echo "Output: $output"
 echo
 echo "Testing deleteBlob..."
 output=$(cast send --rpc-url $ETH_RPC_URL $BLOBS "deleteBlob(address,string,string)" \
-    "0x0000000000000000000000000000000000000000" "$BLOB_HASH" "" \
+    "$ZERO_ADDR" "$BLOB_HASH" "" \
     --private-key $PRIVATE_KEY)
 if [ "$output" = "0x" ]; then
     echo "deleteBlob failed"