Rename field

flashbots · Jun 3, 2024 · 8a669dc · 8a669dc
1 parent ed2a50f
commit 8a669dc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/core/types/confidential.go b/core/types/confidential.go
@@ -18,7 +18,7 @@ type ConfidentialComputeRecord struct {
 	ConfidentialInputsHash common.Hash
 
 	// Envelope signals whether this CCR was signed using EIP-712
-	Envelope bool
+	IsEIP712 bool
 
 	ChainID *big.Int
 	V, R, S *big.Int
@@ -33,7 +33,7 @@ func (tx *ConfidentialComputeRecord) copy() TxData {
 		Gas:                    tx.Gas,
 		KettleAddress:          tx.KettleAddress,
 		ConfidentialInputsHash: tx.ConfidentialInputsHash,
-		Envelope:               tx.Envelope,
+		IsEIP712:               tx.IsEIP712,
 
 		Value:    new(big.Int),
 		GasPrice: new(big.Int),

diff --git a/core/types/transaction_marshalling.go b/core/types/transaction_marshalling.go
@@ -44,7 +44,7 @@ type txJSON struct {
 	BlobVersionedHashes       []common.Hash    `json:"blobVersionedHashes,omitempty"`
 	KettleAddress             *common.Address  `json:"kettleAddress,omitempty"`
 	ConfidentialInputsHash    *common.Hash     `json:"confidentialInputsHash,omitempty"`
-	Envelope                  *bool            `json:"envelope,omitempty"`
+	IsEIP712                  *bool            `json:"iseip712,omitempty"`
 	ConfidentialInputs        *hexutil.Bytes   `json:"confidentialInputs,omitempty"`
 	RequestRecord             *json.RawMessage `json:"requestRecord,omitempty"`
 	ConfidentialComputeResult *hexutil.Bytes   `json:"confidentialComputeResult,omitempty"`
@@ -147,7 +147,7 @@ func (tx *Transaction) MarshalJSON() ([]byte, error) {
 		enc.V = (*hexutil.Big)(itx.V)
 		enc.R = (*hexutil.Big)(itx.R)
 		enc.S = (*hexutil.Big)(itx.S)
-		enc.Envelope = &itx.Envelope
+		enc.IsEIP712 = &itx.IsEIP712
 
 	case *SuaveTransaction:
 		requestRecord, err := NewTx(&itx.ConfidentialComputeRequest).MarshalJSON()
@@ -500,8 +500,8 @@ func (tx *Transaction) UnmarshalJSON(input []byte) error {
 			return errors.New("missing required field 'chainId' in transaction")
 		}
 		itx.ChainID = (*big.Int)(dec.ChainID)
-		if dec.Envelope != nil {
-			itx.Envelope = *dec.Envelope
+		if dec.IsEIP712 != nil {
+			itx.IsEIP712 = *dec.IsEIP712
 		}
 		if dec.V == nil {
 			return errors.New("missing required field 'r' in transaction")

diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
@@ -359,7 +359,7 @@ func (s suaveSigner) Hash(tx *Transaction) common.Hash {
 				txdata.ConfidentialComputeResult,
 			})
 	case *ConfidentialComputeRequest:
-		if txdata.Envelope {
+		if txdata.IsEIP712 {
 			// EIP-712 signature used during signing
 			hash, err := txdata.ConfidentialComputeRecord.EIP712Hash()
 			if err != nil {
@@ -381,7 +381,7 @@ func (s suaveSigner) Hash(tx *Transaction) common.Hash {
 				tx.Data(),
 			})
 	case *ConfidentialComputeRecord:
-		if txdata.Envelope {
+		if txdata.IsEIP712 {
 			// EIP-712 signature using during recovery
 			hash, err := txdata.EIP712Hash()
 			if err != nil {

diff --git a/suave/sdk/sdk.go b/suave/sdk/sdk.go
@@ -98,7 +98,7 @@ func (c *Contract) SendTransaction(method string, args []interface{}, confidenti
 	}
 	if c.client.useEIP712 {
 		record.ChainID = signer.ChainID()
-		record.Envelope = true
+		record.IsEIP712 = true
 	}
 
 	computeRequest, err := types.SignTx(types.NewTx(&types.ConfidentialComputeRequest{