From adb9a4d124662501a7928601f0bed35c8aaad0c6 Mon Sep 17 00:00:00 2001 From: Cassandra Heart Date: Thu, 9 Jan 2025 22:31:54 -0600 Subject: [PATCH] final parameters --- node/config/version.go | 2 +- .../token/application/token_handle_mint.go | 2 +- .../token_handle_prover_join_test.go | 60 ++++++------------- 3 files changed, 21 insertions(+), 43 deletions(-) diff --git a/node/config/version.go b/node/config/version.go index 9349bf0..74f6c11 100644 --- a/node/config/version.go +++ b/node/config/version.go @@ -17,7 +17,7 @@ func GetMinimumPatchVersion() byte { } func GetMinimumVersion() []byte { - return []byte{0x02, 0x00, 0x06} + return []byte{0x02, 0x00, 0x05} } func GetVersion() []byte { diff --git a/node/execution/intrinsics/token/application/token_handle_mint.go b/node/execution/intrinsics/token/application/token_handle_mint.go index a60543b..24b98dc 100644 --- a/node/execution/intrinsics/token/application/token_handle_mint.go +++ b/node/execution/intrinsics/token/application/token_handle_mint.go @@ -22,7 +22,7 @@ import ( var PROOF_FRAME_CUTOFF = uint64(46500) var PROOF_FRAME_RING_RESET = uint64(52000) var PROOF_FRAME_RING_RESET_2 = uint64(53028) -var PROOF_FRAME_COMBINE_CUTOFF = uint64(99000) +var PROOF_FRAME_COMBINE_CUTOFF = uint64(99900) const PROOF_FRAME_SENIORITY_REPAIR = 59029 diff --git a/node/execution/intrinsics/token/application/token_handle_prover_join_test.go b/node/execution/intrinsics/token/application/token_handle_prover_join_test.go index b94a8b8..706c412 100644 --- a/node/execution/intrinsics/token/application/token_handle_prover_join_test.go +++ b/node/execution/intrinsics/token/application/token_handle_prover_join_test.go @@ -181,50 +181,28 @@ func (p *prover) generateProof( challenge, frame.FrameNumber, ) - individualChallenge := append([]byte{}, challenge...) - individualChallenge = binary.BigEndian.AppendUint32( - individualChallenge, - uint32(0), - ) - individualChallenge = append(individualChallenge, frame.Output...) - if proofTree != nil { - individualChallenge = append(individualChallenge, proofTree.Root...) - } - out1, _ := wprover.CalculateChallengeProof(individualChallenge, 10000) - if breakWesoProof { - out1[4] ^= 0xff - } - individualChallenge = append([]byte{}, challenge...) - individualChallenge = binary.BigEndian.AppendUint32( - individualChallenge, - uint32(1), - ) - individualChallenge = append(individualChallenge, frame.Output...) - if proofTree != nil { - individualChallenge = append(individualChallenge, proofTree.Root...) - } - out2, _ := wprover.CalculateChallengeProof(individualChallenge, 10000) - if breakWesoProof { - out2[4] ^= 0xff - } + outs := []merkletree.DataBlock{} + for i := 0; i < 64; i++ { + individualChallenge := append([]byte{}, challenge...) + individualChallenge = binary.BigEndian.AppendUint32( + individualChallenge, + uint32(i), + ) + individualChallenge = append(individualChallenge, frame.Output...) + if proofTree != nil { + individualChallenge = append(individualChallenge, proofTree.Root...) + } + out, _ := wprover.CalculateChallengeProof(individualChallenge, 10000) + if breakWesoProof { + out[0] ^= 0xff + } - individualChallenge = append([]byte{}, challenge...) - individualChallenge = binary.BigEndian.AppendUint32( - individualChallenge, - uint32(2), - ) - individualChallenge = append(individualChallenge, frame.Output...) - if proofTree != nil { - individualChallenge = append(individualChallenge, proofTree.Root...) - } - out3, _ := wprover.CalculateChallengeProof(individualChallenge, 10000) - if breakWesoProof { - out3[4] ^= 0xff + outs = append(outs, tries.NewProofLeaf(out)) } proofTree, output, _ := tries.PackOutputIntoMultiPayloadAndProof( - []merkletree.DataBlock{tries.NewProofLeaf(out1), tries.NewProofLeaf(out2), tries.NewProofLeaf(out3)}, - 3, + outs, + len(outs), frame, proofTree, ) @@ -237,7 +215,7 @@ func (p *prover) generateProof( } mint.SignED448([]byte(p.pubKey), p.privKey.Sign) - return proofTree, [][]byte{out1, out2}, &protobufs.TokenRequest{ + return proofTree, [][]byte{}, &protobufs.TokenRequest{ Request: &protobufs.TokenRequest_Mint{ Mint: mint, },