Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[e2etest] add more test #4322

Merged
merged 9 commits into from
Jul 4, 2024
Merged

[e2etest] add more test #4322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
554e6ad
new staking e2etest
envestcc Jun 28, 2024
3a634aa
add rlptest
envestcc Jul 2, 2024
ad7ddb0
claim reward and transfer ownership e2etest
dustinxie Jul 2, 2024
34d6bea
fix test rebase
envestcc Jul 2, 2024
193cbd0
add test for claimreward
envestcc Jul 2, 2024
7f11824
add test for transfer ownership of endorsed candidate
envestcc Jul 2, 2024
e2d8816
fix test
envestcc Jul 2, 2024
6c10615
add rewardClaimWithAddress test
dustinxie Jul 3, 2024
a1b9d12
Merge branch 'master' into e2etest
envestcc Jul 4, 2024
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
132 changes: 112 additions & 20 deletions action/rlp_tx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package action
import (
"bytes"
"context"
"crypto/ecdsa"
"encoding/hex"
"math/big"
"strings"
Expand Down Expand Up @@ -314,6 +315,21 @@ var (
"04830579b50e01602c2015c24e72fbc48bca1cca1e601b119ca73abe2e0b5bd61fcb7874567e091030d6b644f927445d80e00b3f9ca0c566c21c30615e94c343da",
"8d38efe45794d7fceea10b2262c23c12245959db",
},
{
"rewardingClaimWithAddress",
"f9014905830186a082520894a576c141e5659137ddda4223d209d4744b2106be80b8e4d804b87c0000000000000000000000000000000000000000000000000000002e90edd000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000029696f313433617638383078307863653474737939737877723861766870687135736768756d37376374000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008224c6a01490de878ee13ee6976064082f75bbbfd7da0294a151b966d5ddf45dac6838e2a0104fdcc42607f54a8d1a5ad7f2e7fbbd3f8e7f56efb58ebff638ac8485509332",
5,
21000,
"100000",
"0",
"0xA576C141e5659137ddDa4223d209d4744b2106BE",
_evmNetworkID,
iotextypes.Encoding_ETHEREUM_EIP155,
228,
"2b34c548e0b8d027124ead244331c65a92fd7716ce4dac42c7bb5b342d21e240",
"04bc3a3123a0d72e1e622ec1a51087ef3b15a9d6db0f924c0fd8b4958653ff7608194321d1fd90c0c949b05b6b911d8d7e9aaadbe497e696367c19780a016ce440",
"fff810c667050c7e4263a39e796af8d5e74a1b55",
},
{
"rewardingDeposit",
"f8c6016482520894a576c141e5659137ddda4223d209d4744b2106be80b86427852a6b0000000000000000000000000000000000000000000000000000000000000065000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000008224c6a013b7679dbabcb0f97b93942436f5072cca3c7fe43451a8fedcdf3c84c1344e1da02af4cc67594c0200b59f4e30ba149af15e546acbfc69fa31f14e8788ab063d85",
Expand Down Expand Up @@ -374,7 +390,6 @@ var (
"04dc4c548c3a478278a6a09ffa8b5c4b384368e49654b35a6961ee8288fc889cdc39e9f8194e41abdbfac248ef9dc3f37b131a36ee2c052d974c21c1d2cd56730b",
"1e14d5373e1af9cc77f0032ad2cd0fba8be5ea2e",
},
// TODO: add StakeMigrate test
{
"unprotected",
deterministicDeploymentTx,
Expand All @@ -390,23 +405,66 @@ var (
"040a98b1acb38ed9cd8d0e8f1f03b1588bae140586f8a8049197b65013a3c17690151ae422e3fdfb26be2e6a4465b1f9cf5c26a5635109929a0d0a11734124d50a",
"3fab184622dc19b6109349b94811493bf2a45362",
},
// TODO: endorseCandidate, intentToRevokeEndorsement, revokeEndorsement
// also add util functions to generate the test data
// {
// "endorseCandidate",
// "f8487885e8d4a510008252089404c22afae6a03438b8fed74cb1cf441168df3f1280a4284ab8110000000000000000000000000000000000000000000000000000000000000011808080",
// 120,
// 21000,
// "1000000000000",
// "0",
// "0x04C22AfaE6a03438b8FED74cb1Cf441168DF3F12",
// _evmNetworkID,
// iotextypes.Encoding_ETHEREUM_UNPROTECTED,
// 36,
// "d190061a42223c40e755eef500c9c8bbec071556368032777c18d8f023b0f2e3",
// "04bc3a3123a0d72e1e622ec1a51087ef3b15a9d6db0f924c0fd8b4958653ff7608194321d1fd90c0c949b05b6b911d8d7e9aaadbe497e696367c19780a016ce440",
// "fff810c667050c7e4263a39e796af8d5e74a1b55",
// },
{
"migrateStake",
"f887788227108252089404c22afae6a03438b8fed74cb1cf441168df3f1280a4c53b10a4000000000000000000000000000000000000000000000000000000000000000a8224c5a046500c934b4295c246d395a18ab78c4755033a5b85f0743938956ff0b98f8f16a05b758049c1e8ccb3154c53e2ec22a4bad65465aed0be6e352aaa53cfec6f6906",
120,
21000,
"10000",
"0",
"0x04C22AfaE6a03438b8FED74cb1Cf441168DF3F12",
_evmNetworkID,
iotextypes.Encoding_ETHEREUM_EIP155,
36,
"2cb96b971adc556d5deb3f1fbad0b480983545c154a5b9401670ff33dd1f68ce",
"04bc3a3123a0d72e1e622ec1a51087ef3b15a9d6db0f924c0fd8b4958653ff7608194321d1fd90c0c949b05b6b911d8d7e9aaadbe497e696367c19780a016ce440",
"fff810c667050c7e4263a39e796af8d5e74a1b55",
},
{
"endorseCandidate",
"f887788227108252089404c22afae6a03438b8fed74cb1cf441168df3f1280a4284ab81100000000000000000000000000000000000000000000000000000000000000028224c5a01d0c6982474992866529fb72032c629e697ab612d75cba4b07c0137f24081e92a007c4d43d162aa7297cb9f89cf6f1cadfc5fd57703b25f2a67c152b1c32cb09c0",
120,
21000,
"10000",
"0",
"0x04C22AfaE6a03438b8FED74cb1Cf441168DF3F12",
_evmNetworkID,
iotextypes.Encoding_ETHEREUM_EIP155,
36,
"15cd6fec8876ca308d85cce80b26ea9b28c93f57d6823674c4d37efc34248d22",
"04bc3a3123a0d72e1e622ec1a51087ef3b15a9d6db0f924c0fd8b4958653ff7608194321d1fd90c0c949b05b6b911d8d7e9aaadbe497e696367c19780a016ce440",
"fff810c667050c7e4263a39e796af8d5e74a1b55",
},
{
"intentToRevokeEndorsement",
"f887788227108252089404c22afae6a03438b8fed74cb1cf441168df3f1280a485edc03c00000000000000000000000000000000000000000000000000000000000000028224c6a0d07751b74f3a2359a4f12f164ae24146e19aa3db2bda6a9e9eee5ecd67234384a053ea6a1c98fe89b0f065b0173cbeddf1a03b121a6e3c5d3b35dd91641f08baae",
120,
21000,
"10000",
"0",
"0x04C22AfaE6a03438b8FED74cb1Cf441168DF3F12",
_evmNetworkID,
iotextypes.Encoding_ETHEREUM_EIP155,
36,
"c30f7fdacfaba5d7c78963824579793409c3fed1bc5ab67735d128ef2c91eb59",
"04bc3a3123a0d72e1e622ec1a51087ef3b15a9d6db0f924c0fd8b4958653ff7608194321d1fd90c0c949b05b6b911d8d7e9aaadbe497e696367c19780a016ce440",
"fff810c667050c7e4263a39e796af8d5e74a1b55",
},
{
"revokeEndorsement",
"f887788227108252089404c22afae6a03438b8fed74cb1cf441168df3f1280a4120f99ad00000000000000000000000000000000000000000000000000000000000000028224c6a0cbb3cb584e956ada942864d242a15409409bfeb9a428f247a50f5c185cae3c8aa0469d24184060efa8585afe2122a3082d3b61a78e2b1263a750bacf465040d4e1",
120,
21000,
"10000",
"0",
"0x04C22AfaE6a03438b8FED74cb1Cf441168DF3F12",
_evmNetworkID,
iotextypes.Encoding_ETHEREUM_EIP155,
36,
"0a3270daa16fc706fc11dd64ca6e15ed67ccdc40dd1747d1d1001edb18ceaef4",
"04bc3a3123a0d72e1e622ec1a51087ef3b15a9d6db0f924c0fd8b4958653ff7608194321d1fd90c0c949b05b6b911d8d7e9aaadbe497e696367c19780a016ce440",
"fff810c667050c7e4263a39e796af8d5e74a1b55",
},
}
)

Expand Down Expand Up @@ -1014,10 +1072,10 @@ func convertToNativeProto(tx *types.Transaction, actType string) *iotextypes.Act
return elp.Proto()
case "stakeCreate", "stakeAddDeposit", "changeCandidate", "unstake", "withdrawStake", "restake",
"transferStake", "candidateRegister", "candidateUpdate", "candidateActivate", "candidateEndorsement", "candidateTransferOwnership",
"endorseCandidate", "intentToRevokeEndorsement", "revokeEndorsement":
"endorseCandidate", "intentToRevokeEndorsement", "revokeEndorsement", "migrateStake":
elp, _ := elpBuilder.BuildStakingAction(tx)
return elp.Proto()
case "rewardingClaim", "rewardingDeposit":
case "rewardingClaim", "rewardingClaimWithAddress", "rewardingDeposit":
elp, _ := elpBuilder.BuildRewardingAction(tx)
return elp.Proto()
default:
Expand Down Expand Up @@ -1106,3 +1164,37 @@ func TestIssue3944(t *testing.T) {
r.Equal("9415", v.String()) // this is the correct V value corresponding to chainID = 4690
r.Equal(hash, tx1.Hash().Hex())
}

// generateRLPTestData generates RLP test data for testing
// for example to generate for migrate stake action, use the following code snippet:
//
// act, err := NewMigrateStake(120, 10, 21000, big.NewInt(10000))
// test, err := generateRLPTestData("migrateStake", _evmNetworkID, iotextypes.Encoding_ETHEREUM_EIP155, identityset.PrivateKey(1), act)
// fmt.Sprintf("test=%+v", test)
func generateRLPTestData(actType string, chainID uint32, encoding iotextypes.Encoding, sk iotexcrypto.PrivateKey, act EthCompatibleAction) (*rlpTest, error) {
tx, err := act.ToEthTx(chainID)
if err != nil {
return nil, err
}
signer := types.NewEIP2930Signer(big.NewInt(int64(chainID)))
signedTx, err := types.SignTx(tx, signer, sk.EcdsaPrivateKey().(*ecdsa.PrivateKey))
raw, err := signedTx.MarshalBinary()
if err != nil {
return nil, err
}
return &rlpTest{
actType: actType,
raw: hex.EncodeToString(raw),
nonce: tx.Nonce(),
limit: tx.Gas(),
price: tx.GasPrice().String(),
amount: tx.Value().String(),
to: tx.To().Hex(),
chainID: uint32(tx.ChainId().Int64()),
encoding: encoding,
dataLen: len(signedTx.Data()),
hash: signedTx.Hash().Hex(),
pubkey: hex.EncodeToString(sk.PublicKey().Bytes()),
pkhash: hex.EncodeToString(sk.PublicKey().Hash()),
}, nil
}
41 changes: 41 additions & 0 deletions action/signedaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"math/big"

"github.com/iotexproject/go-pkgs/crypto"
"github.com/iotexproject/iotex-address/address"

"github.com/pkg/errors"
)
Expand Down Expand Up @@ -470,3 +471,43 @@ func SignedMigrateStake(
}
return selp, nil
}

func SignedClaimRewardLegacy(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO, functions in this file should be auxiliary functions in test files, since the tx builder and signing is clear already.

nonce uint64,
gasLimit uint64,
gasPrice *big.Int,
senderPriKey crypto.PrivateKey,
amount *big.Int,
payload []byte,
options ...SignedActionOption,
) (*SealedEnvelope, error) {
return SignedClaimReward(nonce, gasLimit, gasPrice, senderPriKey, amount, payload, nil, options...)
}

func SignedClaimReward(
nonce uint64,
gasLimit uint64,
gasPrice *big.Int,
senderPriKey crypto.PrivateKey,
amount *big.Int,
payload []byte,
address address.Address,
options ...SignedActionOption,
) (*SealedEnvelope, error) {
b := &ClaimFromRewardingFundBuilder{}
act := b.SetAmount(amount).SetData(payload).SetAddress(address).Build()
bd := &EnvelopeBuilder{}
bd = bd.SetNonce(nonce).
SetGasPrice(gasPrice).
SetGasLimit(gasLimit).
SetAction(&act)
for _, opt := range options {
opt(bd)
}
elp := bd.Build()
selp, err := Sign(elp, senderPriKey)
if err != nil {
return nil, errors.Wrapf(err, "failed to sign candidate transfer ownership %v", elp)
}
return selp, nil
}
47 changes: 45 additions & 2 deletions blockchain/integrity/integrity_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import (
"github.com/iotexproject/iotex-core/state/factory"
"github.com/iotexproject/iotex-core/test/identityset"
"github.com/iotexproject/iotex-core/test/mock/mock_blockcreationsubscriber"
"github.com/iotexproject/iotex-core/test/mock/mock_poll"
"github.com/iotexproject/iotex-core/testutil"
)

Expand Down Expand Up @@ -999,6 +1000,23 @@ func TestBlockchainHardForkFeatures(t *testing.T) {
ctx := context.Background()
bc, sf, dao, ap, err := createChain(cfg, true)
require.NoError(err)
sk, err := iotexcrypto.HexStringToPrivateKey(cfg.Chain.ProducerPrivKey)
require.NoError(err)
producer := sk.PublicKey().Address()
ctrl := gomock.NewController(t)
pp := mock_poll.NewMockProtocol(ctrl)
pp.EXPECT().CreateGenesisStates(gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
pp.EXPECT().Candidates(gomock.Any(), gomock.Any()).Return([]*state.Candidate{
&state.Candidate{
Address: producer.String(),
RewardAddress: producer.String(),
},
}, nil).AnyTimes()
pp.EXPECT().Register(gomock.Any()).DoAndReturn(func(reg *protocol.Registry) error {
return reg.Register("poll", pp)
}).AnyTimes()
pp.EXPECT().Validate(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
require.NoError(sf.Register(pp))
require.NoError(bc.Start(ctx))
defer func() {
require.NoError(bc.Stop(ctx))
Expand Down Expand Up @@ -1215,7 +1233,7 @@ func TestBlockchainHardForkFeatures(t *testing.T) {
require.Equal(v.b, a.Balance.String())
}

// Add block 4 -- test the UseTxContainer flag
// Add block 4 -- test the UseTxContainer and AddClaimRewardAddress flag
var (
txs [2]*types.Transaction
contractHash hash.Hash256
Expand Down Expand Up @@ -1266,11 +1284,23 @@ func TestBlockchainHardForkFeatures(t *testing.T) {
require.EqualValues(iotextypes.Encoding_TX_CONTAINER, selp.Encoding())
require.NoError(ap.Add(ctx, selp))
}
claim := (&action.ClaimFromRewardingFundBuilder{}).
SetAmount(big.NewInt(200000000000)).
SetAddress(producer).Build()
elp = (&action.EnvelopeBuilder{}).SetNonce(6).
SetChainID(cfg.Chain.ID).
SetGasPrice(minGas).
SetGasLimit(100000).
SetAction(&claim).Build()
tsf2, err = action.Sign(elp, priKey0)
require.NoError(err)
require.NoError(ap.Add(ctx, tsf2))

blockTime = blockTime.Add(time.Second)
blk3, err := bc.MintNewBlock(blockTime)
require.NoError(err)
require.EqualValues(4, blk3.Height())
require.Equal(3, len(blk3.Body.Actions))
require.Equal(4, len(blk3.Body.Actions))
require.NoError(bc.CommitBlock(blk3))

// verify contract execution
Expand All @@ -1286,6 +1316,12 @@ func TestBlockchainHardForkFeatures(t *testing.T) {
require.Equal(_sarTopic, logs[0].Topics[1][:])
require.True(blk3.Header.LogsBloomfilter().Exist(_sarTopic))

// verify claim reward
a, err := accountutil.AccountState(ctx, sf, producer)
require.NoError(err)
require.EqualValues(1, a.AccountType())
require.Equal("200000000000", a.Balance.String())

// commit 4 blocks to a new chain
testTriePath2, err := testutil.PathOfTempFile("trie")
require.NoError(err)
Expand All @@ -1307,6 +1343,7 @@ func TestBlockchainHardForkFeatures(t *testing.T) {
cfg.Chain.IndexDBPath = testIndexPath2
bc2, sf2, dao2, _, err := createChain(cfg, false)
require.NoError(err)
require.NoError(sf2.Register(pp))
require.NoError(bc2.Start(ctx))
defer func() {
require.NoError(bc2.Stop(ctx))
Expand Down Expand Up @@ -1350,6 +1387,12 @@ func TestBlockchainHardForkFeatures(t *testing.T) {
tl, err = dao2.TransactionLogs(2)
require.NoError(err)
require.Equal(4, len(tl.Logs))

// verify claim reward
a, err = accountutil.AccountState(ctx, sf2, producer)
require.NoError(err)
require.EqualValues(1, a.AccountType())
require.Equal("200000000000", a.Balance.String())
}

func TestConstantinople(t *testing.T) {
Expand Down
Loading
Loading