From b87ee2b51e5f63c204aa52fc5f04942d30e5647a Mon Sep 17 00:00:00 2001
From: Brannon King <countprimes@gmail.com>
Date: Fri, 24 Dec 2021 15:15:13 -0500
Subject: [PATCH] switch to syndtr, golang 1.17.5
forgot to run tidy
---
.github/workflows/basic-check.yml | 2 +-
.github/workflows/full-sync-part-1.yml | 2 +-
.github/workflows/full-sync-part-2.yml | 2 +-
.github/workflows/release.yml | 2 +-
blockchain/checkpoints.go | 3 ++-
database/ffldb/db.go | 14 +++++++-------
database/ffldb/dbcache.go | 6 +++---
database/ffldb/ldbtreapiter.go | 4 ++--
database/ffldb/whitebox_test.go | 4 ++--
go.mod | 4 +---
go.sum | 6 ++++--
11 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/.github/workflows/basic-check.yml b/.github/workflows/basic-check.yml
index ab6e5d87..4a644e87 100644
--- a/.github/workflows/basic-check.yml
+++ b/.github/workflows/basic-check.yml
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- go: [1.16.8, 1.17.1]
+ go: [1.16.8, 1.17.5]
steps:
- name: Set up Go
uses: actions/setup-go@v2
diff --git a/.github/workflows/full-sync-part-1.yml b/.github/workflows/full-sync-part-1.yml
index 27b88567..280fb2b2 100644
--- a/.github/workflows/full-sync-part-1.yml
+++ b/.github/workflows/full-sync-part-1.yml
@@ -14,7 +14,7 @@ jobs:
runs-on: self-hosted
strategy:
matrix:
- go: [1.17.3]
+ go: [1.17.5]
steps:
- run: |
echo "Note ${{ github.event.inputs.note }}!"
diff --git a/.github/workflows/full-sync-part-2.yml b/.github/workflows/full-sync-part-2.yml
index ab0309fb..bc72cf62 100644
--- a/.github/workflows/full-sync-part-2.yml
+++ b/.github/workflows/full-sync-part-2.yml
@@ -14,7 +14,7 @@ jobs:
runs-on: self-hosted
strategy:
matrix:
- go: [1.17.3]
+ go: [1.17.5]
steps:
- run: |
echo "Note ${{ github.event.inputs.note }}!"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 92cffcc4..5ab6d24b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v2
with:
- go-version: 1.17.3
+ go-version: 1.17.5
-
name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
diff --git a/blockchain/checkpoints.go b/blockchain/checkpoints.go
index a82d70dd..e9b2d5a2 100644
--- a/blockchain/checkpoints.go
+++ b/blockchain/checkpoints.go
@@ -172,7 +172,8 @@ func (b *BlockChain) findPreviousCheckpoint() (*blockNode, error) {
func isNonstandardTransaction(tx *btcutil.Tx) bool {
// Check all of the output public key scripts for non-standard scripts.
for _, txOut := range tx.MsgTx().TxOut {
- scriptClass := txscript.GetScriptClass(txOut.PkScript)
+ stripped := txscript.StripClaimScriptPrefix(txOut.PkScript)
+ scriptClass := txscript.GetScriptClass(stripped)
if scriptClass == txscript.NonStandardTy {
return true
}
diff --git a/database/ffldb/db.go b/database/ffldb/db.go
index ee6d55f0..843ef6bb 100644
--- a/database/ffldb/db.go
+++ b/database/ffldb/db.go
@@ -14,18 +14,18 @@ import (
"sort"
"sync"
- "github.com/btcsuite/goleveldb/leveldb"
- "github.com/btcsuite/goleveldb/leveldb/comparer"
- ldberrors "github.com/btcsuite/goleveldb/leveldb/errors"
- "github.com/btcsuite/goleveldb/leveldb/filter"
- "github.com/btcsuite/goleveldb/leveldb/iterator"
- "github.com/btcsuite/goleveldb/leveldb/opt"
- "github.com/btcsuite/goleveldb/leveldb/util"
"github.com/lbryio/lbcd/chaincfg/chainhash"
"github.com/lbryio/lbcd/database"
"github.com/lbryio/lbcd/database/internal/treap"
"github.com/lbryio/lbcd/wire"
btcutil "github.com/lbryio/lbcutil"
+ "github.com/syndtr/goleveldb/leveldb"
+ "github.com/syndtr/goleveldb/leveldb/comparer"
+ ldberrors "github.com/syndtr/goleveldb/leveldb/errors"
+ "github.com/syndtr/goleveldb/leveldb/filter"
+ "github.com/syndtr/goleveldb/leveldb/iterator"
+ "github.com/syndtr/goleveldb/leveldb/opt"
+ "github.com/syndtr/goleveldb/leveldb/util"
)
const (
diff --git a/database/ffldb/dbcache.go b/database/ffldb/dbcache.go
index 1bc21a35..eff239c6 100644
--- a/database/ffldb/dbcache.go
+++ b/database/ffldb/dbcache.go
@@ -10,10 +10,10 @@ import (
"sync"
"time"
- "github.com/btcsuite/goleveldb/leveldb"
- "github.com/btcsuite/goleveldb/leveldb/iterator"
- "github.com/btcsuite/goleveldb/leveldb/util"
"github.com/lbryio/lbcd/database/internal/treap"
+ "github.com/syndtr/goleveldb/leveldb"
+ "github.com/syndtr/goleveldb/leveldb/iterator"
+ "github.com/syndtr/goleveldb/leveldb/util"
)
const (
diff --git a/database/ffldb/ldbtreapiter.go b/database/ffldb/ldbtreapiter.go
index 0a552633..2073abbe 100644
--- a/database/ffldb/ldbtreapiter.go
+++ b/database/ffldb/ldbtreapiter.go
@@ -5,9 +5,9 @@
package ffldb
import (
- "github.com/btcsuite/goleveldb/leveldb/iterator"
- "github.com/btcsuite/goleveldb/leveldb/util"
"github.com/lbryio/lbcd/database/internal/treap"
+ "github.com/syndtr/goleveldb/leveldb/iterator"
+ "github.com/syndtr/goleveldb/leveldb/util"
)
// ldbTreapIter wraps a treap iterator to provide the additional functionality
diff --git a/database/ffldb/whitebox_test.go b/database/ffldb/whitebox_test.go
index 15c83cec..31a8ab34 100644
--- a/database/ffldb/whitebox_test.go
+++ b/database/ffldb/whitebox_test.go
@@ -17,11 +17,11 @@ import (
"path/filepath"
"testing"
- "github.com/btcsuite/goleveldb/leveldb"
- ldberrors "github.com/btcsuite/goleveldb/leveldb/errors"
"github.com/lbryio/lbcd/database"
"github.com/lbryio/lbcd/wire"
btcutil "github.com/lbryio/lbcutil"
+ "github.com/syndtr/goleveldb/leveldb"
+ ldberrors "github.com/syndtr/goleveldb/leveldb/errors"
)
var (
diff --git a/go.mod b/go.mod
index 02cf78c6..9ac89078 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,6 @@ go 1.17
require (
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd
- github.com/btcsuite/goleveldb v1.0.0
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792
github.com/btcsuite/winsvc v1.0.0
github.com/cockroachdb/errors v1.8.6
@@ -20,6 +19,7 @@ require (
github.com/shirou/gopsutil/v3 v3.21.7
github.com/spf13/cobra v1.1.3
github.com/stretchr/testify v1.7.0
+ github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7
github.com/vmihailenco/msgpack/v5 v5.3.2
golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b
golang.org/x/text v0.3.7
@@ -29,7 +29,6 @@ require (
github.com/DataDog/zstd v1.5.0 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/aead/siphash v1.0.1 // indirect
- github.com/btcsuite/snappy-go v1.0.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
github.com/cockroachdb/redact v1.1.3 // indirect
@@ -43,7 +42,6 @@ require (
github.com/klauspost/compress v1.13.6 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/kr/text v0.2.0 // indirect
- github.com/onsi/ginkgo v1.14.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
diff --git a/go.sum b/go.sum
index ca8a9a18..987e44d5 100644
--- a/go.sum
+++ b/go.sum
@@ -63,10 +63,8 @@ github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlH
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
-github.com/btcsuite/goleveldb v1.0.0 h1:Tvd0BfvqX9o823q1j2UZ/epQo09eJh6dTcRp79ilIN4=
github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
-github.com/btcsuite/snappy-go v1.0.0 h1:ZxaA6lo2EpxGddsA8JwWOcxlzRybb444sgmeJQMJGQE=
github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc=
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
@@ -498,6 +496,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
+github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
+github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
github.com/tklauser/go-sysconf v0.3.7 h1:HT7h4+536gjqeq1ZIJPgOl1rg1XFatQGVZWp7Py53eg=
github.com/tklauser/go-sysconf v0.3.7/go.mod h1:JZIdXh4RmBvZDBZ41ld2bGxRV3n4daiiqA3skYhAoQ4=
github.com/tklauser/numcpus v0.2.3 h1:nQ0QYpiritP6ViFhrKYsiv6VVxOpum2Gks5GhnJbS/8=
@@ -628,6 +628,7 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
@@ -679,6 +680,7 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=