Skip to content

Commit

Permalink
fix: incorrect verification of bn254 public keys (#1076)
Browse files Browse the repository at this point in the history 
### Uniond & Galoisd
- Update cometbls to latest commit of
https://github.com/unionlabs/cometbls/commits/cometbls-v0.38%2Btm-light-client
- Update cosmos-sdk to latest commit of
https://github.com/unionlabs/cosmos-sdk/tree/v0.50.2u-bn254
#### Galoisd
Upgrade to go 1.21 and cosmos-sdk v0.50.2 which is now in par with
uniond

closes #1075 

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Refactor**
- Replaced `sdk.NewInt` with `math.NewInt` for improved mathematical
operations
- Modified usage of `sdk.TokensToConsensusPower` for more accurate
voting power calculation
- Modified `perSystem` function within a Nix expression and added new
parameter `goPkgs`

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
  • Loading branch information
@aeryz
aeryz authored Dec 27, 2023
2 parents 98873e1 + b348d59 commit 419061a
Show file tree
Hide file tree
Showing 2,249 changed files with 433,629 additions and 217,986 deletions.
3 changes: 2 additions & 1 deletion galoisd/cmd/galoisd/cmd/example_prove.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"math/rand"
"strconv"

"cosmossdk.io/math"
cometbn254 "github.com/cometbft/cometbft/crypto/bn254"
ce "github.com/cometbft/cometbft/crypto/encoding"
"github.com/cometbft/cometbft/libs/protoio"
Expand Down Expand Up @@ -38,7 +39,7 @@ func ExampleProveCmd() *cobra.Command {
}
return &types.SimpleValidator{
PubKey: &protoPK,
VotingPower: sdk.TokensToConsensusPower(sdk.NewInt(rand.Int63n(9223372036854775807/8)), sdk.DefaultPowerReduction),
VotingPower: sdk.TokensToConsensusPower(math.NewInt(rand.Int63n(9223372036854775807/8)), sdk.DefaultPowerReduction),
}, nil
}

Expand Down
3 changes: 2 additions & 1 deletion galoisd/cmd/galoisd/cmd/example_prove16.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"log"
"math/big"

"cosmossdk.io/math"
cometbn254 "github.com/cometbft/cometbft/crypto/bn254"
ce "github.com/cometbft/cometbft/crypto/encoding"
"github.com/cometbft/cometbft/proto/tendermint/types"
Expand Down Expand Up @@ -44,7 +45,7 @@ func ExampleProve16Cmd() *cobra.Command {
}
return &types.SimpleValidator{
PubKey: &protoPK,
VotingPower: sdk.TokensToConsensusPower(sdk.NewIntFromBigInt(tokens), sdk.DefaultPowerReduction),
VotingPower: sdk.TokensToConsensusPower(math.NewIntFromBigInt(tokens), sdk.DefaultPowerReduction),
}
}

Expand Down
3 changes: 2 additions & 1 deletion galoisd/cmd/galoisd/cmd/example_verify.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"log"
"math/big"

"cosmossdk.io/math"
cometbft_bn254 "github.com/cometbft/cometbft/crypto/bn254"
cometbn254 "github.com/cometbft/cometbft/crypto/bn254"
ce "github.com/cometbft/cometbft/crypto/encoding"
Expand Down Expand Up @@ -50,7 +51,7 @@ func ExampleVerifyCmd() *cobra.Command {
}
return &types.SimpleValidator{
PubKey: &protoPK,
VotingPower: sdk.TokensToConsensusPower(sdk.NewIntFromBigInt(tokens), sdk.DefaultPowerReduction),
VotingPower: sdk.TokensToConsensusPower(math.NewIntFromBigInt(tokens), sdk.DefaultPowerReduction),
}
}

Expand Down
4 changes: 2 additions & 2 deletions galoisd/galoisd.nix
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{ ... }: {
perSystem = { self', pkgs, proto, ... }: {
perSystem = { self', pkgs, proto, goPkgs, ... }: {
packages =
{
galoisd = pkgs.buildGoModule ({
galoisd = goPkgs.buildGoModule ({
name = "galoisd";
src = ./.;
vendorSha256 = null;
Expand Down
109 changes: 61 additions & 48 deletions galoisd/go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,107 +1,120 @@
module galois

go 1.20
go 1.21

toolchain go1.21.4

require (
github.com/cometbft/cometbft v0.37.2
github.com/cometbft/cometbft v0.38.2
github.com/consensys/gnark v0.7.2-0.20230418172633-f83323bdf138
github.com/consensys/gnark-crypto v0.12.2-0.20231012161402-206544105834
github.com/cosmos/cosmos-sdk v0.47.0
github.com/cosmos/cosmos-sdk v0.50.2
github.com/gogo/protobuf v1.3.2
github.com/rs/zerolog v1.30.0
github.com/rs/zerolog v1.31.0
github.com/spf13/cobra v1.7.0
golang.org/x/net v0.14.0
google.golang.org/grpc v1.57.0
golang.org/x/net v0.19.0
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.31.0
)

require (
cosmossdk.io/api v0.7.2 // indirect
cosmossdk.io/collections v0.4.0 // indirect
cosmossdk.io/core v0.11.0 // indirect
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
cosmossdk.io/errors v1.0.0 // indirect
cosmossdk.io/math v1.1.2 // indirect
cosmossdk.io/log v1.2.1 // indirect
cosmossdk.io/math v1.2.0 // indirect
cosmossdk.io/store v1.0.1 // indirect
cosmossdk.io/x/tx v0.12.0 // indirect
github.com/DataDog/zstd v1.5.5 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.8.0 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cometbft/cometbft-db v0.7.0 // indirect
github.com/confio/ics23/go v0.9.0 // indirect
github.com/cockroachdb/errors v1.11.1 // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v0.0.0-20231101195458-481da04154d6 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cometbft/cometbft-db v0.9.1 // indirect
github.com/consensys/bavard v0.1.13 // indirect
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect
github.com/cosmos/gogoproto v1.4.10 // indirect
github.com/cosmos/cosmos-db v1.0.0 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect
github.com/cosmos/gogoproto v1.4.11 // indirect
github.com/cosmos/ics23/go v0.10.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
github.com/dgraph-io/ristretto v0.1.1 // indirect
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/fxamacker/cbor/v2 v2.5.0 // indirect
github.com/getsentry/sentry-go v0.25.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/golang/glog v1.1.0 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/golang/glog v1.2.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/btree v1.1.2 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
github.com/gtank/merlin v0.1.1 // indirect
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/holiman/uint256 v1.2.2 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-metrics v0.5.1 // indirect
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/holiman/uint256 v1.2.3 // indirect
github.com/iancoleman/strcase v0.3.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmhodges/levigo v1.0.0 // indirect
github.com/klauspost/compress v1.16.3 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/linxGnu/grocksdb v1.8.6 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mmcloughlin/addchain v0.4.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pelletier/go-toml/v2 v2.0.7 // indirect
github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20220708102147-0a8a51822cae // indirect
github.com/petermattis/goid v0.0.0-20230904192822-1876fd5063bc // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
github.com/sasha-s/go-deadlock v0.3.1 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.14.0 // indirect
github.com/stretchr/testify v1.8.4 // indirect
github.com/subosito/gotenv v1.4.1 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c // indirect
github.com/tendermint/go-amino v0.16.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.etcd.io/bbolt v1.3.7 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
go.etcd.io/bbolt v1.3.8 // indirect
golang.org/x/crypto v0.16.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231012201019-e917dd12ba7a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
rsc.io/tmplfunc v0.0.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

replace (
github.com/cometbft/cometbft => github.com/unionlabs/cometbls v0.0.0-20231016073256-18a1c30dccac
github.com/cometbft/cometbft => github.com/unionlabs/cometbls v0.0.0-20231225001748-d638e57b7566
github.com/consensys/gnark => github.com/consensys/gnark v0.9.1-0.20231013131835-4ebcccd9c0a8
// Fork of gnark crypto until https://github.com/ConsenSys/gnark-crypto/pull/314 is merged
github.com/consensys/gnark-crypto => github.com/unionlabs/gnark-crypto v0.0.0-20231016072529-15c0507b6578
github.com/cosmos/cosmos-sdk => github.com/unionlabs/cosmos-sdk v0.0.0-20231016073706-ce776180ee80
github.com/cosmos/cosmos-sdk => github.com/unionlabs/cosmos-sdk v0.0.0-20231206211859-a69e5866af6b
github.com/cosmos/gogoproto => github.com/cosmos/gogoproto v1.4.11
)
Loading

0 comments on commit 419061a

Please sign in to comment.