Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions build/ci.go
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,10 @@ func doInstall(cmdline []string) {

// Disable CLI markdown doc generation in release builds.
gobuild.Args = append(gobuild.Args, "-tags", "urfave_cli_no_docs")
if runtime.GOOS == "darwin" {
// Silence noisy third-party cgo warnings (e.g. go-duktape) on clang.
gobuild.Env = appendEnvValue(gobuild.Env, "CGO_CFLAGS", "-w")
}

// We use -trimpath to avoid leaking local paths into the built executables.
gobuild.Args = append(gobuild.Args, "-trimpath")
Expand Down Expand Up @@ -264,6 +268,22 @@ func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (
return flags
}

func appendEnvValue(env []string, key, value string) []string {
prefix := key + "="
for i, kv := range env {
if strings.HasPrefix(kv, prefix) {
current := strings.TrimPrefix(kv, prefix)
if current == "" {
env[i] = prefix + value
} else if !strings.Contains(current, value) {
env[i] = prefix + current + " " + value
}
return env
}
}
return append(env, prefix+value)
}

// Running The Tests
//
// "tests" also includes static analysis tools such as vet.
Expand Down
12 changes: 8 additions & 4 deletions core/rawdb/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,14 @@ func InspectDatabase(db ethdb.Database, keyPrefix, keyStart []byte) error {
{"Light client", "Bloom trie nodes", bloomTrieNodes.Size(), bloomTrieNodes.Count()},
}
table := tablewriter.NewWriter(os.Stdout)
table.SetHeader([]string{"Database", "Category", "Size", "Items"})
table.SetFooter([]string{"", "Total", total.String(), " "})
table.AppendBulk(stats)
table.Render()
table.Header("Database", "Category", "Size", "Items")
table.Footer("", "Total", total.String(), " ")
if err := table.Bulk(stats); err != nil {
return err
}
if err := table.Render(); err != nil {
return err
}

if unaccounted.size > 0 {
log.Error("Database contains unaccounted data", "size", unaccounted.size, "count", unaccounted.count)
Expand Down
107 changes: 55 additions & 52 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,73 +8,75 @@ replace github.com/coreos/etcd => github.com/Consensys/etcd v3.3.13-quorum197+in
// End Quorum

require (
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.4.0
github.com/BurntSushi/toml v1.4.0
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4
github.com/BurntSushi/toml v1.6.0
github.com/ConsenSys/quorum-qlight-token-manager-plugin-sdk-go v0.0.1
github.com/VictoriaMetrics/fastcache v1.12.2
github.com/VictoriaMetrics/fastcache v1.13.3
github.com/aws/aws-sdk-go-v2 v1.41.4
github.com/aws/aws-sdk-go-v2/config v1.27.33
github.com/aws/aws-sdk-go-v2/credentials v1.17.32
github.com/aws/aws-sdk-go-v2/service/route53 v1.43.2
github.com/btcsuite/btcd/btcec/v2 v2.3.4
github.com/aws/aws-sdk-go-v2/config v1.32.12
github.com/aws/aws-sdk-go-v2/credentials v1.19.12
github.com/aws/aws-sdk-go-v2/service/kms v1.50.3
github.com/aws/aws-sdk-go-v2/service/route53 v1.62.4
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.41.4
github.com/btcsuite/btcd/btcec/v2 v2.3.6
github.com/cespare/cp v1.1.1
github.com/cloudflare/cloudflare-go v0.104.0
github.com/consensys/gnark-crypto v0.18.1
github.com/cloudflare/cloudflare-go v0.116.0
github.com/consensys/gnark-crypto v0.20.0
github.com/coreos/etcd v3.3.27+incompatible
github.com/davecgh/go-spew v1.1.1
github.com/deckarep/golang-set/v2 v2.6.0
github.com/deckarep/golang-set/v2 v2.8.0
github.com/dop251/goja v0.0.0-20250125213203-5ef83b82af17
github.com/eapache/channels v1.1.0
github.com/fatih/color v1.17.0
github.com/fsnotify/fsnotify v1.7.0
github.com/fatih/color v1.18.0
github.com/fsnotify/fsnotify v1.9.0
github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08
github.com/go-stack/stack v1.8.1
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.4
github.com/golang/snappy v0.0.4
github.com/golang/snappy v1.0.0
github.com/google/gofuzz v1.2.0
github.com/google/uuid v1.6.0
github.com/gorilla/websocket v1.5.3
github.com/graph-gophers/graphql-go v1.5.0
github.com/hashicorp/go-hclog v1.1.0
github.com/hashicorp/go-plugin v1.6.0
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
github.com/graph-gophers/graphql-go v1.9.0
github.com/hashicorp/go-hclog v1.6.3
github.com/hashicorp/go-plugin v1.7.0
github.com/hashicorp/golang-lru v1.0.2
github.com/holiman/bloomfilter/v2 v2.0.3
github.com/holiman/uint256 v1.3.1
github.com/holiman/uint256 v1.3.2
github.com/huin/goupnp v1.3.0
github.com/influxdata/influxdb v1.8.3
github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c
github.com/jackpal/go-nat-pmp v1.0.2
github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267
github.com/jpmorganchase/quorum-account-plugin-sdk-go v0.0.0-20201013091638-8d6ab53641ae
github.com/jpmorganchase/quorum-hello-world-plugin-sdk-go v0.0.0-20201012205023-ad2eaa9cc244
github.com/jpmorganchase/quorum-security-plugin-sdk-go v0.0.0-20201012204850-5cf96db16635
github.com/julienschmidt/httprouter v1.3.0
github.com/karalabe/usb v0.0.3-0.20230711191512-61db3e06439c
github.com/mattn/go-colorable v0.1.13
github.com/mattn/go-colorable v0.1.14
github.com/mattn/go-isatty v0.0.20
github.com/moby/sys/reexec v0.1.0
github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416
github.com/olekukonko/tablewriter v0.0.5
github.com/olekukonko/tablewriter v1.1.4
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pborman/uuid v1.2.1
github.com/peterh/liner v1.2.2
github.com/pion/stun/v2 v2.0.0
github.com/prometheus/tsdb v0.10.0
github.com/rs/cors v1.11.1
github.com/shirou/gopsutil v3.21.11+incompatible
github.com/status-im/keycard-go v0.3.2
github.com/stretchr/testify v1.10.0
github.com/status-im/keycard-go v0.3.3
github.com/stretchr/testify v1.11.1
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c
github.com/tyler-smith/go-bip39 v1.1.0
github.com/urfave/cli/v2 v2.27.4
golang.org/x/crypto v0.45.0
golang.org/x/sync v0.18.0
golang.org/x/sys v0.38.0
golang.org/x/text v0.31.0
golang.org/x/time v0.6.0
google.golang.org/grpc v1.66.1
google.golang.org/protobuf v1.34.2
github.com/urfave/cli/v2 v2.27.5
golang.org/x/crypto v0.48.0
golang.org/x/sync v0.19.0
golang.org/x/sys v0.41.0
golang.org/x/text v0.34.0
golang.org/x/time v0.9.0
google.golang.org/grpc v1.79.2
google.golang.org/protobuf v1.36.10
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
gopkg.in/karalabe/cookiejar.v2 v2.0.0-20150724131613-8dcd6a7f4951
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce
Expand All @@ -83,46 +85,48 @@ require (
)

require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.13.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.20 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 // indirect
github.com/aws/aws-sdk-go-v2/service/kms v1.50.3 // indirect
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.41.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.22.7 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.30.7 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.0.8 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.30.13 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.17 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.41.9 // indirect
github.com/aws/smithy-go v1.24.2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bits-and-blooms/bitset v1.20.0 // indirect
github.com/bits-and-blooms/bitset v1.24.4 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/clipperhouse/displaywidth v0.10.0 // indirect
github.com/clipperhouse/uax29/v2 v2.6.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
github.com/coreos/pkg v0.0.0-20240122114842-bbd7aa9bf6fb // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
github.com/dlclark/regexp2 v1.11.4 // indirect
github.com/eapache/queue v1.1.0 // indirect
github.com/go-kit/kit v0.10.0 // indirect
github.com/go-ole/go-ole v1.3.0 // indirect
github.com/go-sourcemap/sourcemap v2.1.4+incompatible // indirect
github.com/goccy/go-json v0.10.3 // indirect
github.com/goccy/go-json v0.10.5 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/hashicorp/yamux v0.1.2 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mattn/go-runewidth v0.0.19 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/naoina/go-stringutil v0.1.0 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6 // indirect
github.com/olekukonko/errors v1.2.0 // indirect
github.com/olekukonko/ll v0.1.6 // indirect
github.com/pion/dtls/v2 v2.2.7 // indirect
github.com/pion/logging v0.2.2 // indirect
github.com/pion/transport/v2 v2.2.1 // indirect
Expand All @@ -133,7 +137,6 @@ require (
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.59.1 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
Expand All @@ -142,8 +145,8 @@ require (
github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/net v0.50.0 // indirect
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading
Loading