mirror of
https://github.com/luxfi/geth.git
synced 2026-10-30 15:05:39 +00:00
zeekayandEthereum Foundation <https://github.com/ethereum/go-ethereum>
347b448823
Merged upstream changes from go-ethereum master branch (commit fb3c8f462)
while preserving luxfi branding and package structure.
Key changes:
- Updated to go-ethereum v1.16.6 (patch version bump from v1.16.5)
- Preserved luxfi module name (github.com/luxfi/geth)
- Preserved luxfi branding in LICENSE (Lux Industries Inc.)
- Maintained LuxMainnetChainConfig and LuxTestnetChainConfig
- All import paths use github.com/luxfi/geth (not ethereum)
- Added Lux genesis hashes for network identification
- Integrated new upstream features:
* Enhanced blob pool with conversion support
* New keccak256 preimage tracer
* Transaction pool validation improvements
* State sizing utilities
* Filter system enhancements
* Various performance and stability improvements
Build verified: geth v1.16.6-unstable compiled successfully
Co-authored-by: Ethereum Foundation <https://github.com/ethereum/go-ethereum>
62 lines
1.5 KiB
Go
62 lines
1.5 KiB
Go
// Code generated by github.com/fjl/gencodec. DO NOT EDIT.
|
|
|
|
package ethclient
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"github.com/luxfi/geth/common/hexutil"
|
|
"github.com/luxfi/geth/core/types"
|
|
)
|
|
|
|
var _ = (*simulateCallResultMarshaling)(nil)
|
|
|
|
// MarshalJSON marshals as JSON.
|
|
func (s SimulateCallResult) MarshalJSON() ([]byte, error) {
|
|
type SimulateCallResult struct {
|
|
ReturnValue hexutil.Bytes `json:"returnData"`
|
|
Logs []*types.Log `json:"logs"`
|
|
GasUsed hexutil.Uint64 `json:"gasUsed"`
|
|
Status hexutil.Uint64 `json:"status"`
|
|
Error *CallError `json:"error,omitempty"`
|
|
}
|
|
var enc SimulateCallResult
|
|
enc.ReturnValue = s.ReturnValue
|
|
enc.Logs = s.Logs
|
|
enc.GasUsed = hexutil.Uint64(s.GasUsed)
|
|
enc.Status = hexutil.Uint64(s.Status)
|
|
enc.Error = s.Error
|
|
return json.Marshal(&enc)
|
|
}
|
|
|
|
// UnmarshalJSON unmarshals from JSON.
|
|
func (s *SimulateCallResult) UnmarshalJSON(input []byte) error {
|
|
type SimulateCallResult struct {
|
|
ReturnValue *hexutil.Bytes `json:"returnData"`
|
|
Logs []*types.Log `json:"logs"`
|
|
GasUsed *hexutil.Uint64 `json:"gasUsed"`
|
|
Status *hexutil.Uint64 `json:"status"`
|
|
Error *CallError `json:"error,omitempty"`
|
|
}
|
|
var dec SimulateCallResult
|
|
if err := json.Unmarshal(input, &dec); err != nil {
|
|
return err
|
|
}
|
|
if dec.ReturnValue != nil {
|
|
s.ReturnValue = *dec.ReturnValue
|
|
}
|
|
if dec.Logs != nil {
|
|
s.Logs = dec.Logs
|
|
}
|
|
if dec.GasUsed != nil {
|
|
s.GasUsed = uint64(*dec.GasUsed)
|
|
}
|
|
if dec.Status != nil {
|
|
s.Status = uint64(*dec.Status)
|
|
}
|
|
if dec.Error != nil {
|
|
s.Error = dec.Error
|
|
}
|
|
return nil
|
|
}
|