wip: updated mod

Kava-Labs · boodyvo · Oct 11, 2024 · Oct 11, 2024 · Oct 16, 2024 · Oct 16, 2024
commit 0d3d05804e1582f44fbed135be827f49b894e75f
@@ -283,10 +283,6 @@ replace (
 	// Tracking kava-labs/etheremint master branch
 	// TODO: Tag before release
 	//github.com/evmos/ethermint => github.com/kava-labs/ethermint v0.21.1-0.20240802224012-586960857184
-	// first PR
-	//github.com/evmos/ethermint => github.com/kava-labs/ethermint v0.0.0-20241017145243-770ae9c06817
-	// second PR
-	//github.com/evmos/ethermint => github.com/kava-labs/ethermint v0.0.0-20241024201621-2269119c2171
 	github.com/evmos/ethermint => github.com/kava-labs/ethermint v0.0.0-20241025031311-25d6caa0aef9
 	//github.com/evmos/ethermint => ../ethermint
 	// See https://github.com/cosmos/cosmos-sdk/pull/10401, https://github.com/cosmos/cosmos-sdk/commit/0592ba6158cd0bf49d894be1cef4faeec59e8320

diff --git a/tests/util/events.go b/tests/util/events.go

 // FilterTxEventsByType returns a slice of events that match the given type
 // from any and all txs in a slice of ResponseDeliverTx.
 func FilterTxEventsByType(txs []*abci.ResponseDeliverTx, eventType string) []abci.Event {
 	filteredEvents := []abci.Event{}

 	for _, tx := range txs {
diff --git a/tests/util/sdksigner.go b/tests/util/sdksigner.go
 	}

 	// TEXTTUAL will use context for formatting the sign bytes, other just ignore context
 	signBytes, err := txConfig.SignModeHandler().GetSignBytes(context.Background(), signingv1beta1.SignMode(signing.SignMode_SIGN_MODE_DIRECT), signerData, txBuilder.GetTx())
 	if err != nil {
 		return txBuilder.GetTx(), nil, err
 	}
diff --git a/tests/e2e/testutil/account.go b/tests/e2e/testutil/account.go
 	emtypes "github.com/evmos/ethermint/types"

 	"github.com/kava-labs/kava/app"
 	"github.com/kava-labs/kava/tests/util"
 )

 // SigningAccount wraps details about an account and its private keys.

 	// if we don't have a tx receipt within a given timeout, fail the request
 	a.l.Printf("awaiting evm tx receipt for tx %s\n", res.TxHash)
 	response.Receipt, response.Err = util.WaitForEvmTxReceipt(a.evmSigner.EvmClient, res.TxHash, 10*time.Second)

 	return response
 }
 // It does not broadcast the signed data.
 func (a *SigningAccount) SignRawEvmData(msg []byte) ([]byte, cryptotypes.PubKey, error) {
 	keyringSigner := emtests.NewSigner(a.evmPrivKey)
 	return keyringSigner.SignByAddress(a.SdkAddress, msg)
 }

 // NewFundedAccount creates a SigningAccount for a random account & funds the account from the whale.
 	}

 	res := a.SignAndBroadcastEvmTx(req)
 	return res, res.Err
 }

	// FilterTxEventsByType returns a slice of events that match the given type
	// from any and all txs in a slice of ResponseDeliverTx.
	func FilterTxEventsByType(txs []*abci.ResponseDeliverTx, eventType string) []abci.Event {
Check failure on line 22 in tests/util/events.go GitHub Actions / lint / golangci-lint `undefined: abci.ResponseDeliverTx` Check failure on line 22 in tests/util/events.go GitHub Actions / lint / golangci-lint `undefined: abci.ResponseDeliverTx`
	filteredEvents := []abci.Event{}

	for _, tx := range txs {
	}

	// TEXTTUAL will use context for formatting the sign bytes, other just ignore context
	signBytes, err := txConfig.SignModeHandler().GetSignBytes(context.Background(), signingv1beta1.SignMode(signing.SignMode_SIGN_MODE_DIRECT), signerData, txBuilder.GetTx())
Check failure on line 405 in tests/util/sdksigner.go GitHub Actions / lint / golangci-lint `cannot use signerData (variable of type "github.com/cosmos/cosmos-sdk/x/auth/signing".SignerData) as "cosmossdk.io/x/tx/signing".SignerData value in argument to txConfig.SignModeHandler().GetSignBytes` Check failure on line 405 in tests/util/sdksigner.go GitHub Actions / lint / golangci-lint `cannot use txBuilder.GetTx() (value of type "github.com/cosmos/cosmos-sdk/x/auth/signing".Tx) as "cosmossdk.io/x/tx/signing".TxData value in argument to txConfig.SignModeHandler().GetSignBytes (typecheck)` Check failure on line 405 in tests/util/sdksigner.go GitHub Actions / lint / golangci-lint `cannot use signerData (variable of type "github.com/cosmos/cosmos-sdk/x/auth/signing".SignerData) as "cosmossdk.io/x/tx/signing".SignerData value in argument to txConfig.SignModeHandler().GetSignBytes` Check failure on line 405 in tests/util/sdksigner.go GitHub Actions / lint / golangci-lint `cannot use txBuilder.GetTx() (value of type "github.com/cosmos/cosmos-sdk/x/auth/signing".Tx) as "cosmossdk.io/x/tx/signing".TxData value in argument to txConfig.SignModeHandler().GetSignBytes) (typecheck)`
	if err != nil {
	return txBuilder.GetTx(), nil, err
	}
	emtypes "github.com/evmos/ethermint/types"

	"github.com/kava-labs/kava/app"
	"github.com/kava-labs/kava/tests/util"
Check failure on line 30 in tests/e2e/testutil/account.go GitHub Actions / lint / golangci-lint `could not import github.com/kava-labs/kava/tests/util (-: # github.com/kava-labs/kava/tests/util`
	)

	// SigningAccount wraps details about an account and its private keys.

	// if we don't have a tx receipt within a given timeout, fail the request
	a.l.Printf("awaiting evm tx receipt for tx %s\n", res.TxHash)
	response.Receipt, response.Err = util.WaitForEvmTxReceipt(a.evmSigner.EvmClient, res.TxHash, 10*time.Second)
Check failure on line 202 in tests/e2e/testutil/account.go GitHub Actions / lint / golangci-lint `response.Err undefined (type EvmTxResponse has no field or method Err) (typecheck)`

	return response
	}
	// It does not broadcast the signed data.
	func (a *SigningAccount) SignRawEvmData(msg []byte) ([]byte, cryptotypes.PubKey, error) {
	keyringSigner := emtests.NewSigner(a.evmPrivKey)
	return keyringSigner.SignByAddress(a.SdkAddress, msg)
Check failure on line 211 in tests/e2e/testutil/account.go GitHub Actions / lint / golangci-lint `not enough arguments in call to keyringSigner.SignByAddress`
	}

	// NewFundedAccount creates a SigningAccount for a random account & funds the account from the whale.
	}

	res := a.SignAndBroadcastEvmTx(req)
	return res, res.Err
Check failure on line 281 in tests/e2e/testutil/account.go GitHub Actions / lint / golangci-lint `res.Err undefined (type EvmTxResponse has no field or method Err) (typecheck)`
	}