From f865c5e12909825dcf39f4a8cb531790529d75ea Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@alum.mit.edu>
Date: Thu, 5 May 2022 10:04:33 -0700
Subject: [PATCH 1/2] feat: add go packages to package.json

---
 package.json | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 9c2b6dff8c999..c75762385ccde 100644
--- a/package.json
+++ b/package.json
@@ -6,13 +6,19 @@
   "workspaces": {
     "packages": [
       "packages/*",
-      "l2geth",
+      "batch-submitter",
+      "bss-core",
+      "gas-oracle",
+      "indexer",
       "integration-tests",
-      "go/*",
+      "l2geth-exporter",
+      "l2geth",
       "ops/docker/rpc-proxy",
       "ops/docker/hardhat",
       "ops/docker/go-builder",
-      "ops/docker/js-builder"
+      "ops/docker/js-builder",
+      "proxyd",
+      "teleportr"
     ],
     "nohoist": [
       "**/typechain",

From 7fb8624f6a67ccf32cf80354b5f00f71905c9a13 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@alum.mit.edu>
Date: Thu, 5 May 2022 09:43:08 -0700
Subject: [PATCH 2/2] feat: correct conf_remaining calculation

Subtaction was being performed in the wrong order, causing underflow.
---
 .changeset/hungry-turkeys-repeat.md | 5 +++++
 teleportr/api/server.go             | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/hungry-turkeys-repeat.md

diff --git a/.changeset/hungry-turkeys-repeat.md b/.changeset/hungry-turkeys-repeat.md
new file mode 100644
index 0000000000000..2b49cd7550e29
--- /dev/null
+++ b/.changeset/hungry-turkeys-repeat.md
@@ -0,0 +1,5 @@
+---
+'@eth-optimism/teleportr': patch
+---
+
+Fix confs_remaining calculation to prevent underflow
diff --git a/teleportr/api/server.go b/teleportr/api/server.go
index 47fe373f257ba..f105420940d2e 100644
--- a/teleportr/api/server.go
+++ b/teleportr/api/server.go
@@ -478,8 +478,8 @@ func (s *Server) HandleTrack(
 
 	var confsRemaining uint64
 	if teleport.Deposit.BlockNumber+s.numConfirmations > blockNumber+1 {
-		confsRemaining = blockNumber + 1 -
-			(teleport.Deposit.BlockNumber + s.numConfirmations)
+		confsRemaining = teleport.Deposit.BlockNumber + s.numConfirmations -
+			(blockNumber + 1)
 	}
 
 	resp := TrackResponse{