diff --git a/build.gradle.kts b/build.gradle.kts index f8da0f237..a0f496f81 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,7 +52,7 @@ allprojects { } group = "exchange.dydx.abacus" -version = "1.13.20" +version = "1.13.21" repositories { google() diff --git a/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj b/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj index 75609940b..4abeb8b3b 100644 --- a/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj +++ b/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj @@ -9,10 +9,9 @@ /* Begin PBXAggregateTarget section */ 4084846DAF1774840D25DF1BF2460325 /* abacus */ = { isa = PBXAggregateTarget; - buildConfigurationList = 127F9C06E33E9DC2AB3876F089264EB1 /* Build configuration list for PBXAggregateTarget "abacus" */; + buildConfigurationList = B36D4FC54F44832C64D6BFCFC7EF4665 /* Build configuration list for PBXAggregateTarget "abacus" */; buildPhases = ( - DB36ACE8A857E9B93C25EA309FF42C2A /* [CP-User] Build abacus */, - 903ECA29140368245E4B69BE2D0DBCA4 /* [CP] Copy dSYMs */, + 1403E0AEBF8A2087DF8CACA188B609E8 /* [CP-User] Build abacus */, ); dependencies = ( ); @@ -143,26 +142,26 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 174DE097054DE7A0410C57AF4AEF5A1A /* PBXContainerItemProxy */ = { + 3E4D9EBB8F897D7BD1BB900F1CB03EFD /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; remoteGlobalIDString = 469F25E790D19440507BF938A40578A7; remoteInfo = "Pods-abacus.ios"; }; - 8437FCB39ECA4A44D93FCDCBF6066E92 /* PBXContainerItemProxy */ = { + A9316E3AFEDA79C6BE2E70454904E23B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; - remoteGlobalIDString = 99313990C1D76A6D1D017868B6975CC8; - remoteInfo = CryptoSwift; + remoteGlobalIDString = 4084846DAF1774840D25DF1BF2460325; + remoteInfo = abacus; }; - F8007D80E43B99904B0E4DD383211363 /* PBXContainerItemProxy */ = { + D943F129042E36333E484FD2DF373D43 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; - remoteGlobalIDString = 4084846DAF1774840D25DF1BF2460325; - remoteInfo = abacus; + remoteGlobalIDString = 99313990C1D76A6D1D017868B6975CC8; + remoteInfo = CryptoSwift; }; /* End PBXContainerItemProxy section */ @@ -171,10 +170,10 @@ 0105D9F1362588440BA8D3158A228340 /* BlockMode.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BlockMode.swift; path = Sources/CryptoSwift/BlockMode/BlockMode.swift; sourceTree = ""; }; 01C66D92921215B5058ADA6FA1523E18 /* SHA2.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = SHA2.swift; path = Sources/CryptoSwift/SHA2.swift; sourceTree = ""; }; 0449BE88D4D44409CCF0A74B34343D27 /* StreamDecryptor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = StreamDecryptor.swift; path = Sources/CryptoSwift/StreamDecryptor.swift; sourceTree = ""; }; + 059E5579F867BEB3F7E6DF13DEB1712B /* abacus.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = abacus.podspec; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 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 = ""; }; @@ -185,7 +184,6 @@ 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 = ""; }; @@ -197,6 +195,7 @@ 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 = ""; }; 2A89356D96E998228A503AA1A6E9C626 /* Int+Extension.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "Int+Extension.swift"; path = "Sources/CryptoSwift/Int+Extension.swift"; sourceTree = ""; }; + 2B743EE4A0C2A395311B213324EB2342 /* abacus.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = abacus.release.xcconfig; sourceTree = ""; }; 311456A9BE6AD331F084E1FCE9FD2109 /* BigUInt.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BigUInt.swift; path = Sources/CryptoSwift/CS_BigInt/BigUInt.swift; sourceTree = ""; }; 322DD78557BFE4B398A18CBAA3C8A353 /* BlockEncryptor.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BlockEncryptor.swift; path = Sources/CryptoSwift/BlockEncryptor.swift; sourceTree = ""; }; 33400747830CD0D31E461E6DE1F4500B /* String Conversion.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = "String Conversion.swift"; path = "Sources/CryptoSwift/CS_BigInt/String Conversion.swift"; sourceTree = ""; }; @@ -208,19 +207,16 @@ 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 = ""; }; @@ -282,6 +278,7 @@ C74C33FAEC44BEBA526C5472D5CAFD19 /* GCD.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = GCD.swift; path = Sources/CryptoSwift/CS_BigInt/GCD.swift; sourceTree = ""; }; CAF7CB4BE35649AA1E76DE2396A37E0E /* Pods-abacus.ios-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-abacus.ios-acknowledgements.plist"; sourceTree = ""; }; CE3722C155F5908792FD682A1D84EC9C /* CryptoSwift-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "CryptoSwift-Info.plist"; sourceTree = ""; }; + CF5938B823263BBF080C9B21A3470789 /* abacus.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = abacus.debug.xcconfig; sourceTree = ""; }; CF791D3ED0FED5736405B0F135A4B7DA /* Signature.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = Signature.swift; path = Sources/CryptoSwift/Signature.swift; sourceTree = ""; }; D0DF4F835FF3BD92DE8F28EF66D11155 /* Pods-abacus.ios-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-abacus.ios-frameworks.sh"; sourceTree = ""; }; D16CC219F5813A4740742BFCB5F17BB3 /* PKCS1v15.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PKCS1v15.swift; path = Sources/CryptoSwift/PKCS/PKCS1v15.swift; sourceTree = ""; }; @@ -341,23 +338,30 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 208518205B4C2F51FC3700B9883D08D7 /* Support Files */ = { + 2D0B0EF6EDF07ED1C20291E5736D2CD7 /* Development Pods */ = { isa = PBXGroup; children = ( - 5087F83FBB81F03CA21A553057E81A9F /* abacus-copy-dsyms.sh */, - 087E84600314FECE345137BBED3ABF4A /* abacus.debug.xcconfig */, - 41730F22ADD1AE7FC7AB8FCAD4AB2CDA /* abacus.release.xcconfig */, + 62AAA19B1072508BA39B574A06434036 /* abacus */, ); - name = "Support Files"; - path = "integration/iOS/Pods/Target Support Files/abacus"; + name = "Development Pods"; sourceTree = ""; }; - 33D1C287C8CC4BF36926F2A16F33E291 /* Frameworks */ = { + 34798EDB6F1011D15814A373E88BB56F /* Pod */ = { isa = PBXGroup; children = ( - 194377B2DFD1180A2D72988CCD50F152 /* Abacus.framework */, + 059E5579F867BEB3F7E6DF13DEB1712B /* abacus.podspec */, ); - name = Frameworks; + name = Pod; + sourceTree = ""; + }; + 471C85CB948067129D79803FD50B3454 /* Support Files */ = { + isa = PBXGroup; + children = ( + CF5938B823263BBF080C9B21A3470789 /* abacus.debug.xcconfig */, + 2B743EE4A0C2A395311B213324EB2342 /* abacus.release.xcconfig */, + ); + name = "Support Files"; + path = "integration/iOS/Pods/Target Support Files/abacus"; sourceTree = ""; }; 578452D2E740E91742655AC8F1636D1F /* iOS */ = { @@ -368,6 +372,16 @@ name = iOS; sourceTree = ""; }; + 62AAA19B1072508BA39B574A06434036 /* abacus */ = { + isa = PBXGroup; + children = ( + 34798EDB6F1011D15814A373E88BB56F /* Pod */, + 471C85CB948067129D79803FD50B3454 /* Support Files */, + ); + name = abacus; + path = ../../..; + sourceTree = ""; + }; 77BFA6027665EBACC42B94A7C2372871 /* Pods-abacus.iosTests */ = { isa = PBXGroup; children = ( @@ -384,14 +398,6 @@ path = "Target Support Files/Pods-abacus.iosTests"; sourceTree = ""; }; - 792A924F0CBCDCDB77BDB1651564E6F1 /* Pod */ = { - isa = PBXGroup; - children = ( - 5ABBFD1A2A08C44870270007AE1EB5D4 /* abacus.podspec */, - ); - name = Pod; - sourceTree = ""; - }; 7D94CDF401128D689D2B11EDCC7ECD3A /* Products */ = { isa = PBXGroup; children = ( @@ -521,14 +527,6 @@ path = CryptoSwift; sourceTree = ""; }; - A5DC2D324221A781AC0E7A1B4908E26D /* Development Pods */ = { - isa = PBXGroup; - children = ( - F896DEEFEA08BDAEEA48FBC9E29423FF /* abacus */, - ); - name = "Development Pods"; - sourceTree = ""; - }; B284BBC13E1216FA4484D74F45F3F36F /* Pods-abacus.ios */ = { isa = PBXGroup; children = ( @@ -559,7 +557,7 @@ isa = PBXGroup; children = ( 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */, - A5DC2D324221A781AC0E7A1B4908E26D /* Development Pods */, + 2D0B0EF6EDF07ED1C20291E5736D2CD7 /* Development Pods */, D210D550F4EA176C3123ED886F8F87F5 /* Frameworks */, DA389CCA0C382AECE0DD24ED555B7245 /* Pods */, 7D94CDF401128D689D2B11EDCC7ECD3A /* Products */, @@ -598,17 +596,6 @@ 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 */ @@ -651,8 +638,8 @@ buildRules = ( ); dependencies = ( - E8ABF0505B4018EE55DC64051C0E3170 /* PBXTargetDependency */, - CF848ADCA9D462971E67CA041BBB55DD /* PBXTargetDependency */, + 5A2D5CC658950E4A7AEC9150E168E04C /* PBXTargetDependency */, + CB00F4B79F2C6FE352C8E0E376CC0EE4 /* PBXTargetDependency */, ); name = "Pods-abacus.ios"; productName = Pods_abacus_ios; @@ -671,7 +658,7 @@ buildRules = ( ); dependencies = ( - 1F67D19EAC36A41088EB458D7432B293 /* PBXTargetDependency */, + A5DD726974B98C309F8CC82EA812FDEF /* PBXTargetDependency */, ); name = "Pods-abacus.iosTests"; productName = Pods_abacus_iosTests; @@ -752,24 +739,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 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 */ = { + 1403E0AEBF8A2087DF8CACA188B609E8 /* [CP-User] Build abacus */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -919,23 +889,23 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 1F67D19EAC36A41088EB458D7432B293 /* PBXTargetDependency */ = { + 5A2D5CC658950E4A7AEC9150E168E04C /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = CryptoSwift; + target = 99313990C1D76A6D1D017868B6975CC8 /* CryptoSwift */; + targetProxy = D943F129042E36333E484FD2DF373D43 /* PBXContainerItemProxy */; + }; + A5DD726974B98C309F8CC82EA812FDEF /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "Pods-abacus.ios"; target = 469F25E790D19440507BF938A40578A7 /* Pods-abacus.ios */; - targetProxy = 174DE097054DE7A0410C57AF4AEF5A1A /* PBXContainerItemProxy */; + targetProxy = 3E4D9EBB8F897D7BD1BB900F1CB03EFD /* PBXContainerItemProxy */; }; - CF848ADCA9D462971E67CA041BBB55DD /* PBXTargetDependency */ = { + CB00F4B79F2C6FE352C8E0E376CC0EE4 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = abacus; target = 4084846DAF1774840D25DF1BF2460325 /* abacus */; - targetProxy = F8007D80E43B99904B0E4DD383211363 /* PBXContainerItemProxy */; - }; - E8ABF0505B4018EE55DC64051C0E3170 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = CryptoSwift; - target = 99313990C1D76A6D1D017868B6975CC8 /* CryptoSwift */; - targetProxy = 8437FCB39ECA4A44D93FCDCBF6066E92 /* PBXContainerItemProxy */; + targetProxy = A9316E3AFEDA79C6BE2E70454904E23B /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -977,6 +947,23 @@ }; name = Debug; }; + 22B0388248EDA44270493DDECC58CF78 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 2B743EE4A0C2A395311B213324EB2342 /* abacus.release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; 4C06C857647A16E5CF368D22DFA55BAF /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 0ECEA0D8830DCE37C7297C5F1342B08E /* Pods-abacus.ios.release.xcconfig */; @@ -1050,6 +1037,22 @@ }; name = Debug; }; + 5B331F72A7F4402311EBC4A06282E60D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = CF5938B823263BBF080C9B21A3470789 /* abacus.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; 5D1E4AA7093DAD0F254B24C6406C303C /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 7996373D44C9A5554EA9135984BC01DB /* Pods-abacus.iosTests.release.xcconfig */; @@ -1216,39 +1219,6 @@ }; name = Debug; }; - 96B05028328C5704FCE6A41A515364C0 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 087E84600314FECE345137BBED3ABF4A /* abacus.debug.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - B0264023D64B16BF2F6C8B4C076E862A /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 41730F22ADD1AE7FC7AB8FCAD4AB2CDA /* abacus.release.xcconfig */; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - SDKROOT = iphoneos; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; F3A0E769E09875E7B65318E499E93FAC /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 5E828917FF2AA3CC6B23ECF8A598B684 /* CryptoSwift.release.xcconfig */; @@ -1325,15 +1295,6 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 127F9C06E33E9DC2AB3876F089264EB1 /* Build configuration list for PBXAggregateTarget "abacus" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 96B05028328C5704FCE6A41A515364C0 /* Debug */, - B0264023D64B16BF2F6C8B4C076E862A /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 2ECD87CECC0DF0128DB6EE0BDC2D9E8A /* Build configuration list for PBXNativeTarget "CryptoSwift" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1352,6 +1313,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + B36D4FC54F44832C64D6BFCFC7EF4665 /* Build configuration list for PBXAggregateTarget "abacus" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 5B331F72A7F4402311EBC4A06282E60D /* Debug */, + 22B0388248EDA44270493DDECC58CF78 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; D5458BD03143642191683A4348FED1F8 /* Build configuration list for PBXNativeTarget "Pods-abacus.ios" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-input-files.xcfilelist b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-input-files.xcfilelist index fde154c0b..5a72e622a 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-input-files.xcfilelist +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-input-files.xcfilelist @@ -1,3 +1,2 @@ ${PODS_ROOT}/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks.sh -${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework -${PODS_ROOT}/../../../build/cocoapods/framework/Abacus.framework \ No newline at end of file +${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework \ No newline at end of file diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-output-files.xcfilelist b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-output-files.xcfilelist index d4b327f7e..60ae66013 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-output-files.xcfilelist +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-output-files.xcfilelist @@ -1,2 +1 @@ -${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework -${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Abacus.framework \ No newline at end of file +${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework \ No newline at end of file diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-input-files.xcfilelist b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-input-files.xcfilelist index fde154c0b..5a72e622a 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-input-files.xcfilelist +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-input-files.xcfilelist @@ -1,3 +1,2 @@ ${PODS_ROOT}/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks.sh -${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework -${PODS_ROOT}/../../../build/cocoapods/framework/Abacus.framework \ No newline at end of file +${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework \ No newline at end of file diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-output-files.xcfilelist b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-output-files.xcfilelist index d4b327f7e..60ae66013 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-output-files.xcfilelist +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-output-files.xcfilelist @@ -1,2 +1 @@ -${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework -${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Abacus.framework \ No newline at end of file +${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework \ No newline at end of file diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks.sh b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks.sh index 91b03c4c7..87d4632ad 100755 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks.sh +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks.sh @@ -177,11 +177,9 @@ code_sign_if_enabled() { if [[ "$CONFIGURATION" == "Debug" ]]; then install_framework "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework" - install_framework "${PODS_ROOT}/../../../build/cocoapods/framework/Abacus.framework" fi if [[ "$CONFIGURATION" == "Release" ]]; then install_framework "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework" - install_framework "${PODS_ROOT}/../../../build/cocoapods/framework/Abacus.framework" fi if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then wait diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.debug.xcconfig b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.debug.xcconfig index bb1b3d88e..465909b2f 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.debug.xcconfig +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.debug.xcconfig @@ -1,11 +1,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" "${PODS_ROOT}/../../../build/cocoapods/framework" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" LD_RUNPATH_SEARCH_PATHS = $(inherited) /usr/lib/swift '@executable_path/Frameworks' '@loader_path/Frameworks' LIBRARY_SEARCH_PATHS = $(inherited) "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift -OTHER_LDFLAGS = $(inherited) -l"c++" -framework "Abacus" -framework "CryptoSwift" +OTHER_LDFLAGS = $(inherited) -l"c++" -framework "CryptoSwift" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.release.xcconfig b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.release.xcconfig index bb1b3d88e..465909b2f 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.release.xcconfig +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.release.xcconfig @@ -1,11 +1,11 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" "${PODS_ROOT}/../../../build/cocoapods/framework" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" LD_RUNPATH_SEARCH_PATHS = $(inherited) /usr/lib/swift '@executable_path/Frameworks' '@loader_path/Frameworks' LIBRARY_SEARCH_PATHS = $(inherited) "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift -OTHER_LDFLAGS = $(inherited) -l"c++" -framework "Abacus" -framework "CryptoSwift" +OTHER_LDFLAGS = $(inherited) -l"c++" -framework "CryptoSwift" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.debug.xcconfig b/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.debug.xcconfig index fca5da53c..48b7be218 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.debug.xcconfig +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.debug.xcconfig @@ -1,8 +1,8 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" "${PODS_ROOT}/../../../build/cocoapods/framework" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" -OTHER_LDFLAGS = $(inherited) -l"c++" -framework "Abacus" -framework "CryptoSwift" +OTHER_LDFLAGS = $(inherited) -l"c++" -framework "CryptoSwift" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.release.xcconfig b/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.release.xcconfig index fca5da53c..48b7be218 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.release.xcconfig +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.release.xcconfig @@ -1,8 +1,8 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" "${PODS_ROOT}/../../../build/cocoapods/framework" +FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" -OTHER_LDFLAGS = $(inherited) -l"c++" -framework "Abacus" -framework "CryptoSwift" +OTHER_LDFLAGS = $(inherited) -l"c++" -framework "CryptoSwift" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/integration/iOS/Pods/Target Support Files/abacus/abacus.debug.xcconfig b/integration/iOS/Pods/Target Support Files/abacus/abacus.debug.xcconfig index b7f6dcfae..954328169 100644 --- a/integration/iOS/Pods/Target Support Files/abacus/abacus.debug.xcconfig +++ b/integration/iOS/Pods/Target Support Files/abacus/abacus.debug.xcconfig @@ -1,6 +1,5 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/abacus -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../../../build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 KOTLIN_PROJECT_PATH = OTHER_LDFLAGS = $(inherited) -l"c++" diff --git a/integration/iOS/Pods/Target Support Files/abacus/abacus.release.xcconfig b/integration/iOS/Pods/Target Support Files/abacus/abacus.release.xcconfig index b7f6dcfae..954328169 100644 --- a/integration/iOS/Pods/Target Support Files/abacus/abacus.release.xcconfig +++ b/integration/iOS/Pods/Target Support Files/abacus/abacus.release.xcconfig @@ -1,6 +1,5 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/abacus -FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../../../build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 KOTLIN_PROJECT_PATH = OTHER_LDFLAGS = $(inherited) -l"c++" diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/processor/markets/MarketProcessor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/processor/markets/MarketProcessor.kt index 9c51a3dfc..177285f55 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/processor/markets/MarketProcessor.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/processor/markets/MarketProcessor.kt @@ -186,10 +186,10 @@ internal class MarketProcessor( ): PerpetualMarket? { cachedIndexerSparklines[marketId] = payload.mapNotNull { parser.asDouble(it) }.reversed() when (period) { - IndexerSparklineTimePeriod.ONEDAY -> { + IndexerSparklineTimePeriod.ONE_DAY -> { return createPerpetualMarket(marketId) } - IndexerSparklineTimePeriod.SEVENDAYS -> { + IndexerSparklineTimePeriod.SEVEN_DAYS -> { val sevenDaySparklineEntries = 42 cachedIsNew[marketId] = payload.size < sevenDaySparklineEntries return createPerpetualMarket(marketId) @@ -249,7 +249,7 @@ internal class MarketProcessor( canTrade = true, canReduce = true, ) - IndexerPerpetualMarketStatus.CANCELONLY -> MarketStatus( + IndexerPerpetualMarketStatus.CANCEL_ONLY -> MarketStatus( canTrade = false, canReduce = true, ) diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+Sparklines.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+Sparklines.kt index 4e2f9ffe7..f77ff2c91 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+Sparklines.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+Sparklines.kt @@ -16,10 +16,10 @@ internal fun TradingStateMachine.sparklines( return if (sparklines != null) { marketsProcessor.processSparklines(internalState.marketsSummary, sparklines, period) when (period) { - IndexerSparklineTimePeriod.ONEDAY -> { + IndexerSparklineTimePeriod.ONE_DAY -> { StateChanges(iListOf(Changes.sparklines, Changes.markets), null) } - IndexerSparklineTimePeriod.SEVENDAYS -> { + IndexerSparklineTimePeriod.SEVEN_DAYS -> { StateChanges(iListOf(Changes.markets), null) } } diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/MarketsSupervisor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/MarketsSupervisor.kt index ce438673d..8df121ae2 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/MarketsSupervisor.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/MarketsSupervisor.kt @@ -150,7 +150,7 @@ internal class MarketsSupervisor( val url = helper.configs.publicApiUrl("sparklines") if (url != null) { // Get 1 day sparkline for market display - val period = IndexerSparklineTimePeriod.ONEDAY + val period = IndexerSparklineTimePeriod.ONE_DAY helper.get(url, iMapOf("timePeriod" to period.value), null) { _, response, httpCode, _ -> if (helper.success(httpCode) && response != null) { parseSparklinesResponse(response, period) @@ -159,7 +159,7 @@ internal class MarketsSupervisor( if (configs.retrieveSevenDaySparkline) { // Get 7 day sparkline to determine if market is new - val period = IndexerSparklineTimePeriod.SEVENDAYS + val period = IndexerSparklineTimePeriod.SEVEN_DAYS helper.get(url, iMapOf("timePeriod" to period.value), null) { _, response, httpCode, _ -> if (helper.success(httpCode) && response != null) { parseSparklinesResponse(response, period) diff --git a/src/commonMain/kotlin/indexer/codegen/IndexerAffiliateSnapshotResponseObject.kt b/src/commonMain/kotlin/indexer/codegen/IndexerAffiliateSnapshotResponseObject.kt index 104ded4b5..cc4304c38 100644 --- a/src/commonMain/kotlin/indexer/codegen/IndexerAffiliateSnapshotResponseObject.kt +++ b/src/commonMain/kotlin/indexer/codegen/IndexerAffiliateSnapshotResponseObject.kt @@ -24,6 +24,9 @@ import kotlin.js.JsExport * @param affiliateReferredUsers * @param affiliateReferredNetProtocolEarnings * @param affiliateReferredTotalVolume + * @param affiliateReferredMakerFees + * @param affiliateReferredTakerFees + * @param affiliateReferredMakerRebates */ @JsExport @Serializable @@ -36,5 +39,8 @@ data class IndexerAffiliateSnapshotResponseObject( val affiliateTotalReferredFees: kotlin.Double? = null, val affiliateReferredUsers: kotlin.Double? = null, val affiliateReferredNetProtocolEarnings: kotlin.Double? = null, - val affiliateReferredTotalVolume: kotlin.Double? = null + val affiliateReferredTotalVolume: kotlin.Double? = null, + val affiliateReferredMakerFees: kotlin.Double? = null, + val affiliateReferredTakerFees: kotlin.Double? = null, + val affiliateReferredMakerRebates: kotlin.Double? = null ) diff --git a/src/commonMain/kotlin/indexer/codegen/IndexerComplianceReason.kt b/src/commonMain/kotlin/indexer/codegen/IndexerComplianceReason.kt index 913da0f92..515ead74b 100644 --- a/src/commonMain/kotlin/indexer/codegen/IndexerComplianceReason.kt +++ b/src/commonMain/kotlin/indexer/codegen/IndexerComplianceReason.kt @@ -16,15 +16,15 @@ import kotlin.js.JsExport /** * - * Values: MANUAL,USGEO,CAGEO,GBGEO,SANCTIONEDGEO,COMPLIANCEPROVIDER + * Values: MANUAL,US_GEO,CA_GEO,GB_GEO,SANCTIONED_GEO,COMPLIANCE_PROVIDER */ @JsExport @Serializable enum class IndexerComplianceReason(val value: kotlin.String) { MANUAL("MANUAL"), // :/ - USGEO("US_GEO"), // :/ - CAGEO("CA_GEO"), // :/ - GBGEO("GB_GEO"), // :/ - SANCTIONEDGEO("SANCTIONED_GEO"), // :/ - COMPLIANCEPROVIDER("COMPLIANCE_PROVIDER"); // :/ + US_GEO("US_GEO"), // :/ + CA_GEO("CA_GEO"), // :/ + GB_GEO("GB_GEO"), // :/ + SANCTIONED_GEO("SANCTIONED_GEO"), // :/ + COMPLIANCE_PROVIDER("COMPLIANCE_PROVIDER"); // :/ } diff --git a/src/commonMain/kotlin/indexer/codegen/IndexerComplianceStatus.kt b/src/commonMain/kotlin/indexer/codegen/IndexerComplianceStatus.kt index 33952e842..18ed88ffb 100644 --- a/src/commonMain/kotlin/indexer/codegen/IndexerComplianceStatus.kt +++ b/src/commonMain/kotlin/indexer/codegen/IndexerComplianceStatus.kt @@ -16,14 +16,14 @@ import kotlin.js.JsExport /** * - * Values: COMPLIANT,FIRSTSTRIKECLOSEONLY,FIRSTSTRIKE,CLOSEONLY,BLOCKED + * Values: COMPLIANT,FIRST_STRIKE_CLOSE_ONLY,FIRST_STRIKE,CLOSE_ONLY,BLOCKED */ @JsExport @Serializable enum class IndexerComplianceStatus(val value: kotlin.String) { COMPLIANT("COMPLIANT"), // :/ - FIRSTSTRIKECLOSEONLY("FIRST_STRIKE_CLOSE_ONLY"), // :/ - FIRSTSTRIKE("FIRST_STRIKE"), // :/ - CLOSEONLY("CLOSE_ONLY"), // :/ + FIRST_STRIKE_CLOSE_ONLY("FIRST_STRIKE_CLOSE_ONLY"), // :/ + FIRST_STRIKE("FIRST_STRIKE"), // :/ + CLOSE_ONLY("CLOSE_ONLY"), // :/ BLOCKED("BLOCKED"); // :/ } diff --git a/src/commonMain/kotlin/indexer/codegen/IndexerPerpetualMarketStatus.kt b/src/commonMain/kotlin/indexer/codegen/IndexerPerpetualMarketStatus.kt index da7f09f80..b0c064dea 100644 --- a/src/commonMain/kotlin/indexer/codegen/IndexerPerpetualMarketStatus.kt +++ b/src/commonMain/kotlin/indexer/codegen/IndexerPerpetualMarketStatus.kt @@ -16,15 +16,15 @@ import kotlin.js.JsExport /** * - * Values: ACTIVE,PAUSED,CANCELONLY,POSTONLY,INITIALIZING,FINALSETTLEMENT + * Values: ACTIVE,PAUSED,CANCEL_ONLY,POST_ONLY,INITIALIZING,FINAL_SETTLEMENT */ @JsExport @Serializable enum class IndexerPerpetualMarketStatus(val value: kotlin.String) { ACTIVE("ACTIVE"), // :/ PAUSED("PAUSED"), // :/ - CANCELONLY("CANCEL_ONLY"), // :/ - POSTONLY("POST_ONLY"), // :/ + CANCEL_ONLY("CANCEL_ONLY"), // :/ + POST_ONLY("POST_ONLY"), // :/ INITIALIZING("INITIALIZING"), // :/ - FINALSETTLEMENT("FINAL_SETTLEMENT"); // :/ + FINAL_SETTLEMENT("FINAL_SETTLEMENT"); // :/ } diff --git a/src/commonMain/kotlin/indexer/codegen/IndexerSparklineTimePeriod.kt b/src/commonMain/kotlin/indexer/codegen/IndexerSparklineTimePeriod.kt index d204ac645..ea0ce8d2f 100644 --- a/src/commonMain/kotlin/indexer/codegen/IndexerSparklineTimePeriod.kt +++ b/src/commonMain/kotlin/indexer/codegen/IndexerSparklineTimePeriod.kt @@ -16,11 +16,11 @@ import kotlin.js.JsExport /** * - * Values: ONEDAY,SEVENDAYS + * Values: ONE_DAY,SEVEN_DAYS */ @JsExport @Serializable enum class IndexerSparklineTimePeriod(val value: kotlin.String) { - ONEDAY("ONE_DAY"), // :/ - SEVENDAYS("SEVEN_DAYS"); // :/ + ONE_DAY("ONE_DAY"), // :/ + SEVEN_DAYS("SEVEN_DAYS"); // :/ } diff --git a/src/commonTest/kotlin/exchange.dydx.abacus/processor/markets/MarketProcessorTests.kt b/src/commonTest/kotlin/exchange.dydx.abacus/processor/markets/MarketProcessorTests.kt index e24fc36b0..f25b574b9 100644 --- a/src/commonTest/kotlin/exchange.dydx.abacus/processor/markets/MarketProcessorTests.kt +++ b/src/commonTest/kotlin/exchange.dydx.abacus/processor/markets/MarketProcessorTests.kt @@ -153,21 +153,21 @@ class MarketProcessorTests { val output = processor.processSparklines( marketId = "BTC-USD", payload = listOf("1", "2", "3"), - period = IndexerSparklineTimePeriod.ONEDAY, + period = IndexerSparklineTimePeriod.ONE_DAY, ) assertEquals(output?.perpetual?.line, listOf(3.0, 2.0, 1.0).toIList()) val output2 = processor.processSparklines( marketId = "BTC-USD", payload = listOf("1", "2", "3"), - period = IndexerSparklineTimePeriod.SEVENDAYS, + period = IndexerSparklineTimePeriod.SEVEN_DAYS, ) assertEquals(output2?.perpetual?.isNew, true) val output3 = processor.processSparklines( marketId = "BTC-USD", payload = MutableList(42) { "1" }, // 42 elements - period = IndexerSparklineTimePeriod.SEVENDAYS, + period = IndexerSparklineTimePeriod.SEVEN_DAYS, ) assertEquals(output3?.perpetual?.isNew, false) } diff --git a/src/commonTest/kotlin/exchange.dydx.abacus/processor/markets/MarketsProcessorTests.kt b/src/commonTest/kotlin/exchange.dydx.abacus/processor/markets/MarketsProcessorTests.kt index 294ef02fa..09827dac0 100644 --- a/src/commonTest/kotlin/exchange.dydx.abacus/processor/markets/MarketsProcessorTests.kt +++ b/src/commonTest/kotlin/exchange.dydx.abacus/processor/markets/MarketsProcessorTests.kt @@ -100,7 +100,7 @@ class MarketsProcessorTests { "BTC-USD" to listOf("1", "2", "3"), "ETH-USD" to listOf("1", "2", "3"), ) - val result = processor.processSparklines(state, sparklines, IndexerSparklineTimePeriod.ONEDAY) + val result = processor.processSparklines(state, sparklines, IndexerSparklineTimePeriod.ONE_DAY) assertEquals(2, marketProcessor.processSparklinesCallCount) assertEquals(2, result.markets.size) } diff --git a/src/commonTest/kotlin/exchange.dydx.abacus/tests/extensions/TradingStateMachine+TestUtils.kt b/src/commonTest/kotlin/exchange.dydx.abacus/tests/extensions/TradingStateMachine+TestUtils.kt index faf3b76ec..7dfc7824d 100644 --- a/src/commonTest/kotlin/exchange.dydx.abacus/tests/extensions/TradingStateMachine+TestUtils.kt +++ b/src/commonTest/kotlin/exchange.dydx.abacus/tests/extensions/TradingStateMachine+TestUtils.kt @@ -579,7 +579,7 @@ fun TradingStateMachine.rest( } "/v4/sparklines" -> { - changes = sparklines(payload, IndexerSparklineTimePeriod.ONEDAY) + changes = sparklines(payload, IndexerSparklineTimePeriod.ONE_DAY) } "/v4/fills" -> { diff --git a/swagger_codegen.sh b/swagger_codegen.sh index fa253cec1..871f86c86 100755 --- a/swagger_codegen.sh +++ b/swagger_codegen.sh @@ -106,6 +106,44 @@ sed -i '' 's/_4HOURS("4HOURS")/@SerialName("4HOURS")\n _4HOURS("4HOURS")/' ge # add @SerialName("1DAY") to _1DAY("1DAY") in CandleResolution.kt sed -i '' 's/_1DAY("1DAY")/@SerialName("1DAY")\n _1DAY("1DAY")/' generated/src/main/kotlin/indexer/codegen/CandleResolution.kt +# replace CANCELONLY with CANCEL_ONLY in PerpetualMarketStatus.kt +sed -i '' 's/CANCELONLY/CANCEL_ONLY/' generated/src/main/kotlin/indexer/codegen/PerpetualMarketStatus.kt + +# replace POSTONLY with POST_ONLY in PerpetualMarketStatus.kt +sed -i '' 's/POSTONLY/POST_ONLY/' generated/src/main/kotlin/indexer/codegen/PerpetualMarketStatus.kt + +# replace FINALSETTLEMENT with FINAL_SETTLEMENT in PerpetualMarketStatus.kt +sed -i '' 's/FINALSETTLEMENT/FINAL_SETTLEMENT/' generated/src/main/kotlin/indexer/codegen/PerpetualMarketStatus.kt + +# replace SANCTIONEDGEO with SANCTIONED_GEO in ComplianceReason.kt +sed -i '' 's/SANCTIONEDGEO/SANCTIONED_GEO/' generated/src/main/kotlin/indexer/codegen/ComplianceReason.kt + +# replace COMPLIANCEPROVIDER with COMPLIANCE_PROVIDER in ComplianceReason.kt +sed -i '' 's/COMPLIANCEPROVIDER/COMPLIANCE_PROVIDER/' generated/src/main/kotlin/indexer/codegen/ComplianceReason.kt + +# replace USGEO with US_GEO in ComplianceReason.kt +sed -i '' 's/USGEO/US_GEO/' generated/src/main/kotlin/indexer/codegen/ComplianceReason.kt + +# replace CAGEO with CA_GEO in ComplianceReason.kt +sed -i '' 's/CAGEO/CA_GEO/' generated/src/main/kotlin/indexer/codegen/ComplianceReason.kt + +# replace GBGEO with GB_GEO in ComplianceReason.kt +sed -i '' 's/GBGEO/GB_GEO/' generated/src/main/kotlin/indexer/codegen/ComplianceReason.kt + +# replace FIRSTSTRIKECLOSEONLY with FIRST_STRIKE_CLOSE_ONLY in ComplianceStatus.kt +sed -i '' 's/FIRSTSTRIKECLOSEONLY/FIRST_STRIKE_CLOSE_ONLY/' generated/src/main/kotlin/indexer/codegen/ComplianceStatus.kt + +# replace FIRSTSTRIKE with FIRST_STRIKE in ComplianceStatus.kt +sed -i '' 's/FIRSTSTRIKE/FIRST_STRIKE/' generated/src/main/kotlin/indexer/codegen/ComplianceStatus.kt + +# replace CLOSEONLY with CLOSE_ONLY in ComplianceStatus.kt +sed -i '' 's/CLOSEONLY/CLOSE_ONLY/' generated/src/main/kotlin/indexer/codegen/ComplianceStatus.kt + +# replace ONEDAY with ONE_DAY in SparklineTimePeriod.kt +sed -i '' 's/ONEDAY/ONE_DAY/' generated/src/main/kotlin/indexer/codegen/SparklineTimePeriod.kt + +# replace SEVENDAYS with SEVEN_DAYS in SparklineTimePeriod.kt +sed -i '' 's/SEVENDAYS/SEVEN_DAYS/' generated/src/main/kotlin/indexer/codegen/SparklineTimePeriod.kt # for each of the time in the generated code, run "swagger_update_file.sh " find generated/src/main/kotlin/indexer -type f \ diff --git a/v4_abacus.podspec b/v4_abacus.podspec index a0fa8fcfb..91384affc 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.13.20' + spec.version = '1.13.21' spec.homepage = 'https://github.com/dydxprotocol/v4-abacus' spec.source = { :http=> ''} spec.authors = ''