Dev o ref2 test

.github/workflows/test.yml

@@ -44,3 +44,21 @@ jobs:
         run: |
           make test-unit-cover
         if: env.GIT_DIFF
+  test-unit-e2e:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.21'
+          check-latest: true
+      - uses: actions/checkout@v4
+      - uses: technote-space/[email protected]
+        with:
+          PATTERNS: |
+            **/**.go
+            go.mod
+            go.sum
+      - name: Test e2e cases
+        run: |
+          make test-unit-e2e
+        if: env.GIT_DIFF

Makefile

@@ -186,7 +186,7 @@ all: build
 
 build-all: tools build lint test vulncheck
 
-.PHONY: distclean clean build-all
+.PHONY: distclean clean build-all build
 
 ###############################################################################
 ###                          makTools & Dependencies                           ###
@@ -305,23 +305,27 @@ test-all: test-unit test-race
 # we want to include all unit tests in the subfolders (tests/e2e/*)
 # We also want to exclude the testutil folder because it contains only
 # helper functions for the tests.
-PACKAGES_UNIT=$(shell go list ./... | grep -v '/tests/e2e$$' | grep -v 'testutil')
+PACKAGES_UNIT=$(shell go list ./... | grep -v '/tests/e2e' | grep -v 'testutil')
+PACKAGES_UNIT_E2E=$(shell go list ./... | grep '/tests/e2e')
 TEST_PACKAGES=./...
-TEST_TARGETS := test-unit test-unit-cover test-race
+TEST_TARGETS := test-unit test-unit-cover test-race test-unit-e2e
 
 # Test runs-specific rules. To add a new test target, just add
 # a new rule, customise ARGS or TEST_PACKAGES ad libitum, and
 # append the new rule to the TEST_TARGETS list.
-test-unit: ARGS=-timeout=15m -gcflags=all=-l
+test-unit: ARGS=-timeout=15m -gcflags=all=-l --tags devmode
 test-unit: TEST_PACKAGES=$(PACKAGES_UNIT)
 
 test-race: ARGS=-race
 test-race: TEST_PACKAGES=$(PACKAGES_NOSIMULATION)
 $(TEST_TARGETS): run-tests
 
-test-unit-cover: ARGS=-timeout=15m -coverprofile=cover.out -covermode=atomic -gcflags=all=-l
+test-unit-cover: ARGS=-timeout=15m -coverprofile=cover.out -covermode=atomic -gcflags=all=-l --tags devmode
 test-unit-cover: TEST_PACKAGES=$(PACKAGES_UNIT)
 
+test-unit-e2e: ARGS=-timeout=15m --tags devmode
+test-unit-e2e: TEST_PACKAGES=$(PACKAGES_UNIT_E2E)
+
 test-e2e:
 	@if [ -z "$(TARGET_VERSION)" ]; then \
 		echo "Building docker image from local codebase"; \
@@ -634,4 +638,4 @@ check-licenses:
 	@python3 scripts/check_licenses.py .
 
 swagger-ui:
-	docker run -p 8080:8080 -e SWAGGER_JSON=/app/swagger.json -v $(pwd)/client/docs/swagger-ui:/app swaggerapi/swagger-ui
+	docker run -p 8080:8080 -e SWAGGER_JSON=/app/swagger.json -v $(pwd)/client/docs/swagger-ui:/app swaggerapi/swagger-ui

app/ante/cosmos/sigverify.go

@@ -391,6 +391,8 @@ func (isd IncrementSequenceDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, sim
 			msg := msg.(*oracletypes.MsgCreatePrice)
 			if accAddress, err := sdk.AccAddressFromBech32(msg.Creator); err != nil {
 				return ctx, errors.New("invalid address")
+				// #nosec G115  // safe conversion
+				// TODO: define msg.Nonce as uint32 to avoid conversion
 			} else if _, err := isd.oracleKeeper.CheckAndIncreaseNonce(ctx, sdk.ConsAddress(accAddress).String(), msg.FeederID, uint32(msg.Nonce)); err != nil {
 				return ctx, err
 			}
@@ -445,6 +447,7 @@ func (vscd ValidateSigCountDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, sim
 	sigCount := 0
 	for _, pk := range pubKeys {
 		sigCount += CountSubKeys(pk)
+		// #nosec G115
 		if uint64(sigCount) > params.TxSigLimit {
 			return ctx, sdkerrors.ErrTooManySignatures.Wrapf("signatures: %d, limit: %d", sigCount, params.TxSigLimit)
 		}

app/ante/cosmos/txsize_gas.go

@@ -76,12 +76,14 @@ func (cgts ConsumeTxSizeGasDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, sim
 			}
 
 			// use stdsignature to mock the size of a full signature
+			// #nosec G115
 			simSig := legacytx.StdSignature{ // nolint:staticcheck // this will be removed when proto is ready
 				Signature: simSecp256k1Sig[:],
 				PubKey:    pubkey,
 			}
 
 			sigBz := legacy.Cdc.MustMarshal(simSig)
+			// #nosec G115
 			cost := sdk.Gas(len(sigBz) + 6)
 
 			// If the pubkey is a multi-signature pubkey, then we estimate for the maximum

app/app.go

@@ -915,14 +915,15 @@ func NewExocoreApp(
 	app.mm.SetOrderBeginBlockers(
 		upgradetypes.ModuleName,    // to upgrade the chain
 		capabilitytypes.ModuleName, // before any module with capabilities like IBC
-		epochstypes.ModuleName,     // to update the epoch
-		feemarkettypes.ModuleName,  // set EIP-1559 gas prices
-		evmtypes.ModuleName,        // stores chain id in memory
-		slashingtypes.ModuleName,   // TODO after reward
-		evidencetypes.ModuleName,   // TODO after reward
-		stakingtypes.ModuleName,    // track historical info
-		ibcexported.ModuleName,     // handles upgrades of chain and hence client
-		authz.ModuleName,           // clear expired approvals
+		oracleTypes.ModuleName,
+		epochstypes.ModuleName,    // to update the epoch
+		feemarkettypes.ModuleName, // set EIP-1559 gas prices
+		evmtypes.ModuleName,       // stores chain id in memory
+		slashingtypes.ModuleName,  // TODO after reward
+		evidencetypes.ModuleName,  // TODO after reward
+		stakingtypes.ModuleName,   // track historical info
+		ibcexported.ModuleName,    // handles upgrades of chain and hence client
+		authz.ModuleName,          // clear expired approvals
 		// no-op modules
 		ibctransfertypes.ModuleName,
 		icatypes.ModuleName,
@@ -943,7 +944,6 @@ func NewExocoreApp(
 		rewardTypes.ModuleName,
 		exoslashTypes.ModuleName,
 		avsManagerTypes.ModuleName,
-		oracleTypes.ModuleName,
 		distrtypes.ModuleName,
 	)
 

precompiles/avs/events.go

@@ -271,6 +271,8 @@ func (p Precompile) EmitTaskSubmittedByOperator(ctx sdk.Context, stateDB vm.Stat
 	}
 	// Prepare the event data:sender,TaskResponse, BlsSignature, Phase
 	arguments := abi.Arguments{event.Inputs[2], event.Inputs[3], event.Inputs[4], event.Inputs[5]}
+	// #nosec G115
+	// TODO: consider modify define of Phase to uint8
 	packed, err := arguments.Pack(params.CallerAddress.String(), params.TaskResponse, params.BlsSignature, uint8(params.Phase))
 	if err != nil {
 		return err

tests/e2e/oracle/create_price.go

@@ -101,7 +101,10 @@ func (s *E2ETestSuite) testCreatePriceLST() {
 	// query final price
 	res, err := s.network.QueryOracle().LatestPrice(context.Background(), &oracletypes.QueryGetLatestPriceRequest{TokenId: 1})
 	s.Require().NoError(err)
-	s.Require().Equal(priceTest1R1.getPriceTimeRound(1), res.Price)
+	// NOTE: update timestamp manually to ignore
+	ret := priceTest1R1.getPriceTimeRound(1)
+	ret.Timestamp = res.Price.Timestamp
+	s.Require().Equal(ret, res.Price)
 
 	// TODO: there might be a small chance that the blockHeight grows to more than 13, try bigger price window(nonce>3) to be more confident
 	// send create-price from validator3 to avoid being slashed for downtime
@@ -134,8 +137,10 @@ func (s *E2ETestSuite) testCreatePriceLST() {
 	res, err = s.network.QueryOracle().LatestPrice(context.Background(), &oracletypes.QueryGetLatestPriceRequest{TokenId: 1})
 	s.Require().NoError(err)
 	// price update fail, round 2 still have price{p1}
-	s.Require().Equal(priceTest1R1.getPriceTimeRound(2), res.Price)
-
+	// NOTE: update timestamp manually to ignore
+	ret = priceTest1R1.getPriceTimeRound(2)
+	ret.Timestamp = res.Price.Timestamp
+	s.Require().Equal(ret, res.Price)
 	// case_3.  slashing_{miss_v3:2, window:3} [1.0.1]
 	// update timestamp
 	priceTest2R3 := price2.updateTimestamp()
@@ -167,7 +172,10 @@ func (s *E2ETestSuite) testCreatePriceLST() {
 	res, err = s.network.QueryOracle().LatestPrice(context.Background(), &oracletypes.QueryGetLatestPriceRequest{TokenId: 1})
 	s.Require().NoError(err)
 	// price updated, round 3 has price{p2}
-	s.Require().Equal(priceTest2R3.getPriceTimeRound(3), res.Price)
+	// NOTE: update timestamp manually to ignore
+	ret = priceTest2R3.getPriceTimeRound(3)
+	ret.Timestamp = res.Price.Timestamp
+	s.Require().Equal(ret, res.Price)
 
 	// case_4. slashing_{miss_v3:2, window:4}.maxWindow=4 [1.0.1.0]
 	// update timestamp
@@ -186,7 +194,10 @@ func (s *E2ETestSuite) testCreatePriceLST() {
 	res, err = s.network.QueryOracle().LatestPrice(context.Background(), &oracletypes.QueryGetLatestPriceRequest{TokenId: 1})
 	s.Require().NoError(err)
 	// price updated, round 4 has price{p1}
-	s.Require().Equal(priceTest1R4.getPriceTimeRound(4), res.Price)
+	// NOTE: update timestamp manually to ignore
+	ret = priceTest1R4.getPriceTimeRound(4)
+	ret.Timestamp = res.Price.Timestamp
+	s.Require().Equal(ret, res.Price)
 	// send create-price from validator3 to avoid being slashed for downtime
 	msg3 = oracletypes.NewMsgCreatePrice(creator3.String(), 1, []*oracletypes.PriceSource{&priceSource1R4}, 40, 1)
 	err = s.network.SendTxOracleCreateprice([]sdk.Msg{msg3}, "valconskey3", kr3)
@@ -266,11 +277,13 @@ func (s *E2ETestSuite) testCreatePriceNST() {
 	s.Require().Equal([]*oracletypes.BalanceInfo{
 		{
 			Block:   6,
+			Index:   0,
 			Balance: 32,
 			Change:  oracletypes.Action_ACTION_DEPOSIT,
 		},
 		{
 			RoundID: 1,
+			Index:   1,
 			Block:   8,
 			Balance: 28,
 			Change:  oracletypes.Action_ACTION_SLASH_REFUND,
@@ -299,7 +312,10 @@ func (s *E2ETestSuite) testSlashing() {
 	res, err := s.network.QueryOracle().LatestPrice(context.Background(), &oracletypes.QueryGetLatestPriceRequest{TokenId: 1})
 	s.Require().NoError(err)
 	// price updated, round 4 has price{p1}
-	s.Require().Equal(priceTest1R5.getPriceTimeRound(5), res.Price)
+	// NOTE: update timestamp manually to ignore
+	ret := priceTest1R5.getPriceTimeRound(5)
+	ret.Timestamp = res.Price.Timestamp
+	s.Require().Equal(ret, res.Price)
 	s.moveToAndCheck(60)
 	// slashing_{miss_v3:3, window:5} [0.1.0.1.1] -> {miss_v3:2, window:4} [1.0.1.1]
 	_, priceSource1R6 := price1.generateRealTimeStructs("14", 1)
@@ -312,7 +328,7 @@ func (s *E2ETestSuite) testSlashing() {
 	s.Require().NoError(err)
 	err = s.network.SendTxOracleCreateprice([]sdk.Msg{msg2}, "valconskey2", kr2)
 	s.Require().NoError(err)
-	s.moveToAndCheck(63)
+	s.moveToAndCheck(64)
 	resSigningInfo, err := s.network.QuerySlashing().SigningInfo(context.Background(), &slashingtypes.QuerySigningInfoRequest{ConsAddress: sdk.ConsAddress(s.network.Validators[3].PubKey.Address()).String()})
 	s.Require().NoError(err)
 	// validator3 is jailed
@@ -331,7 +347,6 @@ func (s *E2ETestSuite) testSlashing() {
 	s.moveNAndCheck(2)
 	resOperator, err = s.network.QueryOperator().QueryOptInfo(context.Background(), &operatortypes.QueryOptInfoRequest{OperatorAVSAddress: &operatortypes.OperatorAVSAddress{OperatorAddr: s.network.Validators[3].Address.String(), AvsAddress: avsAddr}})
 	s.Require().NoError(err)
-	fmt.Println("debug----->jailed:", resOperator.Jailed)
 	s.Require().False(resOperator.Jailed)
 }
 
@@ -353,7 +368,7 @@ func (s *E2ETestSuite) testRegisterTokenThroughPrecompile() {
 	// registerToken will automaticlly register that token into oracle module
 	res, err := s.network.QueryOracle().Params(context.Background(), &oracletypes.QueryParamsRequest{})
 	s.Require().NoError(err)
-	s.Require().Equal(name, res.Params.Tokens[3].Name)
+	s.Require().Equal(name, res.Params.Tokens[len(res.Params.Tokens)-1].Name)
 }
 
 func (s *E2ETestSuite) moveToAndCheck(height int64) {

tests/e2e/oracle/helper_nstconvert.go

@@ -2,6 +2,7 @@ package oracle
 
 import (
 	"encoding/binary"
+	"math"
 	"strings"
 
 	"github.com/imroc/biu"
@@ -10,8 +11,7 @@ import (
 func convertBalanceChangeToBytes(stakerChanges [][]int) []byte {
 	if len(stakerChanges) == 0 {
 		// length equals to 0 means that alls takers have efb of 32 with 0 changes
-		ret := make([]byte, 32)
-		return ret
+		return make([]byte, 32)
 	}
 	str := ""
 	index := 0
@@ -23,6 +23,10 @@ func convertBalanceChangeToBytes(stakerChanges [][]int) []byte {
 
 		// change amount -> bytes
 		change := stakerChange[1]
+		if (change > 0 && change > math.MaxUint16) ||
+			(change < 0 && (-1*change) > math.MaxUint16) {
+			return make([]byte, 32)
+		}
 		var changeBytes []byte
 		symbol := 1
 		if change < 0 {
@@ -47,6 +51,7 @@ func convertBalanceChangeToBytes(stakerChanges [][]int) []byte {
 			} else {
 				// 2 byte
 				changeBytes = make([]byte, 2)
+				// #nosec G115  // change has been checked to make sure no overflow
 				binary.BigEndian.PutUint16(changeBytes, uint16(change))
 				moveLength := 16 - bits
 				changeBytes[0] <<= moveLength

testutil/utils.go

@@ -504,6 +504,7 @@ func (suite *BaseTestSuite) DoSetupTest() {
 	queryHelperEvm := baseapp.NewQueryServerTestHelper(suite.Ctx, suite.App.InterfaceRegistry())
 	evmtypes.RegisterQueryServer(queryHelperEvm, suite.App.EvmKeeper)
 	suite.QueryClientEVM = evmtypes.NewQueryClient(queryHelperEvm)
+	suite.App.OracleKeeper.FeederManager.BeginBlock(suite.Ctx)
 }
 
 // DeployContract deploys a contract that calls the deposit precompile's methods for testing purposes.

x/avs/client/cli/tx.go

@@ -116,7 +116,7 @@ func newBuildMsg(
 	taskContractAddress, _ := fs.GetString(FlagTaskContractAddress)
 
 	taskID, _ := fs.GetUint64(FlagTaskID)
-	phase, _ := fs.GetUint32(FlagPhase)
+	phase, _ := fs.GetInt32(FlagPhase)
 	if err := types.ValidatePhase(types.Phase(phase)); err != nil {
 		return nil, err
 	}

x/avs/keeper/keeper.go

@@ -447,12 +447,14 @@ func (k Keeper) RaiseAndResolveChallenge(ctx sdk.Context, params *types.Challeng
 		return errorsmod.Wrap(types.ErrEpochNotFound, fmt.Sprintf("epoch info not found %s",
 			avsInfo.EpochIdentifier))
 	}
+	// #nosec G115
 	if epoch.CurrentEpoch <= int64(taskInfo.StartingEpoch)+int64(taskInfo.TaskResponsePeriod)+int64(taskInfo.TaskStatisticalPeriod) {
 		return errorsmod.Wrap(
 			types.ErrSubmitTooSoonError,
 			fmt.Sprintf("SetTaskResultInfo:the challenge period has not started , CurrentEpoch:%d", epoch.CurrentEpoch),
 		)
 	}
+	// #nosec G115
 	if epoch.CurrentEpoch > int64(taskInfo.StartingEpoch)+int64(taskInfo.TaskResponsePeriod)+int64(taskInfo.TaskStatisticalPeriod)+int64(taskInfo.TaskChallengePeriod) {
 		return errorsmod.Wrap(
 			types.ErrSubmitTooLateError,
@@ -589,6 +591,7 @@ func (k Keeper) SubmitTaskResult(ctx sdk.Context, addr string, info *types.TaskR
 				fmt.Sprintf("SetTaskResultInfo:the TaskResponse period has not started , CurrentEpoch:%d", epoch.CurrentEpoch),
 			)
 		}
+		// #nosec G115
 		if epoch.CurrentEpoch > int64(task.StartingEpoch)+int64(task.TaskResponsePeriod)+int64(task.TaskStatisticalPeriod) {
 			return errorsmod.Wrap(
 				types.ErrSubmitTooLateError,

x/evm/keeper/grpc_query.go

@@ -472,6 +472,7 @@ func (k Keeper) TraceTx(c context.Context, req *types.QueryTraceTxRequest) (*typ
 			continue
 		}
 		txConfig.TxHash = ethTx.Hash()
+		// #nosec G115
 		txConfig.TxIndex = uint(i)
 		// reset gas meter for each transaction
 		ctx = ctx.WithGasMeter(evmostypes.NewInfiniteGasMeterWithLimit(msg.Gas()))
@@ -565,6 +566,7 @@ func (k Keeper) TraceBlock(c context.Context, req *types.QueryTraceBlockRequest)
 		result := types.TxTraceResult{}
 		ethTx := tx.AsTransaction()
 		txConfig.TxHash = ethTx.Hash()
+		// #nosec G115
 		txConfig.TxIndex = uint(i)
 		traceResult, logIndex, err := k.traceTx(ctx, cfg, txConfig, signer, ethTx, req.TraceConfig, true, nil)
 		if err != nil {

x/operator/keeper/slash.go

@@ -19,6 +19,7 @@ import (
 // GetSlashIDForDogfood It use infractionType+'_'+'infractionHeight' as the slashID, because /* the slash  */event occurs in dogfood doesn't have a TxID. It isn't submitted through an external transaction.
 func GetSlashIDForDogfood(infraction stakingtypes.Infraction, infractionHeight int64) string {
 	// #nosec G701
+	// #nosec G115
 	return strings.Join([]string{hexutil.EncodeUint64(uint64(infraction)), hexutil.EncodeUint64(uint64(infractionHeight))}, utils.DelimiterForID)
 }
 

x/operator/types/keys.go

@@ -157,7 +157,7 @@ func KeyForVotingPowerSnapshot(avs common.Address, height int64) []byte {
 	return utils.AppendMany(
 		avs.Bytes(),
 		// Append the height
-		sdk.Uint64ToBigEndian(uint64(height)),
+		sdk.Uint64ToBigEndian(uint64(height)), // #nosec G115  // height is not negative
 	)
 }