diff --git a/core/types/confidential.go b/core/types/confidential.go index 714e4bcd62..5a68de0db6 100644 --- a/core/types/confidential.go +++ b/core/types/confidential.go @@ -14,8 +14,7 @@ type ConfidentialComputeRequest struct { Value *big.Int Data []byte - ExecutionNode common.Address - ConfidentialInputsHash common.Hash + ExecutionNode common.Address ChainID *big.Int V, R, S *big.Int @@ -24,12 +23,11 @@ type ConfidentialComputeRequest struct { // copy creates a deep copy of the transaction data and initializes all fields. func (tx *ConfidentialComputeRequest) copy() TxData { cpy := &ConfidentialComputeRequest{ - Nonce: tx.Nonce, - To: copyAddressPtr(tx.To), - Data: common.CopyBytes(tx.Data), - Gas: tx.Gas, - ExecutionNode: tx.ExecutionNode, - ConfidentialInputsHash: tx.ConfidentialInputsHash, + Nonce: tx.Nonce, + To: copyAddressPtr(tx.To), + Data: common.CopyBytes(tx.Data), + Gas: tx.Gas, + ExecutionNode: tx.ExecutionNode, Value: new(big.Int), GasPrice: new(big.Int), diff --git a/core/types/transaction_marshalling.go b/core/types/transaction_marshalling.go index 89a7c3464d..2aa05fbf29 100644 --- a/core/types/transaction_marshalling.go +++ b/core/types/transaction_marshalling.go @@ -119,7 +119,6 @@ func (tx *Transaction) MarshalJSON() ([]byte, error) { case *ConfidentialComputeRequest: enc.ExecutionNode = &itx.ExecutionNode - enc.ConfidentialInputsHash = itx.ConfidentialInputsHash enc.Nonce = (*hexutil.Uint64)(&itx.Nonce) enc.To = tx.To() enc.Gas = (*hexutil.Uint64)(&itx.Gas) @@ -390,8 +389,6 @@ func (tx *Transaction) UnmarshalJSON(input []byte) error { } itx.ExecutionNode = *dec.ExecutionNode - itx.ConfidentialInputsHash = dec.ConfidentialInputsHash - if dec.Nonce == nil { return errors.New("missing required field 'nonce' in transaction") } diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index 4c306e87cd..58015d97a3 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -337,7 +337,6 @@ func (s suaveSigner) Hash(tx *Transaction) common.Hash { tx.Type(), []interface{}{ txdata.ExecutionNode, - txdata.ConfidentialInputsHash, tx.Nonce(), tx.GasPrice(), tx.Gas(), diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 72d769f353..4f4b5b77e1 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -1439,7 +1439,6 @@ func newRPCTransaction(tx *types.Transaction, blockHash common.Hash, blockNumber } result.ExecutionNode = &inner.ExecutionNode - result.ConfidentialInputsHash = &inner.ConfidentialInputsHash // if a legacy transaction has an EIP-155 chain id, include it explicitly if id := tx.ChainId(); id.Sign() != 0 { diff --git a/internal/ethapi/transaction_args.go b/internal/ethapi/transaction_args.go index e52e092d76..3e4b576f5b 100644 --- a/internal/ethapi/transaction_args.go +++ b/internal/ethapi/transaction_args.go @@ -347,10 +347,6 @@ func (args *TransactionArgs) toTransaction() *types.Transaction { Data: args.data(), } - if args.ConfidentialInputsHash != nil { - ccrData.ConfidentialInputsHash = *args.ConfidentialInputsHash - } - data = ccrData default: data = &types.LegacyTx{