TinyChain --> baseFeePerGas position fixed.

Author: JasminDreasond

src/TinyChain/Block.mjs

@@ -21,7 +21,6 @@ import TinySecp256k1 from './Secp256k1/index.mjs';
  * @typedef {Object} NewTransactionData
  * @property {bigint | number | string} gasLimit - Max gas allowed for transactions.
  * @property {bigint | number | string} gasUsed - Actual gas used.
- * @property {bigint | number | string} baseFeePerGas - Base fee per gas unit.
  * @property {bigint | number | string} maxPriorityFeePerGas - Priority fee paid to the miner.
  * @property {bigint | number | string} maxFeePerGas - Max total fee per gas unit allowed.
  * @property {string} address - Hex address that created the tx.
@@ -34,7 +33,6 @@ import TinySecp256k1 from './Secp256k1/index.mjs';
  * @typedef {Object} TransactionData
  * @property {bigint} gasLimit - Max gas allowed for transactions.
  * @property {bigint} gasUsed - Actual gas used.
- * @property {bigint} baseFeePerGas - Base fee per gas unit.
  * @property {bigint} maxPriorityFeePerGas - Priority fee paid to the miner.
  * @property {bigint} maxFeePerGas - Max total fee per gas unit allowed.
  * @property {string} address - Hex address that created the block.
@@ -57,6 +55,7 @@ import TinySecp256k1 from './Secp256k1/index.mjs';
  * @property {bigint | number | string} [reward=0n] - Block reward.
  * @property {bigint | number | string} [nonce=0n] - Starting nonce.
  * @property {bigint | number | string} [chainId] - The chain ID.
+ * @property {bigint | number | string} [baseFeePerGas] - Base fee per gas unit.
  * @property {TxIndexMap} [txs] - A map where each key is a transaction index.
  * @property {SignIndexMap} [sigs] - A map where each key is a transaction signature.
  * @property {number} [time=Date.now()] - Unix timestamp of the block.
@@ -76,6 +75,7 @@ import TinySecp256k1 from './Secp256k1/index.mjs';
  *   reward: bigint,
  *   miner: string|null,
  *   chainId: bigint,
+ *   baseFeePerGas: bigint,
  *   txs: TxIndexMap,
  *   sigs: SignIndexMap,
  * }} GetTransactionData
@@ -184,13 +184,7 @@ class TinyChainBlock {
         throw new Error(`"payload" in data entry at index ${index} must be a string.`);
 
       /** @type {Array<string>} */
-      const bigintFields = [
-        'gasLimit',
-        'gasUsed',
-        'baseFeePerGas',
-        'maxFeePerGas',
-        'maxPriorityFeePerGas',
-      ];
+      const bigintFields = ['gasLimit', 'gasUsed', 'maxFeePerGas', 'maxPriorityFeePerGas'];
 
       for (const field of bigintFields) {
         // @ts-ignore
@@ -203,8 +197,6 @@ class TinyChainBlock {
 
       const gasLimit = typeof t.gasLimit === 'bigint' ? t.gasLimit : BigInt(t.gasLimit);
       const gasUsed = typeof t.gasUsed === 'bigint' ? t.gasUsed : BigInt(t.gasUsed);
-      const baseFeePerGas =
-        typeof t.baseFeePerGas === 'bigint' ? t.baseFeePerGas : BigInt(t.baseFeePerGas);
       const maxFeePerGas =
         typeof t.maxFeePerGas === 'bigint' ? t.maxFeePerGas : BigInt(t.maxFeePerGas);
       const maxPriorityFeePerGas =
@@ -219,7 +211,6 @@ class TinyChainBlock {
         payload: this.#payloadString ? t.payload : undefined,
         gasLimit,
         gasUsed,
-        baseFeePerGas,
         maxFeePerGas,
         maxPriorityFeePerGas,
       };
@@ -286,6 +277,7 @@ class TinyChainBlock {
     index = 0n,
     prevHash = '',
     diff = 1n,
+    baseFeePerGas = 0n,
     reward = 0n,
     nonce = 0n,
     hash = null,
@@ -307,6 +299,12 @@ class TinyChainBlock {
     if (typeof index !== 'bigint' && !(typeof index === 'string' && /^[0-9]+$/.test(index)))
       throw new Error('index must be a bigint or a numeric string.');
     this.index = typeof index === 'bigint' ? index : BigInt(index);
+    if (
+      typeof baseFeePerGas !== 'bigint' &&
+      !(typeof baseFeePerGas === 'string' && /^[0-9]+$/.test(baseFeePerGas))
+    )
+      throw new Error('baseFeePerGas must be a bigint or a numeric string.');
+    this.baseFeePerGas = typeof baseFeePerGas === 'bigint' ? baseFeePerGas : BigInt(baseFeePerGas);
     if (typeof prevHash !== 'string') throw new Error('prevHash must be a hash string.');
     this.prevHash = prevHash;
     if (typeof diff !== 'bigint' && !(typeof diff === 'string' && /^[0-9]+$/.test(diff)))
@@ -393,6 +391,7 @@ class TinyChainBlock {
       index: this.getIndex(),
       time: this.getTime(),
       data: this.getData(),
+      baseFeePerGas: this.getBaseFeePerGas(),
       prevHash: this.getPrevHash(),
       diff: this.getDiff(),
       nonce: this.getNonce(),
@@ -424,6 +423,7 @@ class TinyChainBlock {
     value += this.#parser.serializeDeep(this.data);
     value += this.#parser.serialize(this.sigs);
     value += this.getIndex().toString();
+    value += this.getBaseFeePerGas().toString();
     value += this.getNonce().toString();
     value += this.getChainId().toString();
     return createHash('sha256').update(Buffer.from(value, 'utf-8')).digest('hex');
@@ -664,6 +664,15 @@ class TinyChainBlock {
     if (typeof this.hash !== 'string') throw new Error('Hash must be a string');
     return this.hash;
   }
+
+  /**
+   * Returns the base fee per gas (in gwei).
+   * @returns {bigint}
+   */
+  getBaseFeePerGas() {
+    if (typeof this.baseFeePerGas !== 'bigint') throw new Error('baseFeePerGas must be a bigint');
+    return this.baseFeePerGas;
+  }
 }
 
 export default TinyChainBlock;

src/TinyChain/Instance.mjs

@@ -585,7 +585,6 @@ class TinyChainInstance {
       payload: 'Genesis Block',
       gasLimit: 0n,
       gasUsed: 0n,
-      baseFeePerGas: 0n,
       maxFeePerGas: 0n,
       maxPriorityFeePerGas: 0n,
     };
@@ -595,6 +594,7 @@ class TinyChainInstance {
     const block = this.#createBlockInstance({
       index: 0n,
       prevHash: '0',
+      baseFeePerGas: 0n,
       firstValidation: false,
       data: [data],
       sigs: [sig.toString('hex')],
@@ -636,6 +636,7 @@ class TinyChainInstance {
    */
   #createBlockInstance(options) {
     return new TinyChainBlock({
+      baseFeePerGas: this.isCurrencyMode() ? this.getBaseFeePerGas() : 0n,
       payloadString: this.#payloadString,
       parser: this.#parser,
       signer: this.#signer,
@@ -889,7 +890,6 @@ class TinyChainInstance {
       payload,
       gasLimit: isCurrencyMode ? gasLimit : 0n,
       gasUsed,
-      baseFeePerGas: isCurrencyMode ? this.getBaseFeePerGas() : 0n,
       maxFeePerGas: isCurrencyMode ? maxFeePerGas : 0n,
       maxPriorityFeePerGas: isCurrencyMode ? maxPriorityFeePerGas : 0n,
     };
@@ -939,7 +939,6 @@ class TinyChainInstance {
       if (!Buffer.isBuffer(sig) && typeof sig !== 'string')
         throw new Error(`Signature at index ${index} must be a Buffer or hex string`);
 
-      data.baseFeePerGas = isCurrencyMode ? this.getBaseFeePerGas() : 0n;
       dataList.push(data);
       sigs.push(typeof sig === 'string' ? sig : sig.toString('hex'));
     }
@@ -1130,12 +1129,15 @@ class TinyChainInstance {
   updateBalance(block, balances = this.#getBalances(), emitEvents = true) {
     const reward = block.reward;
     const minerAddress = block.miner;
+    const baseFeePerGas = block.baseFeePerGas;
     const isMinerAddress = typeof minerAddress === 'string' && minerAddress.length > 0;
 
     if (isMinerAddress && !this.#signer.validateAddress(minerAddress, 'guess').valid)
       throw new Error('Invalid miner address!');
     if (typeof reward !== 'bigint')
       throw new Error(`Invalid reward: expected a BigInt, got "${typeof reward}"`);
+    if (typeof baseFeePerGas !== 'bigint')
+      throw new Error(`Invalid baseFeePerGas: expected a BigInt, got "${typeof baseFeePerGas}"`);
     if (typeof minerAddress !== 'string' && minerAddress !== null)
       throw new Error(
         `Invalid minerAddress: expected a string or null, got "${typeof minerAddress}"`,
@@ -1166,7 +1168,6 @@ class TinyChainInstance {
               `Gas limit exceeded: used ${data.gasUsed} > limit ${data.gasLimit} for sender "${execAddress}"`,
             );
 
-          const baseFeePerGas = data.baseFeePerGas;
           const maxPriorityFeePerGas = data.maxPriorityFeePerGas;
           const maxFeePerGas = data.maxFeePerGas; // user sets this