Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set route gasPrice and gasLimit to null #724

Merged
merged 1 commit into from
Oct 22, 2024
Merged

Set route gasPrice and gasLimit to null #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ allprojects {
}

group = "exchange.dydx.abacus"
version = "1.13.6"
version = "1.13.7"

repositories {
google()
Expand Down
11 changes: 1 addition & 10 deletions ...commonMain/kotlin/exchange.dydx.abacus/processor/router/skip/SkipRoutePayloadProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package exchange.dydx.abacus.processor.router.skip

import exchange.dydx.abacus.processor.base.BaseProcessor
import exchange.dydx.abacus.protocols.ParserProtocol
import exchange.dydx.abacus.utils.DEFAULT_GAS_LIMIT
import exchange.dydx.abacus.utils.DEFAULT_GAS_PRICE
import exchange.dydx.abacus.utils.JsonEncoder
import exchange.dydx.abacus.utils.safeSet
import exchange.dydx.abacus.utils.toCamelCaseKeys
Expand Down Expand Up @@ -89,10 +87,7 @@ internal class SkipRoutePayloadProcessor(parser: ParserProtocol) : BaseProcessor
): Map<String, Any> {
val txType = getTxType(payload)
val modified = transform(existing, payload, keyMap)
// squid used to provide these, but now we need to hardcode them
// for the API to work (even though they seem to have default values?): https://ethereum.org/en/developers/docs/apis/json-rpc/#eth_sendtransaction
modified.safeSet("gasPrice", DEFAULT_GAS_PRICE)
modified.safeSet("gasLimit", DEFAULT_GAS_LIMIT)

val data = modified["data"]
if (data != null && txType == TxType.EVM) {
modified.safeSet("data", "0x$data")
Expand All @@ -110,10 +105,6 @@ internal class SkipRoutePayloadProcessor(parser: ParserProtocol) : BaseProcessor
if (modified["solanaTransaction"] != null) {
modified.safeSet("data", modified["solanaTransaction"])
modified.remove("solanaTransaction")

// These are EVM specific fields and do not make sense for solana
modified.remove("gasPrice")
modified.remove("gasLimit")
}
}
return modified
Expand Down
4 changes: 0 additions & 4 deletions src/commonMain/kotlin/exchange.dydx.abacus/utils/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,5 @@ internal const val GEO_POLLING_DURATION_SECONDS = 600.0
// Autosweep Constants
internal const val MIN_USDC_AMOUNT_FOR_AUTO_SWEEP = 50000

// Gas Constants based on historical Squid responses
internal const val DEFAULT_GAS_LIMIT = 1500000
internal const val DEFAULT_GAS_PRICE = 1520000000

// Limit Close GTT duration in Days
internal const val LIMIT_CLOSE_ORDER_DEFAULT_DURATION_DAYS = 28.0
4 changes: 0 additions & 4 deletions src/commonTest/kotlin/exchange.dydx.abacus/processor/router/skip/SkipProcessorTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import exchange.dydx.abacus.tests.payloads.SkipChainsMock
import exchange.dydx.abacus.tests.payloads.SkipRouteMock
import exchange.dydx.abacus.tests.payloads.SkipTokensMock
import exchange.dydx.abacus.tests.payloads.SkipVenuesMock
import exchange.dydx.abacus.utils.DEFAULT_GAS_LIMIT
import exchange.dydx.abacus.utils.DEFAULT_GAS_PRICE
import exchange.dydx.abacus.utils.Parser
import exchange.dydx.abacus.utils.toJsonObject
import kotlinx.serialization.json.Json
Expand Down Expand Up @@ -372,8 +370,6 @@ class SkipProcessorTests {
"fromAddress" to "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
"toChainId" to "noble-1",
"toAddress" to "uusdc",
"gasPrice" to DEFAULT_GAS_PRICE,
"gasLimit" to DEFAULT_GAS_LIMIT,
),
),
),
Expand Down
12 changes: 0 additions & 12 deletions src/commonTest/kotlin/exchange.dydx.abacus/processor/router/skip/SkipRouteProcessorTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package exchange.dydx.abacus.processor.router.skip

import exchange.dydx.abacus.state.manager.StatsigConfig
import exchange.dydx.abacus.tests.payloads.SkipRouteMock
import exchange.dydx.abacus.utils.DEFAULT_GAS_LIMIT
import exchange.dydx.abacus.utils.DEFAULT_GAS_PRICE
import exchange.dydx.abacus.utils.JsonEncoder
import exchange.dydx.abacus.utils.Parser
import exchange.dydx.abacus.utils.toJsonArray
Expand Down Expand Up @@ -37,8 +35,6 @@ class SkipRouteProcessorTests {
"fromAddress" to "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
"toChainId" to "noble-1",
"toAddress" to "uusdc",
"gasPrice" to DEFAULT_GAS_PRICE,
"gasLimit" to DEFAULT_GAS_LIMIT,
),
)
assertEquals(expected, result)
Expand Down Expand Up @@ -112,8 +108,6 @@ class SkipRouteProcessorTests {
"toAddress" to "uusdc",
"data" to jsonEncoder.encode(expectedDataRaw),
"allMessages" to jsonEncoder.encode(listOf(expectedDataRaw)),
"gasPrice" to DEFAULT_GAS_PRICE,
"gasLimit" to DEFAULT_GAS_LIMIT,
),
)
assertEquals(expected, result)
Expand Down Expand Up @@ -167,8 +161,6 @@ class SkipRouteProcessorTests {
"toAddress" to "ethereum-native",
"data" to jsonEncoder.encode(expectedDataRaw),
"allMessages" to jsonEncoder.encode(listOf(expectedDataRaw)),
"gasPrice" to DEFAULT_GAS_PRICE,
"gasLimit" to DEFAULT_GAS_LIMIT,
),
)

Expand Down Expand Up @@ -246,8 +238,6 @@ class SkipRouteProcessorTests {
"toAddress" to "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
"data" to expectedData,
"allMessages" to expectedMessagesArray,
"gasPrice" to DEFAULT_GAS_PRICE,
"gasLimit" to DEFAULT_GAS_LIMIT,
),
)
assertEquals(expected, result)
Expand Down Expand Up @@ -293,8 +283,6 @@ class SkipRouteProcessorTests {
"toAddress" to "ibc/8E27BA2D5493AF5636760E354E46004562C46AB7EC0CC4C1CA14E9E20E2545B5",
"data" to jsonEncoder.encode(expectedDataRaw),
"allMessages" to jsonEncoder.encode(listOf(expectedDataRaw)),
"gasPrice" to DEFAULT_GAS_PRICE,
"gasLimit" to DEFAULT_GAS_LIMIT,
),
)
assertEquals(expected, result)
Expand Down
2 changes: 1 addition & 1 deletion v4_abacus.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'v4_abacus'
spec.version = '1.13.6'
spec.version = '1.13.7'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

since we're removing properties from state this is technically a breaking change, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it doesn't change the state exposed to the client. We only removed it from the internal state.

spec.homepage = 'https://github.com/dydxprotocol/v4-abacus'
spec.source = { :http=> ''}
spec.authors = ''
Expand Down