update TeePodr2Pk, NetSnapShot, QueryChallengeSt, QueryChallenge (#50)

CESSProject · May 17, 2023 · 0bf82f1 · 0bf82f1
1 parent 2705211
commit 0bf82f1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/core/chain/snapshot.go b/core/chain/snapshot.go
@@ -21,7 +21,7 @@ func (c *chainClient) QueryChallengeSnapshot() (ChallengeSnapShot, error) {
 		return data, ERR_RPC_CONNECTION
 	}
 
-	key, err := types.CreateStorageKey(c.metadata, NETSNAPSHOT, CHALLENGESNAPSHOT)
+	key, err := types.CreateStorageKey(c.metadata, AUDIT, CHALLENGESNAPSHOT)
 	if err != nil {
 		return data, errors.Wrap(err, "[CreateStorageKey]")
 	}

diff --git a/core/chain/types.go b/core/chain/types.go
@@ -32,8 +32,6 @@ const (
 	SMINER = "Sminer"
 	// SMINER is a module about storage miners
 	STORAGEHANDLER = "StorageHandler"
-	//
-	NETSNAPSHOT = "NetSnapShotStorage"
 	// SYSTEM is a module about the system
 	SYSTEM = "System"
 )
@@ -149,7 +147,7 @@ var (
 
 type FileHash [64]types.U8
 type Random [20]types.U8
-type TeePodr2Pk [294]types.U8
+type TeePodr2Pk [270]types.U8
 type PeerId [38]types.U8
 
 type SysProperties struct {
@@ -266,10 +264,12 @@ type ChallengeSnapShot struct {
 
 type NetSnapShot struct {
 	Start             types.U32
+	Life              types.U32
 	TotalReward       types.U128
 	TotalIdleSpace    types.U128
 	TotalServiceSpace types.U128
-	Random            Random
+	RandomIndexList   []types.U32
+	Random            []Random
 }
 
 type MinerSnapShot struct {

diff --git a/core/client/netinfo.go b/core/client/netinfo.go
@@ -19,8 +19,17 @@ func (c *Cli) QueryChallengeSt() (ChallengeSnapshot, error) {
 		return challengeSnapshot, err
 	}
 	challengeSnapshot.NetSnapshot.Start = uint32(chall.NetSnapshot.Start)
+	challengeSnapshot.NetSnapshot.Life = uint32(chall.NetSnapshot.Life)
 	challengeSnapshot.NetSnapshot.Total_idle_space = chall.NetSnapshot.TotalIdleSpace.String()
 	challengeSnapshot.NetSnapshot.Total_reward = chall.NetSnapshot.TotalReward.String()
+	challengeSnapshot.NetSnapshot.Random_index_list = make([]uint32, len(chall.NetSnapshot.RandomIndexList))
+	for k, v := range chall.NetSnapshot.RandomIndexList {
+		challengeSnapshot.NetSnapshot.Random_index_list[k] = uint32(v)
+	}
+	challengeSnapshot.NetSnapshot.Random = make([][]byte, len(chall.NetSnapshot.Random))
+	for k, v := range chall.NetSnapshot.Random {
+		challengeSnapshot.NetSnapshot.Random[k] = []byte(string(v[:]))
+	}
 	challengeSnapshot.MinerSnapshot = make([]MinerSnapshot, len(chall.MinerSnapShot))
 	for k, v := range chall.MinerSnapShot {
 		challengeSnapshot.MinerSnapshot[k].Idle_space = v.IdleSpace.String()
@@ -43,11 +52,11 @@ func (c *Cli) QueryChallenge(pubkey []byte) (ChallengeInfo, error) {
 	if err != nil {
 		return chal, err
 	}
-	chal.Random = make([]byte, len(netinfo.NetSnapshot.Random))
+	chal.Random = make([][]byte, len(netinfo.NetSnapshot.Random))
 	for _, v := range netinfo.MinerSnapShot {
 		if v.Miner == *acc {
-			for i := 0; i < len(netinfo.NetSnapshot.Random); i++ {
-				chal.Random[i] = byte(netinfo.NetSnapshot.Random[i])
+			for k, value := range netinfo.NetSnapshot.Random {
+				chal.Random[k] = []byte(string(value[:]))
 			}
 			chal.Start = uint32(netinfo.NetSnapshot.Start)
 			break

diff --git a/core/client/types.go b/core/client/types.go
@@ -11,8 +11,9 @@ type UserSpaceSt struct {
 }
 
 type ChallengeInfo struct {
-	Random []byte
-	Start  uint32
+	Random          [][]byte
+	RandomIndexList []uint32
+	Start           uint32
 }
 
 type ChallengeSnapshot struct {
@@ -22,10 +23,12 @@ type ChallengeSnapshot struct {
 
 type NetSnapshot struct {
 	Start               uint32
+	Life                uint32
 	Total_reward        string
 	Total_idle_space    string
 	Total_service_space string
-	Random              []byte
+	Random_index_list   []uint32
+	Random              [][]byte
 }
 
 type MinerSnapshot struct {