Skip to content

Commit

Permalink
Merge pull request #984 from novasamatech/develop
Browse files Browse the repository at this point in the history
7.9.0 Hydra swaps support
  • Loading branch information
ERussel committed Feb 19, 2024
2 parents fb090be + fb72bff commit b18ba50
Show file tree
Hide file tree
Showing 117 changed files with 7,635 additions and 445 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/deploy_staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,20 +134,20 @@ jobs:

- name: Upload artifact to Firebase with Dev Id
if: ${{ github.event.inputs.config == 'Dev' }}
uses: wzieba/Firebase-Distribution-Github-Action@v1
uses: wzieba/Firebase-Distribution-Github-Action@v1.7.0
with:
appId: ${{ secrets.FIREBASE_APP_ID }}
token: ${{ secrets.FIREBASE_TOKEN }}
serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
groups: ${{ github.event.inputs.userGroup }}
file: export/novawallet.ipa
releaseNotes: ${{ github.event.head_commit.message }}

- name: Upload artifact to Firebase with Staging Id
if: ${{ github.event.inputs.config == 'Staging' }}
uses: wzieba/Firebase-Distribution-Github-Action@v1
uses: wzieba/Firebase-Distribution-Github-Action@v1.7.0
with:
appId: ${{ secrets.FIREBASE_STAGING_APP_ID }}
token: ${{ secrets.FIREBASE_TOKEN }}
serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
groups: ${{ github.event.inputs.userGroup }}
file: export/novawallet.ipa
releaseNotes: ${{ github.event.head_commit.message }}
4 changes: 2 additions & 2 deletions .github/workflows/push_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@ jobs:
path: export

- name: Upload artifact to Firebase App Distribution
uses: wzieba/Firebase-Distribution-Github-Action@v1
uses: wzieba/Firebase-Distribution-Github-Action@v1.7.0
with:
appId: ${{ secrets.FIREBASE_APP_ID }}
token: ${{ secrets.FIREBASE_TOKEN }}
serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
groups: dev-team
file: export/novawallet.ipa
releaseNotes: ${{ github.event.head_commit.message }}
8 changes: 5 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ platform :ios, '13.0'
abstract_target 'novawalletAll' do
use_frameworks!

pod 'SubstrateSdk', :git => 'https://github.com/nova-wallet/substrate-sdk-ios.git', :tag => '1.16.1'
pod 'SubstrateSdk', :git => 'https://github.com/nova-wallet/substrate-sdk-ios.git', :tag => '1.17.0'
pod 'SwiftLint'
pod 'R.swift', :inhibit_warnings => true
pod 'SoraKeystore', '~> 1.0.0'
Expand All @@ -26,20 +26,22 @@ abstract_target 'novawalletAll' do
pod 'EthereumSignTypedDataUtil', :git => 'https://github.com/ERussel/EthereumSignTypedDataUtil.git', :tag => '0.1.3'
pod 'SwiftAlgorithms', '~> 1.0.0'
pod 'ZMarkupParser', '= 1.6.1'
pod 'HydraMath', :git => 'https://github.com/novasamatech/hydra-math-swift.git', :tag => '0.1'

target 'novawalletTests' do
inherit! :search_paths

pod 'Cuckoo'
pod 'SubstrateSdk', :git => 'https://github.com/nova-wallet/substrate-sdk-ios.git', :tag => '1.16.1'
pod 'SubstrateSdk', :git => 'https://github.com/nova-wallet/substrate-sdk-ios.git', :tag => '1.17.0'
pod 'SoraFoundation', :git => 'https://github.com/ERussel/Foundation-iOS.git', :tag => '1.1.0'
pod 'R.swift', :inhibit_warnings => true
pod 'FireMock', :inhibit_warnings => true
pod 'SoraKeystore', '~> 1.0.0'
pod 'RobinHood', '~> 2.6.0'
pod 'Sourcery', '~> 1.4'
pod 'Starscream', :git => 'https://github.com/ERussel/Starscream.git', :tag => '4.0.8'

pod 'HydraMath', :git => 'https://github.com/novasamatech/hydra-math-swift.git', :tag => '0.1'

end

target 'novawalletIntegrationTests'
Expand Down
21 changes: 15 additions & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ PODS:
- BigInt (~> 5.0)
- CryptoSwift (~> 1.4)
- FireMock (3.1)
- HydraMath (0.1.0)
- IrohaCrypto/BIP39 (0.9.0):
- IrohaCrypto/Common
- IrohaCrypto/blake2 (0.9.0)
Expand Down Expand Up @@ -94,7 +95,7 @@ PODS:
- SoraUI/Skrull (1.12.0)
- Sourcery (1.4.1)
- Starscream (4.0.8)
- SubstrateSdk (1.16.1):
- SubstrateSdk (1.17.0):
- BigInt (~> 5.0)
- IrohaCrypto/ed25519 (~> 0.9.0)
- IrohaCrypto/Scrypt (~> 0.9.0)
Expand Down Expand Up @@ -152,6 +153,7 @@ DEPENDENCIES:
- Cuckoo
- EthereumSignTypedDataUtil (from `https://github.com/ERussel/EthereumSignTypedDataUtil.git`, tag `0.1.3`)
- FireMock
- HydraMath (from `https://github.com/novasamatech/hydra-math-swift.git`, tag `0.1`)
- Kingfisher
- R.swift
- ReachabilitySwift
Expand All @@ -162,7 +164,7 @@ DEPENDENCIES:
- SoraUI (from `https://github.com/ERussel/UIkit-iOS.git`, tag `1.12.0`)
- Sourcery (~> 1.4)
- Starscream (from `https://github.com/ERussel/Starscream.git`, tag `4.0.8`)
- SubstrateSdk (from `https://github.com/nova-wallet/substrate-sdk-ios.git`, tag `1.16.1`)
- SubstrateSdk (from `https://github.com/nova-wallet/substrate-sdk-ios.git`, tag `1.17.0`)
- SVGKit (from `https://github.com/SVGKit/SVGKit.git`, tag `3.0.0`)
- SwiftAlgorithms (~> 1.0.0)
- SwiftFormat/CLI (~> 0.47.13)
Expand Down Expand Up @@ -209,6 +211,9 @@ EXTERNAL SOURCES:
EthereumSignTypedDataUtil:
:git: https://github.com/ERussel/EthereumSignTypedDataUtil.git
:tag: 0.1.3
HydraMath:
:git: https://github.com/novasamatech/hydra-math-swift.git
:tag: '0.1'
SoraFoundation:
:git: https://github.com/ERussel/Foundation-iOS.git
:tag: 1.1.0
Expand All @@ -220,7 +225,7 @@ EXTERNAL SOURCES:
:tag: 4.0.8
SubstrateSdk:
:git: https://github.com/nova-wallet/substrate-sdk-ios.git
:tag: 1.16.1
:tag: 1.17.0
SVGKit:
:git: https://github.com/SVGKit/SVGKit.git
:tag: 3.0.0
Expand All @@ -240,6 +245,9 @@ CHECKOUT OPTIONS:
EthereumSignTypedDataUtil:
:git: https://github.com/ERussel/EthereumSignTypedDataUtil.git
:tag: 0.1.3
HydraMath:
:git: https://github.com/novasamatech/hydra-math-swift.git
:tag: '0.1'
SoraFoundation:
:git: https://github.com/ERussel/Foundation-iOS.git
:tag: 1.1.0
Expand All @@ -251,7 +259,7 @@ CHECKOUT OPTIONS:
:tag: 4.0.8
SubstrateSdk:
:git: https://github.com/nova-wallet/substrate-sdk-ios.git
:tag: 1.16.1
:tag: 1.17.0
SVGKit:
:git: https://github.com/SVGKit/SVGKit.git
:tag: 3.0.0
Expand All @@ -273,6 +281,7 @@ SPEC CHECKSUMS:
Cuckoo: 9e258d68137c411df47c6390f72901d5276b4f03
EthereumSignTypedDataUtil: ae4e33b21e51ee046a86a65b02843090b8bbd3f9
FireMock: 3eed872059c12f94855413347da83b9d6d1a6fac
HydraMath: 9d3eed16500b480673599494e85d60060b44a5a8
IrohaCrypto: 6be75a4268cd1f5cec4231c6d3f95cb03f723fd3
keccak.c: 859583afdaccb4e4fcc0f0096064d101580313f4
Kingfisher: 6c3df386db71d82c0817a429d2c9421a77396529
Expand All @@ -288,7 +297,7 @@ SPEC CHECKSUMS:
SoraUI: a3c1163a95c9dd1b6758ca90eb5bda2f4639d634
Sourcery: db66600e8b285c427701821598d07cf3c7e6c476
Starscream: b676ee89781677a2d8d36029a78c970710e2d3eb
SubstrateSdk: 15ba30c832d76d336c4986acb3a57b10065ff8ab
SubstrateSdk: a67e5c58fc9a7b31f24e1dc43e7dd44568018c83
SVGKit: 132b010efbf57ec345309fe4a7f627c0a40c5d63
SwiftAlgorithms: 38dda4731d19027fdeee1125f973111bf3386b53
SwiftFormat: 73573b89257437c550b03d934889725fbf8f75e5
Expand All @@ -303,6 +312,6 @@ SPEC CHECKSUMS:
ZMarkupParser: a92d31ba40695b790f1da5fec98c3d4505341aff
ZNSTextAttachment: 1ddd53660a8d3c42dbb716bf6866ffce22c44181

PODFILE CHECKSUM: 671c8a712df1c5c8a1250876ca0f0a31d3646675
PODFILE CHECKSUM: aa3fb53d81d4ec88f1cc632534e55682e7632451

COCOAPODS: 1.13.0

0 comments on commit b18ba50

Please sign in to comment.