From 04ff27c06e6fa23934bb29840191a7371da08df9 Mon Sep 17 00:00:00 2001 From: Jack Winfield Date: Mon, 8 Mar 2021 14:51:45 -0600 Subject: [PATCH] Added comments for chainId --- .../contracts/OVM/accounts/OVM_ECDSAContractAccount.spec.ts | 6 +++++- .../OVM/precompiles/OVM_SequencerEntrypoint.spec.ts | 2 ++ test/helpers/codec/encoding.ts | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/test/contracts/OVM/accounts/OVM_ECDSAContractAccount.spec.ts b/test/contracts/OVM/accounts/OVM_ECDSAContractAccount.spec.ts index ae25d11ca..8923dd7f3 100644 --- a/test/contracts/OVM/accounts/OVM_ECDSAContractAccount.spec.ts +++ b/test/contracts/OVM/accounts/OVM_ECDSAContractAccount.spec.ts @@ -10,6 +10,8 @@ import { NON_ZERO_ADDRESS } from '../../../helpers/constants' import { serializeNativeTransaction, signNativeTransaction, + // `DEFAULT_EIP155_TX` comes with `chainId: 420` encoded as a key-value pair, + // along with other transaction data DEFAULT_EIP155_TX, serializeEthSignTransaction, signEthSignMessage, @@ -216,9 +218,11 @@ describe('OVM_ECDSAContractAccount', () => { }) it(`should revert on incorrect chainId`, async () => { + // `DEFAULT_EIP155_TX` comes with `chainId: 420` encoded as a key-value + // pair, along with other transaction data. const alteredChainIdTx = { ...DEFAULT_EIP155_TX, - chainId: 421, + chainId: 421, // Overwrites the default `chainId: 420`. } const message = serializeNativeTransaction(alteredChainIdTx) const sig = await signNativeTransaction(wallet, alteredChainIdTx) diff --git a/test/contracts/OVM/precompiles/OVM_SequencerEntrypoint.spec.ts b/test/contracts/OVM/precompiles/OVM_SequencerEntrypoint.spec.ts index bb7c3d72a..de3e9e777 100644 --- a/test/contracts/OVM/precompiles/OVM_SequencerEntrypoint.spec.ts +++ b/test/contracts/OVM/precompiles/OVM_SequencerEntrypoint.spec.ts @@ -11,6 +11,8 @@ import { encodeSequencerCalldata, signNativeTransaction, signEthSignMessage, + // `DEFAULT_EIP155_TX` comes with `chainId: 420` encoded as a key-value pair, + // along with other transaction data DEFAULT_EIP155_TX, serializeNativeTransaction, serializeEthSignTransaction, diff --git a/test/helpers/codec/encoding.ts b/test/helpers/codec/encoding.ts index 600207f4a..3c1a55404 100644 --- a/test/helpers/codec/encoding.ts +++ b/test/helpers/codec/encoding.ts @@ -22,13 +22,14 @@ export interface SignatureParameters { s: string } +// Used in OVM_ECDSAContractAccount.spec.ts and OVM_SequencerEntrypoint.spec.ts export const DEFAULT_EIP155_TX: EIP155Transaction = { to: `0x${'12'.repeat(20)}`, nonce: 100, gasLimit: 1000000, gasPrice: 100000000, data: `0x${'99'.repeat(10)}`, - chainId: 420, + chainId: 420, // Encoding chainId. Test in OVM_ECDSAContractAccount.spec.ts } export const getRawSignedComponents = (signed: string): any[] => {