Fixing configuration issues

Author: jhubbardsf

packages/lively-diamond/global.d.ts

@@ -2,3 +2,5 @@ declare module "*.bin" {
   const content: string;
   export default content;
 }
+
+declare module "tsconfig-paths/register";

packages/lively-diamond/hardhat.config.ts

@@ -8,6 +8,7 @@ import { HardhatUserConfig, task } from "hardhat/config";
 import type { NetworkUserConfig } from "hardhat/types";
 import { resolve } from "path";
 import "solidity-docgen";
+import "tsconfig-paths/register";
 
 import "./tasks/accounts";
 import "./tasks/taskGenerators";

packages/lively-diamond/package.json

@@ -20,9 +20,9 @@
     "@nomiclabs/hardhat-etherscan": "^3.1.2",
     "@openzeppelin/contracts": "^4.9.1",
     "@openzeppelin/contracts-upgradeable": "^4.9.1",
+    "@solidstate/abi": "^0.0.57",
     "@solidstate/contracts": "^0.0.57",
     "@solidstate/hardhat-bytecode-exporter": "^1.1.1",
-    "@solidstate/spec": "^0.0.57",
     "@trivago/prettier-plugin-sort-imports": "^4.0.0",
     "@typechain/ethers-v6": "^0.4.0",
     "@typechain/hardhat": "^6.1.4",
@@ -59,6 +59,7 @@
     "solidity-docgen": "0.6.0-beta.35",
     "ts-generator": "^0.1.1",
     "ts-node": "^10.9.1",
+    "tsconfig-paths": "^4.2.0",
     "typechain": "^8.1.1"
   },
   "files": [

packages/lively-diamond/scripts/1155/deploy.ts

@@ -1,9 +1,9 @@
+import { abi, bytecode } from "$artifacts/contracts/ERC1155-Diamond/Lively1155Diamond.sol/Lively1155Diamond.json";
+import { abi as initAbi } from "$artifacts/contracts/ERC1155-Diamond/upgradeInitializers/Diamond1155Init.sol/Diamond1155Init.json";
 import { Abi, Hex, createPublicClient, createWalletClient, encodeFunctionData, http } from "viem";
 import { mnemonicToAccount } from "viem/accounts";
 import { localhost } from "viem/chains";
 
-import { abi, bytecode } from "../../artifacts/contracts/ERC1155-Diamond/Lively1155Diamond.sol/Lively1155Diamond.json";
-import { abi as initAbi } from "../../artifacts/contracts/ERC1155-Diamond/upgradeInitializers/Diamond1155Init.sol/Diamond1155Init.json";
 import { cut1155, diamond1155Init } from "../../diamond-cut";
 import { defaultArgs } from "./defaultArgs";
 

packages/lively-diamond/test/1155/Diamond1155.test.ts

@@ -150,6 +150,7 @@ describe(`DiamondBase 1155 Test`, function () {
   });
 
   describe("PaymentSplitterUpdate", function () {
+    // FIXME: This test is failing
     it("Should allow the owner to update the payment splitter", async function () {
       const { paymentSplitterFacet, owner, livelyDev, signer1, signer2, diamondAddress } = await loadFixture(
         deployTokenFixture
@@ -203,6 +204,7 @@ describe(`DiamondBase 1155 Test`, function () {
       expect(await paymentSplitterFacet["releasable(address)"](livelyDev.address)).to.equal(ethers.parseEther("1.5"));
     });
 
+    // FIXME: This test is failing
     it("Should revert if the caller isn't a payee", async function () {
       const { paymentSplitterFacet, signer1, signer2 } = await loadFixture(deployTokenFixture);
 
@@ -228,6 +230,7 @@ describe(`DiamondBase 1155 Test`, function () {
       expect(await diamondFacet.exists(0)).to.equal(true);
     });
 
+    // FIXME: This test is failing
     it("Diamond should have the correct owner", async function () {
       const { owner, diamondFacet } = await loadFixture(deployTokenFixture);
       expect(await (diamondFacet as unknown as OwnableFacet).owner()).to.equal(owner.address);
@@ -614,6 +617,7 @@ describe(`DiamondBase 1155 Test`, function () {
   });
 
   describe("Allow list", function () {
+    // FIXME: This test is failing
     it("Should allow the allow list to be enabled and addresses added", async function () {
       const { signer1, allowListFacet } = await loadFixture(deployTokenFixture);
 

packages/lively-diamond/test/721/DiamondPrices.test.ts

@@ -4,7 +4,7 @@ import { ethers } from "hardhat";
 
 import { defaultArgs, deploy } from "../../scripts/deployDiamondVerify";
 import { deployAndWait } from "../../scripts/utils/deployHelpers";
-import { LivelyDiamondABI, PriceMock } from "../../types";
+import { PriceMock } from "../../types";
 
 describe(`DiamondPrice Test`, function () {
   async function deployTokenFixture() {
@@ -22,7 +22,8 @@ describe(`DiamondPrice Test`, function () {
 
     const contractAddress = await deploy(defaultArgs, { verify: false });
 
-    const contract = (await ethers.getContractAt("LivelyDiamondABI", contractAddress)) as unknown as LivelyDiamondABI;
+    // const contract = (await ethers.getContractAt("LivelyDiamondABI", contractAddress)) as unknown as LivelyDiamondABI;
+    const contract = await ethers.getContractAt("LivelyDiamond", contractAddress);
 
     const maxSupply = await contract["maxSupply()"]();
 

packages/lively-diamond/test/721/DiamondUSDC.test.ts

@@ -4,7 +4,7 @@ import { ethers } from "hardhat";
 
 import { defaultArgs, deploy } from "../../scripts/deployDiamondVerify";
 import { deployAndWait } from "../../scripts/utils/deployHelpers";
-import { LivelyDiamondABI, USDCMock } from "../../types";
+import { USDCMock } from "../../types";
 
 const USDC_ADDRESS = "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48";
 
@@ -24,7 +24,8 @@ describe(`DiamondUSDC Test`, function () {
 
     const contractAddress = await deploy(defaultArgs, { verify: false });
 
-    const contract = (await ethers.getContractAt("LivelyDiamondABI", contractAddress)) as unknown as LivelyDiamondABI;
+    // const contract = (await ethers.getContractAt("LivelyDiamondABI", contractAddress)) as unknown as LivelyDiamondABI;
+    const contract = await ethers.getContractAt("LivelyDiamond", contractAddress);
 
     const maxSupply = await contract["maxSupply()"]();
 

packages/lively-diamond/tsconfig.json

@@ -16,23 +16,24 @@
     "strict": true,
     "target": "ESNext",
     "paths": {
+      "$artifact": ["./artifacts"],
       "$artifacts/*": ["./artifacts/*"],
+
+      "$utils": ["./utils"],
       "$utils/*": ["./utils/*"],
+
+      "$scripts": ["./scripts"],
       "$scripts/*": ["./scripts/*"],
+
+      "$abi": ["./abi"],
       "$abi/*": ["./abi/*"],
+
+      "$bytecode": ["./bytecode"],
       "$bytecode/*": ["./bytecode/*"]
     }
   },
 
   "exclude": ["node_modules"],
-  "files": ["hardhat.config.ts", "optimizationEnabled.ts", "diamond-cut.ts", "scripts/1155/deploy.ts", "global.d.ts"],
-  "include": [
-    "src/**/*",
-    "tasks/**/*",
-    "test/**/*",
-    "deploy/**/*",
-    "scripts/**/*",
-    "bytecode/**/*",
-    "abi-bytecode/**/*"
-  ]
+  "files": ["hardhat.config.ts", "optimizationEnabled.ts", "diamond-cut.ts", "global.d.ts"],
+  "include": ["src/**/*", "tasks/**/*", "test/**/*", "deploy/**/*", "scripts/**/*", "bytecode/**/*"]
 }

packages/sdk-lively-protocol/package.json

@@ -7,7 +7,7 @@
 		"preview": "vite preview",
 		"package": "svelte-kit sync && svelte-package && publint",
 		"prepublishOnly": "npm run package",
-		"check": "svelte-kit sync && svelte-check --no-tsconfig",
+		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
 		"test": "vitest --run",
 		"test:unit": "vitest",

packages/sdk-lively-protocol/tsconfig.json

@@ -1,5 +1,6 @@
 {
 	"extends": "./.svelte-kit/tsconfig.json",
+	"root": true,
 	"compilerOptions": {
 		"allowJs": true,
 		"checkJs": true,
@@ -14,10 +15,19 @@
 		"experimentalDecorators": true,
 		"emitDecoratorMetadata": true,
 		"esModuleInterop": true,
-		"module": "NodeNext"
+		"module": "NodeNext",
+		"paths": {
+			"$lib": ["./src/lib"],
+			"$lib/*": ["./src/lib/*"],
+			"$artifacts/*": ["../lively-diamond/artifacts/*"],
+			"$utils/*": ["../lively-diamond/utils/*"],
+			"$scripts/*": ["../lively-diamond/scripts/*"],
+			"$abi/*": ["../lively-diamond/abi/*"],
+			"$bytecode/*": ["../lively-diamond/bytecode/*"]
+		}
 	},
 	"ts-node": {
 		"esm": true
 	},
-	"exclude": ["./packages/lively-diamond/"]
+	"exclude": ["**/lively-diamond/**/*", "packages/lively-diamond/**/*"]
 }