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

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
adjisb authored Feb 24, 2023
2 parents 17da968 + 2becf31 commit fe142a9
Show file tree
Hide file tree
Showing 54 changed files with 1,002 additions and 904 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,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-22.04') && startsWith(matrix.node, '14.')
if: startsWith(matrix.os, 'ubuntu-22.04') && startsWith(matrix.node, '14.') && matrix.node != '14.0.0'
# 1. build ganache
# 2. pack it into a tarball
# 3. measure the _unpacked_ tarball's size
Expand All @@ -65,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-22.04') && startsWith(matrix.node, '14.')
if: startsWith(matrix.os, 'ubuntu-22.04') && startsWith(matrix.node, '14.') && matrix.node != '14.0.0'
uses: actions/upload-artifact@v3
with:
name: Candidate
Expand Down
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/[email protected]

- 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 [email protected]

- 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
2 changes: 1 addition & 1 deletion docs/assets/js/ganache/ganache.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/assets/js/ganache/ganache.min.js.map

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">debug_storageRangeAt</span>(<span class="hljs-params">blockHash: <span class="hljs-built_in">string</span>, transactionIndex: <span class="hljs-built_in">number</span>, contractAddress: <span class="hljs-built_in">string</span>, startKey: <span class="hljs-built_in">string</span>, maxResult: <span class="hljs-built_in">number</span></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">StorageRangeAtResult</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3189" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3191" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -464,10 +464,10 @@ <h3 class="signature">
<div>
<a name="debug_traceTransaction"></a>
<h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">debug_traceTransaction</span>(<span class="hljs-params">transactionHash: <span class="hljs-built_in">string</span>, options?: TraceTransactionOptions</span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">TraceTransactionResult</span>&gt;</span>
<span class="hljs-function"> <span class="hljs-title">debug_traceTransaction</span>(<span class="hljs-params">transactionHash: <span class="hljs-built_in">string</span>, options: TraceTransactionOptions</span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">TraceTransactionResult</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3138" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3139" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -496,7 +496,7 @@ <h3 class="signature">
<ul>
<li><code class="language-typescript"><span class="hljs-function"><span class="hljs-params">transactionHash: <span class="hljs-built_in">string</span></span></span>
</code>
</li><li><code class="language-typescript"><span class="hljs-function"><span class="hljs-params">options?: TraceTransactionOptions</span></span>
</li><li><code class="language-typescript"><span class="hljs-function"><span class="hljs-params">options: TraceTransactionOptions</span></span>
</code>
</li>
</ul>
Expand Down Expand Up @@ -5119,7 +5119,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">personal_importRawKey</span>(<span class="hljs-params">rawKey: <span class="hljs-built_in">string</span>, passphrase: <span class="hljs-built_in">string</span></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">Address</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3266" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3275" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5182,7 +5182,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">personal_listAccounts</span>(<span class="hljs-params"></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">string</span>[]&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3218" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3227" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5229,7 +5229,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">personal_lockAccount</span>(<span class="hljs-params">address: <span class="hljs-built_in">string</span></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">boolean</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3296" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3305" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5288,7 +5288,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">personal_newAccount</span>(<span class="hljs-params">passphrase: <span class="hljs-built_in">string</span></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">Address</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3235" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3244" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5348,7 +5348,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">personal_sendTransaction</span>(<span class="hljs-params">transaction: Transaction, passphrase: <span class="hljs-built_in">string</span></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">DATA</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3365" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3374" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5427,7 +5427,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">personal_signTransaction</span>(<span class="hljs-params">transaction: Transaction, passphrase: <span class="hljs-built_in">string</span></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">DATA</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3424" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3433" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5505,7 +5505,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">personal_unlockAccount</span>(<span class="hljs-params">address: <span class="hljs-built_in">string</span>, passphrase: <span class="hljs-built_in">string</span>, duration: <span class="hljs-built_in">number</span></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">boolean</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3324" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3333" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5575,7 +5575,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">rpc_modules</span>(<span class="hljs-params"></span>): <span class="hljs-title">Promise</span>&lt;</span>{ eth: <span class="hljs-string">&quot;1.0&quot;</span>, <span class="hljs-attr">evm</span>: <span class="hljs-string">&quot;1.0&quot;</span>, <span class="hljs-attr">net</span>: <span class="hljs-string">&quot;1.0&quot;</span>, <span class="hljs-attr">personal</span>: <span class="hljs-string">&quot;1.0&quot;</span>, <span class="hljs-attr">rpc</span>: <span class="hljs-string">&quot;1.0&quot;</span>, <span class="hljs-attr">web3</span>: <span class="hljs-string">&quot;1.0&quot;</span> }&gt;
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3455" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3464" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5621,7 +5621,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">shh_addToGroup</span>(<span class="hljs-params">address: <span class="hljs-built_in">string</span></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">boolean</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3512" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3521" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5678,7 +5678,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">shh_getFilterChanges</span>(<span class="hljs-params">id: <span class="hljs-built_in">string</span></span>): <span class="hljs-title">Promise</span>&lt;[]&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3560" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3569" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5735,7 +5735,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">shh_getMessages</span>(<span class="hljs-params">id: <span class="hljs-built_in">string</span></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">boolean</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3575" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3584" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5792,7 +5792,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">shh_hasIdentity</span>(<span class="hljs-params">address: <span class="hljs-built_in">string</span></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">boolean</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3487" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3496" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5849,7 +5849,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">shh_newFilter</span>(<span class="hljs-params">to: <span class="hljs-built_in">string</span>, topics: <span class="hljs-built_in">string</span>[]</span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">boolean</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3529" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3538" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5908,7 +5908,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">shh_newGroup</span>(<span class="hljs-params"></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">string</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3497" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3506" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5943,7 +5943,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">shh_newIdentity</span>(<span class="hljs-params"></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">string</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3472" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3481" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -5989,7 +5989,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">shh_post</span>(<span class="hljs-params">postData: <span class="hljs-built_in">any</span></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">boolean</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3590" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3599" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -6046,7 +6046,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">shh_uninstallFilter</span>(<span class="hljs-params">id: <span class="hljs-built_in">string</span></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">boolean</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3545" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3554" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -6104,7 +6104,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">shh_version</span>(<span class="hljs-params"></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">string</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3604" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3613" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down Expand Up @@ -6150,7 +6150,7 @@ <h3 class="signature">
<span class="hljs-function"> <span class="hljs-title">txpool_content</span>(<span class="hljs-params"></span>): <span class="hljs-title">Promise</span>&lt;<span class="hljs-title">Content</span>&gt;</span>
</h3>
<div class="content small">
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3625" target="_blank" rel="noopener">source</a>
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3634" target="_blank" rel="noopener">source</a>
</div>
<div class="content">

Expand Down
Loading

0 comments on commit fe142a9

Please sign in to comment.