-
Notifications
You must be signed in to change notification settings - Fork 773
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
41 changed files
with
2,049 additions
and
494 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| [submodule "ethereum-tests"] | ||
| path = packages/ethereum-tests | ||
| url = https://github.com/ethereum/tests.git | ||
| url = https://github.com/qbzzt/tests.git | ||
| branch = develop |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "name": "EIP-2718", | ||
| "comment": "Typed Transaction Envelope", | ||
| "url": "https://eips.ethereum.org/EIPS/eip-2718", | ||
| "status": "Draft", | ||
| "minimumHardfork": "chainstart", | ||
| "gasConfig": {}, | ||
| "gasPrices": {}, | ||
| "vm": {}, | ||
| "pow": {} | ||
| } | ||
|
|
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,22 @@ | ||
| { | ||
| "name": "EIP-2929", | ||
| "comment": "Optional access lists", | ||
| "url": "https://eips.ethereum.org/EIPS/eip-2930", | ||
| "status": "Draft", | ||
| "minimumHardfork": "istanbul", | ||
| "requiredEIPs": [2718, 2929], | ||
| "gasConfig": {}, | ||
| "gasPrices": { | ||
| "accessListStorageKeyCost": { | ||
| "v": 1900, | ||
| "d": "Gas cost per storage key in an Access List transaction" | ||
| }, | ||
| "accessListAddressCost": { | ||
| "v": 2400, | ||
| "d": "Gas cost per storage key in an Access List transaction" | ||
| } | ||
| }, | ||
| "vm": {}, | ||
| "pow": {} | ||
| } | ||
|
|
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
Submodule ethereum-tests
updated
from 150812 to 0966f5
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,195 @@ | ||
| import Common from '@ethereumjs/common' | ||
| import { | ||
| Address, | ||
| BN, | ||
| toBuffer, | ||
| MAX_INTEGER, | ||
| unpadBuffer, | ||
| ecsign, | ||
| publicToAddress, | ||
| } from 'ethereumjs-util' | ||
| import { BaseTransactionData, BaseTxOptions, DEFAULT_COMMON, JsonTx } from './types' | ||
|
|
||
| export abstract class BaseTransaction<TransactionObject> { | ||
| public readonly nonce: BN | ||
| public readonly gasLimit: BN | ||
| public readonly gasPrice: BN | ||
| public readonly to?: Address | ||
| public readonly value: BN | ||
| public readonly data: Buffer | ||
| public readonly common: Common | ||
|
|
||
| constructor(txData: BaseTransactionData, txOptions: BaseTxOptions = {}) { | ||
| const { nonce, gasLimit, gasPrice, to, value, data } = txData | ||
|
|
||
| this.nonce = new BN(toBuffer(nonce)) | ||
| this.gasPrice = new BN(toBuffer(gasPrice)) | ||
| this.gasLimit = new BN(toBuffer(gasLimit)) | ||
| this.to = to ? new Address(toBuffer(to)) : undefined | ||
| this.value = new BN(toBuffer(value)) | ||
| this.data = toBuffer(data) | ||
|
|
||
| const validateCannotExceedMaxInteger = { | ||
| nonce: this.nonce, | ||
| gasPrice: this.gasPrice, | ||
| gasLimit: this.gasLimit, | ||
| value: this.value, | ||
| } | ||
|
|
||
| this.validateExceedsMaxInteger(validateCannotExceedMaxInteger) | ||
|
|
||
| this.common = | ||
| (txOptions.common && | ||
| Object.assign(Object.create(Object.getPrototypeOf(txOptions.common)), txOptions.common)) ?? | ||
| DEFAULT_COMMON | ||
| } | ||
|
|
||
| protected validateExceedsMaxInteger(validateCannotExceedMaxInteger: { [key: string]: BN }) { | ||
| for (const [key, value] of Object.entries(validateCannotExceedMaxInteger)) { | ||
| if (value && value.gt(MAX_INTEGER)) { | ||
| throw new Error(`${key} cannot exceed MAX_INTEGER, given ${value}`) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * If the tx's `to` is to the creation address | ||
| */ | ||
| toCreationAddress(): boolean { | ||
| return this.to === undefined || this.to.buf.length === 0 | ||
| } | ||
|
|
||
| /** | ||
| * Computes a sha3-256 hash of the serialized unsigned tx, which is used to sign the transaction. | ||
| */ | ||
| rawTxHash(): Buffer { | ||
| return this.getMessageToSign() | ||
| } | ||
|
|
||
| abstract getMessageToSign(): Buffer | ||
|
|
||
| /** | ||
| * Returns chain ID | ||
| */ | ||
| getChainId(): number { | ||
| return this.common.chainId() | ||
| } | ||
|
|
||
| /** | ||
| * The amount of gas paid for the data in this tx | ||
| */ | ||
| getDataFee(): BN { | ||
| const txDataZero = this.common.param('gasPrices', 'txDataZero') | ||
| const txDataNonZero = this.common.param('gasPrices', 'txDataNonZero') | ||
|
|
||
| let cost = 0 | ||
| for (let i = 0; i < this.data.length; i++) { | ||
| this.data[i] === 0 ? (cost += txDataZero) : (cost += txDataNonZero) | ||
| } | ||
| return new BN(cost) | ||
| } | ||
|
|
||
| /** | ||
| * The minimum amount of gas the tx must have (DataFee + TxFee + Creation Fee) | ||
| */ | ||
| getBaseFee(): BN { | ||
| const fee = this.getDataFee().addn(this.common.param('gasPrices', 'tx')) | ||
| if (this.common.gteHardfork('homestead') && this.toCreationAddress()) { | ||
| fee.iaddn(this.common.param('gasPrices', 'txCreation')) | ||
| } | ||
| return fee | ||
| } | ||
|
|
||
| /** | ||
| * The up front amount that an account must have for this transaction to be valid | ||
| */ | ||
| getUpfrontCost(): BN { | ||
| return this.gasLimit.mul(this.gasPrice).add(this.value) | ||
| } | ||
|
|
||
| /** | ||
| * Checks if the transaction has the minimum amount of gas required | ||
| * (DataFee + TxFee + Creation Fee). | ||
| */ | ||
| /** | ||
| * Checks if the transaction has the minimum amount of gas required | ||
| * (DataFee + TxFee + Creation Fee). | ||
| */ | ||
| validate(): boolean | ||
| /* eslint-disable-next-line no-dupe-class-members */ | ||
| validate(stringError: false): boolean | ||
| /* eslint-disable-next-line no-dupe-class-members */ | ||
| validate(stringError: true): string[] | ||
| /* eslint-disable-next-line no-dupe-class-members */ | ||
| validate(stringError: boolean = false): boolean | string[] { | ||
| const errors = [] | ||
|
|
||
| if (this.getBaseFee().gt(this.gasLimit)) { | ||
| errors.push(`gasLimit is too low. given ${this.gasLimit}, need at least ${this.getBaseFee()}`) | ||
| } | ||
|
|
||
| if (this.isSigned() && !this.verifySignature()) { | ||
| errors.push('Invalid Signature') | ||
| } | ||
|
|
||
| return stringError ? errors : errors.length === 0 | ||
| } | ||
|
|
||
| /** | ||
| * Returns the encoding of the transaction. | ||
| */ | ||
| abstract serialize(): Buffer | ||
|
|
||
| /** | ||
| * Returns an object with the JSON representation of the transaction | ||
| */ | ||
| abstract toJSON(): JsonTx | ||
|
|
||
| abstract isSigned(): boolean | ||
|
|
||
| /** | ||
| * Determines if the signature is valid | ||
| */ | ||
| verifySignature(): boolean { | ||
| try { | ||
| // Main signature verification is done in `getSenderPublicKey()` | ||
| const publicKey = this.getSenderPublicKey() | ||
| return unpadBuffer(publicKey).length !== 0 | ||
| } catch (e) { | ||
| return false | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns the raw `Buffer[]` (LegacyTransaction) or `Buffer` (typed transaction). | ||
| * This is the data which is found in the transactions of the block body. | ||
| */ | ||
| abstract raw(): Buffer[] | Buffer | ||
| abstract hash(): Buffer | ||
|
|
||
| abstract getMessageToVerifySignature(): Buffer | ||
| /** | ||
| * Returns the sender's address | ||
| */ | ||
| getSenderAddress(): Address { | ||
| return new Address(publicToAddress(this.getSenderPublicKey())) | ||
| } | ||
| abstract getSenderPublicKey(): Buffer | ||
|
|
||
| sign(privateKey: Buffer): TransactionObject { | ||
| if (privateKey.length !== 32) { | ||
| throw new Error('Private key must be 32 bytes in length.') | ||
| } | ||
|
|
||
| const msgHash = this.getMessageToSign() | ||
|
|
||
| // Only `v` is reassigned. | ||
| /* eslint-disable-next-line prefer-const */ | ||
| let { v, r, s } = ecsign(msgHash, privateKey) | ||
|
|
||
| return this.processSignature(v, r, s) | ||
| } | ||
|
|
||
| // Accept the v,r,s values from the `sign` method, and convert this into a TransactionObject | ||
| protected abstract processSignature(v: number, r: Buffer, s: Buffer): TransactionObject | ||
| } |
Oops, something went wrong.