Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: additional confirmations clarification #447

Merged
merged 1 commit into from
Jul 11, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export const ConnectGuardians: React.FC<Props> = ({ next }) => {
?.consensus?.network,
},
{
label: 'Block confirmations',
label: 'Additional Block Confirmations',
value: getModuleParamsFromConfig(configGenParams, ModuleKind.Wallet)
?.consensus?.finality_delay,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ export const BitcoinSettingsForm: React.FC<BitcoinSettingsFormProps> = ({
labelText={t('set-config.block-confirmations')}
helperText={t('set-config.block-confirmations-help')}
warningText={t('set-config.block-confirmations-warning')}
recommendedMin={6}
min={1}
recommendedMin={5}
min={0}
max={200}
value={blockConfirmations}
onChange={(value) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export const SetConfiguration: React.FC<Props> = ({ next }: Props) => {
passwordCheck,
federationName,
isValidNumber(numPeers, 4),
isValidNumber(blockConfirmations, 1, 200),
isValidNumber(blockConfirmations, 0, 200),
isValidMeta(metaFields),
network,
];
Expand All @@ -134,7 +134,7 @@ export const SetConfiguration: React.FC<Props> = ({ next }: Props) => {
password,
passwordCheck,
federationName,
isValidNumber(blockConfirmations, 1, 200),
isValidNumber(blockConfirmations, 0, 200),
isValidMeta(metaFields),
network,
];
Expand Down Expand Up @@ -175,7 +175,7 @@ export const SetConfiguration: React.FC<Props> = ({ next }: Props) => {
'Cannot submit before fetching default config gen parameters'
);
// Fedimint finality delay is 1 less than the number of block confirmations input by the UI
const finalityDelay = parseInt(blockConfirmations, 10) - 1;
const finalityDelay = parseInt(blockConfirmations, 10);
const moduleConfigs = applyConfigGenModuleParams(defaultParams.modules, {
[ModuleKind.Mint]: {
consensus: { mint_amounts: mintAmounts },
Expand Down
6 changes: 3 additions & 3 deletions apps/guardian-ui/src/languages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@
"guardian-number": "Number of guardians",
"guardian-number-help": "Federations require a minimum of 4 guardians. This cannot be changed later.",
"bitcoin-settings": "Bitcoin settings",
"block-confirmations": "Block confirmations",
"block-confirmations-help": "How many block confirmations needed before confirming?",
"block-confirmations-warning": "Running Fedimint with less than 6 block confirmations is extremely risky!",
"block-confirmations": "Additional Block Confirmations",
"block-confirmations-help": "Fedimint Guardians trail the blockchain tip by several confirmations to avoid block reorganizations.",
"block-confirmations-warning": "Running Fedimint with less than 5 additional block confirmations is extremely risky! Fedimint CANNOT handle blockchain reorganizations.",
"bitcoin-network": "Bitcoin Network",
"select-network": "Select a network",
"set-rpc-help": "Locally configured Bitcoin RPC address",
Expand Down
Loading