forked from ethereum-optimism/op-geth
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
13 changed files
with
382 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
// TODO: needs copyright header? | ||
|
||
package types | ||
|
||
import ( | ||
"math/big" | ||
|
||
"github.com/ethereum/go-ethereum/common" | ||
) | ||
|
||
type CeloDynamicFeeTx struct { | ||
ChainID *big.Int | ||
Nonce uint64 | ||
GasTipCap *big.Int | ||
GasFeeCap *big.Int | ||
Gas uint64 | ||
To *common.Address `rlp:"nil"` // nil means contract creation | ||
Value *big.Int | ||
Data []byte | ||
AccessList AccessList | ||
|
||
FeeCurrency *common.Address `rlp:"nil"` // nil means native currency | ||
|
||
// Signature values | ||
V *big.Int `json:"v" gencodec:"required"` | ||
R *big.Int `json:"r" gencodec:"required"` | ||
S *big.Int `json:"s" gencodec:"required"` | ||
} | ||
|
||
// copy creates a deep copy of the transaction data and initializes all fields. | ||
func (tx *CeloDynamicFeeTx) copy() TxData { | ||
cpy := &CeloDynamicFeeTx{ | ||
Nonce: tx.Nonce, | ||
To: copyAddressPtr(tx.To), | ||
Data: common.CopyBytes(tx.Data), | ||
Gas: tx.Gas, | ||
FeeCurrency: copyAddressPtr(tx.FeeCurrency), | ||
// These are copied below. | ||
AccessList: make(AccessList, len(tx.AccessList)), | ||
Value: new(big.Int), | ||
ChainID: new(big.Int), | ||
GasTipCap: new(big.Int), | ||
GasFeeCap: new(big.Int), | ||
V: new(big.Int), | ||
R: new(big.Int), | ||
S: new(big.Int), | ||
} | ||
copy(cpy.AccessList, tx.AccessList) | ||
if tx.Value != nil { | ||
cpy.Value.Set(tx.Value) | ||
} | ||
if tx.ChainID != nil { | ||
cpy.ChainID.Set(tx.ChainID) | ||
} | ||
if tx.GasTipCap != nil { | ||
cpy.GasTipCap.Set(tx.GasTipCap) | ||
} | ||
if tx.GasFeeCap != nil { | ||
cpy.GasFeeCap.Set(tx.GasFeeCap) | ||
} | ||
if tx.V != nil { | ||
cpy.V.Set(tx.V) | ||
} | ||
if tx.R != nil { | ||
cpy.R.Set(tx.R) | ||
} | ||
if tx.S != nil { | ||
cpy.S.Set(tx.S) | ||
} | ||
return cpy | ||
} | ||
|
||
// accessors for innerTx. | ||
func (tx *CeloDynamicFeeTx) txType() byte { return CeloDynamicFeeTxType } | ||
func (tx *CeloDynamicFeeTx) chainID() *big.Int { return tx.ChainID } | ||
func (tx *CeloDynamicFeeTx) accessList() AccessList { return tx.AccessList } | ||
func (tx *CeloDynamicFeeTx) data() []byte { return tx.Data } | ||
func (tx *CeloDynamicFeeTx) gas() uint64 { return tx.Gas } | ||
func (tx *CeloDynamicFeeTx) gasFeeCap() *big.Int { return tx.GasFeeCap } | ||
func (tx *CeloDynamicFeeTx) gasTipCap() *big.Int { return tx.GasTipCap } | ||
func (tx *CeloDynamicFeeTx) gasPrice() *big.Int { return tx.GasFeeCap } | ||
func (tx *CeloDynamicFeeTx) value() *big.Int { return tx.Value } | ||
func (tx *CeloDynamicFeeTx) nonce() uint64 { return tx.Nonce } | ||
func (tx *CeloDynamicFeeTx) to() *common.Address { return tx.To } | ||
func (tx *CeloDynamicFeeTx) blobGas() uint64 { return 0 } | ||
func (tx *CeloDynamicFeeTx) blobGasFeeCap() *big.Int { return nil } | ||
func (tx *CeloDynamicFeeTx) blobHashes() []common.Hash { return nil } | ||
func (tx *CeloDynamicFeeTx) isSystemTx() bool { return false } | ||
|
||
func (tx *CeloDynamicFeeTx) effectiveGasPrice(dst *big.Int, baseFee *big.Int) *big.Int { | ||
if baseFee == nil { | ||
return dst.Set(tx.GasFeeCap) | ||
} | ||
tip := dst.Sub(tx.GasFeeCap, baseFee) | ||
if tip.Cmp(tx.GasTipCap) > 0 { | ||
tip.Set(tx.GasTipCap) | ||
} | ||
return tip.Add(tip, baseFee) | ||
} | ||
|
||
func (tx *CeloDynamicFeeTx) rawSignatureValues() (v, r, s *big.Int) { | ||
return tx.V, tx.R, tx.S | ||
} | ||
|
||
func (tx *CeloDynamicFeeTx) setSignatureValues(chainID, v, r, s *big.Int) { | ||
tx.ChainID, tx.V, tx.R, tx.S = chainID, v, r, s | ||
} | ||
|
||
func (tx *CeloDynamicFeeTx) feeCurrency() *common.Address { return tx.FeeCurrency } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
// Copyright 2016 The go-ethereum Authors | ||
// This file is part of the go-ethereum library. | ||
// | ||
// The go-ethereum library is free software: you can redistribute it and/or modify | ||
// it under the terms of the GNU Lesser General Public License as published by | ||
// the Free Software Foundation, either version 3 of the License, or | ||
// (at your option) any later version. | ||
// | ||
// The go-ethereum library is distributed in the hope that it will be useful, | ||
// but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
// GNU Lesser General Public License for more details. | ||
// | ||
// You should have received a copy of the GNU Lesser General Public License | ||
// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>. | ||
|
||
// TODO(pl) | ||
|
||
package types | ||
|
||
import ( | ||
"math/big" | ||
|
||
"github.com/ethereum/go-ethereum/common" | ||
) | ||
|
||
type cel2Signer struct{ cancunSigner } | ||
|
||
// NewCel2Signer returns a signer that accepts | ||
// - CIP-64 celo dynamic fee transaction (v2) | ||
// - EIP-4844 blob transactions | ||
// - EIP-1559 dynamic fee transactions | ||
// - EIP-2930 access list transactions, | ||
// - EIP-155 replay protected transactions, and | ||
// - legacy Homestead transactions. | ||
func NewCel2Signer(chainId *big.Int) Signer { | ||
return cel2Signer{cancunSigner{londonSigner{eip2930Signer{NewEIP155Signer(chainId)}}}} | ||
} | ||
|
||
func (s cel2Signer) Sender(tx *Transaction) (common.Address, error) { | ||
if tx.Type() != CeloDynamicFeeTxType { | ||
return s.cancunSigner.Sender(tx) | ||
} | ||
V, R, S := tx.RawSignatureValues() | ||
// DynamicFee txs are defined to use 0 and 1 as their recovery | ||
// id, add 27 to become equivalent to unprotected Homestead signatures. | ||
V = new(big.Int).Add(V, big.NewInt(27)) | ||
if tx.ChainId().Cmp(s.chainId) != 0 { | ||
return common.Address{}, ErrInvalidChainId | ||
} | ||
return recoverPlain(s.Hash(tx), R, S, V, true) | ||
} | ||
|
||
func (s cel2Signer) Equal(s2 Signer) bool { | ||
x, ok := s2.(cel2Signer) | ||
return ok && x.chainId.Cmp(s.chainId) == 0 | ||
} | ||
|
||
func (s cel2Signer) SignatureValues(tx *Transaction, sig []byte) (R, S, V *big.Int, err error) { | ||
txdata, ok := tx.inner.(*CeloDynamicFeeTx) | ||
if !ok { | ||
return s.cancunSigner.SignatureValues(tx, sig) | ||
} | ||
// Check that chain ID of tx matches the signer. We also accept ID zero here, | ||
// because it indicates that the chain ID was not specified in the tx. | ||
if txdata.ChainID.Sign() != 0 && txdata.ChainID.Cmp(s.chainId) != 0 { | ||
return nil, nil, nil, ErrInvalidChainId | ||
} | ||
R, S, _ = decodeSignature(sig) | ||
V = big.NewInt(int64(sig[64])) | ||
return R, S, V, nil | ||
} | ||
|
||
// Hash returns the hash to be signed by the sender. | ||
// It does not uniquely identify the transaction. | ||
func (s cel2Signer) Hash(tx *Transaction) common.Hash { | ||
if tx.Type() == CeloDynamicFeeTxType { | ||
return prefixedRlpHash( | ||
tx.Type(), | ||
[]interface{}{ | ||
s.chainId, | ||
tx.Nonce(), | ||
tx.GasTipCap(), | ||
tx.GasFeeCap(), | ||
tx.Gas(), | ||
tx.To(), | ||
tx.Value(), | ||
tx.Data(), | ||
tx.AccessList(), | ||
tx.FeeCurrency(), | ||
}) | ||
} | ||
return s.cancunSigner.Hash(tx) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.