hash modifier (#27)

* add hash modifier argument to WalletContract for Tetra L2

* update action

* update action

* fix demo

* fix action

* fix action

* fix tests

Author: anikitin-top

.github/workflows/swift.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/cache@v2
+    - uses: actions/cache@v4
       with:
         path: Pods
         key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
@@ -18,6 +18,6 @@ jobs:
     - name: CocoaPod Install
       run: cd Example; pod install
     - name: Build
-      run: cd Example; xcodebuild -workspace ton-swift-example.xcworkspace -scheme ton-swift-example -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14'
+      run: cd Example; xcodebuild -workspace ton-swift-example.xcworkspace -scheme ton-swift-example -configuration Release -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 17'
     - name: Test
-      run: cd Example; xcodebuild -workspace ton-swift-example.xcworkspace -scheme TonSwift-Unit-Tests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' test
+      run: cd Example; xcodebuild -workspace ton-swift-example.xcworkspace -scheme TonSwift-Unit-Tests -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 17' test

Example/Podfile

@@ -12,7 +12,20 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     target.build_configurations.each do |config|
-      config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = "11.0"
+      config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = "15.0"
+
+      # Fix for CTweetNacl module error with Pusher on Xcode 26.0
+      # Disable explicit module builds for Pusher and TweetNacl pods
+      if ['PusherSwift', 'PusherSwiftWithEncryption', 'TweetNacl'].include?(target.name)
+        config.build_settings['SWIFT_ENABLE_EXPLICIT_MODULES'] = 'NO'
+        # Additional settings to resolve module dependencies
+        config.build_settings['SWIFT_ENABLE_INCREMENTAL_COMPILATION'] = 'NO'
+        config.build_settings['SWIFT_COMPILATION_MODE'] = 'wholemodule'
+      end
     end
   end
+  # Additional project-level settings for all targets
+  installer.pods_project.build_configurations.each do |config|
+    config.build_settings['SWIFT_ENABLE_EXPLICIT_MODULES'] = 'NO'
+  end
 end

Example/Podfile.lock

@@ -1,10 +1,13 @@
 PODS:
   - BigInt (5.2.0)
-  - TonSwift (1.0.3):
+  - Sodium (0.9.1)
+  - TonSwift (1.0.18):
     - BigInt
+    - Sodium
     - TweetNacl
-  - TonSwift/Tests (1.0.3):
+  - TonSwift/Tests (1.0.18):
     - BigInt
+    - Sodium
     - TweetNacl
   - TweetNacl (1.0.2)
 
@@ -15,6 +18,7 @@ DEPENDENCIES:
 SPEC REPOS:
   trunk:
     - BigInt
+    - Sodium
     - TweetNacl
 
 EXTERNAL SOURCES:
@@ -23,9 +27,10 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   BigInt: f668a80089607f521586bbe29513d708491ef2f7
-  TonSwift: 8263886e6a34c81a721cde1674cc70229a1d0d44
+  Sodium: 23d11554ecd556196d313cf6130d406dfe7ac6da
+  TonSwift: 772c4cf09140c087ce6a82253ad0b9ab0f7444ed
   TweetNacl: 3abf4d1d2082b0114e7a67410e300892448951e6
 
-PODFILE CHECKSUM: adb693e82e588cc090eb72c366a3aff89a95e709
+PODFILE CHECKSUM: 2346665ec6fa725b886bf775946ddbfd1a195f90
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.16.2

Source/TonSwift/NFT/NFTTransferData.swift

@@ -32,11 +32,7 @@ public struct NFTTransferData: CellCodable {
         let responseAddress: Address = try slice.loadType()
         try slice.skip(1)
         let forwardAmount = try slice.loadCoins().amount
-        let hasPayloadCell = try slice.loadBoolean()
-        var forwardPayload: Cell?
-        if hasPayloadCell, let payloadCell = try slice.loadMaybeRef() {
-            forwardPayload = payloadCell
-        }
+        let forwardPayload = try slice.loadMaybeRef()
         return NFTTransferData(
             queryId: queryId,
             newOwnerAddress: newOwnerAddress,

Source/TonSwift/Wallets/WalletContract.swift

@@ -50,7 +50,11 @@ public struct WalletTransfer {
         self.signaturePosition = signaturePosition
     }
 
-    public func signMessage(signer: WalletTransferSigner) throws -> Data {
-        return try signer.signMessage(signingMessage.endCell().hash())
+    public func signMessage(signer: WalletTransferSigner, hashModifier: ((Data) -> Data)? = nil) throws -> Data {
+        var hash = try signingMessage.endCell().hash()
+        if let hashModifier {
+            hash = hashModifier(hash)
+        }
+        return try signer.signMessage(hash)
     }
 }

Tests/TonSwiftTests/NFT/NFTTransferDataTests.swift

@@ -54,7 +54,7 @@ final class NFTTransferDataTests: XCTestCase {
 
         XCTAssertEqual(try nftTransferDataCell.toString(),
                        """
-                       x{5FCC3D14000000000000021F8006E2451A5FF8C5BEA1DC8505A789427312E714E1783A8DEBF2573D06BADDAD571001AAD4BD6DAA342C7D03C496083C01AEC31F1A457B8C993C62823E3713E11FD8186989681C_}
+                       x{5FCC3D14000000000000021F8006E2451A5FF8C5BEA1DC8505A789427312E714E1783A8DEBF2573D06BADDAD571001AAD4BD6DAA342C7D03C496083C01AEC31F1A457B8C993C62823E3713E11FD8186989681}
                         x{0000000048656C6C6F2C2074686973206973206120636F6D6D656E74}
                        """)
     }

TonSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'TonSwift'
-  s.version          = '1.0.3'
+  s.version          = '1.0.18'
   s.homepage         = 'https://github.com/tonkeeper/ton-swift'
   s.source           = { :git => 'https://github.com/tonkeeper/ton-swift.git', :tag => s.version.to_s }
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
@@ -15,6 +15,7 @@ Pod::Spec.new do |s|
 
   s.dependency 'BigInt'
   s.dependency 'TweetNacl'
+  s.dependency 'Sodium'
 
   s.test_spec 'Tests' do |test_spec|
     test_spec.source_files = ["Tests/*.{swift,h}", "Tests/**/*.{swift,c,h}", "Tests/**/**/*.{swift,c,h}"]