From f5daa4693861ddfeff32650286e90cfc0646fed7 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 19:08:44 +0200 Subject: [PATCH 01/50] Add files via upload --- src/tokens/fet.ts | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/tokens/fet.ts diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts new file mode 100644 index 00000000..adfcc7b7 --- /dev/null +++ b/src/tokens/fet.ts @@ -0,0 +1,26 @@ +import { defaultFetcherOptions, SupplyFetcher } from "../types"; +import { getAmountInAddresses, getBlockFrostInstance } from "../utils"; + +const FET = + "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a"; + +const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { + const blockFrost = getBlockFrostInstance(options); + const total = 2e8; + const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ + "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", // DEX funds + "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", // Reserve funds + "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", // Development funds + "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", // Fraction Estate funds + "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", // Marketing funds + "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", // Founder - Daniel Johnsen + "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", // Charity funds + ]); + const treasury = Number(treasuryRaw); + return { + circulating: (total - treasury).toString(), + total: total.toString(), + }; +}; + +export default fetcher; \ No newline at end of file From 1cb1789316cb3c03b183d43a12454266063791b6 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 19:13:19 +0200 Subject: [PATCH 02/50] Update index.ts add fet --- src/index.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/index.ts b/src/index.ts index a7ce86fb..b65bc7d2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,4 @@ +import fetFetcher from "./tokens/fet"; import aadaFetcher from "./tokens/aada"; import agcFetcher from "./tokens/agc"; import agixFetcher from "./tokens/agix"; @@ -100,6 +101,8 @@ export const supplyFetchers: Record = { vyfiFetcher, a0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235484f534b59: hoskyFetcher, + 815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa: + fetFetcher, dda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fb0014df1047454e53: gensFetcher, fbae99b8679369079a7f6f0da14a2cf1c2d6bfd3afdf3a96a64ab67a0014df1047454e5358: From ab270c34da2d33cf7345490b00492cb4c1bbae4e Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 19:20:52 +0200 Subject: [PATCH 03/50] Update index.ts --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index b65bc7d2..0bc22522 100644 --- a/src/index.ts +++ b/src/index.ts @@ -101,7 +101,7 @@ export const supplyFetchers: Record = { vyfiFetcher, a0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235484f534b59: hoskyFetcher, - 815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa: + 815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa: fetFetcher, dda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fb0014df1047454e53: gensFetcher, From 0a6da6f1ec21e0e26ec8dd95cad1ddebb48910c8 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 19:45:15 +0200 Subject: [PATCH 04/50] Update index.ts From 58ca88c22788c4a09030bee14fcc314f1884016a Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 19:49:06 +0200 Subject: [PATCH 05/50] Update index.ts --- src/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index 0bc22522..79129dbd 100644 --- a/src/index.ts +++ b/src/index.ts @@ -101,8 +101,7 @@ export const supplyFetchers: Record = { vyfiFetcher, a0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235484f534b59: hoskyFetcher, - 815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa: - fetFetcher, + 815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa: fetFetcher, dda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fb0014df1047454e53: gensFetcher, fbae99b8679369079a7f6f0da14a2cf1c2d6bfd3afdf3a96a64ab67a0014df1047454e5358: From 47e844dfe2f01808c3a549727c188fbf62005280 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 19:58:21 +0200 Subject: [PATCH 06/50] Update index.ts --- src/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 79129dbd..6464ce65 100644 --- a/src/index.ts +++ b/src/index.ts @@ -101,7 +101,8 @@ export const supplyFetchers: Record = { vyfiFetcher, a0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235484f534b59: hoskyFetcher, - 815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa: fetFetcher, + "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa": + fetFetcher, dda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fb0014df1047454e53: gensFetcher, fbae99b8679369079a7f6f0da14a2cf1c2d6bfd3afdf3a96a64ab67a0014df1047454e5358: From bc84fb82a0dbb8b149bb26203955f9015d81d33f Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:03:59 +0200 Subject: [PATCH 07/50] Update index.ts --- src/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 79129dbd..6464ce65 100644 --- a/src/index.ts +++ b/src/index.ts @@ -101,7 +101,8 @@ export const supplyFetchers: Record = { vyfiFetcher, a0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235484f534b59: hoskyFetcher, - 815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa: fetFetcher, + "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa": + fetFetcher, dda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fb0014df1047454e53: gensFetcher, fbae99b8679369079a7f6f0da14a2cf1c2d6bfd3afdf3a96a64ab67a0014df1047454e5358: From 81d3ae601041af3cbafad82be874a3563c1a58b5 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:11:43 +0200 Subject: [PATCH 08/50] Update index.ts --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 6464ce65..0bc22522 100644 --- a/src/index.ts +++ b/src/index.ts @@ -101,7 +101,7 @@ export const supplyFetchers: Record = { vyfiFetcher, a0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235484f534b59: hoskyFetcher, - "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa": + 815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa: fetFetcher, dda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fb0014df1047454e53: gensFetcher, From 50c2fbdb157ef6123a669a6a10a0d15b12512089 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:19:57 +0200 Subject: [PATCH 09/50] Update index.ts --- src/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index 0bc22522..6e7e874b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -101,8 +101,7 @@ export const supplyFetchers: Record = { vyfiFetcher, a0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235484f534b59: hoskyFetcher, - 815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa: - fetFetcher, + "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa": fetFetcher, dda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fb0014df1047454e53: gensFetcher, fbae99b8679369079a7f6f0da14a2cf1c2d6bfd3afdf3a96a64ab67a0014df1047454e5358: From a14edd4d4c356292491acf72df48570277323280 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:25:46 +0200 Subject: [PATCH 10/50] Update index.ts --- src/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 6e7e874b..f0bc5348 100644 --- a/src/index.ts +++ b/src/index.ts @@ -101,7 +101,6 @@ export const supplyFetchers: Record = { vyfiFetcher, a0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235484f534b59: hoskyFetcher, - "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa": fetFetcher, dda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fb0014df1047454e53: gensFetcher, fbae99b8679369079a7f6f0da14a2cf1c2d6bfd3afdf3a96a64ab67a0014df1047454e5358: @@ -182,4 +181,6 @@ export const supplyFetchers: Record = { utilFetcher, a3931691f5c4e65d01c429e473d0dd24c51afdb6daf88e632a6c1e516f7263666178746f6b656e: factFetcher, + "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa": + fetFetcher, }; From 4efb59d23f3dd91f68a5982453291a9f16dc88ae Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:27:04 +0200 Subject: [PATCH 11/50] Update index.ts --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index f0bc5348..d4da5027 100644 --- a/src/index.ts +++ b/src/index.ts @@ -181,6 +181,6 @@ export const supplyFetchers: Record = { utilFetcher, a3931691f5c4e65d01c429e473d0dd24c51afdb6daf88e632a6c1e516f7263666178746f6b656e: factFetcher, - "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa": + "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa": fetFetcher, }; From 531e443ff38580689e86bc444d106b1a1f5b48e7 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:53:12 +0200 Subject: [PATCH 12/50] Update index.ts --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index d4da5027..e8512bdf 100644 --- a/src/index.ts +++ b/src/index.ts @@ -181,6 +181,6 @@ export const supplyFetchers: Record = { utilFetcher, a3931691f5c4e65d01c429e473d0dd24c51afdb6daf88e632a6c1e516f7263666178746f6b656e: factFetcher, - "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa": + "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a": fetFetcher, }; From 432adca041d21bcd9c6d154ac16b31cc85f35ada Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:56:07 +0200 Subject: [PATCH 13/50] Update fet.ts --- src/tokens/fet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index adfcc7b7..ba0560ce 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -23,4 +23,4 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { }; }; -export default fetcher; \ No newline at end of file +export default fetcher; From 90a2115a1d33c8e83fc6701be07a5ada755d057a Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 21:04:23 +0200 Subject: [PATCH 14/50] Update fet.ts --- src/tokens/fet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index ba0560ce..551f9c9a 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -6,7 +6,7 @@ const FET = const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { const blockFrost = getBlockFrostInstance(options); - const total = 2e8; + const total = 200000000; const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", // DEX funds "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", // Reserve funds From a8143148cbd7be6e6401bee882e9278b661f0751 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 21:54:43 +0200 Subject: [PATCH 15/50] Update fet.ts --- src/tokens/fet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 551f9c9a..c6cd1586 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -6,7 +6,7 @@ const FET = const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { const blockFrost = getBlockFrostInstance(options); - const total = 200000000; + const total = 200_000_000; const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", // DEX funds "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", // Reserve funds From 14bc2e04cb18bf8a2a0d98a6bf319fc873699088 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 22:03:49 +0200 Subject: [PATCH 16/50] Update index.ts --- src/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index e8512bdf..69842284 100644 --- a/src/index.ts +++ b/src/index.ts @@ -181,6 +181,5 @@ export const supplyFetchers: Record = { utilFetcher, a3931691f5c4e65d01c429e473d0dd24c51afdb6daf88e632a6c1e516f7263666178746f6b656e: factFetcher, - "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a": - fetFetcher, + "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a": fetFetcher, }; From 34156b39f9934d4d12566eb904840f5cf5f16507 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 22:09:40 +0200 Subject: [PATCH 17/50] Update fet.ts --- src/tokens/fet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index c6cd1586..ba0560ce 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -6,7 +6,7 @@ const FET = const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { const blockFrost = getBlockFrostInstance(options); - const total = 200_000_000; + const total = 2e8; const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", // DEX funds "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", // Reserve funds From d62754577703d3af96eabeaee98e8090b7b3dc4c Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 22:13:58 +0200 Subject: [PATCH 18/50] Update fet.ts --- src/tokens/fet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index ba0560ce..ac0d59fc 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -13,7 +13,7 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", // Development funds "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", // Fraction Estate funds "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", // Marketing funds - "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", // Founder - Daniel Johnsen + "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", // Founder Daniel Johnsen "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", // Charity funds ]); const treasury = Number(treasuryRaw); From 18c36d1468669401089884d96d675131fd9db691 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 22:16:10 +0200 Subject: [PATCH 19/50] Update fet.ts --- src/tokens/fet.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index ac0d59fc..99b4426e 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -1,8 +1,7 @@ import { defaultFetcherOptions, SupplyFetcher } from "../types"; import { getAmountInAddresses, getBlockFrostInstance } from "../utils"; -const FET = - "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a"; +const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a"; const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { const blockFrost = getBlockFrostInstance(options); From 66317d45435e8b7b185a0199ad65878a359a66dc Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 22:34:12 +0200 Subject: [PATCH 20/50] Update fet.ts From 95f2a1d556fe7adb3799b9ffd92c244bdc5d0259 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 22:37:56 +0200 Subject: [PATCH 21/50] Update fet.ts --- src/tokens/fet.ts | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 99b4426e..0d814aba 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -4,22 +4,22 @@ import { getAmountInAddresses, getBlockFrostInstance } from "../utils"; const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a"; const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { - const blockFrost = getBlockFrostInstance(options); - const total = 2e8; - const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ - "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", // DEX funds - "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", // Reserve funds - "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", // Development funds - "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", // Fraction Estate funds - "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", // Marketing funds - "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", // Founder Daniel Johnsen - "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", // Charity funds - ]); - const treasury = Number(treasuryRaw); - return { - circulating: (total - treasury).toString(), - total: total.toString(), - }; + const blockFrost = getBlockFrostInstance(options); + const total = 2e8; + const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ + "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", // DEX funds + "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", // Reserve funds + "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", // Development funds + "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", // Fraction Estate funds + "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", // Marketing funds + "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", // Founder Daniel Johnsen + "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", // Charity funds + ]); + const treasury = Number(treasuryRaw); + return { + circulating: (total - treasury).toString(), + total: total.toString(), + }; }; export default fetcher; From 7650f92fdebbba7c9a08da1d574eb0d0f7a0236c Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 23:29:20 +0200 Subject: [PATCH 22/50] Update index.ts --- src/index.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 757aea61..6464ce65 100644 --- a/src/index.ts +++ b/src/index.ts @@ -183,5 +183,4 @@ export const supplyFetchers: Record = { utilFetcher, a3931691f5c4e65d01c429e473d0dd24c51afdb6daf88e632a6c1e516f7263666178746f6b656e: factFetcher, - "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a": fetFetcher, }; From 48184361a91446466ea4c166a1befa91570e3c1c Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 23:32:57 +0200 Subject: [PATCH 23/50] Update index.ts --- src/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index 6464ce65..6e7e874b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -101,8 +101,7 @@ export const supplyFetchers: Record = { vyfiFetcher, a0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235484f534b59: hoskyFetcher, - "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa": - fetFetcher, + "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa": fetFetcher, dda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fb0014df1047454e53: gensFetcher, fbae99b8679369079a7f6f0da14a2cf1c2d6bfd3afdf3a96a64ab67a0014df1047454e5358: From 6cd0926f8aca8f59a289a846e95f93b261dd52f5 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 23:33:51 +0200 Subject: [PATCH 24/50] Update fet.ts --- src/tokens/fet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 0d814aba..944a39ca 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -4,7 +4,7 @@ import { getAmountInAddresses, getBlockFrostInstance } from "../utils"; const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a"; const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { - const blockFrost = getBlockFrostInstance(options); + const blockFrost = getBlockFrostInstance(options); const total = 2e8; const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", // DEX funds From 6e9ebc45f68544ca04801932d251f752738d247f Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 23:37:17 +0200 Subject: [PATCH 25/50] Update fet.ts From f4e3a062a7604e7a17677800bc359ca10461f2b3 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 23:37:54 +0200 Subject: [PATCH 26/50] Update fet.ts --- src/tokens/fet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 944a39ca..125a6e4b 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -22,4 +22,4 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { }; }; -export default fetcher; +export default fetcher; From d03d869be74f564d1bf77cfda23a22c7acadd2f4 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 23:39:01 +0200 Subject: [PATCH 27/50] Update fet.ts --- src/tokens/fet.ts | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 125a6e4b..9452adba 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -5,21 +5,21 @@ const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a"; const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { const blockFrost = getBlockFrostInstance(options); - const total = 2e8; - const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ - "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", // DEX funds - "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", // Reserve funds - "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", // Development funds - "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", // Fraction Estate funds - "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", // Marketing funds - "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", // Founder Daniel Johnsen - "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", // Charity funds - ]); - const treasury = Number(treasuryRaw); - return { - circulating: (total - treasury).toString(), - total: total.toString(), - }; + const total = 2e8; + const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ + "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", // DEX funds + "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", // Reserve funds + "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", // Development funds + "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", // Fraction Estate funds + "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", // Marketing funds + "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", // Founder - Daniel Johnsen + "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", // Charity funds + ]); + const treasury = Number(treasuryRaw); + return { + circulating: (total - treasury).toString(), + total: total.toString(), + }; }; -export default fetcher; +export default fetcher; From cc84969bf94d8245ca767a4defc1bf30b085dfcf Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 23:45:08 +0200 Subject: [PATCH 28/50] Update fet.ts --- src/tokens/fet.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 9452adba..f7d1ac5a 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -4,18 +4,18 @@ import { getAmountInAddresses, getBlockFrostInstance } from "../utils"; const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a"; const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { + const total = 200e6; const blockFrost = getBlockFrostInstance(options); - const total = 2e8; const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ - "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", // DEX funds - "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", // Reserve funds - "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", // Development funds - "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", // Fraction Estate funds - "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", // Marketing funds - "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", // Founder - Daniel Johnsen - "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", // Charity funds + "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", + "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", + "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", + "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", + "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", + "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", + "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", ]); - const treasury = Number(treasuryRaw); + const treasury = Number(treasuryRaw) / 1; return { circulating: (total - treasury).toString(), total: total.toString(), From e8945c758301359f139266d3a527aba0823ccbe9 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 23:46:40 +0200 Subject: [PATCH 29/50] Update fet.ts --- src/tokens/fet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index f7d1ac5a..c087b392 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -15,7 +15,7 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", ]); - const treasury = Number(treasuryRaw) / 1; + const treasury = Number(treasuryRaw) / 1e4; return { circulating: (total - treasury).toString(), total: total.toString(), From dc45c5a3c6d8767c3d541e8fcd1627fe0a4965dc Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Tue, 19 Sep 2023 23:48:18 +0200 Subject: [PATCH 30/50] Update fet.ts --- src/tokens/fet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index c087b392..c7755ed5 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -15,7 +15,7 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", ]); - const treasury = Number(treasuryRaw) / 1e4; + const treasury = Number(treasuryRaw); return { circulating: (total - treasury).toString(), total: total.toString(), From 81dd3e8af256350a5ecbbe14237036143260546b Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Wed, 20 Sep 2023 07:06:54 +0200 Subject: [PATCH 31/50] Create webpack.yml --- .github/workflows/webpack.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/webpack.yml diff --git a/.github/workflows/webpack.yml b/.github/workflows/webpack.yml new file mode 100644 index 00000000..b95c8ed9 --- /dev/null +++ b/.github/workflows/webpack.yml @@ -0,0 +1,28 @@ +name: NodeJS with Webpack + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [14.x, 16.x, 18.x] + + steps: + - uses: actions/checkout@v3 + + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + + - name: Build + run: | + npm install + npx webpack From 2b646d012fb9f10f4d742ddffd3c641873e500c4 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Wed, 20 Sep 2023 05:14:14 +0000 Subject: [PATCH 32/50] modified: src/index.ts modified: src/tokens/fet.ts --- src/index.ts | 2 +- src/tokens/fet.ts | 50 +++++++++++++++++++++++------------------------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/index.ts b/src/index.ts index 6e7e874b..87f4fa51 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,4 +1,3 @@ -import fetFetcher from "./tokens/fet"; import aadaFetcher from "./tokens/aada"; import agcFetcher from "./tokens/agc"; import agixFetcher from "./tokens/agix"; @@ -21,6 +20,7 @@ import djedFetcher from "./tokens/djed"; import empFetcher from "./tokens/emp"; import encsFetcher from "./tokens/encs"; import factFetcher from "./tokens/fact"; +import fetFetcher from "./tokens/fet"; import flacFetcher from "./tokens/flac"; import gensFetcher from "./tokens/gens"; import gensxFetcher from "./tokens/gensx"; diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index c7755ed5..081f000c 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -1,25 +1,25 @@ -import { defaultFetcherOptions, SupplyFetcher } from "../types"; -import { getAmountInAddresses, getBlockFrostInstance } from "../utils"; - -const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a"; - -const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { - const total = 200e6; - const blockFrost = getBlockFrostInstance(options); - const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ - "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", - "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", - "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", - "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", - "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", - "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", - "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", - ]); - const treasury = Number(treasuryRaw); - return { - circulating: (total - treasury).toString(), - total: total.toString(), - }; -}; - -export default fetcher; +import { defaultFetcherOptions, SupplyFetcher } from "../types"; +import { getAmountInAddresses, getBlockFrostInstance } from "../utils"; + +const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a"; + +const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { + const total = 200e6; + const blockFrost = getBlockFrostInstance(options); + const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ + "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", + "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", + "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", + "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", + "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", + "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", + "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", + ]); + const treasury = Number(treasuryRaw); + return { + circulating: (total - treasury).toString(), + total: total.toString(), + }; +}; + +export default fetcher; From 2b7bdf121066eb3c148f01fa7bfec5a4df04bc43 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Wed, 20 Sep 2023 05:49:03 +0000 Subject: [PATCH 33/50] new file: .vscode/settings.json --- .vscode/settings.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..b242572e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "githubPullRequests.ignoredPullRequestBranches": [ + "main" + ] +} \ No newline at end of file From e4bccead2cfb8821bfc41c6ac60f8287095bc5f3 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Wed, 20 Sep 2023 08:07:13 +0200 Subject: [PATCH 34/50] Delete .github/workflows/webpack.yml --- .github/workflows/webpack.yml | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 .github/workflows/webpack.yml diff --git a/.github/workflows/webpack.yml b/.github/workflows/webpack.yml deleted file mode 100644 index b95c8ed9..00000000 --- a/.github/workflows/webpack.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: NodeJS with Webpack - -on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] - -jobs: - build: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [14.x, 16.x, 18.x] - - steps: - - uses: actions/checkout@v3 - - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} - - - name: Build - run: | - npm install - npx webpack From d0ea47bde29ae29216d57e14ad7eab00ded4cbf5 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Wed, 20 Sep 2023 08:07:33 +0200 Subject: [PATCH 35/50] Delete .vscode/settings.json --- .vscode/settings.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index b242572e..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "githubPullRequests.ignoredPullRequestBranches": [ - "main" - ] -} \ No newline at end of file From c5e2a78aa7608914e7ef7b8939606f4c747ca627 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:06:44 +0200 Subject: [PATCH 36/50] Update index.ts --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 87f4fa51..217d006b 100644 --- a/src/index.ts +++ b/src/index.ts @@ -101,7 +101,7 @@ export const supplyFetchers: Record = { vyfiFetcher, a0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235484f534b59: hoskyFetcher, - "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25aa": fetFetcher, + "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a4672616374696f6e2045737461746520546f6b656e": fetFetcher, dda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fb0014df1047454e53: gensFetcher, fbae99b8679369079a7f6f0da14a2cf1c2d6bfd3afdf3a96a64ab67a0014df1047454e5358: From 27588390c30442a78cbda0f41ad3d4ce8ef2814c Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:07:22 +0200 Subject: [PATCH 37/50] Update fet.ts --- src/tokens/fet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 081f000c..8ae032f4 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -1,7 +1,7 @@ import { defaultFetcherOptions, SupplyFetcher } from "../types"; import { getAmountInAddresses, getBlockFrostInstance } from "../utils"; -const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a"; +const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a4672616374696f6e2045737461746520546f6b656e"; const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { const total = 200e6; From a23f3fb8bf67c94b73bd26725d89fdf6e2f35a30 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Wed, 20 Sep 2023 19:10:59 +0200 Subject: [PATCH 38/50] Update fet.ts --- src/tokens/fet.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 0f034a77..8ae032f4 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -3,7 +3,6 @@ import { getAmountInAddresses, getBlockFrostInstance } from "../utils"; const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a4672616374696f6e2045737461746520546f6b656e"; - const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { const total = 200e6; const blockFrost = getBlockFrostInstance(options); From 0aac73bac6d80fddeeb017af30b439eeb91de96e Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Wed, 20 Sep 2023 17:13:37 +0000 Subject: [PATCH 39/50] modified: src/index.ts modified: src/tokens/fet.ts --- .vscode/settings.json | 5 +++++ src/index.ts | 3 ++- src/tokens/fet.ts | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..b242572e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "githubPullRequests.ignoredPullRequestBranches": [ + "main" + ] +} \ No newline at end of file diff --git a/src/index.ts b/src/index.ts index 217d006b..6163b22c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -101,7 +101,8 @@ export const supplyFetchers: Record = { vyfiFetcher, a0028f350aaabe0545fdcb56b039bfb08e4bb4d8c4d7c3c7d481c235484f534b59: hoskyFetcher, - "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a4672616374696f6e2045737461746520546f6b656e": fetFetcher, + "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a4672616374696f6e2045737461746520546f6b656e": + fetFetcher, dda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fb0014df1047454e53: gensFetcher, fbae99b8679369079a7f6f0da14a2cf1c2d6bfd3afdf3a96a64ab67a0014df1047454e5358: diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 8ae032f4..c76dc619 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -1,7 +1,8 @@ import { defaultFetcherOptions, SupplyFetcher } from "../types"; import { getAmountInAddresses, getBlockFrostInstance } from "../utils"; -const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a4672616374696f6e2045737461746520546f6b656e"; +const FET = + "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a4672616374696f6e2045737461746520546f6b656e"; const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { const total = 200e6; From a8f3f20cc54eabc87febf509a7f31f305f2ff07a Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Wed, 20 Sep 2023 19:16:44 +0200 Subject: [PATCH 40/50] fet --- .vscode/settings.json | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index b242572e..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "githubPullRequests.ignoredPullRequestBranches": [ - "main" - ] -} \ No newline at end of file From 72e439353d287cf4e9b30a06957f2d3ceda89b2f Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Thu, 21 Sep 2023 06:27:49 +0200 Subject: [PATCH 41/50] Update fet.ts --- src/tokens/fet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index c76dc619..595123bd 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -18,7 +18,7 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { ]); const treasury = Number(treasuryRaw); return { - circulating: (total - treasury).toString(), + circulating: (total - treasury).toString() / 1e10, total: total.toString(), }; }; From 71d614cf9ceaca0858dee141afd4d67fa33029a9 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Thu, 21 Sep 2023 07:25:02 +0200 Subject: [PATCH 42/50] Update fet.ts --- src/tokens/fet.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 595123bd..02281c1c 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -5,7 +5,7 @@ const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a4672616374696f6e2045737461746520546f6b656e"; const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { - const total = 200e6; + const total = 200e16; const blockFrost = getBlockFrostInstance(options); const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", @@ -19,7 +19,7 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { const treasury = Number(treasuryRaw); return { circulating: (total - treasury).toString() / 1e10, - total: total.toString(), + total: total.toString() / 1e10, }; }; From b69828faa6d3c7f02a5b0af3a0752c5ea577a939 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Thu, 21 Sep 2023 08:04:20 +0200 Subject: [PATCH 43/50] Update fet.ts --- src/tokens/fet.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 02281c1c..595123bd 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -5,7 +5,7 @@ const FET = "815418a1b078a259e678ecccc9d7eac7648d10b88f6f75ce2db8a25a4672616374696f6e2045737461746520546f6b656e"; const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { - const total = 200e16; + const total = 200e6; const blockFrost = getBlockFrostInstance(options); const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", @@ -19,7 +19,7 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { const treasury = Number(treasuryRaw); return { circulating: (total - treasury).toString() / 1e10, - total: total.toString() / 1e10, + total: total.toString(), }; }; From 7fac382356adc064014b543fbc635e0e067c1331 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Thu, 21 Sep 2023 08:10:39 +0200 Subject: [PATCH 44/50] Update fet.ts --- src/tokens/fet.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 595123bd..7c9dff36 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -16,9 +16,9 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", ]); - const treasury = Number(treasuryRaw); + const treasury = Number(treasuryRaw) / 1e10; return { - circulating: (total - treasury).toString() / 1e10, + circulating: (total - treasury).toString(), total: total.toString(), }; }; From 6fa8adf604bb11320d3f3d82c932d813d4984140 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Thu, 21 Sep 2023 16:33:44 +0200 Subject: [PATCH 45/50] Update fet.ts --- src/tokens/fet.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 7c9dff36..6ba9cd1d 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -1,3 +1,4 @@ +``` import { defaultFetcherOptions, SupplyFetcher } from "../types"; import { getAmountInAddresses, getBlockFrostInstance } from "../utils"; @@ -7,6 +8,8 @@ const FET = const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { const total = 200e6; const blockFrost = getBlockFrostInstance(options); + const assetInfo = await blockFrost.assetsById(FET); + const onchainSupply = Number(assetInfo?.quantity) / 1e10; const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", @@ -18,9 +21,10 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { ]); const treasury = Number(treasuryRaw) / 1e10; return { - circulating: (total - treasury).toString(), + circulating: (onchainSupply - treasury).toString(), total: total.toString(), }; }; export default fetcher; +``` From bd49b1a63b8c7c6c2f1aa8406d07ef4ed5035633 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Thu, 21 Sep 2023 16:36:20 +0200 Subject: [PATCH 46/50] Update fet.ts --- src/tokens/fet.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 6ba9cd1d..5bb4df44 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -1,4 +1,3 @@ -``` import { defaultFetcherOptions, SupplyFetcher } from "../types"; import { getAmountInAddresses, getBlockFrostInstance } from "../utils"; @@ -27,4 +26,3 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { }; export default fetcher; -``` From 7ccd0fff4046f5cb1602d843be102f74f42a1c29 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Thu, 21 Sep 2023 16:58:38 +0200 Subject: [PATCH 47/50] Update fet.ts --- src/tokens/fet.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index 5bb4df44..f5c05f00 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -10,13 +10,15 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { const assetInfo = await blockFrost.assetsById(FET); const onchainSupply = Number(assetInfo?.quantity) / 1e10; const treasuryRaw = await getAmountInAddresses(blockFrost, FET, [ - "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", - "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", - "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", - "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", - "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", - "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", - "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", + "stake1uyyxjvthz4udwdrzr9pkkudpylasg99ufdzu7gpdfckxf2s5peell", // fe.dex.funds + "stake1ux94pdq42nwx0g24ea3myjcnd8tvl354ku4ygedtgm7sfgc2hugz9", // fe.reserve.fund + "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", // fe.dev.funds + "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", // fraction.estate + "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", // fe.market.funds + "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", // founder - daniel johnsen + "addr1wy08wwdmpp6wtkzzjnghpxn0wtm9zyp69s4fxe675yv06cs70pjxk", // Staking Rewards Vyfi + "stake1uxmyhzdqv6e57xwkz3z93v996v3ktdctlda44jv76ese5pqwwg7ue", // Farming Rewards Vyfi + "stake1uyuxqkvqwngv86g9m804kjnhmvunc52kk4kl8cm8fck5kwcjmx8sg", // Rewards Tressury Vyfi ]); const treasury = Number(treasuryRaw) / 1e10; return { From b2bc5c4c2dab74b0765f03671e2a20573292f492 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:04:57 +0200 Subject: [PATCH 48/50] Update fet.ts --- src/tokens/fet.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index f5c05f00..b23fc788 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -18,7 +18,7 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", // founder - daniel johnsen "addr1wy08wwdmpp6wtkzzjnghpxn0wtm9zyp69s4fxe675yv06cs70pjxk", // Staking Rewards Vyfi "stake1uxmyhzdqv6e57xwkz3z93v996v3ktdctlda44jv76ese5pqwwg7ue", // Farming Rewards Vyfi - "stake1uyuxqkvqwngv86g9m804kjnhmvunc52kk4kl8cm8fck5kwcjmx8sg", // Rewards Tressury Vyfi + "stake1uyuxqkvqwngv86g9m804kjnhmvunc52kk4kl8cm8fck5kwcjmx8sg", // Rewards Treasury Vyfi ]); const treasury = Number(treasuryRaw) / 1e10; return { From 2fada483743f65a368c2aa210b8a4c18b2caf9f7 Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:16:16 +0200 Subject: [PATCH 49/50] Update fet.ts --- src/tokens/fet.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tokens/fet.ts b/src/tokens/fet.ts index b23fc788..4c5698e4 100644 --- a/src/tokens/fet.ts +++ b/src/tokens/fet.ts @@ -15,6 +15,7 @@ const fetcher: SupplyFetcher = async (options = defaultFetcherOptions) => { "stake1uxerycuwj09h2n6wydjp4vk936la23p9dvn37ezlkmdl5ycq38hr4", // fe.dev.funds "stake1uypwcfxvg7uyzkyeue8fglq6fx7uxmampr2ahylyy4rg38cvky2pr", // fraction.estate "stake1ux7pa94sgkzd0yawsu9e9ddj0vr07psyezksfek24m9wn2qtjf62u", // fe.market.funds + "stake1uy74mhj5x3jdf8d9446xcwrw723pvqelksxwwxu5c6t799qcnww0q", // fe.charity.fund "stake1u8qzt94vyvfvvs4qan02axtfwj2hz4dcqefpehara5rdh4q6h9xka", // founder - daniel johnsen "addr1wy08wwdmpp6wtkzzjnghpxn0wtm9zyp69s4fxe675yv06cs70pjxk", // Staking Rewards Vyfi "stake1uxmyhzdqv6e57xwkz3z93v996v3ktdctlda44jv76ese5pqwwg7ue", // Farming Rewards Vyfi From 7c9a152de853c3c3094fb2d962e188d5ffc62eab Mon Sep 17 00:00:00 2001 From: Fraction Estate <140243674+FractionEstate@users.noreply.github.com> Date: Mon, 25 Sep 2023 06:36:10 +0200 Subject: [PATCH 50/50] Update fet.ts