Skip to content

Staking fix #1245

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

Merged
WRRicht3r merged 6 commits into from
Jan 29, 2026
Merged

Staking fix #1245

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2260ed0
Staking fix
WRRicht3r Jan 27, 2026
b15b77c
fix(runtime): wire ethereum chains & guard active era
WRRicht3r Jan 27, 2026
a387a54
fix(staking): revisit active era flow mapping
WRRicht3r Jan 27, 2026
be2238c
refactor(runtime): separate ethereum configurator branches
WRRicht3r Jan 28, 2026
43bedd2
refactor(runtime): simplify chain configurator routing
WRRicht3r Jan 28, 2026
8f0e5f0
refactor(staking): use mapNotNull for active era cache
WRRicht3r Jan 28, 2026
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
6 changes: 4 additions & 2 deletions ...impl/src/main/java/jp/co/soramitsu/staking/impl/data/network/blockhain/updaters/Common.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,18 @@ import jp.co.soramitsu.shared_utils.runtime.metadata.storage
import jp.co.soramitsu.shared_utils.runtime.metadata.storageKey
import jp.co.soramitsu.shared_utils.wsrpc.SocketService
import jp.co.soramitsu.staking.impl.data.network.blockhain.bindings.bindActiveEra
import java.math.BigInteger
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.map
import java.math.BigInteger

fun RuntimeMetadata.activeEraStorageKeyOrNull() = moduleOrNull(Modules.STAKING)?.storage("ActiveEra")?.storageKey()
fun RuntimeMetadata.stakingRoundKey() = parachainStaking().storage("Round").storageKey()

suspend fun StorageCache.observeActiveEraIndex(runtime: RuntimeSnapshot, chainId: String): Flow<BigInteger> {
return observeEntry(runtime.metadata.activeEraStorageKeyOrNull(), chainId)
.map { bindActiveEra(it.content!!, runtime) }
.map { entry ->
entry.content?.let { bindActiveEra(it, runtime) }
}
}

suspend fun BulkRetriever.fetchValuesToCache(
Expand Down
7 changes: 3 additions & 4 deletions .../jp/co/soramitsu/staking/impl/scenarios/relaychain/StakingRelayChainScenarioRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import jp.co.soramitsu.runtime.multiNetwork.ChainRegistry
import jp.co.soramitsu.runtime.multiNetwork.chain.model.Chain
import jp.co.soramitsu.runtime.multiNetwork.chain.model.ChainId
import jp.co.soramitsu.runtime.storage.source.StorageDataSource
import jp.co.soramitsu.runtime.storage.source.observeNonNull
import jp.co.soramitsu.runtime.storage.source.queryNonNull
import jp.co.soramitsu.shared_utils.extensions.fromHex
import jp.co.soramitsu.shared_utils.extensions.toHexString
Expand Down Expand Up @@ -197,11 +196,11 @@ class StakingRelayChainScenarioRepository(
}

fun observeActiveEraIndex(chainId: String): Flow<BigInteger> {
return localStorage.observeNonNull(
return localStorage.observe(
chainId = chainId,
keyBuilder = { it.metadata.activeEraStorageKeyOrNull() },
binding = { scale, runtime -> bindActiveEra(scale, runtime) }
)
binder = { scale, runtime -> scale?.let { bindActiveEra(it, runtime) } }
).filterNotNull()
}

@OptIn(ExperimentalCoroutinesApi::class)
Expand Down
23 changes: 12 additions & 11 deletions ...in/java/jp/co/soramitsu/runtime/multiNetwork/configurator/ChainEnvironmentConfigurator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,23 @@ class ChainEnvironmentConfiguratorProvider(
private val ethereumConnectionPool: EthereumConnectionPool
) {
fun provide(chain: Chain): ChainEnvironmentConfigurator {
return when (chain.ecosystem) {
Ecosystem.Substrate,
Ecosystem.EthereumBased -> SubstrateEnvironmentConfigurator(
return when {
chain.isEthereumChain -> EthereumEnvironmentConfigurator(
ethereumConnectionPool,
chainsRepository
)
chain.ecosystem == Ecosystem.Ethereum -> EthereumEnvironmentConfigurator(
ethereumConnectionPool,
chainsRepository
)
chain.ecosystem == Ecosystem.Ton -> TonEnvironmentConfigurator()
else -> SubstrateEnvironmentConfigurator(
connectionPool,
runtimeProviderPool,
runtimeSyncService,
runtimeSubscriptionPool,
chainsRepository
)

Ecosystem.Ethereum -> EthereumEnvironmentConfigurator(
ethereumConnectionPool,
chainsRepository
)

Ecosystem.Ton -> TonEnvironmentConfigurator()
}
}
}
}