Merge branch 'main' into meta_tx_erc1155nontransferable

bosonprotocol · Oct 13, 2021 · de2f2f3 · de2f2f3
2 parents 77d99b0 + 76f65a1
commit de2f2f3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ tools installed.
 
 At a minimum, you'll need:
 * Node (12.20)
-* NPM (> 6)
+* NPM (7)
 * Ruby (2.7)
 * Bundler (> 2)
 * Git
@@ -90,9 +90,27 @@ If preferred by those who are familiar with Hardhat, the standard Hardhat comman
 
 In a separate terminal, contracts can be deployed using
 ```shell
-  npx hardhat --network [customNetworkName] deploy
+  npx hardhat --network localhost deploy
 ```
 
+#### Forking Rinkeby to localnode
+
+It is possible to fork the state of the Rinkeby chain to have it deployed locally. 
+The following hardhat commands will achieve this:
+
+```shell script
+npx hardhat node --fork https://eth-rinkeby.alchemyapi.io/v2/<<alchemy key>>
+```
+Alchemy is recommended by Hardhat over Infura because it's free accounts provide archived data, which is required for successful forking.
+
+You can then deploy from a separate terminal using the command
+
+```shell script
+npx hardhat deploy --network localhost
+```
+
+This makes the BOSON test token deployed on Rinkeby (0xEDa08eF1c6ff51Ca7Fd681295797102c1B84606c) and the official DAI token 
+deployed on Rinkeby (0x6A9865aDE2B6207dAAC49f8bCba9705dEB0B0e6D) available to your local hardhat chain.
 
 ---
 ### Test

diff --git a/contracts/DAITokenWrapper.sol b/contracts/DAITokenWrapper.sol
@@ -38,7 +38,6 @@ contract DAITokenWrapper is
      * @notice Conforms to EIP-2612. Calls permit on token, which may or may not have a permit function that conforms to EIP-2612
      * @param _tokenOwner Address of the token owner who is approving tokens to be transferred by spender
      * @param _spender Address of the party who is transferring tokens on owner's behalf
-     * @param _value Number of tokens to be transferred
      * @param _deadline Time after which this permission to transfer is no longer valid
      * @param _v Part of the owner's signatue
      * @param _r Part of the owner's signatue
@@ -47,7 +46,7 @@ contract DAITokenWrapper is
     function permit(
         address _tokenOwner,
         address _spender,
-        uint256 _value,
+        uint256,
         uint256 _deadline,
         uint8 _v,
         bytes32 _r,

diff --git a/docs/setup/linux.md b/docs/setup/linux.md
@@ -8,7 +8,7 @@ on your development machine:
 * git
 * direnv
 * Node (12.20)
-* NPM (> 6)
+* NPM (7)
 * Ruby (2.7)
 * Bundler (> 2)
 

diff --git a/docs/setup/osx.md b/docs/setup/osx.md
@@ -8,7 +8,7 @@ on your development machine:
 * git
 * direnv
 * Node (12.20)
-* NPM (> 6)
+* NPM (7)
 * Ruby (2.7)
 * Bundler (> 2)