From 29104c0e3a6f216ce71a772114af635bc2f9f853 Mon Sep 17 00:00:00 2001 From: LukasDeco Date: Fri, 30 Aug 2024 16:22:41 -0600 Subject: [PATCH] fix: BN bugs with proposal creation --- lib/client/indexer/proposals.ts | 19 ++++++++++++------- package.json | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/client/indexer/proposals.ts b/lib/client/indexer/proposals.ts index a65c39c..f1574b5 100644 --- a/lib/client/indexer/proposals.ts +++ b/lib/client/indexer/proposals.ts @@ -1,4 +1,4 @@ -import { PublicKey } from "@solana/web3.js"; +import { Keypair, PublicKey } from "@solana/web3.js"; import { Proposal, DaoAggregate, @@ -16,7 +16,10 @@ import { GovernanceParticipant, ProposalRanking, ProposalRequestConfig, - ProposalDaoConfiguration + ProposalDaoConfiguration, + ProposalInstruction, + VaultAccountWithKey, + VaultAccount } from "@/types"; import { FutarchyProposalsClient } from "@/client"; import { FutarchyRPCProposalsClient } from "@/client/rpc"; @@ -35,6 +38,7 @@ import { Observable } from "rxjs"; import { Client as GQLWebSocketClient } from "graphql-ws"; import dayjs from "dayjs"; import { createSlug } from "@/utils"; +import { SUPPORTED_EMOJIS } from "@/constants"; export class FutarchyIndexerProposalsClient implements FutarchyProposalsClient { private protocolMap: Map; @@ -844,14 +848,15 @@ export class FutarchyIndexerProposalsClient implements FutarchyProposalsClient { .add(new BN(slotsPerProposal)) .toNumber(), pass_threshold_bps: dao.daoAccount.passThresholdBps, - duration_in_slots: dao.daoAccount.slotsPerProposal, + duration_in_slots: dao.daoAccount.slotsPerProposal?.toNumber(), min_base_futarchic_liquidity: - dao.daoAccount.minBaseFutarchicLiquidity, + dao.daoAccount.minBaseFutarchicLiquidity?.toNumber(), min_quote_futarchic_liquidity: - dao.daoAccount.minQuoteFutarchicLiquidity, - twap_initial_observation: dao.daoAccount.twapInitialObservation, + dao.daoAccount.minQuoteFutarchicLiquidity?.toNumber(), + twap_initial_observation: + dao.daoAccount.twapInitialObservation?.toNumber(), twap_max_observation_change_per_update: - dao.daoAccount.twapMaxObservationChangePerUpdate + dao.daoAccount.twapMaxObservationChangePerUpdate?.toNumber() } }, proposal_acct: true // Fields you want to return after insertion diff --git a/package.json b/package.json index e00482d..3c6d19d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@metadaoproject/futarchy-sdk", - "version": "4.0.0-alpha.49", + "version": "4.0.0-alpha.50", "type": "module", "main": "dist", "scripts": {