Feature/g7 adding slot uri and improvements

.env.example

@@ -0,0 +1,2 @@
+WEB3_INFURA_PROJECT_ID=YOUR_PROJECT_ID_HERE
+POLYGONSCAN_TOKEN=

.eslintrc

@@ -0,0 +1,17 @@
+{
+  "root": true,
+  "extends": ["eslint:recommended", "prettier"],
+  "env": {
+    "es2022": true,
+    "browser": true,
+    "node": true,
+    "mocha": true
+  },
+  "globals": {
+    "artifacts": "readonly",
+    "contract": "readonly",
+    "web3": "readonly",
+    "extendEnvironment": "readonly",
+    "expect": "readonly"
+  }
+}

.gitignore

@@ -149,3 +149,4 @@ prod.test.env
 dev.test.env
 
 scratch/
+.idea

.prettierrc

@@ -0,0 +1,14 @@
+{
+  "printWidth": 120,
+  "singleQuote": true,
+  "trailingComma": "all",
+  "arrowParens": "avoid",
+  "overrides": [
+    {
+      "files": "*.sol",
+      "options": {
+        "singleQuote": false
+      }
+    }
+  ]
+}

README.md

@@ -14,13 +14,13 @@ The contributing guide is in progress...
 
 First, set up a Python3 environment:
 
-- Check if you have Python3 installed on your system: `python3 --version`.
-- If the above command errors out, you need to install Python3. You can find instructions for how to
-do this at https://python.org.
-- Create a Python virtual environment in the root of this directory: `python3 -m venv .game7`
-- Activate the virtual environment: `source .game7/bin/activate` (when you are finished working in this
-code base, you can deactivate the virtual environment using the `deactivate` command).
-- Install the `game7ctl` package: `pip install -e game7ctl/`
+-   Check if you have Python3 installed on your system: `python3 --version`.
+-   If the above command errors out, you need to install Python3. You can find instructions for how to
+    do this at https://python.org.
+-   Create a Python virtual environment in the root of this directory: `python3 -m venv .game7`
+-   Activate the virtual environment: `source .game7/bin/activate` (when you are finished working in this
+    code base, you can deactivate the virtual environment using the `deactivate` command).
+-   Install the `game7ctl` package: `pip install -e game7ctl/`
 
 Following these steps will make the `game7ctl` command available in your shell. You can use this command-line
 tool to deploy and interact with the smart contracts in this repository. For more details:
@@ -37,7 +37,7 @@ To compile the smart contracts using `brownie`, run the following command from t
 brownie compile
 ```
 
-To set up a *development* environment, you have to also install the developer dependencies using:
+To set up a _development_ environment, you have to also install the developer dependencies using:
 
 ```
 pip install -e "game7ctl/[dev]"
@@ -72,13 +72,13 @@ If you want to register your contract for automatic regeneration, please add it
 ### `game7ctl`
 
 Once you have set up `game7ctl`, you can use it to deploy the contracts in this repository. For example,
-to deploy the Inventory contract as a Diamond proxy, you would use the `game7ctl core inventory-gogogo` command.
+to deploy the Inventory contract as a Diamond proxy, you would use the `game7ctl core dao` command.
 
 To see all the parameters you can pass in the deployment, run:
 
 ```
-$ game7ctl core inventory-gogogo --help
-usage: game7ctl inventory-gogogo [-h] --network NETWORK [--address ADDRESS] --sender SENDER [--password PASSWORD] [--gas-price GAS_PRICE] [--max-fee-per-gas MAX_FEE_PER_GAS]
+$ game7ctl dao systems --help
+usage: game7ctl dao [-h] --network NETWORK [--address ADDRESS] --sender SENDER [--password PASSWORD] [--gas-price GAS_PRICE] [--max-fee-per-gas MAX_FEE_PER_GAS]
                                  [--max-priority-fee-per-gas MAX_PRIORITY_FEE_PER_GAS] [--confirmations CONFIRMATIONS] [--nonce NONCE] [--value VALUE] [--verbose] --admin-terminus-address
                                  ADMIN_TERMINUS_ADDRESS --admin-terminus-pool-id ADMIN_TERMINUS_POOL_ID --subject-erc721-address SUBJECT_ERC721_ADDRESS
                                  [--diamond-cut-address DIAMOND_CUT_ADDRESS] [--diamond-address DIAMOND_ADDRESS] [--diamond-loupe-address DIAMOND_LOUPE_ADDRESS]
@@ -138,7 +138,7 @@ brownie networks add Polygon $NETWORK_NAME host=$JSONRPC_URL chainid=137 explore
 
 The only keys which are not optional are `chainid` and `host`.
 
-Then, you could pass `--network $NETWORK_NAME` as an argument to `game7ctl core inventory-gogogo`.
+Then, you could pass `--network $NETWORK_NAME` as an argument to `game7ctl core dao`.
 
 ##### `--sender`
 
@@ -156,3 +156,14 @@ Then you can pass `--sender $ACCOUNT_NAME` to `game7ctl`.
 The preferred way of using `--sender` is still by passing a keystore file.
 
 `brownie` will always prompt you to unlock the account with a password.
+
+##### Deployment Example:
+
+If you follow all the explanations above, you should be able to deploy the entire Diamond proxy with the InventoryFacet
+
+Using a command like this:
+
+```
+game7ctl dao systems --network <NETWORK> --admin-terminus-address <TERMINUS_ADMIN_ADDRESS> --admin-terminus-pool-id <POOL_ID> --sender <BROWNIE_ACCOUNT/KEYSTORE FILE PATH> --subject-erc721-address <ERC_721_CONTRACT_ADDRESS>
+```
+

brownie-config.yaml

@@ -1,5 +1,7 @@
+dotenv: .env
+
 dependencies:
-  - "OpenZeppelin/openzeppelin-contracts@4.3.2"
+  - "OpenZeppelin/openzeppelin-contracts@4.4.0"
   - "bugout-dev/[email protected]"
   - "bugout-dev/[email protected]"
 

contracts/diamond/Diamond.sol

@@ -4,10 +4,11 @@ pragma solidity ^0.8.0;
 // Adapted from the Diamond 3 reference implementation by Nick Mudge:
 // https://github.com/mudgen/diamond-3-hardhat
 
-import {LibDiamond} from "./libraries/LibDiamond.sol";
-import {IDiamondCut} from "./interfaces/IDiamondCut.sol";
+import {LibDiamond} from "../libraries/LibDiamond.sol";
+import {IDiamondCut} from "../interfaces/IDiamondCut.sol";
+import {IDiamond} from "../interfaces/IDiamond.sol";
 
-contract Diamond {
+contract Diamond is IDiamond {
     constructor(address _contractOwner, address _diamondCutFacet) payable {
         LibDiamond.setContractOwner(_contractOwner);