LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

build(deps): bump cometbft to v1.0.0-rc2 (#22577)

Browse Source 
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
This commit is contained in:
Julien Robert
2024-11-28 11:33:27 +00:00
committed by GitHub
co-authored by marbar3778
parent 300348fe53
commit ca48cef255
78 changed files with 924 additions and 1043 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/systemtests/auth_test.go
+4 -4
View File
@@ -55,7 +55,7 @@ func TestAuthSignAndBroadcastTxCmd(t *testing.T) {
newSignFile := systest.StoreTempFile(t, []byte(updated))
broadcastCmd := []string{"tx", "broadcast", newSignFile.Name()}
rsp = cli.RunCommandWithArgs(cli.WithTXFlags(broadcastCmd...)...)
rsp = cli.WithRunErrorsIgnored().RunCommandWithArgs(cli.WithTXFlags(broadcastCmd...)...) // // ignore run errors, as comet exit with 1 on rpc errors
systest.RequireTxFailure(t, rsp)
// test sign-batch tx command
@@ -383,7 +383,7 @@ func testMultisigTxBroadcast(t *testing.T, cli *systest.CLIWrapper, i multiSigTx
// run broadcast tx command
broadcastCmd := []string{"tx", "broadcast", multiSignFile.Name()}
if tc.expErrMsg != "" {
rsp = cli.RunCommandWithArgs(cli.WithTXFlags(broadcastCmd...)...)
rsp = cli.WithRunErrorsIgnored().RunCommandWithArgs(cli.WithTXFlags(broadcastCmd...)...) // // ignore run errors, as comet exit with 1 on rpc errors
systest.RequireTxFailure(t, rsp)
require.Contains(t, rsp, tc.expErrMsg)
return
@@ -519,9 +519,9 @@ func TestTxWithFeePayer(t *testing.T) {
systest.Sut.StartChain(t)
// send a tx with FeePayer without his signature
rsp := cli.RunCommandWithArgs(cli.WithTXFlags(
rsp := cli.WithRunErrorsIgnored().RunCommandWithArgs(cli.WithTXFlags(
"tx", "bank", "send", senderAddr, "cosmos108jsm625z3ejy63uef2ke7t67h6nukt4ty93nr", "1000stake", "--fees", "1000000stake", "--fee-payer", feePayerAddr,
)...)
)...) // ignore run errors, as comet exit with 1 on rpc errors
systest.RequireTxFailure(t, rsp, "invalid number of signatures")
// send tx with feePayers signature
tests/systemtests/bank_test.go
+9 -4
View File
@@ -5,6 +5,7 @@ package systemtests
import (
"fmt"
"net/http"
"strings"
"testing"
"github.com/stretchr/testify/assert"
@@ -56,10 +57,14 @@ func TestBankSendTxCmd(t *testing.T) {
// test tx bank send with unauthorized signature
assertUnauthorizedErr := func(_ assert.TestingT, gotErr error, gotOutputs ...interface{}) bool {
require.Len(t, gotOutputs, 1)
code := gjson.Get(gotOutputs[0].(string), "code")
require.True(t, code.Exists())
require.Greater(t, code.Int(), int64(0), gotOutputs[0])
var hasString bool
for _, output := range gotOutputs {
if strings.Contains(output.(string), "signature verification failed; please verify account number") {
hasString = true
break
}
}
require.True(t, hasString, "outputs doesn't contain: signature verification failed; please verify account number")
return false
}
invalidCli := cli.WithChainID(cli.ChainID() + "a") // set invalid chain-id
tests/systemtests/circuit_test.go
+2 -2
View File
@@ -230,10 +230,10 @@ func testCircuitTxCommand(t *testing.T, cli *systest.CLIWrapper, txType, superAd
// test given msg transaction to confirm
for _, tx := range tc.executeTxs {
tx = append(tx, "--fees=2stake")
rsp = cli.RunCommandWithArgs(cli.WithTXFlags(tx...)...)
rsp = cli.WithRunErrorsIgnored().RunCommandWithArgs(cli.WithTXFlags(tx...)...)
if txType == "disable" {
systest.RequireTxFailure(t, rsp)
require.Contains(t, gjson.Get(rsp, "raw_log").String(), "tx type not allowed")
require.Contains(t, rsp, "tx type not allowed")
continue
}
systest.RequireTxSuccess(t, rsp)
tests/systemtests/export_test.go
+43 -2
View File
@@ -5,15 +5,47 @@ package systemtests
import (
"fmt"
"os"
"path/filepath"
"strings"
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/tidwall/gjson"
"github.com/tidwall/sjson"
systest "cosmossdk.io/systemtests"
)
func TestChainExportImport(t *testing.T) {
// Scenario:
// given: a state dump from a running chain
// when: new chain is initialized with exported state
// then: the chain should start and produce blocks
systest.Sut.ResetChain(t)
cli := systest.NewCLIWrapper(t, systest.Sut, systest.Verbose)
systest.Sut.StartChain(t)
grantee := cli.GetKeyAddr("node1")
rsp3 := cli.RunAndWait("tx", "authz", "grant", grantee, "send", "--spend-limit=1000stake", "--from=node0", "--fees=1stake")
systest.RequireTxSuccess(t, rsp3)
systest.Sut.StopChain()
outFile := filepath.Join(t.TempDir(), "exported_genesis.json")
cli.RunCommandWithArgs("genesis", "export", "--home="+systest.Sut.NodeDir(0), "--output-document="+outFile)
exportedContent, err := os.ReadFile(outFile)
require.NoError(t, err)
exportedState := gjson.Get(string(exportedContent), "app_state").Raw
systest.Sut.ModifyGenesisJSON(t, func(genesis []byte) []byte {
state, err := sjson.SetRawBytes(genesis, "app_state", []byte(exportedState))
require.NoError(t, err)
return state
})
systest.Sut.StartChain(t)
systest.Sut.AwaitNBlocks(t, 2)
}
func TestExportCmd_WithHeight(t *testing.T) {
systest.Sut.ResetChain(t)
cli := systest.NewCLIWrapper(t, systest.Sut, systest.Verbose)
@@ -30,13 +62,22 @@ func TestExportCmd_WithHeight(t *testing.T) {
args []string
expZeroHeight bool
}{
{"should export correct height", []string{"genesis", "export", "--home", systest.Sut.NodeDir(0)}, false},
{"should export correct height", []string{"genesis", "export", "--home", systest.Sut.NodeDir(0), "--log_level=disabled"}, false},
{"should export correct height with --height", []string{"genesis", "export", "--height=5", "--home", systest.Sut.NodeDir(0), "--log_level=disabled"}, false},
{"should export height 0 with --for-zero-height", []string{"genesis", "export", "--for-zero-height=true", "--home", systest.Sut.NodeDir(0)}, true},
{"should export height 0 with --for-zero-height", []string{"genesis", "export", "--for-zero-height=true", "--home", systest.Sut.NodeDir(0), "--log_level=disabled"}, true},
}
for _, tc := range testCases {
res := cli.RunCommandWithArgs(tc.args...)
// PebbleDB logs are printed directly to stderr.
// Cosmos-DB and Store/v2 do not provide a way to override the logger.
// This isn't problematic in a real-world scenario, but it makes it hard to test the output.
// https://github.com/cockroachdb/pebble/blob/v1.1.2/internal/base/logger.go#L26-L40
// We trim the output to get the JSON part only
if i := strings.Index(res, "{"); i > 0 {
res = res[i:]
}
height := gjson.Get(res, "initial_height").Int()
if tc.expZeroHeight {
require.Equal(t, height, int64(0))
tests/systemtests/go.mod
+3 -3
View File
@@ -4,7 +4,7 @@ go 1.23
require (
cosmossdk.io/math v1.4.0
cosmossdk.io/systemtests v0.0.0-20241126144654-14d98d277124
cosmossdk.io/systemtests v1.0.0-rc.1.0.20241128092904-215d5c16f64d
github.com/cosmos/cosmos-sdk v0.50.6
)
@@ -33,14 +33,14 @@ require (
github.com/cockroachdb/errors v1.11.3 // indirect
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v1.1.1 // indirect
github.com/cockroachdb/pebble v1.1.2 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cometbft/cometbft v0.38.15 // indirect
github.com/cometbft/cometbft-db v0.14.1 // indirect
github.com/cometbft/cometbft/api v1.0.0-rc.1 // indirect
github.com/cosmos/btcutil v1.0.5 // indirect
github.com/cosmos/cosmos-db v1.0.3-0.20240829004618-717cba019b33 // indirect
github.com/cosmos/cosmos-db v1.1.0 // indirect
github.com/cosmos/cosmos-proto v1.0.0-beta.5 // indirect
github.com/cosmos/go-bip39 v1.0.0 // indirect
github.com/cosmos/gogogateway v1.2.0 // indirect
tests/systemtests/go.sum
+6 -6
View File
@@ -16,8 +16,8 @@ cosmossdk.io/math v1.4.0 h1:XbgExXFnXmF/CccPPEto40gOO7FpWu9yWNAZPN3nkNQ=
cosmossdk.io/math v1.4.0/go.mod h1:O5PkD4apz2jZs4zqFdTr16e1dcaQCc5z6lkEnrrppuk=
cosmossdk.io/store v1.1.0 h1:LnKwgYMc9BInn9PhpTFEQVbL9UK475G2H911CGGnWHk=
cosmossdk.io/store v1.1.0/go.mod h1:oZfW/4Fc/zYqu3JmQcQdUJ3fqu5vnYTn3LZFFy8P8ng=
cosmossdk.io/systemtests v0.0.0-20241126144654-14d98d277124 h1:pzhysmpO6+HA/vnJKVTfmtZAtCJJzLqsBZAwzOCFa7Q=
cosmossdk.io/systemtests v0.0.0-20241126144654-14d98d277124/go.mod h1:IQrj3oVhIBn1X8183/IL1z3l7HgjePVSHLeZtUUjGjI=
cosmossdk.io/systemtests v1.0.0-rc.1.0.20241128092904-215d5c16f64d h1:zZUt9DD+3qvwnpQHPwYJ5+NEUU4wMFeNpPBegWMfbn8=
cosmossdk.io/systemtests v1.0.0-rc.1.0.20241128092904-215d5c16f64d/go.mod h1:ME2eFY/+2CjaFrPOMW8paPXupMzYaDMTKQ1sRvi71hU=
cosmossdk.io/x/tx v0.13.3-0.20240419091757-db5906b1e894 h1:kHEvzVqpNv/9pnaEPBsgE/FMc+cVmWjSsInRufkZkpQ=
cosmossdk.io/x/tx v0.13.3-0.20240419091757-db5906b1e894/go.mod h1:Tb6/tpONmtL5qFdOMdv1pdvrtJNxcazZBoz04HB71ss=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
@@ -124,8 +124,8 @@ github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/e
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M=
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
github.com/cockroachdb/pebble v1.1.1 h1:XnKU22oiCLy2Xn8vp1re67cXg4SAasg/WDt1NtcRFaw=
github.com/cockroachdb/pebble v1.1.1/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU=
github.com/cockroachdb/pebble v1.1.2 h1:CUh2IPtR4swHlEj48Rhfzw6l/d0qA31fItcIszQVIsA=
github.com/cockroachdb/pebble v1.1.2/go.mod h1:4exszw1r40423ZsmkG/09AFEG83I0uDgfujJdbL6kYU=
github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
@@ -145,8 +145,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk=
github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis=
github.com/cosmos/cosmos-db v1.0.3-0.20240829004618-717cba019b33 h1:NnqmEOIzUPazzBrhGenzI1AQCBtJ0Hbnb/DDoykpko0=
github.com/cosmos/cosmos-db v1.0.3-0.20240829004618-717cba019b33/go.mod h1:Z8IXcFJ9PqKK6BIsVOB3QXtkKoqUOp1vRvPT39kOXEA=
github.com/cosmos/cosmos-db v1.1.0 h1:KLHNVQ73h7vawXTpj9UJ7ZR2IXv51tsEHkQJJ9EBDzI=
github.com/cosmos/cosmos-db v1.1.0/go.mod h1:t7c4A6cfGdpUwwVxrQ0gQLeRQqGUBJu0yvE4F/26REg=
github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA=
github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec=
github.com/cosmos/cosmos-sdk v0.50.6 h1:efR3MsvMHX5sxS3be+hOobGk87IzlZbSpsI2x/Vw3hk=
tests/systemtests/snapshots_test.go
+8 -1
View File
@@ -13,6 +13,8 @@ import (
)
func TestSnapshots(t *testing.T) {
t.Skip("Skip snapshots test, flaky due to pebbledb logs on CI")
systest.Sut.ResetChain(t)
cli := systest.NewCLIWrapper(t, systest.Sut, systest.Verbose)
systest.Sut.StartChain(t)
@@ -41,7 +43,10 @@ func TestSnapshots(t *testing.T) {
require.DirExists(t, fmt.Sprintf("%s/data/snapshots/5/3", node0Dir))
// Check snapshots list
res = cli.RunCommandWithArgs(command, "list", fmt.Sprintf("--home=%s", node0Dir))
res = cli.
WithRunErrorsIgnored().
WithRunSingleOutput(). // pebbledb prints logs to stderr, we cannot override the logger in store/v2 and cosmos-db. This isn't problematic in a real-world scenario, but it makes it hard to test the output.
RunCommandWithArgs(command, "list", fmt.Sprintf("--home=%s", node0Dir))
require.Contains(t, res, "height: 5")
// Dump snapshot
@@ -75,6 +80,8 @@ func TestSnapshots(t *testing.T) {
}
func TestPrune(t *testing.T) {
t.Skip("Skip snapshots test, flaky due to pebbledb logs on CI")
systest.Sut.ResetChain(t)
cli := systest.NewCLIWrapper(t, systest.Sut, systest.Verbose)