Skip to content

Commit

Permalink
Merge pull request #53 from novasamatech/feature/support-v15
Browse files Browse the repository at this point in the history
Support v15 runtime metadata
  • Loading branch information
ERussel authored Jun 11, 2024
2 parents 501b784 + 36dd8ab commit 2325f68
Show file tree
Hide file tree
Showing 48 changed files with 1,051 additions and 500 deletions.
3 changes: 2 additions & 1 deletion Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use_frameworks!

target 'SubstrateSdkExample' do
pod 'SubstrateSdk', :path => '../'
pod 'Operation-iOS', :git => 'https://github.com/novasamatech/Operation-iOS.git', :tag => '2.0.1'
pod 'Starscream', :git => 'https://github.com/ERussel/Starscream.git', :branch => 'feature/without-origin'
pod 'SwiftLint'

Expand All @@ -16,7 +17,7 @@ post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['ENABLE_BITCODE'] = 'NO'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '11.0'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '14.0'
end
end

Expand Down
22 changes: 14 additions & 8 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@ PODS:
- IrohaCrypto/blake2
- IrohaCrypto/Common
- keccak.c (0.1.3)
- Operation-iOS (2.0.1)
- ReachabilitySwift (5.0.0)
- RobinHood (2.6.0)
- scrypt.c (0.1.1)
- secp256k1.c (0.1.2)
- Starscream (4.0.4)
- SubstrateSdk (1.16.1):
- SubstrateSdk (3.0.0):
- BigInt (~> 5.0)
- IrohaCrypto/ed25519 (~> 0.9.0)
- IrohaCrypto/Scrypt (~> 0.9.0)
- IrohaCrypto/secp256k1 (~> 0.9.0)
- IrohaCrypto/sr25519 (~> 0.9.0)
- IrohaCrypto/ss58 (~> 0.9.0)
- keccak.c (~> 0.1.0)
- Operation-iOS (~> 2.0.1)
- ReachabilitySwift (~> 5.0)
- RobinHood (~> 2.6.0)
- Starscream
- TweetNacl (~> 1.0.0)
- xxHash-Swift (~> 1.0.0)
Expand All @@ -43,6 +43,7 @@ PODS:
- xxHash-Swift (1.0.13)

DEPENDENCIES:
- Operation-iOS (from `https://github.com/novasamatech/Operation-iOS.git`, tag `2.0.1`)
- Starscream (from `https://github.com/ERussel/Starscream.git`, branch `feature/without-origin`)
- SubstrateSdk (from `../`)
- SwiftLint
Expand All @@ -53,21 +54,26 @@ SPEC REPOS:
- IrohaCrypto
- keccak.c
- ReachabilitySwift
- RobinHood
- scrypt.c
- secp256k1.c
- SwiftLint
- TweetNacl
- xxHash-Swift

EXTERNAL SOURCES:
Operation-iOS:
:git: https://github.com/novasamatech/Operation-iOS.git
:tag: 2.0.1
Starscream:
:branch: feature/without-origin
:git: https://github.com/ERussel/Starscream.git
SubstrateSdk:
:path: "../"

CHECKOUT OPTIONS:
Operation-iOS:
:git: https://github.com/novasamatech/Operation-iOS.git
:tag: 2.0.1
Starscream:
:commit: b9e69390d96e71427463469f47cdafb8c0db1b21
:git: https://github.com/ERussel/Starscream.git
Expand All @@ -76,16 +82,16 @@ SPEC CHECKSUMS:
BigInt: f668a80089607f521586bbe29513d708491ef2f7
IrohaCrypto: 6be75a4268cd1f5cec4231c6d3f95cb03f723fd3
keccak.c: 859583afdaccb4e4fcc0f0096064d101580313f4
Operation-iOS: 5f1c2cb82bf10f46b92faefc92d5821550b14eb5
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
RobinHood: f8628c9841dc1a082f4565247f6b598e82157b28
scrypt.c: b42ae06183251329d2b2c620c226fb541a4a3592
secp256k1.c: db47b726585d80f027423682eb369729e61b3b20
Starscream: 5178aed56b316f13fa3bc55694e583d35dd414d9
SubstrateSdk: 15ba30c832d76d336c4986acb3a57b10065ff8ab
SubstrateSdk: 04c2fadf64483ebba8ec78999267305270017541
SwiftLint: 4fa9579c63416865179bc416f0a92d55f009600d
TweetNacl: 3abf4d1d2082b0114e7a67410e300892448951e6
xxHash-Swift: 30bd6a7507b3b7348a277c49b1cb6346c2905ec7

PODFILE CHECKSUM: 127a69a1fa3e3f206edb8f13a28659b4816f7d4c
PODFILE CHECKSUM: 157538d05d1fb55023eefa284e3e1237dbd4e2e6

COCOAPODS: 1.13.0
COCOAPODS: 1.15.2
16 changes: 14 additions & 2 deletions Example/SubstrateSdk.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
0CE840E92BFBFB60003C2B7A /* polkadot-v15 in Resources */ = {isa = PBXBuildFile; fileRef = 0CE840E82BFBFB60003C2B7A /* polkadot-v15 */; };
0CE840FA2BFCA0F3003C2B7A /* RuntimeMetadataV15Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CE840F92BFCA0F3003C2B7A /* RuntimeMetadataV15Tests.swift */; };
0CE92A6F2B2C5906009A21E9 /* kusama-v14-metadata-latest in Resources */ = {isa = PBXBuildFile; fileRef = 0CE92A6E2B2C5906009A21E9 /* kusama-v14-metadata-latest */; };
6976AE87036D532DDD11B3D9 /* Pods_SubstrateSdkExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00060C8DD6432907D485E325 /* Pods_SubstrateSdkExample.framework */; };
841D528A25C4A11900DFA15B /* RegexParserTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 841D528925C4A11900DFA15B /* RegexParserTests.swift */; };
Expand Down Expand Up @@ -137,6 +139,8 @@

/* Begin PBXFileReference section */
00060C8DD6432907D485E325 /* Pods_SubstrateSdkExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SubstrateSdkExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
0CE840E82BFBFB60003C2B7A /* polkadot-v15 */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "polkadot-v15"; sourceTree = "<group>"; };
0CE840F92BFCA0F3003C2B7A /* RuntimeMetadataV15Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuntimeMetadataV15Tests.swift; sourceTree = "<group>"; };
0CE92A6E2B2C5906009A21E9 /* kusama-v14-metadata-latest */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "kusama-v14-metadata-latest"; sourceTree = "<group>"; };
27A1BEB05AA8335CF4053A81 /* Pods_SubstrateSdkTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_SubstrateSdkTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2E305CB3E5589CF7DC3BD962 /* Pods-SubstrateSdkTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SubstrateSdkTests.debug.xcconfig"; path = "Target Support Files/Pods-SubstrateSdkTests/Pods-SubstrateSdkTests.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -361,6 +365,7 @@
84F439BB25DBF8D600AEDA56 /* TypeRegistryNetworkValidationTests.swift */,
84F43A2325DC124600AEDA56 /* TypeRegistryCatalogTests.swift */,
84AF376C271A3AE5007408D6 /* RuntimeMetadataV14Tests.swift */,
0CE840F92BFCA0F3003C2B7A /* RuntimeMetadataV15Tests.swift */,
84AF3779271DA9A2007408D6 /* ScaleRegistryTests.swift */,
);
path = Runtime;
Expand All @@ -369,6 +374,7 @@
8429C7FB25C432DA0086D7F6 /* Runtime */ = {
isa = PBXGroup;
children = (
0CE840E82BFBFB60003C2B7A /* polkadot-v15 */,
0CE92A6E2B2C5906009A21E9 /* kusama-v14-metadata-latest */,
84AF3766271A3A8D007408D6 /* kusama-v14-metadata */,
84AF3767271A3A8D007408D6 /* polkadot-v14-metadata */,
Expand Down Expand Up @@ -757,6 +763,7 @@
84A0DE3124DBF49400F436A8 /* keystore-ed25519.json in Resources */,
849CFADE27394E5D0096D201 /* keystore-ethereum-int-version.json in Resources */,
AE4B521826CE127200A66D2C /* BIP32HDKD.json in Resources */,
0CE840E92BFBFB60003C2B7A /* polkadot-v15 in Resources */,
84DEE7062798116700B9A39E /* statemine.json in Resources */,
84F4394225DBAAA200AEDA56 /* test-metadata in Resources */,
8429C81D25C434E70086D7F6 /* kusama.json in Resources */,
Expand Down Expand Up @@ -821,8 +828,8 @@
"${PODS_ROOT}/Target Support Files/Pods-SubstrateSdkExample/Pods-SubstrateSdkExample-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/BigInt/BigInt.framework",
"${BUILT_PRODUCTS_DIR}/IrohaCrypto/IrohaCrypto.framework",
"${BUILT_PRODUCTS_DIR}/Operation-iOS/Operation_iOS.framework",
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
"${BUILT_PRODUCTS_DIR}/RobinHood/RobinHood.framework",
"${BUILT_PRODUCTS_DIR}/Starscream/Starscream.framework",
"${BUILT_PRODUCTS_DIR}/SubstrateSdk/SubstrateSdk.framework",
"${BUILT_PRODUCTS_DIR}/TweetNacl/TweetNacl.framework",
Expand All @@ -835,8 +842,8 @@
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BigInt.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IrohaCrypto.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Operation_iOS.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RobinHood.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Starscream.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SubstrateSdk.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TweetNacl.framework",
Expand Down Expand Up @@ -910,6 +917,7 @@
849E0AA825C96AD600B33506 /* CompactNodeFactoryTests.swift in Sources */,
849E0B3025CBD1CC00B33506 /* TypeRegistryCatalogValidationTests.swift in Sources */,
84DA3B4324C8CE5A00B5E27F /* ScaleStringTests.swift in Sources */,
0CE840FA2BFCA0F3003C2B7A /* RuntimeMetadataV15Tests.swift in Sources */,
84AF376D271A3AE5007408D6 /* RuntimeMetadataV14Tests.swift in Sources */,
84DA3B4224C8CE5A00B5E27F /* ScaleUInt64Tests.swift in Sources */,
849E0A7A25C94E3F00B33506 /* EnumMappingFactoryTests.swift in Sources */,
Expand Down Expand Up @@ -1104,6 +1112,7 @@
DEVELOPMENT_TEAM = YLWWUD25VZ;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
INFOPLIST_FILE = SubstrateSdk/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
Expand All @@ -1121,6 +1130,7 @@
DEVELOPMENT_TEAM = YLWWUD25VZ;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
INFOPLIST_FILE = SubstrateSdk/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
MODULE_NAME = ExampleApp;
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
Expand All @@ -1146,6 +1156,7 @@
"$(inherited)",
);
INFOPLIST_FILE = Tests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -1167,6 +1178,7 @@
"$(inherited)",
);
INFOPLIST_FILE = Tests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 14;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
6 changes: 3 additions & 3 deletions SubstrateSdk.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'SubstrateSdk'
s.version = '1.17.0'
s.version = '3.0.0'
s.summary = 'Utility library that implements clients specific logic to interact with substrate based networks'

s.homepage = 'https://github.com/nova-wallet/substrate-sdk-ios'
Expand All @@ -17,7 +17,7 @@ Pod::Spec.new do |s|
s.source = { :git => 'https://github.com/nova-wallet/substrate-sdk-ios.git', :tag => s.version.to_s }
s.swift_version = '5.0'

s.ios.deployment_target = '11.0'
s.ios.deployment_target = '14.0'

s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64', 'VALID_ARCHS' => 'x86_64 armv7 arm64' }

Expand All @@ -28,7 +28,7 @@ Pod::Spec.new do |s|
s.dependency 'IrohaCrypto/Scrypt', '~> 0.9.0'
s.dependency 'IrohaCrypto/ss58', '~> 0.9.0'
s.dependency 'ReachabilitySwift', '~> 5.0'
s.dependency 'RobinHood', '~> 2.6.0'
s.dependency 'Operation-iOS', '~> 2.0.1'
s.dependency 'Starscream'
s.dependency 'TweetNacl', '~> 1.0.0'
s.dependency 'BigInt', '~> 5.0'
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

14 changes: 0 additions & 14 deletions SubstrateSdk/Classes/Extrinsic/Extensions/ExtrinsicExtension.swift

This file was deleted.

Loading

0 comments on commit 2325f68

Please sign in to comment.