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

Commit 26a2628

Browse files
acuaricaacuarica
authored
Merge pull request #280 from trufflesuite/develop
Release `2.7.0` into `master`
2 parents e5e9251 + 267b8a7 commit 26a2628

Some content is hidden

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

44 files changed

+1066
-385
lines changed

‎.github/workflows/core-ci-checks.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
runs-on: windows-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v2
11+
uses: actions/checkout@v3
1212

1313
- name: Setup Node
14-
uses: actions/setup-node@v2
14+
uses: actions/setup-node@v3
1515
with:
1616
node-version: lts/*
1717
cache: 'yarn'
@@ -27,3 +27,6 @@ jobs:
2727

2828
- name: Tests
2929
run: yarn test:int
30+
31+
- name: Build smoke check package
32+
run: yarn package

‎CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,25 @@
22

33
All notable changes to the "Truffle for VSCode" extension will be documented in this file.
44

5+
## 2.7.0 - _Aranha_ 🕷️
6+
7+
This release brings some new exciting features regarding the debugger, namely it allows you to fetch external sources when debugging external transactions, reuse your `truffle-config.js` networks to debug a transaction and trigger the visual debugger from the command line. It also includes a fix that removes deprecated networks after the merge and a range of smaller fixes and improvements.
8+
9+
Give it a try and let us know what you think!
10+
11+
### What's Changed
12+
13+
- Clarify Ganache CLI usage in `Requirements Page` [\#274](https://github.com/trufflesuite/vscode-ext/pull/274) ([acuarica](https://github.com/acuarica))
14+
- Allow Node v18 in Required Apps [\#272](https://github.com/trufflesuite/vscode-ext/pull/272) ([acuarica](https://github.com/acuarica))
15+
- Declare `network` option in launch configuration [\#267](https://github.com/trufflesuite/vscode-ext/pull/267) ([acuarica](https://github.com/acuarica))
16+
- Include `disableFetchExternal` flag to avoid debugging with fetching external sources [\#255](https://github.com/trufflesuite/vscode-ext/pull/255) ([acuarica](https://github.com/acuarica))
17+
- Running truffle debug with appropriate flag `--vscode` triggers debugger to launch in VS Code [\#231](https://github.com/trufflesuite/vscode-ext/pull/231) and [\#254](https://github.com/trufflesuite/vscode-ext/pull/254) ([xhulz](https://github.com/xhulz))
18+
- Invalidate `require` cache of `truffle-config.js` when debugging [\#265](https://github.com/trufflesuite/vscode-ext/pull/265) ([acuarica](https://github.com/acuarica))
19+
- Support network option in addition to providerUrl when debugging [\#261](https://github.com/trufflesuite/vscode-ext/pull/261) ([xhulz](https://github.com/xhulz))
20+
- Fetch external sources when debugging a forked network [\#252](https://github.com/trufflesuite/vscode-ext/pull/252) ([acuarica](https://github.com/acuarica))
21+
- Contracts not detected [\#251](https://github.com/trufflesuite/vscode-ext/pull/251) ([xhulz](https://github.com/xhulz))
22+
- Remove deprecated networks [\#250](https://github.com/trufflesuite/vscode-ext/pull/250) ([michaeljohnbennett](https://github.com/michaeljohnbennett))
23+
524
## 2.6.0 - _Arbequina_ 🌳
625

726
This release brings a number of new features including an improved new project workflow, an information tab for your locally running Ganache instances, and a dedicated panel for all logging out from Truffle, Ganache and Dashboard. It also includes a fix for the debugger wherein it was unable to find the source files (resulting in a 'No source file" error) and range of smaller fixes and optimizations.

‎package.json

Lines changed: 44 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@
6767
"onCommand:truffle-vscode.views.dashboard.restartDashboardServer",
6868
"onCommand:truffle-vscode.views.dashboard.openDashboard",
6969
"onCommand:truffle-vscode.views.dashboard.copyRPCEndpointAddress",
70-
"onDebug"
70+
"onDebug",
71+
"onUri"
7172
],
7273
"contributes": {
7374
"configuration": {
@@ -566,7 +567,10 @@
566567
"runtime": "node",
567568
"configurationAttributes": {
568569
"launch": {
569-
"required": [],
570+
"required": [
571+
"txHash",
572+
"workingDirectory"
573+
],
570574
"properties": {
571575
"stopOnEntry": {
572576
"type": "boolean",
@@ -580,23 +584,33 @@
580584
},
581585
"txHash": {
582586
"type": "string",
583-
"description": "Transaction hash to debug",
587+
"description": "The transaction hash to debug.",
584588
"default": "0x"
585589
},
586590
"files": {
587591
"type": "string[]",
588-
"description": "Array of file paths of solidity files to debug",
592+
"description": "Array of file paths of solidity files to debug.",
589593
"default": []
590594
},
591595
"workingDirectory": {
592596
"type": "string",
593-
"description": "Directory of truffle project",
597+
"description": "Directory of the Truffle project where to find the Truffle config file.",
594598
"default": "${workspaceFolder}"
595599
},
596600
"providerUrl": {
597601
"type": "string",
598-
"description": "URL of provider",
602+
"description": "Provider's URL of the Ethereum network to connect to.",
599603
"default": "http://127.0.0.1:8545"
604+
},
605+
"network": {
606+
"type": "string",
607+
"description": "Name of the Ethereum network to connect to. The network name should be a key in the `networks` object in your Truffle config file.",
608+
"default": "development"
609+
},
610+
"disableFetchExternal": {
611+
"type": "boolean",
612+
"description": "When set, do not try to fetch external contract sources when debugging a forked network instance. When the network is not being forked, this flag is ignored.",
613+
"default": false
600614
}
601615
}
602616
}
@@ -610,22 +624,39 @@
610624
"txHash": "0x",
611625
"files": [],
612626
"workingDirectory": "${workspaceFolder}",
613-
"providerUrl": "http://127.0.0.1:8545"
627+
"providerUrl": "http://127.0.0.1:8545",
628+
"disableFetchExternal": false
614629
}
615630
],
616631
"configurationSnippets": [
617632
{
618633
"label": "Truffle - Debugger Launch",
619-
"description": "Runs the Truffle debugger (truffle) and attaches to a TestRPC instance",
634+
"description": "Runs the Truffle debugger (truffle) and attaches to a Ganache instance",
635+
"body": {
636+
"type": "truffle",
637+
"request": "launch",
638+
"name": "Debug Transaction with Truffle",
639+
"stopOnEntry": false,
640+
"txHash": "0x",
641+
"files": [],
642+
"workingDirectory": "^\"\\${workspaceFolder}\"",
643+
"providerUrl": "http://127.0.0.1:8545",
644+
"disableFetchExternal": false
645+
}
646+
},
647+
{
648+
"label": "Truffle - Debugger Launch using config network",
649+
"description": "Runs the Truffle debugger (truffle) and attaches to a Ganache instance",
620650
"body": {
621651
"type": "truffle",
622652
"request": "launch",
623653
"name": "Debug Transaction with Truffle",
624654
"stopOnEntry": false,
625655
"txHash": "0x",
626656
"files": [],
627-
"workingDirectory": "^\"\\${workspaceFolder}/",
628-
"providerUrl": "http://127.0.0.1:8545"
657+
"workingDirectory": "^\"\\${workspaceFolder}\"",
658+
"network": "development",
659+
"disableFetchExternal": false
629660
}
630661
}
631662
],
@@ -810,7 +841,9 @@
810841
"@truffle/compile-solidity": "^6.0.31",
811842
"@truffle/config": "1.3.38",
812843
"@truffle/debug-utils": "^6.0.26",
813-
"@truffle/debugger": "^10.0.14",
844+
"@truffle/debugger": "^11.0.17",
845+
"@truffle/environment": "^0.2.130",
846+
"@truffle/fetch-and-compile": "^0.5.19",
814847
"@truffle/resolver": "^9.0.4",
815848
"@truffle/workflow-compile": "^4.0.36",
816849
"abi-decoder": "^2.4.0",

‎resources/welcome/main.css

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/* Copyright (c) 2022. Consensys Software Inc. All rights reserved. */
2+
/* Licensed under the MIT license. */
3+
14
* {
25
box-sizing: border-box;
36
font-family: 'Segoe UI', sans-serif;
@@ -303,17 +306,22 @@ footer {
303306
max-height: 60px;
304307
}
305308

306-
.required-app div {
309+
.required-app div,
310+
.required-app span {
307311
margin: 10px 0;
308-
font-size: 15px;
312+
font-size: 13px;
309313
text-align: center;
310-
line-height: 20px;
314+
line-height: 16px;
311315
}
312316

313317
.required-app .version {
314318
color: mediumaquamarine;
315319
}
316320

321+
.required-app .versionInvalid {
322+
color: hotpink;
323+
}
324+
317325
.required-app a {
318326
position: relative;
319327
display: block;
@@ -339,6 +347,7 @@ footer {
339347
.required-app a.spinner span {
340348
visibility: hidden;
341349
}
350+
342351
/*#endregion required*/
343352

344353
/*#region spinner*/
@@ -364,6 +373,7 @@ footer {
364373
border-bottom-color: #ffffff;
365374
animation: spinner 0.8s ease infinite;
366375
}
376+
367377
/*#endregion spinner*/
368378

369379
/*#region partners*/
@@ -404,6 +414,7 @@ footer {
404414
.specific-partner > img {
405415
flex: 1;
406416
}
417+
407418
/*#endregion partners*/
408419

409420
/*#region sidebar*/

‎resources/welcome/prereqs.html

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
<!-- Copyright (c) 2022. Consensys Software Inc. All rights reserved. -->
2+
<!-- Licensed under the MIT license. -->
3+
14
<!DOCTYPE html>
25
<html>
36
<head>
@@ -33,8 +36,11 @@ <h2>Required Apps</h2>
3336
<div id="node" class="required-app disabled">
3437
<img src="{{root}}/images/NodeLogo.png" />
3538
<div class="description">
36-
Required version:
37-
<span class="version">⌃14.0.0 and ⌵17.0.0</span>
39+
Required:
40+
<span class="version">{{node}}</span>
41+
<br />
42+
Installed:
43+
<span class="{{node-version}}">{{node-installed}}</span>
3844
</div>
3945
<a class="spinner" href="https://nodejs.org">
4046
<span>Install Node.js</span>
@@ -43,8 +49,11 @@ <h2>Required Apps</h2>
4349
<div id="git" class="required-app disabled">
4450
<img src="{{root}}/images/GitLogo.png" />
4551
<div class="description">
46-
Required version:
47-
<span class="version">2.10.0</span>
52+
Required:
53+
<span class="version">{{git}}</span>
54+
<br />
55+
Installed:
56+
<span class="{{git-version}}">{{git-installed}}</span>
4857
</div>
4958
<a class="spinner" href="https://git-scm.com/downloads">
5059
<span>Install Git</span>
@@ -53,8 +62,11 @@ <h2>Required Apps</h2>
5362
<div id="npm" class="required-app disabled">
5463
<img src="{{root}}/images/NpmLogo.png" />
5564
<div class="description">
56-
Required version:
57-
<span class="version">⌃6.14.15 and ⌵9.0.0</span>
65+
Required:
66+
<span class="version">{{npm}}</span>
67+
<br />
68+
Installed:
69+
<span class="{{npm-version}}">{{npm-installed}}</span>
5870
</div>
5971
<a id="installNpm" class="spinner action" title="Install NPM">
6072
<span>Install NPM</span>
@@ -64,15 +76,18 @@ <h2>Required Apps</h2>
6476
<p>
6577
At this time, while the extension is still in public-preview, you
6678
will also need to install the Truffle Suite of developer tools.
67-
Click the links below to install the Truffle tools directly from
68-
this extension
79+
Click the links below to install Truffle Suite and Ganache CLI
80+
directly from this extension
6981
</p>
7082
<div class="required">
7183
<div id="truffle" class="required-app disabled">
7284
<img src="{{root}}/images/TruffleLogo.svg" />
7385
<div class="description">
74-
Required version:
75-
<span class="version">⌃5.0.0 and ⌵6.0.0</span>
86+
Required:
87+
<span class="version">{{truffle}}</span>
88+
<br />
89+
Installed:
90+
<span class="{{truffle-version}}">{{truffle-installed}}</span>
7691
</div>
7792
<a
7893
id="installTruffle"
@@ -85,15 +100,18 @@ <h2>Required Apps</h2>
85100
<div id="ganache" class="required-app disabled">
86101
<img src="{{root}}/images/GanacheLogo.png" />
87102
<div class="description">
88-
Required version:
89-
<span class="version">⌃6.0.0 and ⌵8.0.0</span>
103+
Required:
104+
<span class="version">{{ganache}}</span>
105+
<br />
106+
Installed:
107+
<span class="{{ganache-version}}">{{ganache-installed}}</span>
90108
</div>
91109
<a
92110
id="installGanache"
93111
class="spinner action"
94-
title="Install Ganache"
112+
title="Install Ganache CLI"
95113
>
96-
<span>Install Ganache</span>
114+
<span>Install Ganache CLI</span>
97115
</a>
98116
</div>
99117
</div>

0 commit comments

Comments
 (0)