Skip to content

Commit e7a2f4d

Browse files
LainaaaLainaaa
authored
Merge pull request #905 from Adamant-im/Xcode26&iOS26
Xcode 26 & iOS 26 update
2 parents b34e89a + 9d66e7f commit e7a2f4d

4 files changed

Lines changed: 34 additions & 33 deletions

File tree

‎Adamant.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
416F5EA4290162EB00EF0400 /* SocketIO in Frameworks */ = {isa = PBXBuildFile; productRef = 416F5EA3290162EB00EF0400 /* SocketIO */; };
1616
4177E5E12A52DA7100C089FE /* AdvancedContextMenuKit in Frameworks */ = {isa = PBXBuildFile; productRef = 4177E5E02A52DA7100C089FE /* AdvancedContextMenuKit */; };
1717
4184F1712A33044E00D7B8B9 /* FirebaseCrashlytics in Frameworks */ = {isa = PBXBuildFile; productRef = 4184F1702A33044E00D7B8B9 /* FirebaseCrashlytics */; };
18+
48F3EA602E79BEAE00A827E4 /* web3swift in Frameworks */ = {isa = PBXBuildFile; productRef = 48F3EA5F2E79BEAE00A827E4 /* web3swift */; };
1819
557AC306287B10D8004699D7 /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = 557AC305287B10D8004699D7 /* SnapKit */; };
1920
55D1D84F287B78F200F94A4E /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = 55D1D84E287B78F200F94A4E /* SnapKit */; };
2021
55D1D851287B78FC00F94A4E /* SnapKit in Frameworks */ = {isa = PBXBuildFile; productRef = 55D1D850287B78FC00F94A4E /* SnapKit */; };
@@ -37,7 +38,6 @@
3738
A57282D1262C94DA00C96FA8 /* DateToolsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = A57282D0262C94DA00C96FA8 /* DateToolsSwift */; };
3839
A57282D3262C94DF00C96FA8 /* DateToolsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = A57282D2262C94DF00C96FA8 /* DateToolsSwift */; };
3940
A57282D5262C94E500C96FA8 /* DateToolsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = A57282D4262C94E500C96FA8 /* DateToolsSwift */; };
40-
A5785ADF262C63580001BC66 /* web3swift in Frameworks */ = {isa = PBXBuildFile; productRef = A5785ADE262C63580001BC66 /* web3swift */; };
4141
A5AC8DFF262E0B030053A7E2 /* SipHash in Frameworks */ = {isa = PBXBuildFile; productRef = A5AC8DFE262E0B030053A7E2 /* SipHash */; };
4242
A5AC8E00262E0B030053A7E2 /* SipHash in Embed Frameworks */ = {isa = PBXBuildFile; productRef = A5AC8DFE262E0B030053A7E2 /* SipHash */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
4343
A5C99E0E262C9E3A00F7B1B7 /* Reachability in Frameworks */ = {isa = PBXBuildFile; productRef = A5C99E0D262C9E3A00F7B1B7 /* Reachability */; };
@@ -291,6 +291,7 @@
291291
files = (
292292
A5AC8DFF262E0B030053A7E2 /* SipHash in Frameworks */,
293293
3A8875EF27BBF38D00436195 /* Parchment in Frameworks */,
294+
48F3EA602E79BEAE00A827E4 /* web3swift in Frameworks */,
294295
3C06931576393125C61FB8F6 /* Pods_Adamant.framework in Frameworks */,
295296
A50AEB0C262C81E300B37C22 /* QRCodeReader in Frameworks */,
296297
416F5EA4290162EB00EF0400 /* SocketIO in Frameworks */,
@@ -299,7 +300,6 @@
299300
A50AEB04262C815200B37C22 /* EFQRCode in Frameworks */,
300301
A544F0D4262C9878001F1A6D /* Eureka in Frameworks */,
301302
3AC76E3D2AB09118008042C4 /* ElegantEmojiPicker in Frameworks */,
302-
A5785ADF262C63580001BC66 /* web3swift in Frameworks */,
303303
557AC306287B10D8004699D7 /* SnapKit in Frameworks */,
304304
9342F6C22A6A35E300A9B39F /* CommonKit in Frameworks */,
305305
A5F0A04B262C9CA90009672A /* Swinject in Frameworks */,
@@ -469,7 +469,6 @@
469469
);
470470
name = Adamant;
471471
packageProductDependencies = (
472-
A5785ADE262C63580001BC66 /* web3swift */,
473472
A5DBBABC262C7221004AC028 /* Clibsodium */,
474473
A5DBBAED262C72EF004AC028 /* BitcoinKit */,
475474
A50AEB03262C815200B37C22 /* EFQRCode */,
@@ -494,6 +493,7 @@
494493
3A833C3F2B99CDA000238F6A /* FilesStorageKit */,
495494
6FB686152D3AAE8800CAB6DD /* AdamantWalletsKit */,
496495
AA8FFFC92D4E6435001D8576 /* CryptoSwift */,
496+
48F3EA5F2E79BEAE00A827E4 /* web3swift */,
497497
);
498498
productName = Adamant;
499499
productReference = E913C8EE1FFFA51D001A83F7 /* Adamant.app */;
@@ -648,7 +648,6 @@
648648
);
649649
mainGroup = E913C8E51FFFA51D001A83F7;
650650
packageReferences = (
651-
A5785ADD262C63580001BC66 /* XCRemoteSwiftPackageReference "web3swift" */,
652651
A5DBBABB262C7221004AC028 /* XCRemoteSwiftPackageReference "swift-sodium" */,
653652
A50AEB02262C815200B37C22 /* XCRemoteSwiftPackageReference "EFQRCode" */,
654653
A50AEB0A262C81E300B37C22 /* XCRemoteSwiftPackageReference "QRCodeReader.swift" */,
@@ -667,6 +666,7 @@
667666
3AC76E3B2AB09118008042C4 /* XCRemoteSwiftPackageReference "Elegant-Emoji-Picker" */,
668667
AA8FFFC82D4E6435001D8576 /* XCRemoteSwiftPackageReference "CryptoSwift" */,
669668
B1C2BA702D90BF34001FE840 /* XCRemoteSwiftPackageReference "SwiftyMocky" */,
669+
48F3EA5E2E79BEAE00A827E4 /* XCRemoteSwiftPackageReference "web3swift" */,
670670
);
671671
preferredProjectObjectVersion = 77;
672672
productRefGroup = E913C8EF1FFFA51D001A83F7 /* Products */;
@@ -1374,6 +1374,14 @@
13741374
minimumVersion = 9.0.0;
13751375
};
13761376
};
1377+
48F3EA5E2E79BEAE00A827E4 /* XCRemoteSwiftPackageReference "web3swift" */ = {
1378+
isa = XCRemoteSwiftPackageReference;
1379+
repositoryURL = "https://github.com/web3swift-team/web3swift";
1380+
requirement = {
1381+
branch = develop;
1382+
kind = branch;
1383+
};
1384+
};
13771385
557AC304287B10D8004699D7 /* XCRemoteSwiftPackageReference "SnapKit" */ = {
13781386
isa = XCRemoteSwiftPackageReference;
13791387
repositoryURL = "https://github.com/SnapKit/SnapKit.git";
@@ -1422,14 +1430,6 @@
14221430
kind = branch;
14231431
};
14241432
};
1425-
A5785ADD262C63580001BC66 /* XCRemoteSwiftPackageReference "web3swift" */ = {
1426-
isa = XCRemoteSwiftPackageReference;
1427-
repositoryURL = "https://github.com/skywinder/web3swift.git";
1428-
requirement = {
1429-
kind = upToNextMajorVersion;
1430-
minimumVersion = 3.2.2;
1431-
};
1432-
};
14331433
A5AC8DFD262E0B030053A7E2 /* XCRemoteSwiftPackageReference "SipHash" */ = {
14341434
isa = XCRemoteSwiftPackageReference;
14351435
repositoryURL = "https://github.com/attaswift/SipHash";
@@ -1529,6 +1529,11 @@
15291529
package = 4184F16F2A33044E00D7B8B9 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
15301530
productName = FirebaseCrashlytics;
15311531
};
1532+
48F3EA5F2E79BEAE00A827E4 /* web3swift */ = {
1533+
isa = XCSwiftPackageProductDependency;
1534+
package = 48F3EA5E2E79BEAE00A827E4 /* XCRemoteSwiftPackageReference "web3swift" */;
1535+
productName = web3swift;
1536+
};
15321537
557AC305287B10D8004699D7 /* SnapKit */ = {
15331538
isa = XCSwiftPackageProductDependency;
15341539
package = 557AC304287B10D8004699D7 /* XCRemoteSwiftPackageReference "SnapKit" */;
@@ -1623,11 +1628,6 @@
16231628
package = A57282C8262C94CD00C96FA8 /* XCRemoteSwiftPackageReference "DateTools" */;
16241629
productName = DateToolsSwift;
16251630
};
1626-
A5785ADE262C63580001BC66 /* web3swift */ = {
1627-
isa = XCSwiftPackageProductDependency;
1628-
package = A5785ADD262C63580001BC66 /* XCRemoteSwiftPackageReference "web3swift" */;
1629-
productName = web3swift;
1630-
};
16311631
A5AC8DFE262E0B030053A7E2 /* SipHash */ = {
16321632
isa = XCSwiftPackageProductDependency;
16331633
package = A5AC8DFD262E0B030053A7E2 /* XCRemoteSwiftPackageReference "SipHash" */;

‎Adamant.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Adamant/Helpers/Markdown+Adamant.swift‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ final class MarkdownAdvancedAdm: MarkdownLink {
126126
addAttributes(attributedString, range: formatRange, link: linkURLString)
127127
}
128128

129-
override func addAttributes(_ attributedString: NSMutableAttributedString, range: NSRange, link: String) {
129+
func addAttributes(_ attributedString: NSMutableAttributedString, range: NSRange, link: String) {
130130
attributedString.addAttributes(attributes, range: range)
131131
}
132132
}
@@ -185,7 +185,7 @@ final class MarkdownLinkAdm: MarkdownLink {
185185
addAttributes(attributedString, range: formatRange, link: url.absoluteString)
186186
}
187187

188-
override func addAttributes(_ attributedString: NSMutableAttributedString, range: NSRange, link: String) {
188+
func addAttributes(_ attributedString: NSMutableAttributedString, range: NSRange, link: String) {
189189
attributedString.addAttributes(attributes, range: range)
190190
}
191191
}
@@ -287,3 +287,4 @@ final class MarkdownFileRaw: MarkdownElement {
287287
)
288288
}
289289
}
290+

‎CommonKit/Sources/CommonKit/Core/NativeAdamantCore.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ public final class NativeAdamantCore: AdamantCore {
8484
recipientPublicKey publicKey: String,
8585
privateKey privateKeyHex: String
8686
) -> (data: Data, nonce: String)? {
87-
let message = data.bytes
88-
let recipientKey = publicKey.hexBytes()
89-
let privateKey = privateKeyHex.hexBytes()
87+
let message: [UInt8] = Array(data)
88+
let recipientKey: [UInt8] = publicKey.hexBytes()
89+
let privateKey: [UInt8] = privateKeyHex.hexBytes()
9090

9191
guard let publicKey = Crypto.ed2Curve.publicKey(recipientKey) else {
9292
print("FAIL to create ed2curve publick key from SHA256")
@@ -115,7 +115,7 @@ public final class NativeAdamantCore: AdamantCore {
115115
senderPublicKey senderKeyHex: String,
116116
privateKey privateKeyHex: String
117117
) -> Data? {
118-
let message = data.bytes
118+
let message: [UInt8] = Array(data)
119119
let nonce = rawNonce.hexBytes()
120120
let senderKey = senderKeyHex.hexBytes()
121121
let privateKey = privateKeyHex.hexBytes()

0 commit comments

Comments
 (0)