Merge pull request #43 from Adamant-im/feature/migrate_to_native_core

Feature/migrate to native core
Adamant-im · Nov 11, 2018 · 6718285 · 6718285
2 parents b90c333 + 0212a5c
commit 6718285
Show file tree

Hide file tree

Showing 22 changed files with 2,970 additions and 285 deletions.
diff --git a/Adamant.xcodeproj/project.pbxproj b/Adamant.xcodeproj/project.pbxproj
diff --git a/...cbaselines/E9EC344320066D4A00C0E546.xcbaseline/2F5A2BDA-A1C8-4C51-B0EB-6802181570B4.plist b/...cbaselines/E9EC344320066D4A00C0E546.xcbaseline/2F5A2BDA-A1C8-4C51-B0EB-6802181570B4.plist
@@ -37,6 +37,39 @@
 				</dict>
 			</dict>
 		</dict>
+		<key>NativeCoreTests</key>
+		<dict>
+			<key>testPerformanceHashForPassphrase()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>1.179</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+			<key>testPerformanceKeypairForPassphrase()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>1.1729</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+			<key>testPerformanceSignTransaction()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.0018654</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+		</dict>
 	</dict>
 </dict>
 </plist>
diff --git a/Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Dev.BackgroundFetch.xcscheme b/Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Dev.BackgroundFetch.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Dev.xcscheme b/Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Dev.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Release.xcscheme b/Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Release.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Test.xcscheme b/Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Test.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/Adamant/AppDelegate.swift b/Adamant/AppDelegate.swift
@@ -36,7 +36,6 @@ extension StoreKey {
 
 // MARK: - Resources
 struct AdamantResources {
-	static let jsCore = Bundle.main.url(forResource: "adamant-core", withExtension: "js")!
 	static let coreDataModel = Bundle.main.url(forResource: "ChatModels", withExtension: "momd")!
 
 	static let nodes: [Node] = [

diff --git a/Adamant/Helpers/Decimal+adamant.swift b/Adamant/Helpers/Decimal+adamant.swift
@@ -14,7 +14,7 @@ extension Decimal {
 	}
 
 	func shiftedToAdamant() -> Decimal {
-        return self * 100000000
+		return Decimal(sign: self.isSignMinus ? .minus : .plus, exponent: -AdamantUtilities.currencyExponent, significand: self)
 	}
 
 	var doubleValue: Double {

diff --git a/Adamant/Services/JSAdamantCore+Native.swift b/Adamant/Services/JSAdamantCore+Native.swift