diff --git a/contribs/gnogenesis/internal/txs/txs_add_packages.go b/contribs/gnogenesis/internal/txs/txs_add_packages.go index 0df579d6d5b2..16da84a916d2 100644 --- a/contribs/gnogenesis/internal/txs/txs_add_packages.go +++ b/contribs/gnogenesis/internal/txs/txs_add_packages.go @@ -17,9 +17,7 @@ import ( "github.com/gnolang/gno/tm2/pkg/std" ) -var ( - errInvalidPackageDir = errors.New("invalid package directory") -) +var errInvalidPackageDir = errors.New("invalid package directory") // Keep in sync with gno.land/cmd/start.go var ( diff --git a/gno.land/pkg/integration/testing_integration.go b/gno.land/pkg/integration/testing_integration.go index 2a0a4cf11067..fa0a0118566d 100644 --- a/gno.land/pkg/integration/testing_integration.go +++ b/gno.land/pkg/integration/testing_integration.go @@ -664,6 +664,11 @@ func (pl *pkgsLoader) SetPatch(replace, with string) { } func (pl *pkgsLoader) LoadPackages(creator bft.Address, fee std.Fee, deposit std.Coins) ([]gnoland.TxWithMetadata, error) { + kb := keys.NewInMemory() + _, err := kb.CreateAccount("creator", DefaultAccount_Seed, "", "", 0, 0) + if err != nil { + return nil, fmt.Errorf("createAccount: %w", err) + } pkgslist, err := pl.List().Sort() // sorts packages by their dependencies. if err != nil { return nil, fmt.Errorf("unable to sort packages: %w", err) @@ -695,6 +700,20 @@ func (pl *pkgsLoader) LoadPackages(creator bft.Address, fee std.Fee, deposit std } } } + signbytes, err := tx.GetSignBytes("tendermint_test", 0, 0) + if err != nil { + return nil, fmt.Errorf("unable to get sign bytes %q: %w", pkg.Name, err) + } + signature, pubKey, err := kb.Sign("creator", "", signbytes) + if err != nil { + return nil, fmt.Errorf("unable to sign transaction %q: %w", pkg.Name, err) + } + tx.Signatures = []std.Signature{ + { + PubKey: pubKey, + Signature: signature, + }, + } txs[i] = gnoland.TxWithMetadata{ Tx: tx, diff --git a/tm2/pkg/sdk/auth/ante.go b/tm2/pkg/sdk/auth/ante.go index da7ae2575d7d..d00a38925d34 100644 --- a/tm2/pkg/sdk/auth/ante.go +++ b/tm2/pkg/sdk/auth/ante.go @@ -146,7 +146,9 @@ func NewAnteHandler(ak AccountKeeper, bank BankKeeperI, sigGasConsumer Signature // check signature, return account with incremented nonce sacc := signerAccs[i] - if isGenesis && !opts.VerifyGenesisSignatures { + // Do not check signatures if the chainID is dev (gnodev) if we decide to verify the genesis signatures for + // gnodev the initialization would take longer + if isGenesis && (!opts.VerifyGenesisSignatures || newCtx.ChainID() == "dev") { // No signatures are needed for genesis. } else { // Check signature