Skip to content

R4: bring the shipped 2.6.3 baseline into sprint - #7031

Open
antuz123 wants to merge 20 commits into
sprintfrom
codex/r3-release-baseline-to-sprint
Open

antuz123 wants to merge 20 commits into
sprintfrom
codex/r3-release-baseline-to-sprint

Conversation

@antuz123

@antuz123 antuz123 commented Oct 7, 2026 •

Copy link
Copy Markdown
Collaborator

Current delivery scope — R4 / 2.6.4 (8 October owner decision)

All unfinished R3 work is now part of R4. This PR is reused in the complete coordinated 2.6.4 app set, with separately tracked backend/Desktop delivery where applicable. Keep existing source and review evidence; this scope transfer publishes no build or backend. One independent developer approval remains required, feasible agent checks precede submission, and owner phone/Desktop/hardware testing remains retrospective. The original branch and older QA version labels below are provenance, not the next release scope.

Current integration order: merge the reviewed baseline, then refresh active backup #7027 and combined USDT/reproducibility draft #7035 against sprint for R4. The separate USDT pause #7037 is closed as superseded by #7035. Keypad #7025 remains draft/unscheduled Later; do not retarget or resume it automatically. USDT Settings #7023 is closed/superseded. The older combined R3 candidate included those excluded proposals and must be refreshed for full R4 acceptance.

Bring the frozen release/2.6.3 baseline 84476d7b17cbd34b0859023052b0d49407e05984 back into shared sprint, together with the explicit Copilot fixes d3e0b0484 and 5ab398397. The release baseline remains frozen; later release work stays in its focused PRs.

This head also merges reviewed public sprint 061f299b684c4d47461693ea45a900ef9a6fe0b4 (SonarCloud replaced by CodeQL and CI linting). The merge was clean. The CI workflow keeps the release-branch triggers and runs Jest, the recovery suite, and release/artifact tests. The existing review fixes retain one recovery-history owner, correct release evidence freshness and fixtures, and check login backup freshness after wallet sync completes.

Validation at 66e8e016e: 192 recovery tests, 12 release-version tests, 7 packaged-artifact tests and 6 Version History tests pass; staged/source diff checks pass. The frozen release baseline, both fix commits and public sprint are verified ancestors. Current-head GitHub Tests/Lint/CodeQL and automatic Copilot review are running. Ben, Utkarsh and Parsh remain requested; one developer approval is required.

Keypad #7025 and backup #7027 retain their release base until this PR is actually merged. Only then fetch the merged sprint baseline, retarget those focused PRs, reconcile the duplicate backup-ordering fix, and run sprint CI. USDT #7023, pairing #7024 and contributor setup #7030 remain separate sprint PRs.

No app build is published, no backend is deployed, and dev/main are not changed by this PR.

Final merge-check corrections — 7 October 2026

Utkarsh approved 66e8e016e27cd6abaf4b614e2758d99176c4aad5. Before merging, a fresh read of all review threads found five unresolved Copilot concerns missed by the earlier checkpoint. They were verified against both this baseline and the pending R3 backup source, then corrected in three focused commits:

  • 197feb399: route fingerprint migration through the shared per-account backup queue/revision invalidation; reject failed wallet/vault specs persistence so login cannot verify stale data.
  • eb26eace8: keep per-account progress active until every inspection/queued repair settles, including cancelled/coalesced wrappers.
  • 27943db4a: execute actual checkout version consistency in CI before the fixture release tests; align the baseline OpenSpec record with 2.6.3/626/619.

Verification: 204 recovery tests, 12 release-version cases and seven packaged-artifact tests pass. Production Babel transforms pass for all three changed runtime modules. New focused fixtures reproduce the old failures and pass after fixes. Independent focused agent review found no actionable findings. Local full ESLint is unavailable because the shared dependency install lacks eslint-plugin-jest; fresh GitHub check results remain authoritative. No native/live production claim is made.

All five addressed inline threads are resolved. Human live testing remains retrospective. No paid Copilot rereview or budget change was requested; its previous source review is distinguished from this changed head. New current source is 27943db4afda7b5cdf3d66b821bb46df2f1497dc. GitHub dismisses stale approval after code changes and requires one independent approval after the latest push. Please review these three corrective commits and approve the updated head. No merge or release has occurred.

Final combined R3 regression checkpoint

Current head: fee03fab6557595e3180b6fb895becf3a6f85815. The follow-up fingerprint fixture accepts the planned read-only retry only after the old read settles, migration is acknowledged, and a fresh snapshot completes before a single verified event. Explicit repair does not retry. Independent review found no further issues.

The exact local rehearsal combines this head with all remaining mobile R3 PR heads: 224/224 recovery tests pass. All five addressed Copilot conversations remain resolved. No remote integration, native release or production deployment occurred. Utkarsh’s approval of the previous source was automatically dismissed by protected sprint; one renewed independent developer approval is required. Ben, Utkarsh and Parsh remain requested. CI is rerunning on this latest test-only update.

@antuz123
antuz123 marked this pull request as ready for review October 7, 2026 03:32
@antuz123
antuz123 requested review from ben-kaufman and cakesoft-utkarsh and a balanced review from Copilot October 7, 2026 03:52

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot review overview

🟡 Changes recommended

Release tests currently fail on incomplete fixtures, CI omits the new suites, and backup/history ordering has unresolved correctness issues.

Review effort: Balanced
Findings: 1 High severity · 6 Medium severity · 2 Low severity

Open (9)
What changed in this PR

Backmerges the frozen release/2.6.3 baseline into sprint, including release tooling, backup/recovery correctness, timelock safeguards, PIN handling, and navigation fixes.

Changes:

  • Adds backup inspection, repair, recovery, and persistence safeguards.
  • Adds release metadata validation and artifact verification.
  • Integrates timelock, authentication, navigation, localization, and CI updates.
File Description
tests/​services/​resetTimelockRoute.test.ts Tests timelock route forwarding.
tests/​services/​resetTimelockBoundary.test.ts Tests migration timelock boundaries.
tests/​services/​initialTimelock.test.ts Tests timelock resolution and policies.
tests/​screens/​PinEntry.test.tsx Tests rapid PIN input.
tests/​recovery/​vaultPersistence.test.cjs Tests vault metadata comparison.
tests/​recovery/​usdtBackup.test.cjs Tests USDT backup persistence.
tests/​recovery/​transport.test.cjs Tests backup transport limits.
tests/​recovery/​signerPersistence.test.cjs Tests signer normalization.
tests/​recovery/​sharedVaultRepair.test.cjs Tests shared-vault repair.
tests/​recovery/​sagaState.test.cjs Tests persisted repair state.
tests/​recovery/​repair.test.cjs Tests backup comparison and repair.
tests/​recovery/​recoveryErrorFeedback.test.cjs Tests recovery error feedback.
tests/​recovery/​nodeReplacement.test.cjs Tests explicit node replacement.
tests/​recovery/​manualCoinChoices.test.cjs Tests coin-control persistence.
tests/​recovery/​helpers.cjs Adds recovery test harnesses.
tests/​recovery/​benchmarks/​backup-cost.cjs Adds synthetic backup benchmark.
tests/​recovery/​backupFreshness.test.cjs Tests incremental backup freshness.
tests/​recovery/​backupFeedback.test.cjs Tests backup UI outcomes.
src/​utils/​utilities.ts Tightens vault signer sanitization.
src/​utils/​service-utilities/​config.ts Changes development channel default.
src/​store/​sagas/​wallets.ts Updates sync and backup propagation.
src/​store/​sagas/​utxos.ts Persists and backs up manual choices.
src/​store/​sagas/​upgrade.ts Adds recovery-aware history.
src/​store/​sagas/​login.ts Makes synchronization asynchronous.
src/​store/​sagas/​index.ts Registers freshness watcher.
src/​store/​sagaActions/​upgrade.ts Adds recovery history flag.
src/​store/​sagaActions/​bhr.ts Adds check and repair actions.
src/​store/​reducers/​bhr.ts Stores per-account repair state.
src/​services/​wallets/​operations/​miniscript/​initialTimelock.ts Validates required timelocks.
src/​services/​rest/​RestClient.ts Supports Axios request options.
src/​services/​backup/​transport.ts Adds serialized bounded transport.
src/​services/​backup/​restore.ts Prevalidates recovery images.
src/​services/​backend/​Relay.ts Routes backup writes through transport.
src/​screens/​Vault/​VaultMigrationController.tsx Hardens timelock migration.
src/​screens/​Vault/​ResetInheritanceKey.tsx Preserves initial duration.
src/​screens/​Vault/​ResetEmergencyKey.tsx Preserves initial duration.
src/​screens/​Vault/​AddSigningDevice.tsx Preserves enhanced-vault roles.
src/​screens/​Vault/​AddReserveKey.tsx Updates inheritance-key replacement.
src/​screens/​Vault/​AddEmergencyKey.tsx Updates emergency-key replacement.
src/​screens/​SeedScreens/​ExportSeedScreen.tsx Separates backup failure feedback.
src/​screens/​Recovery/​EnterSeedScreen.tsx Improves recovery errors.
src/​screens/​LoginScreen/​Login.tsx Fixes PIN and login completion.
src/​screens/​LoginScreen/​CreatePin.tsx Removes PIN throttling.
src/​screens/​Home/​Notifications/​NotificationsCenter.tsx Opens backup status screen.
src/​screens/​Home/​HomeScreen.tsx Isolates tab content lifecycle.
src/​screens/​BackupWallet/​ViewRecoveryKeyScreen.tsx Corrects backup failure handling.
src/​screens/​AppSettings/​AssistedBackupStatus.tsx Adds backup status UI.
src/​navigation/​types.ts Types the new status route.
src/​navigation/​Navigator.tsx Registers the status screen.
src/​hooks/​useUSDTWallets.ts Backs up recovery-relevant edits.
src/​hooks/​useSignerIntel.tsx Validates primary quorum size.
src/​hooks/​useSettingKeeper.tsx Links settings to backup status.
src/​context/​Localization/​language/​es.json Adds Spanish backup copy.
src/​context/​Localization/​language/​en.json Adds English backup copy.
src/​components/​Modal/​PasscodeVerify.tsx Stabilizes passcode entry.
src/​components/​MenuFooter.tsx Adds stable tab selectors.
src/​components/​HomeScreenHeader.tsx Opens backup status details.
src/​components/​Backup/​BackupHealthCheckList.tsx Corrects failure presentation.
scripts/​verify-release-artifact.py Verifies packaged release artifacts.
scripts/​verify-channel-config.cjs Validates production channel configuration.
scripts/​test_release_artifact.py Tests artifact verification.
scripts/​release-version.test.cjs Tests version validation.
scripts/​release-version.cjs Adds release version tooling.
release/​version.json Defines the 2.6.3 release intent.
release/​README.md Documents release verification.
package.json Adds release and recovery scripts.
openspec/​config.yaml Corrects task-rule YAML.
openspec/​changes/​fix-release-version-consistency/​tasks.md Tracks release tasks.
openspec/​changes/​fix-release-version-consistency/​specs/​release-version-consistency/​spec.md Specifies release consistency.
openspec/​changes/​fix-release-version-consistency/​proposal.md Proposes release safeguards.
openspec/​changes/​fix-release-version-consistency/​design.md Designs release validation.
openspec/​changes/​fix-release-version-consistency/​.openspec.yaml Configures the change package.
openspec/​changes/​fix-recovery-backup-freshness/​validation.md Records recovery validation.
openspec/​changes/​fix-recovery-backup-freshness/​tasks.md Tracks recovery work.
openspec/​changes/​fix-recovery-backup-freshness/​specs/​assisted-server-backup/​spec.md Specifies backup behavior.
openspec/​changes/​fix-recovery-backup-freshness/​proposal.md Proposes freshness repairs.
openspec/​changes/​fix-recovery-backup-freshness/​nfr-review.md Reviews backup NFRs.
openspec/​changes/​fix-recovery-backup-freshness/​nfr-benchmark.json Records benchmark results.
openspec/​changes/​fix-recovery-backup-freshness/​evidence/​recovery-tests.txt Records recovery test evidence.
openspec/​changes/​fix-recovery-backup-freshness/​evidence/​migration-tests.txt Records migration evidence.
openspec/​changes/​fix-recovery-backup-freshness/​design.md Designs backup repair.
openspec/​changes/​fix-ask-tab-navigation/​verification.md Records navigation verification.
openspec/​changes/​fix-ask-tab-navigation/​tasks.md Tracks navigation work.
openspec/​changes/​fix-ask-tab-navigation/​specs/​home-navigation/​spec.md Specifies tab lifecycle behavior.
openspec/​changes/​fix-ask-tab-navigation/​proposal.md Proposes navigation correction.
openspec/​changes/​fix-ask-tab-navigation/​design.md Designs native view isolation.
ios/​hexa_keeper/​Info.plist Uses Xcode build version.
ios/​hexa_keeper.xcodeproj/​project.pbxproj Sets iOS 2.6.3/619.
ios/​hexa_keeper_dev-Info.plist Uses Xcode build version.
ios/​fastlane/​Fastfile Adds production preflight.
Gemfile.lock Updates Ruby constraints.
flows/​ask-tab-navigation.yaml Adds empty-Ask navigation flow.
flows/​ask-history-navigation.yaml Adds chat-history navigation flow.
android/​gradle.properties Removes signing credentials.
android/​fastlane/​README.md Updates production lane documentation.
android/​fastlane/​Fastfile Adds artifact checks and explicit signing.
android/​app/​src/​main/​java/​com/​hexa_keeper/​MainActivity.kt Configures screen restoration.
android/​app/​build.gradle Sets Android 2.6.3/626 and signing.
.github/​workflows/​test.yml Enables release-branch test triggers.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread src/store/sagas/login.ts Resolved
Comment thread .github/workflows/test.yml Resolved
Comment thread scripts/release-version.cjs Resolved
Comment thread scripts/test_release_artifact.py Resolved
Comment thread scripts/test_release_artifact.py Resolved
Comment thread scripts/test_release_artifact.py Resolved
Comment thread src/store/sagas/upgrade.ts Resolved
Comment thread release/README.md Resolved
Comment thread release/README.md Resolved
@antuz123 antuz123 changed the title Backmerge frozen R2–2.6.3 release baseline into sprint Backmerge frozen 2.6.3 baseline and review fixes into sprint Oct 7, 2026
@antuz123
antuz123 removed the request for review from cakesoft-utkarsh October 7, 2026 11:47
Copilot AI balanced review requested due to automatic review settings October 7, 2026 12:53

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment thread src/store/sagas/wallets.ts Resolved
Comment thread .github/workflows/test.yml Resolved
Comment thread src/store/sagas/bhr.ts Resolved
Comment thread src/store/sagas/wallets.ts Resolved
@antuz123 antuz123 changed the title Backmerge frozen 2.6.3 baseline and review fixes into sprint R3: bring the 2.6.3 release baseline into sprint Oct 7, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants