Skip to content
This repository has been archived by the owner on Feb 26, 2024. It is now read-only.

Commit

Permalink
Merge pull request #4236 from trufflesuite/develop
Browse files Browse the repository at this point in the history
chore(release): publish v7.7.5
  • Loading branch information
jeffsmale90 authored Feb 15, 2023
2 parents 533f002 + 9e011e9 commit 924d34d
Show file tree
Hide file tree
Showing 10 changed files with 588 additions and 562 deletions.
23 changes: 0 additions & 23 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,29 +55,6 @@ jobs:
if: startsWith(matrix.os, 'windows-')
uses: microsoft/setup-msbuild@v1.1

- name: install node tools
# we don't need to install the windows-build-tools package, as we
# already have almost everything we need. We only need to install
# python 2.7. Also windows-build-tools@4 fails to install because some
# 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@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 #v4.4.0
with:
python-version: "2.7"

- name: install node-gyp
if: startsWith(matrix.os, 'windows-')
run: npm install --global node-gyp@7.1.2

- name: Set node config to use python2.7
if: startsWith(matrix.os, 'windows-')
run: npm config set python python2.7

- name: Set node config to set msvs_version to 2019
if: startsWith(matrix.os, 'windows-')
run: npm config set msvs_version 2019 --global

- run: npm ci
- run: npm run tsc
- run: npm test
Expand Down
15 changes: 12 additions & 3 deletions src/chains/ethereum/ethereum/src/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3135,11 +3135,12 @@ export default class EthereumApi implements Api {
* console.log(transactionTrace);
* ```
*/
@assertArgLength(1, 2)
async debug_traceTransaction(
transactionHash: DATA,
options?: Ethereum.TraceTransactionOptions
options: Ethereum.TraceTransactionOptions = {}
): Promise<Ethereum.TraceTransactionResult<"private">> {
return this.#blockchain.traceTransaction(transactionHash, options || {});
return this.#blockchain.traceTransaction(transactionHash, options);
}

// TODO: example doesn't return correct value
Expand Down Expand Up @@ -3186,14 +3187,22 @@ export default class EthereumApi implements Api {
* console.log(storage);
* ```
*/
@assertArgLength(5)
async debug_storageRangeAt(
blockHash: DATA,
transactionIndex: number,
contractAddress: DATA,
startKey: DATA,
maxResult: number
): Promise<Ethereum.StorageRangeAtResult<"private">> {
return this.#blockchain.storageRangeAt(
const blockchain = this.#blockchain;
if (blockchain.fallback) {
throw new Error(
"debug_storageRangeAt is not supported on a forked network. See https://github.com/trufflesuite/ganache/issues/3488 for details."
);
}

return blockchain.storageRangeAt(
blockHash,
Quantity.toNumber(transactionIndex),
contractAddress,
Expand Down
Loading

0 comments on commit 924d34d

Please sign in to comment.