diff --git a/build.gradle.kts b/build.gradle.kts index 810c7d94a..a5bfa8437 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -53,7 +53,7 @@ allprojects { } group = "exchange.dydx.abacus" -version = "1.14.11" +version = "1.14.12" repositories { google() diff --git a/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj b/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj index 0847697c5..961a3ff58 100644 --- a/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj +++ b/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj @@ -9,9 +9,10 @@ /* Begin PBXAggregateTarget section */ 4084846DAF1774840D25DF1BF2460325 /* abacus */ = { isa = PBXAggregateTarget; - buildConfigurationList = B36D4FC54F44832C64D6BFCFC7EF4665 /* Build configuration list for PBXAggregateTarget "abacus" */; + buildConfigurationList = 127F9C06E33E9DC2AB3876F089264EB1 /* Build configuration list for PBXAggregateTarget "abacus" */; buildPhases = ( - 1403E0AEBF8A2087DF8CACA188B609E8 /* [CP-User] Build abacus */, + DB36ACE8A857E9B93C25EA309FF42C2A /* [CP-User] Build abacus */, + 903ECA29140368245E4B69BE2D0DBCA4 /* [CP] Copy dSYMs */, ); dependencies = ( ); @@ -149,19 +150,19 @@ remoteGlobalIDString = 99313990C1D76A6D1D017868B6975CC8; remoteInfo = CryptoSwift; }; - 13274FE4AB3EF97E826573B1567A1032 /* PBXContainerItemProxy */ = { + 892B7F4AC1E46BF6672D92812669E3AC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; - remoteGlobalIDString = 469F25E790D19440507BF938A40578A7; - remoteInfo = "Pods-abacus.ios"; + remoteGlobalIDString = 4084846DAF1774840D25DF1BF2460325; + remoteInfo = abacus; }; - 892B7F4AC1E46BF6672D92812669E3AC /* PBXContainerItemProxy */ = { + DE06CE5CE6BDE94D5054E5B20E2B48A2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; - remoteGlobalIDString = 4084846DAF1774840D25DF1BF2460325; - remoteInfo = abacus; + remoteGlobalIDString = 469F25E790D19440507BF938A40578A7; + remoteInfo = "Pods-abacus.ios"; }; /* End PBXContainerItemProxy section */ @@ -173,6 +174,7 @@ 05F962230C27EB8320B3F9DACAB26666 /* Random.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Random.swift; path = Sources/CryptoSwift/CS_BigInt/Random.swift; sourceTree = ""; }; 068F760AEB5D19F06497CBD5A01D4B17 /* PBKDF1.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PBKDF1.swift; path = Sources/CryptoSwift/PKCS/PBKDF1.swift; sourceTree = ""; }; 0744F3E2DBB3A6893AC7B625FCBA2151 /* Generics.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Generics.swift; path = Sources/CryptoSwift/Generics.swift; sourceTree = ""; }; + 087E84600314FECE345137BBED3ABF4A /* abacus.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = abacus.debug.xcconfig; sourceTree = ""; }; 0A52523A80E0465BAEC42025DAD553B2 /* Pods-abacus.iosTests-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-abacus.iosTests-Info.plist"; sourceTree = ""; }; 0D4EF333478AFFA4893B29F877CE2E3B /* Pods-abacus.iosTests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-abacus.iosTests.modulemap"; sourceTree = ""; }; 0ECEA0D8830DCE37C7297C5F1342B08E /* Pods-abacus.ios.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-abacus.ios.release.xcconfig"; sourceTree = ""; }; @@ -183,6 +185,7 @@ 15A46B32EBC892483620A52F24AFC350 /* ECB.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ECB.swift; path = Sources/CryptoSwift/BlockMode/ECB.swift; sourceTree = ""; }; 161A656240E3B4B64ECE6858B65DC977 /* Pods-abacus.ios-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-abacus.ios-dummy.m"; sourceTree = ""; }; 186DE576AF9B0EC2149708CD77D2BC1F /* Shifts.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Shifts.swift; path = Sources/CryptoSwift/CS_BigInt/Shifts.swift; sourceTree = ""; }; + 194377B2DFD1180A2D72988CCD50F152 /* Abacus.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Abacus.framework; path = build/cocoapods/framework/Abacus.framework; sourceTree = ""; }; 1B6D2B0A7ACC4ACD9BC9FA5D52199C08 /* Cipher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Cipher.swift; path = Sources/CryptoSwift/Cipher.swift; sourceTree = ""; }; 1C5732A96CD4AA2A534F0887522F1C39 /* CryptoSwift.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CryptoSwift.debug.xcconfig; sourceTree = ""; }; 1CF2318F38D1207A2F8BF92B7B8A294E /* Array+Extension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Array+Extension.swift"; path = "Sources/CryptoSwift/Array+Extension.swift"; sourceTree = ""; }; @@ -190,7 +193,6 @@ 1E34A6EC8D702D85DFC8AB0BCA04D225 /* Pods-abacus.iosTests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-abacus.iosTests-acknowledgements.markdown"; sourceTree = ""; }; 233CC871C3B5E5D1C643AA3F5362558A /* DigestType.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = DigestType.swift; path = Sources/CryptoSwift/DigestType.swift; sourceTree = ""; }; 236DF73D92D4D71C82089CF882764244 /* NoPadding.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = NoPadding.swift; path = Sources/CryptoSwift/NoPadding.swift; sourceTree = ""; }; - 2377C417BE96C2BABD3E1DBC9B1A9D8D /* abacus.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = abacus.podspec; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 2653766C82503F31D9367F8E622F8258 /* PBKDF2.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PBKDF2.swift; path = Sources/CryptoSwift/PKCS/PBKDF2.swift; sourceTree = ""; }; 289CF4084C8BCFCA379CCF7847F8D1F8 /* Blowfish.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Blowfish.swift; path = Sources/CryptoSwift/Blowfish.swift; sourceTree = ""; }; 295A5EFDE6FBDDF94AEC568618EF25FE /* Hashable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Hashable.swift; path = Sources/CryptoSwift/CS_BigInt/Hashable.swift; sourceTree = ""; }; @@ -207,16 +209,19 @@ 3E0AAD4392F812C1C216CCFB8F6C83F1 /* HMAC.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = HMAC.swift; path = Sources/CryptoSwift/HMAC.swift; sourceTree = ""; }; 3EA11A675218D8EC495F817C58CD7850 /* RSA+Cipher.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "RSA+Cipher.swift"; path = "Sources/CryptoSwift/RSA/RSA+Cipher.swift"; sourceTree = ""; }; 4020CF7A5E8D043073442B14C262B52D /* CBCMAC.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CBCMAC.swift; path = Sources/CryptoSwift/CBCMAC.swift; sourceTree = ""; }; + 41730F22ADD1AE7FC7AB8FCAD4AB2CDA /* abacus.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = abacus.release.xcconfig; sourceTree = ""; }; 4557C8EB08F67FA9FE5EF603C935E183 /* Cryptor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Cryptor.swift; path = Sources/CryptoSwift/Cryptor.swift; sourceTree = ""; }; 466CB280E8CD811A98491B57B02D1B46 /* AES+Foundation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "AES+Foundation.swift"; path = "Sources/CryptoSwift/Foundation/AES+Foundation.swift"; sourceTree = ""; }; 47CAE619028B011ED98D7F74CF7215A1 /* Operators.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Operators.swift; path = Sources/CryptoSwift/Operators.swift; sourceTree = ""; }; 4B4AEBC4519953BDD492A3C4EB5E17A9 /* PKCS5.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PKCS5.swift; path = Sources/CryptoSwift/PKCS/PKCS5.swift; sourceTree = ""; }; 4FDF19080B2A0EC139694E150432A773 /* CFB.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CFB.swift; path = Sources/CryptoSwift/BlockMode/CFB.swift; sourceTree = ""; }; + 5087F83FBB81F03CA21A553057E81A9F /* abacus-copy-dsyms.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "abacus-copy-dsyms.sh"; sourceTree = ""; }; 54D5FEEA2249C6778EA73EC5F3C75044 /* ASN1Decoder.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ASN1Decoder.swift; path = Sources/CryptoSwift/ASN1/ASN1Decoder.swift; sourceTree = ""; }; 56CB7109CA84F00DCEB117080E3A0A6F /* Addition.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Addition.swift; path = Sources/CryptoSwift/CS_BigInt/Addition.swift; sourceTree = ""; }; 572CD7D8182D2BDB04D9B0AAB41FAAA2 /* Square Root.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Square Root.swift"; path = "Sources/CryptoSwift/CS_BigInt/Square Root.swift"; sourceTree = ""; }; 5825EF8E1C9D92AFC155A41AB00E7CDE /* CryptoSwift-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "CryptoSwift-umbrella.h"; sourceTree = ""; }; 58D9EEC98E8673B039471D0E403B05CD /* PCBC.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PCBC.swift; path = Sources/CryptoSwift/BlockMode/PCBC.swift; sourceTree = ""; }; + 5ABBFD1A2A08C44870270007AE1EB5D4 /* abacus.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = abacus.podspec; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 5B30BDDC9AD9C2380BF6791299AE1FBE /* Subtraction.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Subtraction.swift; path = Sources/CryptoSwift/CS_BigInt/Subtraction.swift; sourceTree = ""; }; 5E828917FF2AA3CC6B23ECF8A598B684 /* CryptoSwift.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = CryptoSwift.release.xcconfig; sourceTree = ""; }; 61300E9B71B8A176D5EAA3B605958848 /* AES.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AES.swift; path = Sources/CryptoSwift/AES.swift; sourceTree = ""; }; @@ -259,7 +264,6 @@ A7F75F1F8D19379B77CB9B5F20147724 /* Floating Point Conversion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Floating Point Conversion.swift"; path = "Sources/CryptoSwift/CS_BigInt/Floating Point Conversion.swift"; sourceTree = ""; }; AD93A59528068EF859CFB769EA8A6B21 /* StreamEncryptor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = StreamEncryptor.swift; path = Sources/CryptoSwift/StreamEncryptor.swift; sourceTree = ""; }; AE9EA384CA84DA00859213076C156601 /* Rabbit+Foundation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Rabbit+Foundation.swift"; path = "Sources/CryptoSwift/Foundation/Rabbit+Foundation.swift"; sourceTree = ""; }; - AF3276B68F8BA3E3862B4F55A9AB6170 /* abacus.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = abacus.release.xcconfig; sourceTree = ""; }; B008B6FE49BB00A27F5C3A8793251FA6 /* Comparable.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Comparable.swift; path = Sources/CryptoSwift/CS_BigInt/Comparable.swift; sourceTree = ""; }; B08BBA0B72E8D4BE9811F9B7F68AA02C /* Blowfish+Foundation.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Blowfish+Foundation.swift"; path = "Sources/CryptoSwift/Foundation/Blowfish+Foundation.swift"; sourceTree = ""; }; B26CFCBE4B1911C8EC2A1C029CEB4E75 /* String+Extension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String+Extension.swift"; path = "Sources/CryptoSwift/String+Extension.swift"; sourceTree = ""; }; @@ -305,10 +309,8 @@ F270EDBD5E4E8490F69012237AFEC6CC /* BatchedCollection.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BatchedCollection.swift; path = Sources/CryptoSwift/BatchedCollection.swift; sourceTree = ""; }; F37859F4A09B4D8326D98D57FE5A1EE9 /* SecureBytes.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SecureBytes.swift; path = Sources/CryptoSwift/SecureBytes.swift; sourceTree = ""; }; F3BBCD0680550B4404763E23B515A31F /* OCB.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = OCB.swift; path = Sources/CryptoSwift/BlockMode/OCB.swift; sourceTree = ""; }; - F4B1F23DF610F8A9AD9305359993709D /* Abacus.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Abacus.framework; path = build/cocoapods/framework/Abacus.framework; sourceTree = ""; }; F702C9EC7CE0BC75E37AA56B71F7E614 /* AES.Cryptors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = AES.Cryptors.swift; path = Sources/CryptoSwift/AES.Cryptors.swift; sourceTree = ""; }; F81274EDB681F11E7CB05F7DCA2BB33C /* CryptoSwift */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = CryptoSwift; path = CryptoSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - F999223EA515513F8C78AB8A4893AAAD /* abacus.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = abacus.debug.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -339,25 +341,23 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 32C262F4B88173CFDD2E507FF6B0EBF1 /* Support Files */ = { + 208518205B4C2F51FC3700B9883D08D7 /* Support Files */ = { isa = PBXGroup; children = ( - F999223EA515513F8C78AB8A4893AAAD /* abacus.debug.xcconfig */, - AF3276B68F8BA3E3862B4F55A9AB6170 /* abacus.release.xcconfig */, + 5087F83FBB81F03CA21A553057E81A9F /* abacus-copy-dsyms.sh */, + 087E84600314FECE345137BBED3ABF4A /* abacus.debug.xcconfig */, + 41730F22ADD1AE7FC7AB8FCAD4AB2CDA /* abacus.release.xcconfig */, ); name = "Support Files"; path = "integration/iOS/Pods/Target Support Files/abacus"; sourceTree = ""; }; - 6CE1150C1C9A0A71A18F30B35568DD8E /* abacus */ = { + 33D1C287C8CC4BF36926F2A16F33E291 /* Frameworks */ = { isa = PBXGroup; children = ( - C3735E810316ABDD783461EE462A964C /* Frameworks */, - 8750F5C2E47D320BFE4309AE82291B48 /* Pod */, - 32C262F4B88173CFDD2E507FF6B0EBF1 /* Support Files */, + 194377B2DFD1180A2D72988CCD50F152 /* Abacus.framework */, ); - name = abacus; - path = ../../..; + name = Frameworks; sourceTree = ""; }; 77BFA6027665EBACC42B94A7C2372871 /* Pods-abacus.iosTests */ = { @@ -376,22 +376,22 @@ path = "Target Support Files/Pods-abacus.iosTests"; sourceTree = ""; }; - 7D94CDF401128D689D2B11EDCC7ECD3A /* Products */ = { + 792A924F0CBCDCDB77BDB1651564E6F1 /* Pod */ = { isa = PBXGroup; children = ( - F81274EDB681F11E7CB05F7DCA2BB33C /* CryptoSwift */, - A1CCAE37318C6C914C8FE00E0C942B07 /* Pods-abacus.ios */, - E216D81D3656F56D4335CA097BDACFA9 /* Pods-abacus.iosTests */, + 5ABBFD1A2A08C44870270007AE1EB5D4 /* abacus.podspec */, ); - name = Products; + name = Pod; sourceTree = ""; }; - 8750F5C2E47D320BFE4309AE82291B48 /* Pod */ = { + 7D94CDF401128D689D2B11EDCC7ECD3A /* Products */ = { isa = PBXGroup; children = ( - 2377C417BE96C2BABD3E1DBC9B1A9D8D /* abacus.podspec */, + F81274EDB681F11E7CB05F7DCA2BB33C /* CryptoSwift */, + A1CCAE37318C6C914C8FE00E0C942B07 /* Pods-abacus.ios */, + E216D81D3656F56D4335CA097BDACFA9 /* Pods-abacus.iosTests */, ); - name = Pod; + name = Products; sourceTree = ""; }; 915C28C583640C124E56AE6BB9F0DAB2 /* CryptoSwift */ = { @@ -516,7 +516,7 @@ A5DC2D324221A781AC0E7A1B4908E26D /* Development Pods */ = { isa = PBXGroup; children = ( - 6CE1150C1C9A0A71A18F30B35568DD8E /* abacus */, + F896DEEFEA08BDAEEA48FBC9E29423FF /* abacus */, ); name = "Development Pods"; sourceTree = ""; @@ -547,14 +547,6 @@ name = "Targets Support Files"; sourceTree = ""; }; - C3735E810316ABDD783461EE462A964C /* Frameworks */ = { - isa = PBXGroup; - children = ( - F4B1F23DF610F8A9AD9305359993709D /* Abacus.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; CF1408CF629C7361332E53B88F7BD30C = { isa = PBXGroup; children = ( @@ -606,6 +598,17 @@ path = "../Target Support Files/CryptoSwift"; sourceTree = ""; }; + F896DEEFEA08BDAEEA48FBC9E29423FF /* abacus */ = { + isa = PBXGroup; + children = ( + 33D1C287C8CC4BF36926F2A16F33E291 /* Frameworks */, + 792A924F0CBCDCDB77BDB1651564E6F1 /* Pod */, + 208518205B4C2F51FC3700B9883D08D7 /* Support Files */, + ); + name = abacus; + path = ../../..; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -668,7 +671,7 @@ buildRules = ( ); dependencies = ( - 0BC2E632080A081747A0FC16A461DE5F /* PBXTargetDependency */, + 3B75ACEB495DD8303B1DF649780897CC /* PBXTargetDependency */, ); name = "Pods-abacus.iosTests"; productName = Pods_abacus_iosTests; @@ -750,7 +753,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1403E0AEBF8A2087DF8CACA188B609E8 /* [CP-User] Build abacus */ = { + 903ECA29140368245E4B69BE2D0DBCA4 /* [CP] Copy dSYMs */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/abacus/abacus-copy-dsyms-input-files.xcfilelist", + ); + name = "[CP] Copy dSYMs"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/abacus/abacus-copy-dsyms-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/abacus/abacus-copy-dsyms.sh\"\n"; + showEnvVarsInLog = 0; + }; + DB36ACE8A857E9B93C25EA309FF42C2A /* [CP-User] Build abacus */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -900,11 +920,11 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 0BC2E632080A081747A0FC16A461DE5F /* PBXTargetDependency */ = { + 3B75ACEB495DD8303B1DF649780897CC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "Pods-abacus.ios"; target = 469F25E790D19440507BF938A40578A7 /* Pods-abacus.ios */; - targetProxy = 13274FE4AB3EF97E826573B1567A1032 /* PBXContainerItemProxy */; + targetProxy = DE06CE5CE6BDE94D5054E5B20E2B48A2 /* PBXContainerItemProxy */; }; D43EF18A1EBDABC7776E3268C2AD6C7F /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -1040,6 +1060,23 @@ }; name = Release; }; + 89CA580E320AAA0AEB9D69B2DEFBB393 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 087E84600314FECE345137BBED3ABF4A /* abacus.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; 92486E5E72E54FAF60E1A7D022C21B10 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1168,23 +1205,6 @@ }; name = Debug; }; - 99A5516350AB4DDF33626A995DF38B00 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = F999223EA515513F8C78AB8A4893AAAD /* abacus.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; 9FF72943FC5C7DBB78987469B5BFFB01 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 37D6A3426F2BC5FF46D766BC6DEDA246 /* Pods-abacus.iosTests.debug.xcconfig */; @@ -1303,9 +1323,9 @@ }; name = Debug; }; - F5001B5CC98BA79D9C828C12D031AD4C /* Release */ = { + F52AC81744A2346DDAEBC998EF6130F6 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AF3276B68F8BA3E3862B4F55A9AB6170 /* abacus.release.xcconfig */; + baseConfigurationReference = 41730F22ADD1AE7FC7AB8FCAD4AB2CDA /* abacus.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -1324,6 +1344,15 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 127F9C06E33E9DC2AB3876F089264EB1 /* Build configuration list for PBXAggregateTarget "abacus" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 89CA580E320AAA0AEB9D69B2DEFBB393 /* Debug */, + F52AC81744A2346DDAEBC998EF6130F6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; 2E5FBF4AAB7938AAE6A40648B8AD693A /* Build configuration list for PBXNativeTarget "Pods-abacus.iosTests" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1360,15 +1389,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B36D4FC54F44832C64D6BFCFC7EF4665 /* Build configuration list for PBXAggregateTarget "abacus" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 99A5516350AB4DDF33626A995DF38B00 /* Debug */, - F5001B5CC98BA79D9C828C12D031AD4C /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = BFDFE7DC352907FC980B868725387E98 /* Project object */; diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-acknowledgements.markdown b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-acknowledgements.markdown index 1698dfe71..b525651fa 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-acknowledgements.markdown +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-acknowledgements.markdown @@ -18,13 +18,12 @@ Permission is granted to anyone to use this software for any purpose,including c ## abacus -Copyright (C) dYdX Trading Inc. - -Subject to your compliance with applicable law and the v4 Terms of Use, available at dydx.exchange/legal, you are granted the right to use the Program or Licensed Work (defined below) under the terms of the GNU Affero General Public License as set forth below; provided, however, that if you violate any such applicable law in your use of the Program or Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Program or Licensed Work will automatically and immediately terminate. +Copyright (C) 2025 dYdX Trading Inc. -The “Program” or “Licensed Work” shall mean any of the following: dydxprotocol/cosmos-sdk, dydxprotocol/cometbft, dydxprotocol/v4-chain, dydxprotocol/v4-clients, dydxprotocol/v4-web, dydxprotocol/v4-abacus, dydxprotocol/v4-localization, dydxprotocol/v4-documentation, and any dYdX or dYdX Trading Inc. repository reflecting a copy of, or link to, this license. +Subject to your compliance with applicable law and the v4 Terms of Use, available at dydx.exchange/legal, you are granted the right to use the Program or Licensed Work (defined below) under the terms of the GNU Affero General Public License as set forth below; provided, however, that if you violate any such applicable law in your use of the Program or Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Program or Licensed Work will automatically and immediately terminate. +The “Program” or “Licensed Work” shall mean any of the following: dydxprotocol/cosmos-sdk, dydxprotocol/cometbft, dydxprotocol/v4-chain, dydxprotocol/v4-web, dydxprotocol/v4-abacus, dydxprotocol/v4-localization, dydxprotocol/v4-documentation, and any dYdX or dYdX Trading Inc. repository reflecting a copy of, or link to, this license. The GNU Affero General Public License Version 3, 19 November 2007 @@ -819,6 +818,6 @@ copy of the Program in return for a fee. For more information about this software, see https://dydx.exchange. - Copyright (C) dYdX Trading Inc. + Copyright (C) 2025 dYdX Trading Inc. Generated by CocoaPods - https://cocoapods.org diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-acknowledgements.plist b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-acknowledgements.plist index 1679c4137..20de15641 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-acknowledgements.plist +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-acknowledgements.plist @@ -35,13 +35,12 @@ Permission is granted to anyone to use this software for any purpose,including c FooterText - Copyright (C) dYdX Trading Inc. + +Copyright (C) 2025 dYdX Trading Inc. Subject to your compliance with applicable law and the v4 Terms of Use, available at dydx.exchange/legal, you are granted the right to use the Program or Licensed Work (defined below) under the terms of the GNU Affero General Public License as set forth below; provided, however, that if you violate any such applicable law in your use of the Program or Licensed Work, all of your rights and licenses to use (including any rights to reproduce, distribute, install or modify) the Program or Licensed Work will automatically and immediately terminate. - -The “Program” or “Licensed Work” shall mean any of the following: dydxprotocol/cosmos-sdk, dydxprotocol/cometbft, dydxprotocol/v4-chain, dydxprotocol/v4-clients, dydxprotocol/v4-web, dydxprotocol/v4-abacus, dydxprotocol/v4-localization, dydxprotocol/v4-documentation, and any dYdX or dYdX Trading Inc. repository reflecting a copy of, or link to, this license. - +The “Program” or “Licensed Work” shall mean any of the following: dydxprotocol/cosmos-sdk, dydxprotocol/cometbft, dydxprotocol/v4-chain, dydxprotocol/v4-web, dydxprotocol/v4-abacus, dydxprotocol/v4-localization, dydxprotocol/v4-documentation, and any dYdX or dYdX Trading Inc. repository reflecting a copy of, or link to, this license. The GNU Affero General Public License Version 3, 19 November 2007 @@ -836,7 +835,7 @@ copy of the Program in return for a fee. For more information about this software, see https://dydx.exchange. - Copyright (C) dYdX Trading Inc. + Copyright (C) 2025 dYdX Trading Inc. License diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/TradeInput/TradeInputOptionsCalculator.kt b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/TradeInput/TradeInputOptionsCalculator.kt index fad63e48f..6ac2cab75 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/TradeInput/TradeInputOptionsCalculator.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/TradeInput/TradeInputOptionsCalculator.kt @@ -79,51 +79,51 @@ internal class TradeInputOptionsCalculator( return when (trade.type) { OrderType.Market -> { return when (trade.marginMode) { - MarginMode.Isolated -> listOf( + MarginMode.Isolated -> listOfNotNull( sizeField(), balancePercentField(), bracketsField(), marginModeField(market, account, subaccount), reduceOnlyField(), - ).filterNotNull() + ) - else -> listOf( + else -> listOfNotNull( sizeField(), leverageField(), balancePercentField(), bracketsField(), marginModeField(market, account, subaccount), reduceOnlyField(), - ).filterNotNull() + ) } } OrderType.Limit -> { when (trade.timeInForce) { "GTT" -> - listOf( + listOfNotNull( sizeField(), limitPriceField(), timeInForceField(), goodTilField(), postOnlyField(), marginModeField(market, account, subaccount), - ).filterNotNull() + ) else -> - listOf( + listOfNotNull( sizeField(), limitPriceField(), timeInForceField(), marginModeField(market, account, subaccount), reduceOnlyField(), - ).filterNotNull() + ) } } OrderType.StopLimit, OrderType.TakeProfitLimit -> { val execution = trade.execution - listOf( + listOfNotNull( sizeField(), limitPriceField(), triggerPriceField(), @@ -134,28 +134,28 @@ internal class TradeInputOptionsCalculator( "IOC" -> reduceOnlyField() else -> null }, - ).filterNotNull() + ) } OrderType.StopMarket, OrderType.TakeProfitMarket -> { - listOf( + listOfNotNull( sizeField(), triggerPriceField(), goodTilField(), executionField(includesDefaultAndPostOnly = false), marginModeField(market, account, subaccount), reduceOnlyField(), - ).filterNotNull() + ) } OrderType.TrailingStop -> { - listOf( + listOfNotNull( sizeField(), trailingPercentField(), goodTilField(), executionField(includesDefaultAndPostOnly = false), marginModeField(market, account, subaccount), - ).filterNotNull() + ) } OrderType.Liquidated, diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/functional/ClientAnalyticEvents.kt b/src/commonMain/kotlin/exchange.dydx.abacus/functional/ClientAnalyticEvents.kt index 2906fb466..c6bc27eb4 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/functional/ClientAnalyticEvents.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/functional/ClientAnalyticEvents.kt @@ -259,4 +259,44 @@ class ClientTrackableEventType { "tokenInChainId" to status.routeStatuses?.lastOrNull()?.chainId, ).filterValues { it != null } as Map } + + class FiatDepositShowInputEvent() : ClientTrackableEvent { + override val name: String get() = "FiatDepositShowInput" + override val customParameters: Map get() = emptyMap() + } + + class FiatDepositRouteToProviderCompletedEvent( + private val amountUsd: Double?, + private val depositAddress: String?, + private val provider: String, + ) : ClientTrackableEvent { + override val name: String get() = "FiatDepositRouteToProviderCompleted" + override val customParameters: Map get() = mapOf( + "amountUsd" to amountUsd, + "depositAddress" to depositAddress, + "provider" to provider, + ).filterValues { it != null } as Map + } + + class FiatDepositRouteToProviderErrorEvent( + private val message: String?, + private val provider: String, + ) : ClientTrackableEvent { + override val name: String get() = "FiatDepositRouteToProviderError" + override val customParameters: Map get() = mapOf( + "message" to message, + "provider" to provider, + ).filterValues { it != null } as Map + } + + class FiatDepositMoonPayCallbackEvent( + private val callbackName: String, + private val data: Map? = null, + ) : ClientTrackableEvent { + override val name: String get() = "FiatDepositMoonPayCallback" + override val customParameters: Map get() = mapOf( + "callbackName" to callbackName, + "data" to data, + ).filterValues { it != null } as Map + } } diff --git a/v4_abacus.podspec b/v4_abacus.podspec index de2972710..f7fa40c87 100644 --- a/v4_abacus.podspec +++ b/v4_abacus.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'v4_abacus' - spec.version = '1.14.11' + spec.version = '1.14.12' spec.homepage = 'https://github.com/dydxprotocol/v4-abacus' spec.source = { :http=> ''} spec.authors = ''