setter and getter facets

abi/DiamondLoupeFacet.json

@@ -0,0 +1 @@
+[{"type":"function","name":"facetAddress","constant":true,"stateMutability":"view","payable":false,"gas":1100000,"inputs":[{"type":"bytes4","name":"_functionSelector"}],"outputs":[{"type":"address","name":"facetAddress_"}]},{"type":"function","name":"facetAddresses","constant":true,"stateMutability":"view","payable":false,"gas":1100000,"inputs":[],"outputs":[{"type":"address[]","name":"facetAddresses_"}]},{"type":"function","name":"facetFunctionSelectors","constant":true,"stateMutability":"view","payable":false,"gas":1100000,"inputs":[{"type":"address","name":"_facet"}],"outputs":[{"type":"bytes4[]","name":"facetFunctionSelectors_"}]},{"type":"function","name":"facets","constant":true,"stateMutability":"view","payable":false,"gas":1100000,"inputs":[],"outputs":[{"type":"tuple[]","name":"facets_","components":[{"type":"address","name":"facetAddress"},{"type":"bytes4[]","name":"functionSelectors"}]}]},{"type":"function","name":"supportsInterface","constant":true,"stateMutability":"view","payable":false,"gas":1100000,"inputs":[{"type":"bytes4","name":"_interfaceId"}],"outputs":[{"type":"bool"}]}]

abi/Facet1.json

@@ -0,0 +1 @@
+[{"type":"function","name":"setStr1","constant":false,"payable":false,"gas":1100000,"inputs":[{"type":"string","name":"str"}],"outputs":[]},{"type":"function","name":"setStr2","constant":false,"payable":false,"gas":1100000,"inputs":[],"outputs":[]}]

abi/Facet2.json

@@ -0,0 +1 @@
+[{"type":"function","name":"getStr1","constant":true,"stateMutability":"view","payable":false,"gas":1100000,"inputs":[],"outputs":[{"type":"string"}]},{"type":"function","name":"getStr2","constant":true,"stateMutability":"view","payable":false,"gas":1100000,"inputs":[],"outputs":[{"type":"string"}]}]

abi/OwnershipFacet.json

@@ -0,0 +1 @@
+[{"type":"event","anonymous":false,"name":"OwnershipTransferred","inputs":[{"type":"address","name":"previousOwner","indexed":true},{"type":"address","name":"newOwner","indexed":true}]},{"type":"function","name":"owner","constant":true,"stateMutability":"view","payable":false,"gas":1100000,"inputs":[],"outputs":[{"type":"address","name":"owner_"}]},{"type":"function","name":"transferOwnership","constant":false,"payable":false,"gas":1100000,"inputs":[{"type":"address","name":"_newOwner"}],"outputs":[]}]

contracts/facets/Facet1.sol

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { AppStorageOpen, LibCommon } from "../libraries/LibCommon.sol";
+
+contract Facet1 {
+
+    function setStr1(string memory str) external {
+        AppStorageOpen storage appStore = LibCommon.appStorage();
+        appStore.str1 = str;
+    }
+
+    function setStr2() external {
+        AppStorageOpen storage appStore = LibCommon.appStorage();
+        appStore.str2 = "store string 2";
+    }
+
+}

contracts/facets/Facet2.sol

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import { AppStorageOpen, LibCommon } from "../libraries/LibCommon.sol";
+
+contract Facet2 {
+
+    function getStr1() external view returns(string memory){
+        AppStorageOpen memory appStore = LibCommon.appStorage();
+        return appStore.str1;
+    }
+
+    function getStr2() external view returns(string memory){
+        AppStorageOpen memory appStore = LibCommon.appStorage();
+        return appStore.str2;
+    }
+
+}

contracts/facets/Test1Facet.sol

@@ -4,7 +4,9 @@ pragma solidity ^0.8.0;
 contract Test1Facet {
     event TestEvent(address something);
 
-    function test1Func1() external {}
+    function test1Func1() external pure returns(string memory){
+        return "this works";
+    }
 
     function test1Func2() external {}
 

contracts/libraries/LibCommon.sol

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+import "./storage.sol";
+
+library LibCommon {
+
+    function appStorage() internal pure returns (AppStorageOpen storage appStore) {
+        assembly {
+            appStore.slot := 0
+        }
+    }
+}

contracts/libraries/storage.sol

@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+struct AppStorageOpen {
+    string str1;
+    string str2;
+}

diamondAddress.js

@@ -1 +1 @@
-{ "diamond": "0x25b5A1874F31E4d329e3Fe21F9De9628d9804465"}
+{ "diamond": "0x10BCE52147909587F190D12E8e08e6BDc9e7f6F6"}

scripts/deploy.js

@@ -1,9 +1,10 @@
 /* global ethers */
 /* eslint prefer-const: "off" */
-const { writeFileSync } = require("fs");
+const { writeFileSync, mkdirSync } = require("fs");
 const { getSelectors, FacetCutAction } = require('./libraries/diamond.js')
 
 async function deployDiamond () {
+  mkdirSync("abi", { recursive: true });
   const accounts = await ethers.getSigners()
   const contractOwner = accounts[0]
 
@@ -32,7 +33,9 @@ async function deployDiamond () {
   console.log('Deploying facets')
   const FacetNames = [
     'DiamondLoupeFacet',
-    'OwnershipFacet'
+    'OwnershipFacet',
+    'Facet1',
+    'Facet2',
   ]
   const cut = []
   for (const FacetName of FacetNames) {
@@ -45,6 +48,7 @@ async function deployDiamond () {
       action: FacetCutAction.Add,
       functionSelectors: getSelectors(facet)
     })
+    createAbiJSON(facet, FacetName)
   }
 
   // upgrade diamond with facets
@@ -77,4 +81,10 @@ if (require.main === module) {
     })
 }
 
+/// CREATE ABI OF CONTRACTS
+function createAbiJSON(artifact, filename) {
+  const data = JSON.parse(artifact.interface.format("json"));
+  writeFileSync(`${__dirname}/../abi/${filename}.json`, JSON.stringify(data));
+}
+
 exports.deployDiamond = deployDiamond