It has happened

.github/workflows/test.yml

@@ -80,3 +80,20 @@ jobs:
  args: "-failfast;-race;-timeout=60m"
  - name: Build
  run: go build -o bin/ ./cmd/renterd
+ - name: Test Integration V2
+ uses: n8maninger/action-golang-test@v1
+ with:
+ package: "./internal/test/e2e/..."
+ args: "-failfast;-race;-tags=testing,v2;-timeout=30m"
+ - name: Test Integration V2 - MySQL
+ if: matrix.os == 'ubuntu-latest'
+ uses: n8maninger/action-golang-test@v1
+ env:
+ RENTERD_DB_URI: 127.0.0.1:3800
+ RENTERD_DB_USER: root
+ RENTERD_DB_PASSWORD: test
+ with:
+ package: "./internal/test/e2e/..."
+ args: "-failfast;-race;-tags=testing,v2;-timeout=30m"
+ - name: Build
+ run: go build -o bin/ ./cmd/renterd

autopilot/contractor/contractor.go

@@ -486,6 +486,8 @@ func (c *Contractor) refreshFundingEstimate(cfg api.AutopilotConfig, contract ap
 }
 
 func (c *Contractor) shouldArchive(contract api.Contract, bh uint64) error {
+ // TODO: check if a v1 contract still exists beyond the v2 require height.
+ // If so we archive it since we can't renew it.
  if bh > contract.EndHeight()-c.revisionSubmissionBuffer {
  return errContractExpired
  } else if contract.Revision != nil && contract.Revision.RevisionNumber == math.MaxUint64 {

autopilot/contractor/hostfilter.go

@@ -103,6 +103,8 @@ func (u *unusableHostsBreakdown) keysAndValues() []interface{} {
 // - refresh -> should be refreshed
 // - renew -> should be renewed
 func (c *Contractor) isUsableContract(cfg api.AutopilotConfig, s rhpv2.HostSettings, pt rhpv3.HostPriceTable, rs api.RedundancySettings, contract api.Contract, inSet bool, bh uint64, f *hostSet) (usable, refresh, renew bool, reasons []string) {
+ // TODO: check if a v1 contract has an end height beyond the v2 require
+ // height. If so we need to renew it.
  usable = true
  if bh > contract.EndHeight() {
  reasons = append(reasons, errContractExpired.Error())

internal/test/e2e/build_v1.go

@@ -0,0 +1,9 @@
+//go:build !v2
+
+package e2e
+
+// configuration for pre-v2-hardfork tests
+const (
+ HardforkV2AllowHeight = 10000
+ HardforkV2RequireHeight = 20000
+)

internal/test/e2e/build_v2.go

@@ -0,0 +1,9 @@
+//go:build v2
+
+package e2e
+
+// configuration for post-v2-hardfork tests
+const (
+ HardforkV2AllowHeight = 2
+ HardforkV2RequireHeight = 3
+)

internal/test/e2e/cluster.go

@@ -517,11 +517,13 @@ func newTestCluster(t *testing.T, opts testClusterOptions) *TestCluster {
  }
 
  if nHosts > 0 {
- cluster.AddHostsBlocking(nHosts)
+ cluster.AddHosts(nHosts)
  cluster.WaitForPeers()
- cluster.WaitForContracts()
- cluster.WaitForContractSet(test.ContractSet, nHosts)
- cluster.WaitForAccounts()
+ if !opts.skipRunningAutopilot && !opts.skipSettingAutopilot {
+ cluster.WaitForContracts()
+ cluster.WaitForContractSet(test.ContractSet, nHosts)
+ cluster.WaitForAccounts()
+ }
  }
 
  // Ping the UI
@@ -1066,8 +1068,8 @@ func testNetwork() (*consensus.Network, types.Block) {
  n.HardforkOak.Height = 1
  n.HardforkASIC.Height = 1
  n.HardforkFoundation.Height = 1
- n.HardforkV2.AllowHeight = 1000
- n.HardforkV2.RequireHeight = 1020
+ n.HardforkV2.AllowHeight = HardforkV2AllowHeight
+ n.HardforkV2.RequireHeight = HardforkV2RequireHeight
 
  return n, genesis
 }