From bdb4ed51c8adf203d797498e2a34e52292587299 Mon Sep 17 00:00:00 2001 From: valentunn <70131744+valentunn@users.noreply.github.com> Date: Tue, 20 Feb 2024 11:33:50 +0300 Subject: [PATCH 1/9] Update to substrate sdk 2.0 (#1396) --- Jenkinsfile | 4 - app/build.gradle | 2 +- .../nova/BlockParsingIntegrationTest.kt | 4 +- .../nova/GovernanceIntegrationTest.kt | 2 +- .../nova/MoonbaseSendIntagrationTest.kt | 12 +-- .../nova/NftUniquesIntegrationTest.kt | 8 +- .../nova/balances/BalancesIntegrationTest.kt | 8 +- .../handlers/ImportMnemonicDeepLinkHandler.kt | 4 +- build.gradle | 4 +- common/build.gradle | 2 +- .../nova/common/address/AccountId.kt | 2 +- .../common/address/AddressIconGenerator.kt | 10 +- .../address/format/EthereumAddressFormat.kt | 12 +-- .../nova/common/data/holders/RuntimeHolder.kt | 2 +- .../data/mappers/EncryptionTypeMappers.kt | 2 +- .../nova/common/data/network/AndroidLogger.kt | 2 +- .../common/data/network/rpc/BulkRetriever.kt | 10 +- .../data/network/rpc/BulkRetrieverExt.kt | 2 +- .../common/data/network/rpc/ChildState.kt | 2 +- .../rpc/SocketSingleRequestExecutor.kt | 8 +- .../data/network/runtime/binding/AccountId.kt | 2 +- .../network/runtime/binding/AccountInfo.kt | 8 +- .../data/network/runtime/binding/ActiveEra.kt | 6 +- .../network/runtime/binding/BindingHelpers.kt | 22 ++--- .../data/network/runtime/binding/Block.kt | 4 +- .../network/runtime/binding/Collections.kt | 2 +- .../data/network/runtime/binding/Constants.kt | 6 +- .../data/network/runtime/binding/Data.kt | 6 +- .../network/runtime/binding/DispatchTime.kt | 2 +- .../data/network/runtime/binding/Events.kt | 12 +-- .../network/runtime/binding/GenericCall.kt | 2 +- .../network/runtime/binding/MultiAddress.kt | 2 +- .../data/network/runtime/binding/Weight.kt | 2 +- .../runtime/calls/FeeCalculationRequest.kt | 2 +- .../runtime/calls/GetBlockHashRequest.kt | 2 +- .../network/runtime/calls/GetBlockRequest.kt | 2 +- .../runtime/calls/GetChildStateRequest.kt | 2 +- .../runtime/calls/GetFinalizedHeadRequest.kt | 2 +- .../network/runtime/calls/GetHeaderRequest.kt | 2 +- .../network/runtime/calls/GetStorageSize.kt | 2 +- .../runtime/calls/NextAccountIndexRequest.kt | 2 +- .../nova/common/data/secrets/v1/Ext.kt | 4 +- .../common/data/secrets/v1/SecretStoreV1.kt | 2 +- .../common/data/secrets/v1/SourceInternal.kt | 6 +- .../data/secrets/v2/MetaAccountSecrets.kt | 14 +-- .../common/data/secrets/v2/SecretStoreV2.kt | 10 +- .../nova/common/di/CommonApi.kt | 8 +- .../nova/common/di/modules/CommonModule.kt | 4 +- .../nova/common/di/modules/NetworkModule.kt | 8 +- .../common/mixin/impl/NetworkStateProvider.kt | 2 +- .../nova/common/utils/CryptoUtils.kt | 2 +- .../nova/common/utils/FearlessLibExt.kt | 94 +++++++++---------- .../nova/common/utils/Filters.kt | 2 +- .../nova/common/utils/Retries.kt | 4 +- .../data/secrets/v2/SecretStoreV2Test.kt | 2 +- core-api/build.gradle | 2 +- .../nova/core/model/SecuritySource.kt | 2 +- .../core/updater/SharedRequestsBuilder.kt | 2 +- core-db/build.gradle | 2 +- .../nova/core_db/dao/ExternalBalanceDao.kt | 2 +- .../nova/core_db/dao/MetaAccountDao.kt | 2 +- .../core_db/dao/StakingRewardPeriodDao.kt | 2 +- .../nova/core_db/dao/StakingTotalRewardDao.kt | 2 +- .../model/StakingDashboardItemLocal.kt | 2 +- .../core_db/model/StakingRewardPeriodLocal.kt | 2 +- .../nova/core_db/model/TotalRewardLocal.kt | 2 +- .../model/chain/account/ProxyAccountLocal.kt | 2 +- feature-account-api/build.gradle | 2 +- .../derivationPath/DerivationPathDecoder.kt | 6 +- .../ethereum/transaction/TransactionOrigin.kt | 2 +- .../data/extrinsic/ExtrinsicService.kt | 8 +- .../data/model/OnChainIdentity.kt | 2 +- .../ProxiedExtrinsicValidationSystem.kt | 4 +- .../repository/OnChainIdentityRepository.kt | 2 +- .../proxied/ProxiedAddAccountRepository.kt | 2 +- .../data/secrets/SecretStoreExt.kt | 2 +- .../data/signer/SeparateFlowSignerState.kt | 2 +- .../account/identity/IdentityProvider.kt | 2 +- .../account/identity/OneOfIdentityProvider.kt | 4 +- .../system/CompoundSystemAccountMatcher.kt | 2 +- .../system/PrefixSystemAccountMatcher.kt | 2 +- .../account/system/SystemAccountMatcher.kt | 2 +- .../domain/interfaces/AccountInteractor.kt | 2 +- .../domain/interfaces/AccountRepository.kt | 4 +- .../domain/interfaces/AccountRepositoryExt.kt | 4 +- .../domain/model/Account.kt | 2 +- .../domain/model/MetaAccount.kt | 10 +- .../validation/NotSelfAccountValidation.kt | 2 +- .../SystemAccountRecipientValidation.kt | 2 +- .../account/AddressDisplayUseCase.kt | 2 +- .../account/icon/AddressIconGeneratorExt.kt | 2 +- .../presenatation/actions/ExternalActions.kt | 2 +- .../addressInput/inputSpec/EVMSpecProvider.kt | 6 +- .../inputSpec/SubstrateSpecProvider.kt | 2 +- .../sign/SignInterScreenCommunicator.kt | 2 +- .../sign/SignatureWrapperParcel.kt | 2 +- feature-account-impl/build.gradle | 2 +- .../transaction/RealEvmTransactionService.kt | 4 +- .../data/extrinsic/RealExtrinsicService.kt | 8 +- .../blockchain/AccountSubstrateSourceImpl.kt | 8 +- .../network/blockchain/bindings/Identity.kt | 4 +- .../data/repository/AccountRepositoryImpl.kt | 8 +- .../RealOnChainIdentityRepository.kt | 10 +- .../ParitySignerAddAccountRepository.kt | 2 +- .../secrets/JsonAddAccountRepository.kt | 4 +- .../WatchOnlyAddAccountRepository.kt | 2 +- .../datasource/AccountDataSource.kt | 4 +- .../datasource/AccountDataSourceImpl.kt | 8 +- .../migration/AccountDataMigration.kt | 6 +- .../data/secrets/AccountSecretsFactory.kt | 24 ++--- .../data/signer/DefaultFeeSigner.kt | 22 ++--- .../data/signer/LeafSigner.kt | 4 +- .../data/signer/SeparateFlowSigner.kt | 4 +- .../data/signer/ledger/LedgerSigner.kt | 4 +- .../paritySigner/PolkadotVaultSigner.kt | 8 +- .../paritySigner/transaction/Encoder.kt | 12 +-- .../data/signer/proxy/ProxiedFeeSigner.kt | 10 +- .../data/signer/proxy/ProxiedSigner.kt | 10 +- .../signer/proxy/ProxyCallFilterFactory.kt | 2 +- .../signer/proxy/SignerPayloadModifierExt.kt | 18 ++-- .../proxy/callFilter/AnyOfCallFilter.kt | 2 +- .../signer/proxy/callFilter/CallFilter.kt | 2 +- .../proxy/callFilter/EverythingFilter.kt | 2 +- .../proxy/callFilter/WhiteListFilter.kt | 2 +- .../data/signer/secrets/SecretsSigner.kt | 14 +-- .../data/signer/watchOnly/WatchOnlySigner.kt | 8 +- .../di/AccountFeatureDependencies.kt | 2 +- .../di/AccountFeatureModule.kt | 8 +- .../di/AddAccountsModule.kt | 2 +- .../domain/AccountInteractorImpl.kt | 2 +- .../valiadtion/DerivationPathValidation.kt | 6 +- .../domain/account/details/AccountInChain.kt | 2 +- .../mnemonic/ExportMnemonicInteractor.kt | 4 +- .../export/seed/ExportSeedInteractor.kt | 2 +- .../account/identity/LocalIdentityProvider.kt | 2 +- .../identity/OnChainIdentityProvider.kt | 2 +- .../FinishImportParitySignerInteractor.kt | 2 +- .../preview/ParitySignerAccountInChain.kt | 2 +- .../scan/ScanImportParitySignerInteractor.kt | 8 +- .../scan/ScanSignParitySignerInteractor.kt | 12 +-- .../show/ShowSignParitySignerInteractor.kt | 2 +- .../create/CreateWatchWalletInteractor.kt | 2 +- .../account/wallet/WalletUiUseCaseImpl.kt | 2 +- .../common/mnemonic/MnemonicExt.kt | 2 +- .../importing/ImportAccountViewModel.kt | 4 +- .../source/source/JsonImportSource.kt | 2 +- .../source/source/MnemonicImportSource.kt | 2 +- .../confirm/ConfirmMnemonicViewModel.kt | 4 +- .../scan/ScanSignParitySignerViewModel.kt | 2 +- .../show/ShowSignParitySignerViewModel.kt | 4 +- feature-assets/build.gradle | 2 +- .../TransactionHistoryRepository.kt | 2 +- .../di/AssetsFeatureDependencies.kt | 6 +- .../assets/search/AssetSearchInteractor.kt | 2 +- .../domain/send/SendInteractor.kt | 2 +- feature-buy-api/build.gradle | 2 +- .../domain/providers/MercuryoProvider.kt | 2 +- feature-crowdloan-api/build.gradle | 2 +- .../blockhain/binding/DirectContribution.kt | 4 +- .../network/blockhain/binding/FundInfo.kt | 8 +- .../data/network/blockhain/binding/Leases.kt | 2 +- .../ExternalContributionSource.kt | 2 +- feature-crowdloan-impl/build.gradle | 2 +- .../data/network/api/acala/AcalaApi.kt | 2 +- .../data/network/api/parallel/ParallelApi.kt | 2 +- .../extrinsic/ExtrinsicBuilderExt.kt | 2 +- .../repository/CrowdloanRepositoryImpl.kt | 6 +- .../source/LiquidAcalaContributionSource.kt | 2 +- .../source/ParallelContributionSource.kt | 2 +- .../CrowdloanContributeInteractor.kt | 2 +- .../custom/acala/AcalaContributeInteractor.kt | 6 +- .../custom/astar/AstarContributeInteractor.kt | 2 +- .../bifrost/BifrostContributeInteractor.kt | 2 +- .../moonbeam/MoonbeamCrowdloanInteractor.kt | 10 +- .../MoonbeamPrivateSignatureProvider.kt | 8 +- .../RealContributionsRepository.kt | 8 +- .../domain/main/CrowdloanInteractor.kt | 2 +- .../custom/CustomContributeSubmitter.kt | 2 +- .../acala/bonus/AcalaContributeSubmitter.kt | 2 +- .../custom/astar/AstarContributeSubmitter.kt | 2 +- .../bifrost/BifrostContributeSubmitter.kt | 2 +- .../moonbeam/MoonbeamCrowdloanSubmitter.kt | 2 +- feature-currency-api/build.gradle | 2 +- .../PolkadotJsExtensionInteractor.kt | 2 +- .../metamask/states/DefaultMetamaskState.kt | 4 +- .../web3/polkadotJs/model/InjectedAccount.kt | 2 +- .../data/evmApi/EvmApi.kt | 8 +- .../domain/sign/evm/EvmSignInteractor.kt | 8 +- .../sign/evm/RealEvmTypedMessageParser.kt | 2 +- .../sign/polkadot/DAppParsedExtrinsic.kt | 4 +- .../PolkadotExternalSignInteractor.kt | 26 ++--- feature-governance-api/build.gradle | 2 +- .../network/blockhain/model/Delegation.kt | 2 +- .../blockhain/model/OnChainReferendum.kt | 4 +- .../blockhain/model/OnChainReferendumExt.kt | 4 +- .../data/network/blockhain/model/PreImage.kt | 2 +- .../blockhain/model/ReferendumVoter.kt | 2 +- .../blockhain/model/TreasuryProposal.kt | 2 +- .../data/network/blockhain/model/Voting.kt | 4 +- .../model/delegation/DelegateDetailedStats.kt | 2 +- .../model/delegation/DelegateMetadata.kt | 2 +- .../model/delegation/DelegateStats.kt | 2 +- .../network/offchain/model/vote/UserVote.kt | 2 +- .../repository/ConvictionVotingRepository.kt | 4 +- .../data/repository/DelegationsRepository.kt | 2 +- .../data/repository/PreimageRepository.kt | 2 +- .../data/source/GovernanceSource.kt | 2 +- .../domain/delegation/delegate/Delegate.kt | 2 +- .../DelegateDelegatorsInteractor.kt | 2 +- .../delegate/delegators/model/Delegator.kt | 2 +- .../delegate/details/model/DelegateDetails.kt | 2 +- .../model/DelegateDetailsInteractor.kt | 2 +- .../delegate/label/DelegateLabel.kt | 2 +- .../delegate/label/DelegateLabelUseCase.kt | 2 +- .../delegate/list/model/DelegatePreview.kt | 2 +- .../chooseTrack/ChooseTrackInteractor.kt | 2 +- .../NewDelegationChooseAmountInteractor.kt | 2 +- .../locks/RealClaimScheduleCalculator.kt | 2 +- .../domain/locks/reusable/LocksChange.kt | 2 +- .../domain/referendum/common/Proposer.kt | 2 +- .../referendum/details/ReferendumCall.kt | 2 +- .../details/ReferendumDetailsInteractor.kt | 2 +- .../list/ReferendaListInteractor.kt | 2 +- .../referendum/list/ReferendumProposal.kt | 2 +- .../domain/referendum/list/ReferendumVote.kt | 2 +- .../domain/referendum/voters/GenericVoter.kt | 2 +- .../referendum/voters/ReferendumVoter.kt | 2 +- feature-governance-impl/build.gradle | 2 +- .../extrinsic/ExtrinsicBuilderExt.kt | 10 +- .../data/repository/RealTreasuryRepository.kt | 2 +- .../UnsupportedDelegationsRepository.kt | 2 +- .../data/repository/common/Bindings.kt | 10 +- .../data/repository/common/Queries.kt | 2 +- .../v1/GovV1ConvictionVotingRepository.kt | 6 +- .../v1/GovV1OnChainReferendaRepository.kt | 18 ++-- .../repository/v1/GovV1PreImageRepository.kt | 8 +- .../v2/Gov2DelegationsRepository.kt | 2 +- .../repository/v2/Gov2PreImageRepository.kt | 18 ++-- .../v2/GovV2ConvictionVotingRepository.kt | 6 +- .../v2/GovV2OnChainReferendaRepository.kt | 20 ++-- .../repository/DelegateCommonRepository.kt | 2 +- .../RealDelegateDelegatorsInteractor.kt | 2 +- .../details/RealDelegateDetailsInteractor.kt | 2 +- .../label/RealDelegateLabelUseCase.kt | 2 +- .../search/RealDelegateSearchInteractor.kt | 2 +- ...RealNewDelegationChooseAmountInteractor.kt | 2 +- ...ChooseDelegationAmountValidationPayload.kt | 2 +- .../chooseTrack/RealChooseTrackInteractor.kt | 2 +- .../RealRemoveTrackVotesInteractor.kt | 4 +- .../ReferendumProposerIdentityProvider.kt | 2 +- .../RealReferendumDetailsInteractor.kt | 2 +- .../details/call/ReferendumPreImageParser.kt | 4 +- .../details/call/batch/BatchAdapter.kt | 2 +- .../TreasuryApproveProposalAdapter.kt | 2 +- .../call/treasury/TreasurySpendAdapter.kt | 2 +- .../list/RealReferendaListInteractor.kt | 4 +- .../repository/ReferendaCommonRepository.kt | 4 +- .../unlock/GovernanceUnlockInteractor.kt | 6 +- .../vote/RealVoteReferendumInteractor.kt | 2 +- .../delegate/common/DelegateMappers.kt | 2 +- .../common/model/DelegateListModel.kt | 2 +- .../delegators/DelegateDelegatorsPayload.kt | 2 +- .../detail/main/DelegateDetailsPayload.kt | 2 +- .../votedReferenda/VotedReferendaPayload.kt | 2 +- .../NewDelegationChooseAmountPayload.kt | 2 +- .../NewDelegationChooseTracksPayload.kt | 2 +- .../confirm/NewDelegationConfirmPayload.kt | 2 +- .../RevokeDelegationChooseTracksPayload.kt | 2 +- .../confirm/RevokeDelegationConfirmPayload.kt | 2 +- .../referenda/common/ReferendumFormatter.kt | 2 +- .../full/ReferendumFullDetailsPayload.kt | 2 +- .../full/ReferendumFullDetailsViewModel.kt | 2 +- .../domain/locks/ClaimScheduleTestBuilder.kt | 2 +- feature-ledger-api/build.gradle | 2 +- .../substrate/LedgerSubstrateAccount.kt | 2 +- .../substrate/SubstrateLedgerApplication.kt | 4 +- feature-ledger-impl/build.gradle | 2 +- .../account/sign/SignLedgerInteractor.kt | 8 +- ...ectLedgerAddressInterScreenCommunicator.kt | 2 +- .../account/sign/SignLedgerViewModel.kt | 2 +- .../substrate/LedgerDerivationPathEncoder.kt | 2 +- .../RealSubstrateLedgerApplication.kt | 14 +-- .../sdk/connection/ble/LedgerBleManager.kt | 2 +- .../sdk/transport/ChunkedLedgerTransport.kt | 2 +- feature-nft-api/build.gradle | 2 +- .../nova/feature_nft_api/data/model/Nft.kt | 2 +- .../feature_nft_api/data/model/NftDetails.kt | 2 +- feature-nft-impl/build.gradle | 2 +- .../providers/uniques/UniquesNftProvider.kt | 6 +- .../nft/details/NftDetailsViewModel.kt | 2 +- feature-proxy-api/build.gradle | 2 +- .../data/calls/ExtrinsicBuilderExt.kt | 10 +- .../common/NestedProxiesGraphConstructor.kt | 2 +- .../data/repository/GetProxyRepository.kt | 2 +- .../MaximumProxiesNotReachedValidation.kt | 2 +- .../ProxyIsNotDuplicationForAccount.kt | 2 +- .../data/repository/RealGetProxyRepository.kt | 6 +- feature-settings-impl/build.gradle | 2 +- feature-staking-api/build.gradle | 2 +- .../pool/PoolAccountDerivation.kt | 2 +- .../turing/repository/TuringAutomationTask.kt | 2 +- .../TuringAutomationTasksRepository.kt | 2 +- .../domain/api/StakingRepository.kt | 2 +- .../domain/model/Nominations.kt | 2 +- .../domain/model/RewardDestination.kt | 2 +- .../domain/model/StakingLedger.kt | 2 +- .../domain/model/parachain/DelegatorState.kt | 4 +- .../domain/model/relaychain/StakingState.kt | 2 +- .../display/PoolDisplayModel.kt | 2 +- feature-staking-impl/build.gradle | 2 +- .../network/stats/api/StakingStatsRequest.kt | 2 +- .../StakingDashboardNominationPoolsUpdater.kt | 2 +- ...StakingDashboardParachainStakingUpdater.kt | 4 +- .../StakingDashboardRelayStakingUpdater.kt | 2 +- .../data/mappers/SetupStaking.kt | 2 +- .../network/blockhain/api/BabeRuntimeApi.kt | 4 +- .../blockhain/api/SessionRuntimeApi.kt | 4 +- .../blockhain/api/StakingRuntimeApi.kt | 6 +- .../network/blockhain/bindings/Constants.kt | 4 +- .../data/network/blockhain/bindings/Era.kt | 4 +- .../blockhain/bindings/EraRewardPoints.kt | 2 +- .../network/blockhain/bindings/Exposure.kt | 2 +- .../blockhain/bindings/HistoryDepth.kt | 2 +- .../network/blockhain/bindings/Nominations.kt | 10 +- .../network/blockhain/bindings/Primitive.kt | 4 +- .../blockhain/bindings/RewardDestination.kt | 10 +- .../blockhain/bindings/SlashingSpans.kt | 6 +- .../blockhain/bindings/StakingLedger.kt | 8 +- .../bindings/StakingMinMaxStorages.kt | 4 +- .../blockhain/calls/ExtrinsicBuilderExt.kt | 6 +- .../updaters/AccountNominationsUpdater.kt | 6 +- .../AccountRewardDestinationUpdater.kt | 6 +- .../updaters/AccountValidatorPrefsUpdater.kt | 6 +- .../blockhain/updaters/ActiveEraUpdater.kt | 6 +- .../blockhain/updaters/BagListNodeUpdater.kt | 6 +- .../data/network/blockhain/updaters/Common.kt | 8 +- .../updaters/CounterForListNodesUpdater.kt | 6 +- .../updaters/CounterForNominatorsUpdater.kt | 6 +- .../blockhain/updaters/CurrentEraUpdater.kt | 6 +- .../blockhain/updaters/HistoryDepthUpdater.kt | 6 +- .../updaters/MaxNominatorsUpdater.kt | 6 +- .../blockhain/updaters/MinBondUpdater.kt | 6 +- .../blockhain/updaters/ParachainsUpdater.kt | 6 +- .../blockhain/updaters/ProxiesUpdater.kt | 6 +- .../updaters/StakingLedgerUpdater.kt | 18 ++-- .../updaters/ValidatorExposureUpdater.kt | 8 +- .../AccountControllerBalanceUpdater.kt | 4 +- .../HistoricalTotalValidatorRewardUpdater.kt | 6 +- .../historical/HistoricalUpdateMediator.kt | 2 +- .../HistoricalValidatorRewardPointsUpdater.kt | 6 +- .../session/CurrentSessionIndexUpdater.kt | 6 +- .../ElectionsSessionParameterUpdater.kt | 2 +- .../session/EraStartSessionIndexUpdater.kt | 6 +- .../subquery/SubQueryValidatorSetFetcher.kt | 2 +- .../api/NominationPoolsRuntimeApi.kt | 6 +- .../blockhain/calls/ExtrinsicBuilderExt.kt | 8 +- .../network/blockhain/models/PoolMember.kt | 2 +- .../updater/CounterForPoolMembersUpdater.kt | 6 +- .../blockhain/updater/LastPoolIdUpdater.kt | 6 +- .../updater/MaxPoolMembersPerPoolUpdater.kt | 6 +- .../updater/MaxPoolMembersUpdater.kt | 6 +- .../blockhain/updater/MinJoinBondUpdater.kt | 6 +- .../blockhain/updater/PoolMetadataUpdater.kt | 6 +- .../blockhain/updater/SubPoolsUpdater.kt | 6 +- .../pool/PoolAccountDerivation.kt | 4 +- .../NominationPoolMembersRepository.kt | 2 +- .../NominationPoolStateRepository.kt | 2 +- .../network/bindings/DelegationRequest.kt | 4 +- .../network/bindings/DelegatorState.kt | 4 +- .../network/bindings/ParachainBondConfig.kt | 2 +- .../updaters/CollatorCommissionUpdater.kt | 6 +- .../updaters/CurrentRoundCollatorsUpdater.kt | 8 +- .../blockhain/updaters/CurrentRoundUpdater.kt | 6 +- .../updaters/DelegatorStateUpdater.kt | 6 +- .../updaters/InflationConfigUpdater.kt | 6 +- .../updaters/ParachainBondInfoUpdater.kt | 6 +- .../ScheduledDelegationRequestsUpdater.kt | 4 +- .../updaters/TotalDelegatedUpdater.kt | 6 +- .../turing/TuringAdditionalIssuanceUpdater.kt | 6 +- .../turing/TuringAutomationTasksUpdater.kt | 4 +- .../network/calls/ExtrinsicBuilderExt.kt | 4 +- .../repository/CandidatesRepository.kt | 6 +- .../repository/CurrentRoundRepository.kt | 6 +- .../repository/DelegatorStateRepository.kt | 8 +- .../repository/RewardsRepository.kt | 2 +- .../network/rpc/TuringAutomationRpcApi.kt | 12 +-- .../TuringAutomationTasksRepository.kt | 8 +- .../TuringStakingRewardsRepository.kt | 2 +- .../data/repository/BagListRepository.kt | 4 +- .../data/repository/Common.kt | 10 +- .../data/repository/ParasRepository.kt | 2 +- .../data/repository/PayoutRepository.kt | 12 +-- .../repository/StakingPeriodRepository.kt | 2 +- .../data/repository/StakingRepositoryImpl.kt | 12 +-- .../repository/StakingRewardsRepository.kt | 2 +- .../repository/StakingVersioningRepository.kt | 2 +- .../data/repository/consensus/AuraSession.kt | 2 +- .../data/repository/consensus/BabeSession.kt | 2 +- .../StakingRewardPeriodDataSource.kt | 2 +- .../reward/BaseStakingRewardsDataSource.kt | 2 +- .../reward/DirectStakingRewardsDataSource.kt | 2 +- .../reward/PoolStakingRewardsDataSource.kt | 2 +- .../reward/StakingRewardsDataSource.kt | 2 +- .../domain/StakingInteractor.kt | 2 +- .../domain/StakingInteractorExt.kt | 2 +- .../domain/alerts/AlertsInteractor.kt | 4 +- .../domain/era/StakingEraInteractorFactory.kt | 2 +- .../domain/model/BagListNode.kt | 2 +- .../validations/NotUnstakingAllValidation.kt | 2 +- .../NominationPoolsClaimRewardsInteractor.kt | 2 +- .../common/NominationPoolSharedComputation.kt | 2 +- .../common/poolState/PoolState.kt | 4 +- .../PoolAvailableBalanceValidation.kt | 2 +- .../alerts/NominationPoolsAlertsInteractor.kt | 4 +- .../NominationPoolStakeSummaryInteractor.kt | 2 +- .../NomnationPoolsUserRewardsInteractor.kt | 2 +- .../NominationPoolYourPoolInteractor.kt | 2 +- .../nominationPools/model/NominationPool.kt | 2 +- .../nominationPools/model/PoolDisplay.kt | 2 +- .../redeem/NominationPoolsRedeemInteractor.kt | 2 +- .../current/CurrentCollatorInteractor.kt | 2 +- .../common/CollatorProvider.kt | 6 +- .../common/CollatorsUseCase.kt | 4 +- .../common/DelegationState.kt | 4 +- .../parachainStaking/common/model/Collator.kt | 2 +- .../main/ParachainNetworkInfoInteractor.kt | 2 +- .../ParachainStakingUnbondingsInteractor.kt | 2 +- .../ParachainStakingRebondInteractor.kt | 2 +- .../ParachainStakingRedeemInteractor.kt | 4 +- .../ParachainStakingRewardCalculator.kt | 4 +- .../start/StartParachainStakingInteractor.kt | 8 +- .../MinimumDelegationValidation.kt | 2 +- .../validations/NoPendingRevokeValidation.kt | 2 +- .../ParachainStakingUnbondInteractor.kt | 4 +- ...gDelegationRequestsToCollatorValidation.kt | 2 +- .../flow/RemainingUnbondValidation.kt | 2 +- .../yieldBoost/YieldBoostInteractor.kt | 6 +- .../yieldBoost/YieldBoostTask.kt | 2 +- .../domain/payout/PayoutInteractor.kt | 2 +- .../RecommendationSettingsProvider.kt | 2 +- .../settings/filters/HasIdentityFilter.kt | 2 +- .../RemoveClusteringPostprocessor.kt | 2 +- .../setup/ChangeValidatorsInteractor.kt | 4 +- .../proxy/AddStakingProxyInteractor.kt | 2 +- .../proxy/RealAddStakingProxyInteractor.kt | 2 +- .../list/RealStakingProxyListInteractor.kt | 2 +- .../proxy/list/model/StakingProxyAccount.kt | 2 +- .../remove/RemoveStakingProxyInteractor.kt | 2 +- .../common/StartMultiStakingInteractor.kt | 2 +- .../selection/StartMultiStakingSelection.kt | 2 +- .../direct/DirectStakingSelection.kt | 4 +- .../pools/NominationPoolSelection.kt | 2 +- .../domain/staking/unbond/UnbondInteractor.kt | 2 +- .../add/AddStakingProxyValidationPayload.kt | 2 +- .../RemoveStakingProxyValidationPayload.kt | 2 +- .../domain/validators/ValidatorProvider.kt | 2 +- .../current/CurrentValidatorsInteractor.kt | 2 +- .../RewardDestinationProvider.kt | 2 +- .../presentation/dashboard/common/Mappers.kt | 2 +- .../presentation/mappers/Validator.kt | 2 +- .../common/display/RealPoolDisplayUseCase.kt | 2 +- .../common/collators/AddressIcon.kt | 2 +- .../common/mappers/Collator.kt | 2 +- .../common/selectCollators/Mappers.kt | 2 +- .../model/ParachainStakingRebondPayload.kt | 2 +- .../ConfirmStartParachainStakingViewModel.kt | 2 +- .../setup/StartParachainStakingViewModel.kt | 2 +- .../ParachainStakingRewardsComponent.kt | 2 +- .../ParachainStakingUnbondConfirmViewModel.kt | 2 +- .../setup/ParachainStakingUnbondViewModel.kt | 2 +- .../setup/SetupYieldBoostViewModel.kt | 2 +- .../payouts/model/PendingPayoutParcelable.kt | 2 +- .../ConfirmAddStakingProxyViewModel.kt | 2 +- .../proxy/add/set/AddStakingProxyViewModel.kt | 2 +- .../ConfirmRemoveStakingProxyViewModel.kt | 2 +- .../NominationPoolUserRewardsComponent.kt | 2 +- .../components/yourPool/YourPoolComponent.kt | 2 +- .../landing/StartStakingLandingViewModel.kt | 2 +- .../current/CurrentValidatorsViewModel.kt | 2 +- feature-swap-api/build.gradle | 2 +- feature-swap-impl/build.gradle | 2 +- .../assetConversion/AssetConversionApi.kt | 4 +- .../AssetConversionExchange.kt | 10 +- .../assetExchange/hydraDx/HydraDxExchange.kt | 6 +- .../hydraDx/HydraDxSwapSource.kt | 6 +- .../hydraDx/MultiTransactionPaymentApi.kt | 6 +- .../hydraDx/omnipool/DynamicFeesApi.kt | 4 +- .../hydraDx/omnipool/OmniPoolSwapSource.kt | 6 +- .../hydraDx/omnipool/OmnipoolApi.kt | 4 +- .../hydraDx/omnipool/model/DynamicFee.kt | 4 +- .../hydraDx/referrals/ReferralsApi.kt | 6 +- .../hydraDx/stableswap/AssetRegistryApi.kt | 4 +- .../hydraDx/stableswap/StableSwapApi.kt | 4 +- .../hydraDx/stableswap/StableSwapSource.kt | 10 +- .../hydraDx/stableswap/TokensApi.kt | 6 +- .../SwapSmallRemainingBalanceValidation.kt | 2 +- feature-wallet-api/build.gradle | 2 +- .../data/cache/AssetCache.kt | 2 +- .../data/cache/AssetCacheExt.kt | 4 +- .../network/blockhain/ExtrinsicBuilderExt.kt | 6 +- .../blockhain/assets/balances/AssetBalance.kt | 2 +- .../blockhain/assets/history/AssetHistory.kt | 2 +- .../history/realtime/RealtimeHistoryUpdate.kt | 2 +- .../assets/tranfers/AssetTransfers.kt | 2 +- .../assets/txPayment/SubstrateTxPayment.kt | 2 +- .../domain/interfaces/WalletRepository.kt | 2 +- .../domain/updater/AccountInfoUpdater.kt | 8 +- .../ProxyHaveEnoughFeeValidation.kt | 4 +- .../presentation/mixin/fee/FeeParcelModel.kt | 2 +- .../CompoundWalletConnectRequestFactory.kt | 2 +- feature-wallet-impl/build.gradle | 2 +- .../blockchain/SubstrateRemoteSource.kt | 2 +- .../network/blockchain/WssSubstrateSource.kt | 6 +- .../assets/RealHydraDxAssetIdConverter.kt | 2 +- .../balances/UnsupportedAssetBalance.kt | 2 +- .../equilibrium/EquilibriumAssetBalance.kt | 12 +-- .../balances/evmErc20/EvmErc20AssetBalance.kt | 6 +- .../evmNative/EvmNativeAssetBalance.kt | 2 +- .../assets/balances/orml/OrmlAssetBalance.kt | 8 +- .../balances/orml/OrmlBalanceBinding.kt | 6 +- .../statemine/StatemineAssetBalance.kt | 6 +- .../balances/statemine/StatemineAssets.kt | 2 +- .../balances/utility/NativeAssetBalance.kt | 6 +- .../blockchain/assets/common/Statemine.kt | 4 +- .../assets/history/EvmAssetHistory.kt | 2 +- .../assets/history/SubstrateAssetHistory.kt | 2 +- .../assets/history/UnsupportedAssetHistory.kt | 2 +- .../equilibrium/EquilibriumAssetHistory.kt | 6 +- .../history/evmErc20/EvmErc20AssetHistory.kt | 2 +- .../evmNative/EvmNativeAssetHistory.kt | 2 +- .../assets/history/orml/OrmlAssetHistory.kt | 8 +- .../substrate/AssetConversionSwapExtractor.kt | 2 +- .../history/realtime/substrate/Common.kt | 2 +- .../hydraDx/BaseHydraDxSwapExtractor.kt | 2 +- .../hydraDx/HydraDxOmniPoolSwapExtractor.kt | 2 +- .../hydraDx/HydraDxRouterSwapExtractor.kt | 2 +- .../statemine/StatemineAssetHistory.kt | 8 +- .../history/utility/NativeAssetHistory.kt | 6 +- .../assets/transfers/BaseAssetTransfers.kt | 6 +- .../equilibrium/EquilibriumAssetTransfers.kt | 12 +-- .../transfers/orml/OrmlAssetTransfers.kt | 6 +- .../statemine/StatemineAssetTransfers.kt | 8 +- .../transfers/utility/NativeAssetTransfers.kt | 10 +- .../balance/FullSyncPaymentUpdater.kt | 2 +- .../balance/LightSyncPaymentUpdater.kt | 8 +- .../network/crosschain/ExtrinsicBuilderExt.kt | 16 ++-- .../network/crosschain/PalletXcmRepository.kt | 12 +-- .../crosschain/RealCrossChainTransactor.kt | 2 +- .../crosschain/RealCrossChainWeigher.kt | 8 +- .../subquery/SubqueryNetworkPathExtensions.kt | 13 --- .../data/repository/WalletRepositoryImpl.kt | 6 +- .../data/storage/TransferCursorStorage.kt | 4 +- .../di/WalletFeatureDependencies.kt | 6 +- .../data/network/integration/Common.kt | 2 +- runtime/build.gradle | 2 +- .../nova/runtime/call/RuntimeCallsApi.kt | 18 ++-- .../nova/runtime/di/ChainRegistryModule.kt | 2 +- .../nova/runtime/di/RuntimeDependencies.kt | 2 +- .../ethereum/BalancingHttpWeb3jService.kt | 2 +- .../ethereum/SocketServiceAsyncAdapter.kt | 10 +- .../ethereum/StorageSharedRequestsBuilder.kt | 8 +- .../nova/runtime/ethereum/Web3Api.kt | 4 +- .../runtime/ethereum/WebSocketWeb3jService.kt | 6 +- .../ethereum/contract/erc20/Erc20Contract.kt | 2 +- .../contract/erc20/Erc20Transactions.kt | 2 +- .../RealEthereumSubscriptionBuilder.kt | 6 +- .../builder/EvmTransactionBuilder.kt | 2 +- .../builder/RealEvmTransactionBuilder.kt | 2 +- .../nova/runtime/ext/ChainExt.kt | 30 +++--- .../extrinsic/CustomSignedExtensions.kt | 8 +- .../runtime/extrinsic/ExtrinsicBuilderExt.kt | 2 +- .../extrinsic/ExtrinsicBuilderFactory.kt | 12 +-- .../runtime/extrinsic/ExtrinsicSerializers.kt | 6 +- .../nova/runtime/extrinsic/ExtrinsicStatus.kt | 2 +- .../extrinsic/ExtrinsicValidityUseCase.kt | 2 +- .../runtime/extrinsic/MortalityConstructor.kt | 2 +- .../runtime/extrinsic/multi/CallBuilder.kt | 8 +- .../extrinsic/multi/ExtrinsicSplitter.kt | 14 +-- .../runtime/extrinsic/signer/NovaSigner.kt | 6 +- .../extrinsic/visitor/api/ExtrinsicWalk.kt | 6 +- .../visitor/impl/MutableEventQueue.kt | 4 +- .../extrinsic/visitor/impl/NestedCallNode.kt | 6 +- .../visitor/impl/RealExtrinsicWalk.kt | 8 +- .../visitor/impl/nodes/batch/BatchAllNode.kt | 2 +- .../visitor/impl/nodes/batch/Common.kt | 10 +- .../impl/nodes/batch/ForceBatchNode.kt | 2 +- .../visitor/impl/nodes/proxy/ProxyNode.kt | 12 +-- .../runtime/mapper/RuntimeMapperFromLocal.kt | 2 +- .../runtime/multiNetwork/ChainRegistry.kt | 2 +- .../chain/model/StatemineAssetId.kt | 12 +-- .../connection/ChainConnection.kt | 12 +-- .../multiNetwork/connection/Web3ApiPool.kt | 2 +- .../multiLocation/MultiLocation.kt | 2 +- .../multiLocation/MultiLocationEncoding.kt | 8 +- .../ForeignAssetsLocationConverter.kt | 2 +- .../converter/LocalAssetsLocationConverter.kt | 4 +- .../qr/MultiChainQrSharingFactory.kt | 6 +- .../multiNetwork/runtime/RuntimeFactory.kt | 34 +++---- .../multiNetwork/runtime/RuntimeProvider.kt | 2 +- .../runtime/RuntimeSyncService.kt | 8 +- .../runtime/RuntimeVersionSubscription.kt | 4 +- .../runtime/SubscribeRuntimeVersionRequest.kt | 2 +- .../runtime/repository/EventsRepository.kt | 10 +- .../runtime/repository/ExtrinsicWithEvents.kt | 6 +- .../types/custom/vote/SiVoteTypeMapping.kt | 2 +- .../runtime/types/custom/vote/VoteType.kt | 4 +- .../nova/runtime/network/rpc/RpcCalls.kt | 18 ++-- .../runtime/network/rpc/StateCallRequest.kt | 2 +- .../network/rpc/StateRuntimeVersionRequest.kt | 2 +- .../network/updaters/BlockNumberUpdater.kt | 6 +- .../network/updaters/BlockTimeUpdater.kt | 4 +- .../updaters/InactiveIssuanceUpdater.kt | 6 +- .../updaters/SingleStorageKeyUpdater.kt | 2 +- .../network/updaters/TotalIssuanceUpdater.kt | 6 +- .../repository/ChainStateRepository.kt | 6 +- .../repository/ParachainInfoRepository.kt | 2 +- .../runtime/repository/TimestampRepository.kt | 2 +- .../repository/TotalIssuanceRepository.kt | 4 +- .../storage/source/BaseStorageSource.kt | 2 +- .../storage/source/LocalStorageSource.kt | 2 +- .../storage/source/RemoteStorageSource.kt | 10 +- .../storage/source/StorageDataSource.kt | 2 +- .../storage/source/multi/MultiQueryBuilder.kt | 2 +- .../source/multi/MultiQueryBuilderImpl.kt | 10 +- .../source/query/BaseStorageQueryContext.kt | 24 ++--- .../source/query/LocalStorageQueryContext.kt | 2 +- .../source/query/RemoteStorageQueryContext.kt | 10 +- .../source/query/StorageQueryContext.kt | 10 +- .../source/query/api/QueryableModule.kt | 4 +- .../query/api/QueryableStorageEntry0.kt | 2 +- .../query/api/QueryableStorageEntry1.kt | 2 +- .../query/api/QueryableStorageEntry2.kt | 2 +- .../runtime/storage/typed/SystemRuntimeApi.kt | 6 +- .../nova/runtime/util/AccountLookup.kt | 12 +-- .../visitor/impl/BatchAllWalkTest.kt | 12 +-- .../runtime/extrinsic/visitor/impl/Common.kt | 16 ++-- .../visitor/impl/ForceBatchWalkTest.kt | 12 +-- .../extrinsic/visitor/impl/ProxyWalkTest.kt | 16 ++-- .../autobalance/NodeAutobalancerTest.kt | 2 +- .../runtime/RuntimeProviderTest.kt | 2 +- .../runtime/RuntimeSyncServiceTest.kt | 8 +- test-shared/build.gradle | 2 +- .../nova/test_shared/LoggerHelpers.kt | 2 +- .../nova/test_shared/SocketHelpers.kt | 6 +- .../repository/RealWeb3NamesRepository.kt | 6 +- .../W3NServiceEndpointHandlerV1.kt | 2 +- .../W3NServiceEndpointHandlerV2.kt | 2 +- .../domain/exceptions/Web3NamesException.kt | 2 +- 648 files changed, 1450 insertions(+), 1467 deletions(-) delete mode 100644 Jenkinsfile delete mode 100644 feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/subquery/SubqueryNetworkPathExtensions.kt diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index eababf7106..0000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,4 +0,0 @@ -@Library('jenkins-library' ) _ - -def pipeline = new org.android.AppPipeline(steps: this, sonar: false, testCmd: 'runTest') -pipeline.runPipeline('fearless') diff --git a/app/build.gradle b/app/build.gradle index 6d3025d2b3..f5c2eb3c08 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -236,7 +236,7 @@ dependencies { implementation roomDep - implementation fearlessLibDep + implementation substrateSdkDep implementation daggerDep kapt daggerKapt diff --git a/app/src/androidTest/java/io/novafoundation/nova/BlockParsingIntegrationTest.kt b/app/src/androidTest/java/io/novafoundation/nova/BlockParsingIntegrationTest.kt index 5872e00198..db0a69b71b 100644 --- a/app/src/androidTest/java/io/novafoundation/nova/BlockParsingIntegrationTest.kt +++ b/app/src/androidTest/java/io/novafoundation/nova/BlockParsingIntegrationTest.kt @@ -11,8 +11,8 @@ import io.novafoundation.nova.common.utils.system import io.novafoundation.nova.runtime.di.RuntimeApi import io.novafoundation.nova.runtime.di.RuntimeComponent import io.novafoundation.nova.runtime.multiNetwork.connection.ChainConnection -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import kotlinx.coroutines.runBlocking import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/androidTest/java/io/novafoundation/nova/GovernanceIntegrationTest.kt b/app/src/androidTest/java/io/novafoundation/nova/GovernanceIntegrationTest.kt index 47bf605319..b449ae0a01 100644 --- a/app/src/androidTest/java/io/novafoundation/nova/GovernanceIntegrationTest.kt +++ b/app/src/androidTest/java/io/novafoundation/nova/GovernanceIntegrationTest.kt @@ -18,7 +18,7 @@ import io.novafoundation.nova.runtime.ext.utilityAsset import io.novafoundation.nova.runtime.multiNetwork.ChainWithAsset import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.first diff --git a/app/src/androidTest/java/io/novafoundation/nova/MoonbaseSendIntagrationTest.kt b/app/src/androidTest/java/io/novafoundation/nova/MoonbaseSendIntagrationTest.kt index 3bf262ba71..bf22046fe8 100644 --- a/app/src/androidTest/java/io/novafoundation/nova/MoonbaseSendIntagrationTest.kt +++ b/app/src/androidTest/java/io/novafoundation/nova/MoonbaseSendIntagrationTest.kt @@ -12,12 +12,12 @@ import io.novafoundation.nova.runtime.di.RuntimeComponent import io.novafoundation.nova.runtime.ext.accountIdOf import io.novafoundation.nova.runtime.ext.utilityAsset import io.novafoundation.nova.runtime.multiNetwork.connection.ChainConnection -import jp.co.soramitsu.fearless_utils.encrypt.MultiChainEncryption -import jp.co.soramitsu.fearless_utils.encrypt.junction.BIP32JunctionDecoder -import jp.co.soramitsu.fearless_utils.encrypt.keypair.Keypair -import jp.co.soramitsu.fearless_utils.encrypt.keypair.ethereum.EthereumKeypairFactory -import jp.co.soramitsu.fearless_utils.encrypt.seed.ethereum.EthereumSeedFactory -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.KeyPairSigner +import io.novasama.substrate_sdk_android.encrypt.MultiChainEncryption +import io.novasama.substrate_sdk_android.encrypt.junction.BIP32JunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.keypair.Keypair +import io.novasama.substrate_sdk_android.encrypt.keypair.ethereum.EthereumKeypairFactory +import io.novasama.substrate_sdk_android.encrypt.seed.ethereum.EthereumSeedFactory +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.KeyPairSigner import kotlinx.coroutines.runBlocking import org.junit.Test import org.junit.runner.RunWith diff --git a/app/src/androidTest/java/io/novafoundation/nova/NftUniquesIntegrationTest.kt b/app/src/androidTest/java/io/novafoundation/nova/NftUniquesIntegrationTest.kt index dfa7a1fd3f..6313f23394 100644 --- a/app/src/androidTest/java/io/novafoundation/nova/NftUniquesIntegrationTest.kt +++ b/app/src/androidTest/java/io/novafoundation/nova/NftUniquesIntegrationTest.kt @@ -17,10 +17,10 @@ import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.connection.ChainConnection import io.novafoundation.nova.runtime.storage.source.multi.MultiQueryBuilder import io.novafoundation.nova.runtime.storage.source.query.multi -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking import org.junit.Test diff --git a/app/src/androidTest/java/io/novafoundation/nova/balances/BalancesIntegrationTest.kt b/app/src/androidTest/java/io/novafoundation/nova/balances/BalancesIntegrationTest.kt index b26e843128..4bc8328d93 100644 --- a/app/src/androidTest/java/io/novafoundation/nova/balances/BalancesIntegrationTest.kt +++ b/app/src/androidTest/java/io/novafoundation/nova/balances/BalancesIntegrationTest.kt @@ -23,10 +23,10 @@ import io.novafoundation.nova.runtime.extrinsic.systemRemark import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.connection.ChainConnection import io.novafoundation.nova.runtime.multiNetwork.getSocket -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.wsrpc.networkStateFlow +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.wsrpc.networkStateFlow import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.first diff --git a/app/src/main/java/io/novafoundation/nova/app/root/presentation/deepLinks/handlers/ImportMnemonicDeepLinkHandler.kt b/app/src/main/java/io/novafoundation/nova/app/root/presentation/deepLinks/handlers/ImportMnemonicDeepLinkHandler.kt index 997320d502..9558ea158b 100644 --- a/app/src/main/java/io/novafoundation/nova/app/root/presentation/deepLinks/handlers/ImportMnemonicDeepLinkHandler.kt +++ b/app/src/main/java/io/novafoundation/nova/app/root/presentation/deepLinks/handlers/ImportMnemonicDeepLinkHandler.kt @@ -17,8 +17,8 @@ import io.novafoundation.nova.feature_account_api.presenatation.account.add.Impo import io.novafoundation.nova.feature_account_api.presenatation.account.add.ImportType import io.novafoundation.nova.feature_account_api.presenatation.account.common.model.AdvancedEncryptionModel import io.novafoundation.nova.feature_account_impl.presentation.AccountRouter -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.Mnemonic -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.MnemonicCreator +import io.novasama.substrate_sdk_android.encrypt.mnemonic.Mnemonic +import io.novasama.substrate_sdk_android.encrypt.mnemonic.MnemonicCreator import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/build.gradle b/build.gradle index fbed8d5c6b..7d822eb5e3 100644 --- a/build.gradle +++ b/build.gradle @@ -51,7 +51,7 @@ buildscript { web3jVersion = '4.9.5' - fearlessLibVersion = '1.11.2' + substrateSdkVersion = '2.0.0' gifVersion = '1.2.19' @@ -151,7 +151,7 @@ buildscript { zXingCoreDep = "com.google.zxing:core:$zXingVersion" zXingEmbeddedDep = "com.journeyapps:zxing-android-embedded:$zXingEmbeddedVersion" - fearlessLibDep = "io.github.nova-wallet:substrate-sdk-android:$fearlessLibVersion" + substrateSdkDep = "io.github.nova-wallet:substrate-sdk-android:$substrateSdkVersion" gifDep = "pl.droidsonroids.gif:android-gif-drawable:$gifVersion" diff --git a/common/build.gradle b/common/build.gradle index d029850d00..d12c1ac8ea 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -79,7 +79,7 @@ dependencies { implementation bouncyCastleDep - api fearlessLibDep + api substrateSdkDep implementation coroutinesDep api liveDataKtxDep diff --git a/common/src/main/java/io/novafoundation/nova/common/address/AccountId.kt b/common/src/main/java/io/novafoundation/nova/common/address/AccountId.kt index f4503b442d..ec0f8e7ec2 100644 --- a/common/src/main/java/io/novafoundation/nova/common/address/AccountId.kt +++ b/common/src/main/java/io/novafoundation/nova/common/address/AccountId.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.address -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class AccountIdKey(val value: AccountId) { diff --git a/common/src/main/java/io/novafoundation/nova/common/address/AddressIconGenerator.kt b/common/src/main/java/io/novafoundation/nova/common/address/AddressIconGenerator.kt index a2ec6e5c58..269db1ca5f 100644 --- a/common/src/main/java/io/novafoundation/nova/common/address/AddressIconGenerator.kt +++ b/common/src/main/java/io/novafoundation/nova/common/address/AddressIconGenerator.kt @@ -4,11 +4,11 @@ import android.graphics.drawable.Drawable import androidx.annotation.ColorRes import io.novafoundation.nova.common.R import io.novafoundation.nova.common.resources.ResourceManager -import jp.co.soramitsu.fearless_utils.exceptions.AddressFormatException -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.icon.IconGenerator -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.exceptions.AddressFormatException +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.icon.IconGenerator +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.util.concurrent.ConcurrentHashMap diff --git a/common/src/main/java/io/novafoundation/nova/common/address/format/EthereumAddressFormat.kt b/common/src/main/java/io/novafoundation/nova/common/address/format/EthereumAddressFormat.kt index 113f6832d4..a05c974e7a 100644 --- a/common/src/main/java/io/novafoundation/nova/common/address/format/EthereumAddressFormat.kt +++ b/common/src/main/java/io/novafoundation/nova/common/address/format/EthereumAddressFormat.kt @@ -1,11 +1,11 @@ package io.novafoundation.nova.common.address.format -import jp.co.soramitsu.fearless_utils.extensions.asEthereumAccountId -import jp.co.soramitsu.fearless_utils.extensions.asEthereumAddress -import jp.co.soramitsu.fearless_utils.extensions.asEthereumPublicKey -import jp.co.soramitsu.fearless_utils.extensions.isValid -import jp.co.soramitsu.fearless_utils.extensions.toAccountId -import jp.co.soramitsu.fearless_utils.extensions.toAddress +import io.novasama.substrate_sdk_android.extensions.asEthereumAccountId +import io.novasama.substrate_sdk_android.extensions.asEthereumAddress +import io.novasama.substrate_sdk_android.extensions.asEthereumPublicKey +import io.novasama.substrate_sdk_android.extensions.isValid +import io.novasama.substrate_sdk_android.extensions.toAccountId +import io.novasama.substrate_sdk_android.extensions.toAddress class EthereumAddressFormat : AddressFormat { diff --git a/common/src/main/java/io/novafoundation/nova/common/data/holders/RuntimeHolder.kt b/common/src/main/java/io/novafoundation/nova/common/data/holders/RuntimeHolder.kt index dc8d98ad79..9a7d3ee021 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/holders/RuntimeHolder.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/holders/RuntimeHolder.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.holders -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot interface RuntimeHolder { diff --git a/common/src/main/java/io/novafoundation/nova/common/data/mappers/EncryptionTypeMappers.kt b/common/src/main/java/io/novafoundation/nova/common/data/mappers/EncryptionTypeMappers.kt index 5c3c0f708a..357382c4a6 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/mappers/EncryptionTypeMappers.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/mappers/EncryptionTypeMappers.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.common.data.mappers import io.novafoundation.nova.core.model.CryptoType -import jp.co.soramitsu.fearless_utils.encrypt.EncryptionType +import io.novasama.substrate_sdk_android.encrypt.EncryptionType fun mapCryptoTypeToEncryption(cryptoType: CryptoType): EncryptionType { return when (cryptoType) { diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/AndroidLogger.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/AndroidLogger.kt index c006f25f9a..c79f68ee3a 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/AndroidLogger.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/AndroidLogger.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.common.data.network import android.util.Log -import jp.co.soramitsu.fearless_utils.wsrpc.logging.Logger +import io.novasama.substrate_sdk_android.wsrpc.logging.Logger const val TAG = "AndroidLogger" diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/BulkRetriever.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/BulkRetriever.kt index 63be31e467..50d094d912 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/BulkRetriever.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/BulkRetriever.kt @@ -1,11 +1,11 @@ package io.novafoundation.nova.common.data.network.rpc import io.novafoundation.nova.common.data.network.runtime.binding.BlockHash -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService -import jp.co.soramitsu.fearless_utils.wsrpc.executeAsync -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.nonNull -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.pojoList -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.executeAsync +import io.novasama.substrate_sdk_android.wsrpc.mappers.nonNull +import io.novasama.substrate_sdk_android.wsrpc.mappers.pojoList +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.ensureActive import kotlinx.coroutines.withContext diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/BulkRetrieverExt.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/BulkRetrieverExt.kt index ac1cfd4b96..39a70380d2 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/BulkRetrieverExt.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/BulkRetrieverExt.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.common.data.network.rpc import io.novafoundation.nova.common.data.network.runtime.binding.BlockHash -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.SocketService suspend fun BulkRetriever.retrieveAllValues(socketService: SocketService, keyPrefix: String, at: BlockHash? = null): Map { val allKeys = retrieveAllKeys(socketService, keyPrefix, at) diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/ChildState.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/ChildState.kt index aa861b0bf8..ef46dcea24 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/ChildState.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/ChildState.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.rpc -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString import java.io.ByteArrayOutputStream private const val CHILD_KEY_DEFAULT = ":child_storage:default:" diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/SocketSingleRequestExecutor.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/SocketSingleRequestExecutor.kt index 32d48aa8be..9b15a5663a 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/SocketSingleRequestExecutor.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/rpc/SocketSingleRequestExecutor.kt @@ -7,10 +7,10 @@ import com.neovisionaries.ws.client.WebSocketException import com.neovisionaries.ws.client.WebSocketFactory import io.novafoundation.nova.common.base.errors.NovaException import io.novafoundation.nova.common.resources.ResourceManager -import jp.co.soramitsu.fearless_utils.wsrpc.logging.Logger -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.ResponseMapper -import jp.co.soramitsu.fearless_utils.wsrpc.request.base.RpcRequest -import jp.co.soramitsu.fearless_utils.wsrpc.response.RpcResponse +import io.novasama.substrate_sdk_android.wsrpc.logging.Logger +import io.novasama.substrate_sdk_android.wsrpc.mappers.ResponseMapper +import io.novasama.substrate_sdk_android.wsrpc.request.base.RpcRequest +import io.novasama.substrate_sdk_android.wsrpc.response.RpcResponse import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.suspendCancellableCoroutine import kotlinx.coroutines.withContext diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/AccountId.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/AccountId.kt index 75d3865f89..e22fe0f5f4 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/AccountId.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/AccountId.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.binding -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId @HelperBinding fun bindAccountId(dynamicInstance: Any?): AccountId = dynamicInstance.cast() diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/AccountInfo.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/AccountInfo.kt index d1f610e775..328bd87131 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/AccountInfo.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/AccountInfo.kt @@ -2,10 +2,10 @@ package io.novafoundation.nova.common.data.network.runtime.binding import io.novafoundation.nova.common.utils.orZero import io.novafoundation.nova.common.utils.system -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHexOrNull -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHexOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.storage import java.math.BigInteger open class AccountBalance( diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/ActiveEra.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/ActiveEra.kt index 647a316fc9..ca4b0cb2ea 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/ActiveEra.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/ActiveEra.kt @@ -1,8 +1,8 @@ package io.novafoundation.nova.common.data.network.runtime.binding -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHex +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHex import java.math.BigInteger /* diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/BindingHelpers.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/BindingHelpers.kt index 9afd291601..4fc6058a7a 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/BindingHelpers.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/BindingHelpers.kt @@ -1,16 +1,16 @@ package io.novafoundation.nova.common.data.network.runtime.binding -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.RuntimeType -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.Type -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromByteArray -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHex -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.RuntimeType +import io.novasama.substrate_sdk_android.runtime.definitions.types.Type +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromByteArray +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHex +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlin.contracts.ExperimentalContracts import kotlin.contracts.contract diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Block.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Block.kt index 298387df38..4e938daeb8 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Block.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Block.kt @@ -1,8 +1,8 @@ package io.novafoundation.nova.common.data.network.runtime.binding import io.novafoundation.nova.common.utils.system -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage import java.math.BigInteger typealias BlockNumber = BigInteger diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Collections.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Collections.kt index ff88413fd5..4dfa70aee7 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Collections.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Collections.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.binding -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum fun bindList(dynamicInstance: Any?, itemBinder: (Any?) -> T): List { if (dynamicInstance == null) return emptyList() diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Constants.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Constants.kt index 61c865cf18..cb5298312e 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Constants.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Constants.kt @@ -1,8 +1,8 @@ package io.novafoundation.nova.common.data.network.runtime.binding -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromByteArrayOrNull -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Constant +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromByteArrayOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.module.Constant import java.math.BigInteger @HelperBinding diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Data.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Data.kt index 1527c3b5f8..cab33dd777 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Data.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Data.kt @@ -1,8 +1,8 @@ package io.novafoundation.nova.common.data.network.runtime.binding -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Data as DataType +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Data as DataType sealed class Data { abstract fun asString(): String? diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/DispatchTime.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/DispatchTime.kt index de9184fca0..977fb64e69 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/DispatchTime.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/DispatchTime.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.binding -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum import java.math.BigInteger sealed class DispatchTime { diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Events.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Events.kt index dd38441e4e..76f570b7cc 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Events.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Events.kt @@ -1,12 +1,12 @@ package io.novafoundation.nova.common.data.network.runtime.binding import io.novafoundation.nova.common.utils.system -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHex -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHex +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.metadata.storage import java.math.BigInteger class EventRecord(val phase: Phase, val event: GenericEvent.Instance) diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/GenericCall.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/GenericCall.kt index 5c43b8cd03..2591f827ae 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/GenericCall.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/GenericCall.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.binding -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall fun bindGenericCall(decoded: Any?): GenericCall.Instance { return decoded.cast() diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/MultiAddress.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/MultiAddress.kt index 2519689cd5..714231f60d 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/MultiAddress.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/MultiAddress.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.binding -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum import java.math.BigInteger sealed class MultiAddress { diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Weight.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Weight.kt index d197dfecd4..795c9f7ac4 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Weight.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/binding/Weight.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.binding -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct import java.math.BigInteger typealias Weight = BigInteger diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/FeeCalculationRequest.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/FeeCalculationRequest.kt index b876f39910..55ee3dddcf 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/FeeCalculationRequest.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/FeeCalculationRequest.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.calls -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest class FeeCalculationRequest(extrinsicInHex: String) : RuntimeRequest( method = "payment_queryInfo", diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetBlockHashRequest.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetBlockHashRequest.kt index 9748b97a9d..89a893af5b 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetBlockHashRequest.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetBlockHashRequest.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.common.data.network.runtime.calls import io.novafoundation.nova.common.data.network.runtime.binding.BlockNumber -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest class GetBlockHashRequest(blockNumber: BlockNumber?) : RuntimeRequest( method = "chain_getBlockHash", diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetBlockRequest.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetBlockRequest.kt index bd06004b8e..53e8985609 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetBlockRequest.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetBlockRequest.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.calls -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest class GetBlockRequest(blockHash: String? = null) : RuntimeRequest( method = "chain_getBlock", diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetChildStateRequest.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetChildStateRequest.kt index 58fcf4ac54..450064c0ae 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetChildStateRequest.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetChildStateRequest.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.calls -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest class GetChildStateRequest( storageKey: String, diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetFinalizedHeadRequest.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetFinalizedHeadRequest.kt index ebc6334074..36888a0ab0 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetFinalizedHeadRequest.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetFinalizedHeadRequest.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.calls -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest object GetFinalizedHeadRequest : RuntimeRequest( method = "chain_getFinalizedHead", diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetHeaderRequest.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetHeaderRequest.kt index d1a5f06def..fbb2a230e8 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetHeaderRequest.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetHeaderRequest.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.calls -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest class GetHeaderRequest(blockHash: String? = null) : RuntimeRequest( method = "chain_getHeader", diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetStorageSize.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetStorageSize.kt index aaec3d2007..5c067e753a 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetStorageSize.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/GetStorageSize.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.calls -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest class GetStorageSize(key: String) : RuntimeRequest( method = "state_getStorageSize", diff --git a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/NextAccountIndexRequest.kt b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/NextAccountIndexRequest.kt index 6d78c71f22..201c88b1b0 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/NextAccountIndexRequest.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/network/runtime/calls/NextAccountIndexRequest.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.data.network.runtime.calls -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest class NextAccountIndexRequest(accountAddress: String) : RuntimeRequest( method = "system_accountNextIndex", diff --git a/common/src/main/java/io/novafoundation/nova/common/data/secrets/v1/Ext.kt b/common/src/main/java/io/novafoundation/nova/common/data/secrets/v1/Ext.kt index 1573264ee0..2470f06abe 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/secrets/v1/Ext.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/secrets/v1/Ext.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.common.data.secrets.v1 -import jp.co.soramitsu.fearless_utils.encrypt.keypair.BaseKeypair -import jp.co.soramitsu.fearless_utils.encrypt.keypair.substrate.Sr25519Keypair +import io.novasama.substrate_sdk_android.encrypt.keypair.BaseKeypair +import io.novasama.substrate_sdk_android.encrypt.keypair.substrate.Sr25519Keypair /** * Creates [Sr25519Keypair] if [nonce] is not null diff --git a/common/src/main/java/io/novafoundation/nova/common/data/secrets/v1/SecretStoreV1.kt b/common/src/main/java/io/novafoundation/nova/common/data/secrets/v1/SecretStoreV1.kt index 9ff57edb53..984dbc213b 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/secrets/v1/SecretStoreV1.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/secrets/v1/SecretStoreV1.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.core.model.SecuritySource import io.novafoundation.nova.core.model.WithDerivationPath import io.novafoundation.nova.core.model.WithMnemonic import io.novafoundation.nova.core.model.WithSeed -import jp.co.soramitsu.fearless_utils.encrypt.keypair.substrate.Sr25519Keypair +import io.novasama.substrate_sdk_android.encrypt.keypair.substrate.Sr25519Keypair import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/common/src/main/java/io/novafoundation/nova/common/data/secrets/v1/SourceInternal.kt b/common/src/main/java/io/novafoundation/nova/common/data/secrets/v1/SourceInternal.kt index 5d8de4ea41..5b887779af 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/secrets/v1/SourceInternal.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/secrets/v1/SourceInternal.kt @@ -1,8 +1,8 @@ package io.novafoundation.nova.common.data.secrets.v1 -import jp.co.soramitsu.fearless_utils.scale.Schema -import jp.co.soramitsu.fearless_utils.scale.byteArray -import jp.co.soramitsu.fearless_utils.scale.string +import io.novasama.substrate_sdk_android.scale.Schema +import io.novasama.substrate_sdk_android.scale.byteArray +import io.novasama.substrate_sdk_android.scale.string internal enum class SourceType { CREATE, SEED, MNEMONIC, JSON, UNSPECIFIED diff --git a/common/src/main/java/io/novafoundation/nova/common/data/secrets/v2/MetaAccountSecrets.kt b/common/src/main/java/io/novafoundation/nova/common/data/secrets/v2/MetaAccountSecrets.kt index 345cff2e15..b6dbf478d0 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/secrets/v2/MetaAccountSecrets.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/secrets/v2/MetaAccountSecrets.kt @@ -1,13 +1,13 @@ package io.novafoundation.nova.common.data.secrets.v2 import io.novafoundation.nova.common.utils.invoke -import jp.co.soramitsu.fearless_utils.encrypt.keypair.Keypair -import jp.co.soramitsu.fearless_utils.encrypt.keypair.substrate.Sr25519Keypair -import jp.co.soramitsu.fearless_utils.scale.EncodableStruct -import jp.co.soramitsu.fearless_utils.scale.Schema -import jp.co.soramitsu.fearless_utils.scale.byteArray -import jp.co.soramitsu.fearless_utils.scale.schema -import jp.co.soramitsu.fearless_utils.scale.string +import io.novasama.substrate_sdk_android.encrypt.keypair.Keypair +import io.novasama.substrate_sdk_android.encrypt.keypair.substrate.Sr25519Keypair +import io.novasama.substrate_sdk_android.scale.EncodableStruct +import io.novasama.substrate_sdk_android.scale.Schema +import io.novasama.substrate_sdk_android.scale.byteArray +import io.novasama.substrate_sdk_android.scale.schema +import io.novasama.substrate_sdk_android.scale.string object KeyPairSchema : Schema() { val PrivateKey by byteArray() diff --git a/common/src/main/java/io/novafoundation/nova/common/data/secrets/v2/SecretStoreV2.kt b/common/src/main/java/io/novafoundation/nova/common/data/secrets/v2/SecretStoreV2.kt index 2142f35b28..2a9267f561 100644 --- a/common/src/main/java/io/novafoundation/nova/common/data/secrets/v2/SecretStoreV2.kt +++ b/common/src/main/java/io/novafoundation/nova/common/data/secrets/v2/SecretStoreV2.kt @@ -4,11 +4,11 @@ import io.novafoundation.nova.common.data.secrets.v1.Keypair import io.novafoundation.nova.common.data.storage.encrypt.EncryptedPreferences import io.novafoundation.nova.common.utils.Union import io.novafoundation.nova.common.utils.fold -import jp.co.soramitsu.fearless_utils.encrypt.keypair.Keypair -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.scale.EncodableStruct -import jp.co.soramitsu.fearless_utils.scale.toHexString +import io.novasama.substrate_sdk_android.encrypt.keypair.Keypair +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.scale.EncodableStruct +import io.novasama.substrate_sdk_android.scale.toHexString import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/common/src/main/java/io/novafoundation/nova/common/di/CommonApi.kt b/common/src/main/java/io/novafoundation/nova/common/di/CommonApi.kt index ddcefeb057..29362f99be 100644 --- a/common/src/main/java/io/novafoundation/nova/common/di/CommonApi.kt +++ b/common/src/main/java/io/novafoundation/nova/common/di/CommonApi.kt @@ -46,10 +46,10 @@ import io.novafoundation.nova.common.vibration.DeviceVibrator import io.novafoundation.nova.common.view.bottomSheet.description.DescriptionBottomSheetLauncher import io.novafoundation.nova.common.view.input.chooser.ListChooserMixin import io.novafoundation.nova.common.view.parallaxCard.BackingParallaxCardLruCache -import jp.co.soramitsu.fearless_utils.encrypt.Signer -import jp.co.soramitsu.fearless_utils.icon.IconGenerator -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService -import jp.co.soramitsu.fearless_utils.wsrpc.logging.Logger +import io.novasama.substrate_sdk_android.encrypt.Signer +import io.novasama.substrate_sdk_android.icon.IconGenerator +import io.novasama.substrate_sdk_android.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.logging.Logger import okhttp3.OkHttpClient import java.util.Random diff --git a/common/src/main/java/io/novafoundation/nova/common/di/modules/CommonModule.kt b/common/src/main/java/io/novafoundation/nova/common/di/modules/CommonModule.kt index b869d0c1b7..9faccf66cf 100644 --- a/common/src/main/java/io/novafoundation/nova/common/di/modules/CommonModule.kt +++ b/common/src/main/java/io/novafoundation/nova/common/di/modules/CommonModule.kt @@ -64,8 +64,8 @@ import io.novafoundation.nova.common.view.bottomSheet.description.DescriptionBot import io.novafoundation.nova.common.view.bottomSheet.description.RealDescriptionBottomSheetLauncher import io.novafoundation.nova.common.view.input.chooser.ListChooserMixin import io.novafoundation.nova.common.view.input.chooser.RealListChooserMixinFactory -import jp.co.soramitsu.fearless_utils.encrypt.Signer -import jp.co.soramitsu.fearless_utils.icon.IconGenerator +import io.novasama.substrate_sdk_android.encrypt.Signer +import io.novasama.substrate_sdk_android.icon.IconGenerator import java.security.SecureRandom import java.util.Random import javax.inject.Qualifier diff --git a/common/src/main/java/io/novafoundation/nova/common/di/modules/NetworkModule.kt b/common/src/main/java/io/novafoundation/nova/common/di/modules/NetworkModule.kt index 396690d256..3f41b1dc96 100644 --- a/common/src/main/java/io/novafoundation/nova/common/di/modules/NetworkModule.kt +++ b/common/src/main/java/io/novafoundation/nova/common/di/modules/NetworkModule.kt @@ -21,10 +21,10 @@ import io.novafoundation.nova.common.utils.bluetooth.BluetoothManager import io.novafoundation.nova.common.utils.bluetooth.RealBluetoothManager import io.novafoundation.nova.common.utils.location.LocationManager import io.novafoundation.nova.common.utils.location.RealLocationManager -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService -import jp.co.soramitsu.fearless_utils.wsrpc.logging.Logger -import jp.co.soramitsu.fearless_utils.wsrpc.recovery.Reconnector -import jp.co.soramitsu.fearless_utils.wsrpc.request.RequestExecutor +import io.novasama.substrate_sdk_android.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.logging.Logger +import io.novasama.substrate_sdk_android.wsrpc.recovery.Reconnector +import io.novasama.substrate_sdk_android.wsrpc.request.RequestExecutor import okhttp3.Cache import okhttp3.OkHttpClient import okhttp3.logging.HttpLoggingInterceptor diff --git a/common/src/main/java/io/novafoundation/nova/common/mixin/impl/NetworkStateProvider.kt b/common/src/main/java/io/novafoundation/nova/common/mixin/impl/NetworkStateProvider.kt index d4b3b46ae3..2f138d274d 100644 --- a/common/src/main/java/io/novafoundation/nova/common/mixin/impl/NetworkStateProvider.kt +++ b/common/src/main/java/io/novafoundation/nova/common/mixin/impl/NetworkStateProvider.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.common.mixin.impl import androidx.lifecycle.MutableLiveData import io.novafoundation.nova.common.mixin.api.NetworkStateMixin -import jp.co.soramitsu.fearless_utils.wsrpc.state.SocketStateMachine.State +import io.novasama.substrate_sdk_android.wsrpc.state.SocketStateMachine.State private const val ATTEMPT_THRESHOLD = 1 diff --git a/common/src/main/java/io/novafoundation/nova/common/utils/CryptoUtils.kt b/common/src/main/java/io/novafoundation/nova/common/utils/CryptoUtils.kt index 1fb064f3f3..d4970e1b1e 100644 --- a/common/src/main/java/io/novafoundation/nova/common/utils/CryptoUtils.kt +++ b/common/src/main/java/io/novafoundation/nova/common/utils/CryptoUtils.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.common.utils import android.util.Base64 -import jp.co.soramitsu.fearless_utils.hash.Hasher.blake2b256 +import io.novasama.substrate_sdk_android.hash.Hasher.blake2b256 import org.bouncycastle.jcajce.provider.digest.SHA256 import java.security.MessageDigest import javax.crypto.Mac diff --git a/common/src/main/java/io/novafoundation/nova/common/utils/FearlessLibExt.kt b/common/src/main/java/io/novafoundation/nova/common/utils/FearlessLibExt.kt index 11b25b347b..761879b125 100644 --- a/common/src/main/java/io/novafoundation/nova/common/utils/FearlessLibExt.kt +++ b/common/src/main/java/io/novafoundation/nova/common/utils/FearlessLibExt.kt @@ -7,53 +7,53 @@ import io.novafoundation.nova.common.data.network.runtime.binding.bindNumberCons import io.novafoundation.nova.common.data.network.runtime.binding.fromByteArrayOrIncompatible import io.novafoundation.nova.common.data.network.runtime.binding.fromHexOrIncompatible import io.novafoundation.nova.core.model.Node -import jp.co.soramitsu.fearless_utils.encrypt.SignatureWrapper -import jp.co.soramitsu.fearless_utils.encrypt.junction.BIP32JunctionDecoder -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.Mnemonic -import jp.co.soramitsu.fearless_utils.encrypt.seed.SeedFactory -import jp.co.soramitsu.fearless_utils.extensions.asEthereumAccountId -import jp.co.soramitsu.fearless_utils.extensions.asEthereumAddress -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.extensions.toAccountId -import jp.co.soramitsu.fearless_utils.extensions.toAddress -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.hash.Hasher.blake2b256 -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.RuntimeType -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.bytesOrNull -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromByteArrayOrNull -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.DefaultSignedExtensions -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Extrinsic -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Extrinsic.EncodingInstance.CallRepresentation -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.skipAliases -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedRaw -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.genesisHash -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.callOrNull -import jp.co.soramitsu.fearless_utils.runtime.metadata.fullName -import jp.co.soramitsu.fearless_utils.runtime.metadata.module -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Constant -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Event -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.FunctionArgument -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.MetadataFunction -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry -import jp.co.soramitsu.fearless_utils.runtime.metadata.moduleOrNull -import jp.co.soramitsu.fearless_utils.runtime.metadata.splitKey -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageOrNull -import jp.co.soramitsu.fearless_utils.scale.EncodableStruct -import jp.co.soramitsu.fearless_utils.scale.Schema -import jp.co.soramitsu.fearless_utils.scale.dataType.DataType -import jp.co.soramitsu.fearless_utils.scale.utils.toUnsignedBytes -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.addressPrefix -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAddress +import io.novasama.substrate_sdk_android.encrypt.SignatureWrapper +import io.novasama.substrate_sdk_android.encrypt.junction.BIP32JunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.mnemonic.Mnemonic +import io.novasama.substrate_sdk_android.encrypt.seed.SeedFactory +import io.novasama.substrate_sdk_android.extensions.asEthereumAccountId +import io.novasama.substrate_sdk_android.extensions.asEthereumAddress +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.toAccountId +import io.novasama.substrate_sdk_android.extensions.toAddress +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.hash.Hasher.blake2b256 +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.RuntimeType +import io.novasama.substrate_sdk_android.runtime.definitions.types.bytesOrNull +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromByteArrayOrNull +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.DefaultSignedExtensions +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Extrinsic +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Extrinsic.EncodingInstance.CallRepresentation +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.definitions.types.skipAliases +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.genesisHash +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.callOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.fullName +import io.novasama.substrate_sdk_android.runtime.metadata.module +import io.novasama.substrate_sdk_android.runtime.metadata.module.Constant +import io.novasama.substrate_sdk_android.runtime.metadata.module.Event +import io.novasama.substrate_sdk_android.runtime.metadata.module.FunctionArgument +import io.novasama.substrate_sdk_android.runtime.metadata.module.MetadataFunction +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.moduleOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.splitKey +import io.novasama.substrate_sdk_android.runtime.metadata.storageOrNull +import io.novasama.substrate_sdk_android.scale.EncodableStruct +import io.novasama.substrate_sdk_android.scale.Schema +import io.novasama.substrate_sdk_android.scale.dataType.DataType +import io.novasama.substrate_sdk_android.scale.utils.toUnsignedBytes +import io.novasama.substrate_sdk_android.ss58.SS58Encoder +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.addressPrefix +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAddress import org.web3j.crypto.Sign import java.io.ByteArrayOutputStream import java.math.BigInteger diff --git a/common/src/main/java/io/novafoundation/nova/common/utils/Filters.kt b/common/src/main/java/io/novafoundation/nova/common/utils/Filters.kt index 5eb8661cae..3626d9f86a 100644 --- a/common/src/main/java/io/novafoundation/nova/common/utils/Filters.kt +++ b/common/src/main/java/io/novafoundation/nova/common/utils/Filters.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.common.utils -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot interface Filter { fun shouldInclude(model: T): Boolean diff --git a/common/src/main/java/io/novafoundation/nova/common/utils/Retries.kt b/common/src/main/java/io/novafoundation/nova/common/utils/Retries.kt index 99faefc2de..89818bfbf8 100644 --- a/common/src/main/java/io/novafoundation/nova/common/utils/Retries.kt +++ b/common/src/main/java/io/novafoundation/nova/common/utils/Retries.kt @@ -1,8 +1,8 @@ package io.novafoundation.nova.common.utils import android.util.Log -import jp.co.soramitsu.fearless_utils.wsrpc.recovery.LinearReconnectStrategy -import jp.co.soramitsu.fearless_utils.wsrpc.recovery.ReconnectStrategy +import io.novasama.substrate_sdk_android.wsrpc.recovery.LinearReconnectStrategy +import io.novasama.substrate_sdk_android.wsrpc.recovery.ReconnectStrategy import kotlinx.coroutines.delay suspend inline fun retryUntilDone( diff --git a/common/src/test/java/io/novafoundation/nova/common/data/secrets/v2/SecretStoreV2Test.kt b/common/src/test/java/io/novafoundation/nova/common/data/secrets/v2/SecretStoreV2Test.kt index aa829f1ec7..fabaaceeef 100644 --- a/common/src/test/java/io/novafoundation/nova/common/data/secrets/v2/SecretStoreV2Test.kt +++ b/common/src/test/java/io/novafoundation/nova/common/data/secrets/v2/SecretStoreV2Test.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.common.data.secrets.v2.MetaAccountSecrets.Substrat import io.novafoundation.nova.common.data.secrets.v2.MetaAccountSecrets.SubstrateKeypair import io.novafoundation.nova.test_shared.HashMapEncryptedPreferences import io.novafoundation.nova.test_shared.assertSetEquals -import jp.co.soramitsu.fearless_utils.scale.EncodableStruct +import io.novasama.substrate_sdk_android.scale.EncodableStruct import kotlinx.coroutines.runBlocking import org.junit.Assert.assertArrayEquals import org.junit.Assert.assertEquals diff --git a/core-api/build.gradle b/core-api/build.gradle index f450652b06..bed580296f 100644 --- a/core-api/build.gradle +++ b/core-api/build.gradle @@ -25,7 +25,7 @@ android { dependencies { implementation coroutinesDep - implementation fearlessLibDep + implementation substrateSdkDep api web3jDep } \ No newline at end of file diff --git a/core-api/src/main/java/io/novafoundation/nova/core/model/SecuritySource.kt b/core-api/src/main/java/io/novafoundation/nova/core/model/SecuritySource.kt index fb760ca3c0..b5c6a9c6db 100644 --- a/core-api/src/main/java/io/novafoundation/nova/core/model/SecuritySource.kt +++ b/core-api/src/main/java/io/novafoundation/nova/core/model/SecuritySource.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.core.model -import jp.co.soramitsu.fearless_utils.encrypt.keypair.Keypair +import io.novasama.substrate_sdk_android.encrypt.keypair.Keypair sealed class SecuritySource( val keypair: Keypair diff --git a/core-api/src/main/java/io/novafoundation/nova/core/updater/SharedRequestsBuilder.kt b/core-api/src/main/java/io/novafoundation/nova/core/updater/SharedRequestsBuilder.kt index 3b4b97b2f3..7f6a057676 100644 --- a/core-api/src/main/java/io/novafoundation/nova/core/updater/SharedRequestsBuilder.kt +++ b/core-api/src/main/java/io/novafoundation/nova/core/updater/SharedRequestsBuilder.kt @@ -3,7 +3,7 @@ package io.novafoundation.nova.core.updater import io.novafoundation.nova.core.ethereum.Web3Api import io.novafoundation.nova.core.ethereum.log.Topic import io.novafoundation.nova.core.model.StorageChange -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.SocketService import kotlinx.coroutines.flow.Flow import org.web3j.protocol.core.Request import org.web3j.protocol.core.Response diff --git a/core-db/build.gradle b/core-db/build.gradle index 04b42f3577..1296b685a6 100644 --- a/core-db/build.gradle +++ b/core-db/build.gradle @@ -44,7 +44,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation fearlessLibDep + implementation substrateSdkDep implementation project(":common") implementation gsonDep diff --git a/core-db/src/main/java/io/novafoundation/nova/core_db/dao/ExternalBalanceDao.kt b/core-db/src/main/java/io/novafoundation/nova/core_db/dao/ExternalBalanceDao.kt index 068c873fb3..f9f8119856 100644 --- a/core-db/src/main/java/io/novafoundation/nova/core_db/dao/ExternalBalanceDao.kt +++ b/core-db/src/main/java/io/novafoundation/nova/core_db/dao/ExternalBalanceDao.kt @@ -7,7 +7,7 @@ import androidx.room.OnConflictStrategy import androidx.room.Query import io.novafoundation.nova.core_db.model.AggregatedExternalBalanceLocal import io.novafoundation.nova.core_db.model.ExternalBalanceLocal -import jp.co.soramitsu.fearless_utils.hash.isPositive +import io.novasama.substrate_sdk_android.hash.isPositive import kotlinx.coroutines.flow.Flow @Dao diff --git a/core-db/src/main/java/io/novafoundation/nova/core_db/dao/MetaAccountDao.kt b/core-db/src/main/java/io/novafoundation/nova/core_db/dao/MetaAccountDao.kt index 3ec5adc641..5acded6130 100644 --- a/core-db/src/main/java/io/novafoundation/nova/core_db/dao/MetaAccountDao.kt +++ b/core-db/src/main/java/io/novafoundation/nova/core_db/dao/MetaAccountDao.kt @@ -11,7 +11,7 @@ import io.novafoundation.nova.core_db.model.chain.account.MetaAccountLocal import io.novafoundation.nova.core_db.model.chain.account.MetaAccountPositionUpdate import io.novafoundation.nova.core_db.model.chain.account.ProxyAccountLocal import io.novafoundation.nova.core_db.model.chain.account.RelationJoinedMetaAccountInfo -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import org.intellij.lang.annotations.Language import java.math.BigDecimal diff --git a/core-db/src/main/java/io/novafoundation/nova/core_db/dao/StakingRewardPeriodDao.kt b/core-db/src/main/java/io/novafoundation/nova/core_db/dao/StakingRewardPeriodDao.kt index 4848e9551f..f7956bbd7a 100644 --- a/core-db/src/main/java/io/novafoundation/nova/core_db/dao/StakingRewardPeriodDao.kt +++ b/core-db/src/main/java/io/novafoundation/nova/core_db/dao/StakingRewardPeriodDao.kt @@ -5,7 +5,7 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import io.novafoundation.nova.core_db.model.StakingRewardPeriodLocal -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow @Dao diff --git a/core-db/src/main/java/io/novafoundation/nova/core_db/dao/StakingTotalRewardDao.kt b/core-db/src/main/java/io/novafoundation/nova/core_db/dao/StakingTotalRewardDao.kt index 88eb05ffca..8df74b6240 100644 --- a/core-db/src/main/java/io/novafoundation/nova/core_db/dao/StakingTotalRewardDao.kt +++ b/core-db/src/main/java/io/novafoundation/nova/core_db/dao/StakingTotalRewardDao.kt @@ -5,7 +5,7 @@ import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query import io.novafoundation.nova.core_db.model.TotalRewardLocal -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow @Dao diff --git a/core-db/src/main/java/io/novafoundation/nova/core_db/model/StakingDashboardItemLocal.kt b/core-db/src/main/java/io/novafoundation/nova/core_db/model/StakingDashboardItemLocal.kt index b07ba44341..c4de12e3f2 100644 --- a/core-db/src/main/java/io/novafoundation/nova/core_db/model/StakingDashboardItemLocal.kt +++ b/core-db/src/main/java/io/novafoundation/nova/core_db/model/StakingDashboardItemLocal.kt @@ -6,7 +6,7 @@ import androidx.room.ForeignKey import io.novafoundation.nova.core_db.model.chain.ChainAssetLocal import io.novafoundation.nova.core_db.model.chain.ChainLocal import io.novafoundation.nova.core_db.model.chain.account.MetaAccountLocal -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger @Entity( diff --git a/core-db/src/main/java/io/novafoundation/nova/core_db/model/StakingRewardPeriodLocal.kt b/core-db/src/main/java/io/novafoundation/nova/core_db/model/StakingRewardPeriodLocal.kt index 97a8fe23c7..81ef99b5cd 100644 --- a/core-db/src/main/java/io/novafoundation/nova/core_db/model/StakingRewardPeriodLocal.kt +++ b/core-db/src/main/java/io/novafoundation/nova/core_db/model/StakingRewardPeriodLocal.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.core_db.model import androidx.room.Entity -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId @Entity(tableName = "staking_reward_period", primaryKeys = ["accountId", "chainId", "assetId", "stakingType"]) class StakingRewardPeriodLocal( diff --git a/core-db/src/main/java/io/novafoundation/nova/core_db/model/TotalRewardLocal.kt b/core-db/src/main/java/io/novafoundation/nova/core_db/model/TotalRewardLocal.kt index 7ef75de35b..8ae6cee5f5 100644 --- a/core-db/src/main/java/io/novafoundation/nova/core_db/model/TotalRewardLocal.kt +++ b/core-db/src/main/java/io/novafoundation/nova/core_db/model/TotalRewardLocal.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.core_db.model import androidx.room.Entity -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger @Entity( diff --git a/core-db/src/main/java/io/novafoundation/nova/core_db/model/chain/account/ProxyAccountLocal.kt b/core-db/src/main/java/io/novafoundation/nova/core_db/model/chain/account/ProxyAccountLocal.kt index 18c62cad67..6a69446458 100644 --- a/core-db/src/main/java/io/novafoundation/nova/core_db/model/chain/account/ProxyAccountLocal.kt +++ b/core-db/src/main/java/io/novafoundation/nova/core_db/model/chain/account/ProxyAccountLocal.kt @@ -4,7 +4,7 @@ import androidx.room.Entity import androidx.room.ForeignKey import androidx.room.Ignore import io.novafoundation.nova.common.utils.Identifiable -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString @Entity( tableName = "proxy_accounts", diff --git a/feature-account-api/build.gradle b/feature-account-api/build.gradle index 9a6c4f6b2b..94a2c0d3f9 100644 --- a/feature-account-api/build.gradle +++ b/feature-account-api/build.gradle @@ -49,7 +49,7 @@ dependencies { implementation daggerDep kapt daggerKapt - api fearlessLibDep + api substrateSdkDep api project(':core-api') } \ No newline at end of file diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/derivationPath/DerivationPathDecoder.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/derivationPath/DerivationPathDecoder.kt index 648ee57a64..ebbb155600 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/derivationPath/DerivationPathDecoder.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/derivationPath/DerivationPathDecoder.kt @@ -1,8 +1,8 @@ package io.novafoundation.nova.feature_account_api.data.derivationPath -import jp.co.soramitsu.fearless_utils.encrypt.junction.BIP32JunctionDecoder -import jp.co.soramitsu.fearless_utils.encrypt.junction.JunctionDecoder -import jp.co.soramitsu.fearless_utils.encrypt.junction.SubstrateJunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.junction.BIP32JunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.junction.JunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.junction.SubstrateJunctionDecoder object DerivationPathDecoder { diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/ethereum/transaction/TransactionOrigin.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/ethereum/transaction/TransactionOrigin.kt index bf22ceebdf..7b58700734 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/ethereum/transaction/TransactionOrigin.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/ethereum/transaction/TransactionOrigin.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_account_api.data.ethereum.transaction import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId sealed class TransactionOrigin { diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/extrinsic/ExtrinsicService.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/extrinsic/ExtrinsicService.kt index 9d462a9eba..71b8660535 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/extrinsic/ExtrinsicService.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/extrinsic/ExtrinsicService.kt @@ -8,10 +8,10 @@ import io.novafoundation.nova.runtime.extrinsic.ExtrinsicStatus import io.novafoundation.nova.runtime.extrinsic.multi.CallBuilder import io.novafoundation.nova.runtime.extrinsic.signer.FeeSigner import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.BatchMode -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.Signer +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.BatchMode +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.Signer import kotlinx.coroutines.flow.Flow typealias FormExtrinsicWithOrigin = suspend ExtrinsicBuilder.(origin: SubmissionOrigin) -> Unit diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/model/OnChainIdentity.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/model/OnChainIdentity.kt index 985d72b54c..d1c9982124 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/model/OnChainIdentity.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/model/OnChainIdentity.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_account_api.data.model -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface OnChainIdentity { val display: String? diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/proxy/validation/ProxiedExtrinsicValidationSystem.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/proxy/validation/ProxiedExtrinsicValidationSystem.kt index 21d8b205d5..e19ceec34f 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/proxy/validation/ProxiedExtrinsicValidationSystem.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/proxy/validation/ProxiedExtrinsicValidationSystem.kt @@ -7,8 +7,8 @@ import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount import io.novafoundation.nova.runtime.multiNetwork.ChainWithAsset import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import java.math.BigInteger -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall typealias ProxiedExtrinsicValidationSystem = ValidationSystem typealias ProxiedExtrinsicValidationSystemBuilder = ValidationSystemBuilder diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/repository/OnChainIdentityRepository.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/repository/OnChainIdentityRepository.kt index 5f3ed713a7..3bae83758d 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/repository/OnChainIdentityRepository.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/repository/OnChainIdentityRepository.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_account_api.data.model.AccountIdMap import io.novafoundation.nova.feature_account_api.data.model.OnChainIdentity import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface OnChainIdentityRepository { diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/repository/addAccount/proxied/ProxiedAddAccountRepository.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/repository/addAccount/proxied/ProxiedAddAccountRepository.kt index dbb14c7de5..155427936c 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/repository/addAccount/proxied/ProxiedAddAccountRepository.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/repository/addAccount/proxied/ProxiedAddAccountRepository.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.feature_account_api.data.repository.addAccount.Add import io.novafoundation.nova.feature_account_api.domain.account.identity.Identity import io.novafoundation.nova.feature_proxy_api.domain.model.ProxyType import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface ProxiedAddAccountRepository : AddAccountRepository { diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/secrets/SecretStoreExt.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/secrets/SecretStoreExt.kt index 959b84e326..7b11c1c577 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/secrets/SecretStoreExt.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/secrets/SecretStoreExt.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.common.data.secrets.v2.mapChainAccountSecretsToKey import io.novafoundation.nova.common.data.secrets.v2.mapMetaAccountSecretsToDerivationPath import io.novafoundation.nova.common.data.secrets.v2.mapMetaAccountSecretsToKeypair import io.novafoundation.nova.common.utils.fold -import jp.co.soramitsu.fearless_utils.encrypt.keypair.Keypair +import io.novasama.substrate_sdk_android.encrypt.keypair.Keypair import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount import io.novafoundation.nova.feature_account_api.domain.model.accountIdIn import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/signer/SeparateFlowSignerState.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/signer/SeparateFlowSignerState.kt index 2f5928571e..826d496a98 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/signer/SeparateFlowSignerState.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/data/signer/SeparateFlowSignerState.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_account_api.data.signer import io.novafoundation.nova.common.utils.MutableSharedState import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic typealias SigningSharedState = MutableSharedState diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/identity/IdentityProvider.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/identity/IdentityProvider.kt index 9908fe8a31..867748f2d3 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/identity/IdentityProvider.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/identity/IdentityProvider.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_account_api.domain.account.identity import io.novafoundation.nova.common.address.AccountIdKey import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface IdentityProvider { diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/identity/OneOfIdentityProvider.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/identity/OneOfIdentityProvider.kt index 619b0d9ce1..a5110f7570 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/identity/OneOfIdentityProvider.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/identity/OneOfIdentityProvider.kt @@ -2,8 +2,8 @@ package io.novafoundation.nova.feature_account_api.domain.account.identity import io.novafoundation.nova.common.address.AccountIdKey import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.extensions.tryFindNonNull -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.extensions.tryFindNonNull +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/system/CompoundSystemAccountMatcher.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/system/CompoundSystemAccountMatcher.kt index e015081536..36f216ce4b 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/system/CompoundSystemAccountMatcher.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/system/CompoundSystemAccountMatcher.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_account_api.domain.account.system -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class CompoundSystemAccountMatcher( private val delegates: List diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/system/PrefixSystemAccountMatcher.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/system/PrefixSystemAccountMatcher.kt index 399723e39e..e71763d9c8 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/system/PrefixSystemAccountMatcher.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/system/PrefixSystemAccountMatcher.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_account_api.domain.account.system import io.novafoundation.nova.common.utils.startsWith -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class PrefixSystemAccountMatcher(prefix: String) : SystemAccountMatcher { diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/system/SystemAccountMatcher.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/system/SystemAccountMatcher.kt index 43ffe660c9..dacd6e98ab 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/system/SystemAccountMatcher.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/account/system/SystemAccountMatcher.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_account_api.domain.account.system -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface SystemAccountMatcher { diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/interfaces/AccountInteractor.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/interfaces/AccountInteractor.kt index a0aa602edd..6e90f55429 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/interfaces/AccountInteractor.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/interfaces/AccountInteractor.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.feature_account_api.domain.model.Account import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount import io.novafoundation.nova.feature_account_api.domain.model.PreferredCryptoType import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.Mnemonic +import io.novasama.substrate_sdk_android.encrypt.mnemonic.Mnemonic import kotlinx.coroutines.flow.Flow interface AccountInteractor { diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/interfaces/AccountRepository.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/interfaces/AccountRepository.kt index bfd15480ea..963eb85cad 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/interfaces/AccountRepository.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/interfaces/AccountRepository.kt @@ -10,8 +10,8 @@ import io.novafoundation.nova.feature_account_api.domain.model.MetaAccountAssetB import io.novafoundation.nova.feature_account_api.domain.model.MetaAccountOrdering import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.Mnemonic -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.encrypt.mnemonic.Mnemonic +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow class AccountAlreadyExistsException : Exception() diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/interfaces/AccountRepositoryExt.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/interfaces/AccountRepositoryExt.kt index a9c3196f6e..4aeaf35440 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/interfaces/AccountRepositoryExt.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/interfaces/AccountRepositoryExt.kt @@ -6,8 +6,8 @@ import io.novafoundation.nova.feature_account_api.domain.model.accountIdIn import io.novafoundation.nova.feature_account_api.domain.model.requireAccountIdIn import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId suspend fun AccountRepository.findMetaAccountOrThrow(accountId: AccountId, chainId: ChainId) = findMetaAccount(accountId, chainId) ?: error("No meta account found for accountId: ${accountId.toHexString()}") diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/model/Account.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/model/Account.kt index 24135bf67a..5aa775e61a 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/model/Account.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/model/Account.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_account_api.domain.model import io.novafoundation.nova.core.model.CryptoType import io.novafoundation.nova.core.model.Network -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex data class Account( val address: String, diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/model/MetaAccount.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/model/MetaAccount.kt index 9b22a3908d..92e9dd62ee 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/model/MetaAccount.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/model/MetaAccount.kt @@ -8,11 +8,11 @@ import io.novafoundation.nova.runtime.ext.toEthereumAddress import io.novafoundation.nova.runtime.multiNetwork.ChainsById import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.encrypt.MultiChainEncryption -import jp.co.soramitsu.fearless_utils.extensions.asEthereumPublicKey -import jp.co.soramitsu.fearless_utils.extensions.toAccountId -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAddress +import io.novasama.substrate_sdk_android.encrypt.MultiChainEncryption +import io.novasama.substrate_sdk_android.extensions.asEthereumPublicKey +import io.novasama.substrate_sdk_android.extensions.toAccountId +import io.novasama.substrate_sdk_android.ss58.SS58Encoder +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAddress class MetaAccountOrdering( val id: Long, diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/validation/NotSelfAccountValidation.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/validation/NotSelfAccountValidation.kt index bc70fea56a..83a2b9cfe2 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/validation/NotSelfAccountValidation.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/validation/NotSelfAccountValidation.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.common.validation.validOrError import io.novafoundation.nova.feature_account_api.domain.interfaces.AccountRepository import io.novafoundation.nova.feature_account_api.domain.model.accountIdIn import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class NotSelfAccountValidation( private val chainProvider: (P) -> Chain, diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/validation/SystemAccountRecipientValidation.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/validation/SystemAccountRecipientValidation.kt index 08c82729e1..12f8908868 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/validation/SystemAccountRecipientValidation.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/domain/validation/SystemAccountRecipientValidation.kt @@ -10,7 +10,7 @@ import io.novafoundation.nova.common.validation.valid import io.novafoundation.nova.feature_account_api.R import io.novafoundation.nova.feature_account_api.domain.account.system.SystemAccountMatcher import io.novafoundation.nova.feature_account_api.domain.account.system.default -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class SystemAccountRecipientValidation( private val accountId: (P) -> AccountId?, diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/account/AddressDisplayUseCase.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/account/AddressDisplayUseCase.kt index 6d87f876db..0d47ceeb00 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/account/AddressDisplayUseCase.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/account/AddressDisplayUseCase.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.feature_account_api.domain.interfaces.AccountRepos import io.novafoundation.nova.runtime.ext.accountIdOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/account/icon/AddressIconGeneratorExt.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/account/icon/AddressIconGeneratorExt.kt index 76bd92e651..bfb66a7335 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/account/icon/AddressIconGeneratorExt.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/account/icon/AddressIconGeneratorExt.kt @@ -13,7 +13,7 @@ import io.novafoundation.nova.feature_account_api.presenatation.account.invoke import io.novafoundation.nova.runtime.ext.accountIdOf import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId suspend fun AddressIconGenerator.createAddressModel( chain: Chain, diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/actions/ExternalActions.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/actions/ExternalActions.kt index 5d3070202f..0e8cbaf060 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/actions/ExternalActions.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/actions/ExternalActions.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.feature_account_api.presenatation.chain.ChainUi import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ExplorerTemplateExtractor -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface ExternalActions : Browserable { diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/mixin/addressInput/inputSpec/EVMSpecProvider.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/mixin/addressInput/inputSpec/EVMSpecProvider.kt index 4003a3f0c7..28069e4698 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/mixin/addressInput/inputSpec/EVMSpecProvider.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/mixin/addressInput/inputSpec/EVMSpecProvider.kt @@ -2,9 +2,9 @@ package io.novafoundation.nova.feature_account_api.presenatation.mixin.addressIn import android.graphics.drawable.Drawable import io.novafoundation.nova.common.address.AddressIconGenerator -import jp.co.soramitsu.fearless_utils.extensions.asEthereumAddress -import jp.co.soramitsu.fearless_utils.extensions.isValid -import jp.co.soramitsu.fearless_utils.extensions.toAccountId +import io.novasama.substrate_sdk_android.extensions.asEthereumAddress +import io.novasama.substrate_sdk_android.extensions.isValid +import io.novasama.substrate_sdk_android.extensions.toAccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/mixin/addressInput/inputSpec/SubstrateSpecProvider.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/mixin/addressInput/inputSpec/SubstrateSpecProvider.kt index cc7226ae89..faf7998f7d 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/mixin/addressInput/inputSpec/SubstrateSpecProvider.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/mixin/addressInput/inputSpec/SubstrateSpecProvider.kt @@ -3,7 +3,7 @@ package io.novafoundation.nova.feature_account_api.presenatation.mixin.addressIn import android.graphics.drawable.Drawable import io.novafoundation.nova.common.address.AddressIconGenerator import io.novafoundation.nova.common.utils.isValidSS58Address -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/sign/SignInterScreenCommunicator.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/sign/SignInterScreenCommunicator.kt index caf7b9e74f..bffa49dac7 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/sign/SignInterScreenCommunicator.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/sign/SignInterScreenCommunicator.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.common.navigation.InterScreenRequester import io.novafoundation.nova.common.navigation.InterScreenResponder import io.novafoundation.nova.feature_account_api.presenatation.sign.SignInterScreenCommunicator.Request import io.novafoundation.nova.feature_account_api.presenatation.sign.SignInterScreenCommunicator.Response -import jp.co.soramitsu.fearless_utils.encrypt.SignatureWrapper +import io.novasama.substrate_sdk_android.encrypt.SignatureWrapper import kotlinx.android.parcel.Parcelize import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.first diff --git a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/sign/SignatureWrapperParcel.kt b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/sign/SignatureWrapperParcel.kt index 079db44726..a1ace15e80 100644 --- a/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/sign/SignatureWrapperParcel.kt +++ b/feature-account-api/src/main/java/io/novafoundation/nova/feature_account_api/presenatation/sign/SignatureWrapperParcel.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_account_api.presenatation.sign import android.os.Parcelable -import jp.co.soramitsu.fearless_utils.encrypt.SignatureWrapper +import io.novasama.substrate_sdk_android.encrypt.SignatureWrapper import kotlinx.android.parcel.Parcelize sealed class SignatureWrapperParcel : Parcelable { diff --git a/feature-account-impl/build.gradle b/feature-account-impl/build.gradle index 8d1f54825b..edf6c95407 100644 --- a/feature-account-impl/build.gradle +++ b/feature-account-impl/build.gradle @@ -58,7 +58,7 @@ dependencies { implementation bouncyCastleDep - implementation fearlessLibDep + implementation substrateSdkDep implementation biometricDep diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/ethereum/transaction/RealEvmTransactionService.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/ethereum/transaction/RealEvmTransactionService.kt index 284abe21fe..4d8bcd0e07 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/ethereum/transaction/RealEvmTransactionService.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/ethereum/transaction/RealEvmTransactionService.kt @@ -24,8 +24,8 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.getCallEthereumApiOrThrow -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw import org.web3j.crypto.RawTransaction import org.web3j.crypto.Sign import org.web3j.crypto.TransactionEncoder diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/extrinsic/RealExtrinsicService.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/extrinsic/RealExtrinsicService.kt index 11759d83f5..185e00f60d 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/extrinsic/RealExtrinsicService.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/extrinsic/RealExtrinsicService.kt @@ -30,10 +30,10 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.network.rpc.RpcCalls -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHex -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Extrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.BatchMode -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHex +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Extrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.BatchMode +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filterIsInstance diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/network/blockchain/AccountSubstrateSourceImpl.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/network/blockchain/AccountSubstrateSourceImpl.kt index 39fd5fe87c..8a891ffd93 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/network/blockchain/AccountSubstrateSourceImpl.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/network/blockchain/AccountSubstrateSourceImpl.kt @@ -1,10 +1,10 @@ package io.novafoundation.nova.feature_account_impl.data.network.blockchain import io.novafoundation.nova.common.data.network.rpc.SocketSingleRequestExecutor -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.nonNull -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.pojo -import jp.co.soramitsu.fearless_utils.wsrpc.request.base.RpcRequest -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.system.NodeNetworkTypeRequest +import io.novasama.substrate_sdk_android.wsrpc.mappers.nonNull +import io.novasama.substrate_sdk_android.wsrpc.mappers.pojo +import io.novasama.substrate_sdk_android.wsrpc.request.base.RpcRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.system.NodeNetworkTypeRequest class AccountSubstrateSourceImpl( private val socketRequestExecutor: SocketSingleRequestExecutor diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/network/blockchain/bindings/Identity.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/network/blockchain/bindings/Identity.kt index 2707e69a54..41c8c35b24 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/network/blockchain/bindings/Identity.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/network/blockchain/bindings/Identity.kt @@ -12,8 +12,8 @@ import io.novafoundation.nova.common.utils.second import io.novafoundation.nova.feature_account_api.data.model.OnChainIdentity import io.novafoundation.nova.feature_account_api.data.model.RootIdentity import io.novafoundation.nova.feature_account_api.data.model.SuperOf -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct @UseCaseBinding fun bindIdentity(dynamic: Any?): OnChainIdentity? { diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/AccountRepositoryImpl.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/AccountRepositoryImpl.kt index 0d2375bed3..8f08d5b741 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/AccountRepositoryImpl.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/AccountRepositoryImpl.kt @@ -32,10 +32,10 @@ import io.novafoundation.nova.feature_account_impl.data.repository.datasource.Ac import io.novafoundation.nova.runtime.ext.genesisHash import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.qr.MultiChainQrSharingFactory -import jp.co.soramitsu.fearless_utils.encrypt.json.JsonSeedEncoder -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.Mnemonic -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.MnemonicCreator -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.encrypt.json.JsonSeedEncoder +import io.novasama.substrate_sdk_android.encrypt.mnemonic.Mnemonic +import io.novasama.substrate_sdk_android.encrypt.mnemonic.MnemonicCreator +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/RealOnChainIdentityRepository.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/RealOnChainIdentityRepository.kt index b9fad78e4e..28810148e1 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/RealOnChainIdentityRepository.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/RealOnChainIdentityRepository.kt @@ -20,11 +20,11 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.module -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.module +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/addAccount/paritySigner/ParitySignerAddAccountRepository.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/addAccount/paritySigner/ParitySignerAddAccountRepository.kt index c9caff9060..c3e75f63e8 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/addAccount/paritySigner/ParitySignerAddAccountRepository.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/addAccount/paritySigner/ParitySignerAddAccountRepository.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.feature_account_api.data.proxy.ProxySyncService import io.novafoundation.nova.feature_account_api.domain.model.PolkadotVaultVariant import io.novafoundation.nova.feature_account_impl.data.repository.addAccount.BaseAddAccountRepository import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class ParitySignerAddAccountRepository( private val accountDao: MetaAccountDao, diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/addAccount/secrets/JsonAddAccountRepository.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/addAccount/secrets/JsonAddAccountRepository.kt index 1513108ce3..f0fd82b126 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/addAccount/secrets/JsonAddAccountRepository.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/addAccount/secrets/JsonAddAccountRepository.kt @@ -9,8 +9,8 @@ import io.novafoundation.nova.feature_account_api.domain.model.ImportJsonMetaDat import io.novafoundation.nova.feature_account_impl.data.repository.datasource.AccountDataSource import io.novafoundation.nova.feature_account_impl.data.secrets.AccountSecretsFactory import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry -import jp.co.soramitsu.fearless_utils.encrypt.json.JsonSeedDecoder -import jp.co.soramitsu.fearless_utils.encrypt.model.NetworkTypeIdentifier +import io.novasama.substrate_sdk_android.encrypt.json.JsonSeedDecoder +import io.novasama.substrate_sdk_android.encrypt.model.NetworkTypeIdentifier import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/addAccount/watchOnly/WatchOnlyAddAccountRepository.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/addAccount/watchOnly/WatchOnlyAddAccountRepository.kt index e27f5400e9..92dacc2643 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/addAccount/watchOnly/WatchOnlyAddAccountRepository.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/addAccount/watchOnly/WatchOnlyAddAccountRepository.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.core_db.model.chain.account.MetaAccountLocal import io.novafoundation.nova.feature_account_api.data.proxy.ProxySyncService import io.novafoundation.nova.feature_account_impl.data.repository.addAccount.BaseAddAccountRepository import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class WatchOnlyAddAccountRepository( private val accountDao: MetaAccountDao, diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/datasource/AccountDataSource.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/datasource/AccountDataSource.kt index aa88047d57..5e1c16be6d 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/datasource/AccountDataSource.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/datasource/AccountDataSource.kt @@ -14,8 +14,8 @@ import io.novafoundation.nova.feature_account_api.domain.model.MetaAccountAssetB import io.novafoundation.nova.feature_account_api.domain.model.MetaAccountOrdering import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.scale.EncodableStruct +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.scale.EncodableStruct import kotlinx.coroutines.flow.Flow interface AccountDataSource : SecretStoreV1 { diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/datasource/AccountDataSourceImpl.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/datasource/AccountDataSourceImpl.kt index 7ea0c83fe5..a403a2241f 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/datasource/AccountDataSourceImpl.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/datasource/AccountDataSourceImpl.kt @@ -32,10 +32,10 @@ import io.novafoundation.nova.runtime.ext.accountIdOf import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.extensions.asEthereumPublicKey -import jp.co.soramitsu.fearless_utils.extensions.toAccountId -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.scale.EncodableStruct +import io.novasama.substrate_sdk_android.extensions.asEthereumPublicKey +import io.novasama.substrate_sdk_android.extensions.toAccountId +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.scale.EncodableStruct import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.flow.Flow diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/datasource/migration/AccountDataMigration.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/datasource/migration/AccountDataMigration.kt index b0e89f0683..b7132fafa4 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/datasource/migration/AccountDataMigration.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/repository/datasource/migration/AccountDataMigration.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.common.data.storage.encrypt.EncryptedPreferences import io.novafoundation.nova.core.model.SecuritySource import io.novafoundation.nova.core_db.dao.AccountDao import io.novafoundation.nova.core_db.model.AccountLocal -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.MnemonicCreator -import jp.co.soramitsu.fearless_utils.scale.Schema -import jp.co.soramitsu.fearless_utils.scale.byteArray +import io.novasama.substrate_sdk_android.encrypt.mnemonic.MnemonicCreator +import io.novasama.substrate_sdk_android.scale.Schema +import io.novasama.substrate_sdk_android.scale.byteArray import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.bouncycastle.util.encoders.Hex diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/secrets/AccountSecretsFactory.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/secrets/AccountSecretsFactory.kt index 5e19315d73..6be961c89e 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/secrets/AccountSecretsFactory.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/secrets/AccountSecretsFactory.kt @@ -9,18 +9,18 @@ import io.novafoundation.nova.common.utils.castOrNull import io.novafoundation.nova.common.utils.deriveSeed32 import io.novafoundation.nova.core.model.CryptoType import io.novafoundation.nova.feature_account_api.data.derivationPath.DerivationPathDecoder -import jp.co.soramitsu.fearless_utils.encrypt.MultiChainEncryption -import jp.co.soramitsu.fearless_utils.encrypt.json.JsonSeedDecoder -import jp.co.soramitsu.fearless_utils.encrypt.junction.JunctionDecoder -import jp.co.soramitsu.fearless_utils.encrypt.keypair.ethereum.EthereumKeypairFactory -import jp.co.soramitsu.fearless_utils.encrypt.keypair.substrate.SubstrateKeypairFactory -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.MnemonicCreator -import jp.co.soramitsu.fearless_utils.encrypt.seed.SeedFactory -import jp.co.soramitsu.fearless_utils.encrypt.seed.ethereum.EthereumSeedFactory -import jp.co.soramitsu.fearless_utils.encrypt.seed.substrate.SubstrateSeedFactory -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.scale.EncodableStruct -import jp.co.soramitsu.fearless_utils.scale.Schema +import io.novasama.substrate_sdk_android.encrypt.MultiChainEncryption +import io.novasama.substrate_sdk_android.encrypt.json.JsonSeedDecoder +import io.novasama.substrate_sdk_android.encrypt.junction.JunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.keypair.ethereum.EthereumKeypairFactory +import io.novasama.substrate_sdk_android.encrypt.keypair.substrate.SubstrateKeypairFactory +import io.novasama.substrate_sdk_android.encrypt.mnemonic.MnemonicCreator +import io.novasama.substrate_sdk_android.encrypt.seed.SeedFactory +import io.novasama.substrate_sdk_android.encrypt.seed.ethereum.EthereumSeedFactory +import io.novasama.substrate_sdk_android.encrypt.seed.substrate.SubstrateSeedFactory +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.scale.EncodableStruct +import io.novasama.substrate_sdk_android.scale.Schema import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/DefaultFeeSigner.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/DefaultFeeSigner.kt index 0b08f12712..597f4dccfd 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/DefaultFeeSigner.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/DefaultFeeSigner.kt @@ -5,17 +5,17 @@ import io.novafoundation.nova.feature_account_api.domain.model.requireAccountIdI import io.novafoundation.nova.runtime.ext.accountIdOf import io.novafoundation.nova.runtime.extrinsic.signer.FeeSigner import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.encrypt.EncryptionType -import jp.co.soramitsu.fearless_utils.encrypt.MultiChainEncryption -import jp.co.soramitsu.fearless_utils.encrypt.keypair.Keypair -import jp.co.soramitsu.fearless_utils.encrypt.keypair.ethereum.EthereumKeypairFactory -import jp.co.soramitsu.fearless_utils.encrypt.keypair.substrate.SubstrateKeypairFactory -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.KeyPairSigner -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedRaw -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.encrypt.EncryptionType +import io.novasama.substrate_sdk_android.encrypt.MultiChainEncryption +import io.novasama.substrate_sdk_android.encrypt.keypair.Keypair +import io.novasama.substrate_sdk_android.encrypt.keypair.ethereum.EthereumKeypairFactory +import io.novasama.substrate_sdk_android.encrypt.keypair.substrate.SubstrateKeypairFactory +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.KeyPairSigner +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw private val FAKE_CRYPTO_TYPE = EncryptionType.ECDSA diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/LeafSigner.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/LeafSigner.kt index 334f5dff48..a5b9f63d21 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/LeafSigner.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/LeafSigner.kt @@ -4,8 +4,8 @@ import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount import io.novafoundation.nova.feature_account_api.domain.model.requireAccountIdIn import io.novafoundation.nova.runtime.extrinsic.signer.NovaSigner import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic abstract class LeafSigner( private val metaAccount: MetaAccount, diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/SeparateFlowSigner.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/SeparateFlowSigner.kt index e8d3a5eee0..949868af9d 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/SeparateFlowSigner.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/SeparateFlowSigner.kt @@ -8,8 +8,8 @@ import io.novafoundation.nova.feature_account_api.presenatation.sign.SignInterSc import io.novafoundation.nova.feature_account_api.presenatation.sign.SignInterScreenRequester import io.novafoundation.nova.feature_account_api.presenatation.sign.SignatureWrapper import io.novafoundation.nova.feature_account_api.presenatation.sign.awaitConfirmation -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/ledger/LedgerSigner.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/ledger/LedgerSigner.kt index e85beeb8c3..fa9427c97b 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/ledger/LedgerSigner.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/ledger/LedgerSigner.kt @@ -8,8 +8,8 @@ import io.novafoundation.nova.feature_account_api.presenatation.sign.SignInterSc import io.novafoundation.nova.feature_account_impl.R import io.novafoundation.nova.feature_account_impl.data.signer.SeparateFlowSigner import io.novafoundation.nova.feature_account_impl.presentation.common.sign.notSupported.SigningNotSupportedPresentable -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedRaw -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw class LedgerSignerFactory( private val signingSharedState: SigningSharedState, diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/paritySigner/PolkadotVaultSigner.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/paritySigner/PolkadotVaultSigner.kt index 08cae450ac..e11b753c19 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/paritySigner/PolkadotVaultSigner.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/paritySigner/PolkadotVaultSigner.kt @@ -10,10 +10,10 @@ import io.novafoundation.nova.feature_account_api.presenatation.account.polkadot import io.novafoundation.nova.feature_account_impl.R import io.novafoundation.nova.feature_account_impl.data.signer.SeparateFlowSigner import io.novafoundation.nova.feature_account_impl.presentation.common.sign.notSupported.SigningNotSupportedPresentable -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedRaw -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw class PolkadotVaultVariantSignerFactory( private val signingSharedState: SigningSharedState, diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/paritySigner/transaction/Encoder.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/paritySigner/transaction/Encoder.kt index 80f0444090..572a75b994 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/paritySigner/transaction/Encoder.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/paritySigner/transaction/Encoder.kt @@ -1,11 +1,11 @@ package io.novafoundation.nova.feature_account_impl.data.signer.paritySigner.transaction -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.encodedCallData -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.encodedExtensions -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.genesisHash -import jp.co.soramitsu.fearless_utils.scale.dataType.compactInt -import jp.co.soramitsu.fearless_utils.scale.dataType.toByteArray +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.encodedCallData +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.encodedExtensions +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.genesisHash +import io.novasama.substrate_sdk_android.scale.dataType.compactInt +import io.novasama.substrate_sdk_android.scale.dataType.toByteArray fun SignerPayloadExtrinsic.paritySignerTxPayload(): ByteArray { return accountId + transientCallData() + encodedExtensions() + genesisHash diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/ProxiedFeeSigner.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/ProxiedFeeSigner.kt index 6713f92d23..5d5a61622a 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/ProxiedFeeSigner.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/ProxiedFeeSigner.kt @@ -8,11 +8,11 @@ import io.novafoundation.nova.feature_account_api.domain.model.requireAccountIdI import io.novafoundation.nova.feature_proxy_api.domain.model.ProxyType import io.novafoundation.nova.runtime.extrinsic.signer.FeeSigner import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedRaw -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw import java.math.BigInteger class ProxiedFeeSignerFactory( diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/ProxiedSigner.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/ProxiedSigner.kt index f4cc427837..733b10cb24 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/ProxiedSigner.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/ProxiedSigner.kt @@ -21,11 +21,11 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.ChainWithAsset import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.network.rpc.RpcCalls -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedRaw -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw class ProxiedSignerFactory( private val chainRegistry: ChainRegistry, diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/ProxyCallFilterFactory.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/ProxyCallFilterFactory.kt index 8d1638787d..648adbd913 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/ProxyCallFilterFactory.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/ProxyCallFilterFactory.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_account_impl.data.signer.proxy.callFilter. import io.novafoundation.nova.feature_account_impl.data.signer.proxy.callFilter.EverythingFilter import io.novafoundation.nova.feature_account_impl.data.signer.proxy.callFilter.WhiteListFilter import io.novafoundation.nova.feature_proxy_api.domain.model.ProxyType -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall class ProxyCallFilterFactory { diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/SignerPayloadModifierExt.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/SignerPayloadModifierExt.kt index 8aa9eda85d..2a1e3b1937 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/SignerPayloadModifierExt.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/SignerPayloadModifierExt.kt @@ -3,15 +3,15 @@ package io.novafoundation.nova.feature_account_impl.data.signer.proxy import io.novafoundation.nova.common.utils.Modules import io.novafoundation.nova.feature_proxy_api.domain.model.ProxyType import io.novafoundation.nova.runtime.extrinsic.multi.SimpleCallBuilder -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.DefaultSignedExtensions -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Extrinsic.EncodingInstance.CallRepresentation -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.instances.AddressInstanceConstructor -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.encodeNonce -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.replaceBaseNone -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.DefaultSignedExtensions +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Extrinsic.EncodingInstance.CallRepresentation +import io.novasama.substrate_sdk_android.runtime.definitions.types.instances.AddressInstanceConstructor +import io.novasama.substrate_sdk_android.runtime.extrinsic.encodeNonce +import io.novasama.substrate_sdk_android.runtime.extrinsic.replaceBaseNone +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic import java.math.BigInteger fun SignerPayloadExtrinsic.wrapIntoProxyPayload( diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/AnyOfCallFilter.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/AnyOfCallFilter.kt index 637ad90e6e..1efa97f316 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/AnyOfCallFilter.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/AnyOfCallFilter.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_account_impl.data.signer.proxy.callFilter -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall class AnyOfCallFilter( private val filters: List diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/CallFilter.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/CallFilter.kt index 24c5ec2188..139a3a1c05 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/CallFilter.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/CallFilter.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_account_impl.data.signer.proxy.callFilter -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall interface CallFilter { fun canExecute(call: GenericCall.Instance): Boolean diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/EverythingFilter.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/EverythingFilter.kt index 326e6b2b05..fed9832e34 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/EverythingFilter.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/EverythingFilter.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_account_impl.data.signer.proxy.callFilter -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall class EverythingFilter : CallFilter { diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/WhiteListFilter.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/WhiteListFilter.kt index e5029ac459..c3b4f78f40 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/WhiteListFilter.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/proxy/callFilter/WhiteListFilter.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_account_impl.data.signer.proxy.callFilter -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall class WhiteListFilter(private val matchingModule: String, private val matchingCalls: List?) : CallFilter { diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/secrets/SecretsSigner.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/secrets/SecretsSigner.kt index e1b35e6d84..23526d9fb2 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/secrets/SecretsSigner.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/secrets/SecretsSigner.kt @@ -11,13 +11,13 @@ import io.novafoundation.nova.feature_account_api.domain.model.multiChainEncrypt import io.novafoundation.nova.feature_account_impl.data.signer.LeafSigner import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chainsById -import jp.co.soramitsu.fearless_utils.encrypt.MultiChainEncryption -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.KeyPairSigner -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedRaw -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.encrypt.MultiChainEncryption +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.KeyPairSigner +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw class SecretsSignerFactory( private val secretStoreV2: SecretStoreV2, diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/watchOnly/WatchOnlySigner.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/watchOnly/WatchOnlySigner.kt index 2bfac7055d..51fa61bf48 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/watchOnly/WatchOnlySigner.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/data/signer/watchOnly/WatchOnlySigner.kt @@ -4,10 +4,10 @@ import io.novafoundation.nova.common.base.errors.SigningCancelledException import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount import io.novafoundation.nova.feature_account_api.presenatation.account.watchOnly.WatchOnlyMissingKeysPresenter import io.novafoundation.nova.feature_account_impl.data.signer.LeafSigner -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignedRaw -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignedRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw class WatchOnlySignerFactory( private val watchOnlySigningPresenter: WatchOnlyMissingKeysPresenter, diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/di/AccountFeatureDependencies.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/di/AccountFeatureDependencies.kt index d9d1ae5c7c..5b2494caff 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/di/AccountFeatureDependencies.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/di/AccountFeatureDependencies.kt @@ -46,7 +46,7 @@ import io.novafoundation.nova.runtime.multiNetwork.qr.MultiChainQrSharingFactory import io.novafoundation.nova.runtime.network.rpc.RpcCalls import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.web3names.domain.networking.Web3NamesInteractor -import jp.co.soramitsu.fearless_utils.icon.IconGenerator +import io.novasama.substrate_sdk_android.icon.IconGenerator import java.util.Random import javax.inject.Named diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/di/AccountFeatureModule.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/di/AccountFeatureModule.kt index 5d12bfd469..361f437611 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/di/AccountFeatureModule.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/di/AccountFeatureModule.kt @@ -108,10 +108,10 @@ import io.novafoundation.nova.runtime.multiNetwork.qr.MultiChainQrSharingFactory import io.novafoundation.nova.runtime.network.rpc.RpcCalls import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.web3names.domain.networking.Web3NamesInteractor -import jp.co.soramitsu.fearless_utils.encrypt.MultiChainEncryption -import jp.co.soramitsu.fearless_utils.encrypt.json.JsonSeedDecoder -import jp.co.soramitsu.fearless_utils.encrypt.json.JsonSeedEncoder -import jp.co.soramitsu.fearless_utils.encrypt.junction.BIP32JunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.MultiChainEncryption +import io.novasama.substrate_sdk_android.encrypt.json.JsonSeedDecoder +import io.novasama.substrate_sdk_android.encrypt.json.JsonSeedEncoder +import io.novasama.substrate_sdk_android.encrypt.junction.BIP32JunctionDecoder import javax.inject.Named @Module( diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/di/AddAccountsModule.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/di/AddAccountsModule.kt index ad738bf6be..ec374d41bc 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/di/AddAccountsModule.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/di/AddAccountsModule.kt @@ -18,7 +18,7 @@ import io.novafoundation.nova.feature_account_impl.data.repository.addAccount.se import io.novafoundation.nova.feature_account_impl.data.repository.addAccount.secrets.SeedAddAccountRepository import io.novafoundation.nova.feature_account_impl.data.repository.addAccount.watchOnly.WatchOnlyAddAccountRepository import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry -import jp.co.soramitsu.fearless_utils.encrypt.json.JsonSeedDecoder +import io.novasama.substrate_sdk_android.encrypt.json.JsonSeedDecoder @Module() class AddAccountsModule { diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/AccountInteractorImpl.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/AccountInteractorImpl.kt index b719e586a1..c32fe4afff 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/AccountInteractorImpl.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/AccountInteractorImpl.kt @@ -15,7 +15,7 @@ import io.novafoundation.nova.feature_account_impl.domain.errors.NodeAlreadyExis import io.novafoundation.nova.feature_account_impl.domain.errors.UnsupportedNetworkException import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.Mnemonic +import io.novasama.substrate_sdk_android.encrypt.mnemonic.Mnemonic import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.withContext diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/advancedEncryption/valiadtion/DerivationPathValidation.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/advancedEncryption/valiadtion/DerivationPathValidation.kt index 8fd9a59580..c489759938 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/advancedEncryption/valiadtion/DerivationPathValidation.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/advancedEncryption/valiadtion/DerivationPathValidation.kt @@ -4,9 +4,9 @@ import io.novafoundation.nova.common.utils.input.Input import io.novafoundation.nova.common.utils.input.fold import io.novafoundation.nova.common.validation.ValidationStatus import io.novafoundation.nova.common.validation.validOrError -import jp.co.soramitsu.fearless_utils.encrypt.junction.BIP32JunctionDecoder -import jp.co.soramitsu.fearless_utils.encrypt.junction.JunctionDecoder -import jp.co.soramitsu.fearless_utils.encrypt.junction.SubstrateJunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.junction.BIP32JunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.junction.JunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.junction.SubstrateJunctionDecoder sealed class DerivationPathValidation( private val junctionDecoder: JunctionDecoder, diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/details/AccountInChain.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/details/AccountInChain.kt index 08858d970a..79a8205c82 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/details/AccountInChain.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/details/AccountInChain.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_account_impl.domain.account.details import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class AccountInChain( val chain: Chain, diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/export/mnemonic/ExportMnemonicInteractor.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/export/mnemonic/ExportMnemonicInteractor.kt index 30ab39544d..0f7906ecf1 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/export/mnemonic/ExportMnemonicInteractor.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/export/mnemonic/ExportMnemonicInteractor.kt @@ -6,8 +6,8 @@ import io.novafoundation.nova.feature_account_api.data.secrets.getAccountSecrets import io.novafoundation.nova.feature_account_api.domain.interfaces.AccountRepository import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.Mnemonic -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.MnemonicCreator +import io.novasama.substrate_sdk_android.encrypt.mnemonic.Mnemonic +import io.novasama.substrate_sdk_android.encrypt.mnemonic.MnemonicCreator import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/export/seed/ExportSeedInteractor.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/export/seed/ExportSeedInteractor.kt index e47907a086..59e2323caa 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/export/seed/ExportSeedInteractor.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/export/seed/ExportSeedInteractor.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_account_api.data.secrets.getAccountSecrets import io.novafoundation.nova.feature_account_api.domain.interfaces.AccountRepository import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/identity/LocalIdentityProvider.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/identity/LocalIdentityProvider.kt index 95ce1009d1..0b50a5ae5a 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/identity/LocalIdentityProvider.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/identity/LocalIdentityProvider.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.feature_account_api.domain.model.hasAccountIn import io.novafoundation.nova.feature_account_api.domain.model.requireAccountIdIn import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/identity/OnChainIdentityProvider.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/identity/OnChainIdentityProvider.kt index 4f9ba14492..42c58b6504 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/identity/OnChainIdentityProvider.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/account/identity/OnChainIdentityProvider.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_account_api.data.repository.OnChainIdentit import io.novafoundation.nova.feature_account_api.domain.account.identity.Identity import io.novafoundation.nova.feature_account_api.domain.account.identity.IdentityProvider import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class OnChainIdentityProvider( private val onChainIdentityRepository: OnChainIdentityRepository diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/connect/finish/FinishImportParitySignerInteractor.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/connect/finish/FinishImportParitySignerInteractor.kt index d2e1171c6d..0fc1b413ef 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/connect/finish/FinishImportParitySignerInteractor.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/connect/finish/FinishImportParitySignerInteractor.kt @@ -3,7 +3,7 @@ package io.novafoundation.nova.feature_account_impl.domain.paritySigner.connect. import io.novafoundation.nova.feature_account_api.domain.interfaces.AccountRepository import io.novafoundation.nova.feature_account_api.domain.model.PolkadotVaultVariant import io.novafoundation.nova.feature_account_impl.data.repository.addAccount.paritySigner.ParitySignerAddAccountRepository -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/connect/preview/ParitySignerAccountInChain.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/connect/preview/ParitySignerAccountInChain.kt index 309d8f9b55..1c2f565aaa 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/connect/preview/ParitySignerAccountInChain.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/connect/preview/ParitySignerAccountInChain.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_account_impl.domain.paritySigner.connect.preview import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class ParitySignerAccountInChain( val chain: Chain, diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/connect/scan/ScanImportParitySignerInteractor.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/connect/scan/ScanImportParitySignerInteractor.kt index 15fdb7eb75..a76c52d196 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/connect/scan/ScanImportParitySignerInteractor.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/connect/scan/ScanImportParitySignerInteractor.kt @@ -1,9 +1,9 @@ package io.novafoundation.nova.feature_account_impl.domain.paritySigner.connect.scan -import jp.co.soramitsu.fearless_utils.encrypt.qr.QrFormat -import jp.co.soramitsu.fearless_utils.encrypt.qr.formats.SubstrateQrFormat -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.encrypt.qr.QrFormat +import io.novasama.substrate_sdk_android.encrypt.qr.formats.SubstrateQrFormat +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/sign/scan/ScanSignParitySignerInteractor.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/sign/scan/ScanSignParitySignerInteractor.kt index 9f58e7f08d..559e8dd693 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/sign/scan/ScanSignParitySignerInteractor.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/sign/scan/ScanSignParitySignerInteractor.kt @@ -1,12 +1,12 @@ package io.novafoundation.nova.feature_account_impl.domain.paritySigner.sign.scan import io.novafoundation.nova.common.utils.dropBytes -import jp.co.soramitsu.fearless_utils.encrypt.SignatureVerifier -import jp.co.soramitsu.fearless_utils.encrypt.SignatureWrapper -import jp.co.soramitsu.fearless_utils.encrypt.Signer -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.encodedSignaturePayload +import io.novasama.substrate_sdk_android.encrypt.SignatureVerifier +import io.novasama.substrate_sdk_android.encrypt.SignatureWrapper +import io.novasama.substrate_sdk_android.encrypt.Signer +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.encodedSignaturePayload import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/sign/show/ShowSignParitySignerInteractor.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/sign/show/ShowSignParitySignerInteractor.kt index ae52e5570c..4542ef7eed 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/sign/show/ShowSignParitySignerInteractor.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/paritySigner/sign/show/ShowSignParitySignerInteractor.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.feature_account_impl.data.signer.paritySigner.uos. import io.novafoundation.nova.feature_account_impl.data.signer.paritySigner.uos.ParitySignerUOSPayloadCode import io.novafoundation.nova.feature_account_impl.data.signer.paritySigner.uos.UOS import io.novafoundation.nova.feature_account_impl.data.signer.paritySigner.uos.paritySignerUOSCryptoType -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/watchOnly/create/CreateWatchWalletInteractor.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/watchOnly/create/CreateWatchWalletInteractor.kt index 22d4b6a9c9..f3f97ec7f7 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/watchOnly/create/CreateWatchWalletInteractor.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/domain/watchOnly/create/CreateWatchWalletInteractor.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.feature_account_api.domain.interfaces.AccountRepos import io.novafoundation.nova.feature_account_impl.data.repository.WatchOnlyRepository import io.novafoundation.nova.feature_account_impl.data.repository.WatchWalletSuggestion import io.novafoundation.nova.feature_account_impl.data.repository.addAccount.watchOnly.WatchOnlyAddAccountRepository -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId interface CreateWatchWalletInteractor { diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/account/wallet/WalletUiUseCaseImpl.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/account/wallet/WalletUiUseCaseImpl.kt index 486f51ca20..24d0dc4d2c 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/account/wallet/WalletUiUseCaseImpl.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/account/wallet/WalletUiUseCaseImpl.kt @@ -12,7 +12,7 @@ import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount.ChainAccount import io.novafoundation.nova.feature_account_api.presenatation.account.wallet.WalletModel import io.novafoundation.nova.feature_account_api.presenatation.account.wallet.WalletUiUseCase -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.mapLatest diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/common/mnemonic/MnemonicExt.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/common/mnemonic/MnemonicExt.kt index 6c56ee480b..76ad173fa8 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/common/mnemonic/MnemonicExt.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/common/mnemonic/MnemonicExt.kt @@ -1,5 +1,5 @@ package io.novafoundation.nova.feature_account_impl.presentation.common.mnemonic -import jp.co.soramitsu.fearless_utils.encrypt.mnemonic.Mnemonic +import io.novasama.substrate_sdk_android.encrypt.mnemonic.Mnemonic fun Mnemonic.spacedWords(spacing: Int = 2) = wordList.joinToString(separator = " ".repeat(spacing)) diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/importing/ImportAccountViewModel.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/importing/ImportAccountViewModel.kt index a0db39ac86..dcb567b7ef 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/importing/ImportAccountViewModel.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/importing/ImportAccountViewModel.kt @@ -19,8 +19,8 @@ import io.novafoundation.nova.feature_account_impl.presentation.common.mixin.api import io.novafoundation.nova.feature_account_impl.presentation.importing.source.ImportSourceFactory import io.novafoundation.nova.feature_account_impl.presentation.importing.source.source.FileRequester import io.novafoundation.nova.feature_account_impl.presentation.importing.source.source.ImportError -import jp.co.soramitsu.fearless_utils.encrypt.junction.BIP32JunctionDecoder -import jp.co.soramitsu.fearless_utils.encrypt.junction.JunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.junction.BIP32JunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.junction.JunctionDecoder import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.launch diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/importing/source/source/JsonImportSource.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/importing/source/source/JsonImportSource.kt index 891d99759d..570097a200 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/importing/source/source/JsonImportSource.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/importing/source/source/JsonImportSource.kt @@ -20,7 +20,7 @@ import io.novafoundation.nova.feature_account_impl.presentation.importing.FileRe import io.novafoundation.nova.feature_account_impl.presentation.importing.ImportAccountViewModel import io.novafoundation.nova.feature_account_impl.presentation.importing.source.view.ImportSourceView import io.novafoundation.nova.feature_account_impl.presentation.importing.source.view.JsonImportView -import jp.co.soramitsu.fearless_utils.encrypt.json.JsonSeedDecodingException +import io.novasama.substrate_sdk_android.encrypt.json.JsonSeedDecodingException import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/importing/source/source/MnemonicImportSource.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/importing/source/source/MnemonicImportSource.kt index 683e212689..8fb6073cb3 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/importing/source/source/MnemonicImportSource.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/importing/source/source/MnemonicImportSource.kt @@ -13,7 +13,7 @@ import io.novafoundation.nova.feature_account_impl.domain.common.AdvancedEncrypt import io.novafoundation.nova.feature_account_impl.presentation.importing.ImportAccountViewModel import io.novafoundation.nova.feature_account_impl.presentation.importing.source.view.ImportSourceView import io.novafoundation.nova.feature_account_impl.presentation.importing.source.view.MnemonicImportView -import jp.co.soramitsu.fearless_utils.exceptions.Bip39Exception +import io.novasama.substrate_sdk_android.exceptions.Bip39Exception import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.async import kotlinx.coroutines.flow.Flow diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/mnemonic/confirm/ConfirmMnemonicViewModel.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/mnemonic/confirm/ConfirmMnemonicViewModel.kt index c041008b6d..da2488a7a4 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/mnemonic/confirm/ConfirmMnemonicViewModel.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/mnemonic/confirm/ConfirmMnemonicViewModel.kt @@ -18,8 +18,8 @@ import io.novafoundation.nova.feature_account_impl.data.mappers.mapAddAccountPay import io.novafoundation.nova.feature_account_impl.data.mappers.mapOptionalNameToNameChooserState import io.novafoundation.nova.feature_account_impl.domain.account.add.AddAccountInteractor import io.novafoundation.nova.feature_account_impl.presentation.AccountRouter -import jp.co.soramitsu.fearless_utils.encrypt.junction.BIP32JunctionDecoder -import jp.co.soramitsu.fearless_utils.encrypt.junction.JunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.junction.BIP32JunctionDecoder +import io.novasama.substrate_sdk_android.encrypt.junction.JunctionDecoder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/paritySigner/sign/scan/ScanSignParitySignerViewModel.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/paritySigner/sign/scan/ScanSignParitySignerViewModel.kt index 6de400028a..fd19e35f7c 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/paritySigner/sign/scan/ScanSignParitySignerViewModel.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/paritySigner/sign/scan/ScanSignParitySignerViewModel.kt @@ -17,7 +17,7 @@ import io.novafoundation.nova.feature_account_impl.presentation.AccountRouter import io.novafoundation.nova.feature_account_impl.presentation.paritySigner.sign.common.QrCodeExpiredPresentableFactory import io.novafoundation.nova.feature_account_impl.presentation.paritySigner.sign.scan.model.ScanSignParitySignerPayload import io.novafoundation.nova.feature_account_impl.presentation.paritySigner.sign.scan.model.mapValidityPeriodFromParcel -import jp.co.soramitsu.fearless_utils.encrypt.SignatureWrapper.Sr25519 +import io.novasama.substrate_sdk_android.encrypt.SignatureWrapper.Sr25519 import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.launch diff --git a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/paritySigner/sign/show/ShowSignParitySignerViewModel.kt b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/paritySigner/sign/show/ShowSignParitySignerViewModel.kt index a38f88628b..919ff44ced 100644 --- a/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/paritySigner/sign/show/ShowSignParitySignerViewModel.kt +++ b/feature-account-impl/src/main/java/io/novafoundation/nova/feature_account_impl/presentation/paritySigner/sign/show/ShowSignParitySignerViewModel.kt @@ -28,8 +28,8 @@ import io.novafoundation.nova.feature_account_impl.presentation.paritySigner.sig import io.novafoundation.nova.feature_account_impl.presentation.paritySigner.sign.scan.model.mapValidityPeriodToParcel import io.novafoundation.nova.runtime.extrinsic.ExtrinsicValidityUseCase import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.genesisHash +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.genesisHash import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch diff --git a/feature-assets/build.gradle b/feature-assets/build.gradle index 359356db07..48ab759f6c 100644 --- a/feature-assets/build.gradle +++ b/feature-assets/build.gradle @@ -78,7 +78,7 @@ dependencies { testImplementation jUnitDep testImplementation mockitoDep - implementation fearlessLibDep + implementation substrateSdkDep implementation gsonDep implementation retrofitDep diff --git a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/data/repository/TransactionHistoryRepository.kt b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/data/repository/TransactionHistoryRepository.kt index 37807546de..5087d67a61 100644 --- a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/data/repository/TransactionHistoryRepository.kt +++ b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/data/repository/TransactionHistoryRepository.kt @@ -22,7 +22,7 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.findNearestCoinRat import io.novafoundation.nova.runtime.ext.accountIdOrNull import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.mapLatest diff --git a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/di/AssetsFeatureDependencies.kt b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/di/AssetsFeatureDependencies.kt index 89c652c385..b398c7d5e1 100644 --- a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/di/AssetsFeatureDependencies.kt +++ b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/di/AssetsFeatureDependencies.kt @@ -77,9 +77,9 @@ import io.novafoundation.nova.runtime.repository.ChainStateRepository import io.novafoundation.nova.runtime.repository.ParachainInfoRepository import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.web3names.domain.networking.Web3NamesInteractor -import jp.co.soramitsu.fearless_utils.encrypt.Signer -import jp.co.soramitsu.fearless_utils.icon.IconGenerator -import jp.co.soramitsu.fearless_utils.wsrpc.logging.Logger +import io.novasama.substrate_sdk_android.encrypt.Signer +import io.novasama.substrate_sdk_android.icon.IconGenerator +import io.novasama.substrate_sdk_android.wsrpc.logging.Logger import javax.inject.Named interface AssetsFeatureDependencies { diff --git a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/assets/search/AssetSearchInteractor.kt b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/assets/search/AssetSearchInteractor.kt index e4df2f1943..96790acd0c 100644 --- a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/assets/search/AssetSearchInteractor.kt +++ b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/assets/search/AssetSearchInteractor.kt @@ -20,7 +20,7 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainsById import io.novafoundation.nova.runtime.multiNetwork.asset import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId import io.novafoundation.nova.runtime.multiNetwork.chainsById -import jp.co.soramitsu.fearless_utils.hash.isPositive +import io.novasama.substrate_sdk_android.hash.isPositive import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/send/SendInteractor.kt b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/send/SendInteractor.kt index 9948a49881..9a786d0036 100644 --- a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/send/SendInteractor.kt +++ b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/domain/send/SendInteractor.kt @@ -26,7 +26,7 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.networkFeePart import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.repository.ParachainInfoRepository -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-buy-api/build.gradle b/feature-buy-api/build.gradle index 6849529588..4856febd5d 100644 --- a/feature-buy-api/build.gradle +++ b/feature-buy-api/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation daggerDep kapt daggerKapt - implementation fearlessLibDep + implementation substrateSdkDep implementation androidDep implementation constraintDep diff --git a/feature-buy-impl/src/main/java/io/novafoundation/nova/feature_buy_impl/domain/providers/MercuryoProvider.kt b/feature-buy-impl/src/main/java/io/novafoundation/nova/feature_buy_impl/domain/providers/MercuryoProvider.kt index e599f056f2..f892be8400 100644 --- a/feature-buy-impl/src/main/java/io/novafoundation/nova/feature_buy_impl/domain/providers/MercuryoProvider.kt +++ b/feature-buy-impl/src/main/java/io/novafoundation/nova/feature_buy_impl/domain/providers/MercuryoProvider.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.common.utils.showBrowser import io.novafoundation.nova.common.utils.urlEncoded import io.novafoundation.nova.feature_buy_impl.R import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString private const val TYPE_BUY = "buy" private const val NETWORK_KEY = "network" diff --git a/feature-crowdloan-api/build.gradle b/feature-crowdloan-api/build.gradle index 8e9868ece8..a794d2be96 100644 --- a/feature-crowdloan-api/build.gradle +++ b/feature-crowdloan-api/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation daggerDep - implementation fearlessLibDep + implementation substrateSdkDep implementation androidDep diff --git a/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/network/blockhain/binding/DirectContribution.kt b/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/network/blockhain/binding/DirectContribution.kt index 43e3544767..63e416e5b7 100644 --- a/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/network/blockhain/binding/DirectContribution.kt +++ b/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/network/blockhain/binding/DirectContribution.kt @@ -5,8 +5,8 @@ import io.novafoundation.nova.common.data.network.runtime.binding.bindString import io.novafoundation.nova.common.data.network.runtime.binding.cast import io.novafoundation.nova.common.data.network.runtime.binding.incompatible import io.novafoundation.nova.feature_crowdloan_api.domain.contributions.Contribution.Companion.DIRECT_SOURCE_ID -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHex +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHex import java.math.BigInteger class DirectContribution( diff --git a/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/network/blockhain/binding/FundInfo.kt b/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/network/blockhain/binding/FundInfo.kt index 10e5431922..826bb3a738 100644 --- a/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/network/blockhain/binding/FundInfo.kt +++ b/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/network/blockhain/binding/FundInfo.kt @@ -7,10 +7,10 @@ import io.novafoundation.nova.common.data.network.runtime.binding.castToStruct import io.novafoundation.nova.common.data.network.runtime.binding.fromHexOrIncompatible import io.novafoundation.nova.common.data.network.runtime.binding.storageReturnType import io.novafoundation.nova.common.utils.Modules -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.primitives.u32 -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.toByteArray +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.primitives.u32 +import io.novasama.substrate_sdk_android.runtime.definitions.types.toByteArray import java.math.BigInteger class FundInfo( diff --git a/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/network/blockhain/binding/Leases.kt b/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/network/blockhain/binding/Leases.kt index ccba0a41ca..6cc43f304f 100644 --- a/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/network/blockhain/binding/Leases.kt +++ b/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/network/blockhain/binding/Leases.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.common.data.network.runtime.binding.bindAccountId import io.novafoundation.nova.common.data.network.runtime.binding.bindList import io.novafoundation.nova.common.data.network.runtime.binding.bindNumber import io.novafoundation.nova.common.data.network.runtime.binding.cast -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class LeaseEntry( val accountId: AccountId, diff --git a/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/source/contribution/ExternalContributionSource.kt b/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/source/contribution/ExternalContributionSource.kt index 8d538364b2..0e421f1859 100644 --- a/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/source/contribution/ExternalContributionSource.kt +++ b/feature-crowdloan-api/src/main/java/io/novafoundation/nova/feature_crowdloan_api/data/source/contribution/ExternalContributionSource.kt @@ -3,7 +3,7 @@ package io.novafoundation.nova.feature_crowdloan_api.data.source.contribution import io.novafoundation.nova.common.data.network.runtime.binding.ParaId import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger interface ExternalContributionSource { diff --git a/feature-crowdloan-impl/build.gradle b/feature-crowdloan-impl/build.gradle index 586b245614..534928ba0b 100644 --- a/feature-crowdloan-impl/build.gradle +++ b/feature-crowdloan-impl/build.gradle @@ -85,7 +85,7 @@ dependencies { testImplementation jUnitDep testImplementation mockitoDep - implementation fearlessLibDep + implementation substrateSdkDep compileOnly wsDep implementation gsonDep diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/network/api/acala/AcalaApi.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/network/api/acala/AcalaApi.kt index 496d642253..78a4f4e18f 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/network/api/acala/AcalaApi.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/network/api/acala/AcalaApi.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.runtime.ext.Geneses import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.ext.requireGenesisHash import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import retrofit2.http.Body import retrofit2.http.GET import retrofit2.http.Header diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/network/api/parallel/ParallelApi.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/network/api/parallel/ParallelApi.kt index feb94fab50..4ecdb3f09b 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/network/api/parallel/ParallelApi.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/network/api/parallel/ParallelApi.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_crowdloan_impl.data.network.api.parallel import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import retrofit2.http.GET import retrofit2.http.Path diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/network/blockhain/extrinsic/ExtrinsicBuilderExt.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/network/blockhain/extrinsic/ExtrinsicBuilderExt.kt index c4c957a91c..449a5ef32f 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/network/blockhain/extrinsic/ExtrinsicBuilderExt.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/network/blockhain/extrinsic/ExtrinsicBuilderExt.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_crowdloan_impl.data.network.blockhain.extrinsic import io.novafoundation.nova.common.data.network.runtime.binding.ParaId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigInteger fun ExtrinsicBuilder.contribute( diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/repository/CrowdloanRepositoryImpl.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/repository/CrowdloanRepositoryImpl.kt index 4d3d50ff61..53826f4ea4 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/repository/CrowdloanRepositoryImpl.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/repository/CrowdloanRepositoryImpl.kt @@ -21,9 +21,9 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.withContext diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/repository/contributions/source/LiquidAcalaContributionSource.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/repository/contributions/source/LiquidAcalaContributionSource.kt index ca6b2aa96a..d01f2f168c 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/repository/contributions/source/LiquidAcalaContributionSource.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/repository/contributions/source/LiquidAcalaContributionSource.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.feature_crowdloan_impl.data.network.api.acala.Acal import io.novafoundation.nova.runtime.ext.Geneses import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.repository.ParachainInfoRepository -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class LiquidAcalaContributionSource( private val acalaApi: AcalaApi, diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/repository/contributions/source/ParallelContributionSource.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/repository/contributions/source/ParallelContributionSource.kt index 98247c24e1..cb839eac0d 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/repository/contributions/source/ParallelContributionSource.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/data/repository/contributions/source/ParallelContributionSource.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.feature_crowdloan_api.domain.contributions.Contrib import io.novafoundation.nova.feature_crowdloan_impl.data.network.api.parallel.ParallelApi import io.novafoundation.nova.runtime.ext.Geneses import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class ParallelContributionSource( private val parallelApi: ParallelApi, diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/CrowdloanContributeInteractor.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/CrowdloanContributeInteractor.kt index b09b147df1..f9fad33ce8 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/CrowdloanContributeInteractor.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/CrowdloanContributeInteractor.kt @@ -25,7 +25,7 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.repository.ChainStateRepository import io.novafoundation.nova.runtime.state.assetWithChain import io.novafoundation.nova.runtime.state.chainAndAsset -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/acala/AcalaContributeInteractor.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/acala/AcalaContributeInteractor.kt index 9be399dd0c..f163054621 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/acala/AcalaContributeInteractor.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/acala/AcalaContributeInteractor.kt @@ -21,9 +21,9 @@ import io.novafoundation.nova.runtime.state.SingleAssetSharedState import io.novafoundation.nova.runtime.state.chain import io.novafoundation.nova.runtime.state.chainAndAsset import io.novafoundation.nova.runtime.state.chainAsset -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.fromUtf8 +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.fromUtf8 import java.math.BigDecimal class AcalaContributeInteractor( diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/astar/AstarContributeInteractor.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/astar/AstarContributeInteractor.kt index 028bbfb9b6..79b5fad3a4 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/astar/AstarContributeInteractor.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/astar/AstarContributeInteractor.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.runtime.ext.accountIdOf import io.novafoundation.nova.runtime.ext.isValidAddress import io.novafoundation.nova.runtime.state.SingleAssetSharedState import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder class AstarContributeInteractor( private val selectedAssetSharedState: SingleAssetSharedState, diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/bifrost/BifrostContributeInteractor.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/bifrost/BifrostContributeInteractor.kt index 5adc6e8aa3..ecfc58244d 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/bifrost/BifrostContributeInteractor.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/bifrost/BifrostContributeInteractor.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.common.data.network.runtime.binding.ParaId import io.novafoundation.nova.feature_crowdloan_impl.data.network.api.bifrost.BifrostApi import io.novafoundation.nova.feature_crowdloan_impl.data.network.api.bifrost.getAccountByReferralCode import io.novafoundation.nova.feature_crowdloan_impl.data.network.blockhain.extrinsic.addMemo -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder class BifrostContributeInteractor( val novaReferralCode: String, diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/moonbeam/MoonbeamCrowdloanInteractor.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/moonbeam/MoonbeamCrowdloanInteractor.kt index 5d98cb8000..dcb1b4f733 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/moonbeam/MoonbeamCrowdloanInteractor.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/moonbeam/MoonbeamCrowdloanInteractor.kt @@ -30,11 +30,11 @@ import io.novafoundation.nova.runtime.extrinsic.systemRemark import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.state.SingleAssetSharedState import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.fromUtf8 +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.fromUtf8 import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.filterIsInstance import kotlinx.coroutines.flow.first diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/moonbeam/MoonbeamPrivateSignatureProvider.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/moonbeam/MoonbeamPrivateSignatureProvider.kt index 4de0f01fde..c88ec87029 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/moonbeam/MoonbeamPrivateSignatureProvider.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contribute/custom/moonbeam/MoonbeamPrivateSignatureProvider.kt @@ -7,10 +7,10 @@ import io.novafoundation.nova.feature_crowdloan_impl.data.network.api.moonbeam.M import io.novafoundation.nova.feature_crowdloan_impl.data.network.api.moonbeam.makeSignature import io.novafoundation.nova.feature_crowdloan_impl.domain.contribute.custom.PrivateCrowdloanSignatureProvider import io.novafoundation.nova.feature_crowdloan_impl.domain.contribute.custom.PrivateCrowdloanSignatureProvider.Mode -import jp.co.soramitsu.fearless_utils.encrypt.EncryptionType -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.MultiSignature -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.prepareForEncoding +import io.novasama.substrate_sdk_android.encrypt.EncryptionType +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.MultiSignature +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.prepareForEncoding import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.math.BigInteger diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contributions/RealContributionsRepository.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contributions/RealContributionsRepository.kt index 63946b46b6..722db8001d 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contributions/RealContributionsRepository.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/contributions/RealContributionsRepository.kt @@ -19,10 +19,10 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.hash.Hasher.blake2b256 -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.primitives.u32 -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.toByteArray +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.hash.Hasher.blake2b256 +import io.novasama.substrate_sdk_android.runtime.definitions.types.primitives.u32 +import io.novasama.substrate_sdk_android.runtime.definitions.types.toByteArray import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/main/CrowdloanInteractor.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/main/CrowdloanInteractor.kt index 2fe02beffa..40b24d5d9e 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/main/CrowdloanInteractor.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/domain/main/CrowdloanInteractor.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.feature_crowdloan_impl.domain.contribute.mapFundIn import io.novafoundation.nova.runtime.ext.utilityAsset import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.repository.ChainStateRepository -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.flow diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/CustomContributeSubmitter.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/CustomContributeSubmitter.kt index 3d12caf87f..c7309dcf8a 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/CustomContributeSubmitter.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/CustomContributeSubmitter.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.cu import android.os.Parcelable import io.novafoundation.nova.feature_crowdloan_impl.domain.main.Crowdloan -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigDecimal interface CustomContributeSubmitter { diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/acala/bonus/AcalaContributeSubmitter.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/acala/bonus/AcalaContributeSubmitter.kt index 46c81c4696..e2721701e6 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/acala/bonus/AcalaContributeSubmitter.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/acala/bonus/AcalaContributeSubmitter.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.cus import io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.custom.CustomContributeSubmitter import io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.custom.acala.main.AcalaCustomizationPayload import io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.custom.referral.DefaultReferralCodePayload -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigDecimal class AcalaContributeSubmitter( diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/astar/AstarContributeSubmitter.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/astar/AstarContributeSubmitter.kt index 7a9cdcd1ed..b456a665fa 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/astar/AstarContributeSubmitter.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/astar/AstarContributeSubmitter.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_crowdloan_impl.domain.main.Crowdloan import io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.custom.BonusPayload import io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.custom.CustomContributeSubmitter import io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.custom.referral.DefaultReferralCodePayload -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigDecimal class AstarContributeSubmitter( diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/bifrost/BifrostContributeSubmitter.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/bifrost/BifrostContributeSubmitter.kt index 677fca0113..1c678645b1 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/bifrost/BifrostContributeSubmitter.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/bifrost/BifrostContributeSubmitter.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_crowdloan_impl.domain.main.Crowdloan import io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.custom.BonusPayload import io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.custom.CustomContributeSubmitter import io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.custom.referral.DefaultReferralCodePayload -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigDecimal class BifrostContributeSubmitter( diff --git a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/moonbeam/MoonbeamCrowdloanSubmitter.kt b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/moonbeam/MoonbeamCrowdloanSubmitter.kt index 6640a72163..63da53a075 100644 --- a/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/moonbeam/MoonbeamCrowdloanSubmitter.kt +++ b/feature-crowdloan-impl/src/main/java/io/novafoundation/nova/feature_crowdloan_impl/presentation/contribute/custom/moonbeam/MoonbeamCrowdloanSubmitter.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.feature_crowdloan_impl.domain.contribute.custom.mo import io.novafoundation.nova.feature_crowdloan_impl.domain.main.Crowdloan import io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.custom.BonusPayload import io.novafoundation.nova.feature_crowdloan_impl.presentation.contribute.custom.CustomContributeSubmitter -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigDecimal class MoonbeamCrowdloanSubmitter( diff --git a/feature-currency-api/build.gradle b/feature-currency-api/build.gradle index 1b4f1e01ef..0434266e65 100644 --- a/feature-currency-api/build.gradle +++ b/feature-currency-api/build.gradle @@ -31,7 +31,7 @@ dependencies { implementation daggerDep - implementation fearlessLibDep + implementation substrateSdkDep implementation androidDep diff --git a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/domain/browser/polkadotJs/PolkadotJsExtensionInteractor.kt b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/domain/browser/polkadotJs/PolkadotJsExtensionInteractor.kt index b9bab4bab3..331e174fa9 100644 --- a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/domain/browser/polkadotJs/PolkadotJsExtensionInteractor.kt +++ b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/domain/browser/polkadotJs/PolkadotJsExtensionInteractor.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.ext.requireGenesisHash import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.RuntimeVersionsRepository -import jp.co.soramitsu.fearless_utils.extensions.requireHexPrefix +import io.novasama.substrate_sdk_android.extensions.requireHexPrefix class PolkadotJsExtensionInteractor( private val chainRegistry: ChainRegistry, diff --git a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/metamask/states/DefaultMetamaskState.kt b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/metamask/states/DefaultMetamaskState.kt index 9615b45ecf..80e6b2a6ee 100644 --- a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/metamask/states/DefaultMetamaskState.kt +++ b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/metamask/states/DefaultMetamaskState.kt @@ -29,8 +29,8 @@ import io.novafoundation.nova.feature_external_sign_api.model.signPayload.evm.Ev import io.novafoundation.nova.feature_external_sign_api.model.signPayload.evm.EvmSignPayload import io.novafoundation.nova.feature_external_sign_api.model.signPayload.evm.EvmTransaction import io.novafoundation.nova.feature_external_sign_api.model.signPayload.evm.EvmTypedMessage -import jp.co.soramitsu.fearless_utils.extensions.asEthereumAddress -import jp.co.soramitsu.fearless_utils.extensions.toAccountId +import io.novasama.substrate_sdk_android.extensions.asEthereumAddress +import io.novasama.substrate_sdk_android.extensions.toAccountId class DefaultMetamaskState( commonInteractor: DappInteractor, diff --git a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/model/InjectedAccount.kt b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/model/InjectedAccount.kt index ab9ad1b988..d61d390426 100644 --- a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/model/InjectedAccount.kt +++ b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/model/InjectedAccount.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_dapp_impl.web3.polkadotJs.model -import jp.co.soramitsu.fearless_utils.encrypt.EncryptionType +import io.novasama.substrate_sdk_android.encrypt.EncryptionType class InjectedAccount internal constructor( val address: String, diff --git a/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/data/evmApi/EvmApi.kt b/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/data/evmApi/EvmApi.kt index 8a04d5fe09..c778b048ec 100644 --- a/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/data/evmApi/EvmApi.kt +++ b/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/data/evmApi/EvmApi.kt @@ -8,10 +8,10 @@ import io.novafoundation.nova.feature_external_sign_api.model.signPayload.evm.Ev import io.novafoundation.nova.runtime.ethereum.sendSuspend import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.findEvmCallApi -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.Signer -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.Signer +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw import okhttp3.OkHttpClient import org.web3j.crypto.RawTransaction import org.web3j.crypto.Sign.SignatureData diff --git a/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/evm/EvmSignInteractor.kt b/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/evm/EvmSignInteractor.kt index f4090fcf22..159f1fd0bd 100644 --- a/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/evm/EvmSignInteractor.kt +++ b/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/evm/EvmSignInteractor.kt @@ -48,10 +48,10 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.findChain import io.novafoundation.nova.runtime.multiNetwork.findEvmChain -import jp.co.soramitsu.fearless_utils.extensions.asEthereumAddress -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.extensions.toAccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.extensions.asEthereumAddress +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.toAccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers diff --git a/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/evm/RealEvmTypedMessageParser.kt b/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/evm/RealEvmTypedMessageParser.kt index b7a0934a22..1de1149bf3 100644 --- a/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/evm/RealEvmTypedMessageParser.kt +++ b/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/evm/RealEvmTypedMessageParser.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_external_sign_impl.domain.sign.evm import io.novafoundation.nova.feature_external_sign_api.domain.sign.evm.EvmTypedMessageParser import io.novafoundation.nova.feature_external_sign_api.model.signPayload.evm.EvmTypedMessage -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString import org.web3j.crypto.StructuredDataEncoder internal class RealEvmTypedMessageParser : EvmTypedMessageParser { diff --git a/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/polkadot/DAppParsedExtrinsic.kt b/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/polkadot/DAppParsedExtrinsic.kt index 8d6717feb7..9adf25a405 100644 --- a/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/polkadot/DAppParsedExtrinsic.kt +++ b/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/polkadot/DAppParsedExtrinsic.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_external_sign_impl.domain.sign.polkadot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Era -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Extrinsic +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Era +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Extrinsic import java.math.BigInteger class DAppParsedExtrinsic( diff --git a/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/polkadot/PolkadotExternalSignInteractor.kt b/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/polkadot/PolkadotExternalSignInteractor.kt index d7d87c6316..f5be17d291 100644 --- a/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/polkadot/PolkadotExternalSignInteractor.kt +++ b/feature-external-sign-impl/src/main/java/io/novafoundation/nova/feature_external_sign_impl/domain/sign/polkadot/PolkadotExternalSignInteractor.kt @@ -34,19 +34,19 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getChainOrNull import io.novafoundation.nova.runtime.multiNetwork.getRuntime -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHex -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.EraType -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Extrinsic.EncodingInstance.CallRepresentation -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.Nonce -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadRaw -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.fromHex -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.fromUtf8 -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.chain.RuntimeVersion +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHex +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.EraType +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Extrinsic.EncodingInstance.CallRepresentation +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.Nonce +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadRaw +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.fromHex +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.fromUtf8 +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.chain.RuntimeVersion import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emitAll diff --git a/feature-governance-api/build.gradle b/feature-governance-api/build.gradle index 9f1e0fb2b1..d39e603ca2 100644 --- a/feature-governance-api/build.gradle +++ b/feature-governance-api/build.gradle @@ -37,7 +37,7 @@ dependencies { implementation daggerDep - implementation fearlessLibDep + implementation substrateSdkDep implementation androidDep diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/Delegation.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/Delegation.kt index e88e788adf..c412e226e2 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/Delegation.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/Delegation.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_governance_api.data.network.blockhain.mod import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Conviction -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId data class Delegation( val vote: Vote, diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/OnChainReferendum.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/OnChainReferendum.kt index dbefe34c6c..47f9218d90 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/OnChainReferendum.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/OnChainReferendum.kt @@ -2,8 +2,8 @@ package io.novafoundation.nova.feature_governance_api.data.network.blockhain.mod import io.novafoundation.nova.common.data.network.runtime.binding.BlockNumber import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall import java.math.BigInteger @JvmInline diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/OnChainReferendumExt.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/OnChainReferendumExt.kt index b425474e1c..d7084290b9 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/OnChainReferendumExt.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/OnChainReferendumExt.kt @@ -8,8 +8,8 @@ import io.novafoundation.nova.common.utils.filterValuesIsInstance import io.novafoundation.nova.common.utils.orZero import io.novafoundation.nova.feature_governance_api.domain.referendum.common.ReferendumVoting.Approval import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.hash.Hasher.blake2b256 -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.hash.Hasher.blake2b256 +import io.novasama.substrate_sdk_android.runtime.AccountId fun OnChainReferendum.proposal(): Proposal? { return status.asOngoingOrNull()?.proposal diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/PreImage.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/PreImage.kt index acb804316d..13de60f988 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/PreImage.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/PreImage.kt @@ -1,5 +1,5 @@ package io.novafoundation.nova.feature_governance_api.data.network.blockhain.model -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall class PreImage(val encodedCall: ByteArray, val call: GenericCall.Instance) diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/ReferendumVoter.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/ReferendumVoter.kt index 9f90aa750c..b1fcaa1156 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/ReferendumVoter.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/ReferendumVoter.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_governance_api.data.network.blockhain.model -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class ReferendumVoter( val accountId: AccountId, diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/TreasuryProposal.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/TreasuryProposal.kt index 3adabcac59..26ed613e69 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/TreasuryProposal.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/TreasuryProposal.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_api.data.network.blockhain.model import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger class TreasuryProposal( diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/Voting.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/Voting.kt index 1fec971a3d..8738ad4d71 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/Voting.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/blockhain/model/Voting.kt @@ -8,8 +8,8 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.amountFromPlanks import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Conviction import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Vote -import jp.co.soramitsu.fearless_utils.hash.isPositive -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.hash.isPositive +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigDecimal import java.math.BigInteger diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/delegation/DelegateDetailedStats.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/delegation/DelegateDetailedStats.kt index a85309b8a5..3cb8573d66 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/delegation/DelegateDetailedStats.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/delegation/DelegateDetailedStats.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_api.data.network.offchain.model.delegation import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class DelegateDetailedStats( val accountId: AccountId, diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/delegation/DelegateMetadata.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/delegation/DelegateMetadata.kt index e6dbcff98a..ffa3ff1173 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/delegation/DelegateMetadata.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/delegation/DelegateMetadata.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_governance_api.data.network.offchain.model.delegation -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class DelegateMetadata( val accountId: AccountId, diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/delegation/DelegateStats.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/delegation/DelegateStats.kt index 64f5c3fc7b..4608c570d9 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/delegation/DelegateStats.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/delegation/DelegateStats.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_api.data.network.offchain.model.delegation import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class DelegateStats( val accountId: AccountId, diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/vote/UserVote.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/vote/UserVote.kt index ed1dc3b568..5e706bbe46 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/vote/UserVote.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/network/offchain/model/vote/UserVote.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_api.data.network.offchain.model.vote import io.novafoundation.nova.feature_governance_api.data.network.blockhain.model.AccountVote -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId sealed class UserVote { diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/repository/ConvictionVotingRepository.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/repository/ConvictionVotingRepository.kt index cefa987662..0a9bedf962 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/repository/ConvictionVotingRepository.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/repository/ConvictionVotingRepository.kt @@ -13,8 +13,8 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Ba import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.flow.Flow import java.math.BigInteger diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/repository/DelegationsRepository.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/repository/DelegationsRepository.kt index 0c91bae65f..4b9ab918db 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/repository/DelegationsRepository.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/repository/DelegationsRepository.kt @@ -14,7 +14,7 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Ba import io.novafoundation.nova.runtime.extrinsic.multi.CallBuilder import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Conviction -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface DelegationsRepository { diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/repository/PreimageRepository.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/repository/PreimageRepository.kt index 5a09c25f52..03a93b06a3 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/repository/PreimageRepository.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/repository/PreimageRepository.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_governance_api.data.repository import io.novafoundation.nova.feature_governance_api.data.network.blockhain.model.PreImage import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString import java.math.BigInteger typealias HexHash = String diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/source/GovernanceSource.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/source/GovernanceSource.kt index 01046e2ea5..b3d7260ca4 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/source/GovernanceSource.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/data/source/GovernanceSource.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.feature_governance_api.data.repository.OnChainRefe import io.novafoundation.nova.feature_governance_api.data.repository.PreImageRepository import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/Delegate.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/Delegate.kt index 715d9871b8..bfce12f405 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/Delegate.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/Delegate.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_api.domain.delegation.delegate import io.novafoundation.nova.feature_account_api.data.model.OnChainIdentity -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface Delegate { diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/delegators/DelegateDelegatorsInteractor.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/delegators/DelegateDelegatorsInteractor.kt index a124414521..1173c81f48 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/delegators/DelegateDelegatorsInteractor.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/delegators/DelegateDelegatorsInteractor.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_api.domain.delegation.delegate.delegators import io.novafoundation.nova.feature_governance_api.domain.delegation.delegate.delegators.model.Delegator -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow interface DelegateDelegatorsInteractor { diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/delegators/model/Delegator.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/delegators/model/Delegator.kt index 44fd02eb41..a38b2d58ab 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/delegators/model/Delegator.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/delegators/model/Delegator.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.feature_governance_api.domain.referendum.voters.Ge import io.novafoundation.nova.feature_governance_api.domain.referendum.voters.GenericVoter.ConvictionVote import io.novafoundation.nova.feature_wallet_api.domain.model.amountFromPlanks import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigDecimal class Delegator( diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/details/model/DelegateDetails.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/details/model/DelegateDetails.kt index 606630786d..26d7bff751 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/details/model/DelegateDetails.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/details/model/DelegateDetails.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_governance_api.domain.delegation.delegate. import io.novafoundation.nova.feature_governance_api.domain.delegation.delegate.DelegateAccountType import io.novafoundation.nova.feature_governance_api.domain.track.Track import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId data class DelegateDetails( override val accountId: AccountId, diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/details/model/DelegateDetailsInteractor.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/details/model/DelegateDetailsInteractor.kt index 98207e0bb1..6c1036033e 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/details/model/DelegateDetailsInteractor.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/details/model/DelegateDetailsInteractor.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_governance_api.domain.delegation.delegate.details.model -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow interface DelegateDetailsInteractor { diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/label/DelegateLabel.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/label/DelegateLabel.kt index ccc13aa972..9f5162cdfb 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/label/DelegateLabel.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/label/DelegateLabel.kt @@ -3,7 +3,7 @@ package io.novafoundation.nova.feature_governance_api.domain.delegation.delegate import io.novafoundation.nova.feature_account_api.data.model.OnChainIdentity import io.novafoundation.nova.feature_governance_api.domain.delegation.delegate.Delegate import io.novafoundation.nova.feature_governance_api.domain.delegation.delegate.DelegateAccountType -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class DelegateLabel( override val accountId: AccountId, diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/label/DelegateLabelUseCase.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/label/DelegateLabelUseCase.kt index cd3237eca2..1ddb9cb4b9 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/label/DelegateLabelUseCase.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/label/DelegateLabelUseCase.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_governance_api.domain.delegation.delegate.label -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface DelegateLabelUseCase { diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/list/model/DelegatePreview.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/list/model/DelegatePreview.kt index ee1941b901..4c1341e28a 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/list/model/DelegatePreview.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegate/list/model/DelegatePreview.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_governance_api.domain.delegation.delegate. import io.novafoundation.nova.feature_governance_api.domain.delegation.delegate.DelegateAccountType import io.novafoundation.nova.feature_governance_api.domain.track.Track import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId data class DelegatePreview( override val accountId: AccountId, diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegation/common/chooseTrack/ChooseTrackInteractor.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegation/common/chooseTrack/ChooseTrackInteractor.kt index 0f183ab16d..63c28ecc74 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegation/common/chooseTrack/ChooseTrackInteractor.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegation/common/chooseTrack/ChooseTrackInteractor.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_api.domain.delegation.delegation.common.chooseTrack import io.novafoundation.nova.feature_governance_api.domain.delegation.delegation.common.chooseTrack.model.ChooseTrackData -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow interface ChooseTrackInteractor { diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegation/create/chooseAmount/NewDelegationChooseAmountInteractor.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegation/create/chooseAmount/NewDelegationChooseAmountInteractor.kt index d8d4b1dacf..15895cacc5 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegation/create/chooseAmount/NewDelegationChooseAmountInteractor.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/delegation/delegation/create/chooseAmount/NewDelegationChooseAmountInteractor.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_governance_api.data.network.blockhain.mode import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.extrinsic.ExtrinsicStatus import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Conviction -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/locks/RealClaimScheduleCalculator.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/locks/RealClaimScheduleCalculator.kt index 1f78f067e1..140787f057 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/locks/RealClaimScheduleCalculator.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/locks/RealClaimScheduleCalculator.kt @@ -21,7 +21,7 @@ import io.novafoundation.nova.feature_governance_api.domain.locks.ClaimSchedule. import io.novafoundation.nova.feature_governance_api.domain.locks.ClaimSchedule.ClaimAction.Unlock import io.novafoundation.nova.feature_governance_api.domain.locks.ClaimSchedule.UnlockChunk import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.hash.isPositive +import io.novasama.substrate_sdk_android.hash.isPositive private data class ClaimableLock( val claimAt: ClaimTime, diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/locks/reusable/LocksChange.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/locks/reusable/LocksChange.kt index cba316f5f8..a81fe6a125 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/locks/reusable/LocksChange.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/locks/reusable/LocksChange.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_governance_api.domain.locks.reusable import io.novafoundation.nova.feature_governance_api.domain.referendum.common.Change import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.hash.isPositive +import io.novasama.substrate_sdk_android.hash.isPositive import kotlin.time.Duration class LocksChange( diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/common/Proposer.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/common/Proposer.kt index eea99fa310..4399edd5ae 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/common/Proposer.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/common/Proposer.kt @@ -1,5 +1,5 @@ package io.novafoundation.nova.feature_governance_api.domain.referendum.common -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId data class ReferendumProposer(val accountId: AccountId, val offChainNickname: String?) diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/details/ReferendumCall.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/details/ReferendumCall.kt index f0b2b5d5b4..58edb89245 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/details/ReferendumCall.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/details/ReferendumCall.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_api.domain.referendum.details import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId sealed class ReferendumCall { diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/details/ReferendumDetailsInteractor.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/details/ReferendumDetailsInteractor.kt index 5bb026e527..440372d662 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/details/ReferendumDetailsInteractor.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/details/ReferendumDetailsInteractor.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.feature_governance_api.data.network.blockhain.mode import io.novafoundation.nova.feature_governance_api.data.network.blockhain.model.ReferendumId import io.novafoundation.nova.feature_governance_api.data.source.SupportedGovernanceOption import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow interface ReferendumDetailsInteractor { diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/list/ReferendaListInteractor.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/list/ReferendaListInteractor.kt index 6c24f391e1..05d5516e66 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/list/ReferendaListInteractor.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/list/ReferendaListInteractor.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.common.domain.ExtendedLoadingState import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount import io.novafoundation.nova.feature_governance_api.data.source.SupportedGovernanceOption import io.novafoundation.nova.feature_governance_api.domain.referendum.filters.ReferendumTypeFilter -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/list/ReferendumProposal.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/list/ReferendumProposal.kt index 22c7d56673..b28edefea2 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/list/ReferendumProposal.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/list/ReferendumProposal.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_governance_api.domain.referendum.list -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall sealed class ReferendumProposal { diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/list/ReferendumVote.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/list/ReferendumVote.kt index bc19fcfaff..d02347009a 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/list/ReferendumVote.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/list/ReferendumVote.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_governance_api.domain.referendum.list import io.novafoundation.nova.feature_account_api.domain.account.identity.Identity import io.novafoundation.nova.feature_governance_api.data.network.blockhain.model.AccountVote -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId sealed class ReferendumVote(val vote: AccountVote) { diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/voters/GenericVoter.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/voters/GenericVoter.kt index 3e619b1b9e..ba8d9e2664 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/voters/GenericVoter.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/voters/GenericVoter.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Ba import io.novafoundation.nova.feature_wallet_api.domain.model.amountFromPlanks import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Conviction -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigDecimal interface GenericVoter { diff --git a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/voters/ReferendumVoter.kt b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/voters/ReferendumVoter.kt index 8c8794763b..2d68cbcd04 100644 --- a/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/voters/ReferendumVoter.kt +++ b/feature-governance-api/src/main/java/io/novafoundation/nova/feature_governance_api/domain/referendum/voters/ReferendumVoter.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.feature_governance_api.data.network.blockhain.mode import io.novafoundation.nova.feature_governance_api.domain.delegation.delegate.label.DelegateLabel import io.novafoundation.nova.feature_wallet_api.domain.model.amountFromPlanks import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigDecimal class ReferendumVoter( diff --git a/feature-governance-impl/build.gradle b/feature-governance-impl/build.gradle index e3a5ab74e4..5dd0ac613f 100644 --- a/feature-governance-impl/build.gradle +++ b/feature-governance-impl/build.gradle @@ -52,7 +52,7 @@ dependencies { implementation materialDep - implementation fearlessLibDep + implementation substrateSdkDep implementation kotlinDep diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/network/blockchain/extrinsic/ExtrinsicBuilderExt.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/network/blockchain/extrinsic/ExtrinsicBuilderExt.kt index b53f3effef..86f87f3df4 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/network/blockchain/extrinsic/ExtrinsicBuilderExt.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/network/blockchain/extrinsic/ExtrinsicBuilderExt.kt @@ -11,11 +11,11 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Ba import io.novafoundation.nova.runtime.extrinsic.multi.CallBuilder import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Conviction import io.novafoundation.nova.runtime.util.constructAccountLookupInstance -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.instances.AddressInstanceConstructor -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.metadata.call +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.instances.AddressInstanceConstructor +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.metadata.call fun ExtrinsicBuilder.convictionVotingVote( referendumId: ReferendumId, diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/RealTreasuryRepository.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/RealTreasuryRepository.kt index 7cd7b0db15..672118e50e 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/RealTreasuryRepository.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/RealTreasuryRepository.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_governance_api.data.network.blockhain.mode import io.novafoundation.nova.feature_governance_api.data.repository.TreasuryRepository import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storage class RealTreasuryRepository( private val remoteSource: StorageDataSource diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/UnsupportedDelegationsRepository.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/UnsupportedDelegationsRepository.kt index 0b3ac4ad1d..5cc06e5360 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/UnsupportedDelegationsRepository.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/UnsupportedDelegationsRepository.kt @@ -13,7 +13,7 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Ba import io.novafoundation.nova.runtime.extrinsic.multi.CallBuilder import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Conviction -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class UnsupportedDelegationsRepository : DelegationsRepository { diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/common/Bindings.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/common/Bindings.kt index 79a11786ef..f8ce623e9a 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/common/Bindings.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/common/Bindings.kt @@ -19,11 +19,11 @@ import io.novafoundation.nova.feature_governance_api.data.network.blockhain.mode import io.novafoundation.nova.feature_governance_api.data.network.blockhain.model.Voting import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Conviction import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Vote -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromByteArray -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromByteArray +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall fun bindProposal(decoded: Any?, runtimeSnapshot: RuntimeSnapshot): Proposal { return when (decoded) { diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/common/Queries.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/common/Queries.kt index d34d1aaa6a..ecea4d2661 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/common/Queries.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/common/Queries.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.feature_governance_api.data.network.blockhain.mode import io.novafoundation.nova.feature_governance_api.data.network.blockhain.model.Voting import io.novafoundation.nova.feature_governance_api.data.network.blockhain.model.votes import io.novafoundation.nova.runtime.storage.source.query.StorageKeyComponents -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId fun Map.votersFor(referendumId: ReferendumId): List { return mapNotNull { (keyComponents, voting) -> diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v1/GovV1ConvictionVotingRepository.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v1/GovV1ConvictionVotingRepository.kt index d42a62f8bc..ca17296204 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v1/GovV1ConvictionVotingRepository.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v1/GovV1ConvictionVotingRepository.kt @@ -27,9 +27,9 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import java.math.BigInteger diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v1/GovV1OnChainReferendaRepository.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v1/GovV1OnChainReferendaRepository.kt index 1b048fe134..854fa86f9f 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v1/GovV1OnChainReferendaRepository.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v1/GovV1OnChainReferendaRepository.kt @@ -35,15 +35,15 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.repository.TotalIssuanceRepository import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.extensions.pad -import jp.co.soramitsu.fearless_utils.hash.Hasher.blake2b256 -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.primitives.FixedByteArray -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.primitives.u32 -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.toByteArray -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.keys -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.extensions.pad +import io.novasama.substrate_sdk_android.hash.Hasher.blake2b256 +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.primitives.FixedByteArray +import io.novasama.substrate_sdk_android.runtime.definitions.types.primitives.u32 +import io.novasama.substrate_sdk_android.runtime.definitions.types.toByteArray +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.keys +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlinx.coroutines.flow.Flow import java.math.BigInteger diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v1/GovV1PreImageRepository.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v1/GovV1PreImageRepository.kt index de823189b3..86692d1bc1 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v1/GovV1PreImageRepository.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v1/GovV1PreImageRepository.kt @@ -12,10 +12,10 @@ import io.novafoundation.nova.feature_governance_api.data.repository.PreImageReq import io.novafoundation.nova.feature_governance_impl.data.repository.v2.Gov2PreImageRepository import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromByteArray -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromByteArray +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.metadata.storage class GovV1PreImageRepository( private val remoteStorageSource: StorageDataSource, diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/Gov2DelegationsRepository.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/Gov2DelegationsRepository.kt index 309567e16d..a40f80c6d6 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/Gov2DelegationsRepository.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/Gov2DelegationsRepository.kt @@ -41,7 +41,7 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain.ExternalApi import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Conviction import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Vote import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.mapConvictionFromString -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class Gov2DelegationsRepository( private val delegationsSubqueryApi: DelegationsSubqueryApi, diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/Gov2PreImageRepository.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/Gov2PreImageRepository.kt index ebd67d3353..05b70bc4c2 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/Gov2PreImageRepository.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/Gov2PreImageRepository.kt @@ -18,15 +18,15 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.wrapSingleArgumentKeys -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Tuple -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromByteArray -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntryType -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Tuple +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromByteArray +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntryType +import io.novasama.substrate_sdk_android.runtime.metadata.storage import java.math.BigInteger class Gov2PreImageRepository( diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/GovV2ConvictionVotingRepository.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/GovV2ConvictionVotingRepository.kt index 4fe90abe81..c3b29e6f91 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/GovV2ConvictionVotingRepository.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/GovV2ConvictionVotingRepository.kt @@ -37,9 +37,9 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.mapConvictionFromString import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import java.math.BigInteger diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/GovV2OnChainReferendaRepository.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/GovV2OnChainReferendaRepository.kt index 8c14eac156..4e9896e2f0 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/GovV2OnChainReferendaRepository.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/data/repository/v2/GovV2OnChainReferendaRepository.kt @@ -50,16 +50,16 @@ import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.repository.TotalIssuanceRepository import io.novafoundation.nova.runtime.repository.getActiveIssuance import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.hash.Hasher.blake2b256 -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.primitives.u32 -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.toByteArray -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.scale.dataType.string +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.hash.Hasher.blake2b256 +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.primitives.u32 +import io.novasama.substrate_sdk_android.runtime.definitions.types.toByteArray +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.scale.dataType.string import kotlinx.coroutines.flow.Flow import java.math.BigInteger diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/common/repository/DelegateCommonRepository.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/common/repository/DelegateCommonRepository.kt index 3f94054c71..f4d804cc0d 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/common/repository/DelegateCommonRepository.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/common/repository/DelegateCommonRepository.kt @@ -19,7 +19,7 @@ import io.novafoundation.nova.feature_governance_impl.domain.track.mapTrackInfoT import io.novafoundation.nova.runtime.repository.ChainStateRepository import io.novafoundation.nova.runtime.repository.blockDurationEstimator import io.novafoundation.nova.runtime.util.blockInPast -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface DelegateCommonRepository { suspend fun getDelegatesStats(governanceOption: SupportedGovernanceOption, accountIds: List? = null): List diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/delegators/RealDelegateDelegatorsInteractor.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/delegators/RealDelegateDelegatorsInteractor.kt index 48b8ff1aab..61249f925f 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/delegators/RealDelegateDelegatorsInteractor.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/delegators/RealDelegateDelegatorsInteractor.kt @@ -10,7 +10,7 @@ import io.novafoundation.nova.feature_governance_api.domain.delegation.delegate. import io.novafoundation.nova.feature_governance_api.domain.delegation.delegate.delegators.model.Delegator import io.novafoundation.nova.feature_governance_impl.data.GovernanceSharedState import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow class RealDelegateDelegatorsInteractor( diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/details/RealDelegateDetailsInteractor.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/details/RealDelegateDetailsInteractor.kt index 62b7c27397..1d69889f50 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/details/RealDelegateDetailsInteractor.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/details/RealDelegateDetailsInteractor.kt @@ -30,7 +30,7 @@ import io.novafoundation.nova.runtime.repository.ChainStateRepository import io.novafoundation.nova.runtime.repository.blockDurationEstimator import io.novafoundation.nova.runtime.state.selectedOption import io.novafoundation.nova.runtime.util.blockInPast -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.Flow diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/label/RealDelegateLabelUseCase.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/label/RealDelegateLabelUseCase.kt index d711936058..62d1a7f59e 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/label/RealDelegateLabelUseCase.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/label/RealDelegateLabelUseCase.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_governance_api.domain.delegation.delegate. import io.novafoundation.nova.feature_governance_impl.data.GovernanceSharedState import io.novafoundation.nova.feature_governance_impl.domain.delegation.delegate.common.mapAccountTypeToDomain import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/search/RealDelegateSearchInteractor.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/search/RealDelegateSearchInteractor.kt index 5a4e393dfd..26713cca6e 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/search/RealDelegateSearchInteractor.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegate/search/RealDelegateSearchInteractor.kt @@ -15,7 +15,7 @@ import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.ext.isValidAddress import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.state.SelectedAssetOptionSharedState -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.catch diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/create/chooseAmount/RealNewDelegationChooseAmountInteractor.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/create/chooseAmount/RealNewDelegationChooseAmountInteractor.kt index c123ba100f..2882a786e3 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/create/chooseAmount/RealNewDelegationChooseAmountInteractor.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/create/chooseAmount/RealNewDelegationChooseAmountInteractor.kt @@ -25,7 +25,7 @@ import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Con import io.novafoundation.nova.runtime.repository.ChainStateRepository import io.novafoundation.nova.runtime.repository.blockDurationEstimator import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/create/chooseAmount/validation/ChooseDelegationAmountValidationPayload.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/create/chooseAmount/validation/ChooseDelegationAmountValidationPayload.kt index cc1b5200e5..c3307026e8 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/create/chooseAmount/validation/ChooseDelegationAmountValidationPayload.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/create/chooseAmount/validation/ChooseDelegationAmountValidationPayload.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_governance_impl.domain.delegation.delegat import io.novafoundation.nova.feature_wallet_api.domain.model.Asset import io.novafoundation.nova.feature_wallet_api.presentation.model.DecimalFee -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigDecimal class ChooseDelegationAmountValidationPayload( diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/create/chooseTrack/RealChooseTrackInteractor.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/create/chooseTrack/RealChooseTrackInteractor.kt index 725dec7295..29178803f7 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/create/chooseTrack/RealChooseTrackInteractor.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/create/chooseTrack/RealChooseTrackInteractor.kt @@ -24,7 +24,7 @@ import io.novafoundation.nova.feature_governance_impl.domain.track.category.Trac import io.novafoundation.nova.feature_governance_impl.domain.track.mapTrackInfoToTrack import io.novafoundation.nova.runtime.repository.ChainStateRepository import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/removeVotes/RealRemoveTrackVotesInteractor.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/removeVotes/RealRemoveTrackVotesInteractor.kt index e91be3669d..34b0728b2e 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/removeVotes/RealRemoveTrackVotesInteractor.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/delegation/delegation/removeVotes/RealRemoveTrackVotesInteractor.kt @@ -16,8 +16,8 @@ import io.novafoundation.nova.runtime.extrinsic.ExtrinsicStatus import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/identity/ReferendumProposerIdentityProvider.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/identity/ReferendumProposerIdentityProvider.kt index 6bb23a7ce3..f1441a520f 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/identity/ReferendumProposerIdentityProvider.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/identity/ReferendumProposerIdentityProvider.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.feature_account_api.domain.account.identity.Identi import io.novafoundation.nova.feature_account_api.domain.account.identity.IdentityProvider import io.novafoundation.nova.feature_governance_api.domain.referendum.common.ReferendumProposer import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.first diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/RealReferendumDetailsInteractor.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/RealReferendumDetailsInteractor.kt index 5c6716f744..07dbea1c16 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/RealReferendumDetailsInteractor.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/RealReferendumDetailsInteractor.kt @@ -45,7 +45,7 @@ import io.novafoundation.nova.runtime.ext.accountIdOrNull import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.repository.ChainStateRepository -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/ReferendumPreImageParser.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/ReferendumPreImageParser.kt index ee9663e03a..f4f3b57547 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/ReferendumPreImageParser.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/ReferendumPreImageParser.kt @@ -3,8 +3,8 @@ package io.novafoundation.nova.feature_governance_impl.domain.referendum.details import io.novafoundation.nova.feature_governance_api.data.network.blockhain.model.PreImage import io.novafoundation.nova.feature_governance_api.domain.referendum.details.ReferendumCall import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.extensions.tryFindNonNull -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.extensions.tryFindNonNull +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/batch/BatchAdapter.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/batch/BatchAdapter.kt index 06d8b7b029..1deb2fa59a 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/batch/BatchAdapter.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/batch/BatchAdapter.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.common.utils.instanceOf import io.novafoundation.nova.feature_governance_api.domain.referendum.details.ReferendumCall import io.novafoundation.nova.feature_governance_impl.domain.referendum.details.call.ReferendumCallAdapter import io.novafoundation.nova.feature_governance_impl.domain.referendum.details.call.ReferendumCallParseContext -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall class BatchAdapter : ReferendumCallAdapter { diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/treasury/TreasuryApproveProposalAdapter.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/treasury/TreasuryApproveProposalAdapter.kt index 569b8a263e..e34c014a9d 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/treasury/TreasuryApproveProposalAdapter.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/treasury/TreasuryApproveProposalAdapter.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_governance_api.data.repository.TreasuryRep import io.novafoundation.nova.feature_governance_api.domain.referendum.details.ReferendumCall import io.novafoundation.nova.feature_governance_impl.domain.referendum.details.call.ReferendumCallAdapter import io.novafoundation.nova.feature_governance_impl.domain.referendum.details.call.ReferendumCallParseContext -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall class TreasuryApproveProposalAdapter( private val treasuryRepository: TreasuryRepository diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/treasury/TreasurySpendAdapter.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/treasury/TreasurySpendAdapter.kt index 82ded15957..1e0323a432 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/treasury/TreasurySpendAdapter.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/details/call/treasury/TreasurySpendAdapter.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.common.utils.instanceOf import io.novafoundation.nova.feature_governance_api.domain.referendum.details.ReferendumCall import io.novafoundation.nova.feature_governance_impl.domain.referendum.details.call.ReferendumCallAdapter import io.novafoundation.nova.feature_governance_impl.domain.referendum.details.call.ReferendumCallParseContext -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall class TreasurySpendAdapter : ReferendumCallAdapter { diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/list/RealReferendaListInteractor.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/list/RealReferendaListInteractor.kt index 570ada4b2c..2d08540fa0 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/list/RealReferendaListInteractor.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/list/RealReferendaListInteractor.kt @@ -33,8 +33,8 @@ import io.novafoundation.nova.feature_governance_impl.domain.referendum.list.rep import io.novafoundation.nova.feature_governance_impl.domain.referendum.list.sorting.ReferendaSortingProvider import io.novafoundation.nova.runtime.ext.fullId import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.hash.isPositive -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.hash.isPositive +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/list/repository/ReferendaCommonRepository.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/list/repository/ReferendaCommonRepository.kt index 6fb12ddb07..4835f41564 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/list/repository/ReferendaCommonRepository.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/list/repository/ReferendaCommonRepository.kt @@ -38,8 +38,8 @@ import io.novafoundation.nova.runtime.repository.ChainStateRepository import io.novafoundation.nova.runtime.repository.blockDurationEstimator import io.novafoundation.nova.runtime.util.blockInPast import java.math.BigInteger -import jp.co.soramitsu.fearless_utils.extensions.requireHexPrefix -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.requireHexPrefix +import io.novasama.substrate_sdk_android.extensions.toHexString import kotlinx.coroutines.async import kotlinx.coroutines.coroutineScope import kotlinx.coroutines.flow.Flow diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/unlock/GovernanceUnlockInteractor.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/unlock/GovernanceUnlockInteractor.kt index 29220dcf47..25875d1852 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/unlock/GovernanceUnlockInteractor.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/unlock/GovernanceUnlockInteractor.kt @@ -38,9 +38,9 @@ import io.novafoundation.nova.runtime.repository.ChainStateRepository import io.novafoundation.nova.runtime.state.selectedOption import io.novafoundation.nova.runtime.util.BlockDurationEstimator import io.novafoundation.nova.runtime.util.timerUntil -import jp.co.soramitsu.fearless_utils.hash.isPositive -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.hash.isPositive +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/vote/RealVoteReferendumInteractor.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/vote/RealVoteReferendumInteractor.kt index 3a503bb9ed..ae663f33b2 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/vote/RealVoteReferendumInteractor.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/domain/referendum/vote/RealVoteReferendumInteractor.kt @@ -41,7 +41,7 @@ import io.novafoundation.nova.runtime.repository.ChainStateRepository import io.novafoundation.nova.runtime.repository.blockDurationEstimator import io.novafoundation.nova.runtime.state.selectedOption import io.novafoundation.nova.runtime.util.BlockDurationEstimator -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/common/DelegateMappers.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/common/DelegateMappers.kt index 171dfa047b..531666273f 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/common/DelegateMappers.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/common/DelegateMappers.kt @@ -30,7 +30,7 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.amountFromPlanks import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.ChainWithAsset import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface DelegateMappers { diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/common/model/DelegateListModel.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/common/model/DelegateListModel.kt index a774c8a4e8..e345d529f8 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/common/model/DelegateListModel.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/common/model/DelegateListModel.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_governance_impl.presentation.delegation.d import io.novafoundation.nova.feature_governance_impl.presentation.track.TrackModel import io.novafoundation.nova.feature_governance_impl.presentation.common.voters.VoteModel -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class DelegateListModel( val icon: DelegateIcon, diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/delegators/DelegateDelegatorsPayload.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/delegators/DelegateDelegatorsPayload.kt index 75340b68d6..7576aaac9f 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/delegators/DelegateDelegatorsPayload.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/delegators/DelegateDelegatorsPayload.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_impl.presentation.delegation.delegate.delegators import android.os.Parcelable -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.android.parcel.Parcelize @Parcelize diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/detail/main/DelegateDetailsPayload.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/detail/main/DelegateDetailsPayload.kt index 6b49a55b7c..22f0b3efd2 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/detail/main/DelegateDetailsPayload.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/detail/main/DelegateDetailsPayload.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_impl.presentation.delegation.delegate.detail.main import android.os.Parcelable -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.android.parcel.Parcelize @Parcelize diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/detail/votedReferenda/VotedReferendaPayload.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/detail/votedReferenda/VotedReferendaPayload.kt index c0ab444c06..9297728055 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/detail/votedReferenda/VotedReferendaPayload.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegate/detail/votedReferenda/VotedReferendaPayload.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_impl.presentation.delegation.delegate.detail.votedReferenda import android.os.Parcelable -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.android.parcel.Parcelize @Parcelize diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/create/chooseAmount/NewDelegationChooseAmountPayload.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/create/chooseAmount/NewDelegationChooseAmountPayload.kt index 154f5efbba..2bf487cc20 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/create/chooseAmount/NewDelegationChooseAmountPayload.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/create/chooseAmount/NewDelegationChooseAmountPayload.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_governance_impl.presentation.delegation.d import android.os.Parcelable import io.novafoundation.nova.feature_governance_api.data.network.blockhain.model.TrackId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.android.parcel.Parcelize import java.math.BigInteger diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/create/chooseTrack/NewDelegationChooseTracksPayload.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/create/chooseTrack/NewDelegationChooseTracksPayload.kt index f198c3d7ac..40d33675f7 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/create/chooseTrack/NewDelegationChooseTracksPayload.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/create/chooseTrack/NewDelegationChooseTracksPayload.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_impl.presentation.delegation.delegation.create.chooseTrack import android.os.Parcelable -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.android.parcel.Parcelize @Parcelize diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/create/confirm/NewDelegationConfirmPayload.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/create/confirm/NewDelegationConfirmPayload.kt index 3d228b07a9..219ad88413 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/create/confirm/NewDelegationConfirmPayload.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/create/confirm/NewDelegationConfirmPayload.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.feature_governance_api.data.network.blockhain.mode import io.novafoundation.nova.feature_governance_api.domain.referendum.voters.GenericVoter import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.FeeParcelModel import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Conviction -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.android.parcel.Parcelize import java.math.BigDecimal import java.math.BigInteger diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/revoke/chooseTracks/RevokeDelegationChooseTracksPayload.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/revoke/chooseTracks/RevokeDelegationChooseTracksPayload.kt index 604b34bc13..bf2fc71c45 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/revoke/chooseTracks/RevokeDelegationChooseTracksPayload.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/revoke/chooseTracks/RevokeDelegationChooseTracksPayload.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_governance_impl.presentation.delegation.delegation.revoke.chooseTracks import android.os.Parcelable -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.android.parcel.Parcelize @Parcelize diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/revoke/confirm/RevokeDelegationConfirmPayload.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/revoke/confirm/RevokeDelegationConfirmPayload.kt index 51fe1e5fd8..59984931f5 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/revoke/confirm/RevokeDelegationConfirmPayload.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/delegation/delegation/revoke/confirm/RevokeDelegationConfirmPayload.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_governance_impl.presentation.delegation.d import android.os.Parcelable import io.novafoundation.nova.feature_governance_api.data.network.blockhain.model.TrackId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.android.parcel.Parcelize import java.math.BigInteger diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/referenda/common/ReferendumFormatter.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/referenda/common/ReferendumFormatter.kt index 15672c1159..d528f3821f 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/referenda/common/ReferendumFormatter.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/referenda/common/ReferendumFormatter.kt @@ -43,7 +43,7 @@ import io.novafoundation.nova.feature_wallet_api.presentation.formatters.formatT import io.novafoundation.nova.feature_wallet_api.presentation.model.mapAmountToAmountModel import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall import kotlin.time.Duration.Companion.days import kotlin.time.Duration.Companion.milliseconds diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/referenda/full/ReferendumFullDetailsPayload.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/referenda/full/ReferendumFullDetailsPayload.kt index 2177e069be..f6192fa805 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/referenda/full/ReferendumFullDetailsPayload.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/referenda/full/ReferendumFullDetailsPayload.kt @@ -4,7 +4,7 @@ import android.os.Parcelable import io.novafoundation.nova.feature_governance_api.domain.referendum.details.PreimagePreview import io.novafoundation.nova.feature_governance_api.domain.referendum.details.ReferendumCall import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.android.parcel.Parcelize @Parcelize diff --git a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/referenda/full/ReferendumFullDetailsViewModel.kt b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/referenda/full/ReferendumFullDetailsViewModel.kt index a42cd41be5..19aba3bdca 100644 --- a/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/referenda/full/ReferendumFullDetailsViewModel.kt +++ b/feature-governance-impl/src/main/java/io/novafoundation/nova/feature_governance_impl/presentation/referenda/full/ReferendumFullDetailsViewModel.kt @@ -18,7 +18,7 @@ import io.novafoundation.nova.feature_wallet_api.presentation.model.mapAmountToA import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch diff --git a/feature-governance-impl/src/test/java/io/novafoundation/nova/feature_governance_api/domain/locks/ClaimScheduleTestBuilder.kt b/feature-governance-impl/src/test/java/io/novafoundation/nova/feature_governance_api/domain/locks/ClaimScheduleTestBuilder.kt index 01c4ec8da6..d368d4391f 100644 --- a/feature-governance-impl/src/test/java/io/novafoundation/nova/feature_governance_api/domain/locks/ClaimScheduleTestBuilder.kt +++ b/feature-governance-impl/src/test/java/io/novafoundation/nova/feature_governance_api/domain/locks/ClaimScheduleTestBuilder.kt @@ -13,7 +13,7 @@ import io.novafoundation.nova.feature_governance_api.domain.locks.ClaimSchedule. import io.novafoundation.nova.feature_governance_api.domain.locks.ClaimSchedule.UnlockChunk import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.Conviction -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface ClaimScheduleTestBuilder { diff --git a/feature-ledger-api/build.gradle b/feature-ledger-api/build.gradle index a080168b4b..27676b9963 100644 --- a/feature-ledger-api/build.gradle +++ b/feature-ledger-api/build.gradle @@ -30,7 +30,7 @@ dependencies { implementation daggerDep - implementation fearlessLibDep + implementation substrateSdkDep implementation androidDep diff --git a/feature-ledger-api/src/main/java/io/novafoundation/nova/feature_ledger_api/sdk/application/substrate/LedgerSubstrateAccount.kt b/feature-ledger-api/src/main/java/io/novafoundation/nova/feature_ledger_api/sdk/application/substrate/LedgerSubstrateAccount.kt index 02206fdfc2..dbb249d742 100644 --- a/feature-ledger-api/src/main/java/io/novafoundation/nova/feature_ledger_api/sdk/application/substrate/LedgerSubstrateAccount.kt +++ b/feature-ledger-api/src/main/java/io/novafoundation/nova/feature_ledger_api/sdk/application/substrate/LedgerSubstrateAccount.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_ledger_api.sdk.application.substrate -import jp.co.soramitsu.fearless_utils.encrypt.EncryptionType +import io.novasama.substrate_sdk_android.encrypt.EncryptionType class LedgerSubstrateAccount( val address: String, diff --git a/feature-ledger-api/src/main/java/io/novafoundation/nova/feature_ledger_api/sdk/application/substrate/SubstrateLedgerApplication.kt b/feature-ledger-api/src/main/java/io/novafoundation/nova/feature_ledger_api/sdk/application/substrate/SubstrateLedgerApplication.kt index 588638ff4b..4137d5194e 100644 --- a/feature-ledger-api/src/main/java/io/novafoundation/nova/feature_ledger_api/sdk/application/substrate/SubstrateLedgerApplication.kt +++ b/feature-ledger-api/src/main/java/io/novafoundation/nova/feature_ledger_api/sdk/application/substrate/SubstrateLedgerApplication.kt @@ -2,8 +2,8 @@ package io.novafoundation.nova.feature_ledger_api.sdk.application.substrate import io.novafoundation.nova.feature_ledger_api.sdk.device.LedgerDevice import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.encrypt.SignatureWrapper -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.encrypt.SignatureWrapper +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic interface SubstrateLedgerApplication { diff --git a/feature-ledger-impl/build.gradle b/feature-ledger-impl/build.gradle index 93f305709e..430fd7a8b0 100644 --- a/feature-ledger-impl/build.gradle +++ b/feature-ledger-impl/build.gradle @@ -40,7 +40,7 @@ dependencies { implementation materialDep - implementation fearlessLibDep + implementation substrateSdkDep implementation bleDep implementation bleKotlinDep diff --git a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/domain/account/sign/SignLedgerInteractor.kt b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/domain/account/sign/SignLedgerInteractor.kt index 555a3ddc42..10104f2285 100644 --- a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/domain/account/sign/SignLedgerInteractor.kt +++ b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/domain/account/sign/SignLedgerInteractor.kt @@ -4,10 +4,10 @@ import io.novafoundation.nova.common.utils.chainId import io.novafoundation.nova.feature_account_api.data.signer.SeparateFlowSignerState import io.novafoundation.nova.feature_account_api.domain.model.publicKeyIn import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry -import jp.co.soramitsu.fearless_utils.encrypt.SignatureVerifier -import jp.co.soramitsu.fearless_utils.encrypt.SignatureWrapper -import jp.co.soramitsu.fearless_utils.encrypt.Signer.MessageHashing -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.encodedSignaturePayload +import io.novasama.substrate_sdk_android.encrypt.SignatureVerifier +import io.novasama.substrate_sdk_android.encrypt.SignatureWrapper +import io.novasama.substrate_sdk_android.encrypt.Signer.MessageHashing +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.encodedSignaturePayload interface SignLedgerInteractor { diff --git a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/presentation/account/connect/SelectLedgerAddressInterScreenCommunicator.kt b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/presentation/account/connect/SelectLedgerAddressInterScreenCommunicator.kt index f3a802de0e..38ca9203ec 100644 --- a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/presentation/account/connect/SelectLedgerAddressInterScreenCommunicator.kt +++ b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/presentation/account/connect/SelectLedgerAddressInterScreenCommunicator.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.common.navigation.InterScreenRequester import io.novafoundation.nova.common.navigation.InterScreenResponder import io.novafoundation.nova.feature_ledger_impl.presentation.account.common.selectLedger.SelectLedgerPayload import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.encrypt.EncryptionType +import io.novasama.substrate_sdk_android.encrypt.EncryptionType import kotlinx.android.parcel.Parcelize interface SelectLedgerAddressInterScreenRequester : InterScreenRequester diff --git a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/presentation/account/sign/SignLedgerViewModel.kt b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/presentation/account/sign/SignLedgerViewModel.kt index 5ce750c37a..6de5e6e413 100644 --- a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/presentation/account/sign/SignLedgerViewModel.kt +++ b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/presentation/account/sign/SignLedgerViewModel.kt @@ -28,7 +28,7 @@ import io.novafoundation.nova.runtime.extrinsic.ExtrinsicValidityUseCase import io.novafoundation.nova.runtime.extrinsic.closeToExpire import io.novafoundation.nova.runtime.extrinsic.remainingTime import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry -import jp.co.soramitsu.fearless_utils.encrypt.SignatureWrapper +import io.novasama.substrate_sdk_android.encrypt.SignatureWrapper import kotlinx.coroutines.Deferred import kotlinx.coroutines.async import kotlinx.coroutines.delay diff --git a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/application/substrate/LedgerDerivationPathEncoder.kt b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/application/substrate/LedgerDerivationPathEncoder.kt index 62a01d72e5..734cb7592e 100644 --- a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/application/substrate/LedgerDerivationPathEncoder.kt +++ b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/application/substrate/LedgerDerivationPathEncoder.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_ledger_impl.sdk.application.substrate -import jp.co.soramitsu.fearless_utils.encrypt.junction.Junction +import io.novasama.substrate_sdk_android.encrypt.junction.Junction fun List.serializeInLedgerFormat(): ByteArray = fold(ByteArray(0)) { acc, junction -> // Bip32Encoder currently encodes chain codes as big endian, so we need to reverse them to get little endian encoding diff --git a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/application/substrate/RealSubstrateLedgerApplication.kt b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/application/substrate/RealSubstrateLedgerApplication.kt index b78f58c365..704ad7bed7 100644 --- a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/application/substrate/RealSubstrateLedgerApplication.kt +++ b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/application/substrate/RealSubstrateLedgerApplication.kt @@ -17,13 +17,13 @@ import io.novafoundation.nova.feature_ledger_api.data.repository.LedgerRepositor import io.novafoundation.nova.feature_ledger_impl.sdk.application.substrate.DisplayVerificationDialog.NO import io.novafoundation.nova.feature_ledger_impl.sdk.application.substrate.DisplayVerificationDialog.YES import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.encrypt.EncryptionType -import jp.co.soramitsu.fearless_utils.encrypt.SignatureWrapper -import jp.co.soramitsu.fearless_utils.encrypt.json.copyBytes -import jp.co.soramitsu.fearless_utils.encrypt.junction.BIP32JunctionDecoder -import jp.co.soramitsu.fearless_utils.extensions.copyLast -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.encodedSignaturePayload +import io.novasama.substrate_sdk_android.encrypt.EncryptionType +import io.novasama.substrate_sdk_android.encrypt.SignatureWrapper +import io.novasama.substrate_sdk_android.encrypt.json.copyBytes +import io.novasama.substrate_sdk_android.encrypt.junction.BIP32JunctionDecoder +import io.novasama.substrate_sdk_android.extensions.copyLast +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.encodedSignaturePayload private enum class Instruction(val code: UByte) { GET_ADDRESS(0x01u), SIGN(0x02u) diff --git a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/connection/ble/LedgerBleManager.kt b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/connection/ble/LedgerBleManager.kt index 17aeb685c3..85c7fe8964 100644 --- a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/connection/ble/LedgerBleManager.kt +++ b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/connection/ble/LedgerBleManager.kt @@ -6,7 +6,7 @@ import android.bluetooth.BluetoothGattCharacteristic import android.bluetooth.BluetoothGattCharacteristic.WRITE_TYPE_DEFAULT import io.novafoundation.nova.common.resources.ContextManager import io.novafoundation.nova.common.utils.toUuid -import jp.co.soramitsu.fearless_utils.extensions.tryFindNonNull +import io.novasama.substrate_sdk_android.extensions.tryFindNonNull import no.nordicsemi.android.ble.BleManager import no.nordicsemi.android.ble.callback.DataReceivedCallback import no.nordicsemi.android.ble.data.Data diff --git a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/transport/ChunkedLedgerTransport.kt b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/transport/ChunkedLedgerTransport.kt index 3203463366..89b48d6627 100644 --- a/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/transport/ChunkedLedgerTransport.kt +++ b/feature-ledger-impl/src/main/java/io/novafoundation/nova/feature_ledger_impl/sdk/transport/ChunkedLedgerTransport.kt @@ -10,7 +10,7 @@ import io.novafoundation.nova.feature_ledger_api.sdk.device.LedgerDevice import io.novafoundation.nova.feature_ledger_api.sdk.transport.LedgerTransport import io.novafoundation.nova.feature_ledger_api.sdk.transport.LedgerTransportError import io.novafoundation.nova.feature_ledger_api.sdk.transport.LedgerTransportError.Reason -import jp.co.soramitsu.fearless_utils.encrypt.json.copyBytes +import io.novasama.substrate_sdk_android.encrypt.json.copyBytes import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlin.math.min diff --git a/feature-nft-api/build.gradle b/feature-nft-api/build.gradle index 174e38202d..fc1ecf1a9b 100644 --- a/feature-nft-api/build.gradle +++ b/feature-nft-api/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation daggerDep - implementation fearlessLibDep + implementation substrateSdkDep implementation androidDep implementation constraintDep diff --git a/feature-nft-api/src/main/java/io/novafoundation/nova/feature_nft_api/data/model/Nft.kt b/feature-nft-api/src/main/java/io/novafoundation/nova/feature_nft_api/data/model/Nft.kt index 7a2c856fe5..c03a7809ce 100644 --- a/feature-nft-api/src/main/java/io/novafoundation/nova/feature_nft_api/data/model/Nft.kt +++ b/feature-nft-api/src/main/java/io/novafoundation/nova/feature_nft_api/data/model/Nft.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_nft_api.data.model import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger class Nft( diff --git a/feature-nft-api/src/main/java/io/novafoundation/nova/feature_nft_api/data/model/NftDetails.kt b/feature-nft-api/src/main/java/io/novafoundation/nova/feature_nft_api/data/model/NftDetails.kt index 371de24bab..487589ae5c 100644 --- a/feature-nft-api/src/main/java/io/novafoundation/nova/feature_nft_api/data/model/NftDetails.kt +++ b/feature-nft-api/src/main/java/io/novafoundation/nova/feature_nft_api/data/model/NftDetails.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_nft_api.data.model import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class NftDetails( val identifier: String, diff --git a/feature-nft-impl/build.gradle b/feature-nft-impl/build.gradle index 4a5e188ae0..6f414c4794 100644 --- a/feature-nft-impl/build.gradle +++ b/feature-nft-impl/build.gradle @@ -67,7 +67,7 @@ dependencies { testImplementation jUnitDep testImplementation mockitoDep - implementation fearlessLibDep + implementation substrateSdkDep implementation gsonDep implementation retrofitDep diff --git a/feature-nft-impl/src/main/java/io/novafoundation/nova/feature_nft_impl/data/source/providers/uniques/UniquesNftProvider.kt b/feature-nft-impl/src/main/java/io/novafoundation/nova/feature_nft_impl/data/source/providers/uniques/UniquesNftProvider.kt index f34db5d6eb..f535497f25 100644 --- a/feature-nft-impl/src/main/java/io/novafoundation/nova/feature_nft_impl/data/source/providers/uniques/UniquesNftProvider.kt +++ b/feature-nft-impl/src/main/java/io/novafoundation/nova/feature_nft_impl/data/source/providers/uniques/UniquesNftProvider.kt @@ -27,9 +27,9 @@ import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.multi.MultiQueryBuilder import io.novafoundation.nova.runtime.storage.source.multi.singleValueOf import io.novafoundation.nova.runtime.storage.source.query.multi -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlinx.coroutines.flow.Flow import java.math.BigInteger diff --git a/feature-nft-impl/src/main/java/io/novafoundation/nova/feature_nft_impl/presentation/nft/details/NftDetailsViewModel.kt b/feature-nft-impl/src/main/java/io/novafoundation/nova/feature_nft_impl/presentation/nft/details/NftDetailsViewModel.kt index f5b7bfb031..8aec943bb0 100644 --- a/feature-nft-impl/src/main/java/io/novafoundation/nova/feature_nft_impl/presentation/nft/details/NftDetailsViewModel.kt +++ b/feature-nft-impl/src/main/java/io/novafoundation/nova/feature_nft_impl/presentation/nft/details/NftDetailsViewModel.kt @@ -19,7 +19,7 @@ import io.novafoundation.nova.feature_nft_impl.domain.nft.details.PricedNftDetai import io.novafoundation.nova.feature_nft_impl.presentation.nft.common.formatIssuance import io.novafoundation.nova.feature_nft_impl.presentation.nft.common.formatNftPrice import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map diff --git a/feature-proxy-api/build.gradle b/feature-proxy-api/build.gradle index 8844dda1bf..7cdec80b58 100644 --- a/feature-proxy-api/build.gradle +++ b/feature-proxy-api/build.gradle @@ -27,5 +27,5 @@ dependencies { implementation project(":common") implementation project(':runtime') - implementation fearlessLibDep + implementation substrateSdkDep } \ No newline at end of file diff --git a/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/data/calls/ExtrinsicBuilderExt.kt b/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/data/calls/ExtrinsicBuilderExt.kt index e483f3fa1b..98a258a423 100644 --- a/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/data/calls/ExtrinsicBuilderExt.kt +++ b/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/data/calls/ExtrinsicBuilderExt.kt @@ -3,11 +3,11 @@ package io.novafoundation.nova.feature_proxy_api.data.calls import io.novafoundation.nova.common.utils.Modules import io.novafoundation.nova.feature_proxy_api.domain.model.ProxyType import java.math.BigInteger -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.instances.AddressInstanceConstructor -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.instances.AddressInstanceConstructor +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder fun ExtrinsicBuilder.addProxyCall(proxyAccountId: AccountId, proxyType: ProxyType): ExtrinsicBuilder { return call( diff --git a/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/data/common/NestedProxiesGraphConstructor.kt b/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/data/common/NestedProxiesGraphConstructor.kt index f38de14780..b2033fcd66 100644 --- a/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/data/common/NestedProxiesGraphConstructor.kt +++ b/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/data/common/NestedProxiesGraphConstructor.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.common.utils.mapToSet import io.novafoundation.nova.feature_proxy_api.data.common.NestedProxiesGraphConstructor.Node import io.novafoundation.nova.feature_proxy_api.domain.model.ProxyType import io.novafoundation.nova.feature_proxy_api.domain.model.min -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface NestedProxiesGraphConstructor { diff --git a/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/data/repository/GetProxyRepository.kt b/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/data/repository/GetProxyRepository.kt index 6858446a8a..864ed718c7 100644 --- a/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/data/repository/GetProxyRepository.kt +++ b/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/data/repository/GetProxyRepository.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.feature_proxy_api.domain.model.ProxyType import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import java.math.BigInteger -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow interface GetProxyRepository { diff --git a/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/domain/validators/MaximumProxiesNotReachedValidation.kt b/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/domain/validators/MaximumProxiesNotReachedValidation.kt index 9ab2c8f7ba..dd88eeada2 100644 --- a/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/domain/validators/MaximumProxiesNotReachedValidation.kt +++ b/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/domain/validators/MaximumProxiesNotReachedValidation.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.common.validation.ValidationSystemBuilder import io.novafoundation.nova.common.validation.validOrError import io.novafoundation.nova.feature_proxy_api.data.repository.GetProxyRepository import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class MaximumProxiesNotReachedValidation( private val chain: (P) -> Chain, diff --git a/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/domain/validators/ProxyIsNotDuplicationForAccount.kt b/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/domain/validators/ProxyIsNotDuplicationForAccount.kt index fbf78225a8..bbb89c85bf 100644 --- a/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/domain/validators/ProxyIsNotDuplicationForAccount.kt +++ b/feature-proxy-api/src/main/java/io/novafoundation/nova/feature_proxy_api/domain/validators/ProxyIsNotDuplicationForAccount.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.common.validation.validOrError import io.novafoundation.nova.feature_proxy_api.data.repository.GetProxyRepository import io.novafoundation.nova.feature_proxy_api.domain.model.ProxyType import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class ProxyIsNotDuplicationForAccount( private val chain: (P) -> Chain, diff --git a/feature-proxy-impl/src/main/java/io/novafoundation/nova/feature_proxy_impl/data/repository/RealGetProxyRepository.kt b/feature-proxy-impl/src/main/java/io/novafoundation/nova/feature_proxy_impl/data/repository/RealGetProxyRepository.kt index 99a89d6b48..719360e12c 100644 --- a/feature-proxy-impl/src/main/java/io/novafoundation/nova/feature_proxy_impl/data/repository/RealGetProxyRepository.kt +++ b/feature-proxy-impl/src/main/java/io/novafoundation/nova/feature_proxy_impl/data/repository/RealGetProxyRepository.kt @@ -22,9 +22,9 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.storage.source.StorageDataSource import java.math.BigInteger -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.module -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.module +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/feature-settings-impl/build.gradle b/feature-settings-impl/build.gradle index d82dc60635..96fc2069b9 100644 --- a/feature-settings-impl/build.gradle +++ b/feature-settings-impl/build.gradle @@ -52,7 +52,7 @@ dependencies { implementation biometricDep - implementation fearlessLibDep + implementation substrateSdkDep implementation coroutinesDep implementation coroutinesAndroidDep diff --git a/feature-staking-api/build.gradle b/feature-staking-api/build.gradle index 92bf8e2f78..3a792a9240 100644 --- a/feature-staking-api/build.gradle +++ b/feature-staking-api/build.gradle @@ -26,7 +26,7 @@ android { dependencies { implementation coroutinesDep - implementation fearlessLibDep + implementation substrateSdkDep implementation daggerDep implementation project(':runtime') diff --git a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/data/nominationPools/pool/PoolAccountDerivation.kt b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/data/nominationPools/pool/PoolAccountDerivation.kt index 07e25d1f78..002d8b0657 100644 --- a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/data/nominationPools/pool/PoolAccountDerivation.kt +++ b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/data/nominationPools/pool/PoolAccountDerivation.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.common.address.AccountIdKey import io.novafoundation.nova.common.utils.Filter import io.novafoundation.nova.feature_staking_api.domain.nominationPool.model.PoolId import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface PoolAccountDerivation { diff --git a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/data/parachainStaking/turing/repository/TuringAutomationTask.kt b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/data/parachainStaking/turing/repository/TuringAutomationTask.kt index 27b050bac1..5ea2d31fd1 100644 --- a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/data/parachainStaking/turing/repository/TuringAutomationTask.kt +++ b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/data/parachainStaking/turing/repository/TuringAutomationTask.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_staking_api.data.parachainStaking.turing. import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import java.math.BigInteger -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class TuringAutomationTask( val id: String, diff --git a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/data/parachainStaking/turing/repository/TuringAutomationTasksRepository.kt b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/data/parachainStaking/turing/repository/TuringAutomationTasksRepository.kt index 4852a55f38..f3cc808b45 100644 --- a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/data/parachainStaking/turing/repository/TuringAutomationTasksRepository.kt +++ b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/data/parachainStaking/turing/repository/TuringAutomationTasksRepository.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_staking_api.data.parachainStaking.turing. import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow interface TuringAutomationTasksRepository { diff --git a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/api/StakingRepository.kt b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/api/StakingRepository.kt index bdc4e631e9..ca036b6da3 100644 --- a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/api/StakingRepository.kt +++ b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/api/StakingRepository.kt @@ -11,7 +11,7 @@ import io.novafoundation.nova.feature_staking_api.domain.model.ValidatorPrefs import io.novafoundation.nova.feature_staking_api.domain.model.relaychain.StakingState import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import java.math.BigInteger diff --git a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/Nominations.kt b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/Nominations.kt index 0ce47d7074..53a3a74d98 100644 --- a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/Nominations.kt +++ b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/Nominations.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_staking_api.domain.model -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class Nominations( val targets: List, diff --git a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/RewardDestination.kt b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/RewardDestination.kt index 70e6ef8316..5a703ea689 100644 --- a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/RewardDestination.kt +++ b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/RewardDestination.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_staking_api.domain.model -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId sealed class RewardDestination { diff --git a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/StakingLedger.kt b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/StakingLedger.kt index 19abdaac84..81b5e26ec5 100644 --- a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/StakingLedger.kt +++ b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/StakingLedger.kt @@ -3,7 +3,7 @@ package io.novafoundation.nova.feature_staking_api.domain.model import io.novafoundation.nova.common.utils.orZero import io.novafoundation.nova.common.utils.sumByBigInteger import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger class StakingLedger( diff --git a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/parachain/DelegatorState.kt b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/parachain/DelegatorState.kt index 3276a614ef..757af5bec5 100644 --- a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/parachain/DelegatorState.kt +++ b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/parachain/DelegatorState.kt @@ -7,8 +7,8 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Ba import io.novafoundation.nova.feature_wallet_api.domain.model.amountFromPlanks import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigDecimal import java.math.BigInteger diff --git a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/relaychain/StakingState.kt b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/relaychain/StakingState.kt index c36f1943ac..fc958b6145 100644 --- a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/relaychain/StakingState.kt +++ b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/domain/model/relaychain/StakingState.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.feature_staking_api.domain.model.Nominations import io.novafoundation.nova.feature_staking_api.domain.model.ValidatorPrefs import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId sealed class StakingState( val chain: Chain, diff --git a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/presentation/nominationPools/display/PoolDisplayModel.kt b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/presentation/nominationPools/display/PoolDisplayModel.kt index 12c33c6c2f..0fdfafbd4d 100644 --- a/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/presentation/nominationPools/display/PoolDisplayModel.kt +++ b/feature-staking-api/src/main/java/io/novafoundation/nova/feature_staking_api/presentation/nominationPools/display/PoolDisplayModel.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_staking_api.presentation.nominationPools. import io.novafoundation.nova.common.utils.images.Icon import io.novafoundation.nova.common.view.TableCellView -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class PoolDisplayModel( val icon: Icon, diff --git a/feature-staking-impl/build.gradle b/feature-staking-impl/build.gradle index ede505cf2f..4e74c2a4df 100644 --- a/feature-staking-impl/build.gradle +++ b/feature-staking-impl/build.gradle @@ -79,7 +79,7 @@ dependencies { testImplementation jUnitDep testImplementation mockitoDep - implementation fearlessLibDep + implementation substrateSdkDep compileOnly wsDep implementation gsonDep diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/stats/api/StakingStatsRequest.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/stats/api/StakingStatsRequest.kt index 5ba3a06a44..c7f14dc989 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/stats/api/StakingStatsRequest.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/stats/api/StakingStatsRequest.kt @@ -14,7 +14,7 @@ import io.novafoundation.nova.runtime.ext.supportedStakingOptions import io.novafoundation.nova.runtime.ext.utilityAsset import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.extensions.requireHexPrefix +import io.novasama.substrate_sdk_android.extensions.requireHexPrefix class StakingStatsRequest(stakingAccounts: StakingAccounts, chains: List) { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/updaters/chain/StakingDashboardNominationPoolsUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/updaters/chain/StakingDashboardNominationPoolsUpdater.kt index 7d87be6e9a..f1887c5f73 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/updaters/chain/StakingDashboardNominationPoolsUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/updaters/chain/StakingDashboardNominationPoolsUpdater.kt @@ -37,7 +37,7 @@ import io.novafoundation.nova.runtime.storage.cache.cacheValues import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.metadata -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.SharingStarted diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/updaters/chain/StakingDashboardParachainStakingUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/updaters/chain/StakingDashboardParachainStakingUpdater.kt index cb41ab0ce2..867ea9caf7 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/updaters/chain/StakingDashboardParachainStakingUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/updaters/chain/StakingDashboardParachainStakingUpdater.kt @@ -25,8 +25,8 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Ba import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.flowOf diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/updaters/chain/StakingDashboardRelayStakingUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/updaters/chain/StakingDashboardRelayStakingUpdater.kt index 7efa2f3be4..be4ef99d44 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/updaters/chain/StakingDashboardRelayStakingUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/dashboard/network/updaters/chain/StakingDashboardRelayStakingUpdater.kt @@ -30,7 +30,7 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.api.observeNonNull import io.novafoundation.nova.runtime.storage.source.query.metadata -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emitAll diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/mappers/SetupStaking.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/mappers/SetupStaking.kt index bf58b6bf25..d01066497b 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/mappers/SetupStaking.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/mappers/SetupStaking.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_staking_impl.data.mappers -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId import io.novafoundation.nova.feature_staking_api.domain.model.RewardDestination import io.novafoundation.nova.feature_staking_impl.presentation.common.rewardDestination.RewardDestinationModel diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/api/BabeRuntimeApi.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/api/BabeRuntimeApi.kt index b08e4ad4de..c519c5a3a9 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/api/BabeRuntimeApi.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/api/BabeRuntimeApi.kt @@ -7,8 +7,8 @@ import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.api.QueryableModule import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry0 import io.novafoundation.nova.runtime.storage.source.query.api.storage0 -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module import java.math.BigInteger @JvmInline diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/api/SessionRuntimeApi.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/api/SessionRuntimeApi.kt index 1a3fd394c8..eef86a70b2 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/api/SessionRuntimeApi.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/api/SessionRuntimeApi.kt @@ -6,8 +6,8 @@ import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.api.QueryableModule import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry0 import io.novafoundation.nova.runtime.storage.source.query.api.storage0 -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module import java.math.BigInteger @JvmInline diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/api/StakingRuntimeApi.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/api/StakingRuntimeApi.kt index 0281e60335..04a16152b2 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/api/StakingRuntimeApi.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/api/StakingRuntimeApi.kt @@ -17,9 +17,9 @@ import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageE import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry1 import io.novafoundation.nova.runtime.storage.source.query.api.storage0 import io.novafoundation.nova.runtime.storage.source.query.api.storage1 -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module import java.math.BigInteger @JvmInline diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Constants.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Constants.kt index c4b24a071d..be22f47c93 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Constants.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Constants.kt @@ -2,8 +2,8 @@ package io.novafoundation.nova.feature_staking_impl.data.network.blockhain.bindi import io.novafoundation.nova.common.data.network.runtime.binding.UseCaseBinding import io.novafoundation.nova.common.data.network.runtime.binding.bindNumberConstant -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Constant +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.module.Constant import java.math.BigInteger /* diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Era.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Era.kt index 1c6cf23ae6..b4d71e276d 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Era.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Era.kt @@ -7,8 +7,8 @@ import io.novafoundation.nova.common.data.network.runtime.binding.castToStruct import io.novafoundation.nova.common.data.network.runtime.binding.getTyped import io.novafoundation.nova.common.data.network.runtime.binding.storageReturnType import io.novafoundation.nova.feature_staking_api.domain.model.EraIndex -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHexOrNull +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHexOrNull import java.math.BigInteger /* diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/EraRewardPoints.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/EraRewardPoints.kt index ba43d9b6bd..e5690d3d2a 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/EraRewardPoints.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/EraRewardPoints.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.common.data.network.runtime.binding.castToStruct import io.novafoundation.nova.common.data.network.runtime.binding.getList import io.novafoundation.nova.common.data.network.runtime.binding.requireType import io.novafoundation.nova.common.utils.second -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger typealias RewardPoints = BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Exposure.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Exposure.kt index eee60b9bf8..4b0e5d6c37 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Exposure.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Exposure.kt @@ -11,7 +11,7 @@ import io.novafoundation.nova.feature_staking_api.domain.model.Exposure import io.novafoundation.nova.feature_staking_api.domain.model.ExposureOverview import io.novafoundation.nova.feature_staking_api.domain.model.ExposurePage import io.novafoundation.nova.feature_staking_api.domain.model.IndividualExposure -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct import java.math.BigInteger /* diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/HistoryDepth.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/HistoryDepth.kt index 208bea52bf..a05b2871eb 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/HistoryDepth.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/HistoryDepth.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.common.data.network.runtime.binding.UseCaseBinding import io.novafoundation.nova.common.data.network.runtime.binding.bindNumber import io.novafoundation.nova.common.data.network.runtime.binding.fromHexOrIncompatible import io.novafoundation.nova.common.data.network.runtime.binding.storageReturnType -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import java.math.BigInteger @UseCaseBinding diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Nominations.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Nominations.kt index 6e326026ab..b8b09afee5 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Nominations.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Nominations.kt @@ -8,11 +8,11 @@ import io.novafoundation.nova.common.data.network.runtime.binding.requireType import io.novafoundation.nova.common.data.network.runtime.binding.returnType import io.novafoundation.nova.common.utils.staking import io.novafoundation.nova.feature_staking_api.domain.model.Nominations -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHexOrNull -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHexOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.storage @UseCaseBinding fun bindNominations(scale: String, runtime: RuntimeSnapshot): Nominations { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Primitive.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Primitive.kt index 4a3b24e9df..f991fcaedb 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Primitive.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/Primitive.kt @@ -4,8 +4,8 @@ import io.novafoundation.nova.common.data.network.runtime.binding.UseCaseBinding import io.novafoundation.nova.common.data.network.runtime.binding.bindNumber import io.novafoundation.nova.common.data.network.runtime.binding.fromHexOrIncompatible import io.novafoundation.nova.common.data.network.runtime.binding.incompatible -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.Type +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.Type import java.math.BigInteger @UseCaseBinding diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/RewardDestination.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/RewardDestination.kt index c4a7a51d8e..d12d02d00f 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/RewardDestination.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/RewardDestination.kt @@ -5,11 +5,11 @@ import io.novafoundation.nova.common.data.network.runtime.binding.incompatible import io.novafoundation.nova.common.data.network.runtime.binding.returnType import io.novafoundation.nova.common.utils.staking import io.novafoundation.nova.feature_staking_api.domain.model.RewardDestination -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHexOrNull -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHexOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.storage private const val TYPE_STAKED = "Staked" private const val TYPE_ACCOUNT = "Account" diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/SlashingSpans.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/SlashingSpans.kt index b88657a5a9..d9de7fa30f 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/SlashingSpans.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/SlashingSpans.kt @@ -5,9 +5,9 @@ import io.novafoundation.nova.common.data.network.runtime.binding.castToStruct import io.novafoundation.nova.common.data.network.runtime.binding.getList import io.novafoundation.nova.common.data.network.runtime.binding.storageReturnType import io.novafoundation.nova.feature_staking_api.domain.model.SlashingSpans -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.Type -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHexOrNull +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.Type +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHexOrNull fun bindSlashingSpans( decoded: Any?, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/StakingLedger.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/StakingLedger.kt index f9940add7f..d6261f552d 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/StakingLedger.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/StakingLedger.kt @@ -11,10 +11,10 @@ import io.novafoundation.nova.common.data.network.runtime.binding.returnType import io.novafoundation.nova.common.utils.staking import io.novafoundation.nova.feature_staking_api.domain.model.StakingLedger import io.novafoundation.nova.feature_staking_api.domain.model.UnlockChunk -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHexOrNull -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHexOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.storage @UseCaseBinding fun bindStakingLedger(scale: String, runtime: RuntimeSnapshot): StakingLedger { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/StakingMinMaxStorages.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/StakingMinMaxStorages.kt index dfc2f03b73..0ffe3bddfe 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/StakingMinMaxStorages.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/bindings/StakingMinMaxStorages.kt @@ -2,8 +2,8 @@ package io.novafoundation.nova.feature_staking_impl.data.network.blockhain.bindi import io.novafoundation.nova.common.data.network.runtime.binding.bindNumber import io.novafoundation.nova.common.data.network.runtime.binding.fromHexOrIncompatible -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.Type +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.Type import java.math.BigInteger fun bindMinBond(scale: String, runtimeSnapshot: RuntimeSnapshot, type: Type<*>): BigInteger { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/calls/ExtrinsicBuilderExt.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/calls/ExtrinsicBuilderExt.kt index 2684b1d0f5..fafe6561aa 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/calls/ExtrinsicBuilderExt.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/calls/ExtrinsicBuilderExt.kt @@ -5,9 +5,9 @@ import io.novafoundation.nova.common.data.network.runtime.binding.bindMultiAddre import io.novafoundation.nova.common.utils.voterListName import io.novafoundation.nova.feature_staking_api.domain.model.RewardDestination import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.bindings.bindRewardDestination -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.instances.AddressInstanceConstructor -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.instances.AddressInstanceConstructor +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigInteger fun ExtrinsicBuilder.setController(controllerAddress: MultiAddress): ExtrinsicBuilder { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/AccountNominationsUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/AccountNominationsUpdater.kt index fff3fa556c..ca150e0842 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/AccountNominationsUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/AccountNominationsUpdater.kt @@ -8,9 +8,9 @@ import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.update import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.scope.AccountStakingScope import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class AccountNominationsUpdater( scope: AccountStakingScope, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/AccountRewardDestinationUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/AccountRewardDestinationUpdater.kt index 5cb78e33db..560e7dc220 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/AccountRewardDestinationUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/AccountRewardDestinationUpdater.kt @@ -8,9 +8,9 @@ import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.update import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.scope.AccountStakingScope import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class AccountRewardDestinationUpdater( scope: AccountStakingScope, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/AccountValidatorPrefsUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/AccountValidatorPrefsUpdater.kt index 1b9cb6142b..799374ee75 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/AccountValidatorPrefsUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/AccountValidatorPrefsUpdater.kt @@ -8,9 +8,9 @@ import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.update import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.scope.AccountStakingScope import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class AccountValidatorPrefsUpdater( scope: AccountStakingScope, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ActiveEraUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ActiveEraUpdater.kt index 7160c1f0fc..8c903d6d78 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ActiveEraUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ActiveEraUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.base.StakingUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class ActiveEraUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/BagListNodeUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/BagListNodeUpdater.kt index ff5d788c08..8668d1dcf9 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/BagListNodeUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/BagListNodeUpdater.kt @@ -8,9 +8,9 @@ import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.update import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.scope.AccountStakingScope import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class BagListNodeUpdater( scope: AccountStakingScope, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/Common.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/Common.kt index 6ec56a6789..601c7f58fc 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/Common.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/Common.kt @@ -4,10 +4,10 @@ import io.novafoundation.nova.common.data.network.rpc.BulkRetriever import io.novafoundation.nova.common.utils.staking import io.novafoundation.nova.core.model.StorageEntry import io.novafoundation.nova.core.storage.StorageCache -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.wsrpc.SocketService fun RuntimeMetadata.activeEraStorageKey() = staking().storage("ActiveEra").storageKey() diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/CounterForListNodesUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/CounterForListNodesUpdater.kt index 07a07cbbc8..1c909485ea 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/CounterForListNodesUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/CounterForListNodesUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.base.StakingUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class CounterForListNodesUpdater( storageCache: StorageCache, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/CounterForNominatorsUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/CounterForNominatorsUpdater.kt index 14aa438179..7949d3a330 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/CounterForNominatorsUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/CounterForNominatorsUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.base.StakingUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageOrNull +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storageOrNull class CounterForNominatorsUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/CurrentEraUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/CurrentEraUpdater.kt index 85ece87395..4ae575e5e6 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/CurrentEraUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/CurrentEraUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.base.StakingUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class CurrentEraUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/HistoryDepthUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/HistoryDepthUpdater.kt index 2c33c85ff3..4f7729e7dd 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/HistoryDepthUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/HistoryDepthUpdater.kt @@ -8,9 +8,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.base.StakingUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageOrNull +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storageOrNull class HistoryDepthUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/MaxNominatorsUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/MaxNominatorsUpdater.kt index fa79df994f..8efbfe7bfd 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/MaxNominatorsUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/MaxNominatorsUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.base.StakingUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageOrNull +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storageOrNull class MaxNominatorsUpdater( storageCache: StorageCache, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/MinBondUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/MinBondUpdater.kt index 5278c796cf..9e6ffbe657 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/MinBondUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/MinBondUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.base.StakingUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageOrNull +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storageOrNull class MinBondUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ParachainsUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ParachainsUpdater.kt index cb00c6d567..93e09341ce 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ParachainsUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ParachainsUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.base.StakingUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class ParachainsUpdater( storageCache: StorageCache, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ProxiesUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ProxiesUpdater.kt index 993fb4fa05..40b09539fd 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ProxiesUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ProxiesUpdater.kt @@ -8,9 +8,9 @@ import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.update import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.scope.AccountStakingScope import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageOrNull +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storageOrNull class ProxiesUpdater( scope: AccountStakingScope, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/StakingLedgerUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/StakingLedgerUpdater.kt index 7f4effae3c..f0010055e3 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/StakingLedgerUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/StakingLedgerUpdater.kt @@ -25,15 +25,15 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.network.updaters.insert import io.novafoundation.nova.runtime.state.assetWithChain -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.storage.SubscribeStorageRequest -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.storage.storageChange -import jp.co.soramitsu.fearless_utils.wsrpc.subscriptionFlow +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.storage.SubscribeStorageRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.storage.storageChange +import io.novasama.substrate_sdk_android.wsrpc.subscriptionFlow import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ValidatorExposureUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ValidatorExposureUpdater.kt index 36c8cee5e3..eeb1001f14 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ValidatorExposureUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/ValidatorExposureUpdater.kt @@ -14,10 +14,10 @@ import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.update import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.scope.ActiveEraScope import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.getRuntime -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.wsrpc.SocketService import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.flow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/controller/AccountControllerBalanceUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/controller/AccountControllerBalanceUpdater.kt index 479e0add29..72dd834b85 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/controller/AccountControllerBalanceUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/controller/AccountControllerBalanceUpdater.kt @@ -14,8 +14,8 @@ import io.novafoundation.nova.runtime.ext.disabled import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.state.chainAndAsset -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/historical/HistoricalTotalValidatorRewardUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/historical/HistoricalTotalValidatorRewardUpdater.kt index 5f8b284469..97571543b7 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/historical/HistoricalTotalValidatorRewardUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/historical/HistoricalTotalValidatorRewardUpdater.kt @@ -1,9 +1,9 @@ package io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.historical import io.novafoundation.nova.common.utils.staking -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class HistoricalTotalValidatorRewardUpdater : HistoricalUpdater { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/historical/HistoricalUpdateMediator.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/historical/HistoricalUpdateMediator.kt index 33a92e9a6d..b1144c9b9b 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/historical/HistoricalUpdateMediator.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/historical/HistoricalUpdateMediator.kt @@ -12,7 +12,7 @@ import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.update import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.getRuntime -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import kotlinx.coroutines.flow.Flow interface HistoricalUpdater { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/historical/HistoricalValidatorRewardPointsUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/historical/HistoricalValidatorRewardPointsUpdater.kt index aadee6820d..fd60b4ba39 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/historical/HistoricalValidatorRewardPointsUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/historical/HistoricalValidatorRewardPointsUpdater.kt @@ -1,9 +1,9 @@ package io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.historical import io.novafoundation.nova.common.utils.staking -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class HistoricalValidatorRewardPointsUpdater : HistoricalUpdater { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/session/CurrentSessionIndexUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/session/CurrentSessionIndexUpdater.kt index 067f1561d5..3be6b05d22 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/session/CurrentSessionIndexUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/session/CurrentSessionIndexUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.base.StakingUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class CurrentSessionIndexUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/session/ElectionsSessionParameterUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/session/ElectionsSessionParameterUpdater.kt index 7adfbfa780..73a3c4b3bb 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/session/ElectionsSessionParameterUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/session/ElectionsSessionParameterUpdater.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot abstract class ElectionsSessionParameterUpdater( private val electionsSessionRegistry: ElectionsSessionRegistry, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/session/EraStartSessionIndexUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/session/EraStartSessionIndexUpdater.kt index ab90812a97..2f6b01f779 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/session/EraStartSessionIndexUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/blockhain/updaters/session/EraStartSessionIndexUpdater.kt @@ -8,9 +8,9 @@ import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.update import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.updaters.scope.ActiveEraScope import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class EraStartSessionIndexUpdater( activeEraScope: ActiveEraScope, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/subquery/SubQueryValidatorSetFetcher.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/subquery/SubQueryValidatorSetFetcher.kt index 184a3a7e61..b5126c2bfc 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/subquery/SubQueryValidatorSetFetcher.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/network/subquery/SubQueryValidatorSetFetcher.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.feature_staking_impl.data.model.stakingExternalApi import io.novafoundation.nova.feature_staking_impl.data.network.subquery.request.StakingNominatorEraInfosRequest import io.novafoundation.nova.feature_staking_impl.data.network.subquery.request.StakingValidatorEraInfosRequest import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId import java.math.BigInteger data class PayoutTarget(val validatorStash: AccountIdKey, val era: BigInteger) diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/api/NominationPoolsRuntimeApi.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/api/NominationPoolsRuntimeApi.kt index 3ab3f5eacb..7df5115ed1 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/api/NominationPoolsRuntimeApi.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/api/NominationPoolsRuntimeApi.kt @@ -18,9 +18,9 @@ import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageE import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry1 import io.novafoundation.nova.runtime.storage.source.query.api.storage0 import io.novafoundation.nova.runtime.storage.source.query.api.storage1 -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module import java.math.BigInteger @JvmInline diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/calls/ExtrinsicBuilderExt.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/calls/ExtrinsicBuilderExt.kt index ad1a86764b..a0129d9836 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/calls/ExtrinsicBuilderExt.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/calls/ExtrinsicBuilderExt.kt @@ -4,10 +4,10 @@ import io.novafoundation.nova.common.utils.Modules import io.novafoundation.nova.feature_staking_api.domain.nominationPool.model.PoolId import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network.blockhain.models.PoolPoints import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.instances.AddressInstanceConstructor -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.instances.AddressInstanceConstructor +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigInteger @JvmInline diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/models/PoolMember.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/models/PoolMember.kt index a9f591a04d..47afeb5ca3 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/models/PoolMember.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/models/PoolMember.kt @@ -10,7 +10,7 @@ import io.novafoundation.nova.feature_staking_api.domain.model.isUnbondingIn import io.novafoundation.nova.feature_staking_api.domain.model.of import io.novafoundation.nova.feature_staking_api.domain.nominationPool.model.PoolId import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.bindings.bindEraIndex -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger class PoolMember( diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/CounterForPoolMembersUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/CounterForPoolMembersUpdater.kt index 00015c0b52..ff02305fb9 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/CounterForPoolMembersUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/CounterForPoolMembersUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network.blockhain.updater.base.NominationPoolUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class CounterForPoolMembersUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/LastPoolIdUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/LastPoolIdUpdater.kt index 63c0a61f41..0f5f36b060 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/LastPoolIdUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/LastPoolIdUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network.blockhain.updater.base.NominationPoolUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class LastPoolIdUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/MaxPoolMembersPerPoolUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/MaxPoolMembersPerPoolUpdater.kt index 27f3b9d425..b6b64f5ba8 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/MaxPoolMembersPerPoolUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/MaxPoolMembersPerPoolUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network.blockhain.updater.base.NominationPoolUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class MaxPoolMembersPerPoolUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/MaxPoolMembersUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/MaxPoolMembersUpdater.kt index edbcb118ac..26693eda07 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/MaxPoolMembersUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/MaxPoolMembersUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network.blockhain.updater.base.NominationPoolUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class MaxPoolMembersUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/MinJoinBondUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/MinJoinBondUpdater.kt index d063936a82..b9e1bb5d84 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/MinJoinBondUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/MinJoinBondUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network.blockhain.updater.base.NominationPoolUpdater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class MinJoinBondUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/PoolMetadataUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/PoolMetadataUpdater.kt index c0f5ef7a4e..0017928eb2 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/PoolMetadataUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/PoolMetadataUpdater.kt @@ -8,9 +8,9 @@ import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network. import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network.blockhain.updater.scope.PoolScope import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class PoolMetadataUpdater( poolScope: PoolScope, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/SubPoolsUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/SubPoolsUpdater.kt index 41a98e7bc5..e71452603a 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/SubPoolsUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/network/blockhain/updater/SubPoolsUpdater.kt @@ -8,9 +8,9 @@ import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network. import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network.blockhain.updater.scope.PoolScope import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class SubPoolsUpdater( poolScope: PoolScope, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/pool/PoolAccountDerivation.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/pool/PoolAccountDerivation.kt index 97301a219b..ca9cb8ce54 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/pool/PoolAccountDerivation.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/pool/PoolAccountDerivation.kt @@ -13,8 +13,8 @@ import io.novafoundation.nova.feature_staking_api.domain.nominationPool.model.Po import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.metadata -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.scale.dataType.uint32 +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.scale.dataType.uint32 private const val PREFIX = "modl" diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/repository/NominationPoolMembersRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/repository/NominationPoolMembersRepository.kt index 9c7617fbf9..5209cf4096 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/repository/NominationPoolMembersRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/repository/NominationPoolMembersRepository.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.runtime.call.MultiChainRuntimeCallsApi import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.metadata -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow interface NominationPoolMembersRepository { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/repository/NominationPoolStateRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/repository/NominationPoolStateRepository.kt index 70badd0f62..e93858aa80 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/repository/NominationPoolStateRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/nominationPools/repository/NominationPoolStateRepository.kt @@ -21,7 +21,7 @@ import io.novafoundation.nova.runtime.storage.source.query.WithRawValue import io.novafoundation.nova.runtime.storage.source.query.api.observeNonNull import io.novafoundation.nova.runtime.storage.source.query.api.queryNonNull import io.novafoundation.nova.runtime.storage.source.query.metadata -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow interface NominationPoolStateRepository { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/bindings/DelegationRequest.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/bindings/DelegationRequest.kt index 4ea1b7748b..99f6878c6b 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/bindings/DelegationRequest.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/bindings/DelegationRequest.kt @@ -8,8 +8,8 @@ import io.novafoundation.nova.common.data.network.runtime.binding.getTyped import io.novafoundation.nova.common.data.network.runtime.binding.incompatible import io.novafoundation.nova.feature_staking_api.domain.model.parachain.DelegationAction import io.novafoundation.nova.feature_staking_api.domain.model.parachain.ScheduledDelegationRequest -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum fun bindDelegationRequests(instance: Any?, collatorId: AccountId) = instance?.let { bindList(instance) { listElement -> bindDelegationRequest(collatorId, listElement) } diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/bindings/DelegatorState.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/bindings/DelegatorState.kt index bf84472d07..f0ce5df446 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/bindings/DelegatorState.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/bindings/DelegatorState.kt @@ -8,8 +8,8 @@ import io.novafoundation.nova.common.data.network.runtime.binding.incompatible import io.novafoundation.nova.feature_staking_api.domain.model.parachain.DelegatorBond import io.novafoundation.nova.feature_staking_api.domain.model.parachain.DelegatorState import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct fun bindDelegatorState( dynamicInstance: Any?, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/bindings/ParachainBondConfig.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/bindings/ParachainBondConfig.kt index 4f06f8a99f..ae6b702090 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/bindings/ParachainBondConfig.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/bindings/ParachainBondConfig.kt @@ -3,7 +3,7 @@ package io.novafoundation.nova.feature_staking_impl.data.parachainStaking.networ import io.novafoundation.nova.common.data.network.runtime.binding.bindAccountId import io.novafoundation.nova.common.data.network.runtime.binding.cast import io.novafoundation.nova.common.data.network.runtime.binding.castToStruct -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger typealias Percent = BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/CollatorCommissionUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/CollatorCommissionUpdater.kt index 74eb3d0c99..14c07edecf 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/CollatorCommissionUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/CollatorCommissionUpdater.kt @@ -6,9 +6,9 @@ import io.novafoundation.nova.core.updater.GlobalScope import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class CollatorCommissionUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/CurrentRoundCollatorsUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/CurrentRoundCollatorsUpdater.kt index e4cce05614..6c0c21d343 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/CurrentRoundCollatorsUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/CurrentRoundCollatorsUpdater.kt @@ -12,10 +12,10 @@ import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.update import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.repository.CurrentRoundRepository import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.getRuntime -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.wsrpc.SocketService import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.filterNot diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/CurrentRoundUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/CurrentRoundUpdater.kt index e543540b43..54be66c79a 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/CurrentRoundUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/CurrentRoundUpdater.kt @@ -6,9 +6,9 @@ import io.novafoundation.nova.core.updater.GlobalScope import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class CurrentRoundUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/DelegatorStateUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/DelegatorStateUpdater.kt index 744b705830..f3c150c41a 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/DelegatorStateUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/DelegatorStateUpdater.kt @@ -9,9 +9,9 @@ import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class DelegatorStateUpdater( scope: AccountUpdateScope, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/InflationConfigUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/InflationConfigUpdater.kt index 8b2ef5dedb..5f871672ab 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/InflationConfigUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/InflationConfigUpdater.kt @@ -6,9 +6,9 @@ import io.novafoundation.nova.core.updater.GlobalScope import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class InflationConfigUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/ParachainBondInfoUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/ParachainBondInfoUpdater.kt index 898f282a46..f76103fc22 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/ParachainBondInfoUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/ParachainBondInfoUpdater.kt @@ -6,9 +6,9 @@ import io.novafoundation.nova.core.updater.GlobalScope import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class ParachainBondInfoUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/ScheduledDelegationRequestsUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/ScheduledDelegationRequestsUpdater.kt index 9c5c539833..8602a9a980 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/ScheduledDelegationRequestsUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/ScheduledDelegationRequestsUpdater.kt @@ -17,8 +17,8 @@ import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.state.chainAndAsset import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.wrapSingleArgumentKeys -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.map diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/TotalDelegatedUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/TotalDelegatedUpdater.kt index d6454b9c5a..ff2d4eb9e2 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/TotalDelegatedUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/TotalDelegatedUpdater.kt @@ -6,9 +6,9 @@ import io.novafoundation.nova.core.updater.GlobalScope import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class TotalDelegatedUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/turing/TuringAdditionalIssuanceUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/turing/TuringAdditionalIssuanceUpdater.kt index a0f9c18055..9938753dd6 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/turing/TuringAdditionalIssuanceUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/turing/TuringAdditionalIssuanceUpdater.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.core.updater.GlobalScope import io.novafoundation.nova.feature_staking_impl.data.StakingSharedState import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class TuringAdditionalIssuanceUpdater( stakingSharedState: StakingSharedState, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/turing/TuringAutomationTasksUpdater.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/turing/TuringAutomationTasksUpdater.kt index 9ea423166e..aeba02b4f9 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/turing/TuringAutomationTasksUpdater.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/blockhain/updaters/turing/TuringAutomationTasksUpdater.kt @@ -15,8 +15,8 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.state.chain import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.mapLatest diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/calls/ExtrinsicBuilderExt.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/calls/ExtrinsicBuilderExt.kt index e49576e5e5..fd7cdd65aa 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/calls/ExtrinsicBuilderExt.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/network/calls/ExtrinsicBuilderExt.kt @@ -2,8 +2,8 @@ package io.novafoundation.nova.feature_staking_impl.data.parachainStaking.networ import io.novafoundation.nova.common.utils.Modules import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigInteger fun ExtrinsicBuilder.delegate( diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/CandidatesRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/CandidatesRepository.kt index 5ba14cf97e..147100c608 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/CandidatesRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/CandidatesRepository.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.wrapSingleArgumentKeys -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.storage interface CandidatesRepository { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/CurrentRoundRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/CurrentRoundRepository.kt index e697c6eacd..9cb0068292 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/CurrentRoundRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/CurrentRoundRepository.kt @@ -11,9 +11,9 @@ import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlinx.coroutines.flow.Flow interface CurrentRoundRepository { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/DelegatorStateRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/DelegatorStateRepository.kt index 8e139af8a9..86a635c67a 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/DelegatorStateRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/DelegatorStateRepository.kt @@ -10,10 +10,10 @@ import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network.bindings.bindDelegatorState import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/RewardsRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/RewardsRepository.kt index c30a184b37..a24608c858 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/RewardsRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/repository/RewardsRepository.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network.bindings.bindParachainBondConfig import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storage interface RewardsRepository { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/turing/network/rpc/TuringAutomationRpcApi.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/turing/network/rpc/TuringAutomationRpcApi.kt index 0620379bfe..c53fb2dfb1 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/turing/network/rpc/TuringAutomationRpcApi.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/turing/network/rpc/TuringAutomationRpcApi.kt @@ -9,12 +9,12 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Ba import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.getSocket -import jp.co.soramitsu.fearless_utils.wsrpc.executeAsync -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.NullableMapper -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.nonNull -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.pojo -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest -import jp.co.soramitsu.fearless_utils.wsrpc.response.RpcResponse +import io.novasama.substrate_sdk_android.wsrpc.executeAsync +import io.novasama.substrate_sdk_android.wsrpc.mappers.NullableMapper +import io.novasama.substrate_sdk_android.wsrpc.mappers.nonNull +import io.novasama.substrate_sdk_android.wsrpc.mappers.pojo +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.response.RpcResponse interface TuringAutomationRpcApi { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/turing/repository/TuringAutomationTasksRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/turing/repository/TuringAutomationTasksRepository.kt index 3724e99f1b..bd8789eded 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/turing/repository/TuringAutomationTasksRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/turing/repository/TuringAutomationTasksRepository.kt @@ -15,10 +15,10 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Ba import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource import java.math.BigInteger -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/turing/repository/TuringStakingRewardsRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/turing/repository/TuringStakingRewardsRepository.kt index 960be18c5e..fddb60cc7e 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/turing/repository/TuringStakingRewardsRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/parachainStaking/turing/repository/TuringStakingRewardsRepository.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.common.utils.vesting import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storage interface TuringStakingRewardsRepository { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/BagListRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/BagListRepository.kt index 827c218022..c7ecfdc5a6 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/BagListRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/BagListRepository.kt @@ -14,8 +14,8 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.network.binding.collectionOf import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/Common.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/Common.kt index 77578a694a..7795eeaefd 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/Common.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/Common.kt @@ -1,10 +1,10 @@ package io.novafoundation.nova.feature_staking_impl.data.repository -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey fun StorageEntry.accountMapStorageKeys(runtime: RuntimeSnapshot, accountIdsHex: List): List { return accountIdsHex.map { storageKey(runtime, it.fromHex()) } diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/ParasRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/ParasRepository.kt index c2630fe586..48df5cc299 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/ParasRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/ParasRepository.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.common.data.network.runtime.binding.bindNumber import io.novafoundation.nova.common.utils.parasOrNull import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storage interface ParasRepository { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/PayoutRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/PayoutRepository.kt index 91db20510c..d4083e58ae 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/PayoutRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/PayoutRepository.kt @@ -44,12 +44,12 @@ import io.novafoundation.nova.runtime.storage.source.query.DynamicInstanceBinder import io.novafoundation.nova.runtime.storage.source.query.metadata import io.novafoundation.nova.runtime.storage.source.query.multi import io.novafoundation.nova.runtime.storage.source.query.wrapSingleArgumentKeys -import jp.co.soramitsu.fearless_utils.hash.isPositive -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.hash.isPositive +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import java.math.BigInteger typealias HistoricalMapping = Map // EraIndex -> T diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingPeriodRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingPeriodRepository.kt index c791d14459..f907ae7509 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingPeriodRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingPeriodRepository.kt @@ -3,7 +3,7 @@ package io.novafoundation.nova.feature_staking_impl.data.repository import io.novafoundation.nova.feature_staking_impl.data.repository.datasource.StakingRewardPeriodDataSource import io.novafoundation.nova.feature_staking_impl.domain.period.RewardPeriod import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow interface StakingPeriodRepository { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingRepositoryImpl.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingRepositoryImpl.kt index 1d1409e22c..7c44433e51 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingRepositoryImpl.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingRepositoryImpl.kt @@ -52,12 +52,12 @@ import io.novafoundation.nova.runtime.storage.source.observeNonNull import io.novafoundation.nova.runtime.storage.source.query.api.queryNonNull import io.novafoundation.nova.runtime.storage.source.query.metadata import io.novafoundation.nova.runtime.storage.source.queryNonNull -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageOrNull +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storageOrNull import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingRewardsRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingRewardsRepository.kt index 9a93ba5037..989d5efb95 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingRewardsRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingRewardsRepository.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_staking_impl.data.fullId import io.novafoundation.nova.feature_staking_impl.data.repository.datasource.reward.StakingRewardsDataSourceRegistry import io.novafoundation.nova.feature_staking_impl.domain.model.TotalReward import io.novafoundation.nova.feature_staking_impl.domain.period.RewardPeriod -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow interface StakingRewardsRepository { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingVersioningRepository.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingVersioningRepository.kt index 6c9b29b582..eeb75ae512 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingVersioningRepository.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/StakingVersioningRepository.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.common.utils.staking import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.getRuntime -import jp.co.soramitsu.fearless_utils.runtime.metadata.call +import io.novasama.substrate_sdk_android.runtime.metadata.call interface StakingVersioningRepository { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/consensus/AuraSession.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/consensus/AuraSession.kt index b5fcda9361..d79847b5e4 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/consensus/AuraSession.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/consensus/AuraSession.kt @@ -12,7 +12,7 @@ import io.novafoundation.nova.runtime.storage.source.query.api.observeNonNull import io.novafoundation.nova.runtime.storage.source.query.metadata import io.novafoundation.nova.runtime.storage.typed.number import io.novafoundation.nova.runtime.storage.typed.system -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/consensus/BabeSession.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/consensus/BabeSession.kt index 597bcace34..e2c8e3464c 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/consensus/BabeSession.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/consensus/BabeSession.kt @@ -13,7 +13,7 @@ import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.api.observeNonNull import io.novafoundation.nova.runtime.storage.source.query.api.queryNonNull import io.novafoundation.nova.runtime.storage.source.query.metadata -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import kotlinx.coroutines.flow.Flow import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/StakingRewardPeriodDataSource.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/StakingRewardPeriodDataSource.kt index a745ae9884..91f671c645 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/StakingRewardPeriodDataSource.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/StakingRewardPeriodDataSource.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.period.RewardPeriod import io.novafoundation.nova.feature_staking_impl.domain.period.RewardPeriod.CustomRange import io.novafoundation.nova.feature_staking_impl.domain.period.RewardPeriodType import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import java.util.Date diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/BaseStakingRewardsDataSource.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/BaseStakingRewardsDataSource.kt index e3978a973c..1cd343ac76 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/BaseStakingRewardsDataSource.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/BaseStakingRewardsDataSource.kt @@ -12,7 +12,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.model.TotalReward import io.novafoundation.nova.feature_staking_impl.domain.period.RewardPeriod import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.mappers.mapStakingTypeToStakingString -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.filterNotNull diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/DirectStakingRewardsDataSource.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/DirectStakingRewardsDataSource.kt index b9d4f01631..7e976d1f25 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/DirectStakingRewardsDataSource.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/DirectStakingRewardsDataSource.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_staking_impl.data.network.subquery.request import io.novafoundation.nova.feature_staking_impl.data.network.subquery.response.totalReward import io.novafoundation.nova.feature_staking_impl.domain.period.RewardPeriod import io.novafoundation.nova.runtime.ext.addressOf -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class DirectStakingRewardsDataSource( private val stakingApi: StakingApi, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/PoolStakingRewardsDataSource.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/PoolStakingRewardsDataSource.kt index 8e3034caba..727669aa95 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/PoolStakingRewardsDataSource.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/PoolStakingRewardsDataSource.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_staking_impl.data.network.subquery.request import io.novafoundation.nova.feature_staking_impl.data.network.subquery.response.totalReward import io.novafoundation.nova.feature_staking_impl.domain.period.RewardPeriod import io.novafoundation.nova.runtime.ext.addressOf -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class PoolStakingRewardsDataSource( private val stakingApi: StakingApi, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/StakingRewardsDataSource.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/StakingRewardsDataSource.kt index 6829ce98a5..0d22436ab6 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/StakingRewardsDataSource.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/data/repository/datasource/reward/StakingRewardsDataSource.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.feature_staking_api.domain.dashboard.model.Staking import io.novafoundation.nova.feature_staking_impl.data.StakingOption import io.novafoundation.nova.feature_staking_impl.domain.model.TotalReward import io.novafoundation.nova.feature_staking_impl.domain.period.RewardPeriod -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow interface StakingRewardsDataSource { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/StakingInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/StakingInteractor.kt index 165a8de2c1..0e66619e43 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/StakingInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/StakingInteractor.kt @@ -45,7 +45,7 @@ import io.novafoundation.nova.runtime.state.chain import io.novafoundation.nova.runtime.state.chainAndAsset import io.novafoundation.nova.runtime.state.chainAsset import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/StakingInteractorExt.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/StakingInteractorExt.kt index 6f2460d0e2..6f613e6202 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/StakingInteractorExt.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/StakingInteractorExt.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_staking_api.domain.model.IndividualExposur import io.novafoundation.nova.feature_staking_impl.domain.bagList.BagListLocator import io.novafoundation.nova.feature_staking_impl.domain.bagList.BagListScoreConverter import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger enum class NominationStatus { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/alerts/AlertsInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/alerts/AlertsInteractor.kt index 5a19f0b074..7004c55612 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/alerts/AlertsInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/alerts/AlertsInteractor.kt @@ -18,8 +18,8 @@ import io.novafoundation.nova.feature_wallet_api.domain.interfaces.WalletReposit import io.novafoundation.nova.feature_wallet_api.domain.model.Asset import io.novafoundation.nova.feature_wallet_api.domain.model.amountFromPlanks import io.novafoundation.nova.runtime.repository.TotalIssuanceRepository -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/era/StakingEraInteractorFactory.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/era/StakingEraInteractorFactory.kt index 799abef00b..ccab8ed224 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/era/StakingEraInteractorFactory.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/era/StakingEraInteractorFactory.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.common.StakingSharedCo import io.novafoundation.nova.runtime.ext.StakingTypeGroup import io.novafoundation.nova.runtime.ext.group import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.extensions.tryFindNonNull +import io.novasama.substrate_sdk_android.extensions.tryFindNonNull import kotlinx.coroutines.CoroutineScope class StakingEraInteractorFactory( diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/model/BagListNode.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/model/BagListNode.kt index 0db9862720..214a54018a 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/model/BagListNode.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/model/BagListNode.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_staking_impl.domain.model -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger class BagListNode( diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/bondMore/validations/NotUnstakingAllValidation.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/bondMore/validations/NotUnstakingAllValidation.kt index b9a5cc0816..e41750fea4 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/bondMore/validations/NotUnstakingAllValidation.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/bondMore/validations/NotUnstakingAllValidation.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_staking_impl.domain.nominationPools.bondM import io.novafoundation.nova.common.validation.ValidationStatus import io.novafoundation.nova.common.validation.isTrueOrError -import jp.co.soramitsu.fearless_utils.hash.isPositive +import io.novasama.substrate_sdk_android.hash.isPositive class NotUnstakingAllValidation : NominationPoolsBondMoreValidation { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/claimRewards/NominationPoolsClaimRewardsInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/claimRewards/NominationPoolsClaimRewardsInteractor.kt index 9215becac1..cbf1d56a9a 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/claimRewards/NominationPoolsClaimRewardsInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/claimRewards/NominationPoolsClaimRewardsInteractor.kt @@ -13,7 +13,7 @@ import io.novafoundation.nova.feature_staking_impl.data.nominationPools.reposito import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.common.NominationPoolMemberUseCase import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.distinctUntilChangedBy diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/NominationPoolSharedComputation.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/NominationPoolSharedComputation.kt index ac549d26ba..46def7d5ca 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/NominationPoolSharedComputation.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/NominationPoolSharedComputation.kt @@ -23,7 +23,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.model. import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/poolState/PoolState.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/poolState/PoolState.kt index 72172d93b1..d1c0f6024c 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/poolState/PoolState.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/poolState/PoolState.kt @@ -3,8 +3,8 @@ package io.novafoundation.nova.feature_staking_impl.domain.nominationPools.commo import io.novafoundation.nova.feature_account_api.data.model.AccountIdMap import io.novafoundation.nova.feature_staking_api.domain.model.Exposure import io.novafoundation.nova.feature_staking_api.domain.model.Nominations -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId fun AccountIdMap.isPoolStaking(poolStash: AccountId, poolNominations: Nominations?): Boolean { // whereas pool might still stake without nominations if era it has chilled in haven't yet finished diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/validations/PoolAvailableBalanceValidation.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/validations/PoolAvailableBalanceValidation.kt index a6d159f54d..4e3ec72755 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/validations/PoolAvailableBalanceValidation.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/common/validations/PoolAvailableBalanceValidation.kt @@ -21,7 +21,7 @@ import io.novafoundation.nova.feature_wallet_api.domain.validation.FeeProducer import io.novafoundation.nova.feature_wallet_api.presentation.formatters.formatPlanks import io.novafoundation.nova.feature_wallet_api.presentation.formatters.formatTokenAmount import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.hash.isPositive +import io.novasama.substrate_sdk_android.hash.isPositive import java.math.BigDecimal class PoolAvailableBalanceValidationFactory( diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/alerts/NominationPoolsAlertsInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/alerts/NominationPoolsAlertsInteractor.kt index 8ff534437e..7c7e07dbf9 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/alerts/NominationPoolsAlertsInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/alerts/NominationPoolsAlertsInteractor.kt @@ -19,8 +19,8 @@ import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.main.a import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.main.alerts.NominationPoolAlert.WaitingForNextEra import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.main.alerts.RealNominationPoolsAlertsInteractor.AlertsResolutionContext.PoolContext import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.hash.isPositive -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.hash.isPositive +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/stakeSummary/NominationPoolStakeSummaryInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/stakeSummary/NominationPoolStakeSummaryInteractor.kt index e7d79c6020..e5a3f731f9 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/stakeSummary/NominationPoolStakeSummaryInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/stakeSummary/NominationPoolStakeSummaryInteractor.kt @@ -17,7 +17,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.common import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.common.participatingBondedPoolStateFlow import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.common.poolState.isPoolStaking import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.model.amountOf -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.FlowCollector diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/userRewards/NomnationPoolsUserRewardsInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/userRewards/NomnationPoolsUserRewardsInteractor.kt index fa5e319e8c..282e5b0bb3 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/userRewards/NomnationPoolsUserRewardsInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/userRewards/NomnationPoolsUserRewardsInteractor.kt @@ -12,7 +12,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.main.u import io.novafoundation.nova.feature_staking_impl.domain.period.RewardPeriod import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.combine diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/yourPool/NominationPoolYourPoolInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/yourPool/NominationPoolYourPoolInteractor.kt index ea2f791bfd..abab2a65b0 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/yourPool/NominationPoolYourPoolInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/main/yourPool/NominationPoolYourPoolInteractor.kt @@ -10,7 +10,7 @@ import io.novafoundation.nova.feature_staking_impl.data.nominationPools.reposito import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.main.yourPool.NominationPoolYourPoolInteractor.YourPool import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.model.PoolDisplay import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/model/NominationPool.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/model/NominationPool.kt index 5f36846e1e..47304beb73 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/model/NominationPool.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/model/NominationPool.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network. import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network.blockhain.models.PoolState import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class NominationPool( val id: PoolId, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/model/PoolDisplay.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/model/PoolDisplay.kt index 38ea78ccc6..fcde182610 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/model/PoolDisplay.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/model/PoolDisplay.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_staking_impl.domain.nominationPools.model import io.novafoundation.nova.common.utils.images.Icon import io.novafoundation.nova.feature_staking_impl.data.nominationPools.network.blockhain.models.PoolMetadata -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface PoolDisplay { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/redeem/NominationPoolsRedeemInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/redeem/NominationPoolsRedeemInteractor.kt index 7e7d5ecce8..4517c4a305 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/redeem/NominationPoolsRedeemInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/redeem/NominationPoolsRedeemInteractor.kt @@ -21,7 +21,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.common import io.novafoundation.nova.feature_staking_impl.domain.staking.redeem.RedeemConsequences import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/collator/current/CurrentCollatorInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/collator/current/CurrentCollatorInteractor.kt index 0cd440a6c5..f14af6af79 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/collator/current/CurrentCollatorInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/collator/current/CurrentCollatorInteractor.kt @@ -10,7 +10,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.commo import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.common.DelegationState import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.common.delegationStatesFor import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.flow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/CollatorProvider.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/CollatorProvider.kt index d72feb6a00..e108f006fb 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/CollatorProvider.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/CollatorProvider.kt @@ -16,9 +16,9 @@ import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.commo import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.rewards.ParachainStakingRewardCalculatorFactory import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId interface CollatorProvider { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/CollatorsUseCase.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/CollatorsUseCase.kt index 4375982347..3682071c2a 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/CollatorsUseCase.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/CollatorsUseCase.kt @@ -11,8 +11,8 @@ import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.commo import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.common.collators.collatorAddressModel import io.novafoundation.nova.runtime.state.chain import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/DelegationState.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/DelegationState.kt index 30946fe9c5..705e72c60a 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/DelegationState.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/DelegationState.kt @@ -8,8 +8,8 @@ import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network.bindings.isStakeEnoughToEarnRewards import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.common.model.Collator import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.common.model.isElected -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId enum class DelegationState { COLLATOR_NOT_ACTIVE, TOO_LOW_STAKE, WAITING, ACTIVE diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/model/Collator.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/model/Collator.kt index da49c1b9ee..5f1751d304 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/model/Collator.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/common/model/Collator.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_account_api.data.model.OnChainIdentity import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network.bindings.CandidateMetadata import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network.bindings.CollatorSnapshot import io.novafoundation.nova.feature_staking_impl.domain.rewards.PeriodReturns -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex import java.math.BigDecimal import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/main/ParachainNetworkInfoInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/main/ParachainNetworkInfoInteractor.kt index a23c076ca6..634ebbc2d4 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/main/ParachainNetworkInfoInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/main/ParachainNetworkInfoInteractor.kt @@ -11,7 +11,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.model.StakingPeriod import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.common.model.minimumStake import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.emitAll diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/main/unbondings/ParachainStakingUnbondingsInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/main/unbondings/ParachainStakingUnbondingsInteractor.kt index 182ab4557e..7c2a592ab0 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/main/unbondings/ParachainStakingUnbondingsInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/main/unbondings/ParachainStakingUnbondingsInteractor.kt @@ -14,7 +14,7 @@ import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.toTimer import io.novafoundation.nova.feature_staking_impl.domain.model.Unbonding import io.novafoundation.nova.feature_staking_impl.domain.staking.unbond.Unbondings import io.novafoundation.nova.feature_staking_impl.domain.staking.unbond.from -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/rebond/ParachainStakingRebondInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/rebond/ParachainStakingRebondInteractor.kt index 5d034426a5..66c72f2545 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/rebond/ParachainStakingRebondInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/rebond/ParachainStakingRebondInteractor.kt @@ -10,7 +10,7 @@ import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.repository.DelegatorStateRepository import io.novafoundation.nova.runtime.state.AnySelectedAssetOptionSharedState import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/redeem/ParachainStakingRedeemInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/redeem/ParachainStakingRedeemInteractor.kt index 49b528db39..711e1da377 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/redeem/ParachainStakingRedeemInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/redeem/ParachainStakingRedeemInteractor.kt @@ -15,8 +15,8 @@ import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.repository.CurrentRoundRepository import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.repository.DelegatorStateRepository import io.novafoundation.nova.feature_staking_impl.domain.staking.redeem.RedeemConsequences -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/rewards/ParachainStakingRewardCalculator.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/rewards/ParachainStakingRewardCalculator.kt index 91e5444dcb..0325b63b02 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/rewards/ParachainStakingRewardCalculator.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/rewards/ParachainStakingRewardCalculator.kt @@ -5,8 +5,8 @@ import io.novafoundation.nova.common.utils.percentageToFraction import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network.bindings.InflationInfo import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.network.bindings.ParachainBondConfig import io.novafoundation.nova.feature_staking_impl.domain.rewards.PeriodReturns -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigDecimal import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/start/StartParachainStakingInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/start/StartParachainStakingInteractor.kt index c5e39c4578..b8e2e5ed01 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/start/StartParachainStakingInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/start/StartParachainStakingInteractor.kt @@ -22,10 +22,10 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.state.AnySelectedAssetOptionSharedState import io.novafoundation.nova.runtime.state.chainAndAsset -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.primitives.FixedByteArray -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.skipAliases -import jp.co.soramitsu.fearless_utils.runtime.metadata.call +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.primitives.FixedByteArray +import io.novasama.substrate_sdk_android.runtime.definitions.types.skipAliases +import io.novasama.substrate_sdk_android.runtime.metadata.call import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/start/validations/MinimumDelegationValidation.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/start/validations/MinimumDelegationValidation.kt index a2140bb977..d8083f1c74 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/start/validations/MinimumDelegationValidation.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/start/validations/MinimumDelegationValidation.kt @@ -18,7 +18,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.start import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.start.validations.StartParachainStakingValidationFailure.TooLowStake.TooLowTotalStake import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.start.validations.StartParachainStakingValidationFailure.TooLowStake.WontReceiveRewards import io.novafoundation.nova.feature_wallet_api.domain.model.amountFromPlanks -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex class MinimumDelegationValidationFactory( private val stakingConstantsRepository: ParachainStakingConstantsRepository, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/start/validations/NoPendingRevokeValidation.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/start/validations/NoPendingRevokeValidation.kt index 809eff3309..d67bef1533 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/start/validations/NoPendingRevokeValidation.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/start/validations/NoPendingRevokeValidation.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.common.validation.isFalseOrError import io.novafoundation.nova.feature_staking_api.domain.model.parachain.DelegationAction import io.novafoundation.nova.feature_staking_api.domain.model.parachain.DelegatorState import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.repository.DelegatorStateRepository -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex class NoPendingRevokeValidationFactory( private val delegatorStateRepository: DelegatorStateRepository, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/unbond/ParachainStakingUnbondInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/unbond/ParachainStakingUnbondInteractor.kt index 248a208f23..3ab6dc7c85 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/unbond/ParachainStakingUnbondInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/unbond/ParachainStakingUnbondInteractor.kt @@ -14,8 +14,8 @@ import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.commo import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.common.DelegatorStateUseCase import io.novafoundation.nova.runtime.state.AnySelectedAssetOptionSharedState import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/unbond/validations/flow/NoExistingDelegationRequestsToCollatorValidation.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/unbond/validations/flow/NoExistingDelegationRequestsToCollatorValidation.kt index 885673faf0..c1d46ca6ba 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/unbond/validations/flow/NoExistingDelegationRequestsToCollatorValidation.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/unbond/validations/flow/NoExistingDelegationRequestsToCollatorValidation.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.common.validation.ValidationSystemBuilder import io.novafoundation.nova.common.validation.isTrueOrError import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.common.DelegatorStateUseCase import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.unbond.ParachainStakingUnbondInteractor -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex class NoExistingDelegationRequestsToCollatorValidationFactory( private val interactor: ParachainStakingUnbondInteractor, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/unbond/validations/flow/RemainingUnbondValidation.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/unbond/validations/flow/RemainingUnbondValidation.kt index c86a2c8035..c50ddae748 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/unbond/validations/flow/RemainingUnbondValidation.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/unbond/validations/flow/RemainingUnbondValidation.kt @@ -18,7 +18,7 @@ import io.novafoundation.nova.feature_staking_impl.data.parachainStaking.reposit import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.common.DelegatorStateUseCase import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.unbond.validations.flow.ParachainStakingUnbondValidationFailure.TooLowRemainingBond.WillBeAddedToUnbondings import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.unbond.validations.flow.ParachainStakingUnbondValidationFailure.TooLowRemainingBond.WontReceiveRewards -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex class RemainingUnbondValidationFactory( private val stakingConstantsRepository: ParachainStakingConstantsRepository, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/yieldBoost/YieldBoostInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/yieldBoost/YieldBoostInteractor.kt index 427fcab723..07b60683ec 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/yieldBoost/YieldBoostInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/yieldBoost/YieldBoostInteractor.kt @@ -20,9 +20,9 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.repository.TimestampRepository import io.novafoundation.nova.runtime.state.AnySelectedAssetOptionSharedState import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import kotlin.math.roundToLong diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/yieldBoost/YieldBoostTask.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/yieldBoost/YieldBoostTask.kt index e495c5d7c4..082899d4ae 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/yieldBoost/YieldBoostTask.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/parachainStaking/yieldBoost/YieldBoostTask.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.yieldBoost import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlin.time.Duration import kotlin.time.DurationUnit diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/payout/PayoutInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/payout/PayoutInteractor.kt index 35dc6c4166..5489437cf2 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/payout/PayoutInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/payout/PayoutInteractor.kt @@ -13,7 +13,7 @@ import io.novafoundation.nova.runtime.ext.accountIdOf import io.novafoundation.nova.runtime.extrinsic.ExtrinsicStatus import io.novafoundation.nova.runtime.extrinsic.multi.CallBuilder import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/recommendations/settings/RecommendationSettingsProvider.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/recommendations/settings/RecommendationSettingsProvider.kt index 1ae6ae3649..ada660e279 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/recommendations/settings/RecommendationSettingsProvider.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/recommendations/settings/RecommendationSettingsProvider.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.recommendations.settin import io.novafoundation.nova.feature_staking_impl.domain.recommendations.settings.filters.NotSlashedFilter import io.novafoundation.nova.feature_staking_impl.domain.recommendations.settings.postprocessors.RemoveClusteringPostprocessor import io.novafoundation.nova.feature_staking_impl.domain.recommendations.settings.sortings.APYSorting -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/recommendations/settings/filters/HasIdentityFilter.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/recommendations/settings/filters/HasIdentityFilter.kt index 57bd2c97fb..8ac2ad6825 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/recommendations/settings/filters/HasIdentityFilter.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/recommendations/settings/filters/HasIdentityFilter.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.common.utils.Modules import io.novafoundation.nova.common.utils.hasModule import io.novafoundation.nova.feature_staking_api.domain.model.Validator import io.novafoundation.nova.feature_staking_impl.domain.recommendations.settings.RecommendationFilter -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot object HasIdentityFilter : RecommendationFilter { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/recommendations/settings/postprocessors/RemoveClusteringPostprocessor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/recommendations/settings/postprocessors/RemoveClusteringPostprocessor.kt index 88ec406005..b617f12766 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/recommendations/settings/postprocessors/RemoveClusteringPostprocessor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/recommendations/settings/postprocessors/RemoveClusteringPostprocessor.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.feature_account_api.data.model.OnChainIdentity import io.novafoundation.nova.feature_account_api.data.model.RootIdentity import io.novafoundation.nova.feature_staking_api.domain.model.Validator import io.novafoundation.nova.feature_staking_impl.domain.recommendations.settings.RecommendationPostProcessor -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot private const val MAX_PER_CLUSTER = 2 diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/setup/ChangeValidatorsInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/setup/ChangeValidatorsInteractor.kt index 2f7fe5b501..3fe60ea9a4 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/setup/ChangeValidatorsInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/setup/ChangeValidatorsInteractor.kt @@ -10,8 +10,8 @@ import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.calls. import io.novafoundation.nova.runtime.ext.multiAddressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/AddStakingProxyInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/AddStakingProxyInteractor.kt index 3bce3f08da..bd04a2bf35 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/AddStakingProxyInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/AddStakingProxyInteractor.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.feature_account_api.data.model.Fee import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.extrinsic.ExtrinsicStatus import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface AddStakingProxyInteractor { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/RealAddStakingProxyInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/RealAddStakingProxyInteractor.kt index c99edce477..b19965c89f 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/RealAddStakingProxyInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/RealAddStakingProxyInteractor.kt @@ -14,7 +14,7 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Ba import io.novafoundation.nova.runtime.ext.emptyAccountId import io.novafoundation.nova.runtime.extrinsic.ExtrinsicStatus import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/list/RealStakingProxyListInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/list/RealStakingProxyListInteractor.kt index 8a13aa97c4..257b3d24b2 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/list/RealStakingProxyListInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/list/RealStakingProxyListInteractor.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_proxy_api.domain.model.ProxyType import io.novafoundation.nova.feature_staking_impl.domain.staking.delegation.proxy.list.model.StakingProxyAccount import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/list/model/StakingProxyAccount.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/list/model/StakingProxyAccount.kt index 4361f339a4..372aee95c1 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/list/model/StakingProxyAccount.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/list/model/StakingProxyAccount.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_staking_impl.domain.staking.delegation.proxy.list.model -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class StakingProxyAccount( val accountName: String, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/remove/RemoveStakingProxyInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/remove/RemoveStakingProxyInteractor.kt index a293b1bce5..377be2a44a 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/remove/RemoveStakingProxyInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/delegation/proxy/remove/RemoveStakingProxyInteractor.kt @@ -10,7 +10,7 @@ import io.novafoundation.nova.feature_proxy_api.domain.model.ProxyType import io.novafoundation.nova.runtime.ext.emptyAccountId import io.novafoundation.nova.runtime.extrinsic.ExtrinsicStatus import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/common/StartMultiStakingInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/common/StartMultiStakingInteractor.kt index 71d4c609ec..a21e7c06a2 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/common/StartMultiStakingInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/common/StartMultiStakingInteractor.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_account_api.domain.interfaces.AccountRepos import io.novafoundation.nova.feature_staking_impl.data.chain import io.novafoundation.nova.feature_staking_impl.domain.staking.start.common.selection.StartMultiStakingSelection import io.novafoundation.nova.runtime.extrinsic.ExtrinsicStatus -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/common/selection/StartMultiStakingSelection.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/common/selection/StartMultiStakingSelection.kt index b4db477575..0740e12cc6 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/common/selection/StartMultiStakingSelection.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/common/selection/StartMultiStakingSelection.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.feature_staking_impl.data.asset import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.feature_wallet_api.domain.model.amountFromPlanks import io.novafoundation.nova.feature_wallet_api.domain.model.planksFromAmount -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigDecimal interface StartMultiStakingSelection { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/setupAmount/direct/DirectStakingSelection.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/setupAmount/direct/DirectStakingSelection.kt index 46c8863612..0884b8d4ba 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/setupAmount/direct/DirectStakingSelection.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/setupAmount/direct/DirectStakingSelection.kt @@ -12,8 +12,8 @@ import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.calls. import io.novafoundation.nova.feature_staking_impl.domain.staking.start.common.selection.StartMultiStakingSelection import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.ext.multiAddressOf -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder data class DirectStakingSelection( val validators: List, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/setupAmount/pools/NominationPoolSelection.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/setupAmount/pools/NominationPoolSelection.kt index d56a5ce555..b79fc67d20 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/setupAmount/pools/NominationPoolSelection.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/start/setupAmount/pools/NominationPoolSelection.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.model. import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.model.apy import io.novafoundation.nova.feature_staking_impl.domain.staking.start.common.selection.StartMultiStakingSelection import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder data class NominationPoolSelection( val pool: NominationPool, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/unbond/UnbondInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/unbond/UnbondInteractor.kt index 36682208a1..bf07149155 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/unbond/UnbondInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/staking/unbond/UnbondInteractor.kt @@ -14,7 +14,7 @@ import io.novafoundation.nova.feature_staking_impl.data.network.blockhain.calls. import io.novafoundation.nova.feature_staking_impl.domain.common.StakingSharedComputation import io.novafoundation.nova.feature_staking_impl.domain.model.Unbonding import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/add/AddStakingProxyValidationPayload.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/add/AddStakingProxyValidationPayload.kt index 8a4dcb6ada..b8ff5f4c5c 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/add/AddStakingProxyValidationPayload.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/add/AddStakingProxyValidationPayload.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Ba import io.novafoundation.nova.feature_wallet_api.domain.model.Asset import io.novafoundation.nova.feature_wallet_api.presentation.model.DecimalFee import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class AddStakingProxyValidationPayload( val chain: Chain, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/remove/RemoveStakingProxyValidationPayload.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/remove/RemoveStakingProxyValidationPayload.kt index 1909ea1ea2..2dc0a18d5f 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/remove/RemoveStakingProxyValidationPayload.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/remove/RemoveStakingProxyValidationPayload.kt @@ -3,7 +3,7 @@ package io.novafoundation.nova.feature_staking_impl.domain.validations.delegatio import io.novafoundation.nova.feature_wallet_api.domain.model.Asset import io.novafoundation.nova.feature_wallet_api.presentation.model.DecimalFee import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class RemoveStakingProxyValidationPayload( val chain: Chain, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validators/ValidatorProvider.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validators/ValidatorProvider.kt index 971d742164..22ab8674f6 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validators/ValidatorProvider.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validators/ValidatorProvider.kt @@ -15,7 +15,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.common.electedExposure import io.novafoundation.nova.feature_staking_impl.domain.rewards.RewardCalculatorFactory import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex import kotlinx.coroutines.CoroutineScope sealed class ValidatorSource { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validators/current/CurrentValidatorsInteractor.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validators/current/CurrentValidatorsInteractor.kt index cb6d0f08e1..797a51e9c9 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validators/current/CurrentValidatorsInteractor.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validators/current/CurrentValidatorsInteractor.kt @@ -21,7 +21,7 @@ import io.novafoundation.nova.feature_staking_impl.domain.validators.ValidatorSo import io.novafoundation.nova.feature_staking_impl.domain.validators.getValidators import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/common/rewardDestination/RewardDestinationProvider.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/common/rewardDestination/RewardDestinationProvider.kt index 6fddb58c70..9770394d8b 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/common/rewardDestination/RewardDestinationProvider.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/common/rewardDestination/RewardDestinationProvider.kt @@ -23,7 +23,7 @@ import io.novafoundation.nova.feature_staking_impl.presentation.mappers.mapPerio import io.novafoundation.nova.feature_wallet_api.domain.model.Asset import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/dashboard/common/Mappers.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/dashboard/common/Mappers.kt index 7d8e936db1..a77075f899 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/dashboard/common/Mappers.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/dashboard/common/Mappers.kt @@ -18,7 +18,7 @@ import io.novafoundation.nova.feature_staking_impl.presentation.dashboard.main.m import io.novafoundation.nova.feature_staking_impl.presentation.dashboard.main.view.syncingIf import io.novafoundation.nova.feature_wallet_api.presentation.formatters.formatPlanks import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain.Asset.StakingType -import jp.co.soramitsu.fearless_utils.hash.isPositive +import io.novasama.substrate_sdk_android.hash.isPositive interface StakingDashboardPresentationMapper { diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/mappers/Validator.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/mappers/Validator.kt index dc8c372ac2..e17be26ac4 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/mappers/Validator.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/mappers/Validator.kt @@ -33,7 +33,7 @@ import io.novafoundation.nova.feature_wallet_api.presentation.formatters.formatT import io.novafoundation.nova.feature_wallet_api.presentation.model.mapAmountToAmountModel import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex import java.math.BigDecimal import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/nominationPools/common/display/RealPoolDisplayUseCase.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/nominationPools/common/display/RealPoolDisplayUseCase.kt index 9fb531fb33..ac03236274 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/nominationPools/common/display/RealPoolDisplayUseCase.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/nominationPools/common/display/RealPoolDisplayUseCase.kt @@ -11,7 +11,7 @@ import io.novafoundation.nova.feature_staking_impl.data.nominationPools.reposito import io.novafoundation.nova.feature_staking_impl.domain.nominationPools.model.PoolDisplay import io.novafoundation.nova.feature_staking_impl.presentation.nominationPools.common.PoolDisplayFormatter import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId internal class RealPoolDisplayUseCase( private val poolDisplayFormatter: PoolDisplayFormatter, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/common/collators/AddressIcon.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/common/collators/AddressIcon.kt index b4d5075cf0..1e74ea4624 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/common/collators/AddressIcon.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/common/collators/AddressIcon.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.feature_account_api.presenatation.account.icon.cre import io.novafoundation.nova.feature_staking_impl.domain.parachainStaking.common.model.Collator import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex suspend fun AddressIconGenerator.collatorAddressModel(collator: Collator, chain: Chain) = createAccountAddressModel( chain = chain, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/common/mappers/Collator.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/common/mappers/Collator.kt index 1360cbab11..ec32e5523a 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/common/mappers/Collator.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/common/mappers/Collator.kt @@ -21,7 +21,7 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.Token import io.novafoundation.nova.feature_wallet_api.presentation.model.mapAmountToAmountModel import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex typealias CollatorModel = StakeTargetModel diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/common/selectCollators/Mappers.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/common/selectCollators/Mappers.kt index 698ff13827..3a3cef82b7 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/common/selectCollators/Mappers.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/common/selectCollators/Mappers.kt @@ -18,7 +18,7 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.Asset import io.novafoundation.nova.feature_wallet_api.presentation.model.AmountModel import io.novafoundation.nova.feature_wallet_api.presentation.model.mapAmountToAmountModel import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex suspend fun mapUnbondingCollatorToSelectCollatorModel( unbondingCollator: UnbondingCollator, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/rebond/model/ParachainStakingRebondPayload.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/rebond/model/ParachainStakingRebondPayload.kt index 00a1f9a5d4..623897c015 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/rebond/model/ParachainStakingRebondPayload.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/rebond/model/ParachainStakingRebondPayload.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.rebond.model import android.os.Parcelable -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.android.parcel.Parcelize @Parcelize diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/start/confirm/ConfirmStartParachainStakingViewModel.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/start/confirm/ConfirmStartParachainStakingViewModel.kt index ae57d4b17c..ee6cbc3bfe 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/start/confirm/ConfirmStartParachainStakingViewModel.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/start/confirm/ConfirmStartParachainStakingViewModel.kt @@ -43,7 +43,7 @@ import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.mapFeeFr import io.novafoundation.nova.feature_wallet_api.presentation.model.mapAmountToAmountModel import io.novafoundation.nova.runtime.state.AnySelectedAssetOptionSharedState import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/start/setup/StartParachainStakingViewModel.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/start/setup/StartParachainStakingViewModel.kt index 77e9569ffd..94aef07b3d 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/start/setup/StartParachainStakingViewModel.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/start/setup/StartParachainStakingViewModel.kt @@ -53,7 +53,7 @@ import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.mapFeeTo import io.novafoundation.nova.feature_wallet_api.presentation.model.DecimalFee import io.novafoundation.nova.feature_wallet_api.presentation.model.mapAmountToAmountModel import io.novafoundation.nova.runtime.state.selectedOption -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/start/setup/rewards/ParachainStakingRewardsComponent.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/start/setup/rewards/ParachainStakingRewardsComponent.kt index 43edd1dcc2..23dd50caf1 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/start/setup/rewards/ParachainStakingRewardsComponent.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/start/setup/rewards/ParachainStakingRewardsComponent.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking import io.novafoundation.nova.feature_staking_impl.presentation.parachainStaking.start.setup.rewards.ParachainStakingRewardsComponent.State import io.novafoundation.nova.feature_staking_impl.presentation.staking.main.components.StatefullComponent import io.novafoundation.nova.feature_staking_impl.presentation.staking.main.model.RewardEstimation -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.launchIn diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/unbond/confirm/ParachainStakingUnbondConfirmViewModel.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/unbond/confirm/ParachainStakingUnbondConfirmViewModel.kt index 16c2b0d4b1..4564bdab98 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/unbond/confirm/ParachainStakingUnbondConfirmViewModel.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/unbond/confirm/ParachainStakingUnbondConfirmViewModel.kt @@ -36,7 +36,7 @@ import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.mapFeeFr import io.novafoundation.nova.feature_wallet_api.presentation.model.mapAmountToAmountModel import io.novafoundation.nova.runtime.state.AnySelectedAssetOptionSharedState import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/unbond/setup/ParachainStakingUnbondViewModel.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/unbond/setup/ParachainStakingUnbondViewModel.kt index 82e233197c..c46c250514 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/unbond/setup/ParachainStakingUnbondViewModel.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/unbond/setup/ParachainStakingUnbondViewModel.kt @@ -42,7 +42,7 @@ import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.mapFeeTo import io.novafoundation.nova.feature_wallet_api.presentation.model.DecimalFee import io.novafoundation.nova.feature_wallet_api.presentation.model.mapAmountToAmountModel import io.novafoundation.nova.feature_wallet_api.presentation.model.transferableAmountModel -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/yieldBoost/setup/SetupYieldBoostViewModel.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/yieldBoost/setup/SetupYieldBoostViewModel.kt index ace1a5bf26..688236578c 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/yieldBoost/setup/SetupYieldBoostViewModel.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/parachainStaking/yieldBoost/setup/SetupYieldBoostViewModel.kt @@ -57,7 +57,7 @@ import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.awaitDec import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.connectWith import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.mapFeeToParcel import io.novafoundation.nova.feature_wallet_api.presentation.model.DecimalFee -import jp.co.soramitsu.fearless_utils.extensions.toHexString +import io.novasama.substrate_sdk_android.extensions.toHexString import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/payouts/model/PendingPayoutParcelable.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/payouts/model/PendingPayoutParcelable.kt index 227ee13d36..7064b9e39e 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/payouts/model/PendingPayoutParcelable.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/payouts/model/PendingPayoutParcelable.kt @@ -3,7 +3,7 @@ package io.novafoundation.nova.feature_staking_impl.presentation.payouts.model import android.os.Parcelable import io.novafoundation.nova.common.address.intoKey import io.novafoundation.nova.feature_staking_impl.data.model.Payout -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId import kotlinx.android.parcel.Parcelize import java.math.BigInteger diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/delegation/proxy/add/confirm/ConfirmAddStakingProxyViewModel.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/delegation/proxy/add/confirm/ConfirmAddStakingProxyViewModel.kt index 99359b1b76..448e11db6e 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/delegation/proxy/add/confirm/ConfirmAddStakingProxyViewModel.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/delegation/proxy/add/confirm/ConfirmAddStakingProxyViewModel.kt @@ -30,7 +30,7 @@ import io.novafoundation.nova.runtime.state.AnySelectedAssetOptionSharedState import io.novafoundation.nova.runtime.state.chain import io.novafoundation.nova.runtime.state.selectedAssetFlow import io.novafoundation.nova.runtime.state.selectedChainFlow -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/delegation/proxy/add/set/AddStakingProxyViewModel.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/delegation/proxy/add/set/AddStakingProxyViewModel.kt index 5d6bb08f55..0ca00eb15e 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/delegation/proxy/add/set/AddStakingProxyViewModel.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/delegation/proxy/add/set/AddStakingProxyViewModel.kt @@ -43,7 +43,7 @@ import io.novafoundation.nova.runtime.state.assetWithChain import io.novafoundation.nova.runtime.state.chain import io.novafoundation.nova.runtime.state.selectedAssetFlow import io.novafoundation.nova.runtime.state.selectedChainFlow -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/delegation/proxy/revoke/ConfirmRemoveStakingProxyViewModel.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/delegation/proxy/revoke/ConfirmRemoveStakingProxyViewModel.kt index f781098f50..f9d957edb8 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/delegation/proxy/revoke/ConfirmRemoveStakingProxyViewModel.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/delegation/proxy/revoke/ConfirmRemoveStakingProxyViewModel.kt @@ -28,7 +28,7 @@ import io.novafoundation.nova.runtime.state.AnySelectedAssetOptionSharedState import io.novafoundation.nova.runtime.state.chain import io.novafoundation.nova.runtime.state.selectedAssetFlow import io.novafoundation.nova.runtime.state.selectedChainFlow -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.combine diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/main/components/userRewards/nominationPools/NominationPoolUserRewardsComponent.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/main/components/userRewards/nominationPools/NominationPoolUserRewardsComponent.kt index e64686a292..16e91dba2b 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/main/components/userRewards/nominationPools/NominationPoolUserRewardsComponent.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/main/components/userRewards/nominationPools/NominationPoolUserRewardsComponent.kt @@ -20,7 +20,7 @@ import io.novafoundation.nova.feature_staking_impl.presentation.staking.main.com import io.novafoundation.nova.feature_staking_impl.presentation.staking.main.components.userRewards.UserRewardsComponent import io.novafoundation.nova.feature_staking_impl.presentation.staking.main.components.userRewards.UserRewardsState import io.novafoundation.nova.feature_wallet_api.presentation.model.mapAmountToAmountModel -import jp.co.soramitsu.fearless_utils.hash.isPositive +import io.novasama.substrate_sdk_android.hash.isPositive import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.distinctUntilChanged diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/main/components/yourPool/YourPoolComponent.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/main/components/yourPool/YourPoolComponent.kt index 6205fbcef1..78149d1171 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/main/components/yourPool/YourPoolComponent.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/main/components/yourPool/YourPoolComponent.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_staking_impl.presentation.staking.main.com import io.novafoundation.nova.feature_staking_impl.presentation.staking.main.components.StatefullComponent import io.novafoundation.nova.feature_staking_impl.presentation.staking.main.components.UnsupportedComponent import io.novafoundation.nova.feature_staking_impl.presentation.staking.main.components.yourPool.nominationPools.NominationPoolsYourPoolComponentFactory -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId typealias YourPoolComponent = StatefullComponent, YourPoolEvent, YourPoolAction> diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/start/landing/StartStakingLandingViewModel.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/start/landing/StartStakingLandingViewModel.kt index 82c49ef7a2..e460f757c7 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/start/landing/StartStakingLandingViewModel.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/staking/start/landing/StartStakingLandingViewModel.kt @@ -71,7 +71,7 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch import java.math.BigInteger -import jp.co.soramitsu.fearless_utils.hash.isPositive +import io.novasama.substrate_sdk_android.hash.isPositive import kotlin.time.Duration class StartStakingInfoModel( diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/validators/current/CurrentValidatorsViewModel.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/validators/current/CurrentValidatorsViewModel.kt index fdb3e2b9b4..37e9db61ed 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/validators/current/CurrentValidatorsViewModel.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/presentation/validators/current/CurrentValidatorsViewModel.kt @@ -36,7 +36,7 @@ import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.state.AnySelectedAssetOptionSharedState import io.novafoundation.nova.runtime.state.chain -import jp.co.soramitsu.fearless_utils.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.fromHex import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/feature-swap-api/build.gradle b/feature-swap-api/build.gradle index 996accce46..5c8d522625 100644 --- a/feature-swap-api/build.gradle +++ b/feature-swap-api/build.gradle @@ -28,7 +28,7 @@ android { dependencies { implementation coroutinesDep - implementation fearlessLibDep + implementation substrateSdkDep implementation daggerDep implementation project(':runtime') diff --git a/feature-swap-impl/build.gradle b/feature-swap-impl/build.gradle index ebc6c3a84d..16828fa27d 100644 --- a/feature-swap-impl/build.gradle +++ b/feature-swap-impl/build.gradle @@ -47,7 +47,7 @@ dependencies { implementation materialDep - implementation fearlessLibDep + implementation substrateSdkDep implementation kotlinDep diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/assetConversion/AssetConversionApi.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/assetConversion/AssetConversionApi.kt index df9df237c6..484d9469d3 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/assetConversion/AssetConversionApi.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/assetConversion/AssetConversionApi.kt @@ -10,8 +10,8 @@ import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.api.QueryableModule import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry1 import io.novafoundation.nova.runtime.storage.source.query.api.storage1 -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module @JvmInline value class AssetConversionApi(override val module: Module) : QueryableModule diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/assetConversion/AssetConversionExchange.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/assetConversion/AssetConversionExchange.kt index e18fcbf8d7..048a99b223 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/assetConversion/AssetConversionExchange.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/assetConversion/AssetConversionExchange.kt @@ -44,11 +44,11 @@ import io.novafoundation.nova.runtime.multiNetwork.multiLocation.toEncodableInst import io.novafoundation.nova.runtime.repository.ChainStateRepository import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.metadata -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.primitives.BooleanType -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.call +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.primitives.BooleanType +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.call import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.drop diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/HydraDxExchange.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/HydraDxExchange.kt index 675c419978..c2cd22a844 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/HydraDxExchange.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/HydraDxExchange.kt @@ -58,9 +58,9 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.metadata -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.BatchMode -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.BatchMode +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/HydraDxSwapSource.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/HydraDxSwapSource.kt index 8c4960ee68..72443b4cfb 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/HydraDxSwapSource.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/HydraDxSwapSource.kt @@ -9,9 +9,9 @@ import io.novafoundation.nova.feature_swap_api.domain.model.SwapQuoteException import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.flow.Flow typealias HydraDxSwapSourceId = String diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/MultiTransactionPaymentApi.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/MultiTransactionPaymentApi.kt index ff7a0d94c8..d3ddab2b1f 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/MultiTransactionPaymentApi.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/MultiTransactionPaymentApi.kt @@ -10,9 +10,9 @@ import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.api.QueryableModule import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry1 import io.novafoundation.nova.runtime.storage.source.query.api.storage1 -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module @JvmInline value class MultiTransactionPaymentApi(override val module: Module) : QueryableModule diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/DynamicFeesApi.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/DynamicFeesApi.kt index 0a7ceb1afd..ea01deb036 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/DynamicFeesApi.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/DynamicFeesApi.kt @@ -10,8 +10,8 @@ import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.api.QueryableModule import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry1 import io.novafoundation.nova.runtime.storage.source.query.api.storage1 -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module @JvmInline value class DynamicFeesApi(override val module: Module) : QueryableModule diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/OmniPoolSwapSource.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/OmniPoolSwapSource.kt index 110508e206..67f9a1fb97 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/OmniPoolSwapSource.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/OmniPoolSwapSource.kt @@ -37,9 +37,9 @@ import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.api.observeNonNull import io.novafoundation.nova.runtime.storage.source.query.metadata -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/OmnipoolApi.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/OmnipoolApi.kt index 668938d742..eec11732e7 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/OmnipoolApi.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/OmnipoolApi.kt @@ -11,8 +11,8 @@ import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.api.QueryableModule import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry1 import io.novafoundation.nova.runtime.storage.source.query.api.storage1 -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module @JvmInline value class OmnipoolApi(override val module: Module) : QueryableModule diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/model/DynamicFee.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/model/DynamicFee.kt index e0b04d7716..0502aa1c42 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/model/DynamicFee.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/omnipool/model/DynamicFee.kt @@ -5,8 +5,8 @@ import io.novafoundation.nova.common.data.network.runtime.binding.castToStruct import io.novafoundation.nova.common.utils.Perbill import io.novafoundation.nova.common.utils.constant import io.novafoundation.nova.common.utils.decoded -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module class DynamicFee( val assetFee: Perbill, diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/referrals/ReferralsApi.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/referrals/ReferralsApi.kt index f8cfd5ce07..bbb7d42701 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/referrals/ReferralsApi.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/referrals/ReferralsApi.kt @@ -8,9 +8,9 @@ import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.api.QueryableModule import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry1 import io.novafoundation.nova.runtime.storage.source.query.api.storage1 -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module @JvmInline value class ReferralsApi(override val module: Module) : QueryableModule diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/AssetRegistryApi.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/AssetRegistryApi.kt index 8fe69f9ec3..a1c27c8bef 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/AssetRegistryApi.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/AssetRegistryApi.kt @@ -8,8 +8,8 @@ import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.api.QueryableModule import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry1 import io.novafoundation.nova.runtime.storage.source.query.api.storage1 -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module @JvmInline value class AssetRegistryApi(override val module: Module) : QueryableModule diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/StableSwapApi.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/StableSwapApi.kt index aa4bb0a50e..3986cf3382 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/StableSwapApi.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/StableSwapApi.kt @@ -9,8 +9,8 @@ import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.api.QueryableModule import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry1 import io.novafoundation.nova.runtime.storage.source.query.api.storage1 -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module @JvmInline value class StableSwapApi(override val module: Module) : QueryableModule diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/StableSwapSource.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/StableSwapSource.kt index 8fde5b6dd5..7d5e3e7845 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/StableSwapSource.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/StableSwapSource.kt @@ -34,11 +34,11 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId import io.novafoundation.nova.runtime.repository.ChainStateRepository import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.metadata -import jp.co.soramitsu.fearless_utils.encrypt.json.asLittleEndianBytes -import jp.co.soramitsu.fearless_utils.hash.Hasher.blake2b256 -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.encrypt.json.asLittleEndianBytes +import io.novasama.substrate_sdk_android.hash.Hasher.blake2b256 +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Deferred import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/TokensApi.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/TokensApi.kt index 3f30314bf5..491e04a825 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/TokensApi.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/data/assetExchange/hydraDx/stableswap/TokensApi.kt @@ -12,9 +12,9 @@ import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageE import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry2 import io.novafoundation.nova.runtime.storage.source.query.api.storage1 import io.novafoundation.nova.runtime.storage.source.query.api.storage2 -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module @JvmInline value class TokensApi(override val module: Module) : QueryableModule diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/domain/validation/validations/SwapSmallRemainingBalanceValidation.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/domain/validation/validations/SwapSmallRemainingBalanceValidation.kt index 66cc8fa729..23f8a512e2 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/domain/validation/validations/SwapSmallRemainingBalanceValidation.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/domain/validation/validations/SwapSmallRemainingBalanceValidation.kt @@ -13,7 +13,7 @@ import io.novafoundation.nova.feature_swap_impl.domain.validation.SwapValidation import io.novafoundation.nova.feature_swap_impl.domain.validation.toBuyAmountToKeepMainEDInFeeAsset import io.novafoundation.nova.feature_swap_impl.domain.validation.totalDeductedAmountInFeeToken import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.AssetSourceRegistry -import jp.co.soramitsu.fearless_utils.hash.isPositive +import io.novasama.substrate_sdk_android.hash.isPositive class SwapSmallRemainingBalanceValidation( private val assetSourceRegistry: AssetSourceRegistry diff --git a/feature-wallet-api/build.gradle b/feature-wallet-api/build.gradle index 311648d007..e69ea3fe70 100644 --- a/feature-wallet-api/build.gradle +++ b/feature-wallet-api/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation daggerDep kapt daggerKapt - implementation fearlessLibDep + implementation substrateSdkDep implementation androidDep implementation constraintDep diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/cache/AssetCache.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/cache/AssetCache.kt index bf50ae6e2b..79e55e019b 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/cache/AssetCache.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/cache/AssetCache.kt @@ -12,7 +12,7 @@ import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount import io.novafoundation.nova.runtime.ext.enabledAssets import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/cache/AssetCacheExt.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/cache/AssetCacheExt.kt index e65ac506dc..c38d6b81f5 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/cache/AssetCacheExt.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/cache/AssetCacheExt.kt @@ -7,8 +7,8 @@ import io.novafoundation.nova.core_db.model.AssetLocal.EDCountingModeLocal import io.novafoundation.nova.core_db.model.AssetLocal.TransferableModeLocal import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot suspend fun AssetCache.updateAsset( metaId: Long, diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/ExtrinsicBuilderExt.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/ExtrinsicBuilderExt.kt index ba11392c0b..07b9ed9888 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/ExtrinsicBuilderExt.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/ExtrinsicBuilderExt.kt @@ -3,9 +3,9 @@ package io.novafoundation.nova.feature_wallet_api.data.network.blockhain import io.novafoundation.nova.common.utils.Modules import io.novafoundation.nova.common.utils.balances import io.novafoundation.nova.common.utils.firstExistingCallName -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.instances.AddressInstanceConstructor -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.instances.AddressInstanceConstructor +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigInteger fun ExtrinsicBuilder.nativeTransfer(accountId: AccountId, amount: BigInteger, keepAlive: Boolean = false): ExtrinsicBuilder { diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/balances/AssetBalance.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/balances/AssetBalance.kt index 2b08fb138f..deeb40ea15 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/balances/AssetBalance.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/balances/AssetBalance.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.feature_account_api.domain.model.MetaAccount import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.history.realtime.RealtimeHistoryUpdate import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import java.math.BigInteger diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/history/AssetHistory.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/history/AssetHistory.kt index e3862aee60..cccf659c21 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/history/AssetHistory.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/history/AssetHistory.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.h import io.novafoundation.nova.feature_wallet_api.domain.interfaces.TransactionFilter import io.novafoundation.nova.feature_wallet_api.domain.model.Operation import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface AssetHistory { diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/history/realtime/RealtimeHistoryUpdate.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/history/realtime/RealtimeHistoryUpdate.kt index 9330fc6de2..449b4804c5 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/history/realtime/RealtimeHistoryUpdate.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/history/realtime/RealtimeHistoryUpdate.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Ba import io.novafoundation.nova.feature_wallet_api.domain.model.ChainAssetWithAmount import io.novafoundation.nova.feature_wallet_api.domain.model.Operation import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class RealtimeHistoryUpdate( val txHash: String, diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/tranfers/AssetTransfers.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/tranfers/AssetTransfers.kt index 7f9b395a8c..f8c959c73c 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/tranfers/AssetTransfers.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/tranfers/AssetTransfers.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.OriginDecimalFee import io.novafoundation.nova.feature_wallet_api.domain.model.Token import io.novafoundation.nova.runtime.ext.accountIdOrNull import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf import java.math.BigDecimal diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/txPayment/SubstrateTxPayment.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/txPayment/SubstrateTxPayment.kt index ebac0384cb..b095d02689 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/txPayment/SubstrateTxPayment.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/txPayment/SubstrateTxPayment.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.txPayment import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder interface SubstrateTxPayment { diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/interfaces/WalletRepository.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/interfaces/WalletRepository.kt index 55f67315b3..08048862e8 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/interfaces/WalletRepository.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/interfaces/WalletRepository.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.Asset import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import java.math.BigDecimal import java.math.BigInteger diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/updater/AccountInfoUpdater.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/updater/AccountInfoUpdater.kt index 0a5cca04cc..6644f66110 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/updater/AccountInfoUpdater.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/updater/AccountInfoUpdater.kt @@ -9,10 +9,10 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.network.updaters.SingleStorageKeyUpdater import io.novafoundation.nova.runtime.state.SelectedAssetOptionSharedState -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.module -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.module +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class AccountInfoUpdaterFactory( private val storageCache: StorageCache, diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/validation/ProxyHaveEnoughFeeValidation.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/validation/ProxyHaveEnoughFeeValidation.kt index 8ff9583283..10dd64e42a 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/validation/ProxyHaveEnoughFeeValidation.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/validation/ProxyHaveEnoughFeeValidation.kt @@ -16,8 +16,8 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.Asset.Companion.ca import io.novafoundation.nova.feature_wallet_api.domain.model.Asset.Companion.calculateTransferable import io.novafoundation.nova.runtime.multiNetwork.ChainWithAsset import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall class ProxyHaveEnoughFeeValidationFactory( private val assetSourceRegistry: AssetSourceRegistry, diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/presentation/mixin/fee/FeeParcelModel.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/presentation/mixin/fee/FeeParcelModel.kt index c3b555b7ce..09e5455f05 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/presentation/mixin/fee/FeeParcelModel.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/presentation/mixin/fee/FeeParcelModel.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_account_api.data.model.EvmFee import io.novafoundation.nova.feature_account_api.data.model.SubstrateFee import io.novafoundation.nova.feature_wallet_api.presentation.model.DecimalFee import io.novafoundation.nova.feature_wallet_api.presentation.model.GenericDecimalFee -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.android.parcel.Parcelize import java.math.BigDecimal import java.math.BigInteger diff --git a/feature-wallet-connect-impl/src/main/java/io/novafoundation/nova/feature_wallet_connect_impl/domain/session/requests/CompoundWalletConnectRequestFactory.kt b/feature-wallet-connect-impl/src/main/java/io/novafoundation/nova/feature_wallet_connect_impl/domain/session/requests/CompoundWalletConnectRequestFactory.kt index a32c580388..28144f7539 100644 --- a/feature-wallet-connect-impl/src/main/java/io/novafoundation/nova/feature_wallet_connect_impl/domain/session/requests/CompoundWalletConnectRequestFactory.kt +++ b/feature-wallet-connect-impl/src/main/java/io/novafoundation/nova/feature_wallet_connect_impl/domain/session/requests/CompoundWalletConnectRequestFactory.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.feature_wallet_connect_impl.domain.session.requests import com.walletconnect.web3.wallet.client.Wallet -import jp.co.soramitsu.fearless_utils.extensions.tryFindNonNull +import io.novasama.substrate_sdk_android.extensions.tryFindNonNull class CompoundWalletConnectRequestFactory( private val nestedFactories: List diff --git a/feature-wallet-impl/build.gradle b/feature-wallet-impl/build.gradle index 51d874c3f1..7f928230ce 100644 --- a/feature-wallet-impl/build.gradle +++ b/feature-wallet-impl/build.gradle @@ -79,7 +79,7 @@ dependencies { testImplementation jUnitDep testImplementation mockitoDep - implementation fearlessLibDep + implementation substrateSdkDep implementation gsonDep implementation retrofitDep diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/SubstrateRemoteSource.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/SubstrateRemoteSource.kt index 2353703b0f..59cbeee3d4 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/SubstrateRemoteSource.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/SubstrateRemoteSource.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.feature_wallet_impl.data.network.blockchain import io.novafoundation.nova.common.data.network.runtime.binding.AccountInfo import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId interface SubstrateRemoteSource { diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/WssSubstrateSource.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/WssSubstrateSource.kt index f138a43129..9270dfc5aa 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/WssSubstrateSource.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/WssSubstrateSource.kt @@ -7,9 +7,9 @@ import io.novafoundation.nova.common.data.network.runtime.binding.bindAccountInf import io.novafoundation.nova.common.utils.system import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class WssSubstrateSource( private val remoteStorageSource: StorageDataSource, diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/RealHydraDxAssetIdConverter.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/RealHydraDxAssetIdConverter.kt index dad356b737..6e5a42adc4 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/RealHydraDxAssetIdConverter.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/RealHydraDxAssetIdConverter.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.runtime.ext.decodeOrNull import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getRuntime -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import java.math.BigInteger private val SYSTEM_ON_CHAIN_ASSET_ID = BigInteger.ZERO diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/UnsupportedAssetBalance.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/UnsupportedAssetBalance.kt index 6085a31df0..99995fbd9c 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/UnsupportedAssetBalance.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/UnsupportedAssetBalance.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.b import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.balances.BalanceSyncUpdate import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/equilibrium/EquilibriumAssetBalance.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/equilibrium/EquilibriumAssetBalance.kt index f07c49b72e..ba5c7fdda9 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/equilibrium/EquilibriumAssetBalance.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/equilibrium/EquilibriumAssetBalance.kt @@ -41,12 +41,12 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.network.binding.number import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHexOrNull -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHexOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.combine diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/evmErc20/EvmErc20AssetBalance.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/evmErc20/EvmErc20AssetBalance.kt index 496dba1683..4f0130e4f6 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/evmErc20/EvmErc20AssetBalance.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/evmErc20/EvmErc20AssetBalance.kt @@ -22,9 +22,9 @@ import io.novafoundation.nova.runtime.ext.requireErc20 import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getCallEthereumApiOrThrow -import jp.co.soramitsu.fearless_utils.extensions.asEthereumAddress -import jp.co.soramitsu.fearless_utils.extensions.toAccountId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.extensions.asEthereumAddress +import io.novasama.substrate_sdk_android.extensions.toAccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Deferred import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emitAll diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/evmNative/EvmNativeAssetBalance.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/evmNative/EvmNativeAssetBalance.kt index a06370db34..6e9a2abd05 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/evmNative/EvmNativeAssetBalance.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/evmNative/EvmNativeAssetBalance.kt @@ -15,7 +15,7 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getCallEthereumApiOrThrow import io.novafoundation.nova.runtime.multiNetwork.getSubscriptionEthereumApiOrThrow -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.emptyFlow diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/orml/OrmlAssetBalance.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/orml/OrmlAssetBalance.kt index 8ec1cc31d6..f18576ae80 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/orml/OrmlAssetBalance.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/orml/OrmlAssetBalance.kt @@ -24,10 +24,10 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.metadata -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import java.math.BigInteger diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/orml/OrmlBalanceBinding.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/orml/OrmlBalanceBinding.kt index c627b18dcd..30bd1bf742 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/orml/OrmlBalanceBinding.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/orml/OrmlBalanceBinding.kt @@ -5,9 +5,9 @@ import io.novafoundation.nova.common.data.network.runtime.binding.UseCaseBinding import io.novafoundation.nova.common.data.network.runtime.binding.bindOrmlAccountData import io.novafoundation.nova.common.data.network.runtime.binding.returnType import io.novafoundation.nova.common.utils.tokens -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHexOrNull -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHexOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.storage @UseCaseBinding fun bindOrmlAccountData(scale: String, runtime: RuntimeSnapshot): AccountBalance { diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/statemine/StatemineAssetBalance.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/statemine/StatemineAssetBalance.kt index 58f6492e49..020c418162 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/statemine/StatemineAssetBalance.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/statemine/StatemineAssetBalance.kt @@ -21,9 +21,9 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.prepareIdForEncod import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.network.updaters.insert import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.emptyFlow diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/statemine/StatemineAssets.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/statemine/StatemineAssets.kt index 2d57652161..32dee0c4b8 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/statemine/StatemineAssets.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/statemine/StatemineAssets.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.common.data.network.runtime.binding.bindNumber import io.novafoundation.nova.common.data.network.runtime.binding.cast import io.novafoundation.nova.common.data.network.runtime.binding.incompatible import io.novafoundation.nova.feature_wallet_impl.data.network.blockchain.assets.balances.statemine.AssetAccount.AccountStatus -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct import java.math.BigInteger class AssetDetails( diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/utility/NativeAssetBalance.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/utility/NativeAssetBalance.kt index 5a1ab39c11..ccc5815d06 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/utility/NativeAssetBalance.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/balances/utility/NativeAssetBalance.kt @@ -30,9 +30,9 @@ import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.query.metadata import io.novafoundation.nova.runtime.storage.typed.account import io.novafoundation.nova.runtime.storage.typed.system -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.map diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/common/Statemine.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/common/Statemine.kt index 12674056a1..4fe08889dc 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/common/Statemine.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/common/Statemine.kt @@ -4,8 +4,8 @@ import io.novafoundation.nova.feature_wallet_impl.data.network.blockchain.assets import io.novafoundation.nova.feature_wallet_impl.data.network.blockchain.assets.balances.statemine.bindAssetAccount import io.novafoundation.nova.runtime.ext.palletNameOrDefault import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module fun RuntimeMetadata.statemineModule(statemineType: Chain.Asset.Type.Statemine) = module(statemineType.palletNameOrDefault()) diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/EvmAssetHistory.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/EvmAssetHistory.kt index 26a2c56821..2e4c2519e9 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/EvmAssetHistory.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/EvmAssetHistory.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.Operation import io.novafoundation.nova.feature_wallet_api.domain.model.satisfies import io.novafoundation.nova.runtime.ext.externalApi import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId private const val FIRST_PAGE_INDEX = 1 private const val SECOND_PAGE_INDEX = 2 diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/SubstrateAssetHistory.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/SubstrateAssetHistory.kt index fb914c0bd9..1dd00ad5a0 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/SubstrateAssetHistory.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/SubstrateAssetHistory.kt @@ -26,7 +26,7 @@ import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.ext.externalApi import io.novafoundation.nova.runtime.ext.fullId import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlin.time.Duration.Companion.seconds abstract class SubstrateAssetHistory( diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/UnsupportedAssetHistory.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/UnsupportedAssetHistory.kt index d5bc438507..92f1db8ec4 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/UnsupportedAssetHistory.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/UnsupportedAssetHistory.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.h import io.novafoundation.nova.feature_wallet_api.domain.interfaces.TransactionFilter import io.novafoundation.nova.feature_wallet_api.domain.model.Operation import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId class UnsupportedAssetHistory : AssetHistory { diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/equilibrium/EquilibriumAssetHistory.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/equilibrium/EquilibriumAssetHistory.kt index 6e7466f70a..d00c5d4ef0 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/equilibrium/EquilibriumAssetHistory.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/equilibrium/EquilibriumAssetHistory.kt @@ -18,9 +18,9 @@ import io.novafoundation.nova.runtime.extrinsic.visitor.api.ExtrinsicVisit import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getRuntime -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.metadata.call +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.metadata.call class EquilibriumAssetHistory( private val chainRegistry: ChainRegistry, diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/evmErc20/EvmErc20AssetHistory.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/evmErc20/EvmErc20AssetHistory.kt index 625bf6d422..9e38e62c1b 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/evmErc20/EvmErc20AssetHistory.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/evmErc20/EvmErc20AssetHistory.kt @@ -16,7 +16,7 @@ import io.novafoundation.nova.feature_wallet_impl.data.network.etherscan.model.f import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.ext.requireErc20 import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlin.time.Duration.Companion.seconds class EvmErc20AssetHistory( diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/evmNative/EvmNativeAssetHistory.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/evmNative/EvmNativeAssetHistory.kt index 31df3e0b28..45b5b9f77f 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/evmNative/EvmNativeAssetHistory.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/evmNative/EvmNativeAssetHistory.kt @@ -22,7 +22,7 @@ import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.getCallEthereumApiOrThrow import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import org.web3j.protocol.core.methods.response.EthBlock import org.web3j.protocol.core.methods.response.EthBlock.TransactionResult import org.web3j.protocol.core.methods.response.Transaction diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/orml/OrmlAssetHistory.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/orml/OrmlAssetHistory.kt index 199f89a371..c7859fad78 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/orml/OrmlAssetHistory.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/orml/OrmlAssetHistory.kt @@ -22,10 +22,10 @@ import io.novafoundation.nova.runtime.extrinsic.visitor.api.ExtrinsicVisit import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getRuntime -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.metadata.call -import jp.co.soramitsu.fearless_utils.runtime.metadata.callOrNull +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.metadata.call +import io.novasama.substrate_sdk_android.runtime.metadata.callOrNull class OrmlAssetHistory( private val chainRegistry: ChainRegistry, diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/AssetConversionSwapExtractor.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/AssetConversionSwapExtractor.kt index b58d8d69f2..f14d02e20a 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/AssetConversionSwapExtractor.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/AssetConversionSwapExtractor.kt @@ -16,7 +16,7 @@ import io.novafoundation.nova.runtime.multiNetwork.multiLocation.converter.Multi import io.novafoundation.nova.runtime.multiNetwork.multiLocation.converter.MultiLocationConverterFactory import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.findAllOfType import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.requireNativeFee -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall import kotlinx.coroutines.CoroutineScope import kotlin.coroutines.coroutineContext diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/Common.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/Common.kt index 41f3891960..7c28a7b8f1 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/Common.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/Common.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.feature_wallet_api.domain.model.ChainAssetWithAmou import io.novafoundation.nova.runtime.multiNetwork.multiLocation.bindMultiLocation import io.novafoundation.nova.runtime.multiNetwork.multiLocation.converter.MultiLocationConverter import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.findEvent -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent suspend fun List.assetFee(multiLocationConverter: MultiLocationConverter): ChainAssetWithAmount? { val event = assetTxFeePaidEvent() ?: return null diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/hydraDx/BaseHydraDxSwapExtractor.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/hydraDx/BaseHydraDxSwapExtractor.kt index 841b0095b5..67fb384beb 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/hydraDx/BaseHydraDxSwapExtractor.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/hydraDx/BaseHydraDxSwapExtractor.kt @@ -12,7 +12,7 @@ import io.novafoundation.nova.runtime.extrinsic.visitor.api.ExtrinsicVisit import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.findLastEvent import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.requireNativeFee -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall abstract class BaseHydraDxSwapExtractor( private val hydraDxAssetIdConverter: HydraDxAssetIdConverter, diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/hydraDx/HydraDxOmniPoolSwapExtractor.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/hydraDx/HydraDxOmniPoolSwapExtractor.kt index e8763a1204..6cf51c3c13 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/hydraDx/HydraDxOmniPoolSwapExtractor.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/hydraDx/HydraDxOmniPoolSwapExtractor.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.common.utils.Modules import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.HydraDxAssetIdConverter import io.novafoundation.nova.runtime.extrinsic.visitor.api.ExtrinsicVisit import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.findEvent -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall class HydraDxOmniPoolSwapExtractor( hydraDxAssetIdConverter: HydraDxAssetIdConverter, diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/hydraDx/HydraDxRouterSwapExtractor.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/hydraDx/HydraDxRouterSwapExtractor.kt index 3ccff03f6d..0ced0b02f7 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/hydraDx/HydraDxRouterSwapExtractor.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/realtime/substrate/hydraDx/HydraDxRouterSwapExtractor.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.common.utils.Modules import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.HydraDxAssetIdConverter import io.novafoundation.nova.runtime.extrinsic.visitor.api.ExtrinsicVisit import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.findEvent -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall class HydraDxRouterSwapExtractor( hydraDxAssetIdConverter: HydraDxAssetIdConverter, diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/statemine/StatemineAssetHistory.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/statemine/StatemineAssetHistory.kt index f0c5ddb9d9..95daf98d35 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/statemine/StatemineAssetHistory.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/statemine/StatemineAssetHistory.kt @@ -22,10 +22,10 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.hasSameId import io.novafoundation.nova.runtime.multiNetwork.getRuntime -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.metadata.call -import jp.co.soramitsu.fearless_utils.runtime.metadata.module +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.metadata.call +import io.novasama.substrate_sdk_android.runtime.metadata.module class StatemineAssetHistory( private val chainRegistry: ChainRegistry, diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/utility/NativeAssetHistory.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/utility/NativeAssetHistory.kt index c4def4f882..52f0af135d 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/utility/NativeAssetHistory.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/history/utility/NativeAssetHistory.kt @@ -20,9 +20,9 @@ import io.novafoundation.nova.runtime.extrinsic.visitor.api.ExtrinsicVisit import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getRuntime -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.metadata.callOrNull +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.metadata.callOrNull class NativeAssetHistory( private val chainRegistry: ChainRegistry, diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/BaseAssetTransfers.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/BaseAssetTransfers.kt index c9d0df2806..8e8a4d9dc4 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/BaseAssetTransfers.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/BaseAssetTransfers.kt @@ -28,9 +28,9 @@ import io.novafoundation.nova.feature_wallet_impl.domain.validaiton.recipientCan import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getRuntime -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.metadata.callOrNull -import jp.co.soramitsu.fearless_utils.runtime.metadata.moduleOrNull +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.metadata.callOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.moduleOrNull abstract class BaseAssetTransfers( internal val chainRegistry: ChainRegistry, diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/equilibrium/EquilibriumAssetTransfers.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/equilibrium/EquilibriumAssetTransfers.kt index 471ea8d9cd..f08b22d27b 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/equilibrium/EquilibriumAssetTransfers.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/equilibrium/EquilibriumAssetTransfers.kt @@ -25,12 +25,12 @@ import io.novafoundation.nova.runtime.ext.requireEquilibrium import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHexOrNull -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHexOrNull +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey private const val TRANSFER_CALL = "transfer" diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/orml/OrmlAssetTransfers.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/orml/OrmlAssetTransfers.kt index 09ac466273..1ad7c63474 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/orml/OrmlAssetTransfers.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/orml/OrmlAssetTransfers.kt @@ -15,9 +15,9 @@ import io.novafoundation.nova.runtime.ext.ormlCurrencyId import io.novafoundation.nova.runtime.ext.requireOrml import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.instances.AddressInstanceConstructor -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.instances.AddressInstanceConstructor +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigInteger class OrmlAssetTransfers( diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/statemine/StatemineAssetTransfers.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/statemine/StatemineAssetTransfers.kt index 0a434a5f32..a544626251 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/statemine/StatemineAssetTransfers.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/statemine/StatemineAssetTransfers.kt @@ -18,10 +18,10 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.prepareIdForEncoding import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.instances.AddressInstanceConstructor -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.instances.AddressInstanceConstructor +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.metadata.storage import java.math.BigInteger class StatemineAssetTransfers( diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/utility/NativeAssetTransfers.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/utility/NativeAssetTransfers.kt index c203cb32fe..f33f0b250d 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/utility/NativeAssetTransfers.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/utility/NativeAssetTransfers.kt @@ -19,11 +19,11 @@ import io.novafoundation.nova.runtime.ext.accountIdOrDefault import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.metadata.module -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.metadata.module +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.flatMapLatest diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/updaters/balance/FullSyncPaymentUpdater.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/updaters/balance/FullSyncPaymentUpdater.kt index 8b4be46c64..888c8f6610 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/updaters/balance/FullSyncPaymentUpdater.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/updaters/balance/FullSyncPaymentUpdater.kt @@ -21,7 +21,7 @@ import io.novafoundation.nova.runtime.ext.addressOf import io.novafoundation.nova.runtime.ext.enabledAssets import io.novafoundation.nova.runtime.ext.localId import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.emptyFlow diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/updaters/balance/LightSyncPaymentUpdater.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/updaters/balance/LightSyncPaymentUpdater.kt index 4e4df333d3..e1df7f4f6a 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/updaters/balance/LightSyncPaymentUpdater.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/updaters/balance/LightSyncPaymentUpdater.kt @@ -10,10 +10,10 @@ import io.novafoundation.nova.feature_account_api.domain.updaters.AccountUpdateS import io.novafoundation.nova.feature_wallet_api.data.cache.AssetCache import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.hash.Hasher.blake2b128Concat -import jp.co.soramitsu.fearless_utils.hash.Hasher.xxHash128 -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.hash.Hasher.blake2b128Concat +import io.novasama.substrate_sdk_android.hash.Hasher.xxHash128 +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.onEach diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/ExtrinsicBuilderExt.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/ExtrinsicBuilderExt.kt index 176f604b6c..58135be325 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/ExtrinsicBuilderExt.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/ExtrinsicBuilderExt.kt @@ -8,14 +8,14 @@ import io.novafoundation.nova.common.utils.xcmPalletName import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.types.Balance import io.novafoundation.nova.runtime.multiNetwork.multiLocation.toEncodableInstance import io.novafoundation.nova.feature_wallet_impl.data.network.crosschain.XcmMultiAsset.Fungibility -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.Type -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.Struct -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.primitives.NumberType -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.metadata.call -import jp.co.soramitsu.fearless_utils.runtime.metadata.module +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.Type +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.Struct +import io.novasama.substrate_sdk_android.runtime.definitions.types.primitives.NumberType +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.metadata.call +import io.novasama.substrate_sdk_android.runtime.metadata.module fun ExtrinsicBuilder.xcmExecute( message: VersionedXcm, diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/PalletXcmRepository.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/PalletXcmRepository.kt index 0ba03a6748..e006cbfed0 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/PalletXcmRepository.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/PalletXcmRepository.kt @@ -4,12 +4,12 @@ import io.novafoundation.nova.common.utils.enumValueOfOrNull import io.novafoundation.nova.common.utils.xcmPalletName import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.skipAliases -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.callOrNull -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.MetadataFunction -import jp.co.soramitsu.fearless_utils.runtime.metadata.moduleOrNull +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.skipAliases +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.callOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.module.MetadataFunction +import io.novasama.substrate_sdk_android.runtime.metadata.moduleOrNull enum class XcmVersion { V0, V1, V2, V3; diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/RealCrossChainTransactor.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/RealCrossChainTransactor.kt index 8055d58f97..a62c1af794 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/RealCrossChainTransactor.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/RealCrossChainTransactor.kt @@ -34,7 +34,7 @@ import io.novafoundation.nova.feature_wallet_impl.data.network.blockchain.assets import io.novafoundation.nova.feature_wallet_impl.data.network.crosschain.validations.canPayCrossChainFee import io.novafoundation.nova.runtime.ext.accountIdOrDefault import io.novafoundation.nova.runtime.multiNetwork.multiLocation.MultiLocation -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder import java.math.BigInteger class RealCrossChainTransactor( diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/RealCrossChainWeigher.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/RealCrossChainWeigher.kt index c5dc950906..43227a5220 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/RealCrossChainWeigher.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/RealCrossChainWeigher.kt @@ -36,10 +36,10 @@ import io.novafoundation.nova.runtime.multiNetwork.multiLocation.isHere import io.novafoundation.nova.runtime.multiNetwork.multiLocation.paraIdOrNull import io.novafoundation.nova.runtime.storage.source.StorageDataSource import java.math.BigInteger -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.bytes -import jp.co.soramitsu.fearless_utils.runtime.metadata.call -import jp.co.soramitsu.fearless_utils.runtime.metadata.module -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.definitions.types.bytes +import io.novasama.substrate_sdk_android.runtime.metadata.call +import io.novasama.substrate_sdk_android.runtime.metadata.module +import io.novasama.substrate_sdk_android.runtime.metadata.storage // TODO: Currently message doesn't contain setTopic command in the end. It will come with XCMv3 support private const val SET_TOPIC_SIZE = 33 diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/subquery/SubqueryNetworkPathExtensions.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/subquery/SubqueryNetworkPathExtensions.kt deleted file mode 100644 index 7b1c51d43b..0000000000 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/subquery/SubqueryNetworkPathExtensions.kt +++ /dev/null @@ -1,13 +0,0 @@ -package io.novafoundation.nova.feature_wallet_impl.data.network.subquery - -import io.novafoundation.nova.core.model.Node - -class WrongNetworkTypeForSubqueryRequest(message: String) : Exception(message) - -fun Node.NetworkType.getSubQueryPath() = - when (this) { - Node.NetworkType.POLKADOT -> "fearless-wallet" - Node.NetworkType.KUSAMA -> "fearless-wallet-ksm" - Node.NetworkType.WESTEND -> "fearless-wallet-westend" - else -> throw WrongNetworkTypeForSubqueryRequest("$this is not supported for fetching pending rewards via Subquery") - } diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/repository/WalletRepositoryImpl.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/repository/WalletRepositoryImpl.kt index 007f4c1dfe..a23ea5c180 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/repository/WalletRepositoryImpl.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/repository/WalletRepositoryImpl.kt @@ -27,9 +27,9 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/storage/TransferCursorStorage.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/storage/TransferCursorStorage.kt index d91d24dcf8..9123567d17 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/storage/TransferCursorStorage.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/storage/TransferCursorStorage.kt @@ -2,8 +2,8 @@ package io.novafoundation.nova.feature_wallet_impl.data.storage import io.novafoundation.nova.common.data.storage.Preferences import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.flow.filterNotNull import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/di/WalletFeatureDependencies.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/di/WalletFeatureDependencies.kt index 85d2a245e9..7a6d49b72f 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/di/WalletFeatureDependencies.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/di/WalletFeatureDependencies.kt @@ -44,9 +44,9 @@ import io.novafoundation.nova.runtime.multiNetwork.multiLocation.converter.Multi import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.EventsRepository import io.novafoundation.nova.runtime.network.rpc.RpcCalls import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.encrypt.Signer -import jp.co.soramitsu.fearless_utils.icon.IconGenerator -import jp.co.soramitsu.fearless_utils.wsrpc.logging.Logger +import io.novasama.substrate_sdk_android.encrypt.Signer +import io.novasama.substrate_sdk_android.icon.IconGenerator +import io.novasama.substrate_sdk_android.wsrpc.logging.Logger import javax.inject.Named interface WalletFeatureDependencies { diff --git a/feature-wallet-impl/src/test/java/io/novafoundation/nova/feature_wallet_impl/data/network/integration/Common.kt b/feature-wallet-impl/src/test/java/io/novafoundation/nova/feature_wallet_impl/data/network/integration/Common.kt index 2223f31c31..2d578730d0 100644 --- a/feature-wallet-impl/src/test/java/io/novafoundation/nova/feature_wallet_impl/data/network/integration/Common.kt +++ b/feature-wallet-impl/src/test/java/io/novafoundation/nova/feature_wallet_impl/data/network/integration/Common.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.feature_wallet_impl.data.network.integration -import jp.co.soramitsu.fearless_utils.wsrpc.logging.Logger +import io.novasama.substrate_sdk_android.wsrpc.logging.Logger class StdoutLogger : Logger { override fun log(message: String?) { diff --git a/runtime/build.gradle b/runtime/build.gradle index 0a3e74399f..76f0316325 100644 --- a/runtime/build.gradle +++ b/runtime/build.gradle @@ -51,7 +51,7 @@ dependencies { implementation project(":core-api") implementation gsonDep - implementation fearlessLibDep + implementation substrateSdkDep implementation kotlinDep diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/call/RuntimeCallsApi.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/call/RuntimeCallsApi.kt index 3c6a3bbc5e..e8a1203328 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/call/RuntimeCallsApi.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/call/RuntimeCallsApi.kt @@ -2,15 +2,15 @@ package io.novafoundation.nova.runtime.call import io.novafoundation.nova.common.data.network.runtime.binding.fromHexOrIncompatible import io.novafoundation.nova.runtime.network.rpc.StateCallRequest -import jp.co.soramitsu.fearless_utils.extensions.requireHexPrefix -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.registry.TypeRegistry -import jp.co.soramitsu.fearless_utils.runtime.definitions.registry.getOrThrow -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.bytes -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService -import jp.co.soramitsu.fearless_utils.wsrpc.executeAsync -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.pojo +import io.novasama.substrate_sdk_android.extensions.requireHexPrefix +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.registry.TypeRegistry +import io.novasama.substrate_sdk_android.runtime.definitions.registry.getOrThrow +import io.novasama.substrate_sdk_android.runtime.definitions.types.bytes +import io.novasama.substrate_sdk_android.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.executeAsync +import io.novasama.substrate_sdk_android.wsrpc.mappers.pojo typealias RuntimeTypeName = String typealias RuntimeTypeValue = Any? diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/di/ChainRegistryModule.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/di/ChainRegistryModule.kt index 9d047ecdd2..5bb2fbe2a0 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/di/ChainRegistryModule.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/di/ChainRegistryModule.kt @@ -29,7 +29,7 @@ import io.novafoundation.nova.runtime.multiNetwork.runtime.RuntimeSubscriptionPo import io.novafoundation.nova.runtime.multiNetwork.runtime.RuntimeSyncService import io.novafoundation.nova.runtime.multiNetwork.runtime.types.BaseTypeSynchronizer import io.novafoundation.nova.runtime.multiNetwork.runtime.types.TypesFetcher -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.SocketService import kotlinx.coroutines.flow.MutableStateFlow import okhttp3.logging.HttpLoggingInterceptor import org.web3j.protocol.http.HttpService diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/di/RuntimeDependencies.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/di/RuntimeDependencies.kt index 45f01e7412..4b6975a99b 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/di/RuntimeDependencies.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/di/RuntimeDependencies.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.common.interfaces.FileProvider import io.novafoundation.nova.core_db.dao.ChainAssetDao import io.novafoundation.nova.core_db.dao.ChainDao import io.novafoundation.nova.core_db.dao.StorageDao -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.SocketService interface RuntimeDependencies { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/BalancingHttpWeb3jService.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/BalancingHttpWeb3jService.kt index 60d01df00d..88a4db33ad 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/BalancingHttpWeb3jService.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/BalancingHttpWeb3jService.kt @@ -14,7 +14,7 @@ import io.novafoundation.nova.runtime.multiNetwork.connection.autobalance.strate import io.novafoundation.nova.runtime.multiNetwork.connection.autobalance.strategy.generateNodeIterator import io.novafoundation.nova.runtime.multiNetwork.connection.saturateNodeUrls import io.reactivex.Flowable -import jp.co.soramitsu.fearless_utils.extensions.tryFindNonNull +import io.novasama.substrate_sdk_android.extensions.tryFindNonNull import okhttp3.Call import okhttp3.Callback import okhttp3.OkHttpClient diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/SocketServiceAsyncAdapter.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/SocketServiceAsyncAdapter.kt index 313c74a142..5f39174cbf 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/SocketServiceAsyncAdapter.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/SocketServiceAsyncAdapter.kt @@ -1,11 +1,11 @@ package io.novafoundation.nova.runtime.ethereum import io.reactivex.Observable -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService -import jp.co.soramitsu.fearless_utils.wsrpc.request.DeliveryType -import jp.co.soramitsu.fearless_utils.wsrpc.request.base.RpcRequest -import jp.co.soramitsu.fearless_utils.wsrpc.response.RpcResponse -import jp.co.soramitsu.fearless_utils.wsrpc.subscription.response.SubscriptionChange +import io.novasama.substrate_sdk_android.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.request.DeliveryType +import io.novasama.substrate_sdk_android.wsrpc.request.base.RpcRequest +import io.novasama.substrate_sdk_android.wsrpc.response.RpcResponse +import io.novasama.substrate_sdk_android.wsrpc.subscription.response.SubscriptionChange import kotlinx.coroutines.future.await import org.web3j.protocol.core.Request import org.web3j.protocol.core.Response diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/StorageSharedRequestsBuilder.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/StorageSharedRequestsBuilder.kt index 60d1d725da..cdd9c9ff53 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/StorageSharedRequestsBuilder.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/StorageSharedRequestsBuilder.kt @@ -12,10 +12,10 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.getCallEthereumApi import io.novafoundation.nova.runtime.multiNetwork.getSocketOrNull import io.novafoundation.nova.runtime.multiNetwork.getSubscriptionEthereumApi -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.storage.StorageSubscriptionMultiplexer -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.storage.subscribeUsing -import jp.co.soramitsu.fearless_utils.wsrpc.subscribe +import io.novasama.substrate_sdk_android.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.storage.StorageSubscriptionMultiplexer +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.storage.subscribeUsing +import io.novasama.substrate_sdk_android.wsrpc.subscribe import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.launchIn diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/Web3Api.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/Web3Api.kt index 4a5038aba4..3a8d7f0cdb 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/Web3Api.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/Web3Api.kt @@ -6,8 +6,8 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.connection.ConnectionSecrets import io.novafoundation.nova.runtime.multiNetwork.connection.UpdatableNodes import io.novafoundation.nova.runtime.multiNetwork.connection.autobalance.strategy.AutoBalanceStrategyProvider -import jp.co.soramitsu.fearless_utils.extensions.requireHexPrefix -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService +import io.novasama.substrate_sdk_android.extensions.requireHexPrefix +import io.novasama.substrate_sdk_android.wsrpc.SocketService import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.reactive.asFlow import okhttp3.OkHttpClient diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/WebSocketWeb3jService.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/WebSocketWeb3jService.kt index 22a371c228..758855c999 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/WebSocketWeb3jService.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/WebSocketWeb3jService.kt @@ -3,9 +3,9 @@ package io.novafoundation.nova.runtime.ethereum import com.fasterxml.jackson.databind.ObjectMapper import io.reactivex.BackpressureStrategy import io.reactivex.Flowable -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService -import jp.co.soramitsu.fearless_utils.wsrpc.request.base.RpcRequest -import jp.co.soramitsu.fearless_utils.wsrpc.response.RpcResponse +import io.novasama.substrate_sdk_android.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.request.base.RpcRequest +import io.novasama.substrate_sdk_android.wsrpc.response.RpcResponse import org.web3j.protocol.ObjectMapperFactory import org.web3j.protocol.Web3jService import org.web3j.protocol.core.BatchRequest diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/contract/erc20/Erc20Contract.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/contract/erc20/Erc20Contract.kt index f28c9e3f6c..9da0434a2f 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/contract/erc20/Erc20Contract.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/contract/erc20/Erc20Contract.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.runtime.ethereum.contract.base.CallableContract import io.novafoundation.nova.runtime.ethereum.contract.base.ContractStandard import io.novafoundation.nova.runtime.ethereum.contract.base.caller.ContractCaller import io.novafoundation.nova.runtime.ethereum.transaction.builder.EvmTransactionBuilder -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import kotlinx.coroutines.Deferred import org.web3j.abi.TypeReference import org.web3j.abi.datatypes.Address diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/contract/erc20/Erc20Transactions.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/contract/erc20/Erc20Transactions.kt index 56af120cb0..3996a8673b 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/contract/erc20/Erc20Transactions.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/contract/erc20/Erc20Transactions.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.runtime.ethereum.contract.erc20 -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger interface Erc20Transactions { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/subscribtion/RealEthereumSubscriptionBuilder.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/subscribtion/RealEthereumSubscriptionBuilder.kt index 33b0418096..3e25bc4d80 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/subscribtion/RealEthereumSubscriptionBuilder.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/subscribtion/RealEthereumSubscriptionBuilder.kt @@ -4,9 +4,9 @@ import io.novafoundation.nova.common.data.network.runtime.binding.cast import io.novafoundation.nova.common.utils.mergeIfMultiple import io.novafoundation.nova.core.ethereum.Web3Api import io.novafoundation.nova.core.ethereum.log.Topic -import jp.co.soramitsu.fearless_utils.extensions.asEthereumAddress -import jp.co.soramitsu.fearless_utils.extensions.toAccountId -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService.ResponseListener +import io.novasama.substrate_sdk_android.extensions.asEthereumAddress +import io.novasama.substrate_sdk_android.extensions.toAccountId +import io.novasama.substrate_sdk_android.wsrpc.SocketService.ResponseListener import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.async import kotlinx.coroutines.channels.BufferOverflow diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/transaction/builder/EvmTransactionBuilder.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/transaction/builder/EvmTransactionBuilder.kt index 07ed4df5d7..b34c479b6c 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/transaction/builder/EvmTransactionBuilder.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/transaction/builder/EvmTransactionBuilder.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.runtime.ethereum.transaction.builder import io.novafoundation.nova.common.data.network.runtime.binding.BalanceOf import io.novafoundation.nova.runtime.ethereum.contract.base.ContractStandard -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import org.web3j.abi.TypeReference import org.web3j.abi.datatypes.Type as EvmType diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/transaction/builder/RealEvmTransactionBuilder.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/transaction/builder/RealEvmTransactionBuilder.kt index 9c167ecc57..e97e80f2f9 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/transaction/builder/RealEvmTransactionBuilder.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/ethereum/transaction/builder/RealEvmTransactionBuilder.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.runtime.ethereum.transaction.builder import io.novafoundation.nova.common.data.network.runtime.binding.BalanceOf import io.novafoundation.nova.common.utils.ethereumAccountIdToAddress -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import org.web3j.abi.FunctionEncoder import org.web3j.abi.TypeReference import org.web3j.abi.datatypes.Type diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/ext/ChainExt.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/ext/ChainExt.kt index bbc5ba6d98..c12a6b0b97 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/ext/ChainExt.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/ext/ChainExt.kt @@ -21,21 +21,21 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain.Asset.Type import io.novafoundation.nova.runtime.multiNetwork.chain.model.ExplorerTemplateExtractor import io.novafoundation.nova.runtime.multiNetwork.chain.model.FullChainAssetId import io.novafoundation.nova.runtime.multiNetwork.chain.model.TypesUsage -import jp.co.soramitsu.fearless_utils.extensions.asEthereumAccountId -import jp.co.soramitsu.fearless_utils.extensions.asEthereumAddress -import jp.co.soramitsu.fearless_utils.extensions.asEthereumPublicKey -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.extensions.isValid -import jp.co.soramitsu.fearless_utils.extensions.toAccountId -import jp.co.soramitsu.fearless_utils.extensions.toAddress -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHex -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHexOrNull -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.toHexUntyped -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.addressPrefix -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAccountId -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAddress +import io.novasama.substrate_sdk_android.extensions.asEthereumAccountId +import io.novasama.substrate_sdk_android.extensions.asEthereumAddress +import io.novasama.substrate_sdk_android.extensions.asEthereumPublicKey +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.isValid +import io.novasama.substrate_sdk_android.extensions.toAccountId +import io.novasama.substrate_sdk_android.extensions.toAddress +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHex +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHexOrNull +import io.novasama.substrate_sdk_android.runtime.definitions.types.toHexUntyped +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.addressPrefix +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAccountId +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAddress val Chain.typesUsage: TypesUsage get() = when { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/CustomSignedExtensions.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/CustomSignedExtensions.kt index 6d2d69823e..93d8f7e1a5 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/CustomSignedExtensions.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/CustomSignedExtensions.kt @@ -2,10 +2,10 @@ package io.novafoundation.nova.runtime.extrinsic import io.novafoundation.nova.common.utils.structOf import io.novafoundation.nova.runtime.extrinsic.CustomSignedExtensions.CustomExtension.ASSETS_TX_PAYMENT -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signedExtra -import jp.co.soramitsu.fearless_utils.runtime.metadata.SignedExtensionId -import jp.co.soramitsu.fearless_utils.runtime.metadata.SignedExtensionValue +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.signedExtra +import io.novasama.substrate_sdk_android.runtime.metadata.SignedExtensionId +import io.novasama.substrate_sdk_android.runtime.metadata.SignedExtensionValue import java.math.BigInteger object CustomSignedExtensions { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicBuilderExt.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicBuilderExt.kt index 2466aa5888..f30f945288 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicBuilderExt.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicBuilderExt.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.runtime.extrinsic -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder fun ExtrinsicBuilder.systemRemark(remark: ByteArray): ExtrinsicBuilder { return call( diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicBuilderFactory.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicBuilderFactory.kt index 21009fb9a0..95fbe74ad8 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicBuilderFactory.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicBuilderFactory.kt @@ -10,12 +10,12 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.network.rpc.RpcCalls -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.Nonce -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.Signer -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.chain.RuntimeVersion +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.Nonce +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.Signer +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.chain.RuntimeVersion import java.math.BigInteger class ExtrinsicBuilderFactory( diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicSerializers.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicSerializers.kt index 9157a05800..f5c27f9758 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicSerializers.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicSerializers.kt @@ -6,9 +6,9 @@ import com.google.gson.JsonObject import com.google.gson.JsonPrimitive import com.google.gson.JsonSerializationContext import com.google.gson.JsonSerializer -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Extrinsic -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Extrinsic +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall import java.lang.reflect.Type private class GenericCallAdapter : JsonSerializer { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicStatus.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicStatus.kt index 779cd4283e..3e97bc27d3 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicStatus.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicStatus.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.runtime.extrinsic -import jp.co.soramitsu.fearless_utils.wsrpc.subscription.response.SubscriptionChange +import io.novasama.substrate_sdk_android.wsrpc.subscription.response.SubscriptionChange sealed class ExtrinsicStatus(val extrinsicHash: String, val terminal: Boolean) { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicValidityUseCase.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicValidityUseCase.kt index a60fbc89c6..b757d4f701 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicValidityUseCase.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/ExtrinsicValidityUseCase.kt @@ -8,7 +8,7 @@ import io.novafoundation.nova.common.utils.formatting.remainingTime import io.novafoundation.nova.common.utils.setTextColorRes import io.novafoundation.nova.common.view.startTimer import io.novafoundation.nova.runtime.R -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.minutes diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/MortalityConstructor.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/MortalityConstructor.kt index fdb3044b6e..cefbb928c8 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/MortalityConstructor.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/MortalityConstructor.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.common.utils.invoke import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.network.rpc.RpcCalls import io.novafoundation.nova.runtime.repository.ChainStateRepository -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Era +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Era import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.withContext diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/multi/CallBuilder.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/multi/CallBuilder.kt index e047cee211..d47eedffb5 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/multi/CallBuilder.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/multi/CallBuilder.kt @@ -1,9 +1,9 @@ package io.novafoundation.nova.runtime.extrinsic.multi -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.metadata.call -import jp.co.soramitsu.fearless_utils.runtime.metadata.module +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.metadata.call +import io.novasama.substrate_sdk_android.runtime.metadata.module interface CallBuilder { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/multi/ExtrinsicSplitter.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/multi/ExtrinsicSplitter.kt index 713c9b1689..7c11f5c515 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/multi/ExtrinsicSplitter.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/multi/ExtrinsicSplitter.kt @@ -9,13 +9,13 @@ import io.novafoundation.nova.runtime.extrinsic.signer.NovaSigner import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.network.rpc.RpcCalls import io.novafoundation.nova.runtime.repository.BlockLimitsRepository -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Era -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.ExtrinsicBuilder -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.Nonce -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.chain.RuntimeVersion +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Era +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.extrinsic.ExtrinsicBuilder +import io.novasama.substrate_sdk_android.runtime.extrinsic.Nonce +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.chain.RuntimeVersion import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Deferred import kotlinx.coroutines.async diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/signer/NovaSigner.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/signer/NovaSigner.kt index 9068d274d6..ec37b3ca95 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/signer/NovaSigner.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/signer/NovaSigner.kt @@ -1,9 +1,9 @@ package io.novafoundation.nova.runtime.extrinsic.signer import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.Signer -import jp.co.soramitsu.fearless_utils.runtime.extrinsic.signer.SignerPayloadExtrinsic +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.Signer +import io.novasama.substrate_sdk_android.runtime.extrinsic.signer.SignerPayloadExtrinsic interface NovaSigner : Signer { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/api/ExtrinsicWalk.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/api/ExtrinsicWalk.kt index e94225b5d1..c8124174ec 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/api/ExtrinsicWalk.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/api/ExtrinsicWalk.kt @@ -2,9 +2,9 @@ package io.novafoundation.nova.runtime.extrinsic.visitor.api import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.ExtrinsicWithEvents -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent interface ExtrinsicWalk { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/MutableEventQueue.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/MutableEventQueue.kt index 685bc355d2..05bf4ea33a 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/MutableEventQueue.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/MutableEventQueue.kt @@ -1,8 +1,8 @@ package io.novafoundation.nova.runtime.extrinsic.visitor.impl import io.novafoundation.nova.common.utils.instanceOf -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Event +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.metadata.module.Event internal interface MutableEventQueue : EventQueue { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/NestedCallNode.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/NestedCallNode.kt index f71dbfd07a..552ffe9393 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/NestedCallNode.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/NestedCallNode.kt @@ -3,9 +3,9 @@ package io.novafoundation.nova.runtime.extrinsic.visitor.impl import io.novafoundation.nova.runtime.extrinsic.visitor.api.ExtrinsicVisit import io.novafoundation.nova.runtime.extrinsic.visitor.api.ExtrinsicVisitor import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.ExtrinsicWithEvents -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall internal interface NestedCallNode { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/RealExtrinsicWalk.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/RealExtrinsicWalk.kt index 882fb4c406..5726dfdc2c 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/RealExtrinsicWalk.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/RealExtrinsicWalk.kt @@ -12,10 +12,10 @@ import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.ExtrinsicWithEvents import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.isSuccess import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.signer -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.ss58.SS58Encoder.toAddress +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.ss58.SS58Encoder.toAddress internal class RealExtrinsicWalk( private val chainRegistry: ChainRegistry, diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/batch/BatchAllNode.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/batch/BatchAllNode.kt index f1b2c01188..f98131581f 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/batch/BatchAllNode.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/batch/BatchAllNode.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.runtime.extrinsic.visitor.impl.EventCountingContex import io.novafoundation.nova.runtime.extrinsic.visitor.impl.NestedCallNode import io.novafoundation.nova.runtime.extrinsic.visitor.impl.VisitingContext import io.novafoundation.nova.runtime.extrinsic.visitor.impl.indexOfLastOrThrow -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall internal class BatchAllNode : NestedCallNode { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/batch/Common.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/batch/Common.kt index 634967f2c2..2448e75c05 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/batch/Common.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/batch/Common.kt @@ -2,11 +2,11 @@ package io.novafoundation.nova.runtime.extrinsic.visitor.impl.nodes.batch import io.novafoundation.nova.common.utils.utility import io.novafoundation.nova.runtime.extrinsic.visitor.impl.VisitingContext -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent -import jp.co.soramitsu.fearless_utils.runtime.metadata.event -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Event +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.metadata.event +import io.novasama.substrate_sdk_android.runtime.metadata.module.Event internal fun RuntimeSnapshot.batchCompletedEvent(): Event { return metadata.utility().event("BatchCompleted") diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/batch/ForceBatchNode.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/batch/ForceBatchNode.kt index 5430714a81..422d7554a8 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/batch/ForceBatchNode.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/batch/ForceBatchNode.kt @@ -10,7 +10,7 @@ import io.novafoundation.nova.runtime.extrinsic.visitor.impl.VisitingContext import io.novafoundation.nova.runtime.extrinsic.visitor.impl.indexOfLastOrThrow import io.novafoundation.nova.runtime.extrinsic.visitor.impl.peekItemFromEndOrThrow import io.novafoundation.nova.runtime.extrinsic.visitor.impl.takeFromEndOrThrow -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall internal class ForceBatchNode : NestedCallNode { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/proxy/ProxyNode.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/proxy/ProxyNode.kt index bf0a7ced8c..cb058a9ab8 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/proxy/ProxyNode.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/nodes/proxy/ProxyNode.kt @@ -11,12 +11,12 @@ import io.novafoundation.nova.runtime.extrinsic.visitor.impl.NestedCallNode import io.novafoundation.nova.runtime.extrinsic.visitor.impl.VisitingContext import io.novafoundation.nova.runtime.extrinsic.visitor.impl.peekItemFromEndOrThrow import io.novafoundation.nova.runtime.extrinsic.visitor.impl.takeFromEndOrThrow -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent -import jp.co.soramitsu.fearless_utils.runtime.metadata.event -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Event +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.metadata.event +import io.novasama.substrate_sdk_android.runtime.metadata.module.Event internal class ProxyNode : NestedCallNode { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/mapper/RuntimeMapperFromLocal.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/mapper/RuntimeMapperFromLocal.kt index 68e50f585f..68aedab6bc 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/mapper/RuntimeMapperFromLocal.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/mapper/RuntimeMapperFromLocal.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.runtime.mapper import io.novafoundation.nova.core_db.model.chain.ChainRuntimeInfoLocal -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.chain.RuntimeVersion +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.chain.RuntimeVersion fun ChainRuntimeInfoLocal.toRuntimeVersion(): RuntimeVersion? { return RuntimeVersion( diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/ChainRegistry.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/ChainRegistry.kt index f4b1189b9e..19f3594b04 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/ChainRegistry.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/ChainRegistry.kt @@ -31,7 +31,7 @@ import io.novafoundation.nova.runtime.multiNetwork.runtime.RuntimeProviderPool import io.novafoundation.nova.runtime.multiNetwork.runtime.RuntimeSubscriptionPool import io.novafoundation.nova.runtime.multiNetwork.runtime.RuntimeSyncService import io.novafoundation.nova.runtime.multiNetwork.runtime.types.BaseTypeSynchronizer -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.SocketService import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.SharingStarted diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/chain/model/StatemineAssetId.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/chain/model/StatemineAssetId.kt index c0bb821fd3..c491584aea 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/chain/model/StatemineAssetId.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/chain/model/StatemineAssetId.kt @@ -2,12 +2,12 @@ package io.novafoundation.nova.runtime.multiNetwork.chain.model import io.novafoundation.nova.common.data.network.runtime.binding.bindNumber import io.novafoundation.nova.runtime.ext.palletNameOrDefault -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.RuntimeType -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHex -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.toHexUntyped -import jp.co.soramitsu.fearless_utils.runtime.metadata.callOrNull -import jp.co.soramitsu.fearless_utils.runtime.metadata.moduleOrNull +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.RuntimeType +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHex +import io.novasama.substrate_sdk_android.runtime.definitions.types.toHexUntyped +import io.novasama.substrate_sdk_android.runtime.metadata.callOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.moduleOrNull import java.math.BigInteger sealed interface StatemineAssetId { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/connection/ChainConnection.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/connection/ChainConnection.kt index b5358d0e58..04501365c4 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/connection/ChainConnection.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/connection/ChainConnection.kt @@ -4,12 +4,12 @@ import android.util.Log import io.novafoundation.nova.common.utils.LOG_TAG import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.connection.autobalance.NodeAutobalancer -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService -import jp.co.soramitsu.fearless_utils.wsrpc.interceptor.WebSocketResponseInterceptor -import jp.co.soramitsu.fearless_utils.wsrpc.interceptor.WebSocketResponseInterceptor.ResponseDelivery -import jp.co.soramitsu.fearless_utils.wsrpc.networkStateFlow -import jp.co.soramitsu.fearless_utils.wsrpc.response.RpcResponse -import jp.co.soramitsu.fearless_utils.wsrpc.state.SocketStateMachine.State +import io.novasama.substrate_sdk_android.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.interceptor.WebSocketResponseInterceptor +import io.novasama.substrate_sdk_android.wsrpc.interceptor.WebSocketResponseInterceptor.ResponseDelivery +import io.novasama.substrate_sdk_android.wsrpc.networkStateFlow +import io.novasama.substrate_sdk_android.wsrpc.response.RpcResponse +import io.novasama.substrate_sdk_android.wsrpc.state.SocketStateMachine.State import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.cancel diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/connection/Web3ApiPool.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/connection/Web3ApiPool.kt index 86001454e0..75db664f28 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/connection/Web3ApiPool.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/connection/Web3ApiPool.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.runtime.ext.httpNodes import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain.Node.ConnectionType import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.SocketService import java.util.concurrent.ConcurrentHashMap typealias Web3ApiPoolKey = Pair diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/MultiLocation.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/MultiLocation.kt index 3b008fb217..1dc168dee3 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/MultiLocation.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/MultiLocation.kt @@ -3,7 +3,7 @@ package io.novafoundation.nova.runtime.multiNetwork.multiLocation import io.novafoundation.nova.common.data.network.runtime.binding.ParaId import io.novafoundation.nova.common.utils.removeHexPrefix import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.AccountId import java.math.BigInteger fun Junctions(vararg junctions: MultiLocation.Junction) = MultiLocation.Interior.Junctions(junctions.toList()) diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/MultiLocationEncoding.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/MultiLocationEncoding.kt index 27461a4d74..9d7b426092 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/MultiLocationEncoding.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/MultiLocationEncoding.kt @@ -11,10 +11,10 @@ import io.novafoundation.nova.runtime.ext.Geneses import io.novafoundation.nova.runtime.ext.Ids import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.multiLocation.MultiLocation.Junction -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.extensions.toHexString -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.extensions.toHexString +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum // ------ Decode ------ diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/converter/ForeignAssetsLocationConverter.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/converter/ForeignAssetsLocationConverter.kt index 33772842ee..a014a4b891 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/converter/ForeignAssetsLocationConverter.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/converter/ForeignAssetsLocationConverter.kt @@ -13,7 +13,7 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.statemineAssetIdS import io.novafoundation.nova.runtime.multiNetwork.multiLocation.MultiLocation import io.novafoundation.nova.runtime.multiNetwork.multiLocation.bindMultiLocation import io.novafoundation.nova.runtime.multiNetwork.multiLocation.toEncodableInstance -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import kotlinx.coroutines.Deferred private typealias ScaleEncodedMultiLocation = String diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/converter/LocalAssetsLocationConverter.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/converter/LocalAssetsLocationConverter.kt index 9fe81003b1..ca45d96b04 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/converter/LocalAssetsLocationConverter.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/multiLocation/converter/LocalAssetsLocationConverter.kt @@ -13,8 +13,8 @@ import io.novafoundation.nova.runtime.multiNetwork.multiLocation.Junctions import io.novafoundation.nova.runtime.multiNetwork.multiLocation.MultiLocation import io.novafoundation.nova.runtime.multiNetwork.multiLocation.MultiLocation.Junction import io.novafoundation.nova.runtime.multiNetwork.multiLocation.junctionList -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.moduleOrNull +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.moduleOrNull import kotlinx.coroutines.Deferred import java.math.BigInteger diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/qr/MultiChainQrSharingFactory.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/qr/MultiChainQrSharingFactory.kt index 32f55c663b..ec55265b98 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/qr/MultiChainQrSharingFactory.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/qr/MultiChainQrSharingFactory.kt @@ -1,8 +1,8 @@ package io.novafoundation.nova.runtime.multiNetwork.qr -import jp.co.soramitsu.fearless_utils.encrypt.qr.QrSharing -import jp.co.soramitsu.fearless_utils.encrypt.qr.formats.AddressQrFormat -import jp.co.soramitsu.fearless_utils.encrypt.qr.formats.SubstrateQrFormat +import io.novasama.substrate_sdk_android.encrypt.qr.QrSharing +import io.novasama.substrate_sdk_android.encrypt.qr.formats.AddressQrFormat +import io.novasama.substrate_sdk_android.encrypt.qr.formats.SubstrateQrFormat class MultiChainQrSharingFactory { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeFactory.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeFactory.kt index fff9f32528..a977050400 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeFactory.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeFactory.kt @@ -6,23 +6,23 @@ import io.novafoundation.nova.common.utils.newLimitedThreadPoolExecutor import io.novafoundation.nova.core_db.dao.ChainDao import io.novafoundation.nova.runtime.multiNetwork.chain.model.TypesUsage import io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote.SiVoteTypeMapping -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.TypeDefinitionParser.parseBaseDefinitions -import jp.co.soramitsu.fearless_utils.runtime.definitions.TypeDefinitionParser.parseNetworkVersioning -import jp.co.soramitsu.fearless_utils.runtime.definitions.TypeDefinitionsTree -import jp.co.soramitsu.fearless_utils.runtime.definitions.dynamic.DynamicTypeResolver -import jp.co.soramitsu.fearless_utils.runtime.definitions.dynamic.extentsions.GenericsExtension -import jp.co.soramitsu.fearless_utils.runtime.definitions.registry.TypePreset -import jp.co.soramitsu.fearless_utils.runtime.definitions.registry.TypeRegistry -import jp.co.soramitsu.fearless_utils.runtime.definitions.registry.v13Preset -import jp.co.soramitsu.fearless_utils.runtime.definitions.registry.v14Preset -import jp.co.soramitsu.fearless_utils.runtime.definitions.v14.TypesParserV14 -import jp.co.soramitsu.fearless_utils.runtime.definitions.v14.typeMapping.SiTypeMapping -import jp.co.soramitsu.fearless_utils.runtime.definitions.v14.typeMapping.default -import jp.co.soramitsu.fearless_utils.runtime.definitions.v14.typeMapping.plus -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadataReader -import jp.co.soramitsu.fearless_utils.runtime.metadata.builder.VersionedRuntimeBuilder -import jp.co.soramitsu.fearless_utils.runtime.metadata.v14.RuntimeMetadataSchemaV14 +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.TypeDefinitionParser.parseBaseDefinitions +import io.novasama.substrate_sdk_android.runtime.definitions.TypeDefinitionParser.parseNetworkVersioning +import io.novasama.substrate_sdk_android.runtime.definitions.TypeDefinitionsTree +import io.novasama.substrate_sdk_android.runtime.definitions.dynamic.DynamicTypeResolver +import io.novasama.substrate_sdk_android.runtime.definitions.dynamic.extentsions.GenericsExtension +import io.novasama.substrate_sdk_android.runtime.definitions.registry.TypePreset +import io.novasama.substrate_sdk_android.runtime.definitions.registry.TypeRegistry +import io.novasama.substrate_sdk_android.runtime.definitions.registry.v13Preset +import io.novasama.substrate_sdk_android.runtime.definitions.registry.v14Preset +import io.novasama.substrate_sdk_android.runtime.definitions.v14.TypesParserV14 +import io.novasama.substrate_sdk_android.runtime.definitions.v14.typeMapping.SiTypeMapping +import io.novasama.substrate_sdk_android.runtime.definitions.v14.typeMapping.default +import io.novasama.substrate_sdk_android.runtime.definitions.v14.typeMapping.plus +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadataReader +import io.novasama.substrate_sdk_android.runtime.metadata.builder.VersionedRuntimeBuilder +import io.novasama.substrate_sdk_android.runtime.metadata.v14.RuntimeMetadataSchemaV14 import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.sync.Semaphore import kotlinx.coroutines.sync.withPermit diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeProvider.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeProvider.kt index 76827a913f..c1ad869f5b 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeProvider.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeProvider.kt @@ -6,7 +6,7 @@ import io.novafoundation.nova.runtime.ext.typesUsage import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.TypesUsage import io.novafoundation.nova.runtime.multiNetwork.runtime.types.BaseTypeSynchronizer -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeSyncService.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeSyncService.kt index fe5e120bd0..8fa82d0e0e 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeSyncService.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeSyncService.kt @@ -9,10 +9,10 @@ import io.novafoundation.nova.core_db.model.chain.ChainRuntimeInfoLocal import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.connection.ChainConnection import io.novafoundation.nova.runtime.multiNetwork.runtime.types.TypesFetcher -import jp.co.soramitsu.fearless_utils.runtime.metadata.GetMetadataRequest -import jp.co.soramitsu.fearless_utils.wsrpc.executeAsync -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.nonNull -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.pojo +import io.novasama.substrate_sdk_android.runtime.metadata.GetMetadataRequest +import io.novasama.substrate_sdk_android.wsrpc.executeAsync +import io.novasama.substrate_sdk_android.wsrpc.mappers.nonNull +import io.novasama.substrate_sdk_android.wsrpc.mappers.pojo import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeVersionSubscription.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeVersionSubscription.kt index 2738f661bb..a6408b6693 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeVersionSubscription.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeVersionSubscription.kt @@ -4,8 +4,8 @@ import android.util.Log import io.novafoundation.nova.common.utils.LOG_TAG import io.novafoundation.nova.core_db.dao.ChainDao import io.novafoundation.nova.runtime.multiNetwork.connection.ChainConnection -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.chain.runtimeVersionChange -import jp.co.soramitsu.fearless_utils.wsrpc.subscriptionFlow +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.chain.runtimeVersionChange +import io.novasama.substrate_sdk_android.wsrpc.subscriptionFlow import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.catch diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/SubscribeRuntimeVersionRequest.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/SubscribeRuntimeVersionRequest.kt index 45a80445d3..12704d6c1b 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/SubscribeRuntimeVersionRequest.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/SubscribeRuntimeVersionRequest.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.runtime.multiNetwork.runtime -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest object SubscribeRuntimeVersionRequest : RuntimeRequest( method = "state_subscribeRuntimeVersion", diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/repository/EventsRepository.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/repository/EventsRepository.kt index 91c2f90d74..40cfe4bfbc 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/repository/EventsRepository.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/repository/EventsRepository.kt @@ -12,11 +12,11 @@ import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.network.rpc.RpcCalls import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.queryNonNull -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHexOrNull -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Extrinsic -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHexOrNull +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Extrinsic +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey interface EventsRepository { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/repository/ExtrinsicWithEvents.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/repository/ExtrinsicWithEvents.kt index aefe21ddb1..b0c42889e9 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/repository/ExtrinsicWithEvents.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/repository/ExtrinsicWithEvents.kt @@ -4,9 +4,9 @@ import io.novafoundation.nova.common.data.network.runtime.binding.bindAccountIde import io.novafoundation.nova.common.data.network.runtime.binding.bindNumber import io.novafoundation.nova.common.utils.Modules import io.novafoundation.nova.common.utils.instanceOf -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Extrinsic -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Extrinsic +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent import java.math.BigInteger private const val SUCCESS_EVENT = "ExtrinsicSuccess" diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/types/custom/vote/SiVoteTypeMapping.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/types/custom/vote/SiVoteTypeMapping.kt index 310fefd381..7551ebc121 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/types/custom/vote/SiVoteTypeMapping.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/types/custom/vote/SiVoteTypeMapping.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote -import jp.co.soramitsu.fearless_utils.runtime.definitions.v14.typeMapping.ReplaceTypesSiTypeMapping +import io.novasama.substrate_sdk_android.runtime.definitions.v14.typeMapping.ReplaceTypesSiTypeMapping fun SiVoteTypeMapping(): ReplaceTypesSiTypeMapping { val voteType = VoteType("NovaWallet.ConvictionVote") diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/types/custom/vote/VoteType.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/types/custom/vote/VoteType.kt index a56cabe7d8..8b85c3673d 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/types/custom/vote/VoteType.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/multiNetwork/runtime/types/custom/vote/VoteType.kt @@ -2,8 +2,8 @@ package io.novafoundation.nova.runtime.multiNetwork.runtime.types.custom.vote import io.emeraldpay.polkaj.scale.ScaleCodecReader import io.emeraldpay.polkaj.scale.ScaleCodecWriter -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.primitives.Primitive +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.primitives.Primitive import kotlin.experimental.and import kotlin.experimental.or diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/network/rpc/RpcCalls.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/network/rpc/RpcCalls.kt index fb18c8013d..a07389ffc7 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/network/rpc/RpcCalls.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/network/rpc/RpcCalls.kt @@ -26,15 +26,15 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.multiNetwork.getSocket -import jp.co.soramitsu.fearless_utils.extensions.fromHex -import jp.co.soramitsu.fearless_utils.wsrpc.executeAsync -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.nonNull -import jp.co.soramitsu.fearless_utils.wsrpc.mappers.pojo -import jp.co.soramitsu.fearless_utils.wsrpc.request.DeliveryType -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.author.SubmitAndWatchExtrinsicRequest -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.author.SubmitExtrinsicRequest -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.chain.RuntimeVersion -import jp.co.soramitsu.fearless_utils.wsrpc.subscriptionFlow +import io.novasama.substrate_sdk_android.extensions.fromHex +import io.novasama.substrate_sdk_android.wsrpc.executeAsync +import io.novasama.substrate_sdk_android.wsrpc.mappers.nonNull +import io.novasama.substrate_sdk_android.wsrpc.mappers.pojo +import io.novasama.substrate_sdk_android.wsrpc.request.DeliveryType +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.author.SubmitAndWatchExtrinsicRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.author.SubmitExtrinsicRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.chain.RuntimeVersion +import io.novasama.substrate_sdk_android.wsrpc.subscriptionFlow import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emitAll import kotlinx.coroutines.flow.flow diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/network/rpc/StateCallRequest.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/network/rpc/StateCallRequest.kt index c4e6995373..e154fd1c47 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/network/rpc/StateCallRequest.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/network/rpc/StateCallRequest.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.runtime.network.rpc -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest class StateCallRequest( runtimeRpcName: String, diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/network/rpc/StateRuntimeVersionRequest.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/network/rpc/StateRuntimeVersionRequest.kt index d3ff27145d..1e1a01ba4b 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/network/rpc/StateRuntimeVersionRequest.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/network/rpc/StateRuntimeVersionRequest.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.runtime.network.rpc -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest private const val METHOD = "state_getRuntimeVersion" diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/BlockNumberUpdater.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/BlockNumberUpdater.kt index e0d0e5d14b..b874bfef5e 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/BlockNumberUpdater.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/BlockNumberUpdater.kt @@ -6,9 +6,9 @@ import io.novafoundation.nova.core.storage.StorageCache import io.novafoundation.nova.core.updater.GlobalScope import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.state.SelectedAssetOptionSharedState -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class BlockNumberUpdater( chainRegistry: ChainRegistry, diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/BlockTimeUpdater.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/BlockTimeUpdater.kt index c1019703f8..f3ca10a4b3 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/BlockTimeUpdater.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/BlockTimeUpdater.kt @@ -18,8 +18,8 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.storage.SampledBlockTimeStorage import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.drop import kotlinx.coroutines.flow.filter diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/InactiveIssuanceUpdater.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/InactiveIssuanceUpdater.kt index cb9f74c4b3..3be13938b7 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/InactiveIssuanceUpdater.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/InactiveIssuanceUpdater.kt @@ -6,9 +6,9 @@ import io.novafoundation.nova.common.utils.balances import io.novafoundation.nova.core.storage.StorageCache import io.novafoundation.nova.core.updater.GlobalScope import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageOrNull +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storageOrNull class InactiveIssuanceUpdater( chainIdHolder: ChainIdHolder, diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/SingleStorageKeyUpdater.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/SingleStorageKeyUpdater.kt index b7059206e4..f10a087840 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/SingleStorageKeyUpdater.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/SingleStorageKeyUpdater.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.core.updater.UpdateScope import io.novafoundation.nova.core.updater.Updater import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.getRuntime -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emptyFlow import kotlinx.coroutines.flow.map diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/TotalIssuanceUpdater.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/TotalIssuanceUpdater.kt index 7c115fc79b..174a74e6c9 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/TotalIssuanceUpdater.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/network/updaters/TotalIssuanceUpdater.kt @@ -6,9 +6,9 @@ import io.novafoundation.nova.common.utils.balances import io.novafoundation.nova.core.storage.StorageCache import io.novafoundation.nova.core.updater.GlobalScope import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey class TotalIssuanceUpdater( chainIdHolder: ChainIdHolder, diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/repository/ChainStateRepository.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/repository/ChainStateRepository.kt index cdd563f21c..7f369b58c3 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/repository/ChainStateRepository.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/repository/ChainStateRepository.kt @@ -18,9 +18,9 @@ import io.novafoundation.nova.runtime.storage.SampledBlockTimeStorage import io.novafoundation.nova.runtime.storage.source.StorageDataSource import io.novafoundation.nova.runtime.storage.source.observeNonNull import io.novafoundation.nova.runtime.storage.source.queryNonNull -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import java.math.BigInteger diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/repository/ParachainInfoRepository.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/repository/ParachainInfoRepository.kt index 6ad172e8c2..c8e3caa90f 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/repository/ParachainInfoRepository.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/repository/ParachainInfoRepository.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.common.data.network.runtime.binding.bindNumber import io.novafoundation.nova.common.utils.parachainInfoOrNull import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storage import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/repository/TimestampRepository.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/repository/TimestampRepository.kt index 3dca5b42af..c29aba7e27 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/repository/TimestampRepository.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/repository/TimestampRepository.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.common.data.network.runtime.binding.bindNumber import io.novafoundation.nova.common.utils.timestamp import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storage import java.math.BigInteger typealias UnixTime = BigInteger diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/repository/TotalIssuanceRepository.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/repository/TotalIssuanceRepository.kt index 6322a76d92..b95b30eb2c 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/repository/TotalIssuanceRepository.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/repository/TotalIssuanceRepository.kt @@ -6,8 +6,8 @@ import io.novafoundation.nova.common.utils.balances import io.novafoundation.nova.common.utils.orZero import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.StorageDataSource -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageOrNull +import io.novasama.substrate_sdk_android.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.storageOrNull import java.math.BigInteger interface TotalIssuanceRepository { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/BaseStorageSource.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/BaseStorageSource.kt index 447f275cf7..54273d7274 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/BaseStorageSource.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/BaseStorageSource.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.runtime.ethereum.subscribe import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.getRuntime import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.emitAll diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/LocalStorageSource.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/LocalStorageSource.kt index 0f42b2eaa4..a3ccd00428 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/LocalStorageSource.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/LocalStorageSource.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.runtime.ethereum.StorageSharedRequestsBuilderFacto import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.storage.source.query.LocalStorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/RemoteStorageSource.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/RemoteStorageSource.kt index 7dea995c5d..304f7a2aaa 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/RemoteStorageSource.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/RemoteStorageSource.kt @@ -10,11 +10,11 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.getSocket import io.novafoundation.nova.runtime.storage.source.query.RemoteStorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.wsrpc.executeAsync -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.storage.SubscribeStorageRequest -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.storage.storageChange -import jp.co.soramitsu.fearless_utils.wsrpc.subscriptionFlow +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.wsrpc.executeAsync +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.storage.SubscribeStorageRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.storage.storageChange +import io.novasama.substrate_sdk_android.wsrpc.subscriptionFlow import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/StorageDataSource.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/StorageDataSource.kt index cfa637f77f..b67024dc29 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/StorageDataSource.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/StorageDataSource.kt @@ -5,7 +5,7 @@ import io.novafoundation.nova.common.data.network.runtime.binding.BlockHash import io.novafoundation.nova.common.data.network.runtime.binding.NonNullBinder import io.novafoundation.nova.core.updater.SubstrateSubscriptionBuilder import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import kotlinx.coroutines.flow.Flow import java.io.OutputStream diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/multi/MultiQueryBuilder.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/multi/MultiQueryBuilder.kt index a5a92b1c05..7eb099daad 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/multi/MultiQueryBuilder.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/multi/MultiQueryBuilder.kt @@ -3,7 +3,7 @@ package io.novafoundation.nova.runtime.storage.source.multi import io.novafoundation.nova.runtime.storage.source.query.DynamicInstanceBinder import io.novafoundation.nova.runtime.storage.source.query.StorageKeyComponents import io.novafoundation.nova.runtime.storage.source.query.wrapSingleArgumentKeys -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry interface MultiQueryBuilder { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/multi/MultiQueryBuilderImpl.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/multi/MultiQueryBuilderImpl.kt index 295926cc1e..29b17db72e 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/multi/MultiQueryBuilderImpl.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/multi/MultiQueryBuilderImpl.kt @@ -4,11 +4,11 @@ import io.novafoundation.nova.common.utils.splitKeyToComponents import io.novafoundation.nova.runtime.storage.source.multi.MultiQueryBuilder.Descriptor import io.novafoundation.nova.runtime.storage.source.query.DynamicInstanceBinder import io.novafoundation.nova.runtime.storage.source.query.StorageKeyComponents -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHex -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKeys +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHex +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storageKeys class MultiQueryBuilderImpl( private val runtime: RuntimeSnapshot diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/BaseStorageQueryContext.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/BaseStorageQueryContext.kt index 5be9f7d720..25e9499296 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/BaseStorageQueryContext.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/BaseStorageQueryContext.kt @@ -10,18 +10,18 @@ import io.novafoundation.nova.common.utils.mapValuesNotNull import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.multi.MultiQueryBuilder import io.novafoundation.nova.runtime.storage.source.multi.MultiQueryBuilderImpl -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.fromHex -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.primitives.u16 -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.toByteArray -import jp.co.soramitsu.fearless_utils.runtime.metadata.StorageEntryModifier -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Constant -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntryType -import jp.co.soramitsu.fearless_utils.runtime.metadata.splitKey -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKey -import jp.co.soramitsu.fearless_utils.runtime.metadata.storageKeys +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHex +import io.novasama.substrate_sdk_android.runtime.definitions.types.primitives.u16 +import io.novasama.substrate_sdk_android.runtime.definitions.types.toByteArray +import io.novasama.substrate_sdk_android.runtime.metadata.StorageEntryModifier +import io.novasama.substrate_sdk_android.runtime.metadata.module.Constant +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntryType +import io.novasama.substrate_sdk_android.runtime.metadata.splitKey +import io.novasama.substrate_sdk_android.runtime.metadata.storageKey +import io.novasama.substrate_sdk_android.runtime.metadata.storageKeys import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import java.math.BigInteger diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/LocalStorageQueryContext.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/LocalStorageQueryContext.kt index 003db77686..571368ae51 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/LocalStorageQueryContext.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/LocalStorageQueryContext.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.common.data.network.runtime.binding.BlockHash import io.novafoundation.nova.core.model.StorageEntry import io.novafoundation.nova.core.storage.StorageCache import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.first diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/RemoteStorageQueryContext.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/RemoteStorageQueryContext.kt index f7fef6c500..639c319fba 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/RemoteStorageQueryContext.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/RemoteStorageQueryContext.kt @@ -6,11 +6,11 @@ import io.novafoundation.nova.common.data.network.rpc.retrieveAllValues import io.novafoundation.nova.common.data.network.runtime.binding.BlockHash import io.novafoundation.nova.core.updater.SubstrateSubscriptionBuilder import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.storage.SubscribeStorageRequest -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.storage.storageChange -import jp.co.soramitsu.fearless_utils.wsrpc.subscriptionFlow +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.storage.SubscribeStorageRequest +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.storage.storageChange +import io.novasama.substrate_sdk_android.wsrpc.subscriptionFlow import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/StorageQueryContext.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/StorageQueryContext.kt index 0d9e79718d..1f5a9ba570 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/StorageQueryContext.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/StorageQueryContext.kt @@ -3,11 +3,11 @@ package io.novafoundation.nova.runtime.storage.source.query import io.novafoundation.nova.common.utils.ComponentHolder import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.multi.MultiQueryBuilder -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Constant -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Constant +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry import kotlinx.coroutines.flow.Flow import kotlin.contracts.ExperimentalContracts import kotlin.contracts.InvocationKind diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableModule.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableModule.kt index 760fc80923..fe6726209f 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableModule.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableModule.kt @@ -1,8 +1,8 @@ package io.novafoundation.nova.runtime.storage.source.query.api import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.metadata.storage typealias QueryableStorageKeyBinder = (keyInstance: Any) -> K typealias QueryableStorageKeyBinder2 = (keyInstance: Any) -> Pair diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry0.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry0.kt index 23c896f9f6..3c47cb8922 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry0.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry0.kt @@ -2,7 +2,7 @@ package io.novafoundation.nova.runtime.storage.source.query.api import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.WithRawValue -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filterNotNull diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry1.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry1.kt index 0ef0e6c429..c4b776347d 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry1.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry1.kt @@ -4,7 +4,7 @@ import io.novafoundation.nova.runtime.storage.source.query.StorageKeyComponents import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext import io.novafoundation.nova.runtime.storage.source.query.WithRawValue import io.novafoundation.nova.runtime.storage.source.query.wrapSingleArgumentKeys -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.filterNotNull diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry2.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry2.kt index d5a8b4e50c..ca6ac4ed6d 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry2.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/api/QueryableStorageEntry2.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.runtime.storage.source.query.api import io.novafoundation.nova.runtime.storage.source.query.StorageQueryContext -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.StorageEntry +import io.novasama.substrate_sdk_android.runtime.metadata.module.StorageEntry import kotlinx.coroutines.flow.Flow typealias QueryableStorageBinder2 = (dynamicInstance: Any, key1: K1, key2: K2) -> V diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/typed/SystemRuntimeApi.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/typed/SystemRuntimeApi.kt index 8c7d0244fd..939605b044 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/typed/SystemRuntimeApi.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/typed/SystemRuntimeApi.kt @@ -10,9 +10,9 @@ import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageE import io.novafoundation.nova.runtime.storage.source.query.api.QueryableStorageEntry1 import io.novafoundation.nova.runtime.storage.source.query.api.storage0 import io.novafoundation.nova.runtime.storage.source.query.api.storage1 -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module import java.math.BigInteger @JvmInline diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/util/AccountLookup.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/util/AccountLookup.kt index 60f41d62a9..5432593337 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/util/AccountLookup.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/util/AccountLookup.kt @@ -1,11 +1,11 @@ package io.novafoundation.nova.runtime.util -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.RuntimeType -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.MULTI_ADDRESS_ID -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.primitives.FixedByteArray -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.skipAliases +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.RuntimeType +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.MULTI_ADDRESS_ID +import io.novasama.substrate_sdk_android.runtime.definitions.types.primitives.FixedByteArray +import io.novasama.substrate_sdk_android.runtime.definitions.types.skipAliases fun RuntimeType<*, *>.constructAccountLookupInstance(accountId: AccountId): Any { return when (skipAliases()) { diff --git a/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/BatchAllWalkTest.kt b/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/BatchAllWalkTest.kt index 50e2acffe6..a4eaef55e8 100644 --- a/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/BatchAllWalkTest.kt +++ b/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/BatchAllWalkTest.kt @@ -7,12 +7,12 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.runtime.RuntimeProvider import io.novafoundation.nova.test_shared.any import io.novafoundation.nova.test_shared.whenever -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Event -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Event +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module import junit.framework.Assert.assertEquals import kotlinx.coroutines.runBlocking import org.junit.Assert.assertArrayEquals diff --git a/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/Common.kt b/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/Common.kt index 67e2613282..8dce0605be 100644 --- a/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/Common.kt +++ b/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/Common.kt @@ -9,14 +9,14 @@ import io.novafoundation.nova.runtime.extrinsic.visitor.api.walkToList import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import io.novafoundation.nova.runtime.multiNetwork.runtime.repository.ExtrinsicWithEvents import io.novafoundation.nova.test_shared.whenever -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.Extrinsic -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent -import jp.co.soramitsu.fearless_utils.runtime.metadata.call -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Event -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.MetadataFunction -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.Extrinsic +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.metadata.call +import io.novasama.substrate_sdk_android.runtime.metadata.module.Event +import io.novasama.substrate_sdk_android.runtime.metadata.module.MetadataFunction +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module import org.junit.Assert import org.mockito.Mockito import java.math.BigInteger diff --git a/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/ForceBatchWalkTest.kt b/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/ForceBatchWalkTest.kt index 26b2a5e829..ba172accc5 100644 --- a/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/ForceBatchWalkTest.kt +++ b/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/ForceBatchWalkTest.kt @@ -7,12 +7,12 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.runtime.RuntimeProvider import io.novafoundation.nova.test_shared.any import io.novafoundation.nova.test_shared.whenever -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Event -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Event +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module import junit.framework.Assert.assertEquals import kotlinx.coroutines.runBlocking import org.junit.Assert.assertArrayEquals diff --git a/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/ProxyWalkTest.kt b/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/ProxyWalkTest.kt index 4a58ae7ce1..5a5281c3b7 100644 --- a/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/ProxyWalkTest.kt +++ b/runtime/src/test/java/io/novafoundation/nova/runtime/extrinsic/visitor/impl/ProxyWalkTest.kt @@ -8,14 +8,14 @@ import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.runtime.RuntimeProvider import io.novafoundation.nova.test_shared.any import io.novafoundation.nova.test_shared.whenever -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.composite.DictEnum -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericCall -import jp.co.soramitsu.fearless_utils.runtime.definitions.types.generics.GenericEvent -import jp.co.soramitsu.fearless_utils.runtime.metadata.RuntimeMetadata -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Event -import jp.co.soramitsu.fearless_utils.runtime.metadata.module.Module +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.composite.DictEnum +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericCall +import io.novasama.substrate_sdk_android.runtime.definitions.types.generics.GenericEvent +import io.novasama.substrate_sdk_android.runtime.metadata.RuntimeMetadata +import io.novasama.substrate_sdk_android.runtime.metadata.module.Event +import io.novasama.substrate_sdk_android.runtime.metadata.module.Module import junit.framework.Assert.assertEquals import kotlinx.coroutines.runBlocking import org.junit.Assert.assertArrayEquals diff --git a/runtime/src/test/java/io/novafoundation/nova/runtime/multiNetwork/connection/autobalance/NodeAutobalancerTest.kt b/runtime/src/test/java/io/novafoundation/nova/runtime/multiNetwork/connection/autobalance/NodeAutobalancerTest.kt index 63d8ed6f3c..4f634325a4 100644 --- a/runtime/src/test/java/io/novafoundation/nova/runtime/multiNetwork/connection/autobalance/NodeAutobalancerTest.kt +++ b/runtime/src/test/java/io/novafoundation/nova/runtime/multiNetwork/connection/autobalance/NodeAutobalancerTest.kt @@ -9,7 +9,7 @@ import io.novafoundation.nova.runtime.multiNetwork.connection.autobalance.strate import io.novafoundation.nova.test_shared.CoroutineTest import io.novafoundation.nova.test_shared.any import io.novafoundation.nova.test_shared.whenever -import jp.co.soramitsu.fearless_utils.wsrpc.state.SocketStateMachine +import io.novasama.substrate_sdk_android.wsrpc.state.SocketStateMachine import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.flowOf diff --git a/runtime/src/test/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeProviderTest.kt b/runtime/src/test/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeProviderTest.kt index fc378c7944..0f40e9257c 100644 --- a/runtime/src/test/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeProviderTest.kt +++ b/runtime/src/test/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeProviderTest.kt @@ -7,7 +7,7 @@ import io.novafoundation.nova.test_shared.any import io.novafoundation.nova.test_shared.eq import io.novafoundation.nova.test_shared.thenThrowUnsafe import io.novafoundation.nova.test_shared.whenever -import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.first diff --git a/runtime/src/test/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeSyncServiceTest.kt b/runtime/src/test/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeSyncServiceTest.kt index 48ed54fcb8..074fa53542 100644 --- a/runtime/src/test/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeSyncServiceTest.kt +++ b/runtime/src/test/java/io/novafoundation/nova/runtime/multiNetwork/runtime/RuntimeSyncServiceTest.kt @@ -10,10 +10,10 @@ import io.novafoundation.nova.runtime.multiNetwork.runtime.types.TypesFetcher import io.novafoundation.nova.test_shared.any import io.novafoundation.nova.test_shared.eq import io.novafoundation.nova.test_shared.whenever -import jp.co.soramitsu.fearless_utils.runtime.metadata.GetMetadataRequest -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService -import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.RuntimeRequest -import jp.co.soramitsu.fearless_utils.wsrpc.response.RpcResponse +import io.novasama.substrate_sdk_android.runtime.metadata.GetMetadataRequest +import io.novasama.substrate_sdk_android.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.request.runtime.RuntimeRequest +import io.novasama.substrate_sdk_android.wsrpc.response.RpcResponse import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.first diff --git a/test-shared/build.gradle b/test-shared/build.gradle index 2b3c63f2bc..c1b8e89005 100644 --- a/test-shared/build.gradle +++ b/test-shared/build.gradle @@ -39,7 +39,7 @@ dependencies { api wsDep api gsonDep - api fearlessLibDep + api substrateSdkDep api coroutinesTestDep } \ No newline at end of file diff --git a/test-shared/src/main/java/io/novafoundation/nova/test_shared/LoggerHelpers.kt b/test-shared/src/main/java/io/novafoundation/nova/test_shared/LoggerHelpers.kt index 088ce5776e..f33b5776f6 100644 --- a/test-shared/src/main/java/io/novafoundation/nova/test_shared/LoggerHelpers.kt +++ b/test-shared/src/main/java/io/novafoundation/nova/test_shared/LoggerHelpers.kt @@ -1,6 +1,6 @@ package io.novafoundation.nova.test_shared -import jp.co.soramitsu.fearless_utils.wsrpc.logging.Logger +import io.novasama.substrate_sdk_android.wsrpc.logging.Logger object StdoutLogger : Logger { override fun log(message: String?) { diff --git a/test-shared/src/main/java/io/novafoundation/nova/test_shared/SocketHelpers.kt b/test-shared/src/main/java/io/novafoundation/nova/test_shared/SocketHelpers.kt index c3ffff8c74..74a7aea424 100644 --- a/test-shared/src/main/java/io/novafoundation/nova/test_shared/SocketHelpers.kt +++ b/test-shared/src/main/java/io/novafoundation/nova/test_shared/SocketHelpers.kt @@ -2,8 +2,8 @@ package io.novafoundation.nova.test_shared import com.google.gson.Gson import com.neovisionaries.ws.client.WebSocketFactory -import jp.co.soramitsu.fearless_utils.wsrpc.SocketService -import jp.co.soramitsu.fearless_utils.wsrpc.recovery.Reconnector -import jp.co.soramitsu.fearless_utils.wsrpc.request.RequestExecutor +import io.novasama.substrate_sdk_android.wsrpc.SocketService +import io.novasama.substrate_sdk_android.wsrpc.recovery.Reconnector +import io.novasama.substrate_sdk_android.wsrpc.request.RequestExecutor fun createTestSocket() = SocketService(Gson(), NoOpLogger, WebSocketFactory(), Reconnector(), RequestExecutor()) diff --git a/web3names/src/main/java/io/novafoundation/nova/web3names/data/repository/RealWeb3NamesRepository.kt b/web3names/src/main/java/io/novafoundation/nova/web3names/data/repository/RealWeb3NamesRepository.kt index 7206ac448a..b22b484cf7 100644 --- a/web3names/src/main/java/io/novafoundation/nova/web3names/data/repository/RealWeb3NamesRepository.kt +++ b/web3names/src/main/java/io/novafoundation/nova/web3names/data/repository/RealWeb3NamesRepository.kt @@ -17,9 +17,9 @@ import io.novafoundation.nova.web3names.domain.exceptions.Web3NamesException.Cha import io.novafoundation.nova.web3names.domain.exceptions.Web3NamesException.UnsupportedAsset import io.novafoundation.nova.web3names.domain.exceptions.Web3NamesException.ValidAccountNotFoundException import io.novafoundation.nova.web3names.domain.models.Web3NameAccount -import jp.co.soramitsu.fearless_utils.runtime.AccountId -import jp.co.soramitsu.fearless_utils.runtime.metadata.module -import jp.co.soramitsu.fearless_utils.runtime.metadata.storage +import io.novasama.substrate_sdk_android.runtime.AccountId +import io.novasama.substrate_sdk_android.runtime.metadata.module +import io.novasama.substrate_sdk_android.runtime.metadata.storage class RealWeb3NamesRepository( private val remoteStorageSource: StorageDataSource, diff --git a/web3names/src/main/java/io/novafoundation/nova/web3names/data/serviceEndpoint/W3NServiceEndpointHandlerV1.kt b/web3names/src/main/java/io/novafoundation/nova/web3names/data/serviceEndpoint/W3NServiceEndpointHandlerV1.kt index de3be85df2..6201393e22 100644 --- a/web3names/src/main/java/io/novafoundation/nova/web3names/data/serviceEndpoint/W3NServiceEndpointHandlerV1.kt +++ b/web3names/src/main/java/io/novafoundation/nova/web3names/data/serviceEndpoint/W3NServiceEndpointHandlerV1.kt @@ -5,7 +5,7 @@ import io.ipfs.multibase.Multibase import io.novafoundation.nova.common.utils.fromJson import io.novafoundation.nova.web3names.data.endpoints.TransferRecipientsApi import io.novafoundation.nova.web3names.data.endpoints.model.TransferRecipientDetailsRemoteV1 -import jp.co.soramitsu.fearless_utils.hash.Hasher.blake2b256 +import io.novasama.substrate_sdk_android.hash.Hasher.blake2b256 private typealias RecipientsByChainV1 = Map> diff --git a/web3names/src/main/java/io/novafoundation/nova/web3names/data/serviceEndpoint/W3NServiceEndpointHandlerV2.kt b/web3names/src/main/java/io/novafoundation/nova/web3names/data/serviceEndpoint/W3NServiceEndpointHandlerV2.kt index 0520875934..616d48d11a 100644 --- a/web3names/src/main/java/io/novafoundation/nova/web3names/data/serviceEndpoint/W3NServiceEndpointHandlerV2.kt +++ b/web3names/src/main/java/io/novafoundation/nova/web3names/data/serviceEndpoint/W3NServiceEndpointHandlerV2.kt @@ -5,7 +5,7 @@ import io.ipfs.multibase.Multibase import io.novafoundation.nova.common.utils.fromJson import io.novafoundation.nova.web3names.data.endpoints.TransferRecipientsApi import io.novafoundation.nova.web3names.data.endpoints.model.TransferRecipientDetailsRemoteV2 -import jp.co.soramitsu.fearless_utils.hash.Hasher.blake2b256 +import io.novasama.substrate_sdk_android.hash.Hasher.blake2b256 import org.erdtman.jcs.JsonCanonicalizer private typealias RecipientsByChainV2 = Map> diff --git a/web3names/src/main/java/io/novafoundation/nova/web3names/domain/exceptions/Web3NamesException.kt b/web3names/src/main/java/io/novafoundation/nova/web3names/domain/exceptions/Web3NamesException.kt index 3a1fe3d450..1eb873f550 100644 --- a/web3names/src/main/java/io/novafoundation/nova/web3names/domain/exceptions/Web3NamesException.kt +++ b/web3names/src/main/java/io/novafoundation/nova/web3names/domain/exceptions/Web3NamesException.kt @@ -1,7 +1,7 @@ package io.novafoundation.nova.web3names.domain.exceptions import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain -import jp.co.soramitsu.fearless_utils.extensions.requirePrefix +import io.novasama.substrate_sdk_android.extensions.requirePrefix sealed class Web3NamesException(identifier: String) : Exception() { From 6991195e2ccbad8478769f2d59fb14da98df0d34 Mon Sep 17 00:00:00 2001 From: antonijzelinskij Date: Wed, 21 Feb 2024 10:25:58 +0100 Subject: [PATCH 2/9] Apply storage default value for delivery fee factor --- .../data/network/crosschain/RealCrossChainWeigher.kt | 2 +- .../nova/runtime/storage/source/BaseStorageSource.kt | 12 +++++++----- .../runtime/storage/source/LocalStorageSource.kt | 3 ++- .../runtime/storage/source/RemoteStorageSource.kt | 6 ++++-- .../nova/runtime/storage/source/StorageDataSource.kt | 1 + .../storage/source/query/BaseStorageQueryContext.kt | 10 +++++++++- .../storage/source/query/LocalStorageQueryContext.kt | 5 +++-- .../source/query/RemoteStorageQueryContext.kt | 5 +++-- 8 files changed, 30 insertions(+), 14 deletions(-) diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/RealCrossChainWeigher.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/RealCrossChainWeigher.kt index 43227a5220..08d6417287 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/RealCrossChainWeigher.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/crosschain/RealCrossChainWeigher.kt @@ -263,7 +263,7 @@ class RealCrossChainWeigher( private fun Chain.emptyBeneficiaryMultiLocation(): MultiLocation = emptyAccountId().accountIdToMultiLocation() private suspend fun xcmParachainDeliveryFeeFactor(chainId: ChainId, moduleName: String, paraId: ParaId): BigInteger { - return storageDataSource.query(chainId) { + return storageDataSource.query(chainId, applyStorageDefault = true) { runtime.metadata.module(moduleName).storage("DeliveryFeeFactor") .query( paraId, diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/BaseStorageSource.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/BaseStorageSource.kt index 54273d7274..c0a5354f07 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/BaseStorageSource.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/BaseStorageSource.kt @@ -33,7 +33,8 @@ abstract class BaseStorageSource( chainId: String, at: BlockHash?, runtime: RuntimeSnapshot, - subscriptionBuilder: SubstrateSubscriptionBuilder? + applyStorageDefault: Boolean, + subscriptionBuilder: SubstrateSubscriptionBuilder?, ): StorageQueryContext override suspend fun query( @@ -85,10 +86,11 @@ abstract class BaseStorageSource( override suspend fun query( chainId: String, at: BlockHash?, + applyStorageDefault: Boolean, query: suspend StorageQueryContext.() -> R ): R { val runtime = chainRegistry.getRuntime(chainId) - val context = createQueryContext(chainId, at, runtime, subscriptionBuilder = null) + val context = createQueryContext(chainId, at, runtime, applyStorageDefault, subscriptionBuilder = null) return context.query() } @@ -100,7 +102,7 @@ abstract class BaseStorageSource( ): Flow { return flow { val runtime = chainRegistry.getRuntime(chainId) - val context = createQueryContext(chainId, at, runtime, subscriptionBuilder = null) + val context = createQueryContext(chainId, at, runtime, applyStorageDefault = false, subscriptionBuilder = null) emitAll(context.subscribe()) } @@ -113,7 +115,7 @@ abstract class BaseStorageSource( subscribe: suspend StorageQueryContext.() -> Flow ): Flow { val runtime = chainRegistry.getRuntime(chainId) - val context = createQueryContext(chainId, at, runtime, subscriptionBuilder) + val context = createQueryContext(chainId, at, runtime, applyStorageDefault = false, subscriptionBuilder) return subscribe(context) } @@ -125,7 +127,7 @@ abstract class BaseStorageSource( ): Flow { val runtime = chainRegistry.getRuntime(chainId) val sharedSubscription = sharedRequestsBuilderFactory.create(chainId) - val context = createQueryContext(chainId, at, runtime, sharedSubscription) + val context = createQueryContext(chainId, at, runtime, applyStorageDefault = false, sharedSubscription) val result = subscribe(context) diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/LocalStorageSource.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/LocalStorageSource.kt index a3ccd00428..76eef3d5a5 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/LocalStorageSource.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/LocalStorageSource.kt @@ -36,9 +36,10 @@ class LocalStorageSource( chainId: String, at: BlockHash?, runtime: RuntimeSnapshot, + applyStorageDefault: Boolean, subscriptionBuilder: SubstrateSubscriptionBuilder? ): StorageQueryContext { - return LocalStorageQueryContext(storageCache, chainId, at, runtime) + return LocalStorageQueryContext(storageCache, chainId, at, runtime, applyStorageDefault) } private fun requireWithoutAt(at: BlockHash?) = require(at == null) { diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/RemoteStorageSource.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/RemoteStorageSource.kt index 304f7a2aaa..0e6387e6dd 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/RemoteStorageSource.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/RemoteStorageSource.kt @@ -43,7 +43,8 @@ class RemoteStorageSource( chainId: String, at: BlockHash?, runtime: RuntimeSnapshot, - subscriptionBuilder: SubstrateSubscriptionBuilder? + applyStorageDefault: Boolean, + subscriptionBuilder: SubstrateSubscriptionBuilder?, ): StorageQueryContext { return RemoteStorageQueryContext( bulkRetriever = bulkRetriever, @@ -51,7 +52,8 @@ class RemoteStorageSource( subscriptionBuilder = subscriptionBuilder, chainId = chainId, at = at, - runtime = runtime + runtime = runtime, + applyStorageDefault = applyStorageDefault ) } diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/StorageDataSource.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/StorageDataSource.kt index b67024dc29..178beaf781 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/StorageDataSource.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/StorageDataSource.kt @@ -37,6 +37,7 @@ interface StorageDataSource { suspend fun query( chainId: String, at: BlockHash? = null, + applyStorageDefault: Boolean = false, query: suspend StorageQueryContext.() -> R ): R diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/BaseStorageQueryContext.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/BaseStorageQueryContext.kt index 25e9499296..9e864503be 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/BaseStorageQueryContext.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/BaseStorageQueryContext.kt @@ -11,6 +11,7 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.ChainId import io.novafoundation.nova.runtime.storage.source.multi.MultiQueryBuilder import io.novafoundation.nova.runtime.storage.source.multi.MultiQueryBuilderImpl import io.novasama.substrate_sdk_android.runtime.RuntimeSnapshot +import io.novasama.substrate_sdk_android.runtime.definitions.types.fromByteArray import io.novasama.substrate_sdk_android.runtime.definitions.types.fromHex import io.novasama.substrate_sdk_android.runtime.definitions.types.primitives.u16 import io.novasama.substrate_sdk_android.runtime.definitions.types.toByteArray @@ -31,6 +32,7 @@ abstract class BaseStorageQueryContext( override val chainId: ChainId, override val runtime: RuntimeSnapshot, private val at: BlockHash?, + private val applyStorageDefault: Boolean ) : StorageQueryContext { protected abstract suspend fun queryKeysByPrefix(prefix: String, at: BlockHash?): List @@ -137,7 +139,7 @@ abstract class BaseStorageQueryContext( ): V { val storageKey = storageKeyWith(keyArguments) val scaleResult = queryKey(storageKey, at) - val decoded = scaleResult?.let { type.value?.fromHex(runtime, scaleResult) } + val decoded = scaleResult?.let { type.value?.fromHex(runtime, scaleResult) } ?: takeDefaultIfAllowed() return binding(decoded) } @@ -261,6 +263,12 @@ abstract class BaseStorageQueryContext( } } + private fun StorageEntry.takeDefaultIfAllowed(): Any? { + if (!applyStorageDefault) return null + + return type.value?.fromByteArray(runtime, default) + } + @JvmInline private value class MultiQueryResult(val delegate: Map, Map>) : MultiQueryBuilder.Result { @Suppress("UNCHECKED_CAST") diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/LocalStorageQueryContext.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/LocalStorageQueryContext.kt index 571368ae51..7da53f83b8 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/LocalStorageQueryContext.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/LocalStorageQueryContext.kt @@ -14,8 +14,9 @@ class LocalStorageQueryContext( private val storageCache: StorageCache, chainId: ChainId, at: BlockHash?, - runtime: RuntimeSnapshot -) : BaseStorageQueryContext(chainId, runtime, at) { + runtime: RuntimeSnapshot, + applyStorageDefault: Boolean +) : BaseStorageQueryContext(chainId, runtime, at, applyStorageDefault) { override suspend fun queryKeysByPrefix(prefix: String, at: BlockHash?): List { return storageCache.getKeys(prefix, chainId) diff --git a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/RemoteStorageQueryContext.kt b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/RemoteStorageQueryContext.kt index 639c319fba..7c927641a1 100644 --- a/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/RemoteStorageQueryContext.kt +++ b/runtime/src/main/java/io/novafoundation/nova/runtime/storage/source/query/RemoteStorageQueryContext.kt @@ -20,8 +20,9 @@ class RemoteStorageQueryContext( private val subscriptionBuilder: SubstrateSubscriptionBuilder?, chainId: ChainId, at: BlockHash?, - runtime: RuntimeSnapshot -) : BaseStorageQueryContext(chainId, runtime, at) { + runtime: RuntimeSnapshot, + applyStorageDefault: Boolean +) : BaseStorageQueryContext(chainId, runtime, at, applyStorageDefault) { override suspend fun queryKeysByPrefix(prefix: String, at: BlockHash?): List { return bulkRetriever.retrieveAllKeys(socketService, prefix, at) From 678c6cd20456be358c0ef2b528a4f4d637d75ce8 Mon Sep 17 00:00:00 2001 From: antonijzelinskij Date: Wed, 21 Feb 2024 12:58:28 +0100 Subject: [PATCH 3/9] Fixed ed validation message text --- common/src/main/res/values/strings.xml | 7 +++-- .../claimRewards/validations/Declarations.kt | 2 +- ...ationPoolsClaimRewardsValidationFailure.kt | 3 +- .../redeem/validations/Declarations.kt | 2 +- .../NominationPoolsRedeemValidationFailure.kt | 3 +- .../unbond/validations/Declarations.kt | 2 +- .../NominationPoolsUnbondValidationFailure.kt | 3 +- .../add/AddStakingProxyValidationFailure.kt | 3 +- .../delegation/proxy/add/Declarations.kt | 5 ++-- .../delegation/proxy/remove/Declarations.kt | 5 ++-- .../RemoveStakingProxyValidationFailure.kt | 3 +- .../validation/SwapValidationFailure.kt | 3 +- ...tBalanceToPayFeeConsideringEDValidation.kt | 16 ++++++++-- .../tranfers/AssetTransferValidations.kt | 4 ++- .../EnoughBalanceToStayAboveEDValidation.kt | 29 +++++++++++++++---- .../validation/ValidationMessagesFormat.kt | 10 +++++-- .../assets/transfers/validations/Common.kt | 2 +- 17 files changed, 76 insertions(+), 26 deletions(-) diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index d52410cb36..19242a8415 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1,5 +1,10 @@ + + Your balance is too small + + You need to have at least %s to pay this transaction fee and stay above the minimum network balance. Your current balance is: %s. You need to add %s DOT to your balance to perform this operation. + %s units of %s %s for %s @@ -103,8 +108,6 @@ Wiki - You don\'t have enough %s to pay fee and remain above minimal balance - Swap Repeat the operation diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/claimRewards/validations/Declarations.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/claimRewards/validations/Declarations.kt index 4337303a81..9d2d5ac58a 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/claimRewards/validations/Declarations.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/claimRewards/validations/Declarations.kt @@ -33,7 +33,7 @@ private fun NominationPoolsClaimRewardsValidationSystemBuilder.sufficientCommiss fee = { it.fee }, balance = { it.asset.balanceCountedTowardsED() }, chainWithAsset = { ChainWithAsset(it.chain, it.chain.utilityAsset) }, - error = { payload, _ -> NominationPoolsClaimRewardsValidationFailure.ToStayAboveED(payload.chain.utilityAsset) } + error = { payload, error -> NominationPoolsClaimRewardsValidationFailure.ToStayAboveED(payload.chain.utilityAsset, error) } ) } diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/claimRewards/validations/NominationPoolsClaimRewardsValidationFailure.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/claimRewards/validations/NominationPoolsClaimRewardsValidationFailure.kt index e424b9e0f0..9edea53ecc 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/claimRewards/validations/NominationPoolsClaimRewardsValidationFailure.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/claimRewards/validations/NominationPoolsClaimRewardsValidationFailure.kt @@ -15,5 +15,6 @@ sealed class NominationPoolsClaimRewardsValidationFailure { object NonProfitableClaim : NominationPoolsClaimRewardsValidationFailure() - class ToStayAboveED(override val asset: Chain.Asset) : NominationPoolsClaimRewardsValidationFailure(), InsufficientBalanceToStayAboveEDError + class ToStayAboveED(override val asset: Chain.Asset, override val errorModel: InsufficientBalanceToStayAboveEDError.ErrorModel) : + NominationPoolsClaimRewardsValidationFailure(), InsufficientBalanceToStayAboveEDError } diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/redeem/validations/Declarations.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/redeem/validations/Declarations.kt index 9ff505d945..33178c84a7 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/redeem/validations/Declarations.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/redeem/validations/Declarations.kt @@ -40,6 +40,6 @@ private fun NominationPoolsRedeemValidationSystemBuilder.sufficientCommissionBal fee = { it.fee }, balance = { it.asset.balanceCountedTowardsED() }, chainWithAsset = { ChainWithAsset(it.chain, it.chain.utilityAsset) }, - error = { payload, _ -> NominationPoolsRedeemValidationFailure.ToStayAboveED(payload.chain.utilityAsset) } + error = { payload, error -> NominationPoolsRedeemValidationFailure.ToStayAboveED(payload.chain.utilityAsset, error) } ) } diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/redeem/validations/NominationPoolsRedeemValidationFailure.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/redeem/validations/NominationPoolsRedeemValidationFailure.kt index 274a1f5f55..dbbf1b7133 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/redeem/validations/NominationPoolsRedeemValidationFailure.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/redeem/validations/NominationPoolsRedeemValidationFailure.kt @@ -13,5 +13,6 @@ sealed class NominationPoolsRedeemValidationFailure { override val fee: BigDecimal ) : NominationPoolsRedeemValidationFailure(), NotEnoughToPayFeesError - class ToStayAboveED(override val asset: Chain.Asset) : NominationPoolsRedeemValidationFailure(), InsufficientBalanceToStayAboveEDError + class ToStayAboveED(override val asset: Chain.Asset, override val errorModel: InsufficientBalanceToStayAboveEDError.ErrorModel) : + NominationPoolsRedeemValidationFailure(), InsufficientBalanceToStayAboveEDError } diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/unbond/validations/Declarations.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/unbond/validations/Declarations.kt index c866a640da..663692c2d2 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/unbond/validations/Declarations.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/unbond/validations/Declarations.kt @@ -72,6 +72,6 @@ private fun NominationPoolsUnbondValidationSystemBuilder.sufficientCommissionBal fee = { it.fee }, balance = { it.asset.balanceCountedTowardsED() }, chainWithAsset = { ChainWithAsset(it.chain, it.chain.utilityAsset) }, - error = { payload, _ -> NominationPoolsUnbondValidationFailure.ToStayAboveED(payload.chain.utilityAsset) } + error = { payload, error -> NominationPoolsUnbondValidationFailure.ToStayAboveED(payload.chain.utilityAsset, error) } ) } diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/unbond/validations/NominationPoolsUnbondValidationFailure.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/unbond/validations/NominationPoolsUnbondValidationFailure.kt index a16c169de2..2e7e6cce23 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/unbond/validations/NominationPoolsUnbondValidationFailure.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/nominationPools/unbond/validations/NominationPoolsUnbondValidationFailure.kt @@ -28,5 +28,6 @@ sealed class NominationPoolsUnbondValidationFailure { class PoolMemberMaxUnlockingLimitReached(val limit: Int) : NominationPoolsUnbondValidationFailure() - class ToStayAboveED(override val asset: Chain.Asset) : NominationPoolsUnbondValidationFailure(), InsufficientBalanceToStayAboveEDError + class ToStayAboveED(override val asset: Chain.Asset, override val errorModel: InsufficientBalanceToStayAboveEDError.ErrorModel) : + NominationPoolsUnbondValidationFailure(), InsufficientBalanceToStayAboveEDError } diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/add/AddStakingProxyValidationFailure.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/add/AddStakingProxyValidationFailure.kt index ec7cbcc86c..20ab8bae27 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/add/AddStakingProxyValidationFailure.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/add/AddStakingProxyValidationFailure.kt @@ -14,7 +14,8 @@ sealed interface AddStakingProxyValidationFailure { override val fee: BigDecimal ) : AddStakingProxyValidationFailure, NotEnoughToPayFeesError - class NotEnoughToStayAboveED(override val asset: Chain.Asset) : AddStakingProxyValidationFailure, InsufficientBalanceToStayAboveEDError + class NotEnoughToStayAboveED(override val asset: Chain.Asset, override val errorModel: InsufficientBalanceToStayAboveEDError.ErrorModel) : + AddStakingProxyValidationFailure, InsufficientBalanceToStayAboveEDError class NotEnoughBalanceToReserveDeposit( val chainAsset: Chain.Asset, diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/add/Declarations.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/add/Declarations.kt index f51ee4604e..f3be5e518b 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/add/Declarations.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/add/Declarations.kt @@ -35,9 +35,10 @@ fun AddStakingProxyValidationSystemBuilder.sufficientBalanceToStayAboveEd( chainWithAsset = { ChainWithAsset(it.chain, it.asset.token.configuration) }, balance = { it.asset.balanceCountedTowardsED() }, fee = { it.fee }, - error = { payload, _ -> + error = { payload, errorModel -> AddStakingProxyValidationFailure.NotEnoughToStayAboveED( - asset = payload.asset.token.configuration + asset = payload.asset.token.configuration, + errorModel = errorModel ) } ) diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/remove/Declarations.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/remove/Declarations.kt index 7da3fac0d2..c05e700de5 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/remove/Declarations.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/remove/Declarations.kt @@ -18,9 +18,10 @@ fun RemoveStakingProxyValidationSystemBuilder.sufficientBalanceToStayAboveEd( chainWithAsset = { ChainWithAsset(it.chain, it.asset.token.configuration) }, balance = { it.asset.balanceCountedTowardsED() }, fee = { it.fee }, - error = { payload, _ -> + error = { payload, errorModel -> RemoveStakingProxyValidationFailure.NotEnoughToStayAboveED( - asset = payload.asset.token.configuration + asset = payload.asset.token.configuration, + errorModel = errorModel ) } ) diff --git a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/remove/RemoveStakingProxyValidationFailure.kt b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/remove/RemoveStakingProxyValidationFailure.kt index 0a80ac80bb..01fc63d550 100644 --- a/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/remove/RemoveStakingProxyValidationFailure.kt +++ b/feature-staking-impl/src/main/java/io/novafoundation/nova/feature_staking_impl/domain/validations/delegation/proxy/remove/RemoveStakingProxyValidationFailure.kt @@ -13,5 +13,6 @@ sealed interface RemoveStakingProxyValidationFailure { override val fee: BigDecimal ) : RemoveStakingProxyValidationFailure, NotEnoughToPayFeesError - class NotEnoughToStayAboveED(override val asset: Chain.Asset) : RemoveStakingProxyValidationFailure, InsufficientBalanceToStayAboveEDError + class NotEnoughToStayAboveED(override val asset: Chain.Asset, override val errorModel: InsufficientBalanceToStayAboveEDError.ErrorModel) : + RemoveStakingProxyValidationFailure, InsufficientBalanceToStayAboveEDError } diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/domain/validation/SwapValidationFailure.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/domain/validation/SwapValidationFailure.kt index 1c4d228b51..354b76cdf4 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/domain/validation/SwapValidationFailure.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/domain/validation/SwapValidationFailure.kt @@ -27,7 +27,8 @@ sealed class SwapValidationFailure { sealed class NotEnoughFunds : SwapValidationFailure() { - class ToPayFeeAndStayAboveED(override val asset: Chain.Asset) : NotEnoughFunds(), InsufficientBalanceToStayAboveEDError + class ToPayFeeAndStayAboveED(override val asset: Chain.Asset, override val errorModel: InsufficientBalanceToStayAboveEDError.ErrorModel) : + NotEnoughFunds(), InsufficientBalanceToStayAboveEDError object InUsedAsset : NotEnoughFunds() diff --git a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/domain/validation/validations/EnoughNativeAssetBalanceToPayFeeConsideringEDValidation.kt b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/domain/validation/validations/EnoughNativeAssetBalanceToPayFeeConsideringEDValidation.kt index 2dd5ad8e99..2142a9562f 100644 --- a/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/domain/validation/validations/EnoughNativeAssetBalanceToPayFeeConsideringEDValidation.kt +++ b/feature-swap-impl/src/main/java/io/novafoundation/nova/feature_swap_impl/domain/validation/validations/EnoughNativeAssetBalanceToPayFeeConsideringEDValidation.kt @@ -11,6 +11,8 @@ import io.novafoundation.nova.feature_swap_impl.domain.validation.SwapValidation import io.novafoundation.nova.feature_swap_impl.domain.validation.SwapValidationSystemBuilder import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.AssetSourceRegistry import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.existentialDepositInPlanks +import io.novafoundation.nova.feature_wallet_api.domain.model.amountFromPlanks +import io.novafoundation.nova.feature_wallet_api.domain.validation.InsufficientBalanceToStayAboveEDError import io.novafoundation.nova.runtime.ext.isCommissionAsset import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry @@ -25,8 +27,18 @@ class EnoughNativeAssetBalanceToPayFeeConsideringEDValidation( if (feeChainAsset.isCommissionAsset) { val chain = chainRegistry.getChain(feeChainAsset.chainId) val existentialDeposit = assetSourceRegistry.existentialDepositInPlanks(chain, feeChainAsset) - return validOrError(value.feeAsset.balanceCountedTowardsEDInPlanks - value.decimalFee.networkFee.amountByRequestedAccount >= existentialDeposit) { - NotEnoughFunds.ToPayFeeAndStayAboveED(value.feeAsset.token.configuration) + val availableBalance = value.feeAsset.balanceCountedTowardsEDInPlanks + val fee = value.decimalFee.networkFee.amountByRequestedAccount + return validOrError(availableBalance - fee >= existentialDeposit) { + val minRequiredBalance = existentialDeposit + fee + NotEnoughFunds.ToPayFeeAndStayAboveED( + value.feeAsset.token.configuration, + InsufficientBalanceToStayAboveEDError.ErrorModel( + minRequiredBalance = feeChainAsset.amountFromPlanks(minRequiredBalance), + availableBalance = feeChainAsset.amountFromPlanks(availableBalance), + balanceToAdd = feeChainAsset.amountFromPlanks(minRequiredBalance - availableBalance) + ) + ) } } diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/tranfers/AssetTransferValidations.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/tranfers/AssetTransferValidations.kt index 67d31b80ff..70e3f7552c 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/tranfers/AssetTransferValidations.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/data/network/blockhain/assets/tranfers/AssetTransferValidations.kt @@ -47,7 +47,9 @@ sealed class AssetTransferValidationFailure { override val fee: BigDecimal ) : NotEnoughFunds(), NotEnoughToPayFeesError - class ToStayAboveED(override val asset: Chain.Asset) : NotEnoughFunds(), InsufficientBalanceToStayAboveEDError + class ToStayAboveED(override val asset: Chain.Asset, override val errorModel: InsufficientBalanceToStayAboveEDError.ErrorModel) : + NotEnoughFunds(), + InsufficientBalanceToStayAboveEDError class ToPayCrossChainFee( val usedAsset: Chain.Asset, diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/validation/EnoughBalanceToStayAboveEDValidation.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/validation/EnoughBalanceToStayAboveEDValidation.kt index f265c383ff..7310422501 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/validation/EnoughBalanceToStayAboveEDValidation.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/domain/validation/EnoughBalanceToStayAboveEDValidation.kt @@ -6,6 +6,7 @@ import io.novafoundation.nova.common.validation.ValidationSystemBuilder import io.novafoundation.nova.common.validation.validOrError import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.AssetSourceRegistry import io.novafoundation.nova.feature_wallet_api.data.network.blockhain.assets.existentialDeposit +import io.novafoundation.nova.feature_wallet_api.domain.validation.InsufficientBalanceToStayAboveEDError.ErrorModel import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.GenericFee import io.novafoundation.nova.feature_wallet_api.presentation.model.networkFeeByRequestedAccountOrZero import io.novafoundation.nova.runtime.multiNetwork.ChainWithAsset @@ -13,7 +14,15 @@ import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain import java.math.BigDecimal interface InsufficientBalanceToStayAboveEDError { + val asset: Chain.Asset + val errorModel: ErrorModel + + class ErrorModel( + val minRequiredBalance: BigDecimal, + val availableBalance: BigDecimal, + val balanceToAdd: BigDecimal + ) } class EnoughBalanceToStayAboveEDValidation( @@ -21,15 +30,25 @@ class EnoughBalanceToStayAboveEDValidation( private val fee: GenericFeeProducer, private val balance: AmountProducer

, private val chainWithAsset: (P) -> ChainWithAsset, - private val error: (P, BigDecimal) -> E + private val error: (P, ErrorModel) -> E ) : Validation { override suspend fun validate(value: P): ValidationStatus { val chain = chainWithAsset(value).chain val asset = chainWithAsset(value).asset val existentialDeposit = assetSourceRegistry.existentialDeposit(chain, asset) - return validOrError(balance(value) - fee(value).networkFeeByRequestedAccountOrZero >= existentialDeposit) { - error(value, existentialDeposit) + val balance = balance(value) + val fee = fee(value).networkFeeByRequestedAccountOrZero + return validOrError(balance - fee >= existentialDeposit) { + val minRequired = existentialDeposit + fee + error( + value, + ErrorModel( + minRequiredBalance = minRequired, + availableBalance = balance, + balanceToAdd = minRequired - balance + ) + ) } } } @@ -40,7 +59,7 @@ class EnoughTotalToStayAboveEDValidationFactory(private val assetSourceRegistry: fee: GenericFeeProducer, balance: AmountProducer

, chainWithAsset: (P) -> ChainWithAsset, - error: (P, BigDecimal) -> E + error: (P, ErrorModel) -> E ): EnoughBalanceToStayAboveEDValidation { return EnoughBalanceToStayAboveEDValidation( assetSourceRegistry = assetSourceRegistry, @@ -57,7 +76,7 @@ fun EnoughTotalToStayAboveEDValidationFactory.validate( fee: GenericFeeProducer, balance: AmountProducer

, chainWithAsset: (P) -> ChainWithAsset, - error: (P, BigDecimal) -> E + error: (P, ErrorModel) -> E ) { validate(create(fee, balance, chainWithAsset, error)) } diff --git a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/presentation/validation/ValidationMessagesFormat.kt b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/presentation/validation/ValidationMessagesFormat.kt index 1968b35cb7..314fa6f05d 100644 --- a/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/presentation/validation/ValidationMessagesFormat.kt +++ b/feature-wallet-api/src/main/java/io/novafoundation/nova/feature_wallet_api/presentation/validation/ValidationMessagesFormat.kt @@ -4,10 +4,16 @@ import io.novafoundation.nova.common.base.TitleAndMessage import io.novafoundation.nova.common.resources.ResourceManager import io.novafoundation.nova.feature_wallet_api.R import io.novafoundation.nova.feature_wallet_api.domain.validation.InsufficientBalanceToStayAboveEDError +import io.novafoundation.nova.feature_wallet_api.presentation.formatters.formatTokenAmount fun handleInsufficientBalanceCommission(failure: InsufficientBalanceToStayAboveEDError, resourceManager: ResourceManager): TitleAndMessage { - return resourceManager.getString(R.string.common_not_enough_funds_title) to - resourceManager.getString(R.string.wallet_send_insufficient_balance_commission, failure.asset.symbol) + return resourceManager.getString(R.string.common_too_small_balance_title) to + resourceManager.getString( + R.string.wallet_send_insufficient_balance_commission, + failure.errorModel.minRequiredBalance.formatTokenAmount(failure.asset), + failure.errorModel.availableBalance.formatTokenAmount(failure.asset), + failure.errorModel.balanceToAdd.formatTokenAmount(failure.asset), + ) } fun handleNonPositiveAmount(resourceManager: ResourceManager): TitleAndMessage { diff --git a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/validations/Common.kt b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/validations/Common.kt index a36a1c0b83..a8d57920dd 100644 --- a/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/validations/Common.kt +++ b/feature-wallet-impl/src/main/java/io/novafoundation/nova/feature_wallet_impl/data/network/blockchain/assets/transfers/validations/Common.kt @@ -59,7 +59,7 @@ fun AssetTransfersValidationSystemBuilder.sufficientCommissionBalanceToStayAbove fee = { it.originFee.networkFeePart() }, balance = { it.originCommissionAsset.balanceCountedTowardsED() }, chainWithAsset = { ChainWithAsset(it.transfer.originChain, it.transfer.originChain.commissionAsset) }, - error = { payload, _ -> AssetTransferValidationFailure.NotEnoughFunds.ToStayAboveED(payload.transfer.originChain.commissionAsset) } + error = { payload, error -> AssetTransferValidationFailure.NotEnoughFunds.ToStayAboveED(payload.transfer.originChain.commissionAsset, error) } ) } From 5222661d9453038fad6d4cfb7b7d9eac08072f91 Mon Sep 17 00:00:00 2001 From: valentunn <70131744+valentunn@users.noreply.github.com> Date: Wed, 21 Feb 2024 15:03:58 +0300 Subject: [PATCH 4/9] Allow to switch to landsape in dapp browser & fix layouts for landpsape (#1400) --- app/src/main/AndroidManifest.xml | 1 + .../browser/main/DAppBrowserFragment.kt | 5 + .../layout/bottom_sheet_confirm_authorize.xml | 183 +++++++++--------- .../bottom_sheet_confirm_dapp_action.xml | 4 +- 4 files changed, 104 insertions(+), 89 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 639c1427de..152608b647 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,6 +41,7 @@ android:exported="true" android:launchMode="singleTask" android:screenOrientation="portrait" + android:configChanges="orientation|screenSize" android:theme="@style/Theme.NovaFoundation.Nova" android:windowSoftInputMode="adjustResize"> diff --git a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/presentation/browser/main/DAppBrowserFragment.kt b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/presentation/browser/main/DAppBrowserFragment.kt index 9e55c107de..69b76aa99a 100644 --- a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/presentation/browser/main/DAppBrowserFragment.kt +++ b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/presentation/browser/main/DAppBrowserFragment.kt @@ -1,6 +1,7 @@ package io.novafoundation.nova.feature_dapp_impl.presentation.browser.main import android.content.Intent +import android.content.pm.ActivityInfo import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -92,6 +93,8 @@ class DAppBrowserFragment : BaseFragment(), OptionsBottomS dappBrowserRefresh.setOnClickListener { refreshClicked() } dappBrowserMore.setOnClickListener { moreClicked() } + + requireActivity().requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR } override fun onDestroyView() { @@ -99,6 +102,8 @@ class DAppBrowserFragment : BaseFragment(), OptionsBottomS dappBrowserWebView.uninjectWeb3() + requireActivity().requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT + webViewHolder.release() } diff --git a/feature-external-sign-api/src/main/res/layout/bottom_sheet_confirm_authorize.xml b/feature-external-sign-api/src/main/res/layout/bottom_sheet_confirm_authorize.xml index 9539495954..dc3fea418a 100644 --- a/feature-external-sign-api/src/main/res/layout/bottom_sheet_confirm_authorize.xml +++ b/feature-external-sign-api/src/main/res/layout/bottom_sheet_confirm_authorize.xml @@ -1,100 +1,107 @@ - - - - + tools:background="@color/bottom_sheet_background"> - + - + - + - + - - \ No newline at end of file + + + + + + + \ No newline at end of file diff --git a/feature-external-sign-api/src/main/res/layout/bottom_sheet_confirm_dapp_action.xml b/feature-external-sign-api/src/main/res/layout/bottom_sheet_confirm_dapp_action.xml index 42921908c4..9e2b99c5b7 100644 --- a/feature-external-sign-api/src/main/res/layout/bottom_sheet_confirm_dapp_action.xml +++ b/feature-external-sign-api/src/main/res/layout/bottom_sheet_confirm_dapp_action.xml @@ -15,13 +15,15 @@ Date: Wed, 21 Feb 2024 13:11:12 +0100 Subject: [PATCH 5/9] Localize resources --- common/src/main/res/values-ru/strings.xml | 3 ++- common/src/main/res/values/strings.xml | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/res/values-ru/strings.xml b/common/src/main/res/values-ru/strings.xml index 6a60331e1d..784c1396bb 100644 --- a/common/src/main/res/values-ru/strings.xml +++ b/common/src/main/res/values-ru/strings.xml @@ -372,6 +372,7 @@ Оставшееся время Заголовок Открыть Настройки + Ваш баланс слишком мал Всего ID транзакции Транзакция отправлена @@ -1372,7 +1373,7 @@ Перевод удалит аккаунт Ваша учетная запись будет удалена из блокчейна после перевода, потому что общий баланс становится ниже минимального. Остаток также будет переведен получателю. Из сети - У вас недостаточно %s, чтобы оплатить комиссию и остаться выше минимального баланса + Вам необходимо иметь как минимум %s , чтобы оплатить комиссию за транзакцию и остаться выше минимального баланса. Ваш текущий баланс: %s . Для выполнения этой операции вам необходимо добавить %s к своему балансу. Себе Внутри сети Следующий адрес: %s как известно, используется для фишинга, поэтому мы не рекомендуем отправлять токены на этот адрес. Вы все равно хотите продолжить? diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 19242a8415..242c6d9cd6 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -2,8 +2,7 @@ Your balance is too small - - You need to have at least %s to pay this transaction fee and stay above the minimum network balance. Your current balance is: %s. You need to add %s DOT to your balance to perform this operation. + You need to have at least %s to pay this transaction fee and stay above the minimum network balance. Your current balance is: %s. You need to add %s to your balance to perform this operation. %s units of %s From 9356670888ba9381e1f1b1c755024afc30fd8616 Mon Sep 17 00:00:00 2001 From: antonijzelinskij Date: Wed, 21 Feb 2024 13:29:05 +0100 Subject: [PATCH 6/9] Bump version --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7d822eb5e3..537f5f7ebf 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ buildscript { ext { // App version - versionName = '7.9.1' - versionCode = 118 + versionName = '7.9.2' + versionCode = 119 applicationId = "io.novafoundation.nova" releaseApplicationSuffix = "market" From f547e91c8adf2ea7e1d3dffc239ff4f2dfb6336b Mon Sep 17 00:00:00 2001 From: Stepan Lavrentev <40560660+stepanLav@users.noreply.github.com> Date: Wed, 21 Feb 2024 15:30:13 +0300 Subject: [PATCH 7/9] use local sdk to link ndk (#1402) --- .github/workflows/install/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/install/action.yml b/.github/workflows/install/action.yml index 6bfb2ee262..90e5cea154 100644 --- a/.github/workflows/install/action.yml +++ b/.github/workflows/install/action.yml @@ -15,6 +15,7 @@ runs: with: ndk-version: 'r26b' local-cache: true + link-to-sdk: true - name: 🦀 Install Rust run: | From 59a90e814f11c25197e7d710587c77ae752f3356 Mon Sep 17 00:00:00 2001 From: valentunn <70131744+valentunn@users.noreply.github.com> Date: Wed, 21 Feb 2024 17:09:19 +0300 Subject: [PATCH 8/9] Hotifx/console crashes (#1405) * Fix - race condition when setting initial state of send screen in cross-in mode * Fix - failing error type check when rejecting phishing with Metamask --- .../presentation/send/amount/SelectSendViewModel.kt | 8 ++++++-- .../web3/metamask/states/PhishingDetectedMetamaskState.kt | 5 +++++ .../polkadotJs/states/PhishingDetectedPolkadotJsState.kt | 7 ++++++- .../web3/states/PhishingDetectedState.kt | 6 ++++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/presentation/send/amount/SelectSendViewModel.kt b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/presentation/send/amount/SelectSendViewModel.kt index 119975a614..f54e78249d 100644 --- a/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/presentation/send/amount/SelectSendViewModel.kt +++ b/feature-assets/src/main/java/io/novafoundation/nova/feature_assets/presentation/send/amount/SelectSendViewModel.kt @@ -49,9 +49,9 @@ import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.SimpleGe import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.awaitDecimalFee import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.awaitOptionalDecimalFee import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.create +import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.createGeneric import io.novafoundation.nova.feature_wallet_api.presentation.model.AssetPayload import io.novafoundation.nova.feature_wallet_api.presentation.model.mapAmountToAmountModel -import io.novafoundation.nova.feature_wallet_api.presentation.mixin.fee.createGeneric import io.novafoundation.nova.runtime.multiNetwork.ChainRegistry import io.novafoundation.nova.runtime.multiNetwork.ChainWithAsset import io.novafoundation.nova.runtime.multiNetwork.chain.model.Chain @@ -284,7 +284,11 @@ class SelectSendViewModel( is SendPayload.SpecifiedDestination -> { val destination = chainRegistry.chainWithAsset(payload.destination.chainId, payload.destination.chainAssetId) - val origin = availableCrossChainDestinations.first().first().chainWithAsset + + // When destination chain is specified we expect at least one destination to be available + val availableCrossChainDestinations = availableCrossChainDestinations.first { it.isNotEmpty() } + val origin = availableCrossChainDestinations.first().chainWithAsset + destinationChainWithAsset.emit(destination) originChainWithAsset.emit(origin) } diff --git a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/metamask/states/PhishingDetectedMetamaskState.kt b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/metamask/states/PhishingDetectedMetamaskState.kt index 60caed9867..d4a162265c 100644 --- a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/metamask/states/PhishingDetectedMetamaskState.kt +++ b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/metamask/states/PhishingDetectedMetamaskState.kt @@ -1,6 +1,7 @@ package io.novafoundation.nova.feature_dapp_impl.web3.metamask.states import io.novafoundation.nova.feature_dapp_impl.web3.metamask.model.MetamaskChain +import io.novafoundation.nova.feature_dapp_impl.web3.metamask.transport.MetamaskError import io.novafoundation.nova.feature_dapp_impl.web3.metamask.transport.MetamaskTransportRequest import io.novafoundation.nova.feature_dapp_impl.web3.states.PhishingDetectedState @@ -8,4 +9,8 @@ class PhishingDetectedMetamaskState(override val chain: MetamaskChain) : PhishingDetectedState, MetamaskState>(), MetamaskState { override val selectedAccountAddress: String? = null + + override fun rejectError(): Throwable { + return MetamaskError.Rejected() + } } diff --git a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/states/PhishingDetectedPolkadotJsState.kt b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/states/PhishingDetectedPolkadotJsState.kt index 4678e95bd9..bd5bcaed1a 100644 --- a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/states/PhishingDetectedPolkadotJsState.kt +++ b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/polkadotJs/states/PhishingDetectedPolkadotJsState.kt @@ -3,4 +3,9 @@ package io.novafoundation.nova.feature_dapp_impl.web3.polkadotJs.states import io.novafoundation.nova.feature_dapp_impl.web3.polkadotJs.PolkadotJsTransportRequest import io.novafoundation.nova.feature_dapp_impl.web3.states.PhishingDetectedState -class PhishingDetectedPolkadotJsState : PhishingDetectedState, PolkadotJsState>(), PolkadotJsState +class PhishingDetectedPolkadotJsState : PhishingDetectedState, PolkadotJsState>(), PolkadotJsState { + + override fun rejectError(): Throwable { + return IllegalAccessException("Phishing detected!") + } +} diff --git a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/states/PhishingDetectedState.kt b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/states/PhishingDetectedState.kt index 9f6ab9c785..5aa3e0b081 100644 --- a/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/states/PhishingDetectedState.kt +++ b/feature-dapp-impl/src/main/java/io/novafoundation/nova/feature_dapp_impl/web3/states/PhishingDetectedState.kt @@ -5,10 +5,12 @@ import io.novafoundation.nova.feature_dapp_impl.web3.states.Web3ExtensionStateMa import io.novafoundation.nova.feature_dapp_impl.web3.states.Web3ExtensionStateMachine.State import io.novafoundation.nova.feature_dapp_impl.web3.states.Web3ExtensionStateMachine.StateMachineTransition -open class PhishingDetectedState, S> : State { +abstract class PhishingDetectedState, S> : State { + + abstract fun rejectError(): Throwable override suspend fun acceptRequest(request: R, transition: StateMachineTransition) { - request.reject(IllegalStateException("Phishing detected!")) + request.reject(rejectError()) } override suspend fun acceptEvent(event: ExternalEvent, transition: StateMachineTransition) { From 47c8f7fb67d52d4a12c769fd1de367b564638141 Mon Sep 17 00:00:00 2001 From: antonijzelinskij Date: Wed, 21 Feb 2024 15:26:18 +0100 Subject: [PATCH 9/9] Change version code --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 537f5f7ebf..cb1edb4371 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { // App version versionName = '7.9.2' - versionCode = 119 + versionCode = 120 applicationId = "io.novafoundation.nova" releaseApplicationSuffix = "market"