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

Jump to bottom

nonce related changes #272

Merged
merged 3 commits into from
Feb 20, 2023
Merged

nonce related changes #272

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a89f49e
Add method `getNonce` to EthereumKit
omurovch Feb 10, 2023
4809afa
Remove field `nonce` from `TransactionData'
omurovch Feb 10, 2023
9184e77
Remove parameter `nonce` from `L1FeeProvider.getL1Fee()'
omurovch Feb 14, 2023
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
Next Next commit
Add method getNonce to EthereumKit
  • Loading branch information
@omurovch
omurovch committed Feb 10, 2023
commit a89f49eecdc06d24d5089219ec6b7b6cda2c93d2
4 changes: 2 additions & 2 deletions ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/api/core/RpcBlockchain.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ class RpcBlockchain(
.map { transaction }
}

override fun getNonce(): Single<Long> {
return syncer.single(GetTransactionCountJsonRpc(address, DefaultBlockParameter.Pending))
override fun getNonce(defaultBlockParameter: DefaultBlockParameter): Single<Long> {
return syncer.single(GetTransactionCountJsonRpc(address, defaultBlockParameter))
}

override fun estimateGas(to: Address?, amount: BigInteger?, gasLimit: Long?, gasPrice: GasPrice, data: ByteArray?): Single<Long> {
Expand Down
5 changes: 4 additions & 1 deletion ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/EthereumKit.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,9 @@ class EthereumKit(
transactionSyncManager.sync()
}

fun getNonce(defaultBlockParameter: DefaultBlockParameter): Single<Long> {
return blockchain.getNonce(defaultBlockParameter)
}
fun getFullTransactionsFlowable(tags: List<List<String>>): Flowable<List<FullTransaction>> {
return transactionManager.getFullTransactionsFlowable(tags)
}
Expand Down Expand Up @@ -194,7 +197,7 @@ class EthereumKit(
gasLimit: Long,
nonce: Long? = null
): Single<RawTransaction> {
val nonceSingle = nonce?.let { Single.just(it) } ?: blockchain.getNonce()
val nonceSingle = nonce?.let { Single.just(it) } ?: blockchain.getNonce(DefaultBlockParameter.Pending)

return nonceSingle.flatMap { nonce ->
Single.just(RawTransaction(gasPrice, gasLimit, address, value, nonce, transactionInput))
Expand Down
2 changes: 1 addition & 1 deletion ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/core/Interfaces.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ interface IBlockchain {
val accountState: AccountState?

fun send(rawTransaction: RawTransaction, signature: Signature): Single<Transaction>
fun getNonce(): Single<Long>
fun getNonce(defaultBlockParameter: DefaultBlockParameter): Single<Long>
fun estimateGas(to: Address?, amount: BigInteger?, gasLimit: Long?, gasPrice: GasPrice, data: ByteArray?): Single<Long>
fun getTransactionReceipt(transactionHash: ByteArray): Single<RpcTransactionReceipt>
fun getTransaction(transactionHash: ByteArray): Single<RpcTransaction>
Expand Down
2 changes: 1 addition & 1 deletion ethereumkit/src/main/java/io/horizontalsystems/ethereumkit/spv/core/SpvBlockchain.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class SpvBlockchain(
}
}

override fun getNonce(): Single<Long> {
override fun getNonce(defaultBlockParameter: DefaultBlockParameter): Single<Long> {
TODO("not implemented")
}

Expand Down