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

Commit fe142a9

Browse files
adjisbadjisb
authored
Merge branch 'develop' into develop
2 parents 17da968 + 2becf31 commit fe142a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1002
-904
lines changed

‎.github/workflows/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
- name: Check bundle size
4545
# this should match the os and version used in the release.yml
46-
if: startsWith(matrix.os, 'ubuntu-22.04') && startsWith(matrix.node, '14.')
46+
if: startsWith(matrix.os, 'ubuntu-22.04') && startsWith(matrix.node, '14.') && matrix.node != '14.0.0'
4747
# 1. build ganache
4848
# 2. pack it into a tarball
4949
# 3. measure the _unpacked_ tarball's size
@@ -65,7 +65,7 @@ jobs:
6565
INFURA_KEY: "badc0de0deadc0debadc0de0deadc0de"
6666
- name: Upload artifact
6767
# this should match the os and version used in the release.yml
68-
if: startsWith(matrix.os, 'ubuntu-22.04') && startsWith(matrix.node, '14.')
68+
if: startsWith(matrix.os, 'ubuntu-22.04') && startsWith(matrix.node, '14.') && matrix.node != '14.0.0'
6969
uses: actions/upload-artifact@v3
7070
with:
7171
name: Candidate

‎.github/workflows/push.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -55,29 +55,6 @@ jobs:
5555
if: startsWith(matrix.os, 'windows-')
5656
uses: microsoft/setup-msbuild@v1.1
5757

58-
- name: install node tools
59-
# we don't need to install the windows-build-tools package, as we
60-
# already have almost everything we need. We only need to install
61-
# python 2.7. Also windows-build-tools@4 fails to install because some
62-
# resources it downloads no longer exist, and windows-build-tools@5
63-
# fails to install Python (it will wait on the python installer forever)
64-
if: startsWith(matrix.os, 'windows-')
65-
uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912 #v4.4.0
66-
with:
67-
python-version: "2.7"
68-
69-
- name: install node-gyp
70-
if: startsWith(matrix.os, 'windows-')
71-
run: npm install --global node-gyp@7.1.2
72-
73-
- name: Set node config to use python2.7
74-
if: startsWith(matrix.os, 'windows-')
75-
run: npm config set python python2.7
76-
77-
- name: Set node config to set msvs_version to 2019
78-
if: startsWith(matrix.os, 'windows-')
79-
run: npm config set msvs_version 2019 --global
80-
8158
- run: npm ci
8259
- run: npm run tsc
8360
- run: npm test

‎docs/assets/js/ganache/ganache.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/assets/js/ganache/ganache.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/index.html

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ <h3 class="signature">
374374
<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>
375375
</h3>
376376
<div class="content small">
377-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3189" target="_blank" rel="noopener">source</a>
377+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3191" target="_blank" rel="noopener">source</a>
378378
</div>
379379
<div class="content">
380380

@@ -464,10 +464,10 @@ <h3 class="signature">
464464
<div>
465465
<a name="debug_traceTransaction"></a>
466466
<h3 class="signature">
467-
<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>
467+
<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>
468468
</h3>
469469
<div class="content small">
470-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3138" target="_blank" rel="noopener">source</a>
470+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3139" target="_blank" rel="noopener">source</a>
471471
</div>
472472
<div class="content">
473473

@@ -496,7 +496,7 @@ <h3 class="signature">
496496
<ul>
497497
<li><code class="language-typescript"><span class="hljs-function"><span class="hljs-params">transactionHash: <span class="hljs-built_in">string</span></span></span>
498498
</code>
499-
</li><li><code class="language-typescript"><span class="hljs-function"><span class="hljs-params">options?: TraceTransactionOptions</span></span>
499+
</li><li><code class="language-typescript"><span class="hljs-function"><span class="hljs-params">options: TraceTransactionOptions</span></span>
500500
</code>
501501
</li>
502502
</ul>
@@ -5119,7 +5119,7 @@ <h3 class="signature">
51195119
<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>
51205120
</h3>
51215121
<div class="content small">
5122-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3266" target="_blank" rel="noopener">source</a>
5122+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3275" target="_blank" rel="noopener">source</a>
51235123
</div>
51245124
<div class="content">
51255125

@@ -5182,7 +5182,7 @@ <h3 class="signature">
51825182
<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>
51835183
</h3>
51845184
<div class="content small">
5185-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3218" target="_blank" rel="noopener">source</a>
5185+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3227" target="_blank" rel="noopener">source</a>
51865186
</div>
51875187
<div class="content">
51885188

@@ -5229,7 +5229,7 @@ <h3 class="signature">
52295229
<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>
52305230
</h3>
52315231
<div class="content small">
5232-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3296" target="_blank" rel="noopener">source</a>
5232+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3305" target="_blank" rel="noopener">source</a>
52335233
</div>
52345234
<div class="content">
52355235

@@ -5288,7 +5288,7 @@ <h3 class="signature">
52885288
<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>
52895289
</h3>
52905290
<div class="content small">
5291-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3235" target="_blank" rel="noopener">source</a>
5291+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3244" target="_blank" rel="noopener">source</a>
52925292
</div>
52935293
<div class="content">
52945294

@@ -5348,7 +5348,7 @@ <h3 class="signature">
53485348
<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>
53495349
</h3>
53505350
<div class="content small">
5351-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3365" target="_blank" rel="noopener">source</a>
5351+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3374" target="_blank" rel="noopener">source</a>
53525352
</div>
53535353
<div class="content">
53545354

@@ -5427,7 +5427,7 @@ <h3 class="signature">
54275427
<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>
54285428
</h3>
54295429
<div class="content small">
5430-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3424" target="_blank" rel="noopener">source</a>
5430+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3433" target="_blank" rel="noopener">source</a>
54315431
</div>
54325432
<div class="content">
54335433

@@ -5505,7 +5505,7 @@ <h3 class="signature">
55055505
<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>
55065506
</h3>
55075507
<div class="content small">
5508-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3324" target="_blank" rel="noopener">source</a>
5508+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3333" target="_blank" rel="noopener">source</a>
55095509
</div>
55105510
<div class="content">
55115511

@@ -5575,7 +5575,7 @@ <h3 class="signature">
55755575
<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;
55765576
</h3>
55775577
<div class="content small">
5578-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3455" target="_blank" rel="noopener">source</a>
5578+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3464" target="_blank" rel="noopener">source</a>
55795579
</div>
55805580
<div class="content">
55815581

@@ -5621,7 +5621,7 @@ <h3 class="signature">
56215621
<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>
56225622
</h3>
56235623
<div class="content small">
5624-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3512" target="_blank" rel="noopener">source</a>
5624+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3521" target="_blank" rel="noopener">source</a>
56255625
</div>
56265626
<div class="content">
56275627

@@ -5678,7 +5678,7 @@ <h3 class="signature">
56785678
<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>
56795679
</h3>
56805680
<div class="content small">
5681-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3560" target="_blank" rel="noopener">source</a>
5681+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3569" target="_blank" rel="noopener">source</a>
56825682
</div>
56835683
<div class="content">
56845684

@@ -5735,7 +5735,7 @@ <h3 class="signature">
57355735
<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>
57365736
</h3>
57375737
<div class="content small">
5738-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3575" target="_blank" rel="noopener">source</a>
5738+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3584" target="_blank" rel="noopener">source</a>
57395739
</div>
57405740
<div class="content">
57415741

@@ -5792,7 +5792,7 @@ <h3 class="signature">
57925792
<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>
57935793
</h3>
57945794
<div class="content small">
5795-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3487" target="_blank" rel="noopener">source</a>
5795+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3496" target="_blank" rel="noopener">source</a>
57965796
</div>
57975797
<div class="content">
57985798

@@ -5849,7 +5849,7 @@ <h3 class="signature">
58495849
<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>
58505850
</h3>
58515851
<div class="content small">
5852-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3529" target="_blank" rel="noopener">source</a>
5852+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3538" target="_blank" rel="noopener">source</a>
58535853
</div>
58545854
<div class="content">
58555855

@@ -5908,7 +5908,7 @@ <h3 class="signature">
59085908
<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>
59095909
</h3>
59105910
<div class="content small">
5911-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3497" target="_blank" rel="noopener">source</a>
5911+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3506" target="_blank" rel="noopener">source</a>
59125912
</div>
59135913
<div class="content">
59145914

@@ -5943,7 +5943,7 @@ <h3 class="signature">
59435943
<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>
59445944
</h3>
59455945
<div class="content small">
5946-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3472" target="_blank" rel="noopener">source</a>
5946+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3481" target="_blank" rel="noopener">source</a>
59475947
</div>
59485948
<div class="content">
59495949

@@ -5989,7 +5989,7 @@ <h3 class="signature">
59895989
<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>
59905990
</h3>
59915991
<div class="content small">
5992-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3590" target="_blank" rel="noopener">source</a>
5992+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3599" target="_blank" rel="noopener">source</a>
59935993
</div>
59945994
<div class="content">
59955995

@@ -6046,7 +6046,7 @@ <h3 class="signature">
60466046
<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>
60476047
</h3>
60486048
<div class="content small">
6049-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3545" target="_blank" rel="noopener">source</a>
6049+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3554" target="_blank" rel="noopener">source</a>
60506050
</div>
60516051
<div class="content">
60526052

@@ -6104,7 +6104,7 @@ <h3 class="signature">
61046104
<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>
61056105
</h3>
61066106
<div class="content small">
6107-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3604" target="_blank" rel="noopener">source</a>
6107+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3613" target="_blank" rel="noopener">source</a>
61086108
</div>
61096109
<div class="content">
61106110

@@ -6150,7 +6150,7 @@ <h3 class="signature">
61506150
<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>
61516151
</h3>
61526152
<div class="content small">
6153-
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3625" target="_blank" rel="noopener">source</a>
6153+
<a href="https://github.com/trufflesuite/ganache/blob/next/src/ethereum/src/api.ts#L3634" target="_blank" rel="noopener">source</a>
61546154
</div>
61556155
<div class="content">
61566156

0 commit comments

Comments
 (0)