refactor: using old sqlite version (#697)

Dockerfile

@@ -1,5 +1,5 @@
 # Build thor in a stock Go builder container
-FROM golang:alpine as builder
+FROM golang:1.21.9-alpine3.18 as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 WORKDIR  /go/thor
@@ -16,4 +16,4 @@ RUN adduser -D -s /bin/ash thor
 USER thor
 
 EXPOSE 8669 11235 11235/udp 55555/udp
-ENTRYPOINT ["thor"]
+ENTRYPOINT ["thor"]

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/holiman/uint256 v1.2.0
 	github.com/inconshreveable/log15 v0.0.0-20171019012758-0decfc6c20d9
 	github.com/mattn/go-isatty v0.0.3
-	github.com/mattn/go-sqlite3 v1.14.19
+	github.com/mattn/go-sqlite3 v1.14.9
 	github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a
 	github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c
 	github.com/pkg/errors v0.8.0

go.sum

@@ -99,8 +99,8 @@ github.com/mattn/go-isatty v0.0.3 h1:ns/ykhmWi7G9O+8a448SecJU3nSMBXJfqQkl0upE1jI
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
 github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/mattn/go-sqlite3 v1.14.19 h1:fhGleo2h1p8tVChob4I9HpmVFIAkKGpiukdrgQbWfGI=
-github.com/mattn/go-sqlite3 v1.14.19/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/KYA=
+github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a h1:8TGB3DFRNl06DB1Q6zBX+I7FDoCUZY2fmMS9WGUIIpw=
 github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=

logdb/logdb.go

@@ -139,29 +139,21 @@ FROM (%v) e
 		subQuery += ")"
 	}
 
+	if filter.Order == DESC {
+		subQuery += " ORDER BY seq DESC "
+	} else {
+		subQuery += " ORDER BY seq ASC "
+	}
+
 	// if there is limit option, set order inside subquery
 	if filter.Options != nil {
-		if filter.Order == DESC {
-			subQuery += " ORDER BY seq DESC "
-		} else {
-			subQuery += " ORDER BY seq ASC "
-		}
 		subQuery += " LIMIT ?, ?"
 		args = append(args, filter.Options.Offset, filter.Options.Limit)
 	}
 
 	subQuery = "SELECT e.* FROM (" + subQuery + ") s LEFT JOIN event e ON s.seq = e.seq"
 
-	eventQuery := fmt.Sprintf(query, subQuery)
-	// if there is no limit option, set order outside
-	if filter.Options == nil {
-		if filter.Order == DESC {
-			eventQuery += " ORDER BY seq DESC "
-		} else {
-			eventQuery += " ORDER BY seq ASC "
-		}
-	}
-	return db.queryEvents(ctx, eventQuery, args...)
+	return db.queryEvents(ctx, fmt.Sprintf(query, subQuery), args...)
 }
 
 func (db *LogDB) FilterTransfers(ctx context.Context, filter *TransferFilter) ([]*Transfer, error) {
@@ -204,28 +196,21 @@ FROM (%v) t
 		subQuery += ")"
 	}
 
+	if filter.Order == DESC {
+		subQuery += " ORDER BY seq DESC "
+	} else {
+		subQuery += " ORDER BY seq ASC "
+	}
+
 	// if there is limit option, set order inside subquery
 	if filter.Options != nil {
-		if filter.Order == DESC {
-			subQuery += " ORDER BY seq DESC"
-		} else {
-			subQuery += " ORDER BY seq ASC"
-		}
 		subQuery += " LIMIT ?, ?"
 		args = append(args, filter.Options.Offset, filter.Options.Limit)
 	}
 
 	subQuery = "SELECT e.* FROM (" + subQuery + ") s LEFT JOIN transfer e ON s.seq = e.seq"
-	transferQuery := fmt.Sprintf(query, subQuery)
-	// if there is no limit option, set order outside
-	if filter.Options == nil {
-		if filter.Order == DESC {
-			transferQuery += " ORDER BY seq DESC "
-		} else {
-			transferQuery += " ORDER BY seq ASC "
-		}
-	}
-	return db.queryTransfers(ctx, transferQuery, args...)
+
+	return db.queryTransfers(ctx, fmt.Sprintf(query, subQuery), args...)
 }
 
 func (db *LogDB) queryEvents(ctx context.Context, query string, args ...interface{}) ([]*Event, error) {