Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Feature/3913 add chia transaction builder #381

Merged
merged 62 commits into from
Aug 15, 2023

Conversation

skibinalexander
Copy link
Contributor

@skibinalexander skibinalexander commented Aug 2, 2023

Реализация сборщика транзакций + сетевой слой. Пока еще тестирую поэтому в драфте

…/3913-add-chia-transaction-builder

# Conflicts:
#	BlockchainSdk.xcodeproj/project.pbxproj
# Conflicts:
#	BlockchainSdk/Common/Blockchain+AllCases.swift
#	BlockchainSdk/Common/Blockchain.swift
#	BlockchainSdk/Extensions/TWCoin+.swift
#	BlockchainSdkExample/BlockchainSdkExampleViewModel.swift
…/3913-add-chia-transaction-builder

# Conflicts:
#	BlockchainSdk/Common/Blockchain+AllCases.swift
#	BlockchainSdk/Common/Blockchain.swift
#	BlockchainSdk/WalletManagers/Chia/ChiaAddressService.swift
…/3913-add-chia-transaction-builder

# Conflicts:
#	BlockchainSdk.xcodeproj/project.pbxproj
#	BlockchainSdk/Common/Derivations/DerivationConfigV1.swift
#	BlockchainSdk/Common/Derivations/DerivationConfigV2.swift
#	BlockchainSdk/Common/Derivations/DerivationConfigV3.swift
#	BlockchainSdk/Extensions/BlockchainUtils/Bech32.swift
#	BlockchainSdk/WalletManagers/Chia/ChiaAddressService.swift
#	BlockchainSdk/WalletManagers/Chia/Common/ChiaConstant.swift
#	BlockchainSdk/WalletManagers/Chia/Common/ClvmProgram.swift
…/3913-add-chia-transaction-builder

# Conflicts:
#	BlockchainSdk.xcodeproj/project.pbxproj
Podfile Outdated
pod 'TangemSdk', :git => 'https://github.com/Tangem/tangem-sdk-ios.git', :tag => 'develop-259'
#pod 'TangemSdk', :path => '../tangem-sdk-ios'
pod 'TangemSdk', :git => 'https://github.com/Tangem/tangem-sdk-ios.git', :tag => 'develop'
# pod 'TangemSdk', :path => '../tangem-sdk-ios'
Copy link
Contributor

Choose a reason for hiding this comment

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

тут получается лишнее изменение )

Copy link
Contributor Author

Choose a reason for hiding this comment

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

тут получается лишнее изменение )

Жду еще от @tureck1y тег в TangemSdk можно пока пропустить

Copy link
Contributor

Choose a reason for hiding this comment

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

я просто 7 строку) # мы же теперь всегда в плотную держим )

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Все так, Саня обещал ругаться )

Copy link
Collaborator

Choose a reason for hiding this comment

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

да даже не важно как мы держим, эта строка не должна меняться) Если всем удобнее держать не вплотную, давайте так

Copy link
Contributor

Choose a reason for hiding this comment

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

Да давайте в плотную, что бы точно одинаково было)

Podfile Outdated Show resolved Hide resolved
m3g0byt3
m3g0byt3 previously approved these changes Aug 14, 2023
tureck1y
tureck1y previously approved these changes Aug 15, 2023
Balashov152
Balashov152 previously approved these changes Aug 15, 2023
@skibinalexander skibinalexander merged commit 7730200 into develop Aug 15, 2023
1 check passed
@skibinalexander skibinalexander deleted the feature/3913-add-chia-transaction-builder branch August 15, 2023 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants