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.

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

refactor: reduce tendermint deps (backport #14616) #14664

Merged
merged 4 commits into from
Jan 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 18, 2023

This is an automatic backport of pull request #14616 done by Mergify.
Cherry-pick of 44fbb0d has failed:

On branch mergify/bp/release/v0.45.x/pr-14616
Your branch is up to date with 'origin/release/v0.45.x'.

You are currently cherry-picking commit 44fbb0df9.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   crypto/armor.go
	modified:   crypto/armor_test.go
	modified:   crypto/keyring/keyring.go
	new file:   crypto/keys/bcrypt/base64.go
	new file:   crypto/keys/bcrypt/bcrypt.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   crypto/ledger/ledger_mock.go
	both modified:   crypto/ledger/ledger_secp256k1.go
	both modified:   go.mod
	both modified:   go.sum
	deleted by us:   simapp/go.mod
	deleted by us:   simapp/go.sum
	deleted by us:   tests/go.mod
	deleted by us:   tests/go.sum
	deleted by us:   x/nft/go.mod
	deleted by us:   x/nft/go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 44fbb0d)

# Conflicts:
#	crypto/ledger/ledger_mock.go
#	crypto/ledger/ledger_secp256k1.go
#	go.mod
#	go.sum
#	simapp/go.mod
#	simapp/go.sum
#	tests/go.mod
#	tests/go.sum
#	x/nft/go.mod
#	x/nft/go.sum
@mergify mergify bot requested review from aaronc and alexanderbez as code owners January 18, 2023 10:29
@mergify mergify bot added the conflicts label Jan 18, 2023
@julienrbrt julienrbrt self-assigned this Jan 18, 2023
@julienrbrt julienrbrt removed their assignment Jan 18, 2023
go.mod Show resolved Hide resolved
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

tACK


// Replicates https://github.com/cosmos/cosmos-sdk/blob/44fbb0df9cea049d588e76bf930177d777552cf3/crypto/ledger/ledger_secp256k1.go#L228
// DO NOT USE. This is a temporary workaround that is cleaned-up in v0.47+
func IsOverHalfOrder(sigS *big.Int) bool {
Copy link
Member

Choose a reason for hiding this comment

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

@elias-orijtech, this is a good replacement of

if sModNScalar.IsOverHalfOrder() {
right?

Copy link
Contributor

Choose a reason for hiding this comment

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

Functionally, yes. ecdsa.IsSNormalized calls big.Int.Cmp which is not constant time. secp256k1.ModNScalar.IsOverHalfOrder is designed to be constant time.

@julienrbrt julienrbrt merged commit 5524b56 into release/v0.45.x Jan 18, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.45.x/pr-14616 branch January 18, 2023 17:52
@faddat faddat mentioned this pull request Mar 23, 2023
19 tasks
JeancarloBarrios pushed a commit to agoric-labs/cosmos-sdk that referenced this pull request Sep 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants