Skip to content

Commit

Permalink
fix(crypto): bls compilation (#22717)
Browse files Browse the repository at this point in the history
  • Loading branch information
tac0turtle authored Dec 2, 2024
1 parent f350775 commit 9d9c19c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 18 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,12 @@ jobs:
- name: Build with rocksdb backend
if: matrix.go-arch == 'amd64'
run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS="rocksdb" make build
- name: Build with BLS12381
if: matrix.go-arch == 'amd64'
run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS="bls12381" make build
- name: Build with Secp_cgo
if: matrix.go-arch == 'amd64'
run: GOARCH=${{ matrix.go-arch }} COSMOS_BUILD_OPTIONS="secp" make build
###################
## Build Tooling ##
###################
Expand Down
13 changes: 1 addition & 12 deletions crypto/keys/bls12_381/key_cgo.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@ package bls12_381

import (
"bytes"
"crypto/sha256"
"errors"
"fmt"

"github.com/cometbft/cometbft/crypto"
"github.com/cometbft/cometbft/crypto/tmhash"
"github.com/cometbft/cometbft/crypto/bls12381"
"github.com/cometbft/cometbft/crypto/tmhash"

"github.com/cosmos/cosmos-sdk/codec"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
Expand Down Expand Up @@ -84,11 +83,6 @@ func (privKey PrivKey) Sign(msg []byte) ([]byte, error) {
return nil, err
}

if len(msg) > bls12381.MaxMsgLen {
hash := sha256.Sum256(msg)
return secretKey.Sign(hash[:])
}

return secretKey.Sign(msg)
}

Expand Down Expand Up @@ -151,11 +145,6 @@ func (pubKey PubKey) VerifySignature(msg, sig []byte) bool {
return false
}

if len(msg) > bls12381.MaxMsgLen {
hash := sha256.Sum256(msg)
msg = hash[:]
}

return pubK.VerifySignature(msg, sig)
}

Expand Down
6 changes: 0 additions & 6 deletions scripts/build/build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,6 @@ ifeq (v2,$(findstring v2,$(COSMOS_BUILD_OPTIONS)))
endif

# DB backend selection
ifeq (cleveldb,$(findstring cleveldb,$(COSMOS_BUILD_OPTIONS)))
build_tags += gcc
endif
ifeq (badgerdb,$(findstring badgerdb,$(COSMOS_BUILD_OPTIONS)))
build_tags += badgerdb
endif
# handle rocksdb
ifeq (rocksdb,$(findstring rocksdb,$(COSMOS_BUILD_OPTIONS)))
CGO_ENABLED=1
Expand Down

0 comments on commit 9d9c19c

Please sign in to comment.