This repository was archived by the owner on Aug 2, 2021. It is now read-only.
Client-side MRU signing -- step 5/5 #704
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,65 +30,109 @@ import ( | |
| "gopkg.in/urfave/cli.v1" | ||
| ) | ||
|
|
||
| func NewGenericSigner(ctx *cli.Context) mru.Signer { | ||
| return mru.NewGenericSigner(getClientAccount(ctx)) | ||
| } | ||
|
|
||
| // swarm resource create <frequency> [--name <name>] [--data <0x Hexdata> [--multihash=false]] | ||
| // swarm resource update <Manifest Address or ENS domain> <0x Hexdata> [--multihash=false] | ||
| // swarm resource info <Manifest Address or ENS domain> | ||
|
|
||
| func resourceCreate(ctx *cli.Context) { | ||
| args := ctx.Args() | ||
|
|
||
| var ( | ||
| bzzapi = strings.TrimRight(ctx.GlobalString(SwarmApiFlag.Name), "/") | ||
| client = swarm.NewClient(bzzapi) | ||
| multihash = ctx.Bool(SwarmResourceMultihashFlag.Name) | ||
| initialData = ctx.String(SwarmResourceDataOnCreateFlag.Name) | ||
| name = ctx.String(SwarmResourceNameFlag.Name) | ||
| ) | ||
|
|
||
| if len(args) < 1 { | ||
| fmt.Println("Incorrect number of arguments") | ||
| cli.ShowCommandHelpAndExit(ctx, "create", 1) | ||
| return | ||
| } | ||
| signer := NewGenericSigner(ctx) | ||
| frequency, err := strconv.ParseUint(args[0], 10, 64) | ||
| if err != nil { | ||
| fmt.Printf("Frequency formatting error: %s\n", err.Error()) | ||
| cli.ShowCommandHelpAndExit(ctx, "create", 1) | ||
| return | ||
| } | ||
|
|
||
| newResourceRequest, err := mru.NewCreateRequest(&mru.ResourceMetadata{ | ||
| Name: name, | ||
| Frequency: frequency, | ||
| Owner: signer.Address(), | ||
| }) | ||
|
|
||
| if err != nil { | ||
| utils.Fatalf("Error creating new resource request: %s", err) | ||
| } | ||
|
|
||
| if initialData != "" { | ||
| initialDataBytes, err := hexutil.Decode(initialData) | ||
|
||
| if err != nil { | ||
| fmt.Printf("Error parsing data: %s\n", err.Error()) | ||
| cli.ShowCommandHelpAndExit(ctx, "create", 1) | ||
| return | ||
| } | ||
|
|
||
| newResourceRequest.SetData(initialDataBytes, multihash) | ||
| if err = newResourceRequest.Sign(signer); err != nil { | ||
| utils.Fatalf("Error signing resource update: %s", err.Error()) | ||
| } | ||
| } | ||
|
|
||
| manifestAddress, err := client.CreateResource(newResourceRequest) | ||
| if err != nil { | ||
| utils.Fatalf("Error creating resource: %s", err.Error()) | ||
| return | ||
| } | ||
| fmt.Println(manifestAddress) // output manifest address to the user in a single line (useful for other commands to pick up) | ||
|
|
||
| } | ||
|
|
||
| func resourceUpdate(ctx *cli.Context) { | ||
| args := ctx.Args() | ||
|
|
||
| var ( | ||
| bzzapi = strings.TrimRight(ctx.GlobalString(SwarmApiFlag.Name), "/") | ||
| client = swarm.NewClient(bzzapi) | ||
| multihash = ctx.Bool(SwarmResourceMultihashFlag.Name) | ||
| ) | ||
|
|
||
| if len(args) < 2 { | ||
| fmt.Println("Incorrect number of arguments") | ||
| cli.ShowCommandHelpAndExit(ctx, "update", 1) | ||
| return | ||
| } | ||
| signer := NewGenericSigner(ctx) | ||
| manifestAddressOrDomain := args[0] | ||
| data, err := hexutil.Decode(args[1]) | ||
| if err != nil { | ||
| utils.Fatalf("Error parsing data: %s", err.Error()) | ||
| return | ||
| } | ||
|
|
||
| // Retrieve resource status and metadata out of the manifest | ||
| updateRequest, err := client.GetResourceMetadata(manifestAddressOrDomain) | ||
| if err != nil { | ||
| utils.Fatalf("Error retrieving resource status: %s", err.Error()) | ||
| } | ||
|
|
||
| // set the new data | ||
| updateRequest.SetData(data, multihash) | ||
|
|
||
| // sign update | ||
| if err = updateRequest.Sign(signer); err != nil { | ||
| utils.Fatalf("Error signing resource update: %s", err.Error()) | ||
| } | ||
|
|
||
| // post update | ||
| err = client.UpdateResource(updateRequest) | ||
| if err != nil { | ||
| utils.Fatalf("Error updating resource: %s", err.Error()) | ||
| return | ||
|
|
@@ -112,7 +156,7 @@ func resourceInfo(ctx *cli.Context) { | |
| utils.Fatalf("Error retrieving resource metadata: %s", err.Error()) | ||
| return | ||
| } | ||
| encodedMetadata, err := metadata.MarshalJSON() | ||
| if err != nil { | ||
| utils.Fatalf("Error encoding metadata to JSON for display:%s", err) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we create a resource without a name?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. Name is optional. If you don't put the
nameflag, then the resource name is an empty string.