identity deserialization #628
Merged
Conversation
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
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
token/core/common/validator.go
Outdated
| @@ -94,7 +93,7 @@ func (v *Validator[P, T, TA, IA]) VerifyTokenRequestFromRaw(getState driver.GetS | |||
| return nil, nil, errors.Wrap(err, "failed to marshal signed token request") | |||
| } | |||
|
|
|||
| v.Logger.Debugf("cc tx-id [%s][%s]", hash.Hashable(raqRaw).String(), anchor) | |||
| v.Logger.Debugf("cc tx-id [%s][%s]", Hashable(raqRaw).String(), anchor) | |||
There was a problem hiding this comment.
Avoid to call String() in debug logs. It is called lazily
| @@ -125,14 +136,15 @@ func (s *TransferService) Transfer(txID string, wallet driver.OwnerWallet, ids [ | |||
| } | |||
|
|
|||
| metadata := &driver.TransferMetadata{ | |||
| Outputs: outputs, | |||
There was a problem hiding this comment.
I think it would give more clarity to have a struct:
type OutToken struct {
TokenID
Sender
Output
Metadata
AuditInfo
Receiver
ReceiverAuditInfo
ReceiverIsSender
}
Then the transferMetadata would contain a []OutToken slice.
This way it's not necessary to read the code to figure out which slice elements are related, and we don't need to check that the lengths are correct.
| } | ||
|
|
||
| type TypedVerifierDeserializerMultiplex struct { | ||
| deserializers map[string]TypedVerifierDeserializer |
There was a problem hiding this comment.
We could use an alias to link this value to the Type property and even provide constants for it
| func (a *AuditDeserializer) DeserializeAuditInfo(bytes []byte) (deserializer.AuditInfo, error) { | ||
| si := &ScriptInfo{} | ||
| err := json.Unmarshal(bytes, si) | ||
| if err == nil && (len(si.Sender) != 0 || len(si.Recipient) != 0) { |
There was a problem hiding this comment.
We could inverse the condition to reduce nesting.
| } | ||
| return nil, errors.Errorf("no recipient defined") | ||
| } | ||
| return nil, errors.Errorf("ivalid audit info, failed unmarshal [%s]", string(bytes)) |
There was a problem hiding this comment.
Maybe it makes sense to include also the length of sender/recipient for better debugging.
| return nil, errors.Errorf("failed signer deserialization [%v]", errs) | ||
| } | ||
|
|
||
| func (d *multipler) Info(raw []byte, auditInfo []byte) (string, error) { |
There was a problem hiding this comment.
To avoid duplication we could have a method:
func deserialize[V](extractor func(driver.Deserializer) (V, err)) {
var errs []error
copyDeserial := d.threadSafeCopyDeserializers()
for _, des := range copyDeserial {
if logger.IsEnabledFor(zapcore.DebugLevel) {
logger.Debugf("trying signer deserialization with [%s]", des)
}
v, err := extractor()
if err == nil {
if logger.IsEnabledFor(zapcore.DebugLevel) {
logger.Debugf("trying signer deserialization with [%s] succeeded", des)
}
return v, nil
}
if logger.IsEnabledFor(zapcore.DebugLevel) {
logger.Debugf("trying signer deserialization with [%s] failed [%s]", des, err)
}
errs = append(errs, err)
}
return nil, errors.Errorf("failed signer deserialization [%v]", errs)
}
Then your three methods are almost the same:
func (d *multipler) DeserializeSigner(raw []byte) (driver.Signer, error) {
return deserialize(d.threadSafeCopyDeserializers(), func(des driver.Deserializer) (driver.Signer, error) {return des.DeserializeSigner(raw)})
}
alexandrosfilios
approved these changes
May 13, 2024
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR does the following:
view.Identityfrom the smart client in the Token and Driver API. In future PR, the alias will be used everywhere and then the dependency to the smart client removed.Side node: This PR leaves a TODO to be addressed in another PR. The auditor of the zkatdlog driver needs to be updated to better handle the htlc identities and their relative audit information.