Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update challenge #118

Merged
merged 1 commit into from
Jun 23, 2023
+207 −33
Merged

update challenge #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
214 changes: 193 additions & 21 deletions node/challengeMgt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
var netinfo pattern.ChallengeSnapShot
var qslice []proof.QElement

n.Chal("info", ">>>>> Start challengeMgt task")
n.Chal("info", ">>>>> start challengeMgt <<<<<")

for {
pubkey, err := n.QueryTeePodr2Puk()
Expand Down Expand Up @@ -134,7 +134,7 @@

n.Chal("info", fmt.Sprintf("saveRandom suc: %v", chal.Start))

idleSiama, qslice, err = n.idleAggrProof(chal.RandomIndexList, chal.Random, chal.Start)

Check failure on line 137 in node/challengeMgt.go

View workflow job for this annotation

GitHub Actions / build 

assignment mismatch: 3 variables but n.idleAggrProof returns 2 values

Check failure on line 137 in node/challengeMgt.go

View workflow job for this annotation

GitHub Actions / build 

too many arguments in call to n.idleAggrProof
if err != nil {
n.Chal("err", fmt.Sprintf("[idleAggrProof] %v", err))
continue
Expand Down Expand Up @@ -177,6 +177,188 @@
}
}

func (n *Node) pChallenge() error {
var err error
var txhash string
var idleSiama string
var serviceSigma string
var peerid peer.ID
var b []byte
var chalStart int
var chal pattern.ChallengeInfo
var netinfo pattern.ChallengeSnapShot

var tempInt int
var haveChallenge bool
var challenge pattern.ChallengeSnapshot

challenge, err = n.QueryChallengeSt()
if err != nil {
return errors.Wrapf(err, "[QueryChallengeSnapshot]")
}

for _, v := range challenge.MinerSnapshot {
if n.GetSignatureAcc() == v.Miner {
haveChallenge = true
break
}
}

if !haveChallenge {
b, err = n.Get([]byte(Cach_AggrProof_Transfered))
if err != nil {
err = n.transferProof()
if err != nil {
n.Chal("err", err.Error())
}
continue

Check failure on line 214 in node/challengeMgt.go

View workflow job for this annotation

GitHub Actions / build 

continue is not in a loop
}
netinfo, err = n.QueryChallengeSnapshot()
if err != nil {
n.Chal("err", err.Error())
continue

Check failure on line 219 in node/challengeMgt.go

View workflow job for this annotation

GitHub Actions / build 

continue is not in a loop
}

temp := strings.Split(string(b), "_")
if len(temp) <= 1 {
n.Delete([]byte(Cach_AggrProof_Transfered))
err = n.transferProof()
if err != nil {
n.Chal("err", err.Error())
}
continue

Check failure on line 229 in node/challengeMgt.go

View workflow job for this annotation

GitHub Actions / build 

continue is not in a loop
}

peerid, _, err = n.queryProofAssignedTee()
if err != nil {
n.Chal("err", fmt.Sprintf("[queryProofAssignedTee] %v", err))
continue

Check failure on line 235 in node/challengeMgt.go

View workflow job for this annotation

GitHub Actions / build 

continue is not in a loop
}

chalStart, err = strconv.Atoi(temp[1])
if err != nil {
n.Delete([]byte(Cach_AggrProof_Transfered))
err = n.transferProof()
if err != nil {
n.Chal("err", err.Error())
}
continue

Check failure on line 245 in node/challengeMgt.go

View workflow job for this annotation

GitHub Actions / build 

continue is not in a loop
}

if chalStart != int(netinfo.NetSnapshot.Start) || peerid.Pretty() != temp[0] {
err = n.transferProof()
if err != nil {
n.Chal("err", err.Error())
}
continue

Check failure on line 253 in node/challengeMgt.go

View workflow job for this annotation

GitHub Actions / build 

continue is not in a loop
}
n.Chal("info", "Proof was transmitted")
time.Sleep(time.Minute)
continue

Check failure on line 257 in node/challengeMgt.go

View workflow job for this annotation

GitHub Actions / build 

continue is not in a loop
}

n.Delete([]byte(Cach_AggrProof_Transfered))

n.Chal("info", fmt.Sprintf("Start processing challenges: %v", chal.Start))

var qslice = make([]proof.QElement, len(challenge.NetSnapshot.Random_index_list))
for k, v := range challenge.NetSnapshot.Random_index_list {
qslice[k].I = int64(v)
qslice[k].V = new(big.Int).SetBytes(challenge.NetSnapshot.Random[k]).String()
}

err = n.saveRandom(chal)
if err != nil {
n.Chal("err", fmt.Sprintf("Save challenge random err: %v", err))
}

n.Chal("info", "Save challenge random suc")

b, err = n.Get([]byte(Cach_IdleChallengeBlock))
if err != nil {
idleSiama, qslice, err = n.idleAggrProof(qslice, chal.Start)
if err != nil {
return errors.Wrapf(err, "[idleAggrProof]")
}
n.Put([]byte(Cach_IdleChallengeBlock), []byte(fmt.Sprintf("%d", chal.Start)))
n.Chal("info", fmt.Sprintf("Idle data aggregation proof: %s", idleSiama))
} else {
tempInt, err = strconv.Atoi(string(b))
if err != nil {
n.Delete([]byte(Cach_IdleChallengeBlock))
idleSiama, qslice, err = n.idleAggrProof(chal.RandomIndexList, chal.Random, chal.Start)
if err != nil {
return errors.Wrapf(err, "[idleAggrProof]")
}
n.Put([]byte(Cach_IdleChallengeBlock), []byte(fmt.Sprintf("%d", chal.Start)))
n.Chal("info", fmt.Sprintf("Idle data aggregation proof: %s", idleSiama))
} else {
if uint32(tempInt) != chal.Start {
idleSiama, qslice, err = n.idleAggrProof(chal.RandomIndexList, chal.Random, chal.Start)
if err != nil {
return errors.Wrapf(err, "[idleAggrProof]")
}
n.Put([]byte(Cach_IdleChallengeBlock), []byte(fmt.Sprintf("%d", chal.Start)))
n.Chal("info", fmt.Sprintf("Idle data aggregation proof: %s", idleSiama))
}
}
}

b, err = n.Get([]byte(Cach_ServiceChallengeBlock))
if err != nil {
serviceSigma, err = n.serviceAggrProof(qslice, chal.Start)
if err != nil {
return errors.Wrapf(err, "[serviceAggrProof]")
}
n.Put([]byte(Cach_ServiceChallengeBlock), []byte(fmt.Sprintf("%d", chal.Start)))
n.Chal("info", fmt.Sprintf("Service data aggregation proof: %s", serviceSigma))
} else {
tempInt, err = strconv.Atoi(string(b))
if err != nil {
n.Delete([]byte(Cach_ServiceChallengeBlock))
serviceSigma, err = n.serviceAggrProof(qslice, chal.Start)
if err != nil {
return errors.Wrapf(err, "[serviceAggrProof]")
}
n.Put([]byte(Cach_ServiceChallengeBlock), []byte(fmt.Sprintf("%d", chal.Start)))
n.Chal("info", fmt.Sprintf("Service data aggregation proof: %s", serviceSigma))
} else {
if uint32(tempInt) != chal.Start {
serviceSigma, err = n.serviceAggrProof(qslice, chal.Start)
if err != nil {
return errors.Wrapf(err, "[serviceAggrProof]")
}
n.Put([]byte(Cach_ServiceChallengeBlock), []byte(fmt.Sprintf("%d", chal.Start)))
n.Chal("info", fmt.Sprintf("Service data aggregation proof: %s", serviceSigma))
}
}
}

n.Put([]byte(Cach_prefix_idleSiama), []byte(idleSiama))
n.Put([]byte(Cach_prefix_serviceSiama), []byte(serviceSigma))

txhash, err = n.ReportProof(idleSiama, serviceSigma)
if err != nil {
return errors.Wrapf(err, "[ReportProof]")
}

n.Chal("info", fmt.Sprintf("Submit proof suc: %v", txhash))

err = n.Put([]byte(Cach_AggrProof_Reported), []byte(fmt.Sprintf("%v", chal.Start)))
if err != nil {
n.Chal("err", fmt.Sprintf("Put Cach_AggrProof_Reported [%d] err: %v", chal.Start, err))
}

time.Sleep(pattern.BlockInterval)

err = n.transferProof()
if err != nil {
n.Chal("err", fmt.Sprintf("Put Cach_AggrProof_Reported [%d] err: %v", chal.Start, err))
continue

Check failure on line 357 in node/challengeMgt.go

View workflow job for this annotation

GitHub Actions / build 

continue is not in a loop
}
return nil
}

func (n *Node) transferProof() error {
chalshort, err := n.QueryChallengeSt()
if err != nil {
Expand Down Expand Up @@ -239,7 +421,7 @@
if err != nil || code != 0 {
count++
n.Chal("err", fmt.Sprintf("AggrProofReq err: %v, code: %d", err, code))
time.Sleep(pattern.BlockInterval * 5)
time.Sleep(pattern.BlockInterval)
continue
}
n.Chal("info", fmt.Sprintf("Aggr proof response suc: %s", peerid.Pretty()))
Expand All @@ -261,7 +443,7 @@
if err != nil || code != 0 {
count++
n.Chal("err", fmt.Sprintf("FileType_IdleMu FileReq err: %v, code: %d", err, code))
time.Sleep(pattern.BlockInterval * 5)
time.Sleep(pattern.BlockInterval)
continue
}
n.Chal("info", fmt.Sprintf("Aggr proof idle file response suc: %s", peerid.Pretty()))
Expand All @@ -279,7 +461,7 @@
if err != nil || code != 0 {
count++
n.Chal("err", fmt.Sprintf("FileType_CustomMu FileReq err: %v, code: %d", err, code))
time.Sleep(pattern.BlockInterval * 5)
time.Sleep(pattern.BlockInterval)
continue
}
n.Chal("info", fmt.Sprintf("Aggr proof service file response suc: %s", peerid.Pretty()))
Expand All @@ -288,14 +470,10 @@
return peerid.Pretty(), code, err
}

func (n *Node) idleAggrProof(randomIndexList []uint32, random [][]byte, start uint32) (string, []proof.QElement, error) {
if len(randomIndexList) != len(random) {
return "", nil, fmt.Errorf("invalid random length")
}

func (n *Node) idleAggrProof(qslice []proof.QElement, start uint32) (string, error) {
idleRoothashs, err := n.QueryPrefixKeyListByHeigh(Cach_prefix_idle, start)
if err != nil {
return "", nil, err
return "", err
}

var buf []byte
Expand All @@ -309,12 +487,6 @@
pf.Us = make([]string, len(idleRoothashs))
pf.Mus = make([]string, len(idleRoothashs))

var qslice = make([]proof.QElement, len(randomIndexList))
for k, v := range randomIndexList {
qslice[k].I = int64(v)
qslice[k].V = new(big.Int).SetBytes(random[k]).String()
}

timeout := time.NewTicker(time.Duration(time.Minute))
defer timeout.Stop()

Expand Down Expand Up @@ -371,11 +543,11 @@
//
buf, err = json.Marshal(&pf)
if err != nil {
return "", nil, err
return "", err
}
f, err := os.OpenFile(n.GetDirs().IproofFile, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, os.ModePerm)
if err != nil {
return "", nil, err
return "", err
}
defer func() {
if f != nil {
Expand All @@ -385,18 +557,18 @@

_, err = f.Write(buf)
if err != nil {
return "", nil, err
return "", err
}

err = f.Sync()
if err != nil {
return "", nil, err
return "", err
}

f.Close()
f = nil

return sigma, qslice, nil
return sigma, nil
}

func (n *Node) serviceAggrProof(qslice []proof.QElement, start uint32) (string, error) {
Expand Down
26 changes: 14 additions & 12 deletions node/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,20 @@ const (
)

const (
Cach_prefix_metadata = "metadata:"
Cach_prefix_report = "report:"
Cach_prefix_idle = "idle:"
Cach_prefix_idleSiama = "sigmaidle:"
Cach_prefix_serviceSiama = "sigmaservice:"
Cach_AggrProof_Reported = "AggrProof_Reported"
Cach_AggrProof_Transfered = "AggrProof_Transfered"
Cach_prefix_MyLost = "mylost:"
Cach_prefix_recovery = "recovery:"
Cach_prefix_TargetMiner = "targetminer:"
Cach_prefix_File = "file:"
Cach_prefix_ParseBlock = "parseblocks"
Cach_prefix_metadata = "metadata:"
Cach_prefix_report = "report:"
Cach_prefix_idle = "idle:"
Cach_prefix_idleSiama = "sigmaidle:"
Cach_prefix_serviceSiama = "sigmaservice:"
Cach_AggrProof_Reported = "AggrProofReported"
Cach_AggrProof_Transfered = "AggrProofTransfered"
Cach_IdleChallengeBlock = "ChallengeIdleBlock"
Cach_ServiceChallengeBlock = "ChallengeServiceBlock"
Cach_prefix_MyLost = "mylost:"
Cach_prefix_recovery = "recovery:"
Cach_prefix_TargetMiner = "targetminer:"
Cach_prefix_File = "file:"
Cach_prefix_ParseBlock = "parseblocks"
)

const P2PResponseOK uint32 = 200
Expand Down