Sby3 (#235)

* update readme, add QueryDealMapList

* add InitExtrinsicsNameForMiner and  InitExtrinsicsNameForOSS, update ExtName

.env.local

@@ -7,4 +7,4 @@ MY_ADDR="cXgaee2N8E77JJv9gdsGAckv1Qsf3hqWYf7NL4q6ZuQzuAUtB"
 RPC_ADDRS="ws://localhost:9944"
 
 # testnet
-BOOTSTRAP_NODES="_dnsaddr.boot-miner-testnet.cess.cloud"
+BOOTSTRAP_NODES="_dnsaddr.boot-miner-testnet.cess.network"

.env.testnet

@@ -5,7 +5,7 @@ MY_ADDR="cXgaee2N8E77JJv9gdsGAckv1Qsf3hqWYf7NL4q6ZuQzuAUtB" # root
 
 
 # testnet
-RPC_ADDRS="wss://testnet-rpc.cess.cloud/ws/"
+RPC_ADDRS="wss://testnet-rpc.cess.network/ws/"
 
 # testnet
-BOOTSTRAP_NODES="_dnsaddr.boot-miner-testnet.cess.cloud"
+BOOTSTRAP_NODES="_dnsaddr.boot-miner-testnet.cess.network"

README.md

@@ -19,11 +19,11 @@ If you find any system errors or you have better suggestions, please submit an i
 ## 📢 Announcement
 **CESS test network rpc endpoints**
 ```
-wss://testnet-rpc.cess.cloud/ws/
+wss://testnet-rpc.cess.network/ws/
 ```
 **CESS test network bootstrap node**
 ```
-_dnsaddr.boot-miner-testnet.cess.cloud
+_dnsaddr.boot-miner-testnet.cess.network
 ```
 
 ## 🚰 CESS test network faucet
@@ -50,7 +50,7 @@ make check
 ## 📖 Document
 
 - [Reference](https://pkg.go.dev/github.com/CESSProject/cess-go-sdk)
-- [Guidebook](https://docs.cess.cloud/core/developer/cess-sdk/sdk-golang)
+- [Guidebook](https://doc.cess.network/developer/cess-sdk/sdk-golang)
 
 ## License
 

chain/chainer.go

@@ -46,6 +46,7 @@ type Chainer interface {
 	// FileBank
 	QueryBucket(accountID []byte, bucketName string, block int32) (BucketInfo, error)
 	QueryDealMap(fid string, block int32) (StorageOrder, error)
+	QueryDealMapList(block int32) ([]StorageOrder, error)
 	QueryFile(fid string, block int32) (FileMetadata, error)
 	QueryRestoralOrder(fragmentHash string, block int32) (RestoralOrderInfo, error)
 	QueryAllRestoralOrder(block int32) ([]RestoralOrderInfo, error)
@@ -179,6 +180,8 @@ type Chainer interface {
 
 	// extrinsics
 	InitExtrinsicsName() error
+	InitExtrinsicsNameForMiner() error
+	InitExtrinsicsNameForOSS() error
 	ParseBlockData(blocknumber uint64) (BlockData, error)
 
 	// event

chain/file_bank.go

@@ -161,6 +161,64 @@ func (c *ChainClient) QueryDealMap(fid string, block int32) (StorageOrder, error
 	return data, nil
 }
 
+// QueryDealMapList query file storage order list
+//   - block: block number, less than 0 indicates the latest block
+//
+// Return:
+//   - []StorageOrder: file storage order list
+//   - error: error message
+func (c *ChainClient) QueryDealMapList(block int32) ([]StorageOrder, error) {
+	defer func() {
+		if err := recover(); err != nil {
+			log.Println(utils.RecoverError(err))
+		}
+	}()
+	var result []StorageOrder
+
+	if !c.GetRpcState() {
+		return nil, ERR_RPC_CONNECTION
+	}
+
+	key := CreatePrefixedKey(FileBank, DealMap)
+	keys, err := c.api.RPC.State.GetKeysLatest(key)
+	if err != nil {
+		err = fmt.Errorf("rpc err: [%s] [st] [%s.%s] GetKeysLatest: %v", c.GetCurrentRpcAddr(), FileBank, DealMap, err)
+		c.SetRpcState(false)
+		return nil, err
+	}
+
+	var set []types.StorageChangeSet
+	if block < 0 {
+		set, err = c.api.RPC.State.QueryStorageAtLatest(keys)
+		if err != nil {
+			err = fmt.Errorf("rpc err: [%s] [st] [%s.%s] QueryStorageAtLatest: %v", c.GetCurrentRpcAddr(), FileBank, DealMap, err)
+			c.SetRpcState(false)
+			return nil, err
+		}
+	} else {
+		blockhash, err := c.api.RPC.Chain.GetBlockHash(uint64(block))
+		if err != nil {
+			return nil, err
+		}
+		set, err = c.api.RPC.State.QueryStorageAt(keys, blockhash)
+		if err != nil {
+			err = fmt.Errorf("rpc err: [%s] [st] [%s.%s] QueryStorageAtLatest: %v", c.GetCurrentRpcAddr(), FileBank, DealMap, err)
+			c.SetRpcState(false)
+			return nil, err
+		}
+	}
+	for _, elem := range set {
+		for _, change := range elem.Changes {
+			var data StorageOrder
+			if err := codec.Decode(change.StorageData, &data); err != nil {
+				continue
+			}
+			result = append(result, data)
+		}
+	}
+	return result, nil
+}
+
 // QueryFile query file metadata
 //   - fid: file identification
 //   - block: block number, less than 0 indicates the latest block
@@ -747,9 +805,6 @@ func (c *ChainClient) UploadDeclaration(fid string, segment []SegmentList, user
 // Note:
 //   - cannot create a bucket that already exists
 //   - if you are not the owner, the owner account must be authorised to you
-//
-// For details on bucket naming rules, see:
-//   - https://docs.cess.cloud/deoss/get-started/deoss-gateway/step-1-create-a-bucket#naming-conventions-for-a-bucket
 func (c *ChainClient) CreateBucket(owner []byte, bucketName string) (string, error) {
 	c.lock.Lock()
 	defer func() {

config/config.go

@@ -30,7 +30,7 @@ const (
 	CharacterName_Default = "cess-sdk-go"
 
 	// offcial gateway address
-	PublicGatewayAddr = "http://deoss-pub-gateway.cess.cloud/"
+	PublicGatewayAddr = "https://deoss-pub-gateway.cess.network/"
 	// offcial gateway account
 	PublicGatewayAccount = "cXhwBytXqrZLr1qM5NHJhCzEMckSTzNKw17ci2aHft6ETSQm9"
 )

core/process/file.go

@@ -48,7 +48,7 @@ var globalTransport = &http.Transport{
 //
 // Explanation:
 //   - Account refers to the account where you configured mnemonic when creating an SDK.
-//   - CESS public gateway address: [http://deoss-pub-gateway.cess.cloud/]
+//   - CESS public gateway address: [https://deoss-pub-gateway.cess.network/]
 //   - CESS public gateway account: [cXhwBytXqrZLr1qM5NHJhCzEMckSTzNKw17ci2aHft6ETSQm9]
 func StoreFile(url, file, bucket, territory, mnemonic string) (string, error) {
 	fstat, err := os.Stat(file)
@@ -165,7 +165,7 @@ func StoreFile(url, file, bucket, territory, mnemonic string) (string, error) {
 //
 // Explanation:
 //   - Account refers to the account where you configured mnemonic when creating an SDK.
-//   - CESS public gateway address: [http://deoss-pub-gateway.cess.cloud/]
+//   - CESS public gateway address: [https://deoss-pub-gateway.cess.network/]
 //   - CESS public gateway account: [cXhwBytXqrZLr1qM5NHJhCzEMckSTzNKw17ci2aHft6ETSQm9]
 func StoreObject(url string, bucket, territory, mnemonic string, reader io.Reader) (string, error) {
 	if !utils.CheckBucketName(bucket) {

defaults.go

@@ -14,7 +14,7 @@ import (
 // DefaultRpcAddrs configures the default rpc address
 var DefaultRpcAddrs = func(cfg *Config) error {
 	rpcAddrs := []string{
-		"wss://testnet-rpc.cess.cloud/ws/",
+		"wss://testnet-rpc.cess.network/ws/",
 	}
 	return cfg.Apply(ConnectRpcAddrs(rpcAddrs))
 }

example/evm/evm.go

@@ -20,7 +20,7 @@ var MY_MNEMONIC = "head achieve piano online exhaust bulk trust vote inflict roo
 
 var RPC_ADDRS = []string{
 	//testnet
-	"wss://testnet-rpc.cess.cloud/ws/",
+	"wss://testnet-rpc.cess.network/ws/",
 }
 
 func main() {

example/file/file.go

@@ -27,10 +27,10 @@ var MY_MNEMONIC = "bottom drive obey lake curtain smoke basket hold race lonely
 
 var RPC_ADDRS = []string{
 	//testnet
-	"wss://testnet-rpc.cess.cloud/ws/",
+	"wss://testnet-rpc.cess.network/ws/",
 }
 
-const PublicGateway = "http://deoss-pub-gateway.cess.cloud/"
+const PublicGateway = "https://deoss-pub-gateway.cess.network/"
 const PublicGatewayAccount = "cXhwBytXqrZLr1qM5NHJhCzEMckSTzNKw17ci2aHft6ETSQm9"
 const UploadFile = "file.go"
 const BucketName = "myBucket"

example/new/sdk.go

@@ -24,11 +24,8 @@ import (
 var MY_MNEMONIC = "bottom drive obey lake curtain smoke basket hold race lonely fit walk"
 
 var RPC_ADDRS = []string{
-	//devnet
-	"wss://testnet-rpc.cess.cloud/ws/",
-
 	//testnet
-	//"wss://testnet-rpc.cess.cloud/ws/",
+	"wss://testnet-rpc.cess.network/ws/",
 }
 
 func main() {
@@ -43,13 +40,22 @@ func main() {
 	}
 	defer sdk.Close()
 
+	err = sdk.InitExtrinsicsNameForMiner()
+	if err != nil {
+		panic(err)
+	}
+	err = sdk.InitExtrinsicsNameForOSS()
+	if err != nil {
+		panic(err)
+	}
 	err = sdk.InitExtrinsicsName()
 	if err != nil {
 		panic(err)
 	}
 
 	fmt.Println(sdk.SystemVersion())
 	fmt.Println(sdk.GetCurrentRpcAddr())
+	fmt.Println(sdk.SystemProperties())
 	return
 
 	puk, err := utils.ParsingPublickey("cXfg2SYcq85nyZ1U4ccx6QnAgSeLQB8aXZ2jstbw9CPGSmhXY")

example/parse_block/parse_block.go

@@ -10,16 +10,9 @@ import (
 	"github.com/centrifuge/go-substrate-rpc-client/v4/types"
 )
 
-// Substrate well-known mnemonic:
-//
-//	https://github.com/substrate-developer-hub/substrate-developer-hub.github.io/issues/613
-var MY_MNEMONIC = "bottom drive obey lake curtain smoke basket hold race lonely fit walk"
-
 var RPC_ADDRS = []string{
-	//devnet
-	"wss://devnet-rpc.cess.cloud/ws/",
 	//testnet
-	// "wss://testnet-rpc.cess.cloud/ws/",
+	"wss://testnet-rpc.cess.network/ws/",
 }
 
 type MyEvent struct {
@@ -42,7 +35,7 @@ func main() {
 		panic(err)
 	}
 
-	blockData, err := sdk.ParseBlockData(43742)
+	blockData, err := sdk.ParseBlockData(24112)
 	if err != nil {
 		fmt.Println("ERR: ", err)
 		return

example/test/main.go

@@ -9,14 +9,13 @@ package main
 
 import (
 	"context"
-	"fmt"
 
 	sdkgo "github.com/CESSProject/cess-go-sdk"
 )
 
 var RPC_ADDRS = []string{
 	//testnet
-	"wss://testnet-rpc.cess.cloud/ws/",
+	"wss://testnet-rpc.cess.network/ws/",
 }
 
 func main() {
@@ -28,11 +27,4 @@ func main() {
 		panic(err)
 	}
 	defer sdk.Close()
-
-	blockhash, err := sdk.ChainGetBlockHash(0)
-	if err != nil {
-		panic(err)
-	}
-
-	fmt.Println(sdk.ChainGetBlock(blockhash))
 }

sdk.go

@@ -17,7 +17,7 @@ import (
 // reasonable defaults. The defaults are:
 //
 // - If no rpc address is provided, the sdk client uses the default address
-// "wss://testnet-rpc0.cess.cloud/ws/"" or "wss://testnet-rpc1.cess.cloud/ws/";
+// "wss://testnet-rpc.cess.network/ws/"
 //
 // - If no transaction timeout is provided, the sdk client uses the default
 // timeout: time.Duration(time.Second * 6)

version.go

@@ -8,4 +8,4 @@
 package sdkgo
 
 // SDK Version
-const Version = "0.6.0"
+const Version = "0.6.1"