fix: encoding tests

Author: bigearsenal

Sources/SolanaSwift/APIClient/APIClient+Extension.swift

@@ -168,7 +168,7 @@ public extension SolanaAPIClient {
             isUnregisteredAsocciatedToken = true
 
             // if associated token account has been registered
-            if PublicKey.isSPLTokenOrToken2022ProgramId(info?.owner),
+            if PublicKey.isSPLTokenProgram(info?.owner),
                info?.data != nil
             {
                 isUnregisteredAsocciatedToken = false

Sources/SolanaSwift/BlockchainClient/BlockchainClient+Extensions.swift

@@ -71,7 +71,7 @@ public extension SolanaBlockchainClient {
         do {
             let info: BufferInfo<SPLTokenAccountState>? = try await apiClient
                 .getAccountInfo(account: associatedAddress.base58EncodedString)
-            if PublicKey.isSPLTokenOrToken2022ProgramId(info?.owner),
+            if PublicKey.isSPLTokenProgram(info?.owner),
                info?.data.owner == owner
             {
                 isAssociatedTokenAddressRegistered = true

Sources/SolanaSwift/Extensions/PublicKey/PublicKey+Validation.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 public extension PublicKey {
-    static func isSPLTokenOrToken2022ProgramId(_ programId: String?) -> Bool {
+    static func isSPLTokenProgram(_ programId: String?) -> Bool {
         programId == TokenProgram.id.base58EncodedString ||
             programId == Token2022Program.id.base58EncodedString
     }

Sources/SolanaSwift/Programs/TokenPrograms/Token2022Program/ExtensionReader/AnyToken2022ExtensionState.swift

@@ -62,6 +62,14 @@ public struct AnyToken2022ExtensionState: BorshCodable, Codable, Equatable, Hash
         }
     }
 
+    init(
+        type: Token2022ExtensionType,
+        state: any Token2022ExtensionState
+    ) {
+        self.type = type
+        self.state = state
+    }
+
     public func serialize(to data: inout Data) throws {
         try type.rawValue.serialize(to: &data)
         try state.serialize(to: &data)

Sources/SolanaSwift/Programs/TokenPrograms/Token2022Program/ExtensionReader/Extensions/InterestBearingConfigExtensionState.swift

@@ -26,4 +26,20 @@ public struct InterestBearingConfigExtensionState: Token2022ExtensionState {
         try lastUpdateTimestamp.serialize(to: &data)
         try currentRate.serialize(to: &data)
     }
+
+    init(
+        length: UInt16,
+        rateAuthority: PublicKey,
+        initializationTimestamp: Int64,
+        preUpdateAverageRate: Int16,
+        lastUpdateTimestamp: Int64,
+        currentRate: Int16
+    ) {
+        self.length = length
+        self.rateAuthority = rateAuthority
+        self.initializationTimestamp = initializationTimestamp
+        self.preUpdateAverageRate = preUpdateAverageRate
+        self.lastUpdateTimestamp = lastUpdateTimestamp
+        self.currentRate = currentRate
+    }
 }

Sources/SolanaSwift/Programs/TokenPrograms/Token2022Program/ExtensionReader/Extensions/TransferFeeConfigExtensionState.swift

@@ -17,6 +17,16 @@ public struct TransferFeeConfigExtensionState: Token2022ExtensionState {
             try maximumFee.serialize(to: &data)
             try transferFeeBasisPoints.serialize(to: &data)
         }
+
+        init(
+            epoch: UInt64,
+            maximumFee: UInt64,
+            transferFeeBasisPoints: UInt16
+        ) {
+            self.epoch = epoch
+            self.maximumFee = maximumFee
+            self.transferFeeBasisPoints = transferFeeBasisPoints
+        }
     }
 
     public let length: UInt16
@@ -49,4 +59,20 @@ public struct TransferFeeConfigExtensionState: Token2022ExtensionState {
         try olderTransferFee.serialize(to: &data)
         try newerTransferFee.serialize(to: &data)
     }
+
+    init(
+        length: UInt16,
+        transferFeeConfigAuthority: PublicKey,
+        withdrawWithHeldAuthority: PublicKey,
+        withheldAmount: UInt64,
+        olderTransferFee: TransferFeeConfigExtensionState.TransferFee,
+        newerTransferFee: TransferFeeConfigExtensionState.TransferFee
+    ) {
+        self.length = length
+        self.transferFeeConfigAuthority = transferFeeConfigAuthority
+        self.withdrawWithHeldAuthority = withdrawWithHeldAuthority
+        self.withheldAmount = withheldAmount
+        self.olderTransferFee = olderTransferFee
+        self.newerTransferFee = newerTransferFee
+    }
 }

Sources/SolanaSwift/Programs/TokenPrograms/Token2022Program/Token2022AccountState.swift

@@ -59,6 +59,7 @@ public struct Token2022AccountState: TokenAccountState {
 extension Token2022AccountState: BorshCodable {
     public func serialize(to writer: inout Data) throws {
         try serializeCommonProperties(to: &writer)
+        try UInt8(0).serialize(to: &writer)
         for ext in extensions {
             try ext.serialize(to: &writer)
         }

Sources/SolanaSwift/Programs/TokenPrograms/Token2022Program/Token2022MintState.swift

@@ -47,6 +47,8 @@ extension Token2022MintState: BorshCodable {
 
     public func serialize(to writer: inout Data) throws {
         try serializeCommonProperties(to: &writer)
+        try Data(repeating: UInt8(0), count: 83).serialize(to: &writer)
+        try UInt8(1).serialize(to: &writer)
         for ext in extensions {
             try ext.serialize(to: &writer)
         }

…her/BufferLayout/BufferLayoutTests.swift …erLayout/BufferLayoutDecodingTests.swiftTests/SolanaSwiftUnitTests/Other/BufferLayout/BufferLayoutTests.swift renamed to Tests/SolanaSwiftUnitTests/Other/BufferLayout/BufferLayoutDecodingTests.swift Tests/SolanaSwiftUnitTests/Other/BufferLayout/BufferLayoutTests.swift renamed to Tests/SolanaSwiftUnitTests/Other/BufferLayout/BufferLayoutDecodingTests.swift

@@ -1,7 +1,7 @@
 import SolanaSwift
 import XCTest
 
-class BufferLayoutTests: XCTestCase {
+class BufferLayoutDecodingTests: XCTestCase {
     // MARK: - Raw data
 
     func testDecodingRawData() throws {
@@ -177,7 +177,31 @@ class BufferLayoutTests: XCTestCase {
         var binaryReader = BinaryReader(bytes: data.bytes)
         let state = try Token2022MintState(from: &binaryReader)
 
+        XCTAssertEqual(state.mintAuthorityOption, 0)
+        XCTAssertEqual(state.mintAuthority?.base58EncodedString, "LPF354oHyPWL7BoMRySPQLwfvUyqPBWpwC4R7atptrD")
+        XCTAssertEqual(state.isInitialized, true)
+        XCTAssertEqual(state.freezeAuthorityOption, 0)
+        XCTAssertEqual(state.decimals, 5)
+        XCTAssertEqual(state.supply, 49_999_926_084_701)
         XCTAssertEqual(state.extensions.count, 1)
+
+        // Assertions for the extension state
+        let extensionState = state.getParsedExtension(ofType: TransferFeeConfigExtensionState.self)!
+        XCTAssertEqual(extensionState.withheldAmount, 2_531_431_991)
+        XCTAssertEqual(
+            extensionState.transferFeeConfigAuthority.base58EncodedString,
+            "11111111111111111111111111111111"
+        )
+        XCTAssertEqual(
+            extensionState.withdrawWithHeldAuthority.base58EncodedString,
+            "LPF354oHyPWL7BoMRySPQLwfvUyqPBWpwC4R7atptrD"
+        )
+        XCTAssertEqual(extensionState.olderTransferFee.maximumFee, 50_000_000_000_000)
+        XCTAssertEqual(extensionState.olderTransferFee.epoch, 530)
+        XCTAssertEqual(extensionState.olderTransferFee.transferFeeBasisPoints, 300)
+        XCTAssertEqual(extensionState.newerTransferFee.transferFeeBasisPoints, 300)
+        XCTAssertEqual(extensionState.newerTransferFee.maximumFee, 50_000_000_000_000)
+        XCTAssertEqual(extensionState.newerTransferFee.epoch, 530)
     }
 
     func testDecodingToken2022MintState2() throws {