Merge branch 'develop' into master

README.md

@@ -666,19 +666,19 @@ Workers = 50
 
 ### Join Greenfield Testnet
 
-[Run Testnet SP Node](https://docs.bnbchain.org/greenfield-docs/docs/guide/storage-provider/run-book/run-testnet-SP-node)
+[Run Testnet SP Node](https://docs.bnbchain.org/bnb-greenfield/storage-provider/run-book/run-SP-node)
 
 ## Document
 
 * [Greenfield Whitepaper](https://github.com/bnb-chain/greenfield-whitepaper): The official Greenfield Whitepaper.
-* [Greenfield](https://docs.bnbchain.org/greenfield-docs/docs/guide/greenfield-blockchain/overview): The Greenfield documents.
-* [Storage Module on Greenfield](https://docs.bnbchain.org/greenfield-docs/docs/guide/greenfield-blockchain/modules/storage-module): The storage module on Greenfield Chain.
-* [Storage Provider on Greenfield](https://docs.bnbchain.org/greenfield-docs/docs/guide/greenfield-blockchain/modules/storage-provider): The storage provider on Greenfield Chain.
-* [Data Availability Challenge](https://docs.bnbchain.org/greenfield-docs/docs/guide/greenfield-blockchain/modules/data-availability-challenge): The correctness of payload be stored in SP.
-* [SP Introduction](https://docs.bnbchain.org/greenfield-docs/docs/guide/storage-provider/introduction/overview): The Greenfield Storage Provider documents.
-* [SP Compiling and Dependencies](https://docs.bnbchain.org/greenfield-docs/docs/guide/storage-provider/run-book/compile-dependences): The detailed introduction to sp compiling and dependencies.
-* [Run Local SP Network](https://docs.bnbchain.org/greenfield-docs/docs/guide/storage-provider/run-book/run-local-SP-network): The introduction to run local SP env for testing.
-* [Run Testnet SP Node](https://docs.bnbchain.org/greenfield-docs/docs/guide/storage-provider/run-book/run-testnet-SP-node): The introduction to run testnet SP node.
+* [Greenfield](https://docs.bnbchain.org/bnb-greenfield): The Greenfield documents.
+* [Storage Module on Greenfield](https://github.com/bnb-chain/greenfield/tree/master/docs/modules): The storage module on Greenfield Chain.
+* [Storage Provider on Greenfield](https://github.com/bnb-chain/greenfield-storage-provider/tree/master/docs/modules): The storage provider on Greenfield Chain.
+* [Data Availability Challenge](https://github.com/bnb-chain/greenfield/blob/master/docs/modules/data-availability-challenge.md): The correctness of payload be stored in SP.
+* [SP Introduction](https://docs.bnbchain.org/bnb-greenfield/storage-provider/overview): The Greenfield Storage Provider documents.
+* [SP Compiling and Dependencies](https://docs.bnbchain.org/bnb-greenfield/storage-provider/run-book/compile-dependences): The detailed introduction to sp compiling and dependencies.
+* [Run Local SP Network](https://docs.bnbchain.org/bnb-greenfield/storage-provider/run-book/run-local-SP-network): The introduction to run local SP env for testing.
+* [Run Testnet SP Node](https://docs.bnbchain.org/bnb-greenfield/storage-provider/run-book/run-SP-node): The introduction to run testnet SP node.
 
 ## Related Projects
 

base/gfspvgmgr/virtual_group_manager.go

@@ -32,6 +32,7 @@ const (
 	VirtualGroupManagerSpace            = "VirtualGroupManager"
 	RefreshMetaInterval                 = 5 * time.Second
 	MaxStorageUsageRatio                = 0.95
+
 	DefaultInitialGVGStakingStorageSize = uint64(1) * 1024 * 1024 * 1024 * 256 // 256GB per GVG, chain side DefaultMaxStoreSizePerFamily is 64 TB
 	additionalGVGStakingStorageSize     = uint64(1) * 1024 * 1024 * 1024 * 512 // 0.5TB
 

base/gnfd/gnfd_service.go

@@ -874,7 +874,7 @@ func (g *Gnfd) ConfirmTransaction(ctx context.Context, txHash string) (*sdk.TxRe
 			if strings.Contains(err.Error(), "not found") {
 				// Tx not found, wait for next block and try again
 				if err = g.WaitForNextBlock(ctx); err != nil {
-					return nil, err
+					log.Warnf("failed to wait for next block err:%v", err)
 				}
 				continue
 			}

go.mod

@@ -308,7 +308,7 @@ replace (
 	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.8.0
 	github.com/cosmos/iavl => github.com/bnb-chain/greenfield-iavl v0.20.1
-	github.com/forbole/juno/v4 => github.com/bnb-chain/juno/v4 v4.0.0-20240422102216-0039530fcfb2
+	github.com/forbole/juno/v4 => github.com/bnb-chain/juno/v4 v4.0.0-20240604033531-028f2cc8f76d
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
 )

go.sum

@@ -192,8 +192,8 @@ github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20231206043955-0855e0965b
 github.com/bnb-chain/greenfield-cosmos-sdk/math v0.0.0-20231206043955-0855e0965bc8/go.mod h1:An0MllWJY6PxibUpnwGk8jOm+a/qIxlKmL5Zyp9NnaM=
 github.com/bnb-chain/greenfield-iavl v0.20.1 h1:y3L64GU99otNp27/xLVBTDbv4eroR6CzoYz0rbaVotM=
 github.com/bnb-chain/greenfield-iavl v0.20.1/go.mod h1:oLksTs8dfh7DYIKBro7hbRQ+ewls7ghJ27pIXlbEXyI=
-github.com/bnb-chain/juno/v4 v4.0.0-20240422102216-0039530fcfb2 h1:Zpq40LEvqzaqtT7QqISASBg6E51SZPAWLQ5gdbAtsfk=
-github.com/bnb-chain/juno/v4 v4.0.0-20240422102216-0039530fcfb2/go.mod h1:p+KkPIHURpqUJOdXanhhYgZpTLQxGZWkrAwtUaOuPlM=
+github.com/bnb-chain/juno/v4 v4.0.0-20240604033531-028f2cc8f76d h1:a5Q944ZvZK4K3lDkbIqweZd1CqEE8gmxph+wpTQzE3k=
+github.com/bnb-chain/juno/v4 v4.0.0-20240604033531-028f2cc8f76d/go.mod h1:p+KkPIHURpqUJOdXanhhYgZpTLQxGZWkrAwtUaOuPlM=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
 github.com/bradfitz/gomemcache v0.0.0-20170208213004-1952afaa557d/go.mod h1:PmM6Mmwb0LSuEubjR8N7PtNe1KxZLtOUHtbeikc5h60=

modular/blocksyncer/blocksyncer_options.go

@@ -265,6 +265,7 @@ func (b *BlockSyncerModular) getLatestBlockHeight(ctx context.Context) {
 			return
 		case <-ticker.C:
 			{
+				rpcStartTime := time.Now()
 				latestBlockHeight, err := b.parserCtx.Node.LatestHeight()
 				if err != nil {
 					log.Errorw("failed to get last block from RPCConfig client",
@@ -273,6 +274,7 @@ func (b *BlockSyncerModular) getLatestBlockHeight(ctx context.Context) {
 					continue
 				}
 				metrics.ChainLatestHeight.Set(float64(latestBlockHeight))
+				metrics.ChainRPCTime.Set(float64(time.Since(rpcStartTime).Milliseconds()))
 				metrics.GoRoutineCount.Set(float64(runtime.NumGoroutine()))
 				Cast(b.parserCtx.Indexer).GetLatestBlockHeight().Store(latestBlockHeight)
 			}