re-apply session overlap fix
Signed-off-by: Uncle Fatso <uncle.fatso@ghostchain.io>
This commit is contained in:
parent
1fbaf94c24
commit
970299385b
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "ghost-dao-interface",
|
"name": "ghost-dao-interface",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.5.2",
|
"version": "0.5.3",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@ -129,10 +129,18 @@ const Bridge = ({ chainId, address, config, connect }) => {
|
|||||||
});
|
});
|
||||||
const blockCommitments = useBlockCommitments({ evmChainId: chainId });
|
const blockCommitments = useBlockCommitments({ evmChainId: chainId });
|
||||||
const disabledValidators = useDisabledValidators();
|
const disabledValidators = useDisabledValidators();
|
||||||
const transactionApplaused = useApplauseDetails({
|
const transactionApplausedDirect = useApplauseDetails({
|
||||||
currentSession: watchTransaction?.sessionIndex ?? currentSession,
|
currentSession: watchTransaction?.sessionIndex ?? currentSession,
|
||||||
argsHash: hashedArguments
|
argsHash: hashedArguments
|
||||||
});
|
});
|
||||||
|
const transactionApplausedIncremented = useApplauseDetails({
|
||||||
|
currentSession: watchTransaction ? watchTransaction.sessionIndex + 1 : undefined,
|
||||||
|
argsHash: hashedArguments
|
||||||
|
});
|
||||||
|
|
||||||
|
const transactionApplaused = useMemo(() => {
|
||||||
|
return transactionApplausedDirect || transactionApplausedIncremented;
|
||||||
|
}, [transactionApplausedDirect, transactionApplausedIncremented]);
|
||||||
|
|
||||||
const finalityDelay = Number(evmNetwork?.finality_delay ?? 0n);
|
const finalityDelay = Number(evmNetwork?.finality_delay ?? 0n);
|
||||||
|
|
||||||
@ -272,8 +280,11 @@ const Bridge = ({ chainId, address, config, connect }) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const storeTransactionHash = (txHash, receiver, amount) => {
|
const storeTransactionHash = (txHash, receiver, amount) => {
|
||||||
|
const expectedSessionIndex = (currentSession ?? 0) + (evmNetwork
|
||||||
|
? Number((evmNetwork.avg_block_speed * evmNetwork.finality_delay) / (1000n * 14400n))
|
||||||
|
: 0);
|
||||||
const transaction = {
|
const transaction = {
|
||||||
sessionIndex: currentSession ?? 0,
|
sessionIndex: expectedSessionIndex,
|
||||||
transactionHash: txHash,
|
transactionHash: txHash,
|
||||||
receiverAddress: receiver,
|
receiverAddress: receiver,
|
||||||
amount: amount,
|
amount: amount,
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user