resolve conflict merge to develop

bnb-chain · Mar 14, 2024 · 3f065dc · 3f065dc
2 parents df143c6 + f33ddf3
commit 3f065dc
Show file tree

Hide file tree

Showing 24 changed files with 454 additions and 204 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## v1.5.0
+This release introduces the Pawnee upgrade to Testnet and Mainnet
+
+Features:
+* [#564](https://github.com/bnb-chain/greenfield/pull/564) feat: add settlement events
+* [#570](https://github.com/bnb-chain/greenfield/pull/570) feat: atomic object update
+* [#571](https://github.com/bnb-chain/greenfield/pull/571) feat: modify dependency for supporting custom blocks to rollback
+* [#573](https://github.com/bnb-chain/greenfield/pull/573) feat: support delete object in created status
+
+Fix:
+* [#579](https://github.com/bnb-chain/greenfield/pull/579) fix: delete created object by authorized account
+* [#583](https://github.com/bnb-chain/greenfield/pull/583) fix: disable discontinue on testnet
+* [#584](https://github.com/bnb-chain/greenfield/pull/584) fix: disallow update payment address when there are created/updating objects
+* [#586](https://github.com/bnb-chain/greenfield/pull/586) fix: unlock shadow-object balance when a bucket is force deleted
+* [#587](https://github.com/bnb-chain/greenfield/pull/587) fix: disallow copy an object is being updated
+
 ## v1.4.0
 This release introduces the Ural upgrade to the testnet.
 

diff --git a/e2e/tests/permission_test.go b/e2e/tests/permission_test.go
@@ -338,9 +338,9 @@ func (s *StorageTestSuite) TestCreateObjectByOthers() {
 	// CancelCreateObject
 	msgCancelCreateObject := storagetypes.NewMsgCancelCreateObject(user[2].GetAddr(), bucketName, objectName)
 	s.Require().NoError(err)
-	s.SendTxBlockWithExpectErrorString(msgCancelCreateObject, user[2], "Only allowed owner/creator to do cancel create object")
+	s.SendTxBlockWithExpectErrorString(msgCancelCreateObject, user[2], "has no DeleteObject permission")
 
-	// CancelCreateObject
+	// CancelCreateObject by creator
 	msgCancelCreateObject = storagetypes.NewMsgCancelCreateObject(user[1].GetAddr(), bucketName, objectName)
 	s.Require().NoError(err)
 	s.SendTxBlock(user[1], msgCancelCreateObject)

diff --git a/e2e/tests/storage_test.go b/e2e/tests/storage_test.go
@@ -28,6 +28,7 @@ import (
 	"github.com/bnb-chain/greenfield/sdk/types"
 	storageutils "github.com/bnb-chain/greenfield/testutil/storage"
 	types2 "github.com/bnb-chain/greenfield/types"
+	paymenttypes "github.com/bnb-chain/greenfield/x/payment/types"
 	sptypes "github.com/bnb-chain/greenfield/x/sp/types"
 	storagetypes "github.com/bnb-chain/greenfield/x/storage/types"
 )
@@ -828,56 +829,11 @@ func (s *StorageTestSuite) TestDiscontinueObject_UserDeleted() {
 
 	// DiscontinueObject
 	msgDiscontinueObject := storagetypes.NewMsgDiscontinueObject(sp.GcKey.GetAddr(), bucketName, []sdkmath.Uint{objectId}, "test")
-	txRes := s.SendTxBlock(sp.GcKey, msgDiscontinueObject)
-	deleteAt := filterDiscontinueObjectEventFromTx(txRes).DeleteAt
+	_ = s.SendTxBlock(sp.GcKey, msgDiscontinueObject)
 
 	// DeleteObject before discontinue confirm window
 	msgDeleteObject := storagetypes.NewMsgDeleteObject(user.GetAddr(), bucketName, objectName)
-	txRes = s.SendTxBlock(user, msgDeleteObject)
-	event := filterDeleteObjectEventFromTx(txRes)
-	s.Require().Equal(event.ObjectId, objectId)
-
-	// Wait after the delete timestamp
-	heightBefore := txRes.Height
-	heightAfter := int64(0)
-	for {
-		time.Sleep(200 * time.Millisecond)
-		statusRes, err := s.TmClient.TmClient.Status(context.Background())
-		s.Require().NoError(err)
-		blockTime := statusRes.SyncInfo.LatestBlockTime.Unix()
-
-		s.T().Logf("current blockTime: %d, delete blockTime: %d", blockTime, deleteAt)
-
-		if blockTime >= deleteAt {
-			heightAfter = statusRes.SyncInfo.LatestBlockHeight
-			break
-		} else {
-			heightBefore = statusRes.SyncInfo.LatestBlockHeight
-		}
-	}
-
-	time.Sleep(200 * time.Millisecond)
-	events := make([]storagetypes.EventDeleteObject, 0)
-	for heightBefore <= heightAfter {
-		blockRes, err := s.TmClient.TmClient.BlockResults(context.Background(), &heightBefore)
-		s.Require().NoError(err)
-		events = append(events, filterDeleteObjectEventFromBlock(blockRes)...)
-		heightBefore++
-	}
-
-	// Already deleted by user
-	found := false
-	for _, event := range events {
-		if event.ObjectId.Equal(objectId) {
-			found = true
-		}
-	}
-	s.Require().True(!found)
-
-	time.Sleep(500 * time.Millisecond)
-	statusRes, err := s.TmClient.TmClient.Status(context.Background())
-	s.Require().NoError(err)
-	s.Require().True(statusRes.SyncInfo.LatestBlockHeight > heightAfter)
+	s.SendTxBlockWithExpectErrorString(msgDeleteObject, user, "is discontined")
 }
 
 func (s *StorageTestSuite) TestDiscontinueBucket_Normal() {
@@ -1190,23 +1146,6 @@ func filterDeleteObjectEventFromBlock(blockRes *ctypes.ResultBlockResults) []sto
 	return events
 }
 
-func filterDeleteObjectEventFromTx(txRes *sdk.TxResponse) storagetypes.EventDeleteObject {
-	objectIdStr := ""
-	for _, event := range txRes.Events {
-		if event.Type == "greenfield.storage.EventDeleteObject" {
-			for _, attr := range event.Attributes {
-				if string(attr.Key) == "object_id" {
-					objectIdStr = strings.Trim(string(attr.Value), `"`)
-				}
-			}
-		}
-	}
-	objectId := sdkmath.NewUintFromString(objectIdStr)
-	return storagetypes.EventDeleteObject{
-		ObjectId: objectId,
-	}
-}
-
 func filterDiscontinueBucketEventFromTx(txRes *sdk.TxResponse) storagetypes.EventDiscontinueBucket {
 	deleteAtStr := ""
 	for _, event := range txRes.Logs[0].Events {
@@ -2408,6 +2347,132 @@ func (s *StorageTestSuite) TestDeleteCreateObject_InCreatedStatus() {
 	s.Require().EqualError(err, "rpc error: code = Unknown desc = No such object: unknown request")
 }
 
+func (s *StorageTestSuite) TestDisallowChangePaymentAccount() {
+	var err error
+	sp := s.BaseSuite.PickStorageProvider()
+	gvg, found := sp.GetFirstGlobalVirtualGroup()
+	s.Require().True(found)
+	user := s.User
+	// CreateBucket
+	bucketName := storageutils.GenRandomBucketName()
+	msgCreateBucket := storagetypes.NewMsgCreateBucket(
+		user.GetAddr(), bucketName, storagetypes.VISIBILITY_TYPE_PUBLIC_READ, sp.OperatorKey.GetAddr(),
+		nil, math.MaxUint, nil, 0)
+	msgCreateBucket.PrimarySpApproval.GlobalVirtualGroupFamilyId = gvg.FamilyId
+	msgCreateBucket.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateBucket.GetApprovalBytes())
+	s.Require().NoError(err)
+	s.SendTxBlock(user, msgCreateBucket)
+
+	// HeadBucket
+	ctx := context.Background()
+	queryHeadBucketRequest := storagetypes.QueryHeadBucketRequest{
+		BucketName: bucketName,
+	}
+	_, err = s.Client.HeadBucket(ctx, &queryHeadBucketRequest)
+	s.Require().NoError(err)
+
+	// create a new payment account
+	msgCreatePaymentAccount := &paymenttypes.MsgCreatePaymentAccount{
+		Creator: user.GetAddr().String(),
+	}
+	_ = s.SendTxBlock(user, msgCreatePaymentAccount)
+	// query user's payment accounts
+	queryGetPaymentAccountsByOwnerRequest := paymenttypes.QueryPaymentAccountsByOwnerRequest{
+		Owner: user.GetAddr().String(),
+	}
+	paymentAccounts, err := s.Client.PaymentAccountsByOwner(ctx, &queryGetPaymentAccountsByOwnerRequest)
+	s.Require().NoError(err)
+	s.T().Log(paymentAccounts)
+	s.Require().Equal(1, len(paymentAccounts.PaymentAccounts))
+	paymentAccountAddr := sdk.MustAccAddressFromHex(paymentAccounts.PaymentAccounts[0])
+
+	msgDeposit := &paymenttypes.MsgDeposit{
+		Creator: user.GetAddr().String(),
+		To:      paymentAccountAddr.String(),
+		Amount:  types.NewIntFromInt64WithDecimal(2, types.DecimalBNB),
+	}
+	_ = s.SendTxBlock(user, msgDeposit)
+
+	// UpdateBucketInfo is fine for no created object
+	msgUpdateBucketInfo := storagetypes.NewMsgUpdateBucketInfo(
+		user.GetAddr(), bucketName, nil, paymentAccountAddr, storagetypes.VISIBILITY_TYPE_PRIVATE)
+	s.Require().NoError(err)
+	s.SendTxBlock(user, msgUpdateBucketInfo)
+	s.Require().NoError(err)
+
+	// CreateObject
+	objectName := storageutils.GenRandomObjectName()
+	// create test buffer
+	var buffer bytes.Buffer
+	line := `1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,
+	1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,
+	1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,
+	1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,
+	1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,
+	1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,
+	1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,
+	1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,
+	1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,1234567890,
+	1234567890,1234567890,1234567890,123`
+	// Create 1MiB content where each line contains 1024 characters.
+	for i := 0; i < 1024; i++ {
+		buffer.WriteString(fmt.Sprintf("[%05d] %s\n", i, line))
+	}
+	payloadSize := buffer.Len()
+	checksum := sdk.Keccak256(buffer.Bytes())
+	expectChecksum := [][]byte{checksum, checksum, checksum, checksum, checksum, checksum, checksum}
+	contextType := "text/event-stream"
+	msgCreateObject := storagetypes.NewMsgCreateObject(user.GetAddr(), bucketName, objectName, uint64(payloadSize),
+		storagetypes.VISIBILITY_TYPE_PRIVATE, expectChecksum, contextType, storagetypes.REDUNDANCY_EC_TYPE, math.MaxUint, nil)
+	msgCreateObject.PrimarySpApproval.Sig, err = sp.ApprovalKey.Sign(msgCreateObject.GetApprovalBytes())
+	s.Require().NoError(err)
+	s.SendTxBlock(user, msgCreateObject)
+
+	// HeadObject
+	queryHeadObjectRequest := storagetypes.QueryHeadObjectRequest{
+		BucketName: bucketName,
+		ObjectName: objectName,
+	}
+	queryHeadObjectResponse, err := s.Client.HeadObject(ctx, &queryHeadObjectRequest)
+	s.Require().NoError(err)
+
+	// UpdateBucketInfo is not fine for there is a created object
+	msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo(
+		user.GetAddr(), bucketName, nil, user.GetAddr(), storagetypes.VISIBILITY_TYPE_PRIVATE)
+	s.Require().NoError(err)
+	s.SendTxBlockWithExpectErrorString(msgUpdateBucketInfo, user, "has unseald objects")
+
+	// SealObject
+	gvgId := gvg.Id
+	msgSealObject := storagetypes.NewMsgSealObject(sp.SealKey.GetAddr(), bucketName, objectName, gvgId, nil)
+
+	secondarySigs := make([][]byte, 0)
+	secondarySPBlsPubKeys := make([]bls.PublicKey, 0)
+	blsSignHash := storagetypes.NewSecondarySpSealObjectSignDoc(s.GetChainID(), gvgId, queryHeadObjectResponse.ObjectInfo.Id, storagetypes.GenerateHash(queryHeadObjectResponse.ObjectInfo.Checksums[:])).GetBlsSignHash()
+	// every secondary sp signs the checksums
+	for _, spID := range gvg.SecondarySpIds {
+		sig, err := core.BlsSignAndVerify(s.StorageProviders[spID], blsSignHash)
+		s.Require().NoError(err)
+		secondarySigs = append(secondarySigs, sig)
+		pk, err := bls.PublicKeyFromBytes(s.StorageProviders[spID].BlsKey.PubKey().Bytes())
+		s.Require().NoError(err)
+		secondarySPBlsPubKeys = append(secondarySPBlsPubKeys, pk)
+	}
+	aggBlsSig, err := core.BlsAggregateAndVerify(secondarySPBlsPubKeys, blsSignHash, secondarySigs)
+	s.Require().NoError(err)
+	msgSealObject.SecondarySpBlsAggSignatures = aggBlsSig
+
+	s.T().Logf("msg %s", msgSealObject.String())
+	s.SendTxBlock(sp.SealKey, msgSealObject)
+
+	// UpdateBucketInfo is fine for there is no created object
+	msgUpdateBucketInfo = storagetypes.NewMsgUpdateBucketInfo(
+		user.GetAddr(), bucketName, nil, user.GetAddr(), storagetypes.VISIBILITY_TYPE_PRIVATE)
+	s.Require().NoError(err)
+	s.SendTxBlock(user, msgUpdateBucketInfo)
+	s.Require().NoError(err)
+}
+
 func (s *StorageTestSuite) TestToggleBucketSpAsDelegatedAgents() {
 	var err error
 	// CreateBucket

diff --git a/go.mod b/go.mod
@@ -179,7 +179,7 @@ replace (
 	github.com/cometbft/cometbft => github.com/bnb-chain/greenfield-cometbft v1.2.0
 	github.com/cometbft/cometbft-db => github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1
 	github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0
-	github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v1.4.1-0.20240305064839-3cb07f5a365c
+	github.com/cosmos/cosmos-sdk => github.com/bnb-chain/greenfield-cosmos-sdk v1.5.1-0.20240314024318-a972393c0430
 	github.com/cosmos/iavl => github.com/bnb-chain/greenfield-iavl v0.20.1
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 	github.com/wercker/journalhook => github.com/wercker/journalhook v0.0.0-20230927020745-64542ffa4117

diff --git a/go.sum b/go.sum
@@ -163,8 +163,8 @@ github.com/bnb-chain/greenfield-cometbft v1.2.0 h1:LTStppZS9WkVj0TfEYKkk5OAQDGfY
 github.com/bnb-chain/greenfield-cometbft v1.2.0/go.mod h1:WVOEZ59UYM2XePQH47/IQfcInspDn8wbRXhFSJrbU1c=
 github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1 h1:XcWulGacHVRiSCx90Q8Y//ajOrLNBQWR/KDB89dy3cU=
 github.com/bnb-chain/greenfield-cometbft-db v0.8.1-alpha.1/go.mod h1:ey1CiK4bYo1RBNJLRiVbYr5CMdSxci9S/AZRINLtppI=
-github.com/bnb-chain/greenfield-cosmos-sdk v1.4.1-0.20240305064839-3cb07f5a365c h1:H0Rvx1FTVNgmXnUYvG0z3oFVvixPzlUHGN2JOPoNszM=
-github.com/bnb-chain/greenfield-cosmos-sdk v1.4.1-0.20240305064839-3cb07f5a365c/go.mod h1:XF8U3VN1euzLkIR5xiSNyQSnBabvnD86oz6fgdrpteQ=
+github.com/bnb-chain/greenfield-cosmos-sdk v1.5.1-0.20240314024318-a972393c0430 h1:Lerm4iJITbmJBOqRj/IPQhS8cvjTKOfuq3XOoDgjAtM=
+github.com/bnb-chain/greenfield-cosmos-sdk v1.5.1-0.20240314024318-a972393c0430/go.mod h1:XF8U3VN1euzLkIR5xiSNyQSnBabvnD86oz6fgdrpteQ=
 github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210 h1:GHPbV2bC+gmuO6/sG0Tm8oGal3KKSRlyE+zPscDjlA8=
 github.com/bnb-chain/greenfield-cosmos-sdk/api v0.0.0-20230816082903-b48770f5e210/go.mod h1:vhsZxXE9tYJeYB5JR4hPhd6Pc/uPf7j1T8IJ7p9FdeM=
 github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20230816082903-b48770f5e210 h1:FLVOn4+OVbsKi2+YJX5kmD27/4dRu4FW7xCXFhzDO5s=

diff --git a/x/payment/keeper/grpc_query_params_by_timestamp.go b/x/payment/keeper/grpc_query_params_by_timestamp.go
@@ -18,7 +18,7 @@ func (k Keeper) ParamsByTimestamp(c context.Context, req *types.QueryParamsByTim
 
 	ts := req.GetTimestamp()
 	if ts == 0 {
-		ts = ctx.BlockTime().Unix()
+		ts = ctx.BlockTime().Unix() + 1
 	}
 
 	params := k.GetParams(ctx)

diff --git a/x/payment/keeper/grpc_query_test.go b/x/payment/keeper/grpc_query_test.go
@@ -41,13 +41,13 @@ func TestParamsByTimestampQuery(t *testing.T) {
 	require.NoError(t, err)
 
 	response, err := keeper.ParamsByTimestamp(ctx, &types.QueryParamsByTimestampRequest{
-		Timestamp: before.Unix(),
+		Timestamp: before.Unix() + 1,
 	})
 	require.NoError(t, err)
 	require.True(t, newReserveTime != response.Params.VersionedParams.ReserveTime)
 
 	response, err = keeper.ParamsByTimestamp(ctx, &types.QueryParamsByTimestampRequest{
-		Timestamp: after.Unix(),
+		Timestamp: after.Unix() + 1,
 	})
 	require.NoError(t, err)
 	require.True(t, newReserveTime == response.Params.VersionedParams.ReserveTime)

diff --git a/x/payment/keeper/params.go b/x/payment/keeper/params.go
@@ -53,8 +53,11 @@ func (k Keeper) SetVersionedParamsWithTs(ctx sdk.Context, verParams types.Versio
 func (k Keeper) GetVersionedParamsWithTs(ctx sdk.Context, ts int64) (verParams types.VersionedParams, err error) {
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), types.VersionedParamsKeyPrefix)
 
-	// ReverseIterator will exclusive end, so we increment ts by 1
-	startKey := types.VersionedParamsKey(ts + 1)
+	// params are updated in the endblock, so we do not need to make the ts to be included
+	// for example, if the params is updated in 100 timestamp: the txs that are executed in 100 timestamp
+	// will use the old parameter, after 100 timestamp, when we passing 100 to query, we should still get
+	// the old parameter.
+	startKey := types.VersionedParamsKey(ts)
 	iterator := store.ReverseIterator(nil, startKey)
 	defer iterator.Close()
 	if !iterator.Valid() {

diff --git a/x/payment/keeper/stream_record.go b/x/payment/keeper/stream_record.go
@@ -10,6 +10,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/bnb-chain/greenfield/x/payment/types"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 )
 
 func (k Keeper) CheckStreamRecord(streamRecord *types.StreamRecord) {
@@ -123,7 +124,12 @@ func (k Keeper) UpdateFrozenStreamRecord(ctx sdk.Context, streamRecord *types.St
 		streamRecord.LockBalance = streamRecord.LockBalance.Add(change.LockBalanceChange)
 		streamRecord.StaticBalance = streamRecord.StaticBalance.Sub(change.LockBalanceChange)
 		if streamRecord.LockBalance.IsNegative() {
-			return fmt.Errorf("lock balance can not become negative, current: %s", streamRecord.LockBalance)
+			if ctx.IsUpgraded(upgradetypes.Pawnee) {
+				streamRecord.StaticBalance = streamRecord.StaticBalance.Add(streamRecord.LockBalance)
+				streamRecord.LockBalance = sdkmath.ZeroInt()
+			} else {
+				return fmt.Errorf("lock balance can not become negative, current: %s", streamRecord.LockBalance)
+			}
 		}
 	}
 	if !change.RateChange.IsZero() {
@@ -158,7 +164,12 @@ func (k Keeper) UpdateStreamRecord(ctx sdk.Context, streamRecord *types.StreamRe
 		streamRecord.LockBalance = streamRecord.LockBalance.Add(change.LockBalanceChange)
 		streamRecord.StaticBalance = streamRecord.StaticBalance.Sub(change.LockBalanceChange)
 		if streamRecord.LockBalance.IsNegative() {
-			return fmt.Errorf("lock balance can not become negative, current: %s", streamRecord.LockBalance)
+			if ctx.IsUpgraded(upgradetypes.Pawnee) {
+				streamRecord.StaticBalance = streamRecord.StaticBalance.Add(streamRecord.LockBalance)
+				streamRecord.LockBalance = sdkmath.ZeroInt()
+			} else {
+				return fmt.Errorf("lock balance can not become negative, current: %s", streamRecord.LockBalance)
+			}
 		}
 	}
 	// update buffer balance

diff --git a/x/payment/types/expected_keepers_mocks.go b/x/payment/types/expected_keepers_mocks.go