Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: code reduction on doHash #377

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −29
Open

chore: code reduction on doHash #377

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f0270e
chore: code reduction on doHash
colin-axner Oct 7, 2024
2149728
Merge branch 'master' into colin/code-reduction
colin-axner Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 5 additions & 29 deletions go/ops.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,41 +190,17 @@ func doHash(hashOp HashOp, preimage []byte) ([]byte, error) {
return hashBz(crypto.RIPEMD160, preimage)
case HashOp_BITCOIN:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wasn't mentioned in the audit, but I added code reduction here as well

// ripemd160(sha256(x))
sha := crypto.SHA256.New()
_, err := sha.Write(preimage)
tmp, err := hashBz(crypto.SHA256, preimage)
if err != nil {
return nil, err
}
tmp := sha.Sum(nil)
bitcoinHash := crypto.RIPEMD160.New()
_, err = bitcoinHash.Write(tmp)
if err != nil {
return nil, err
}
return bitcoinHash.Sum(nil), nil
return hashBz(crypto.RIPEMD160, tmp)
case HashOp_SHA512_256:
shaHash := crypto.SHA512_256.New()
_, err := shaHash.Write(preimage)
if err != nil {
return nil, err
}
return shaHash.Sum(nil), nil
return hashBz(crypto.SHA512_256, preimage)
case HashOp_BLAKE2B_512:
blakeHash := crypto.BLAKE2b_512.New()
_, err := blakeHash.Write(preimage)
if err != nil {
return nil, err
}
return blakeHash.Sum(nil), nil
return hashBz(crypto.BLAKE2b_512, preimage)
case HashOp_BLAKE2S_256:
blakeHash := crypto.BLAKE2s_256.New()
_, err := blakeHash.Write(preimage)
if err != nil {
return nil, err
}
return blakeHash.Sum(nil), nil
// TODO: there doesn't seem to be an "official" implementation of BLAKE3 in Go,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

took the liberty of removing this comment. If desired, someone can open an issue

// so we are unable to support it for now
return hashBz(crypto.BLAKE2s_256, preimage)
}
return nil, fmt.Errorf("unsupported hashop: %d", hashOp)
}
Expand Down
Loading