From dada79fc1f3813c1155ac291acf8002631867c37 Mon Sep 17 00:00:00 2001 From: jaredvu Date: Wed, 15 May 2024 09:50:45 -0700 Subject: [PATCH 01/14] Add amountPercent and fix summary + fields --- .../AdjustIsolatedMarginInputCalculator.kt | 55 ++++++++++++-- .../output/input/AdjustIsolatedMarginInput.kt | 67 ++++++++-------- .../state/manager/StateManagerAdaptor.kt | 2 +- ...gStateMachine+AdjustIsolatedMarginInput.kt | 49 +++++++++++- .../v2/supervisor/SubaccountSupervisor.kt | 18 ++++- .../payload/AdjustIsolatedMarginInputTests.kt | 76 +++++++++++++++++++ 6 files changed, 223 insertions(+), 44 deletions(-) diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AdjustIsolatedMarginInputCalculator.kt b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AdjustIsolatedMarginInputCalculator.kt index 113feec6a..0622d19ab 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AdjustIsolatedMarginInputCalculator.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AdjustIsolatedMarginInputCalculator.kt @@ -21,7 +21,7 @@ internal class AdjustIsolatedMarginInputCalculator(val parser: ParserProtocol) { IsolatedMarginAdjustmentType.valueOf(it) } ?: IsolatedMarginAdjustmentType.Add - return if (wallet != null && isolatedMarginAdjustment != null && type != null) { + return if (wallet != null && isolatedMarginAdjustment != null) { val modified = state.mutable() val parentTransferDelta = getModifiedTransferDelta(isolatedMarginAdjustment, true) val childTransferDelta = getModifiedTransferDelta(isolatedMarginAdjustment, false) @@ -44,8 +44,8 @@ internal class AdjustIsolatedMarginInputCalculator(val parser: ParserProtocol) { "postOrder", ) - val modifiedParentSubaccount = parser.asNativeMap(parser.value(walletPostChildSubaccountTransfer, "accounts.subaccounts.$parentSubaccountNumber")) - val modifiedChildSubaccount = parser.asNativeMap(parser.value(walletPostChildSubaccountTransfer, "accounts.subaccounts.$childSubaccountNumber")) + val modifiedParentSubaccount = parser.asNativeMap(parser.value(walletPostChildSubaccountTransfer, "account.subaccounts.$parentSubaccountNumber")) + val modifiedChildSubaccount = parser.asNativeMap(parser.value(walletPostChildSubaccountTransfer, "account.subaccounts.$childSubaccountNumber")) val modifiedIsolatedMarginAdjustment = finalize(isolatedMarginAdjustment, modifiedParentSubaccount, modifiedChildSubaccount, type) modified["adjustIsolatedMargin"] = modifiedIsolatedMarginAdjustment @@ -94,13 +94,13 @@ internal class AdjustIsolatedMarginInputCalculator(val parser: ParserProtocol) { type: IsolatedMarginAdjustmentType, ): Map { val summary = mutableMapOf() - val crossCollateral = parser.asDouble(parser.value(parentSubaccount, "freeCollateral.postOrder")) - val crossMarginUsage = parser.asDouble(parser.value(parentSubaccount, "marginUsage.postOrder")) + val crossCollateral = parentSubaccount?.get("freeCollateral") + val crossMarginUsage = parentSubaccount?.get("marginUsage") val openPositions = parser.asNativeMap(childSubaccount?.get("openPositions")) val marketId = openPositions?.keys?.firstOrNull() - val positionMargin = parser.asDouble(parser.value(childSubaccount, "freeCollateral.postOrder")) - val positionLeverage = parser.asDouble(parser.value(childSubaccount, "openPositions.$marketId.leverage.postOrder")) - val liquidationPrice = parser.asDouble(parser.value(childSubaccount, "openPositions.$marketId.liquidationPrice.postOrder")) + val positionMargin = childSubaccount?.get("freeCollateral") + val positionLeverage = parser.value(childSubaccount, "openPositions.$marketId.leverage") + val liquidationPrice = parser.value(childSubaccount, "openPositions.$marketId.liquidationPrice") when (type) { IsolatedMarginAdjustmentType.Add -> { @@ -123,6 +123,42 @@ internal class AdjustIsolatedMarginInputCalculator(val parser: ParserProtocol) { return summary } + private fun amountField(): Map { + return mapOf( + "field" to "amount", + "type" to "double", + ) + } + + private fun requiredFields(): List { + return listOf( + amountField(), + ) + } + + private fun calculatedOptionsFromField(fields: List?): Map? { + fields?.let { + val options = mutableMapOf( + "needsSize" to false, + ) + + for (item in fields) { + parser.asNativeMap(item)?.let { field -> + when (parser.asString(field["field"])) { + "amount" -> { + options["needsSize"] = true + } + } + + } + } + + return options + } + + return null + } + private fun finalize( isolatedMarginAdjustment: Map, parentSubaccount: Map?, @@ -130,6 +166,9 @@ internal class AdjustIsolatedMarginInputCalculator(val parser: ParserProtocol) { type: IsolatedMarginAdjustmentType, ): Map { val modified = isolatedMarginAdjustment.mutable() + val fields = requiredFields() + modified.safeSet("fields", fields) + modified.safeSet("options", calculatedOptionsFromField(fields)) modified.safeSet("summary", summaryForType(parentSubaccount, childSubaccount, type)) return modified } diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/output/input/AdjustIsolatedMarginInput.kt b/src/commonMain/kotlin/exchange.dydx.abacus/output/input/AdjustIsolatedMarginInput.kt index c6dd2941a..af2672230 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/output/input/AdjustIsolatedMarginInput.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/output/input/AdjustIsolatedMarginInput.kt @@ -1,5 +1,6 @@ package exchange.dydx.abacus.output.input +import exchange.dydx.abacus.output.TradeStatesWithDoubleValues import exchange.dydx.abacus.protocols.ParserProtocol import exchange.dydx.abacus.utils.Logger import kollections.JsExport @@ -38,10 +39,15 @@ data class AdjustIsolatedMarginInputOptions( @Serializable data class AdjustIsolatedMarginInputSummary( val crossFreeCollateral: Double?, + val crossFreeCollateralUpdated: Double?, val crossMarginUsage: Double?, + val crossMarginUsageUpdated: Double?, val positionMargin: Double?, + val positionMarginUpdated: Double?, val positionLeverage: Double?, + val positionLeverageUpdated: Double?, val liquidationPrice: Double?, + val liquidationPriceUpdated: Double?, ) { companion object { internal fun create( @@ -52,25 +58,40 @@ data class AdjustIsolatedMarginInputSummary( Logger.d { "creating Adjust Isolated Margin Input Summary\n" } data?.let { - val crossFreeCollateral = parser.asDouble(data["crossFreeCollateral"]) - val crossMarginUsage = parser.asDouble(data["crossMarginUsage"]) - val positionMargin = parser.asDouble(data["positionMargin"]) - val positionLeverage = parser.asDouble(data["positionLeverage"]) - val liquidationPrice = parser.asDouble(data["liquidationPrice"]) + val crossFreeCollateral = parser.asDouble(parser.value(data, "crossFreeCollateral.current")) + val crossFreeCollateralUpdated = parser.asDouble(parser.value(data, "crossFreeCollateral.postOrder")) + val crossMarginUsage = parser.asDouble(parser.value(data, "crossMarginUsage.current")) + val crossMarginUsageUpdated = parser.asDouble(parser.value(data, "crossMarginUsage.postOrder")) + val positionMargin = parser.asDouble(parser.value(data, "positionMargin.current")) + val positionMarginUpdated = parser.asDouble(parser.value(data, "positionMargin.postOrder")) + val positionLeverage = parser.asDouble(parser.value(data, "positionLeverage.current")) + val positionLeverageUpdated = parser.asDouble(parser.value(data, "positionLeverage.postOrder")) + val liquidationPrice = parser.asDouble(parser.value(data, "liquidationPrice.current")) + val liquidationPriceUpdated = parser.asDouble(parser.value(data, "liquidationPrice.postOrder")) return if ( existing?.crossFreeCollateral != crossFreeCollateral || + existing?.crossFreeCollateralUpdated != crossFreeCollateralUpdated || existing?.crossMarginUsage != crossMarginUsage || + existing?.crossMarginUsageUpdated != crossMarginUsageUpdated || existing?.positionMargin != positionMargin || + existing?.positionMarginUpdated != positionMarginUpdated || existing?.positionLeverage != positionLeverage || - existing?.liquidationPrice != liquidationPrice + existing?.positionLeverageUpdated != positionLeverageUpdated || + existing?.liquidationPrice != liquidationPrice || + existing?.liquidationPriceUpdated != liquidationPriceUpdated ) { AdjustIsolatedMarginInputSummary( crossFreeCollateral, + crossFreeCollateralUpdated, crossMarginUsage, + crossMarginUsageUpdated, positionMargin, + positionMarginUpdated, positionLeverage, + positionLeverageUpdated, liquidationPrice, + liquidationPriceUpdated, ) } else { existing @@ -94,12 +115,10 @@ enum class IsolatedMarginAdjustmentType { data class AdjustIsolatedMarginInput( val type: IsolatedMarginAdjustmentType, val amount: String?, + val amountPercent: String?, val childSubaccountNumber: Int?, val adjustIsolatedMarginInputOptions: AdjustIsolatedMarginInputOptions?, - val summary: AdjustIsolatedMarginInputSummary?, - val errors: String?, - val errorMessage: String?, - val fee: Double?, + val summary: AdjustIsolatedMarginInputSummary? ) { companion object { internal fun create( @@ -116,11 +135,12 @@ data class AdjustIsolatedMarginInput( val childSubaccountNumber = parser.asInt(data["ChildSubaccountNumber"]) val amount = parser.asString(data["Amount"]) - val fee = parser.asDouble(data["fee"]) + val amountPercent = parser.asString(data["AmountPercent"]) + val adjustIsolatedMarginInputOptions = AdjustIsolatedMarginInputOptions.create( existing?.adjustIsolatedMarginInputOptions, parser, - parser.asMap(data["adjustIsolatedMarginInputOptions"]), + parser.asMap(data["options"]), ) val summary = AdjustIsolatedMarginInputSummary.create( existing?.summary, @@ -128,36 +148,21 @@ data class AdjustIsolatedMarginInput( parser.asMap(data["summary"]), ) - val errors = parser.asString(data["errors"]) - - val errorMessage: String? = - if (errors != null) { - val errorArray = parser.decodeJsonArray(errors) - val firstError = parser.asMap(errorArray?.first()) - parser.asString(firstError?.get("message")) - } else { - null - } - return if ( existing?.type != type || existing.amount != amount || + existing.amountPercent != amountPercent || existing.childSubaccountNumber != childSubaccountNumber || existing.adjustIsolatedMarginInputOptions != adjustIsolatedMarginInputOptions || - existing.summary !== summary || - existing.errors !== errors || - existing.errorMessage != errorMessage || - existing.fee != fee + existing.summary !== summary ) { AdjustIsolatedMarginInput( type, amount, + amountPercent, childSubaccountNumber, adjustIsolatedMarginInputOptions, - summary, - errors, - errorMessage, - fee, + summary ) } else { existing diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/StateManagerAdaptor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/StateManagerAdaptor.kt index ef78ed483..f8b8f934d 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/StateManagerAdaptor.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/StateManagerAdaptor.kt @@ -2244,7 +2244,7 @@ open class StateManagerAdaptor( val walletAddress = wallet.walletAddress ?: error("walletAddress is null") val isolatedMarginAdjustment = stateMachine.state?.input?.adjustIsolatedMargin ?: error("isolatedMarginAdjustment is null") - val amount = isolatedMarginAdjustment.amount ?: error("amount is null") + val amount = parser.asString(isolatedMarginAdjustment.amount) ?: error("amount is null") val childSubaccountNumber = isolatedMarginAdjustment.childSubaccountNumber ?: error("childSubaccountNumber is null") diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt index a902e6358..d2a05c157 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt @@ -19,6 +19,7 @@ import kotlinx.serialization.Serializable enum class AdjustIsolatedMarginInputField { Type, Amount, + AmountPercent, ChildSubaccountNumber, } @@ -64,6 +65,10 @@ fun TradingStateMachine.adjustIsolatedMargin( if (adjustIsolatedMargin["Type"] != parser.asString(data)) { adjustIsolatedMargin.safeSet(type.name, parser.asString(data)) adjustIsolatedMargin.safeSet("Amount", null) + adjustIsolatedMargin.safeSet("AmountPercent", null) + if (parser.asString(parser.value(adjustIsolatedMargin, "amount.input")) == "amount.percent") { + adjustIsolatedMargin.safeSet("amount.input", "amount.size") + } } changes = StateChanges( iListOf(Changes.wallet, Changes.subaccount, Changes.input), @@ -71,9 +76,45 @@ fun TradingStateMachine.adjustIsolatedMargin( subaccountNumbers, ) } + AdjustIsolatedMarginInputField.AmountPercent, AdjustIsolatedMarginInputField.Amount -> { - val amount = parser.asString(data) - adjustIsolatedMargin.safeSet(type.name, amount) + val isolatedMarginAdjustmentType = adjustIsolatedMargin["Type"] + val subaccountNumber = if (isolatedMarginAdjustmentType == IsolatedMarginAdjustmentType.Add.name) { + parentSubaccountNumber + } else { + childSubaccountNumber + } + val subaccount = parser.asNativeMap( + parser.value( + this.account, + "subaccounts.$subaccountNumber", + ), + ) + + val freeCollateral = parser.asDouble(parser.value(subaccount, "freeCollateral.current")) + + if (type == AdjustIsolatedMarginInputField.Amount) { + val amount = parser.asDouble(data) + if (amount != null && freeCollateral != null) { + val amountPercent = amount / freeCollateral + adjustIsolatedMargin.safeSet("AmountPercent", amountPercent.toString()) + adjustIsolatedMargin.safeSet(type.name, amount.toString()) + } else { + adjustIsolatedMargin.safeSet(type.name, data) + adjustIsolatedMargin.safeSet("AmountPercent", null) + } + } else if (type == AdjustIsolatedMarginInputField.AmountPercent) { + val amountPercent = parser.asDouble(data) + if (amountPercent != null && freeCollateral != null) { + val amount = amountPercent * freeCollateral + adjustIsolatedMargin.safeSet("Amount", amount.toString()) + adjustIsolatedMargin.safeSet(type.name, amountPercent.toString()) + } else { + adjustIsolatedMargin.safeSet(type.name, data) + adjustIsolatedMargin.safeSet("Amount", null) + } + } + changes = StateChanges( iListOf(Changes.wallet, Changes.subaccount, Changes.input), null, @@ -130,6 +171,10 @@ fun TradingStateMachine.validAdjustIsolatedMarginInput( val amount = parser.asDouble(adjustIsolatedMargin["Amount"]) return amount == null || amount > 0 } + AdjustIsolatedMarginInputField.AmountPercent.name -> { + val amountPercent = parser.asDouble(adjustIsolatedMargin["AmountPercent"]) + return amountPercent == null || amountPercent > 0 + } AdjustIsolatedMarginInputField.ChildSubaccountNumber.name -> { val childSubaccountNumber = parser.asInt(adjustIsolatedMargin["ChildSubaccountNumber"]) return childSubaccountNumber == null || childSubaccountNumber % NUM_PARENT_SUBACCOUNTS == parentSubaccountNumber diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/SubaccountSupervisor.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/SubaccountSupervisor.kt index 97ea41512..0b6f59b6a 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/SubaccountSupervisor.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/supervisor/SubaccountSupervisor.kt @@ -4,6 +4,7 @@ import exchange.dydx.abacus.calculator.TriggerOrdersConstants.TRIGGER_ORDER_DEFA import exchange.dydx.abacus.output.Notification import exchange.dydx.abacus.output.SubaccountOrder import exchange.dydx.abacus.output.TransferRecordType +import exchange.dydx.abacus.output.input.IsolatedMarginAdjustmentType import exchange.dydx.abacus.output.input.OrderStatus import exchange.dydx.abacus.output.input.OrderType import exchange.dydx.abacus.output.input.TradeInputGoodUntil @@ -1268,12 +1269,25 @@ internal class SubaccountSupervisor( val isolatedMarginAdjustment = stateMachine.state?.input?.adjustIsolatedMargin ?: error("AdjustIsolatedMarginInput is null") val amount = isolatedMarginAdjustment.amount ?: error("amount is null") val childSubaccountNumber = isolatedMarginAdjustment.childSubaccountNumber ?: error("childSubaccountNumber is null") + val type = isolatedMarginAdjustment.type + + val recipientSubaccountNumber = if (type == IsolatedMarginAdjustmentType.Add) { + childSubaccountNumber + } else { + subaccountNumber + } + + val sourceSubaccountNumber = if (type == IsolatedMarginAdjustmentType.Add) { + subaccountNumber + } else { + childSubaccountNumber + } return HumanReadableSubaccountTransferPayload( - subaccountNumber, + sourceSubaccountNumber, amount, accountAddress, - childSubaccountNumber, + recipientSubaccountNumber, ) } diff --git a/src/commonTest/kotlin/exchange.dydx.abacus/payload/AdjustIsolatedMarginInputTests.kt b/src/commonTest/kotlin/exchange.dydx.abacus/payload/AdjustIsolatedMarginInputTests.kt index e60d945bc..5c8aa5664 100644 --- a/src/commonTest/kotlin/exchange.dydx.abacus/payload/AdjustIsolatedMarginInputTests.kt +++ b/src/commonTest/kotlin/exchange.dydx.abacus/payload/AdjustIsolatedMarginInputTests.kt @@ -45,6 +45,7 @@ class AdjustIsolatedMarginInputTests : V4BaseTests() { testMarginAddition() testMarginRemoval() testZeroAmount() + testMarginAmountPercent() } private fun testChildSubaccountNumberInput() { @@ -203,4 +204,79 @@ class AdjustIsolatedMarginInputTests : V4BaseTests() { """.trimIndent(), ) } + + private fun testMarginAmountPercent() { + test({ + perp.adjustIsolatedMargin(IsolatedMarginAdjustmentType.Add.name, AdjustIsolatedMarginInputField.Type, 0) + }, + """ + { + "input": { + "current": "adjustIsolatedMargin", + "adjustIsolatedMargin": { + "Type": "Add", + "Amount": null, + "AmountPercent": null + } + } + } + """.trimIndent(), + ) + + test( + { + perp.adjustIsolatedMargin("0.1", AdjustIsolatedMarginInputField.AmountPercent, 0) + }, + """ + { + "input": { + "current": "adjustIsolatedMargin", + "adjustIsolatedMargin": { + "Type": "Add", + "AmountPercent": "0.1", + "Amount": "8882.656169898173" + } + } + } + """.trimIndent(), + ) + + test({ + perp.adjustIsolatedMargin( + IsolatedMarginAdjustmentType.Remove.name, + AdjustIsolatedMarginInputField.Type, + 0 + ) + }, + """ + { + "input": { + "current": "adjustIsolatedMargin", + "adjustIsolatedMargin": { + "Type": "Remove", + "Amount": null, + "AmountPercent": null + } + } + } + """.trimIndent(), + ) + + test({ + perp.adjustIsolatedMargin("0.1", AdjustIsolatedMarginInputField.AmountPercent, 0) + }, + """ + { + "input": { + "current": "adjustIsolatedMargin", + "adjustIsolatedMargin": { + "Type": "Remove", + "AmountPercent": "0.1", + "Amount": "79.62439999999999" + } + } + } + """.trimIndent(), + ) + } } From a419dbcb76875b63ccc64ac8ca1a30d337919385 Mon Sep 17 00:00:00 2001 From: jaredvu Date: Wed, 15 May 2024 09:54:19 -0700 Subject: [PATCH 02/14] bump version --- build.gradle.kts | 2 +- v4_abacus.podspec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b5c0b74eb..15c955f2f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,7 +51,7 @@ allprojects { } group = "exchange.dydx.abacus" -version = "1.7.16" +version = "1.7.17" repositories { google() diff --git a/v4_abacus.podspec b/v4_abacus.podspec index 6cd8595bc..8527e409c 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.7.16' + spec.version = '1.7.17' spec.homepage = 'https://github.com/dydxprotocol/v4-abacus' spec.source = { :http=> ''} spec.authors = '' @@ -11,7 +11,7 @@ Pod::Spec.new do |spec| - if false + if !Dir.exist?('build/cocoapods/framework/Abacus.framework') || Dir.empty?('build/cocoapods/framework/Abacus.framework') raise " Kotlin framework 'Abacus' doesn't exist yet, so a proper Xcode project can't be generated. From cac4f7f7edbd4a442d13f758580848fd9bda4fcb Mon Sep 17 00:00:00 2001 From: jaredvu Date: Wed, 15 May 2024 09:57:19 -0700 Subject: [PATCH 03/14] spotlessApply --- .../AdjustIsolatedMarginInputCalculator.kt | 1 - .../output/input/AdjustIsolatedMarginInput.kt | 3 +- .../payload/AdjustIsolatedMarginInputTests.kt | 29 ++++++++++--------- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AdjustIsolatedMarginInputCalculator.kt b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AdjustIsolatedMarginInputCalculator.kt index 0622d19ab..ac4ddd73a 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AdjustIsolatedMarginInputCalculator.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/calculator/AdjustIsolatedMarginInputCalculator.kt @@ -149,7 +149,6 @@ internal class AdjustIsolatedMarginInputCalculator(val parser: ParserProtocol) { options["needsSize"] = true } } - } } diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/output/input/AdjustIsolatedMarginInput.kt b/src/commonMain/kotlin/exchange.dydx.abacus/output/input/AdjustIsolatedMarginInput.kt index af2672230..6b3b7f7c9 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/output/input/AdjustIsolatedMarginInput.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/output/input/AdjustIsolatedMarginInput.kt @@ -1,6 +1,5 @@ package exchange.dydx.abacus.output.input -import exchange.dydx.abacus.output.TradeStatesWithDoubleValues import exchange.dydx.abacus.protocols.ParserProtocol import exchange.dydx.abacus.utils.Logger import kollections.JsExport @@ -162,7 +161,7 @@ data class AdjustIsolatedMarginInput( amountPercent, childSubaccountNumber, adjustIsolatedMarginInputOptions, - summary + summary, ) } else { existing diff --git a/src/commonTest/kotlin/exchange.dydx.abacus/payload/AdjustIsolatedMarginInputTests.kt b/src/commonTest/kotlin/exchange.dydx.abacus/payload/AdjustIsolatedMarginInputTests.kt index 5c8aa5664..6a328a935 100644 --- a/src/commonTest/kotlin/exchange.dydx.abacus/payload/AdjustIsolatedMarginInputTests.kt +++ b/src/commonTest/kotlin/exchange.dydx.abacus/payload/AdjustIsolatedMarginInputTests.kt @@ -206,9 +206,10 @@ class AdjustIsolatedMarginInputTests : V4BaseTests() { } private fun testMarginAmountPercent() { - test({ - perp.adjustIsolatedMargin(IsolatedMarginAdjustmentType.Add.name, AdjustIsolatedMarginInputField.Type, 0) - }, + test( + { + perp.adjustIsolatedMargin(IsolatedMarginAdjustmentType.Add.name, AdjustIsolatedMarginInputField.Type, 0) + }, """ { "input": { @@ -241,13 +242,14 @@ class AdjustIsolatedMarginInputTests : V4BaseTests() { """.trimIndent(), ) - test({ - perp.adjustIsolatedMargin( - IsolatedMarginAdjustmentType.Remove.name, - AdjustIsolatedMarginInputField.Type, - 0 - ) - }, + test( + { + perp.adjustIsolatedMargin( + IsolatedMarginAdjustmentType.Remove.name, + AdjustIsolatedMarginInputField.Type, + 0, + ) + }, """ { "input": { @@ -262,9 +264,10 @@ class AdjustIsolatedMarginInputTests : V4BaseTests() { """.trimIndent(), ) - test({ - perp.adjustIsolatedMargin("0.1", AdjustIsolatedMarginInputField.AmountPercent, 0) - }, + test( + { + perp.adjustIsolatedMargin("0.1", AdjustIsolatedMarginInputField.AmountPercent, 0) + }, """ { "input": { From f428ffc5a660b481d1af9ac04ee69adf6641317f Mon Sep 17 00:00:00 2001 From: jaredvu Date: Wed, 15 May 2024 10:00:26 -0700 Subject: [PATCH 04/14] remove amount.input usage --- .../model/TradingStateMachine+AdjustIsolatedMarginInput.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt index d2a05c157..ce3a8b549 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt @@ -66,9 +66,6 @@ fun TradingStateMachine.adjustIsolatedMargin( adjustIsolatedMargin.safeSet(type.name, parser.asString(data)) adjustIsolatedMargin.safeSet("Amount", null) adjustIsolatedMargin.safeSet("AmountPercent", null) - if (parser.asString(parser.value(adjustIsolatedMargin, "amount.input")) == "amount.percent") { - adjustIsolatedMargin.safeSet("amount.input", "amount.size") - } } changes = StateChanges( iListOf(Changes.wallet, Changes.subaccount, Changes.input), From 49cef102cf629a5fd98e1d8f14044fb43894fa22 Mon Sep 17 00:00:00 2001 From: jaredvu Date: Wed, 15 May 2024 11:01:16 -0700 Subject: [PATCH 05/14] shorten adjustIsolatedMargin fn --- ...gStateMachine+AdjustIsolatedMarginInput.kt | 63 +++++++++---------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt index ce3a8b549..5c213f2cd 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt @@ -6,6 +6,7 @@ import exchange.dydx.abacus.responses.ParsingError import exchange.dydx.abacus.responses.StateResponse import exchange.dydx.abacus.state.changes.Changes import exchange.dydx.abacus.state.changes.StateChanges +import exchange.dydx.abacus.utils.IList import exchange.dydx.abacus.utils.NUM_PARENT_SUBACCOUNTS import exchange.dydx.abacus.utils.mutable import exchange.dydx.abacus.utils.mutableMapOf @@ -67,11 +68,7 @@ fun TradingStateMachine.adjustIsolatedMargin( adjustIsolatedMargin.safeSet("Amount", null) adjustIsolatedMargin.safeSet("AmountPercent", null) } - changes = StateChanges( - iListOf(Changes.wallet, Changes.subaccount, Changes.input), - null, - subaccountNumbers, - ) + changes = getStateChanges(subaccountNumbers) } AdjustIsolatedMarginInputField.AmountPercent, AdjustIsolatedMarginInputField.Amount -> { @@ -89,34 +86,29 @@ fun TradingStateMachine.adjustIsolatedMargin( ) val freeCollateral = parser.asDouble(parser.value(subaccount, "freeCollateral.current")) + val amountValue = parser.asDouble(data) - if (type == AdjustIsolatedMarginInputField.Amount) { - val amount = parser.asDouble(data) - if (amount != null && freeCollateral != null) { - val amountPercent = amount / freeCollateral + if (amountValue == null) { + adjustIsolatedMargin.safeSet("Amount", null) + adjustIsolatedMargin.safeSet("AmountPercent", null) + } else if (type == AdjustIsolatedMarginInputField.Amount) { + adjustIsolatedMargin.safeSet(type.name, amountValue.toString()) + + if (freeCollateral != null) { + val amountPercent = amountValue / freeCollateral adjustIsolatedMargin.safeSet("AmountPercent", amountPercent.toString()) - adjustIsolatedMargin.safeSet(type.name, amount.toString()) - } else { - adjustIsolatedMargin.safeSet(type.name, data) - adjustIsolatedMargin.safeSet("AmountPercent", null) - } + } else adjustIsolatedMargin.safeSet("AmountPercent", null) } else if (type == AdjustIsolatedMarginInputField.AmountPercent) { - val amountPercent = parser.asDouble(data) - if (amountPercent != null && freeCollateral != null) { - val amount = amountPercent * freeCollateral + adjustIsolatedMargin.safeSet(type.name, amountValue.toString()) + + if (freeCollateral != null) { + val amount = amountValue * freeCollateral adjustIsolatedMargin.safeSet("Amount", amount.toString()) - adjustIsolatedMargin.safeSet(type.name, amountPercent.toString()) - } else { - adjustIsolatedMargin.safeSet(type.name, data) - adjustIsolatedMargin.safeSet("Amount", null) - } + } else adjustIsolatedMargin.safeSet("Amount", null) + } - changes = StateChanges( - iListOf(Changes.wallet, Changes.subaccount, Changes.input), - null, - subaccountNumbers, - ) + changes = getStateChanges(subaccountNumbers) } AdjustIsolatedMarginInputField.ChildSubaccountNumber -> { val childSubaccountNumber = parser.asInt(data) @@ -126,13 +118,8 @@ fun TradingStateMachine.adjustIsolatedMargin( } else { iListOf(parentSubaccountNumber) } - changes = StateChanges( - iListOf(Changes.wallet, Changes.subaccount, Changes.input), - null, - subaccountNumbers, - ) + changes = getStateChanges(subaccountNumbers) } - else -> {} } } else { error = cannotModify(type.name) @@ -151,6 +138,16 @@ fun TradingStateMachine.adjustIsolatedMargin( return StateResponse(state, changes, if (error != null) iListOf(error) else null) } +fun getStateChanges( + subaccountNumbers: IList, +): StateChanges { + return StateChanges( + iListOf(Changes.wallet, Changes.subaccount, Changes.input), + null, + subaccountNumbers, + ) +} + fun TradingStateMachine.validAdjustIsolatedMarginInput( adjustIsolatedMargin: Map, parentSubaccountNumber: Int?, From fd0ac76847bb112b8ac0e814c0435514ab46ca05 Mon Sep 17 00:00:00 2001 From: jaredvu Date: Wed, 15 May 2024 11:01:44 -0700 Subject: [PATCH 06/14] spotlessApply --- .../TradingStateMachine+AdjustIsolatedMarginInput.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt index 5c213f2cd..1061d965f 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt @@ -97,15 +97,18 @@ fun TradingStateMachine.adjustIsolatedMargin( if (freeCollateral != null) { val amountPercent = amountValue / freeCollateral adjustIsolatedMargin.safeSet("AmountPercent", amountPercent.toString()) - } else adjustIsolatedMargin.safeSet("AmountPercent", null) + } else { + adjustIsolatedMargin.safeSet("AmountPercent", null) + } } else if (type == AdjustIsolatedMarginInputField.AmountPercent) { adjustIsolatedMargin.safeSet(type.name, amountValue.toString()) if (freeCollateral != null) { val amount = amountValue * freeCollateral adjustIsolatedMargin.safeSet("Amount", amount.toString()) - } else adjustIsolatedMargin.safeSet("Amount", null) - + } else { + adjustIsolatedMargin.safeSet("Amount", null) + } } changes = getStateChanges(subaccountNumbers) From 4f190f0ef6adff819221a422a93e5e248fca9a9d Mon Sep 17 00:00:00 2001 From: jaredvu Date: Wed, 15 May 2024 11:34:43 -0700 Subject: [PATCH 07/14] shorten function further --- ...ngStateMachine+AdjustIsolatedMarginInput.kt | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt index 1061d965f..4a629a853 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt @@ -79,10 +79,7 @@ fun TradingStateMachine.adjustIsolatedMargin( childSubaccountNumber } val subaccount = parser.asNativeMap( - parser.value( - this.account, - "subaccounts.$subaccountNumber", - ), + parser.value(this.account, "subaccounts.$subaccountNumber"), ) val freeCollateral = parser.asDouble(parser.value(subaccount, "freeCollateral.current")) @@ -114,14 +111,13 @@ fun TradingStateMachine.adjustIsolatedMargin( changes = getStateChanges(subaccountNumbers) } AdjustIsolatedMarginInputField.ChildSubaccountNumber -> { - val childSubaccountNumber = parser.asInt(data) - adjustIsolatedMargin.safeSet(type.name, childSubaccountNumber) - val subaccountNumbers = if (childSubaccountNumber != null) { - iListOf(parentSubaccountNumber, childSubaccountNumber) - } else { - iListOf(parentSubaccountNumber) + var updatedSubaccountNumbers = iListOf(parentSubaccountNumber) + val updatedChildSubaccountNumber = parser.asInt(data) + adjustIsolatedMargin.safeSet(type.name, updatedChildSubaccountNumber) + if (updatedChildSubaccountNumber != null) { + updatedSubaccountNumbers = iListOf(parentSubaccountNumber, updatedChildSubaccountNumber) } - changes = getStateChanges(subaccountNumbers) + changes = getStateChanges(updatedSubaccountNumbers) } } } else { From 20a2fd3fc952fcecfeb0e8d7460c01be928b23e7 Mon Sep 17 00:00:00 2001 From: jaredvu Date: Wed, 15 May 2024 12:00:10 -0700 Subject: [PATCH 08/14] default type to Add --- .../model/TradingStateMachine+AdjustIsolatedMarginInput.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt index 4a629a853..2d13c9413 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt @@ -72,7 +72,7 @@ fun TradingStateMachine.adjustIsolatedMargin( } AdjustIsolatedMarginInputField.AmountPercent, AdjustIsolatedMarginInputField.Amount -> { - val isolatedMarginAdjustmentType = adjustIsolatedMargin["Type"] + val isolatedMarginAdjustmentType = adjustIsolatedMargin["Type"]?: IsolatedMarginAdjustmentType.Add.name val subaccountNumber = if (isolatedMarginAdjustmentType == IsolatedMarginAdjustmentType.Add.name) { parentSubaccountNumber } else { From 22757d947738a58c1deaa75ca1bab5a3c4815542 Mon Sep 17 00:00:00 2001 From: jaredvu Date: Wed, 15 May 2024 12:05:25 -0700 Subject: [PATCH 09/14] spotlessApply --- .../model/TradingStateMachine+AdjustIsolatedMarginInput.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt index 2d13c9413..780d26763 100644 --- a/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt +++ b/src/commonMain/kotlin/exchange.dydx.abacus/state/model/TradingStateMachine+AdjustIsolatedMarginInput.kt @@ -72,7 +72,7 @@ fun TradingStateMachine.adjustIsolatedMargin( } AdjustIsolatedMarginInputField.AmountPercent, AdjustIsolatedMarginInputField.Amount -> { - val isolatedMarginAdjustmentType = adjustIsolatedMargin["Type"]?: IsolatedMarginAdjustmentType.Add.name + val isolatedMarginAdjustmentType = adjustIsolatedMargin["Type"] ?: IsolatedMarginAdjustmentType.Add.name val subaccountNumber = if (isolatedMarginAdjustmentType == IsolatedMarginAdjustmentType.Add.name) { parentSubaccountNumber } else { From af799c296019edc540f73af6cfcd40e8613152d3 Mon Sep 17 00:00:00 2001 From: jaredvu Date: Wed, 15 May 2024 12:33:36 -0700 Subject: [PATCH 10/14] bump-version --- integration/iOS/Podfile.lock | 4 ++-- integration/iOS/Pods/Local Podspecs/abacus.podspec.json | 1 - integration/iOS/Pods/Manifest.lock | 4 ++-- integration/iOS/Pods/Pods.xcodeproj/project.pbxproj | 4 ++-- .../Target Support Files/CryptoSwift/CryptoSwift-Info.plist | 2 +- .../CryptoSwift/CryptoSwift.debug.xcconfig | 3 +-- .../CryptoSwift/CryptoSwift.release.xcconfig | 3 +-- .../Pods-abacus.ios/Pods-abacus.ios-Info.plist | 2 +- .../Pods-abacus.ios/Pods-abacus.ios-frameworks.sh | 4 ++-- .../Pods-abacus.ios/Pods-abacus.ios.debug.xcconfig | 2 +- .../Pods-abacus.ios/Pods-abacus.ios.release.xcconfig | 2 +- .../Pods-abacus.iosTests/Pods-abacus.iosTests-Info.plist | 2 +- .../Pods/Target Support Files/abacus/abacus.debug.xcconfig | 1 - .../Pods/Target Support Files/abacus/abacus.release.xcconfig | 1 - v4_abacus.podspec | 2 +- 15 files changed, 16 insertions(+), 21 deletions(-) diff --git a/integration/iOS/Podfile.lock b/integration/iOS/Podfile.lock index c6e3a06f8..a655a9906 100644 --- a/integration/iOS/Podfile.lock +++ b/integration/iOS/Podfile.lock @@ -15,9 +15,9 @@ EXTERNAL SOURCES: :path: "../.." SPEC CHECKSUMS: - abacus: 46f62be6dc9b3f888093eb2c9952d0267ab40670 + abacus: a57d55b0ca0d3514389573a87c47507f88eb6b0a CryptoSwift: 562f8eceb40e80796fffc668b0cad9313284cfa6 PODFILE CHECKSUM: b52035db7d56f0cfe37ecfb54b51338a99aca685 -COCOAPODS: 1.15.2 +COCOAPODS: 1.11.3 diff --git a/integration/iOS/Pods/Local Podspecs/abacus.podspec.json b/integration/iOS/Pods/Local Podspecs/abacus.podspec.json index 33e8c60d2..19df5e4ce 100644 --- a/integration/iOS/Pods/Local Podspecs/abacus.podspec.json +++ b/integration/iOS/Pods/Local Podspecs/abacus.podspec.json @@ -26,7 +26,6 @@ "osx": null, "ios": null, "tvos": null, - "visionos": null, "watchos": null } } diff --git a/integration/iOS/Pods/Manifest.lock b/integration/iOS/Pods/Manifest.lock index c6e3a06f8..a655a9906 100644 --- a/integration/iOS/Pods/Manifest.lock +++ b/integration/iOS/Pods/Manifest.lock @@ -15,9 +15,9 @@ EXTERNAL SOURCES: :path: "../.." SPEC CHECKSUMS: - abacus: 46f62be6dc9b3f888093eb2c9952d0267ab40670 + abacus: a57d55b0ca0d3514389573a87c47507f88eb6b0a CryptoSwift: 562f8eceb40e80796fffc668b0cad9313284cfa6 PODFILE CHECKSUM: b52035db7d56f0cfe37ecfb54b51338a99aca685 -COCOAPODS: 1.15.2 +COCOAPODS: 1.11.3 diff --git a/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj b/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj index 56d884654..37097ae5a 100644 --- a/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj +++ b/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj @@ -699,8 +699,8 @@ BFDFE7DC352907FC980B868725387E98 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1500; - LastUpgradeCheck = 1500; + LastSwiftUpdateCheck = 1300; + LastUpgradeCheck = 1300; }; buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 13.0"; diff --git a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift-Info.plist b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift-Info.plist index 2d5470eec..2f66809b3 100644 --- a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift-Info.plist +++ b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift-Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - ${PODS_DEVELOPMENT_LANGUAGE} + en CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier diff --git a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.debug.xcconfig b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.debug.xcconfig index c306fb0b0..548e99783 100644 --- a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.debug.xcconfig +++ b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.debug.xcconfig @@ -1,11 +1,10 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -LIBRARY_SEARCH_PATHS = $(inherited) "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift +LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE} PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/CryptoSwift PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates diff --git a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.release.xcconfig b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.release.xcconfig index c306fb0b0..548e99783 100644 --- a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.release.xcconfig +++ b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.release.xcconfig @@ -1,11 +1,10 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -LIBRARY_SEARCH_PATHS = $(inherited) "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift +LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE} PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/CryptoSwift PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-Info.plist b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-Info.plist index 19cf209d2..2243fe6e2 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-Info.plist +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - ${PODS_DEVELOPMENT_LANGUAGE} + en CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier 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..1f87c391a 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 @@ -18,7 +18,7 @@ echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}" -SWIFT_STDLIB_PATH="${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" BCSYMBOLMAP_DIR="BCSymbolMaps" @@ -41,7 +41,7 @@ install_framework() if [ -L "${source}" ]; then echo "Symlinked..." - source="$(readlink -f "${source}")" + source="$(readlink "${source}")" fi if [ -d "${source}/${BCSYMBOLMAP_DIR}" ]; then 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..3340eaffa 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 @@ -4,7 +4,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwi 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 +LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift OTHER_LDFLAGS = $(inherited) -l"c++" -framework "Abacus" -framework "CryptoSwift" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} 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..3340eaffa 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 @@ -4,7 +4,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwi 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 +LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift OTHER_LDFLAGS = $(inherited) -l"c++" -framework "Abacus" -framework "CryptoSwift" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests-Info.plist b/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests-Info.plist index 19cf209d2..2243fe6e2 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests-Info.plist +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests-Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - ${PODS_DEVELOPMENT_LANGUAGE} + en CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier 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..3755c4eeb 100644 --- a/integration/iOS/Pods/Target Support Files/abacus/abacus.debug.xcconfig +++ b/integration/iOS/Pods/Target Support Files/abacus/abacus.debug.xcconfig @@ -6,7 +6,6 @@ KOTLIN_PROJECT_PATH = OTHER_LDFLAGS = $(inherited) -l"c++" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE} PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../.. PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates 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..3755c4eeb 100644 --- a/integration/iOS/Pods/Target Support Files/abacus/abacus.release.xcconfig +++ b/integration/iOS/Pods/Target Support Files/abacus/abacus.release.xcconfig @@ -6,7 +6,6 @@ KOTLIN_PROJECT_PATH = OTHER_LDFLAGS = $(inherited) -l"c++" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) -PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE} PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../.. PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates diff --git a/v4_abacus.podspec b/v4_abacus.podspec index 8527e409c..ab98820c9 100644 --- a/v4_abacus.podspec +++ b/v4_abacus.podspec @@ -11,7 +11,7 @@ Pod::Spec.new do |spec| - if !Dir.exist?('build/cocoapods/framework/Abacus.framework') || Dir.empty?('build/cocoapods/framework/Abacus.framework') + if false raise " Kotlin framework 'Abacus' doesn't exist yet, so a proper Xcode project can't be generated. From c8114938b0e457236bc5cfa9ae3db7fa434c7d2c Mon Sep 17 00:00:00 2001 From: jaredvu Date: Wed, 15 May 2024 12:44:10 -0700 Subject: [PATCH 11/14] use cocoapod 1.15.2 --- integration/iOS/Podfile.lock | 4 ++-- integration/iOS/Pods/Local Podspecs/abacus.podspec.json | 1 + integration/iOS/Pods/Manifest.lock | 4 ++-- integration/iOS/Pods/Pods.xcodeproj/project.pbxproj | 4 ++-- .../Target Support Files/CryptoSwift/CryptoSwift-Info.plist | 2 +- .../CryptoSwift/CryptoSwift.debug.xcconfig | 3 ++- .../CryptoSwift/CryptoSwift.release.xcconfig | 3 ++- .../Pods-abacus.ios/Pods-abacus.ios-Info.plist | 2 +- .../Pods-abacus.ios/Pods-abacus.ios-frameworks.sh | 4 ++-- .../Pods-abacus.ios/Pods-abacus.ios.debug.xcconfig | 2 +- .../Pods-abacus.ios/Pods-abacus.ios.release.xcconfig | 2 +- .../Pods-abacus.iosTests/Pods-abacus.iosTests-Info.plist | 2 +- .../Pods/Target Support Files/abacus/abacus.debug.xcconfig | 1 + .../Pods/Target Support Files/abacus/abacus.release.xcconfig | 1 + 14 files changed, 20 insertions(+), 15 deletions(-) diff --git a/integration/iOS/Podfile.lock b/integration/iOS/Podfile.lock index a655a9906..c6e3a06f8 100644 --- a/integration/iOS/Podfile.lock +++ b/integration/iOS/Podfile.lock @@ -15,9 +15,9 @@ EXTERNAL SOURCES: :path: "../.." SPEC CHECKSUMS: - abacus: a57d55b0ca0d3514389573a87c47507f88eb6b0a + abacus: 46f62be6dc9b3f888093eb2c9952d0267ab40670 CryptoSwift: 562f8eceb40e80796fffc668b0cad9313284cfa6 PODFILE CHECKSUM: b52035db7d56f0cfe37ecfb54b51338a99aca685 -COCOAPODS: 1.11.3 +COCOAPODS: 1.15.2 diff --git a/integration/iOS/Pods/Local Podspecs/abacus.podspec.json b/integration/iOS/Pods/Local Podspecs/abacus.podspec.json index 19df5e4ce..33e8c60d2 100644 --- a/integration/iOS/Pods/Local Podspecs/abacus.podspec.json +++ b/integration/iOS/Pods/Local Podspecs/abacus.podspec.json @@ -26,6 +26,7 @@ "osx": null, "ios": null, "tvos": null, + "visionos": null, "watchos": null } } diff --git a/integration/iOS/Pods/Manifest.lock b/integration/iOS/Pods/Manifest.lock index a655a9906..c6e3a06f8 100644 --- a/integration/iOS/Pods/Manifest.lock +++ b/integration/iOS/Pods/Manifest.lock @@ -15,9 +15,9 @@ EXTERNAL SOURCES: :path: "../.." SPEC CHECKSUMS: - abacus: a57d55b0ca0d3514389573a87c47507f88eb6b0a + abacus: 46f62be6dc9b3f888093eb2c9952d0267ab40670 CryptoSwift: 562f8eceb40e80796fffc668b0cad9313284cfa6 PODFILE CHECKSUM: b52035db7d56f0cfe37ecfb54b51338a99aca685 -COCOAPODS: 1.11.3 +COCOAPODS: 1.15.2 diff --git a/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj b/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj index 37097ae5a..56d884654 100644 --- a/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj +++ b/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj @@ -699,8 +699,8 @@ BFDFE7DC352907FC980B868725387E98 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1300; - LastUpgradeCheck = 1300; + LastSwiftUpdateCheck = 1500; + LastUpgradeCheck = 1500; }; buildConfigurationList = 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 13.0"; diff --git a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift-Info.plist b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift-Info.plist index 2f66809b3..2d5470eec 100644 --- a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift-Info.plist +++ b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift-Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - en + ${PODS_DEVELOPMENT_LANGUAGE} CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier diff --git a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.debug.xcconfig b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.debug.xcconfig index 548e99783..c306fb0b0 100644 --- a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.debug.xcconfig +++ b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.debug.xcconfig @@ -1,10 +1,11 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift +LIBRARY_SEARCH_PATHS = $(inherited) "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE} PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/CryptoSwift PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates diff --git a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.release.xcconfig b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.release.xcconfig index 548e99783..c306fb0b0 100644 --- a/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.release.xcconfig +++ b/integration/iOS/Pods/Target Support Files/CryptoSwift/CryptoSwift.release.xcconfig @@ -1,10 +1,11 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -LIBRARY_SEARCH_PATHS = $(inherited) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift +LIBRARY_SEARCH_PATHS = $(inherited) "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE} PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/CryptoSwift PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-Info.plist b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-Info.plist index 2243fe6e2..19cf209d2 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-Info.plist +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - en + ${PODS_DEVELOPMENT_LANGUAGE} CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier 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 1f87c391a..91b03c4c7 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 @@ -18,7 +18,7 @@ echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}" -SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" +SWIFT_STDLIB_PATH="${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" BCSYMBOLMAP_DIR="BCSymbolMaps" @@ -41,7 +41,7 @@ install_framework() if [ -L "${source}" ]; then echo "Symlinked..." - source="$(readlink "${source}")" + source="$(readlink -f "${source}")" fi if [ -d "${source}/${BCSYMBOLMAP_DIR}" ]; then 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 3340eaffa..bb1b3d88e 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 @@ -4,7 +4,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwi 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) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift +LIBRARY_SEARCH_PATHS = $(inherited) "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift OTHER_LDFLAGS = $(inherited) -l"c++" -framework "Abacus" -framework "CryptoSwift" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} 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 3340eaffa..bb1b3d88e 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 @@ -4,7 +4,7 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwi 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) "${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift +LIBRARY_SEARCH_PATHS = $(inherited) "${TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" /usr/lib/swift OTHER_LDFLAGS = $(inherited) -l"c++" -framework "Abacus" -framework "CryptoSwift" OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests-Info.plist b/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests-Info.plist index 2243fe6e2..19cf209d2 100644 --- a/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests-Info.plist +++ b/integration/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests-Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - en + ${PODS_DEVELOPMENT_LANGUAGE} CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIdentifier 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 3755c4eeb..b7f6dcfae 100644 --- a/integration/iOS/Pods/Target Support Files/abacus/abacus.debug.xcconfig +++ b/integration/iOS/Pods/Target Support Files/abacus/abacus.debug.xcconfig @@ -6,6 +6,7 @@ KOTLIN_PROJECT_PATH = OTHER_LDFLAGS = $(inherited) -l"c++" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE} PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../.. PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates 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 3755c4eeb..b7f6dcfae 100644 --- a/integration/iOS/Pods/Target Support Files/abacus/abacus.release.xcconfig +++ b/integration/iOS/Pods/Target Support Files/abacus/abacus.release.xcconfig @@ -6,6 +6,7 @@ KOTLIN_PROJECT_PATH = OTHER_LDFLAGS = $(inherited) -l"c++" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_DEVELOPMENT_LANGUAGE = ${DEVELOPMENT_LANGUAGE} PODS_ROOT = ${SRCROOT} PODS_TARGET_SRCROOT = ${PODS_ROOT}/../../.. PODS_XCFRAMEWORKS_BUILD_DIR = $(PODS_CONFIGURATION_BUILD_DIR)/XCFrameworkIntermediates From 828d87a371d1abbde325667d766176d4bba1e44a Mon Sep 17 00:00:00 2001 From: jaredvu Date: Wed, 15 May 2024 14:17:20 -0700 Subject: [PATCH 12/14] 1.7.19 --- build.gradle.kts | 2 +- v4_abacus.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index c90a7d3bd..d89f62ead 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,7 +51,7 @@ allprojects { } group = "exchange.dydx.abacus" -version = "1.7.18" +version = "1.7.19" repositories { google() diff --git a/v4_abacus.podspec b/v4_abacus.podspec index ddd358834..8a843c550 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.7.18' + spec.version = '1.7.19' spec.homepage = 'https://github.com/dydxprotocol/v4-abacus' spec.source = { :http=> ''} spec.authors = '' From 1e210e02594de908bb325e490d38c5ca5c6ffc3a Mon Sep 17 00:00:00 2001 From: jaredvu Date: Thu, 16 May 2024 09:27:12 -0700 Subject: [PATCH 13/14] bump to 1.7.20 --- build.gradle.kts | 2 +- v4_abacus.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d89f62ead..b5c9cfab5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,7 +51,7 @@ allprojects { } group = "exchange.dydx.abacus" -version = "1.7.19" +version = "1.7.20" repositories { google() diff --git a/v4_abacus.podspec b/v4_abacus.podspec index 8a843c550..c0360d4e6 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.7.19' + spec.version = '1.7.20' spec.homepage = 'https://github.com/dydxprotocol/v4-abacus' spec.source = { :http=> ''} spec.authors = '' From f974afa5f9d7e69dacb34c38ab4a92e6a80a684f Mon Sep 17 00:00:00 2001 From: jaredvu Date: Fri, 17 May 2024 08:07:19 -0700 Subject: [PATCH 14/14] 1.7.22 --- build.gradle.kts | 2 +- v4_abacus.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 74c007148..753067110 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -51,7 +51,7 @@ allprojects { } group = "exchange.dydx.abacus" -version = "1.7.21" +version = "1.7.22" repositories { google() diff --git a/v4_abacus.podspec b/v4_abacus.podspec index cbe4baa63..f478286ef 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.7.21' + spec.version = '1.7.22' spec.homepage = 'https://github.com/dydxprotocol/v4-abacus' spec.source = { :http=> ''} spec.authors = ''