[docs] Replace Truffle/web3 mentions and sample-project with Waffle/ehters

docs/.vuepress/config.js

@@ -60,11 +60,11 @@ module.exports = {
           collapsable: false,
           depth: 1,
           children: [
-            ["/guides/truffle-migration.md", "Migrating from Truffle", 0],
             ["/guides/project-setup.md", "Setting up a project", 0],
             ["/guides/compile-contracts.md", "Compiling your contracts", 0],
-            ["/guides/truffle-testing.md", "Testing with Web3.js & Truffle", 0],
             ["/guides/waffle-testing.md", "Testing with ethers.js & Waffle", 0],
+            ["/guides/truffle-testing.md", "Testing with Web3.js & Truffle", 0],
+            ["/guides/truffle-migration.md", "Migrating from Truffle", 0],
             ["/guides/deploying.md", "Deploying your contracts", 0],
             ["/guides/scripts.md", "Writing scripts", 0],
             ["/guides/buidler-console.md", "Using the Buidler console", 0],
@@ -225,4 +225,4 @@ module.exports = {
       },
     }]
   ]
-};
+};

docs/advanced/buidler-runtime-environment.md

@@ -14,7 +14,7 @@ The BRE has a role of centralizing coordination across all Buidler components. T
 
 By default, the BRE gives you programmatic access to the task runner and the config system, and exports an [EIP1193-compatible](https://eips.ethereum.org/EIPS/eip-1193) Ethereum provider. You can find more information about [it in its API docs](/api/classes/environment.html).
 
-Plugins can extend the BRE. For example, [buidler-web3](/~https://github.com/nomiclabs/buidler/tree/master/packages/buidler-web3) adds a Web3.js instance to it, making it available to tasks, tests and scripts.
+Plugins can extend the BRE. For example, [buidler-ethers](/~https://github.com/nomiclabs/buidler/tree/master/packages/buidler-ethers) adds a Ethers.js instance to it, making it available to tasks, tests and scripts.
 
 ### As global variables
 
@@ -28,17 +28,36 @@ When writing tests or scripts, you can use `require("@nomiclabs/buidler")` to im
 
 You can import the config DSL explicitly when defining your tasks, and receive the BRE explicitly as an argument to your actions. You can read more about this in [Creating your own tasks](#creating-your-own-tasks).
 
+## Accessing the BRE from outside a task
+
+The BRE can be used from any JavaScript or TypeScript file. To do so, you only have to import it with `require("@nomiclabs/buidler")`. You can do this to keep more control over your development workflow, create your own tools, or to use Buidler with other dev tools from the node.js ecosystem.
+
+Running test directly with [Mocha](https://www.npmjs.com/package/mocha) instead of `npx buidler test` can be done by explicitly importing the BRE in them like this:
+
+```js
+const bre = require("@nomiclabs/buidler");
+const assert = require("assert");
+
+describe("Buidler Runtime Environment", function() {
+  it("should have a config field", function() {
+    assert.notEqual(bre.config, undefined);
+  });
+});
+```
+
+This way, tests written for Buidler are just normal Mocha tests. This enables you to run them from your favorite editor without the need of any Buidler-specific plugin. For example, you can [run them from Visual Studio Code using Mocha Test Explorer](../guides/vscode-tests.md).
+
 ## Extending the BRE
 
 The BRE only provides the core functionality that users and plugin developers need to start building on top of Buidler. Using it to interface directly with Ethereum in your project can be somewhat harder than expected.
 
-Everything gets easier when you use higher-level libraries, like [Web3.js](https://web3js.readthedocs.io/en/latest/) or [@truffle/contract](https://www.npmjs.com/package/@truffle/contract), but these libraries need some initialization to work, and that could get repetitive.
+Everything gets easier when you use higher-level libraries, like [Ethers.js](https://docs.ethers.io/ethers.js/html/) or [ethereum-waffle](https://www.npmjs.com/package/ethereum-waffle), but these libraries need some initialization to work, and that could get repetitive.
 
 Buidler lets you hook into the BRE construction, and extend it with new functionality. This way, you only have to initialize everything once, and your new features or libraries will be available everywhere the BRE is used.
 
 You can do this by adding a BRE extender into a queue. This extender is just a synchronous function that receives the BRE, and adds fields to it with your new functionality. These new fields will also get [injected into the global scope during runtime](#exporting-globally).
 
-For example, adding an instance of Web3.js to the BRE can be done in this way:
+For example, adding an instance of [Web3.js](https://web3js.readthedocs.io/en/latest/) to the BRE can be done in this way:
 
 ```js
 extendEnvironment(bre => {
@@ -49,22 +68,3 @@ extendEnvironment(bre => {
   bre.web3 = new Web3(new Web3HTTPProviderAdapter(bre.network.provider));
 });
 ```
-
-## Accessing the BRE from outside a task
-
-The BRE can be used from any JavaScript or TypeScript file. To do so, you only have to import it with `require("@nomiclabs/buidler")`. You can do this to keep more control over your development workflow, create your own tools, or to use Buidler with other dev tools from the node.js ecosystem.
-
-Running test directly with [Mocha](https://www.npmjs.com/package/mocha) instead of `npx buidler test` can be done by explicitly importing the BRE in them like this:
-
-```js
-const bre = require("@nomiclabs/buidler");
-const assert = require("assert");
-
-describe("Buidler Runtime Environment", function() {
-  it("should have a config field", function() {
-    assert.notEqual(bre.config, undefined);
-  });
-});
-```
-
-This way, tests written for Buidler are just normal Mocha tests. This enables you to run them from your favorite editor without the need of any Buidler-specific plugin. For example, you can [run them from Visual Studio Code using Mocha Test Explorer](../guides/vscode-tests.md).

docs/buidler-evm/README.md

@@ -16,7 +16,7 @@ Buidler comes built-in with Buidler EVM, a local Ethereum network designed for d
 
 - Buidler will always spin up an instance on startup when `defaultNetwork` is empty or set to `buidlerevm`. It's the default behavior.
 - It can be used to run tests, in the console, scripts, and tasks
-- Plugins (web3.js, ethers.js, Truffle, etc) connect directly to the provider
+- Plugins (ethers.js, web3.js, Waffle, Truffle, etc) connect directly to the provider
 - There's no need to make any changes to your tests or scripts.
 - It's simply another network and it can be used with `--network`
 
@@ -44,7 +44,7 @@ This exception will have a combined JavaScript and Solidity stack
 trace: stack traces that start in JavaScript/TypeScript up to your
 call to the contract, and continue with the full Solidity call stack.
 
-This is an example of a Buidler EVM exception:
+This is an example of a Buidler EVM exception using `TruffleContract`:
 
 ```
 Error: Transaction reverted: function selector was not recognized and there's no fallback function
@@ -114,8 +114,8 @@ Buidler EVM allows you to print logging messages and contract variables calling
   - `console.logBytes32(bytes32 b)`
 - `console.log` implements the same formatting options that can be found in Node.js' [`console.log`](https://nodejs.org/dist/latest-v12.x/docs/api/console.html#console_console_log_data_args), which in turn uses [`util.format`](https://nodejs.org/dist/latest-v12.x/docs/api/util.html#util_util_format_format_args).
   - Example: `console.log("Changing owner from %s to %s", currentOwner, newOwner)`
-- It works with any library: web3.js, ethers.js, truffle-contract, waffle, etc.
-- `console.log` is implemented in standard Solidity and then detected in Buidler EVM. This makes its compilation work with any other tools (like Remix or Truffle).
+- It works with any library: ethers.js, web3.js, waffle, truffle-contract, etc.
+- `console.log` is implemented in standard Solidity and then detected in Buidler EVM. This makes its compilation work with any other tools (like Remix, Waffle or Truffle).
 - `console.log` calls can run in other networks, like mainnet, kovan, ropsten, etc. They do nothing in those networks, but spend a minimal amount of gas.
 
 ## Logging

docs/getting-started/README.md

@@ -55,15 +55,13 @@ $ npx buidler
   Quit
 ```
 
-Let’s create the sample project and go through the steps to try out the sample task and compile, test and deploy the sample contract.
+Let’s create the sample project and go through the steps to try out the sample task and compile, test and deploy the sample contract. 
 
-The sample project uses the `buidler-truffle5`, which makes Buidler compatible with
-tests built for Truffle. You can learn more about it [in this guide](../guides/truffle-testing.md). 
-For now, all you need to know is that you may need to install some dependencies with
-
-```
-npm install --save-dev @nomiclabs/buidler-truffle5 @nomiclabs/buidler-web3 web3
-```
+The sample project will ask you to install `buidler-waffle` and `buidler-ethers`, which makes Buidler compatible with tests built with Waffle. You can learn more about it [in this guide](../guides/waffle-testing.md). 
+
+::: tip
+Buidler will let you know how, but in case you missed it you can install them with `npm install --save-dev @nomiclabs/buidler-waffle ethereum-waffle chai @nomiclabs/buidler-ethers ethers`
+:::
 
 ### Running tasks
 
@@ -103,21 +101,7 @@ This is the list of built-in tasks, and the sample `accounts` task. Further ahea
 
 If you take a look at `buidler.config.js`, you will find the definition of the task `accounts`:
 
-```js{5-11}
-usePlugin("@nomiclabs/buidler-truffle5");
-
-// This is a sample Buidler task. To learn how to create your own go to
-// https://buidler.dev/guides/create-task.html
-task("accounts", "Prints the list of accounts", async () => {
-  const accounts = await web3.eth.getAccounts();
-
-  for (const account of accounts) {
-    console.log(account);
-  }
-});
-
-module.exports = {};
-```
+<<< @/../packages/buidler-core/sample-project/buidler.config.js{5-11}
 
 To run it, try `npx buidler accounts`:
 
@@ -149,32 +133,7 @@ $ npx buidler accounts
 
 Next, if you take a look at `contracts/`, you should be able to find `Greeter.sol:`
 
-```solidity
-pragma solidity ^0.5.1;
-
-import "@nomiclabs/buidler/console.sol";
-
-contract Greeter {
-
-    string greeting;
-
-    constructor(string memory _greeting) public {
-        console.log("Deploying a Greeter with greeting:", _greeting);
-        greeting = _greeting;
-    }
-
-    function greet() public view returns (string memory) {
-        return greeting;
-    }
-
-    function setGreeting(string memory _greeting) public {
-        console.log("Changing greeting from '%s' to '%s'", greeting, _greeting);
-        greeting = _greeting;
-    }
-
-}
-
-```
+<<< @/../packages/buidler-core/sample-project/contracts/Greeter.sol
 
 To compile it, simply run:
 
@@ -184,24 +143,9 @@ npx buidler compile
 
 ### Testing your contracts
 
-The sample project comes with these tests that use [`@truffle/contract`](https://www.npmjs.com/package/@truffle/contract) and 
-[Web3.js](/~https://github.com/ethereum/web3.js). You can use other libraries if you want, check the integrations described in our guides.
-
-```js
-const Greeter = artifacts.require("Greeter");
-
-// Traditional Truffle test
-contract("Greeter", accounts => {
-  it("Should return the new greeting once it's changed", async function() {
-    const greeter = await Greeter.new("Hello, world!");
-    assert.equal(await greeter.greet(), "Hello, world!");
+The sample project comes with these tests that use [Waffle](https://getwaffle.io/) and [Ethers.js](/~https://github.com/ethers-io/ethers.js/). You can use other libraries if you want, check the integrations described in our guides.
 
-    await greeter.setGreeting("Hola, mundo!");
-
-    assert.equal(await greeter.greet(), "Hola, mundo!");
-  });
-});
-```
+<<< @/../packages/buidler-core/sample-project/test/sample-test.js
 
 You can run your tests with `npx buidler test`
 
@@ -212,48 +156,26 @@ Compiled 2 contracts successfully
 
 
   Contract: Greeter
-Deploying a Greeter with greeting: Hello, world!
-Changing greeting from 'Hello, world!' to 'Hola, mundo!'
-    ✓ Should return the new greeting once it's changed (344ms)
-
-  Greeter contract
-    Deployment
-Deploying a Greeter with greeting: Hello, world!
-Deploying a Greeter with greeting: Hola, mundo!
-      ✓ Should deploy with the right greeting (82ms)
-
-
-  2 passing (434ms)
+    ✓ Should return the new greeting once it's changed (762ms)
 
+  1 passing (762ms)
 ```
 
 ### Deploying your contracts
 
-Next, to deploy the contract we will use a Buidler script. 
-Create a file `deploy.js` in `scripts/` with the following code:
+Next, to deploy the contract we will use a Buidler script.
+Inside `scripts/` you will find `sample-script.js` with the following code:
 
-```js
-async function main() {
-  const Greeter = artifacts.require("Greeter");
+<<< @/../packages/buidler-core/sample-project/scripts/sample-script.js
 
-  const greeter = await Greeter.new("Hello, Buidler!");
-  console.log("Greeter deployed to:", greeter.address);
-}
+Run it with `npx buidler run scripts/sample-script.js`:
 
-main()
-  .then(() => process.exit(0))
-  .catch(error => {
-    console.error(error);
-    process.exit(1);
-  });
-```
-And run it with `npx buidler run scripts/deploy.js`:
 ```
 $ npx buidler run scripts/deploy.js
 All contracts have already been compiled, skipping compilation.
-Greeter deployed to: 0x080f632fB4211CFc19d1E795F3f3109f221D44C9
+Greeter deployed to: 0x7c2C195CD6D34B8F845992d380aADB2730bB9C6F
 ```
 
-Congrats! You have created a project, ran a Buidler task, compiled a smart contract, installed a Truffle integration plugin, wrote and ran a test using the Truffle plugin, and deployed a contract.
+Congrats! You have created a project, ran a Buidler task, compiled a smart contract, installed a Waffle integration plugin, wrote and ran a test using the Waffle and ethers.js plugins, and deployed a contract.
 
 For any questions or feedback you may have, you can find us in the [Buidler Support Telegram group](http://t.me/BuidlerSupport).

docs/guides/compile-contracts.md

@@ -19,7 +19,7 @@ To force a compilation you can use the `--force` argument, or run `npx buidler c
 
 ## Artifacts
 
-Compiling with Buidler generates one JSON artifact per contract. These are based on Truffle's artifact format, and are compatible with most tools. 
+Compiling with Buidler generates one JSON artifact per contract. These are compatible with most tools, including Truffle's artifact format. 
 
 Each artifact consists of a json with the following properties:
 
@@ -72,10 +72,7 @@ module.exports = {
 
 Set your `buidler.config.js` to the following contents:
 ```js
-// assuming you're running Truffle 5 tests.
-// There's also buidler-truffle4 if your tests are written for the Truffle 4 API.
-// You can use either of them with both versions of Solidity.
-usePlugin("@nomiclabs/buidler-truffle5");
+usePlugin("@nomiclabs/buidler-waffle");
 
 module.exports = {
   paths: {

docs/guides/deploying.md

@@ -7,16 +7,17 @@ with some ideas and we'd value your opinion on how to best design it.
 
 In the meantime, we recommend deploying your smart contracts using
 scripts. You can deploy the `Greeter` contract from the sample project
-by creating a file `scripts/deploy.js` with these contents
+with the deploy script `scripts/sample-script.js`:
 
 ```js
-// This script uses @nomiclabs/buidler-truffle5
-const Greeter = artifacts.require("Greeter");
-
 async function main() {
-  const greeter = await Greeter.new("Hello, world!");
+  // We get the contract to deploy
+  const Greeter = await ethers.getContractFactory("Greeter");
+  const greeter = await Greeter.deploy("Hello, Buidler!");
+
+  await greeter.deployed();
 
-  console.log("Greeter address:", greeter.address);
+  console.log("Greeter deployed to:", greeter.address);
 }
 
 main()
@@ -29,8 +30,8 @@ main()
 
 You can run it with
 
-```sh
-npx buidler run --network your-network scripts/deploy.js
+```
+npx buidler run --network <your-network> scripts/sample-script.js
 ```
 
 ### Truffle migrations support

docs/guides/project-setup.md

@@ -32,7 +32,7 @@ If you select _Create a sample project_ a simple project creation wizard will as
 ```
 contracts/
 scripts/
-tests/
+test/
 buidler.config.js
 ```
 
@@ -59,17 +59,17 @@ You may have seen this notice when creating the sample project:
 
 ```
 You need to install these dependencies to run the sample project:
-  npm install --save-dev web3 @nomiclabs/buidler-web3 @nomiclabs/buidler-truffle5
+  npm install --save-dev @nomiclabs/buidler-waffle ethereum-waffle chai @nomiclabs/buidler-ethers ethers
 ```
 
 This stems from the fact that **most of Buidler's functionality comes from plugins**, so check out the [plugins section](../plugins/README.md) for the official list and see if there are any other ones that look interesting.
 
-The sample project uses the `@nomiclabs/buidler-truffle5` plugin, which depends on the `@nomiclabs/buidler-web3` plugin. These integrate the Web3.js and Truffle tools into your project. 
+The sample project uses the `@nomiclabs/buidler-waffle` plugin, which depends on the `@nomiclabs/buidler-ethers` plugin. These integrate the Ethers.js and Waffle tools into your project. 
 
 To use a plugin, the first step is always to install it using `npm` or `yarn`, and then adding a call to `usePlugin(<npm package name>)` in your config file, like this:
 
 ```js
-usePlugin("@nomiclabs/buidler-truffle5");
+usePlugin("@nomiclabs/buidler-waffle");
 
 module.exports = {};
 ```