Skip to content

Commit

Permalink
remove nonce, gasPrice, gasFee, maxFeePerGas (#241)
Browse files Browse the repository at this point in the history 
* remove nonce, gasPrice, gasFee, maxFeePerGas

* Update Package.resolved

---------

Co-authored-by: Mike <[email protected]>
  • Loading branch information
@mike-dydx
mike-dydx and mike-dydx committed Oct 14, 2024
1 parent 2e1f23f commit f201a92
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 235 deletions.
2 changes: 1 addition & 1 deletion dydx/dydx.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"location" : "[email protected]:dydxprotocol/cartera-ios.git",
"state" : {
"branch" : "main",
"revision" : "6e8d86eeb6b7cacf6644f7be1604eb16cfd4477e"
"revision" : "e6b4e8679213ec3c440f23d14a9af67752f154e8"
}
},
{
Expand Down
16 changes: 7 additions & 9 deletions dydx/dydxCartera/dydxCartera/Contracts/ERC20Token.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ public struct ERC20AllowanceFunction: ContractFunction {
}

public static let name = "allowance"
public let gasPrice: BigUInt? = BigUInt(0)
public let gasLimit: BigUInt? = BigUInt(0)
public let gasPrice: BigUInt? = nil
public let gasLimit: BigUInt? = nil
public let contract: EthereumAddress
public let from: EthereumAddress?

Expand All @@ -32,18 +32,16 @@ public struct ERC20AllowanceFunction: ContractFunction {
}

public struct ERC20ApproveFunction: ContractFunction {
public init(gasPrice: BigUInt? = nil, gasLimit: BigUInt? = nil, contract: EthereumAddress, from: EthereumAddress? = nil, spender: EthereumAddress, amount: BigUInt = BigUInt("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", radix: 16)!) {
self.gasPrice = gasPrice
self.gasLimit = gasLimit
public init(contract: EthereumAddress, from: EthereumAddress? = nil, spender: EthereumAddress, amount: BigUInt = BigUInt("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", radix: 16)!) {
self.contract = contract
self.from = from
self.spender = spender
self.amount = amount
}

public static let name = "approve"
public let gasPrice: BigUInt?
public let gasLimit: BigUInt?
public let gasPrice: BigUInt? = nil
public let gasLimit: BigUInt? = nil
public let contract: EthereumAddress
public let from: EthereumAddress?

Expand All @@ -58,8 +56,8 @@ public struct ERC20ApproveFunction: ContractFunction {

public struct ERC20BalanceOfFunction: ContractFunction {
public static let name = "balanceOf"
public let gasPrice: BigUInt? = BigUInt(0)
public let gasLimit: BigUInt? = BigUInt(0)
public let gasPrice: BigUInt? = nil
public let gasLimit: BigUInt? = nil
public let contract: EthereumAddress
public let from: EthereumAddress?

Expand Down
15 changes: 0 additions & 15 deletions dydx/dydxCartera/dydxCartera/Ethereum/EthereumInteractor.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,6 @@ public final class EthereumInteractor {
}
}

public func eth_gasPrice(completion: @escaping EthereumBigUIntCompletion) {
queue.async { [weak self] in
self?.client?.eth_gasPrice { result in
DispatchQueue.main.async {
switch result {
case .success(let value):
completion(nil, value)
case .failure(let error):
completion(error, nil)
}
}
}
}
}

public func eth_blockNumber(completion: @escaping EthereumIntCompletion) {
queue.async { [weak self] in
self?.client?.eth_blockNumber { result in
Expand Down
12 changes: 0 additions & 12 deletions dydx/dydxStateManager/dydxStateManager.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@
021385BD28DBD21600A9BCA5 /* ThreadRunner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021385BC28DBD21600A9BCA5 /* ThreadRunner.swift */; };
021385BF28DBD22100A9BCA5 /* WebsocketConnection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021385BE28DBD22100A9BCA5 /* WebsocketConnection.swift */; };
021385C128DBD74700A9BCA5 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 021385C028DBD74700A9BCA5 /* Utils.swift */; };
0219D8C82AD36CD700EF31EF /* EthGetNonceStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0219D8C72AD36CD700EF31EF /* EthGetNonceStep.swift */; };
022A81042BE18C51000BF2DD /* AbacusPresentationImp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 022A81032BE18C51000BF2DD /* AbacusPresentationImp.swift */; };
022E928828EA4FD80096CDA9 /* Models+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 022E928728EA4FD80096CDA9 /* Models+Ext.swift */; };
022EDB70299EF054003D59A7 /* dydxWalletState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 022EDB6F299EF054003D59A7 /* dydxWalletState.swift */; };
023BFFD02ABBB25300D3ED5C /* ERC20AllowanceStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 023BFFCF2ABBB25300D3ED5C /* ERC20AllowanceStep.swift */; };
023BFFD72ABBBAA900D3ED5C /* EnableERC20TokenStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 023BFFD62ABBBAA900D3ED5C /* EnableERC20TokenStep.swift */; };
023BFFD92ABBC4C000D3ED5C /* ERC20ApprovalStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 023BFFD82ABBC4C000D3ED5C /* ERC20ApprovalStep.swift */; };
023BFFDB2ABBECB100D3ED5C /* EthEstimateGasStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 023BFFDA2ABBECB100D3ED5C /* EthEstimateGasStep.swift */; };
023BFFDD2ABBEEFA00D3ED5C /* EthGetGasPriceStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 023BFFDC2ABBEEFA00D3ED5C /* EthGetGasPriceStep.swift */; };
0260350929EF30EE00DFFD11 /* WalletSwitchChainStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0260350829EF30EE00DFFD11 /* WalletSwitchChainStep.swift */; };
0260351029EF3C2E00DFFD11 /* WalletSendTransactionStep.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0260350F29EF3C2E00DFFD11 /* WalletSendTransactionStep.swift */; };
02603B9129F1A95E00DFFD11 /* dydxClientState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02603B9029F1A95E00DFFD11 /* dydxClientState.swift */; };
Expand Down Expand Up @@ -131,15 +128,12 @@
021385BC28DBD21600A9BCA5 /* ThreadRunner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThreadRunner.swift; sourceTree = "<group>"; };
021385BE28DBD22100A9BCA5 /* WebsocketConnection.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WebsocketConnection.swift; sourceTree = "<group>"; };
021385C028DBD74700A9BCA5 /* Utils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
0219D8C72AD36CD700EF31EF /* EthGetNonceStep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthGetNonceStep.swift; sourceTree = "<group>"; };
022A81032BE18C51000BF2DD /* AbacusPresentationImp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AbacusPresentationImp.swift; sourceTree = "<group>"; };
022E928728EA4FD80096CDA9 /* Models+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Models+Ext.swift"; sourceTree = "<group>"; };
022EDB6F299EF054003D59A7 /* dydxWalletState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dydxWalletState.swift; sourceTree = "<group>"; };
023BFFCF2ABBB25300D3ED5C /* ERC20AllowanceStep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ERC20AllowanceStep.swift; sourceTree = "<group>"; };
023BFFD62ABBBAA900D3ED5C /* EnableERC20TokenStep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnableERC20TokenStep.swift; sourceTree = "<group>"; };
023BFFD82ABBC4C000D3ED5C /* ERC20ApprovalStep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ERC20ApprovalStep.swift; sourceTree = "<group>"; };
023BFFDA2ABBECB100D3ED5C /* EthEstimateGasStep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthEstimateGasStep.swift; sourceTree = "<group>"; };
023BFFDC2ABBEEFA00D3ED5C /* EthGetGasPriceStep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthGetGasPriceStep.swift; sourceTree = "<group>"; };
0260350829EF30EE00DFFD11 /* WalletSwitchChainStep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletSwitchChainStep.swift; sourceTree = "<group>"; };
0260350F29EF3C2E00DFFD11 /* WalletSendTransactionStep.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletSendTransactionStep.swift; sourceTree = "<group>"; };
02603B9029F1A95E00DFFD11 /* dydxClientState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dydxClientState.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -217,9 +211,6 @@
children = (
0260350829EF30EE00DFFD11 /* WalletSwitchChainStep.swift */,
0260350F29EF3C2E00DFFD11 /* WalletSendTransactionStep.swift */,
023BFFDA2ABBECB100D3ED5C /* EthEstimateGasStep.swift */,
0219D8C72AD36CD700EF31EF /* EthGetNonceStep.swift */,
023BFFDC2ABBEEFA00D3ED5C /* EthGetGasPriceStep.swift */,
023BFFCF2ABBB25300D3ED5C /* ERC20AllowanceStep.swift */,
023BFFD82ABBC4C000D3ED5C /* ERC20ApprovalStep.swift */,
);
Expand Down Expand Up @@ -649,7 +640,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0219D8C82AD36CD700EF31EF /* EthGetNonceStep.swift in Sources */,
27B957EF2B97C11400EF9304 /* dydxRatingService.swift in Sources */,
6473ACB42A65B18B00BBC01F /* AbacusRestImp.swift in Sources */,
023BFFD72ABBBAA900D3ED5C /* EnableERC20TokenStep.swift in Sources */,
Expand All @@ -665,15 +655,13 @@
6473AE412A65D3E700BBC01F /* AbacusChainImp.swift in Sources */,
02E7DD7F28CFAFF000727949 /* AbacusStateManager.swift in Sources */,
6473ACC02A65B1FD00BBC01F /* AbacusFormatterImp.swift in Sources */,
023BFFDB2ABBECB100D3ED5C /* EthEstimateGasStep.swift in Sources */,
6473ACBC2A65B1D300BBC01F /* AbacusWebSocketImp.swift in Sources */,
022A81042BE18C51000BF2DD /* AbacusPresentationImp.swift in Sources */,
023BFFD02ABBB25300D3ED5C /* ERC20AllowanceStep.swift in Sources */,
021385BD28DBD21600A9BCA5 /* ThreadRunner.swift in Sources */,
278765A42C17C529000119D2 /* Kotlin+Ext.swift in Sources */,
021385C128DBD74700A9BCA5 /* Utils.swift in Sources */,
02A8962128E65FBD006F1658 /* AbacusState+Combine.swift in Sources */,
023BFFDD2ABBEEFA00D3ED5C /* EthGetGasPriceStep.swift in Sources */,
02E7DD8C28CFB1C600727949 /* HttpCall.swift in Sources */,
027CB28E29EF02C50069781A /* DepositTransaction.swift in Sources */,
0260351029EF3C2E00DFFD11 /* WalletSendTransactionStep.swift in Sources */,
Expand Down
37 changes: 5 additions & 32 deletions dydx/dydxStateManager/dydxStateManager/Transactions/Deposit/V4/DepositTransactionV4.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,38 +61,16 @@ struct DepositTransactionV4: AsyncStep {
}
return Empty<AsyncEvent<Void, Bool>, Never>().eraseToAnyPublisher()
}
.flatMap { event -> AnyPublisher<AsyncEvent<Void, Int>, Never> in
.flatMap { event -> AnyPublisher<AsyncEvent<Void, String>, Never> in
if case let .result(enabled, error) = event {
if enabled == true {
return EthGetNonceStep(chainRpc: chainRpc,
address: EthereumAddress(walletAddress))
.run()

} else if let error = error {
return Just(AsyncEvent.result(nil, error)).eraseToAnyPublisher()
} else {
let error = NSError(domain: "", code: -1, userInfo: [NSLocalizedDescriptionKey: "Token not enabled"])
return Just(AsyncEvent.result(nil, error)).eraseToAnyPublisher()
}
}
return Empty<AsyncEvent<Void, Int>, Never>().eraseToAnyPublisher()
}
.flatMap { event -> AnyPublisher<AsyncEvent<Void, String>, Never> in
if case let .result(nonce, error) = event {
if nonce != nil {
let transaction = EthereumTransactionRequest(transaction: ethereumTransactionRequest.transaction,
gasPrice: ethereumTransactionRequest.gasPrice,
gas: ethereumTransactionRequest.gas,
nonce: nonce,
maxPriorityFeePerGas: ethereumTransactionRequest.maxPriorityFeePerGas,
maxFeePerGas: ethereumTransactionRequest.maxFeePerGas)
let transaction = EthereumTransactionRequest(transaction: ethereumTransactionRequest.transaction)
return WalletSendTransactionStep(transaction: transaction,
chainIdInt: chainIdInt,
provider: provider,
walletAddress: walletAddress,
walletId: walletId)
.run()

} else if let error = error {
return Just(AsyncEvent.result(nil, error)).eraseToAnyPublisher()
} else {
Expand Down Expand Up @@ -138,16 +116,11 @@ private extension EthereumTransactionRequest {
value: requestPayload.value?.asBigUInt,
data: data.web3.hexData,
nonce: nil,
gasPrice: requestPayload.gasPrice?.asBigUInt,
gasLimit: requestPayload.gasLimit?.asBigUInt,
gasPrice: nil,
gasLimit: nil,
chainId: chainId)

self.init(transaction: transaction,
gasPrice: requestPayload.gasPrice?.asBigUInt,
gas: requestPayload.gasLimit?.asBigUInt,
nonce: nil,
maxPriorityFeePerGas: requestPayload.maxPriorityFeePerGas?.asBigUInt,
maxFeePerGas: requestPayload.maxFeePerGas?.asBigUInt)
self.init(transaction: transaction)
}
}

Expand Down
44 changes: 9 additions & 35 deletions dydx/dydxStateManager/dydxStateManager/Transactions/SharedSteps/ERC20ApprovalStep.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,48 +41,22 @@ struct ERC20ApprovalStep: AsyncStep {
}

func run() -> AnyPublisher<AsyncEvent<ProgressType, ResultType>, Never> {
let function = ERC20ApproveFunction(gasPrice: nil,
gasLimit: nil,
contract: EthereumAddress(tokenAddress),
let function = ERC20ApproveFunction(contract: EthereumAddress(tokenAddress),
from: EthereumAddress(ethereumAddress),
spender: EthereumAddress(spenderAddress),
amount: amount)
guard let transaction = try? function.transaction() else {
return Just(AsyncEvent.result(false, nil)).eraseToAnyPublisher()
}

// Run in parallel
return Publishers.Zip3(
EthGetGasPriceStep(chainRpc: chainRpc).run(),
EthEstimateGasStep(chainRpc: chainRpc, transaction: transaction).run(),
EthGetNonceStep(chainRpc: chainRpc, address: EthereumAddress(ethereumAddress)).run()
)
.flatMap { (gasPriceEvent, estimateGasEvent, nonceEvent) -> AnyPublisher<AsyncEvent<Void, String>, Never> in
if case .result(let gasPrice, let gasPriceError) = gasPriceEvent,
case .result(let gas, let gasError) = estimateGasEvent,
case .result(let nonce, let nonceError) = nonceEvent {
if let gasPrice = gasPrice, let gas = gas, let nonce = nonce {
let ethereumTransactionRequest = EthereumTransactionRequest(transaction: transaction, gasPrice: gasPrice, gas: gas, nonce: nonce)

return WalletSendTransactionStep(transaction: ethereumTransactionRequest,
chainIdInt: chainIdInt,
provider: provider,
walletAddress: ethereumAddress,
walletId: walletId)
.run()
} else {
if let gasPriceError = gasPriceError {
return Just(AsyncEvent.result(nil, gasPriceError)).eraseToAnyPublisher()
} else if let gasError = gasError {
return Just(AsyncEvent.result(nil, gasError)).eraseToAnyPublisher()
} else if let nonceError = nonceError {
return Just(AsyncEvent.result(nil, nonceError)).eraseToAnyPublisher()
}
}
}
let error = NSError(domain: "", code: -1, userInfo: [ NSLocalizedDescriptionKey: "Invalid gas or gasPrice"])
return Just(AsyncEvent.result(nil, error)).eraseToAnyPublisher()
}
let ethereumTransactionRequest = EthereumTransactionRequest(transaction: transaction)

return WalletSendTransactionStep(transaction: ethereumTransactionRequest,
chainIdInt: chainIdInt,
provider: provider,
walletAddress: ethereumAddress,
walletId: walletId)
.run()
.flatMap { event -> AnyPublisher<AsyncEvent<Void, Bool>, Never> in
if case .result(let value, let error) = event {
if let amount = Parser.standard.asUInt256(value), amount > BigInt.zero {
Expand Down
45 changes: 0 additions & 45 deletions dydx/dydxStateManager/dydxStateManager/Transactions/SharedSteps/EthEstimateGasStep.swift
View file

This file was deleted.

42 changes: 0 additions & 42 deletions dydx/dydxStateManager/dydxStateManager/Transactions/SharedSteps/EthGetGasPriceStep.swift
View file

This file was deleted.

Loading

0 comments on commit f201a92

Please sign in to comment.