Merge pull request #89 from SiaFoundation/nate/fix-32-bit-alignment

Align fields for sync/atomic on 32-bit systems

host/contracts/manager.go

@@ -64,6 +64,8 @@ type (
 
 	// A ContractManager manages contracts' lifecycle
 	ContractManager struct {
+		blockHeight uint64 // ensure 64-bit alignment on 32-bit systems
+
 		store ContractStore
 		tg    *threadgroup.ThreadGroup
 		log   *zap.Logger
@@ -74,8 +76,6 @@ type (
 		tpool   TransactionPool
 		wallet  Wallet
 
-		blockHeight uint64
-
 		processQueue chan uint64 // signals that the contract manager should process actions for a given block height
 
 		mu    sync.Mutex                       // guards the following fields

host/storage/storage.go

@@ -64,6 +64,9 @@ type (
 
 	// A VolumeManager manages storage using local volumes.
 	VolumeManager struct {
+		cacheHits   uint64 // ensure 64-bit alignment on 32-bit systems
+		cacheMisses uint64
+
 		a        Alerts
 		vs       VolumeStore
 		cm       ChainManager
@@ -77,8 +80,6 @@ type (
 		// changedVolumes tracks volumes that need to be fsynced
 		changedVolumes map[int]bool
 		cache          *lru.Cache[types.Hash256, *[rhpv2.SectorSize]byte] // Added cache
-		cacheHits      uint64
-		cacheMisses    uint64
 	}
 )
 

wallet/wallet.go

@@ -66,9 +66,10 @@ type (
 	// A SingleAddressWallet is a hot wallet that manages the outputs controlled by
 	// a single address.
 	SingleAddressWallet struct {
-		priv       types.PrivateKey
-		addr       types.Address
-		scanHeight uint64
+		scanHeight uint64 // ensure 64-bit alignment on 32-bit systems
+
+		priv types.PrivateKey
+		addr types.Address
 
 		cm    ChainManager
 		store SingleAddressStore