Use non-zero nonce for attestations (#74)

Co-authored-by: Trajan0x <trajan0x@users.noreply.github.com> Co-authored-by: ChiTimesChi <88190723+ChiTimesChi@users.noreply.github.com>
synapsecns · Aug 10, 2022 · ef918bf · ef918bf
1 parent c539298
commit ef918bf
Show file tree

Hide file tree

Showing 15 changed files with 79 additions and 77 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -216,7 +216,7 @@ jobs:
  # Path to your GolangCI-Lint config within the repo (optional)
  config: ${{ env.GITHUB_WORKSPACE }}/.golangci.yml
  # see: https://github.com/golangci/golangci-lint/issues/2654
- args: --timeout=10m
+ args: --timeout=15m
  env:
  # GitHub token for annotations (optional)
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/core/contracts/home/home.abigen.go b/core/contracts/home/home.abigen.go
diff --git a/core/contracts/home/home.contractinfo.json b/core/contracts/home/home.contractinfo.json
diff --git a/core/contracts/test/headerharness/headerharness.abigen.go b/core/contracts/test/headerharness/headerharness.abigen.go
diff --git a/core/contracts/test/headerharness/headerharness.contractinfo.json b/core/contracts/test/headerharness/headerharness.contractinfo.json
diff --git a/core/contracts/test/homeharness/homeharness.abigen.go b/core/contracts/test/homeharness/homeharness.abigen.go
diff --git a/core/contracts/test/homeharness/homeharness.contractinfo.json b/core/contracts/test/homeharness/homeharness.contractinfo.json
diff --git a/core/contracts/test/messageharness/messageharness.abigen.go b/core/contracts/test/messageharness/messageharness.abigen.go
diff --git a/core/contracts/test/messageharness/messageharness.contractinfo.json b/core/contracts/test/messageharness/messageharness.contractinfo.json
diff --git a/core/contracts/test/tipsharness/tipsharness.abigen.go b/core/contracts/test/tipsharness/tipsharness.abigen.go
diff --git a/core/contracts/test/tipsharness/tipsharness.contractinfo.json b/core/contracts/test/tipsharness/tipsharness.contractinfo.json
diff --git a/core/contracts/updatermanager/updatemanager.abigen.go b/core/contracts/updatermanager/updatemanager.abigen.go
diff --git a/core/contracts/updatermanager/updatemanager.contractinfo.json b/core/contracts/updatermanager/updatemanager.contractinfo.json
diff --git a/packages/contracts/contracts/Home.sol b/packages/contracts/contracts/Home.sol
@@ -123,8 +123,8 @@ contract Home is Version0, MerkleTreeManager, UpdaterStorage, AuthManager {
  _setUpdaterManager(_updaterManager);
  __SynapseBase_initialize(updaterManager.updater());
  state = States.Active;
- // insert a historical root so nonces start at 1 rather then 0
- historicalRoots.push(bytes32(""));
+ // insert a historical root so nonces start at 1 rather then 0. Here we insert the default root of a sparse merkle tree
+ historicalRoots.push(hex"27ae5ba08d7291c96c8cbddcc148bf48a6d68c7974b94356f53754ef6171d757");
  }
 
  // ============ Modifiers ============

diff --git a/packages/contracts/test/Home.t.sol b/packages/contracts/test/Home.t.sol
@@ -31,6 +31,8 @@ contract HomeTest is SynapseTestWithUpdaterManager {
  assertEq(home.owner(), address(this));
  assertEq(uint256(home.state()), 1);
  assertEq(home.updater(), updater);
+ // Root of an empty sparse Merkle tree should be stored with nonce=0
+ assertEq(home.historicalRoots(0), home.root());
  }
 
  function test_cannotInitializeTwice() public {
@@ -166,7 +168,7 @@ contract HomeTest is SynapseTestWithUpdaterManager {
  uint32 nonce = 0;
  bytes32 root = home.root();
  // This root exists, but with nonce = 1
- // nonce = 0 exists, with a different Merkle root
+ // nonce = 2 exists, with a different Merkle root
  _checkImproperUpdate(nonce, root);
  }