Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,9 @@ bun.lockb

# Local Netlify folder
.netlify

# Claude
.claude/

# Misc
deno.lock
5 changes: 3 additions & 2 deletions components/choices/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -260,9 +260,10 @@ const updateChoiceById = async (req, response) => {

if (isVoted.length > 0) {
const oldVoteObj = isVoted[0].walletAddresses.find(x => x.address === address);
oldVote = await ChoiceModel.findById(oldVoteObj.choiceId);
// isVoted[0] is already the Choice document containing the old vote
oldVote = isVoted[0];

const oldSignaturePayload = oldVote.walletAddresses[0].payloadBytes
const oldSignaturePayload = oldVoteObj?.payloadBytes;
if (oldSignaturePayload) {
const oldSignatureDate =
getTimestampFromPayloadBytes(oldSignaturePayload);
Expand Down
1 change: 1 addition & 0 deletions db/mongoose-connection.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ async function connectToMongoose() {

module.exports = { connectToMongoose };


1 change: 1 addition & 0 deletions netlify/functions/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@ exports.handler = async (event, context) => {
return serverlessHandler(event, context);
};


3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,6 @@
"mongodb-memory-server": "^9.1.4",
"nodemon": "^3.1.0",
"supertest": "^6.3.3"
}
},
"packageManager": "pnpm@9.12.2+sha512.22721b3a11f81661ae1ec68ce1a7b879425a1ca5b991c975b074ac220b187ce56c708fe5db69f4c962c989452eee76c82877f4ee80f474cebd61ee13461b6228"
}
4 changes: 2 additions & 2 deletions services/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ const networkNameMap = {
};

const rpcNodes = {
mainnet: "https://mainnet.api.tez.ie",
ghostnet: "https://ghostnet.smartpy.io",
mainnet: "https://rpc.tzkt.io/mainnet",
ghostnet: "https://rpc.tzkt.io/ghostnet",
};

const getTokenMetadata = async (contractAddress, network, tokenId) => {
Expand Down
27 changes: 26 additions & 1 deletion utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,24 @@ const getUserBalanceAtLevel = async (
return new BigNumber(0);
};

const getUserXTZBalanceAtLevelViaRpc = async (network, level, userAddress) => {
const rpcUrl = rpcNodes[network];
const url = `${rpcUrl}/chains/main/blocks/${level}/context/contracts/${userAddress}/full_balance`;

try {
const response = await axios({ url, method: "GET" });
if (response.status === 200) {
return new BigNumber(response.data);
}
} catch (error) {
// RPC failed (likely historical block not available), fall back to TzKT
console.warn(`RPC failed for block ${level}, falling back to TzKT API`);
return await getUserXTZBalanceAtLevel(network, level, userAddress);
}

return new BigNumber(0);
};

const getUserXTZBalanceAtLevel = async (network, level, userAddress) => {
const url = `https://api.${network}.tzkt.io/v1/accounts/${userAddress}/balance_history/${level}`;
const response = await axios({ url, method: "GET" });
Expand Down Expand Up @@ -173,11 +191,18 @@ const getUserTotalVotingPowerAtReferenceBlock = async (

return userVotingPower;
} else {
const selfBalance = await getUserXTZBalanceAtLevel(
const selfBalance = await getUserXTZBalanceAtLevelViaRpc(
network,
level,
userAddress
);
const selfBalanceLegacy = await getUserXTZBalanceAtLevel(
network,
level,
userAddress
);
console.log("selfBalance: ", selfBalance);
console.log("selfBalanceLegacy: ", selfBalanceLegacy);
return userVotingPower.plus(selfBalance);
}
};
Expand Down
Loading