flowerpowerdao · ZenVoich · Jul 26, 2023 · Jul 27, 2023 · Jul 27, 2023 · Aug 2, 2023
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "power-equalizer"]
 	path = power-equalizer
 	url = https://github.com/flowerpowerdao/power-equalizer
-	branch = assets-refactoring
+	branch = main
diff --git a/README.md b/README.md
@@ -7,7 +7,6 @@
 - install [Vessel](https://github.com/dfinity/vessel)
 - install [Plug](https://plugwallet.ooo/)
 - clone the repository and run `git submodule init` and `git submodule update`. this pulls the submodules the project depends on
-- `cd power-equalizer` and run `vessel install && npm install` to install the depenedencies
 - run `npm install` from root
 - create a `set-deploy-env.zsh` file in the root directory according to the following example and replace the `WALLET_ADDRESS` with your Plug wallet address
 

diff --git a/index.html b/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/fpd-logo.svg" />
+    <link rel="icon" type="image/svg+xml" href="/node_modules/fpdao-ui/images/fpd-logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>FPDAO</title>
   </head>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,32 +13,39 @@
     "vite": "vite --port 3000",
     "build": "vite build",
     "serve": "vite preview",
-    "check": "svelte-check --tsconfig ./tsconfig.json"
+    "check": "svelte-check --tsconfig ./tsconfig.json",
+    "postinstall": "cd power-equalizer && vessel install && npm install"
   },
   "dependencies": {
-    "@dfinity/agent": "^0.15.1",
-    "@dfinity/candid": "^0.15.1",
-    "@dfinity/nns": "^0.10.0",
-    "@dfinity/principal": "^0.15.1",
-    "@dfinity/utils": "^0.0.6",
+    "@dfinity/agent": "^0.18.1",
+    "@dfinity/candid": "^0.18.1",
+    "@dfinity/nns": "^0.16.3",
+    "@dfinity/principal": "^0.18.1",
+    "@dfinity/utils": "^0.0.18",
     "@neoconfetti/svelte": "^1.0.0",
-    "date-fns": "^2.29.3",
+    "date-fns": "^2.30.0",
+    "fpdao-ui": "^1.0.6",
     "ic-stoic-identity": "^2.0.0"
   },
   "devDependencies": {
-    "@sveltejs/vite-plugin-svelte": "^2.0.2",
-    "@tailwindcss/typography": "^0.5.8",
-    "@tsconfig/svelte": "^3.0.0",
-    "autoprefixer": "^10.4.13",
-    "cssnano": "^5.1.14",
-    "postcss": "^8.4.20",
+    "@sveltejs/vite-plugin-svelte": "^2.4.3",
+    "@tailwindcss/typography": "^0.5.9",
+    "@tsconfig/svelte": "^5.0.0",
+    "autoprefixer": "^10.4.14",
+    "cssnano": "^6.0.1",
+    "postcss": "^8.4.27",
     "postcss-load-config": "^4.0.1",
-    "svelte": "^3.55.0",
-    "svelte-check": "^3.0.1",
-    "svelte-preprocess": "^5.0.0",
-    "tailwindcss": "^3.2.4",
-    "tslib": "^2.4.1",
-    "typescript": "^4.9.4",
-    "vite": "^4.3.9"
+    "svelte": "^4.1.1",
+    "svelte-check": "^3.4.6",
+    "svelte-preprocess": "^5.0.4",
+    "tailwindcss": "^3.3.3",
+    "tslib": "^2.6.1",
+    "typescript": "^5.1.6",
+    "vite": "^4.4.7"
+  },
+  "overrides": {
+    "@dfinity/candid": "^0.18.1",
+    "@dfinity/principal": "^0.18.1",
+    "@dfinity/agent": "^0.18.1"
   }
 }
diff --git a/power-equalizer b/power-equalizer
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/src/App.svelte b/src/App.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-  import "./global.css";
-  import Footer from "./components/Footer.svelte";
-  import Header from "./components/Header.svelte";
-  import Sale from "./pages/Sale.svelte";
-  import { store } from "./store";
   import { onMount } from "svelte";
+  import "fpdao-ui/styles/global.css";
+  import Header from "fpdao-ui/components/Header.svelte";
+  import Footer from "fpdao-ui/components/Footer.svelte";
+  import Sale from "./components/Sale.svelte";
+  import { authStore } from './store';
 
   onMount(async () => {
-    await store.checkConnections();
+    await authStore.checkConnections();
   });
 </script>
 
-<Header />
+<Header {authStore} />
 <Sale />
-<Footer />
+<Footer {authStore} />
diff --git a/src/assets/fonts/TWKEverett-Medium-web.woff2 b/src/assets/fonts/TWKEverett-Medium-web.woff2
diff --git a/src/assets/fonts/TWKEverett-Regular-web.woff2 b/src/assets/fonts/TWKEverett-Regular-web.woff2
diff --git a/src/assets/fonts/spacemono-italic.woff2 b/src/assets/fonts/spacemono-italic.woff2
diff --git a/src/assets/fonts/spacemono-regular.woff2 b/src/assets/fonts/spacemono-regular.woff2
diff --git a/src/assets/loading.gif b/src/assets/loading.gif
diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte
diff --git a/src/components/BitfinityButton.svelte b/src/components/BitfinityButton.svelte
diff --git a/src/components/Button.svelte b/src/components/Button.svelte
diff --git a/src/components/BuyNftButton.svelte b/src/components/BuyNftButton.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-  import Button from "./Button.svelte";
-  import Loader from "./Loader.svelte";
-  import { store } from "../store";
-  import LoginModal from "./LoginModal.svelte";
+  import Button from "fpdao-ui/components/Button.svelte";
+  import Loader from "fpdao-ui/components/Loader.svelte";
+  import LoginModal from "fpdao-ui/components/LoginModal.svelte";
+  import { store, authStore } from "../store";
   import BuyNftModal from "./BuyNftModal.svelte";
 
-  export let count, price, saleStatus;
+  export let price, saleStatus;
 
   let openLoginModal = false;
   let openBuyModal = false;
@@ -22,17 +22,17 @@
 <Button
   style={"max-w-[150px] lg:h-16 2xl:h-20"}
   disabled={saleStatus === "waiting"}
-  on:click={$store.isAuthed ? toggleBuyModal : toggleLoginModal}
+  on:click={$authStore.isAuthed ? toggleBuyModal : toggleLoginModal}
 >
   {#if $store.isBuying}
     <Loader class="h-14" />
   {:else}
-    BUY {count} NFT<br />FOR {(Number(price) / 100000000).toFixed(3)} ICP
+    BUY 1 NFT<br />FOR {(Number(price) / 100000000).toFixed(3)} ICP
   {/if}
 </Button>
 {#if openBuyModal}
-  <BuyNftModal {toggleBuyModal} {count} {price} />
+  <BuyNftModal {toggleBuyModal} {price} />
 {/if}
 {#if openLoginModal}
-  <LoginModal toggleModal={toggleLoginModal} />
+  <LoginModal {authStore} toggleModal={toggleLoginModal} />
 {/if}
diff --git a/src/components/BuyNftModal.svelte b/src/components/BuyNftModal.svelte
@@ -1,15 +1,14 @@
 <script lang="ts">
   import { confetti } from "@neoconfetti/svelte";
-  import Button from "./Button.svelte";
-  import Modal from "./Modal.svelte";
-  import { store } from "../store";
-  import spinner from "../assets/loading.gif";
-  import Loader from "./Loader.svelte";
+  import Button from "fpdao-ui/components/Button.svelte";
+  import Modal from "fpdao-ui/components/Modal.svelte";
+  import Loader from "fpdao-ui/components/Loader.svelte";
+  import spinner from "fpdao-ui/images/loading.gif";
+  import { store, authStore } from "../store";
   import { fromErr, fromOk, isErr } from "../utils";
   import { collection } from "../collection";
 
   export let toggleBuyModal;
-  export let count: bigint;
   export let price: bigint;
 
   let isDev = process.env.NODE_ENV;
@@ -24,17 +23,6 @@
 
   $: console.log(step);
 
-  //   the method signature of `reserver` asks for a subaccount.
-  // that parameter isn't used though so we just pass random bytes
-  const _getRandomBytes = (): number[] => {
-    var bs = [];
-    for (var i = 0; i < 32; i++) {
-      bs.push(Math.floor(Math.random() * 256));
-    }
-    // turn array of numbers into uint8 array
-    return bs;
-  };
-
   function reset() {
     step = "confirm";
     progressText = "";
@@ -52,15 +40,10 @@
     try {
       // reserve
       let startTime = Date.now();
-      let accountId = $store.accountId;
+      let accountId = $authStore.accountId;
       console.log("reserving for account", accountId);
 
-      let res = await $store.extActor.reserve(
-        price,
-        count,
-        accountId,
-        _getRandomBytes()
-      );
+      let res = await $store.extActor.reserve(accountId);
 
       if (isErr(res)) {
         throw fromErr(res); // will be caught at the end of the method
@@ -80,7 +63,7 @@
       // transfer ICP
       progressText = "Transferring ICP...";
       // this can potentially fail, will be caught at the end of the method
-      await store.transfer(payToAddress, priceToPay);
+      await authStore.transfer(payToAddress, priceToPay);
 
       // retrieve
       progressText = "Completing purchase...";
@@ -144,8 +127,8 @@
 <Modal title="Buy NFT" toggleModal={toggleBuyModal}>
   {#if step == "confirm"}
     <div class="dark:text-white lg:text-3xl 2xl:text-4xl">
-      Are you sure you want to continue with this purchase of <b>{count}</b>
-      NFT{count === 1n ? "" : "s"} for the total price of
+      Are you sure you want to continue with this purchase of <b>1</b>
+      NFT for the total price of
       <b>{(Number(price) / 100000000).toFixed(3)}</b> ICP? All transactions are final
       on confirmation and can't be reversed.
     </div>

diff --git a/src/components/Card.svelte b/src/components/Card.svelte
diff --git a/src/components/CollectionInfo.svelte b/src/components/CollectionInfo.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
+  import { onMount } from "svelte";
+  import formatDistance from "date-fns/formatDistance";
   import { collection } from "../collection";
   import type { SaleSettings } from "../declarations/ext/staging.did";
-  import { store } from "../store";
-  import formatDistance from "date-fns/formatDistance";
-  import { onMount } from "svelte";
+  import { store, authStore } from "../store";
   import BuyNftButton from "./BuyNftButton.svelte";
 
   let saleSettings: SaleSettings;
@@ -14,7 +14,7 @@
 
   let fetchData = async () => {
     try {
-      saleSettings = await $store.extActor.salesSettings($store.accountId);
+      saleSettings = await $store.extActor.salesSettings($authStore.accountId);
     } catch (err) {
       error = "Sale didn't start yet.";
     }
@@ -42,9 +42,9 @@
     }
   };
 
-  onMount(async () => {
+  onMount(() => {
     let timer = setInterval(fetchData, 3000);
-    await fetchData();
+    fetchData();
 
     return () => {
       clearInterval(timer);
@@ -107,9 +107,7 @@
     >
       <div
         class="h-8 bg-gray-800 text-xs font-medium text-blue-100 text-center p-0.5 leading-none rounded-full dark:bg-gray-200"
-        style="width: {(Number(saleSettings.remaining) /
-          Number(saleSettings.totalToSell)) *
-          100}%"
+        style="width: {(Number(saleSettings.remaining) / Number(saleSettings.totalToSell)) * 100}%"
       />
     </div>
 
@@ -125,9 +123,7 @@
           </div>
         {/if}
         <div class="flex flex-wrap justify-center gap-20">
-          {#each saleSettings.bulkPricing as [count, price]}
-            <BuyNftButton {count} {price} {saleStatus} />
-          {/each}
+          <BuyNftButton price={saleSettings.price} {saleStatus} />
         </div>
       </div>
     {:else if saleStatus == "ended"}

diff --git a/src/components/DarkMode.svelte b/src/components/DarkMode.svelte
diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte
diff --git a/src/components/Header.svelte b/src/components/Header.svelte
diff --git a/src/components/Loader.svelte b/src/components/Loader.svelte
diff --git a/src/components/Login.svelte b/src/components/Login.svelte
diff --git a/src/components/LoginModal.svelte b/src/components/LoginModal.svelte
diff --git a/src/components/Logout.svelte b/src/components/Logout.svelte
diff --git a/src/components/Menu.svelte b/src/components/Menu.svelte
diff --git a/src/components/Modal.svelte b/src/components/Modal.svelte
diff --git a/src/components/PlugButton.svelte b/src/components/PlugButton.svelte
diff --git a/src/pages/Sale.svelte → src/components/Sale.svelte b/src/pages/Sale.svelte → src/components/Sale.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import CollectionInfo from "../components/CollectionInfo.svelte";
+  import CollectionInfo from "./CollectionInfo.svelte";
 </script>
 
 <div

diff --git a/src/components/StoicButton.svelte b/src/components/StoicButton.svelte
diff --git a/src/declarations/ext/index.js b/src/declarations/ext/index.js
@@ -4,8 +4,14 @@ import { Actor, HttpAgent } from "@dfinity/agent";
 import { idlFactory } from "./staging.did.js";
 export { idlFactory } from "./staging.did.js";
 
-// CANISTER_ID is replaced by webpack based on node environment
-export const canisterId = process.env.STAGING_CANISTER_ID;
+/* CANISTER_ID is replaced by webpack based on node environment
+ * Note: canister environment variable will be standardized as
+ * process.env.CANISTER_ID_<CANISTER_NAME_UPPERCASE>
+ * beginning in dfx 0.15.0
+ */
+export const canisterId =
+  process.env.CANISTER_ID_STAGING ||
+  process.env.STAGING_CANISTER_ID;
 
 export const createActor = (canisterId, options = {}) => {
   const agent = options.agent || new HttpAgent({ ...options.agentOptions });

diff --git a/src/declarations/ext/staging.did b/src/declarations/ext/staging.did
diff --git a/src/declarations/ext/staging.did.d.ts b/src/declarations/ext/staging.did.d.ts
diff --git a/src/declarations/ext/staging.did.js b/src/declarations/ext/staging.did.js
diff --git a/src/global.css b/src/global.css
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_1.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_1.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_10.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_10.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_11.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_11.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_12.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_12.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_13.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_13.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_14.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_14.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_15.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_15.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_16.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_16.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_17.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_17.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_18.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_18.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_2.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_2.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_3.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_3.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_4.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_4.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_5.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_5.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_6.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_6.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_7.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_7.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_8.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_8.svg
diff --git a/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_9.svg b/src/public/BP_FPDAO_Logo_BlackOnWhite_sRGB_9.svg
diff --git a/src/public/fpd-logo.svg b/src/public/fpd-logo.svg
diff --git a/src/store.ts b/src/store.ts
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
@@ -5,7 +5,11 @@ const typography = require("@tailwindcss/typography");
 const config = {
   darkMode: "class",
   mode: "jit",
-  content: ["index.html", "./src/**/*.{html,js,svelte,ts}"],
+  content: [
+    "index.html",
+    "./src/**/*.{html,js,svelte,ts}",
+    "./node_modules/fpdao-ui/**/*",
+  ],
   theme: {
     extend: {
       boxShadow: {

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,22 +1,22 @@
 {
-    "compilerOptions": {
-        "moduleResolution": "node",
-        "target": "esnext",
-        "module": "esnext",
-        "skipLibCheck": true,
-        "resolveJsonModule": true,
-        "esModuleInterop": true,
-        "noEmit": true,
-        "allowSyntheticDefaultImports": true,
-        "forceConsistentCasingInFileNames": true,
-        "allowJs": true,
-        "types": ["vite/client", "svelte", "node"],
-        "baseUrl": "."
-    },
-    "include": [
-        "src/**/*.d.ts",
-        "src/**/*.ts",
-        "src/**/*.js",
-        "src/**/*.svelte"
-    ]
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "target": "ES2020",
+    "module": "ES2020",
+    "skipLibCheck": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "noEmit": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "allowJs": true,
+    "types": ["vite/client", "svelte"],
+    "baseUrl": "."
+  },
+  "include": [
+    "src/**/*.d.ts",
+    "src/**/*.ts",
+    "src/**/*.js",
+    "src/**/*.svelte"
+  ]
 }
+6 −4		.github/workflows/test.yml
+8 −4		.gitignore
+19 −3		INIT_ARGS.md
+51 −59		README.md
+0 −0		assets/.gitkeep
+6 −0		assets/.ic-assets.json
+2 −2		backup/README.md
+9 −0		backup/restore.ts
+60 −31		declarations/main/staging.did
+47 −20		declarations/main/staging.did.d.ts
+37 −22		declarations/main/staging.did.js
+93 −55		deploy/deploy.ts
+0 −25		deploy/parallel.ts
+5 −5		deploy/utils.ts
+1 −5		dfx.json
+1 −1		initArgs.local.did
+10 −0		mops.toml
+7 −1		package-lock.json
+15 −13		package.json
+42 −20		src/CanisterAssets/lib.mo
+8 −6		src/CanisterAssets/types.mo
+8 −12		src/Disburser/lib.mo
+1 −1		src/Ext/lib.mo
+3 −11		src/Http/lib.mo
+0 −2		src/Http/types.mo
+51 −28		src/Marketplace/lib.mo
+24 −1		src/Marketplace/types.mo
+56 −78		src/Sale/lib.mo
+2 −5		src/Sale/types.mo
+5 −11		src/Shuffle/lib.mo
+3 −0		src/Tokens/lib.mo
+54 −57		src/main.mo
+44 −1		src/utils.mo
+0 −0		test/e2e/apply-env.ts
+5 −5		test/e2e/backup-assets/backup-assets.test.ts
+0 −0		test/e2e/backup-assets/env.ts
+5 −14		test/e2e/backup-restore/backup-restore.test.ts
+0 −0		test/e2e/backup-restore/env.ts
+0 −0		test/e2e/consts.ts
+0 −0		test/e2e/create-agent.ts
+0 −0		test/e2e/default-env.ts
+1 −1		test/e2e/fees/0-fees.test.ts
+5 −3		test/e2e/fees/1-different-frontends.test.ts
+0 −0		test/e2e/fees/env.ts
+0 −0		test/e2e/generate-identity.ts
+0 −0		test/e2e/highload-sale/env.ts
+0 −0		test/e2e/highload-sale/highload-sale.test.ts
+0 −0		test/e2e/initArgs.template.did
+0 −0		test/e2e/marketplace/env.ts
+0 −0		test/e2e/marketplace/list-delist.test.ts
+0 −0		test/e2e/marketplace/list-lock-delist.test.ts
+0 −0		test/e2e/marketplace/marketplace-buy-with-insufficient-funds.test.ts
+0 −0		test/e2e/marketplace/marketplace-buy.test.ts
+0 −0		test/e2e/marketplace/marketplace.test.ts
+0 −0		test/e2e/multi-asset/env.ts
+0 −0		test/e2e/multi-asset/multi-asset.test.ts
+0 −0		test/e2e/open-edition/env.ts
+1 −1		test/e2e/open-edition/open-edition.test.ts
+0 −0		test/e2e/pending-sale/access.test.ts
+0 −0		test/e2e/pending-sale/env.ts
+1 −2		test/e2e/pending-sale/pending-sale.test.ts
+0 −0		test/e2e/public-sale/env.ts
+1 −1		test/e2e/public-sale/public-sale.test.ts
+0 −0		test/e2e/restore/env.ts
+0 −0		test/e2e/setup.ts
+0 −0		test/e2e/single-asset-delayed-reveal/env.ts
+0 −0		test/e2e/single-asset-delayed-reveal/single-asset-delayed-reveal.test.ts
+0 −0		test/e2e/single-asset/env.ts
+0 −0		test/e2e/single-asset/single-asset.test.ts
+0 −0		test/e2e/sold-out/env.ts
+0 −0		test/e2e/sold-out/sold-out.test.ts
+5 −5		test/e2e/user.ts
+2 −2		test/e2e/utils.ts
+6 −2		test/e2e/well-known-users.ts
+0 −0		test/e2e/whitelist-sale/env.ts
+41 −1		test/e2e/whitelist-sale/whitelist-sale.test.ts
+0 −0		test/e2e/whitelist-slots/env.ts
+20 −6		test/e2e/whitelist-slots/whitelist-slots.test.ts
+55 −0		test/unit/shuffleBuffer.test.mo
+2 −91		vite.config.ts