From f9de39315ed034dcee15bddd382e4f8f2c32fbc3 Mon Sep 17 00:00:00 2001 From: noelwei Date: Thu, 13 Mar 2025 10:34:20 +0900 Subject: [PATCH 1/3] fix byte48 type required in prover Signed-off-by: noelwei --- common/types/message/message.go | 26 +++++++++++++++++++++++--- common/types/message/message_test.go | 22 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 common/types/message/message_test.go diff --git a/common/types/message/message.go b/common/types/message/message.go index 3c89434df..e929e977e 100644 --- a/common/types/message/message.go +++ b/common/types/message/message.go @@ -53,15 +53,35 @@ type EuclidV2ChunkTaskDetail struct { PrevMsgQueueHash common.Hash `json:"prev_msg_queue_hash"` } +// it is a hex encoded big with fixed length on 48 bytes +type Byte48 struct { + hexutil.Big +} + +func (e Byte48) MarshalText() ([]byte, error) { + i := e.ToInt() + // overrite encode big + if sign := i.Sign(); sign < 0 { + // sanity check + return nil, fmt.Errorf("Byte48 must be positive integer") + } else { + s := i.Text(16) + if len(s) > 96 { + return nil, fmt.Errorf("Integer Exceed 384bit") + } + return []byte(fmt.Sprintf("0x%0*s", 96, s)), nil + } +} + // BatchTaskDetail is a type containing BatchTask detail. type BatchTaskDetail struct { ChunkInfos []*ChunkInfo `json:"chunk_infos"` ChunkProofs []ChunkProof `json:"chunk_proofs"` BatchHeader interface{} `json:"batch_header"` BlobBytes []byte `json:"blob_bytes"` - KzgProof hexutil.Big `json:"kzg_proof"` - KzgCommitment hexutil.Big `json:"kzg_commitment"` - ChallengeDigest hexutil.Big `json:"challenge_digest"` + KzgProof Byte48 `json:"kzg_proof"` + KzgCommitment Byte48 `json:"kzg_commitment"` + ChallengeDigest Byte48 `json:"challenge_digest"` } // BundleTaskDetail consists of all the information required to describe the task to generate a proof for a bundle of batches. diff --git a/common/types/message/message_test.go b/common/types/message/message_test.go new file mode 100644 index 000000000..c757cbf24 --- /dev/null +++ b/common/types/message/message_test.go @@ -0,0 +1,22 @@ +package message + +import ( + "fmt" + "testing" +) + +func TestBytes48(t *testing.T) { + ti := &Byte48{} + ti.UnmarshalText([]byte("0x1")) + if s, err := ti.MarshalText(); err == nil { + if len(s) != 98 { + panic(fmt.Sprintf("wrong str: %s", s)) + } + } + ti.UnmarshalText([]byte("0x0")) + if s, err := ti.MarshalText(); err == nil { + if len(s) != 98 { + panic(fmt.Sprintf("wrong str: %s", s)) + } + } +} From 7097cc016892a965a410e1613b0f4512a4435c9e Mon Sep 17 00:00:00 2001 From: noelwei Date: Thu, 13 Mar 2025 11:05:32 +0900 Subject: [PATCH 2/3] fix Signed-off-by: noelwei --- coordinator/internal/logic/provertask/batch_prover_task.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index 836fc5cce..5d76906f6 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -291,8 +291,8 @@ func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, chunkInfos []* // | z | y | kzg_commitment | kzg_proof | // |---------|---------|----------------|-----------| // | bytes32 | bytes32 | bytes48 | bytes48 | - taskDetail.KzgProof = hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[112:160])) - taskDetail.KzgCommitment = hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[64:112])) - taskDetail.ChallengeDigest = hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[0:32])) // FIXME: Challenge = ChallengeDigest % BLS_MODULUS, get the original ChallengeDigest. + taskDetail.KzgProof = message.Byte48{hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[112:160]))} + taskDetail.KzgCommitment = message.Byte48{hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[64:112]))} + taskDetail.ChallengeDigest = message.Byte48{hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[0:32]))} // FIXME: Challenge = ChallengeDigest % BLS_MODULUS, get the original ChallengeDigest. return taskDetail, nil } From ffce1aa8f2686285b6dd8bfd78da81fc456a23e0 Mon Sep 17 00:00:00 2001 From: noelwei Date: Thu, 13 Mar 2025 11:56:30 +0900 Subject: [PATCH 3/3] fix Signed-off-by: noelwei --- common/types/message/message.go | 26 ++++++++++++++++++- .../logic/provertask/batch_prover_task.go | 6 ++--- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/common/types/message/message.go b/common/types/message/message.go index e929e977e..bb6ab9153 100644 --- a/common/types/message/message.go +++ b/common/types/message/message.go @@ -4,6 +4,7 @@ import ( "encoding/json" "errors" "fmt" + "math/big" "github.com/scroll-tech/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common/hexutil" @@ -73,6 +74,29 @@ func (e Byte48) MarshalText() ([]byte, error) { } } +func isString(input []byte) bool { + return len(input) >= 2 && input[0] == '"' && input[len(input)-1] == '"' +} + +// hexutil.Big has limition of 256bit so we have to override it ... +func (e *Byte48) UnmarshalJSON(input []byte) error { + if !isString(input) { + return fmt.Errorf("not hex string") + } + + b, err := hexutil.Decode(string(input[1 : len(input)-1])) + if err != nil { + return err + } + if len(b) != 48 { + return fmt.Errorf("not a 48 bytes hex string: %d", len(b)) + } + var dec big.Int + dec.SetBytes(b) + *e = Byte48{(hexutil.Big)(dec)} + return nil +} + // BatchTaskDetail is a type containing BatchTask detail. type BatchTaskDetail struct { ChunkInfos []*ChunkInfo `json:"chunk_infos"` @@ -81,7 +105,7 @@ type BatchTaskDetail struct { BlobBytes []byte `json:"blob_bytes"` KzgProof Byte48 `json:"kzg_proof"` KzgCommitment Byte48 `json:"kzg_commitment"` - ChallengeDigest Byte48 `json:"challenge_digest"` + ChallengeDigest common.Hash `json:"challenge_digest"` } // BundleTaskDetail consists of all the information required to describe the task to generate a proof for a bundle of batches. diff --git a/coordinator/internal/logic/provertask/batch_prover_task.go b/coordinator/internal/logic/provertask/batch_prover_task.go index 5d76906f6..69e5505c6 100644 --- a/coordinator/internal/logic/provertask/batch_prover_task.go +++ b/coordinator/internal/logic/provertask/batch_prover_task.go @@ -291,8 +291,8 @@ func (bp *BatchProverTask) getBatchTaskDetail(dbBatch *orm.Batch, chunkInfos []* // | z | y | kzg_commitment | kzg_proof | // |---------|---------|----------------|-----------| // | bytes32 | bytes32 | bytes48 | bytes48 | - taskDetail.KzgProof = message.Byte48{hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[112:160]))} - taskDetail.KzgCommitment = message.Byte48{hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[64:112]))} - taskDetail.ChallengeDigest = message.Byte48{hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[0:32]))} // FIXME: Challenge = ChallengeDigest % BLS_MODULUS, get the original ChallengeDigest. + taskDetail.KzgProof = message.Byte48{Big: hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[112:160]))} + taskDetail.KzgCommitment = message.Byte48{Big: hexutil.Big(*new(big.Int).SetBytes(dbBatch.BlobDataProof[64:112]))} + taskDetail.ChallengeDigest = common.BytesToHash(dbBatch.BlobDataProof[0:32]) // FIXME: Challenge = ChallengeDigest % BLS_MODULUS, get the original ChallengeDigest. return taskDetail, nil }