From 6e0c84ccad617a78c98b7ac11e166608784cdfca Mon Sep 17 00:00:00 2001
From: Matiss Janis Aboltins <matiss@mja.lv>
Date: Wed, 5 Jul 2023 21:13:46 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix=20new=20budget=20files=20not?=
=?UTF-8?q?=20syncing=20(#1291)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fix a small regression introduced in
https://github.com/actualbudget/actual/pull/1076
Tested locally and this seems to have solved the problem
---
packages/crdt/package.json | 2 +-
packages/crdt/src/crdt/merkle.ts | 2 +-
packages/crdt/src/crdt/timestamp.ts | 5 +----
upcoming-release-notes/1291.md | 6 ++++++
4 files changed, 9 insertions(+), 6 deletions(-)
create mode 100644 upcoming-release-notes/1291.md
diff --git a/packages/crdt/package.json b/packages/crdt/package.json
index 4e4ec2462..5cd121b6c 100644
--- a/packages/crdt/package.json
+++ b/packages/crdt/package.json
@@ -1,6 +1,6 @@
{
"name": "@actual-app/crdt",
- "version": "2.0.0",
+ "version": "2.0.1",
"license": "MIT",
"description": "CRDT layer of Actual",
"main": "dist/index.js",
diff --git a/packages/crdt/src/crdt/merkle.ts b/packages/crdt/src/crdt/merkle.ts
index d77b4f807..20899838a 100644
--- a/packages/crdt/src/crdt/merkle.ts
+++ b/packages/crdt/src/crdt/merkle.ts
@@ -16,7 +16,7 @@ export type TrieNode = {
'0'?: TrieNode;
'1'?: TrieNode;
'2'?: TrieNode;
- hash: number;
+ hash?: number;
};
export function emptyTrie(): TrieNode {
diff --git a/packages/crdt/src/crdt/timestamp.ts b/packages/crdt/src/crdt/timestamp.ts
index 190924c7e..1fe7d31f4 100644
--- a/packages/crdt/src/crdt/timestamp.ts
+++ b/packages/crdt/src/crdt/timestamp.ts
@@ -42,10 +42,7 @@ export function getClock(): Clock {
return clock;
}
-export function makeClock(
- timestamp: Timestamp,
- merkle: TrieNode = { hash: 0 },
-) {
+export function makeClock(timestamp: Timestamp, merkle: TrieNode = {}) {
return { timestamp: MutableTimestamp.from(timestamp), merkle };
}
diff --git a/upcoming-release-notes/1291.md b/upcoming-release-notes/1291.md
new file mode 100644
index 000000000..79212423a
--- /dev/null
+++ b/upcoming-release-notes/1291.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [MatissJanis]
+---
+
+Fix new budget files not syncing correctly
--
GitLab