Merge pull request #4139 from trufflesuite/develop

chore(release): publish v7.7.3

Author: davidmurdoch

.github/actions/docker-publish/action.yml

@@ -34,34 +34,34 @@ runs:
       shell: bash
 
     - name: Log in to Docker Hub
-      uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+      uses: docker/login-action@f75d088332b07a08afadf6ac53c74509b9453f12
       with:
         username: ${{ inputs.DOCKER_USERNAME }}
         password: ${{ inputs.DOCKER_ACCESS_TOKEN }}
 
     - name: Log in to the Container registry
-      uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+      uses: docker/login-action@f75d088332b07a08afadf6ac53c74509b9453f12
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ inputs.GITHUB_TOKEN }}
 
     - name: Extract metadata (tags, labels) for Docker
       id: meta
-      uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+      uses: docker/metadata-action@314ddf6d4a82333bf1bc7630399df41bf68eba09
       with:
         images: |
           trufflesuite/ganache
           ghcr.io/${{ github.repository}}
 
     - name: Set up QEMU
-      uses: docker/setup-qemu-action@0522dcd2bf084920c411162fde334a308be75015
+      uses: docker/setup-qemu-action@38836d31bd1e0f8f29b8c7ad0412da32020f15b3
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@91cb32d715c128e5f0ede915cd7e196ab7799b83
+      uses: docker/setup-buildx-action@39a1a82492fd1ad19af19d61b5f748e4cb6cd1af
 
     - name: Build and push Docker image
-      uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+      uses: docker/build-push-action@175d02bffea74695e96b351069ac938b338802f9
       with:
         context: .
         file: ./src/packages/ganache/Dockerfile

.github/workflows/pr.yml

@@ -11,11 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         node: [14.0.0, 14.x, 16.x, 18.x]
-        os: [windows-2019, ubuntu-18.04, ubuntu-20.04, macos-11]
-        exclude:
-          # Node v18 does not run on ubuntu-18.04: https://github.com/nodejs/node/issues/42351#issuecomment-1068424442
-          - os: ubuntu-18.04
-            node: 18.x
+        os: [windows-2019, ubuntu-20.04, ubuntu-22.04, macos-12]
 
     runs-on: ${{ matrix.os }}
 
@@ -47,7 +43,7 @@ jobs:
 
       - name: Check bundle size
         # this should match the os and version used in the release.yml
-        if: startsWith(matrix.os, 'ubuntu-20.04') && startsWith(matrix.node, '14.')
+        if: startsWith(matrix.os, 'ubuntu-22.04') && startsWith(matrix.node, '14.')
         # 1. build ganache
         # 2. pack it into a tarball
         # 3. measure the _unpacked_ tarball's size
@@ -69,7 +65,7 @@ jobs:
           INFURA_KEY: "badc0de0deadc0debadc0de0deadc0de"
       - name: Upload artifact
         # this should match the os and version used in the release.yml
-        if: startsWith(matrix.os, 'ubuntu-20.04') && startsWith(matrix.node, '14.')
+        if: startsWith(matrix.os, 'ubuntu-22.04') && startsWith(matrix.node, '14.')
         uses: actions/upload-artifact@v3
         with:
           name: Candidate

.github/workflows/push.yml

@@ -11,7 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         node: [14.0.0, 14.x, 16.x, 18.x]
-        os: [ubuntu-20.04]
+        os: [ubuntu-22.04]
 
     runs-on: ${{ matrix.os }}
 
@@ -35,11 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         node: [14.0.0, 14.x, 16.x, 18.x]
-        os: [windows-2019, ubuntu-18.04, ubuntu-20.04, macos-11]
-        exclude:
-          # Node v18 does not run on ubuntu-18.04: https://github.com/nodejs/node/issues/42351#issuecomment-1068424442
-          - os: ubuntu-18.04
-            node: 18.x
+        os: [windows-2019, ubuntu-20.04, ubuntu-22.04, macos-12]
 
     runs-on: ${{ matrix.os }}
 
@@ -66,7 +62,7 @@ jobs:
         # resources it downloads no longer exist, and windows-build-tools@5
         # fails to install Python (it will wait on the python installer forever)
         if: startsWith(matrix.os, 'windows-')
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 #v4.4.0
         with:
           python-version: "2.7"
 

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
   release:
     # this should match the os version used by the "check bundle size" step in
     # pr.yml
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       TAG: ${{ steps.set_tag_output.outputs.TAG }}
       VERSION: ${{ steps.set_version_output.outputs.VERSION }}
@@ -169,14 +169,18 @@ jobs:
 
   publish-docker:
     needs: release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       # because the docker publish action is an action we made, we have to
       # check out the repo
       - name: Checkout repository
         uses: actions/checkout@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          # by specifying the tag of this version as the ref to checkout, we're
+          # making sure the version we just released to npm is being released to
+          # Docker.
+          ref: v${{ needs.release.outputs.VERSION }}
       - name: Run Ganache's docker publish action
         # we are running our local action, so point directly to a folder
         # containing an `action.yml` file

CONTRIBUTING.md

@@ -18,11 +18,12 @@ If installation fails due to a `node-gyp` issue you may need to perform some add
 
 ### on Linux (Ubuntu-based)
 
+- Make sure `npm` commands are not run as `root`.
 - Determine if you have Python 2.7 installed
   - example: `which python2.7`
 - If you do not have Python 2.7 installed, you need to install it
   - example: `sudo apt update && sudo apt install python2.7`
-- Finally, run `npm config set python python2.7`
+- Run `npm config set python python2.7`
 
 ### on Windows
 

src/chains/ethereum/block/src/block.ts

@@ -93,7 +93,7 @@ export class Block {
       // get the maxFeePerGas and maxPriorityFeePerGas, use those to calculate
       // the effectiveGasPrice and add it to `extra` above, or we can just
       // leave it out of extra and update the effectiveGasPrice after like this
-      tx.updateEffectiveGasPrice(header.baseFeePerGas);
+      tx.updateEffectiveGasPrice(header.baseFeePerGas?.toBigInt());
       return txFn(tx);
     }) as IncludeTransactions extends true ? TypedTransactionJSON[] : Data[];
 

src/chains/ethereum/ethereum/src/api.ts

@@ -1885,16 +1885,12 @@ export default class EthereumApi implements Api {
 
     const transactionPromise = transactions.get(txHash);
     const receiptPromise = transactionReceipts.get(txHash);
-    const blockPromise = transactionPromise.then(t =>
-      t ? blocks.get(t.blockNumber.toBuffer()) : null
-    );
-    const [transaction, receipt, block] = await Promise.all([
+    const [transaction, receipt] = await Promise.all([
       transactionPromise,
-      receiptPromise,
-      blockPromise
+      receiptPromise
     ]);
     if (transaction) {
-      return receipt.toJSON(block, transaction, common);
+      return receipt.toJSON(transaction, common);
     }
 
     // if we are performing "strict" instamining, then check to see if the

src/chains/ethereum/ethereum/src/forking/trie.ts

@@ -89,14 +89,14 @@ export class ForkTrie extends GanacheTrie {
     endBlockNumber: Quantity
   ) {
     const db = this.metadataDB;
-    const stream = db.createReadStream({
+    const stream = db.createKeyStream({
       gte: lexico.encode([startBlockNumber.toBuffer()]),
       lt: lexico.encode([
         Quantity.from(endBlockNumber.toBigInt() + 1n).toBuffer()
       ])
     });
     const batch = db.batch();
-    for await (const [key] of stream) {
+    for await (const key of stream) {
       batch.del(key);
     }
     await batch.write();

src/chains/ethereum/ethereum/src/miner/miner.ts

@@ -71,7 +71,7 @@ const updateBloom = (blockBloom: Buffer, bloom: Buffer) => {
 const sortByPrice = (values: TypedTransaction[], a: number, b: number) =>
   values[a].effectiveGasPrice > values[b].effectiveGasPrice;
 
-const refresher = (item: TypedTransaction, context: Quantity) =>
+const refresher = (item: TypedTransaction, context: bigint) =>
   item.updateEffectiveGasPrice(context);
 
 export default class Miner extends Emittery<{
@@ -93,7 +93,7 @@ export default class Miner extends Emittery<{
   #isBusy: boolean = false;
   #paused: boolean = false;
   #resumer: Promise<void>;
-  #currentBlockBaseFeePerGas: Quantity;
+  #currentBlockBaseFeePerGas: bigint;
   #resolver: (value: void) => void;
 
   /**
@@ -127,10 +127,7 @@ export default class Miner extends Emittery<{
   }
 
   // create a Heap that sorts by gasPrice
-  readonly #priced = new Heap<TypedTransaction, Quantity>(
-    sortByPrice,
-    refresher
-  );
+  readonly #priced = new Heap<TypedTransaction, bigint>(sortByPrice, refresher);
   /*
    * @param executables - A live Map of pending transactions from the transaction
    * pool. The miner will update this Map by removing the best transactions
@@ -149,7 +146,7 @@ export default class Miner extends Emittery<{
     this.#executables = executables;
     this.#createBlock = (previousBlock: Block) => {
       const newBlock = createBlock(previousBlock);
-      this.#setCurrentBlockBaseFeePerGas(newBlock);
+      this.#currentBlockBaseFeePerGas = newBlock.header.baseFeePerGas;
       return newBlock;
     };
 
@@ -182,7 +179,7 @@ export default class Miner extends Emittery<{
       this.#updatePricedHeap();
       return;
     } else {
-      this.#setCurrentBlockBaseFeePerGas(block);
+      this.#currentBlockBaseFeePerGas = block.header.baseFeePerGas;
       this.#setPricedHeap();
       const result = await this.#mine(block, maxTransactions, onlyOneBlock);
       this.emit("idle");
@@ -584,15 +581,4 @@ export default class Miner extends Emittery<{
   public toggleStepEvent(enable: boolean) {
     this.#emitStepEvent = enable;
   }
-
-  /**
-   * Sets the #currentBlockBaseFeePerGas property if the current block
-   * has a baseFeePerGas property
-   */
-  #setCurrentBlockBaseFeePerGas = (block: RuntimeBlock) => {
-    const baseFeePerGas = block.header.baseFeePerGas;
-    // before london hard fork, there will be no baseFeePerGas on the block
-    this.#currentBlockBaseFeePerGas =
-      baseFeePerGas === undefined ? undefined : Quantity.from(baseFeePerGas);
-  };
 }

src/chains/ethereum/ethereum/src/transaction-pool.ts

@@ -14,6 +14,7 @@ import {
 import { EthereumInternalOptions } from "@ganache/ethereum-options";
 import { Executables } from "./miner/executables";
 import { TypedTransaction } from "@ganache/ethereum-transaction";
+import { Block } from "@ganache/ethereum-block";
 
 /**
  * Checks if the `replacer` is eligible to replace the `replacee` transaction
@@ -188,7 +189,10 @@ export default class TransactionPool extends Emittery<{ drain: undefined }> {
       !transaction.effectiveGasPrice &&
       this.#blockchain.common.isActivatedEIP(1559)
     ) {
-      const baseFeePerGas = this.#blockchain.blocks.latest.header.baseFeePerGas;
+      const baseFeePerGas = Block.calcNextBaseFee(
+        this.#blockchain.blocks.latest
+      );
+
       transaction.updateEffectiveGasPrice(baseFeePerGas);
     }