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

RUST Min Wallet #13

Merged
merged 34 commits into from
Dec 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/beta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,24 @@ jobs:
- uses: webfactory/[email protected]
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
- uses: SwiftyLab/setup-swift@latest
with:
swift-version: "6.0.2"
- uses: actions/checkout@v4
with:
ssh-key: ${{ secrets.DEPLOY_KEY }}
ssh-strict: true
- uses: SwiftyLab/setup-swift@latest
with:
swift-version: "6.0.2"
- uses: ruby/setup-ruby@v1
with:
bundler-cache: true
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
cache-workspaces: rust
target: aarch64-apple-ios-sim,aarch64-apple-ios
- name: Install Dependencies
run: bundle install
- name: Build rust
run: cd rust && ./build.sh
- name: Build
run: bundle exec fastlane beta
env:
Expand Down
20 changes: 16 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,28 @@ jobs:
lint:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: SwiftyLab/setup-swift@latest
with:
swift-version: "6.0.2"
- uses: actions/checkout@v4
with:
ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
ssh-strict: true
- name: Select Xcode
run: sudo xcode-select -switch /Applications/Xcode_16.1.app
- name: Lint
run: swift format lint --strict -r -p MinWallet
build-and-test:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- uses: SwiftyLab/setup-swift@latest
with:
swift-version: "6.0.2"
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
cache-workspaces: rust
target: aarch64-apple-ios-sim,aarch64-apple-ios
- name: Select Xcode
run: sudo xcode-select -switch /Applications/Xcode_16.1.app
- name: Build rust
run: cd rust && ./build.sh
- name: Build and test
run: xcodebuild -scheme MinWallet CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED="NO" -disable-concurrent-destination-testing test -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 16 Pro Max,OS=18.1"
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,6 @@ fastlane/.env.default
fastlane/report.xml

.bundle
vendor
vendor

.DS_Store
12 changes: 8 additions & 4 deletions MinWallet.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
575157DA2CEB4526004CD647 /* Inter-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 575157AD2CEB4526004CD647 /* Inter-Medium.ttf */; };
575157DE2CEB4526004CD647 /* InterDisplay-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 575157C12CEB4526004CD647 /* InterDisplay-Regular.ttf */; };
575157E72CEB4526004CD647 /* Inter-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 575157AF2CEB4526004CD647 /* Inter-Regular.ttf */; };
5761D7162D0ADFE800D2809A /* Mobile.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5761D7152D0ADFE800D2809A /* Mobile.xcframework */; };
5761D7182D0ADFF400D2809A /* mwrust.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5761D7172D0ADFF400D2809A /* mwrust.swift */; };
5774769B2CED9A280066CFB6 /* Carousel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5774769A2CED9A220066CFB6 /* Carousel.swift */; };
57F102962C64CCA0000B3544 /* MinWalletApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 57F102952C64CCA0000B3544 /* MinWalletApp.swift */; };
57F1029A2C64CCA1000B3544 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 57F102992C64CCA1000B3544 /* Assets.xcassets */; };
Expand Down Expand Up @@ -152,9 +154,9 @@
575157BF2CEB4526004CD647 /* InterDisplay-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "InterDisplay-Medium.ttf"; sourceTree = "<group>"; };
575157C12CEB4526004CD647 /* InterDisplay-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "InterDisplay-Regular.ttf"; sourceTree = "<group>"; };
575157C22CEB4526004CD647 /* InterDisplay-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "InterDisplay-SemiBold.ttf"; sourceTree = "<group>"; };
5761D7152D0ADFE800D2809A /* Mobile.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Mobile.xcframework; path = rust/ios/Mobile.xcframework; sourceTree = "<group>"; };
5761D7172D0ADFF400D2809A /* mwrust.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = mwrust.swift; path = rust/bindings/mwrust.swift; sourceTree = "<group>"; };
5774769A2CED9A220066CFB6 /* Carousel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Carousel.swift; sourceTree = "<group>"; };
57A6D9192CEC35BF009CF6CD /* Mobile.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Mobile.xcframework; path = rust/ios/Mobile.xcframework; sourceTree = "<group>"; };
57A6D91A2CEC3604009CF6CD /* mwrust.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = mwrust.swift; path = rust/bindings/mwrust.swift; sourceTree = "<group>"; };
57A6F7C6490456E5F226DC7F /* TokenLogo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokenLogo.swift; sourceTree = "<group>"; };
57F102922C64CCA0000B3544 /* MinWallet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MinWallet.app; sourceTree = BUILT_PRODUCTS_DIR; };
57F102952C64CCA0000B3544 /* MinWalletApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MinWalletApp.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -253,6 +255,7 @@
files = (
9651CAA32D067760006C46DB /* SDWebImageSwiftUI in Frameworks */,
9651CAAC2D0677B5006C46DB /* SkeletonUI in Frameworks */,
5761D7162D0ADFE800D2809A /* Mobile.xcframework in Frameworks */,
9651CAA92D0677A3006C46DB /* Then in Frameworks */,
9651CAA62D067793006C46DB /* FlowStacks in Frameworks */,
9651CAAF2D0677C4006C46DB /* ScalingHeaderScrollView in Frameworks */,
Expand Down Expand Up @@ -410,8 +413,8 @@
57F102A52C64CCA1000B3544 /* MinWalletTests */,
57F102AF2C64CCA1000B3544 /* MinWalletUITests */,
57F102932C64CCA0000B3544 /* Products */,
57A6D9192CEC35BF009CF6CD /* Mobile.xcframework */,
57A6D91A2CEC3604009CF6CD /* mwrust.swift */,
5761D7152D0ADFE800D2809A /* Mobile.xcframework */,
5761D7172D0ADFF400D2809A /* mwrust.swift */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -971,6 +974,7 @@
E92422734A5D6B793E704F95 /* TokenListItemView.swift in Sources */,
96FE0CFF2CF433E4008E4BFD /* AppBar.swift in Sources */,
9655920F2CF8252C00301DDB /* CreateNewWalletSuccessView.swift in Sources */,
5761D7182D0ADFF400D2809A /* mwrust.swift in Sources */,
96FE0CF02CF366D7008E4BFD /* TokenDetailView.swift in Sources */,
9600DEC92CF18620005D997C /* SplashView.swift in Sources */,
960D6B302CFF562B0017AF29 /* EnterYourPasswordView.swift in Sources */,
Expand Down
5 changes: 5 additions & 0 deletions MinWallet/Features/Home/HomeView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@ struct HomeView: View {
.padding(.xl)
}
.task {
// Test rust code, feel free to remove
let v = genPhrase(wordCount: 24)
print(v)
// Test rust code, feel free to remove

await viewModel.getToken()
}
}
Expand Down
Loading