[v2] Blob Metadata Store #818
There are no files selected for viewing
This file contains 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 |
|---|---|---|
|
|
@@ -5,11 +5,14 @@ import ( | |
| "errors" | ||
| "fmt" | ||
| "math/big" | ||
| "strconv" | ||
|
|
||
| "github.com/Layr-Labs/eigenda/common" | ||
| "github.com/Layr-Labs/eigenda/encoding" | ||
| "github.com/aws/aws-sdk-go-v2/service/dynamodb/types" | ||
| "github.com/consensys/gnark-crypto/ecc/bn254" | ||
| "github.com/ethereum/go-ethereum/accounts/abi" | ||
| "golang.org/x/crypto/sha3" | ||
| ) | ||
|
|
||
| type AccountID = string | ||
|
|
@@ -483,34 +486,80 @@ func (cb Bundles) FromEncodedBundles(eb EncodedBundles) (Bundles, error) { | |
|
|
||
| // PaymentMetadata represents the header information for a blob | ||
| type PaymentMetadata struct { | ||
| // AccountID is the ETH account address for the payer | ||
| AccountID string `json:"account_id"` | ||
|
|
||
| // BinIndex represents the range of time at which the dispersal is made | ||
| BinIndex uint32 `json:"bin_index"` | ||
| // TODO: we are thinking the contract can use uint128 for cumulative payment, | ||
| // but the definition on v2 uses uint64. Double check with team. | ||
| CumulativePayment *big.Int `json:"cumulative_payment"` | ||
| } | ||
|
|
||
| // Hash returns the Keccak256 hash of the PaymentMetadata | ||
| func (pm *PaymentMetadata) Hash() ([32]byte, error) { | ||
|
There was a problem hiding this comment. updated this hash function to make it compatible with solidity |
||
| blobHeaderType, err := abi.NewType("tuple", "", []abi.ArgumentMarshaling{ | ||
| { | ||
| Name: "accountID", | ||
| Type: "string", | ||
| }, | ||
| { | ||
| Name: "binIndex", | ||
| Type: "uint32", | ||
| }, | ||
| { | ||
| Name: "cumulativePayment", | ||
| Type: "uint256", | ||
| }, | ||
| }) | ||
| if err != nil { | ||
| return [32]byte{}, err | ||
| } | ||
|
|
||
| arguments := abi.Arguments{ | ||
| { | ||
| Type: blobHeaderType, | ||
| }, | ||
| } | ||
|
|
||
| bytes, err := arguments.Pack(pm) | ||
| if err != nil { | ||
| return [32]byte{}, err | ||
| } | ||
|
|
||
| var hash [32]byte | ||
| hasher := sha3.NewLegacyKeccak256() | ||
| hasher.Write(bytes) | ||
| copy(hash[:], hasher.Sum(nil)[:32]) | ||
|
|
||
| return hash, nil | ||
| } | ||
|
|
||
| func (pm *PaymentMetadata) MarshalDynamoDBAttributeValue() (types.AttributeValue, error) { | ||
|
There was a problem hiding this comment. Does this belong in core? Is there any way to have this code in the blobstore? There was a problem hiding this comment. They need to belong in the same package as where the type is defined. We can wrap and clone these types in blobstore but not sure if that's worth it |
||
| return &types.AttributeValueMemberM{ | ||
| Value: map[string]types.AttributeValue{ | ||
| "AccountID": &types.AttributeValueMemberS{Value: pm.AccountID}, | ||
| "BinIndex": &types.AttributeValueMemberN{Value: fmt.Sprintf("%d", pm.BinIndex)}, | ||
| "CumulativePayment": &types.AttributeValueMemberN{ | ||
| Value: pm.CumulativePayment.String(), | ||
| }, | ||
| }, | ||
| }, nil | ||
| } | ||
|
|
||
| func (pm *PaymentMetadata) UnmarshalDynamoDBAttributeValue(av types.AttributeValue) error { | ||
| m, ok := av.(*types.AttributeValueMemberM) | ||
| if !ok { | ||
| return fmt.Errorf("expected *types.AttributeValueMemberM, got %T", av) | ||
| } | ||
| pm.AccountID = m.Value["AccountID"].(*types.AttributeValueMemberS).Value | ||
| binIndex, err := strconv.ParseUint(m.Value["BinIndex"].(*types.AttributeValueMemberN).Value, 10, 32) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to parse BinIndex: %w", err) | ||
| } | ||
| pm.BinIndex = uint32(binIndex) | ||
| pm.CumulativePayment, _ = new(big.Int).SetString(m.Value["CumulativePayment"].(*types.AttributeValueMemberN).Value, 10) | ||
| return nil | ||
| } | ||
|
|
||
| // OperatorInfo contains information about an operator which is stored on the blockchain state, | ||
|
|
||
This file contains 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 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 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.
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.
Where is the json serialization used?
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.
It's used when we marshal/unmarshal the struct to/from json, i.e. in dataapi.
I've removed these for now