Merge pull request #491 from lightninglabs/fix-docker-build

Fix docker build

.github/actions/setup-go/action.yml

@@ -8,7 +8,12 @@ runs:
     - name: Query cache for go artifacts
       uses: actions/cache@v3
       with:
-        path: /home/runner/work/go
+        # In order:
+        # * Module download cache
+        # * Build cache (Linux)
+        path: |
+          ~/go/pkg/mod
+          ~/.cache/go-build
         key: taproot-assets-${{ runner.os }}-go-${{ env.GO_VERSION }}-${{ github.job }}-${{ hashFiles('**/go.sum') }}
         restore-keys: |
           taproot-assets-${{ runner.os }}-go-${{ env.GO_VERSION }}-${{ github.job }}-${{ hashFiles('**/go.sum') }}

.github/workflows/main.yaml

@@ -17,10 +17,7 @@ defaults:
 
 env:
   # go needs absolute directories, using the $HOME variable doesn't work here.
-  GOCACHE: /home/runner/work/go/pkg/build
-  GOMODCACHE: /home/runner/work/go/pkg/mod
   GOPATH: /home/runner/work/go
-  GO111MODULE: on
 
   # If you change this value, please change it in the following files as well:
   # /Dockerfile
@@ -97,6 +94,33 @@ jobs:
       - name: compile code
         run: go install -v ./...
 
+  ########################
+  # Docker build check.
+  ########################
+  docker-build-check:
+    name: Docker build check
+    runs-on: ubuntu-latest
+    steps:
+      - name: git checkout
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Build default image
+        uses: docker/build-push-action@v4
+        with:
+          tags: "default-taproot-assets"
+
+      - name: Build dev image
+        uses: docker/build-push-action@v4
+        with:
+          file: dev.Dockerfile
+          tags: "dev-taproot-assets"
+
   ########################
   # cross compilation
   ########################
@@ -209,7 +233,7 @@ jobs:
   ########################
   integration-test-postgres:
     name: run itests postgres
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: git checkout
         uses: actions/checkout@v3

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "bips"]
 	path = bips
-	url = git@github.com:Roasbeef/bips.git
+	url = https://github.com/Roasbeef/bips.git
 	branch = bip-tap

Dockerfile

@@ -4,7 +4,7 @@
 # /make/builder.Dockerfile
 # /taprpc/Dockerfile
 # /tools/Dockerfile
-FROM golang:1.21.0-bookworm as builder
+FROM golang:1.21.0-alpine as builder
 
 # Force Go to use the cgo based DNS resolver. This is required to ensure DNS
 # queries required to connect to linked containers succeed.

go.mod

@@ -3,13 +3,13 @@ module github.com/lightninglabs/taproot-assets
 go 1.19
 
 require (
-	github.com/btcsuite/btcd v0.23.5-0.20230228185050-38331963bddd
+	github.com/btcsuite/btcd v0.23.5-0.20230711222809-7faa9b266231
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2
 	github.com/btcsuite/btcd/btcutil v1.1.3
 	github.com/btcsuite/btcd/btcutil/psbt v1.1.8
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2
 	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f
-	github.com/btcsuite/btcwallet v0.16.10-0.20230706223227-037580c66b74
+	github.com/btcsuite/btcwallet v0.16.10-0.20230804184612-07be54bc22cf
 	github.com/caddyserver/certmagic v0.17.2
 	github.com/davecgh/go-spew v1.1.1
 	github.com/go-errors/errors v1.0.1
@@ -25,15 +25,15 @@ require (
 	github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2
 	github.com/lightninglabs/lndclient v0.16.0-15
 	github.com/lightninglabs/neutrino/cache v1.1.1
-	github.com/lightningnetwork/lnd v0.16.0-beta.rc5.0.20230803213632-03b26bb909bb
+	github.com/lightningnetwork/lnd v0.17.0-beta.rc2
 	github.com/lightningnetwork/lnd/cert v1.2.1
 	github.com/lightningnetwork/lnd/clock v1.1.0
 	github.com/lightningnetwork/lnd/ticker v1.1.0
 	github.com/lightningnetwork/lnd/tlv v1.1.0
 	github.com/lightningnetwork/lnd/tor v1.1.1
 	github.com/ory/dockertest/v3 v3.10.0
 	github.com/prometheus/client_golang v1.14.0
-	github.com/stretchr/testify v1.8.1
+	github.com/stretchr/testify v1.8.2
 	github.com/urfave/cli v1.22.9
 	golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0
 	golang.org/x/net v0.10.0
@@ -120,8 +120,8 @@ require (
 	github.com/kr/pretty v0.3.0 // indirect
 	github.com/libdns/libdns v0.2.1 // indirect
 	github.com/lightninglabs/gozmq v0.0.0-20191113021534-d20a764486bf // indirect
-	github.com/lightninglabs/neutrino v0.15.1-0.20230710222839-9fd0fc551366 // indirect
-	github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1 // indirect
+	github.com/lightninglabs/neutrino v0.16.0 // indirect
+	github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f // indirect
 	github.com/lightningnetwork/lnd/healthcheck v1.2.2 // indirect
 	github.com/lightningnetwork/lnd/kvdb v1.4.2 // indirect
 	github.com/lightningnetwork/lnd/queue v1.1.0 // indirect

go.sum

@@ -77,8 +77,8 @@ github.com/btcsuite/btcd v0.22.0-beta.0.20220207191057-4dc4ff7963b4/go.mod h1:7a
 github.com/btcsuite/btcd v0.23.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
 github.com/btcsuite/btcd v0.23.1/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
 github.com/btcsuite/btcd v0.23.3/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
-github.com/btcsuite/btcd v0.23.5-0.20230228185050-38331963bddd h1:v2Bs8yLhwv+8XYU96OOnhZ5BEj8ZlNGownexUO0e80I=
-github.com/btcsuite/btcd v0.23.5-0.20230228185050-38331963bddd/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
+github.com/btcsuite/btcd v0.23.5-0.20230711222809-7faa9b266231 h1:FZR6mILlSI/GDx8ydNVBZAlXlRXsoRBWX2Un64mpfsI=
+github.com/btcsuite/btcd v0.23.5-0.20230711222809-7faa9b266231/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
 github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
 github.com/btcsuite/btcd/btcec/v2 v2.1.1/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
 github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
@@ -98,8 +98,8 @@ github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2/go.mod h1:7SFka0XMvUgj3hfZtyd
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
 github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
-github.com/btcsuite/btcwallet v0.16.10-0.20230706223227-037580c66b74 h1:RanL5kPm5Gi9YPf+3aPfdd6gJuohoJMxcDv8R033RIo=
-github.com/btcsuite/btcwallet v0.16.10-0.20230706223227-037580c66b74/go.mod h1:Hl4PP/tSNcgN6himfx/020mYSa19a1qkqTuqQBUU97w=
+github.com/btcsuite/btcwallet v0.16.10-0.20230804184612-07be54bc22cf h1:iZrvu/dynDPUcLJFkKiN9wnS4EdjwZSJS1H33Rx/a1Y=
+github.com/btcsuite/btcwallet v0.16.10-0.20230804184612-07be54bc22cf/go.mod h1:qUPTONX2GVX7ERHvgh352/WySsfYlrkL4729qX9o9cA=
 github.com/btcsuite/btcwallet/wallet/txauthor v1.3.2 h1:etuLgGEojecsDOYTII8rYiGHjGyV5xTqsXi+ZQ715UU=
 github.com/btcsuite/btcwallet/wallet/txauthor v1.3.2/go.mod h1:Zpk/LOb2sKqwP2lmHjaZT9AdaKsHPSbNLm2Uql5IQ/0=
 github.com/btcsuite/btcwallet/wallet/txrules v1.2.0 h1:BtEN5Empw62/RVnZ0VcJaVtVlBijnLlJY+dwjAye2Bg=
@@ -468,16 +468,16 @@ github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2 h1:Er1miPZD2X
 github.com/lightninglabs/lightning-node-connect/hashmailrpc v1.0.2/go.mod h1:antQGRDRJiuyQF6l+k6NECCSImgCpwaZapATth2Chv4=
 github.com/lightninglabs/lndclient v0.16.0-15 h1:U4GXByrHAPqZqTaEbzC+J1aCjp3otVI7bemXrf5NB7c=
 github.com/lightninglabs/lndclient v0.16.0-15/go.mod h1:mqY0znSNa+M40HZowwKfno29RyZnmxoqo++BlYP82EY=
-github.com/lightninglabs/neutrino v0.15.1-0.20230710222839-9fd0fc551366 h1:++HuI+fNJ61HWobNkj0BvFs477R2Ar3TJABI0gendI8=
-github.com/lightninglabs/neutrino v0.15.1-0.20230710222839-9fd0fc551366/go.mod h1:pmjwElN/091TErtSE9Vd5W4hpxoG2/+xlb+HoPm9Gug=
+github.com/lightninglabs/neutrino v0.16.0 h1:YNTQG32fPR/Zg0vvJVI65OBH8l3U18LSXXtX91hx0q0=
+github.com/lightninglabs/neutrino v0.16.0/go.mod h1:x3OmY2wsA18+Kc3TSV2QpSUewOCiscw2mKpXgZv2kZk=
 github.com/lightninglabs/neutrino/cache v1.1.1 h1:TllWOSlkABhpgbWJfzsrdUaDH2fBy/54VSIB4vVqV8M=
 github.com/lightninglabs/neutrino/cache v1.1.1/go.mod h1:XJNcgdOw1LQnanGjw8Vj44CvguYA25IMKjWFZczwZuo=
 github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display h1:pRdza2wleRN1L2fJXd6ZoQ9ZegVFTAb2bOQfruJPKcY=
 github.com/lightninglabs/protobuf-go-hex-display v1.30.0-hex-display/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1 h1:Wm0g70gkcAu2pGpNZwfWPSVOY21j8IyYsNewwK4OkT4=
-github.com/lightningnetwork/lightning-onion v1.2.1-0.20221202012345-ca23184850a1/go.mod h1:7dDx73ApjEZA0kcknI799m2O5kkpfg4/gr7N092ojNo=
-github.com/lightningnetwork/lnd v0.16.0-beta.rc5.0.20230803213632-03b26bb909bb h1:q/PUcpcOD0P0jbmwMnIxJ/B3Oe8ehqesyMdsLWiTEAQ=
-github.com/lightningnetwork/lnd v0.16.0-beta.rc5.0.20230803213632-03b26bb909bb/go.mod h1:hkTaH7yfMuN7MnMm3TuLSOv9kjFcGFr+/XnqTR/Nk5o=
+github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f h1:Pua7+5TcFEJXIIZ1I2YAUapmbcttmLj4TTi786bIi3s=
+github.com/lightningnetwork/lightning-onion v1.2.1-0.20230823005744-06182b1d7d2f/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
+github.com/lightningnetwork/lnd v0.17.0-beta.rc2 h1:o2j3foJLC+pXOz56NSaSsaP25kM2rQ4jMt2wZPnW+Gg=
+github.com/lightningnetwork/lnd v0.17.0-beta.rc2/go.mod h1:QdklavIi6ioc3BCl3EYXcL9gdrJn4Wz1Mx3pYjsu5NM=
 github.com/lightningnetwork/lnd/cert v1.2.1 h1:CTrTcU0L66J73oqdRLVfNylZyp1Fh97ZezX6IuzkrqE=
 github.com/lightningnetwork/lnd/cert v1.2.1/go.mod h1:04JhIEodoR6usBN5+XBRtLEEmEHsclLi0tEyxZQNP+w=
 github.com/lightningnetwork/lnd/clock v1.0.1/go.mod h1:KnQudQ6w0IAMZi1SgvecLZQZ43ra2vpDNj7H/aasemg=
@@ -643,8 +643,9 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
 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=

itest/integration_test.go

@@ -56,34 +56,31 @@ func TestTaprootAssetsDaemon(t *testing.T) {
 			testCase.name)
 
 		success := t.Run(testCase.name, func(t1 *testing.T) {
-			// Create a subtest harness for each test case.
-			subTestLnd := lndHarness.Subtest(t1)
-
 			// The universe server and tapd client are both freshly
 			// created and later discarded for each test run to
 			// assure no state is taken over between runs.
 			tapdHarness, universeServer, proofCourier :=
 				setupHarnesses(
-					t1, ht, subTestLnd,
+					t1, ht, lndHarness,
 					testCase.proofCourierType,
 				)
-			subTestLnd.EnsureConnected(
-				subTestLnd.Alice, subTestLnd.Bob,
+			lndHarness.EnsureConnected(
+				lndHarness.Alice, lndHarness.Bob,
 			)
 
-			subTestLnd.Alice.AddToLogf(logLine)
-			subTestLnd.Bob.AddToLogf(logLine)
+			lndHarness.Alice.AddToLogf(logLine)
+			lndHarness.Bob.AddToLogf(logLine)
 
 			ht := ht.newHarnessTest(
-				t1, subTestLnd, universeServer,
+				t1, lndHarness, universeServer,
 				tapdHarness, proofCourier,
 			)
 
 			// Now we have everything to run the test case.
 			ht.RunTestCase(testCase)
 
 			// Shut down both client and server to remove all state.
-			err := ht.shutdown(t)
+			err := ht.shutdown(t1)
 			require.NoError(t1, err)
 		})
 

itest/re-org_test.go

@@ -27,7 +27,7 @@ func testReOrgMint(t *harnessTest) {
 
 	// Before we mine a block to confirm the mint TX, we create a temporary
 	// miner.
-	tempMiner := t.lndHarness.Miner.SpawnTempMiner()
+	tempMiner := spawnTempMiner(t.t, t, ctxt)
 	miner := t.lndHarness.Miner
 
 	// And now we mine a block to confirm the assets.
@@ -146,7 +146,7 @@ func testReOrgSend(t *harnessTest) {
 
 	// Before we mine a block to confirm the mint TX, we create a temporary
 	// miner.
-	tempMiner := t.lndHarness.Miner.SpawnTempMiner()
+	tempMiner := spawnTempMiner(t.t, t, ctxt)
 	miner := t.lndHarness.Miner
 
 	// Now to the second part of the test: We'll send an asset to Bob, and
@@ -238,9 +238,13 @@ func testReOrgSend(t *harnessTest) {
 // testReOrgMintAndSend tests that when a re-org occurs, minted and directly
 // sent asset proofs are updated accordingly.
 func testReOrgMintAndSend(t *harnessTest) {
+	ctxb := context.Background()
+	ctxt, cancel := context.WithTimeout(ctxb, defaultWaitTimeout)
+	defer cancel()
+
 	// Before we do anything, we spawn a miner. This is where the fork in
 	// the chain starts.
-	tempMiner := t.lndHarness.Miner.SpawnTempMiner()
+	tempMiner := spawnTempMiner(t.t, t, ctxt)
 	miner := t.lndHarness.Miner
 
 	// Then, we'll mint a few assets and confirm the batch TX.
@@ -249,10 +253,6 @@ func testReOrgMintAndSend(t *harnessTest) {
 	}
 	assetList := mintAssetsConfirmBatch(t, t.tapd, mintRequests)
 
-	ctxb := context.Background()
-	ctxt, cancel := context.WithTimeout(ctxb, defaultWaitTimeout)
-	defer cancel()
-
 	// Now that we have the asset created, we'll make a new node that'll
 	// serve as the node which'll receive the assets. The existing tapd
 	// node will be used to synchronize universe state.
@@ -363,6 +363,16 @@ func testReOrgMintAndSend(t *harnessTest) {
 	t.lndHarness.MineBlocks(8)
 }
 
+// spawnTempMiner creates a temporary miner that uses the same chain backend
+// and client as the main miner.
+func spawnTempMiner(t *testing.T, ht *harnessTest,
+	ctx context.Context) *lntest.HarnessMiner {
+
+	tempHarness := lntest.NewMiner(ctx, t)
+	tempHarness.Client = ht.lndHarness.Miner.Client
+	return tempHarness.SpawnTempMiner()
+}
+
 // generateReOrg generates a re-org by mining a longer chain with a temporary
 // miner, and then connecting the temporary miner to the original miner.
 // Depending on when exactly the temporary miner was spawned, the expectedDelta

itest/tapd_harness.go

@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"sync"
+	"testing"
 	"time"
 
 	"github.com/btcsuite/btcd/chaincfg"
@@ -78,7 +79,7 @@ type tapdConfig struct {
 
 // newTapdHarness creates a new tapd server harness with the given
 // configuration.
-func newTapdHarness(ht *harnessTest, cfg tapdConfig,
+func newTapdHarness(t *testing.T, ht *harnessTest, cfg tapdConfig,
 	proofCourier proof.CourierHarness,
 	proofSendBackoffCfg *proof.BackoffCfg,
 	proofReceiverAckTimeout *time.Duration) (*tapdHarness, error) {
@@ -117,11 +118,11 @@ func newTapdHarness(ht *harnessTest, cfg tapdConfig,
 
 	case tapcfg.DatabaseBackendPostgres:
 		fixture := tapdb.NewTestPgFixture(
-			ht.t, *postgresTimeout, !*noDelete,
+			t, *postgresTimeout, !*noDelete,
 		)
-		ht.t.Cleanup(func() {
+		t.Cleanup(func() {
 			if !*noDelete {
-				fixture.TearDown(ht.t)
+				fixture.TearDown(t)
 			}
 		})
 		tapCfg.DatabaseBackend = tapcfg.DatabaseBackendPostgres

itest/test_harness.go

@@ -363,7 +363,7 @@ func setupTapdHarness(t *testing.T, ht *harnessTest,
 	}
 
 	tapdHarness, err := newTapdHarness(
-		ht, tapdConfig{
+		t, ht, tapdConfig{
 			NetParams: harnessNetParams,
 			LndNode:   node,
 		}, selectedProofCourier,

itest/test_list_on_test.go

@@ -23,6 +23,21 @@ var testCases = []*testCase{
 		name: "multi address",
 		test: testMultiAddress,
 	},
+	// For some (yet unknown) reason, the Postgres itest is much more flaky
+	// if the re-org tests run last. So we run them toward the beginning to
+	// reduce the flakiness of the Postgres itest.
+	{
+		name: "re-org mint",
+		test: testReOrgMint,
+	},
+	{
+		name: "re-org send",
+		test: testReOrgSend,
+	},
+	{
+		name: "re-org mint and send",
+		test: testReOrgMintAndSend,
+	},
 	{
 		name:             "basic send unidirectional",
 		test:             testBasicSendUnidirectional,
@@ -136,18 +151,6 @@ var testCases = []*testCase{
 		name: "get info",
 		test: testGetInfo,
 	},
-	{
-		name: "re-org mint",
-		test: testReOrgMint,
-	},
-	{
-		name: "re-org send",
-		test: testReOrgSend,
-	},
-	{
-		name: "re-org mint and send",
-		test: testReOrgMintAndSend,
-	},
 }
 
 var optionalTestCases = []*testCase{

tapdb/postgres_fixture.go

@@ -19,7 +19,7 @@ const (
 	testPgUser   = "test"
 	testPgPass   = "test"
 	testPgDBName = "test"
-	PostgresTag  = "11"
+	PostgresTag  = "15"
 )
 
 // TestPgFixture is a test fixture that starts a Postgres 11 instance in a