Merge branch 'bennu' into claude/ecstatic-feynman-2c5628
Brings in member guarded wallets and funding a descendant's guarded wallet. - Schema: bennu's v30 (MemberWallet, MemberWalletSpend) is kept as it is; DkgSession.guardianDelay moves to v31, with a 30 -> 31 auto-migration. - Conflicts: strings and README take both sides; the send form's guardian delay line moves into the shared SpendForm; the guarded wallet card keeps its Fund and Spend buttons and gains this group's own leaf's delay. - bennu's uses of ANCESTOR_DELAY become each leaf's own delay: GuardedWalletRow.arriving, the funding form's "spend these coins again" line, the member wallet screens' reach text (MemberWalletManager.delaysOf) and the member certificate's proposal summary. - Four of bennu's fixtures built a "guarded" wallet with no guardian leaf; they now carry the ancestor's, as a verified statement would. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
commit
3b2d9bd82f
82 files changed
+13759
-187
No files matched your search
@@ -473,6 +473,14 @@
|
||||
<string name="spend_from_s_s_guarded_wallet">Spend from %1$s's guarded wallet</string>
|
||||
<string name="wallets_of_groups_below_this_one">Wallets of groups below this one. This group can spend a coin in each once the coin has waited as long as the delay that wallet gives this group.</string>
|
||||
<string name="s_sats_within_this_group_s_reach">%1$s sats within this group's reach</string>
|
||||
<string name="fund">Fund</string>
|
||||
<string name="fund_s_s_guarded_wallet">Fund %1$s's guarded wallet</string>
|
||||
<string name="s_sats_arriving">%1$s sats arriving</string>
|
||||
<string name="to">To</string>
|
||||
<string name="s_s_guarded_wallet">%1$s's guarded wallet</string>
|
||||
<string name="this_group_can_spend_these_coins_again">This group can spend these coins again once they have waited %1$s.</string>
|
||||
<string name="finding_an_address_in_s_s_wallet">Finding an address in %1$s's wallet…</string>
|
||||
<string name="wait_for_this_group_s_open_payments_to_s">Wait for this group's open payments to %1$s to confirm.</string>
|
||||
<string name="tell_the_groups_above">Tell the groups above</string>
|
||||
<string name="not_yet_shared_with_the_groups_above">Not yet shared with the groups above that you're in</string>
|
||||
<string name="share">Share</string>
|
||||
@@ -525,6 +533,7 @@
|
||||
<string name="feerate_in_sats_per_byte">Fee rate in sats per byte</string>
|
||||
<string name="ask_the_group_to_send">Ask the group to send</string>
|
||||
<string name="sends_s_sats_with_a_fee_of_s_sats">Sends %1$s sats, with a fee of %2$s sats.</string>
|
||||
<string name="sends_s_sats_to_s_s_guarded_wallet_with_a_fee_of_s_sats">Sends %1$s sats to %2$s's guarded wallet, with a fee of %3$s sats.</string>
|
||||
<string name="s_sats_come_back_to_the_group_as_change">%1$s sats come back to the group as change.</string>
|
||||
<string name="that_isn_t_an_address_on_s">That isn't an address on %1$s.</string>
|
||||
<string name="the_group_has_nothing_confirmed_to_spend">The group has nothing confirmed to spend yet.</string>
|
||||
@@ -606,4 +615,71 @@
|
||||
<item quantity="one">about %1$d year</item>
|
||||
<item quantity="other">about %1$d years</item>
|
||||
</plurals>
|
||||
|
||||
<!-- A member's guarded wallet: docs/member-guarded-wallets.md -->
|
||||
<string name="new_guarded_wallet">New guarded wallet</string>
|
||||
<string name="a_group">A group</string>
|
||||
<string name="choose_a_group_to_guard_it">Choose a group to guard it</string>
|
||||
<string name="you_are_in_no_groups_that_can_guard_a_wallet">You're in no groups that could guard a wallet for you.</string>
|
||||
<string name="a_wallet_only_you_can_spend_from_guarded_by_s">A wallet only you can spend from, guarded by %1$s</string>
|
||||
<string name="s_can_take_any_coin_without_asking_you">%1$s can take any coin in it that has waited %2$s, without asking you.</string>
|
||||
<string name="s_and_the_group_above_it_can_take_any_coin_without_asking_you">%1$s can take any coin in it that has waited %2$s, and the group above it any coin that has waited %3$s, without asking you.</string>
|
||||
<string name="s_and_the_d_groups_above_it_can_take_any_coin_without_asking_you">%1$s can take any coin in it that has waited %2$s, and each of the %3$d groups above it after the delay it chose, the shortest %4$s, without asking you.</string>
|
||||
<string name="members_of_those_groups_will_see_this_wallet">Members of the groups that guard it will see its balance, and that it's yours.</string>
|
||||
<string name="if_you_lose_this_device_those_groups_can_still_move_your_coins">If you lose this device, those groups can still move your coins for you.</string>
|
||||
<string name="label_optional">Label (optional)</string>
|
||||
<string name="ask_s">Ask %1$s</string>
|
||||
<string name="asked_s_to_guard_a_wallet">Asked %1$s to guard a wallet.</string>
|
||||
<string name="couldn_t_ask_the_group_to_guard_a_wallet">Couldn't ask the group to guard a wallet.</string>
|
||||
<string name="this_profile_cannot_sign_a_request">This profile can only look, so it can't sign a request.</string>
|
||||
<string name="only_a_group_can_guard_a_wallet">Only a group with a shared key can guard a wallet.</string>
|
||||
<string name="this_device_does_not_know_what_this_group_signs_with">This device doesn't know what this group signs with yet, so it can't work out the group's leaves.</string>
|
||||
<string name="ask_the_group_for_its_key">Ask the group for its key</string>
|
||||
<string name="asked_for_the_group_s_key">Asked. A member who holds the group's key will answer when their device next reads the room.</string>
|
||||
<string name="this_group_s_guardian_keys_can_t_be_read_to_guard_a_wallet">This group's guardian keys can't be read by this version of the app.</string>
|
||||
<string name="member_wallets_are_not_offered_on_this_network">Guarded wallets for members aren't offered on this network yet.</string>
|
||||
<string name="this_profile_cannot_watch_its_own_coins">This profile has no wallet of its own to watch the chain with, so it couldn't see its own coins.</string>
|
||||
<string name="you_have_no_guarded_wallets">You have no guarded wallets.</string>
|
||||
<string name="waiting_for_someone_in_s_to_put_it_to_the_group">Waiting for someone in %1$s to put it to the group</string>
|
||||
<string name="s_is_signing">%1$s is signing</string>
|
||||
<string name="s_did_not_sign">%1$s didn't sign. Ask again, or discard it.</string>
|
||||
<string name="key_on_another_device">Key on another device</string>
|
||||
<string name="you_re_no_longer_in_s">You're no longer in %1$s. It still guards this wallet.</string>
|
||||
<string name="guarded_by_s">Guarded by %1$s</string>
|
||||
<string name="discard">Discard</string>
|
||||
<string name="discard_this_wallet_question">Discard this wallet?</string>
|
||||
<string name="discarding_forgets_its_key">Its key is forgotten. No address of it was ever offered, so nothing can have been paid to it.</string>
|
||||
<string name="export_key">Export key</string>
|
||||
<string name="export_this_wallet_s_key_question">Export this wallet's key?</string>
|
||||
<string name="whoever_holds_these_descriptors_holds_the_coins">Whoever holds these descriptors can spend every coin in this wallet. Keep them where only you can reach them.</string>
|
||||
<string name="show_key">Show key</string>
|
||||
<string name="receive_descriptor">Receive descriptor</string>
|
||||
<string name="change_descriptor">Change descriptor</string>
|
||||
<string name="copied">Copied.</string>
|
||||
<string name="copy">Copy</string>
|
||||
<string name="finding_your_coins">Finding your coins…</string>
|
||||
<string name="s_took_s_sats_in_s">%1$s took %2$s sats through its guardian leaf, in %3$s.</string>
|
||||
<string name="taken_by_guardians">Taken by guardians</string>
|
||||
<string name="the_key_of_this_wallet_is_on_another_device">This wallet's key is on another of your devices, so it can be watched here but not spent from.</string>
|
||||
<string name="couldn_t_ask_again">Couldn't ask again.</string>
|
||||
<string name="couldn_t_discard_the_wallet">Couldn't discard the wallet.</string>
|
||||
<string name="s_sats_come_back_to_this_wallet_as_change">%1$s sats come back to this wallet as change.</string>
|
||||
<string name="this_wallet_has_nothing_confirmed_to_spend">This wallet has nothing confirmed to spend.</string>
|
||||
<string name="this_wallet_doesn_t_have_that_much_confirmed">This wallet doesn't have that much confirmed.</string>
|
||||
<string name="send_from_your_guarded_wallet">Send from your guarded wallet</string>
|
||||
<string name="signed_by_you_alone_and_sent_at_once">You sign this alone, and it is sent as soon as you press the button.</string>
|
||||
<string name="sending_from_this_wallet_needs_its_key_and_a_node">Sending needs this wallet's key on this device, a group's certificate for it, and a wallet of this profile's own to watch the chain with.</string>
|
||||
<string name="sign_and_send">Sign and send</string>
|
||||
<string name="sent">Sent.</string>
|
||||
<string name="couldn_t_send">Couldn't send.</string>
|
||||
<string name="your_spends">Your spends</string>
|
||||
<string name="sent_waiting_for_the_network">Sent, waiting for the network to report it</string>
|
||||
<string name="in_the_mempool">In the mempool</string>
|
||||
<string name="at_s">@%1$s</string>
|
||||
<string name="members_guarded_wallets">Members' guarded wallets</string>
|
||||
<string name="ask_this_group_to_guard_a_wallet_for_you">Ask this group to guard a wallet for you</string>
|
||||
<string name="asked_by_s_not_yet_signed">Asked by %1$s, not yet signed</string>
|
||||
<string name="put_to_the_group">Put to the group</string>
|
||||
<string name="couldn_t_put_it_to_the_group">Couldn't put it to the group.</string>
|
||||
<string name="wallets_your_groups_guard">Wallets your groups guard</string>
|
||||
</resources>
|
||||
Reference in new issue
Block a user