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.

Sign up for GitHub

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

TRCL-2878 CCTP deposit integration #34

Merged
merged 4 commits into from
Dec 2, 2023
Merged

TRCL-2878 CCTP deposit integration #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9534f4
Bump Abacus
ruixhuang Dec 1, 2023
e2af3d9
Fix deposit param format
ruixhuang Dec 1, 2023
b88bd70
Merge branch 'main' into features/squid_v2
ruixhuang Dec 1, 2023
32fe879
Bump Abacus
ruixhuang Dec 2, 2023
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
4 changes: 2 additions & 2 deletions Utilities/Utilities/_Javascript/CosmoJavascript.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ public final class CosmoJavascript: NSObject, SingletonProtocol {
}

public func depositToSubaccount(subaccount: Int,
amount: Double,
amount: String,
completion: @escaping JavascriptCompletion) {
let json = "{\"subaccountNumber\": \(subaccount),\"amount\": \(amount)}"
let json = "{\"subaccountNumber\": \(subaccount),\"amount\": \"\(amount)\"}"
callNativeClient(functionName: "deposit", params: [json], completion: completion)
}

Expand Down
8 changes: 4 additions & 4 deletions dydx/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- Abacus (1.1.1)
- Abacus (1.1.5)
- Amplitude-iOS (4.10.0)
- AppsFlyerFramework (6.12.2):
- AppsFlyerFramework/Main (= 6.12.2)
Expand Down Expand Up @@ -249,7 +249,7 @@ PODS:
- SDWebImageSVGKitPlugin (1.4.0):
- SDWebImage/Core (~> 5.10)
- SVGKit (~> 3.0)
- SDWebImageSwiftUI (2.2.4):
- SDWebImageSwiftUI (2.2.5):
- SDWebImage (~> 5.10)
- SimpleKeychain (0.12.5)
- SnapKit (5.6.0)
Expand Down Expand Up @@ -376,7 +376,7 @@ CHECKOUT OPTIONS:
:http: https://ios-releases.fullstory.com/fullstory-1.29.0-xcframework.tar.gz

SPEC CHECKSUMS:
Abacus: 461fefadb72910fa8d1181f07a2a51219d4aef26
Abacus: 5991494253d3bfae23a8cbd4db11204d758ce0c8
Amplitude-iOS: 7d8cdc3408ba35c2e68368fc7c692cd104606b94
AppsFlyerFramework: 6eb4d89d2eb9a6632317f1055b359d9fd85fd5ff
Atributika: 0eabae2cc37999e79c5b94f60213642946991b1c
Expand Down Expand Up @@ -426,7 +426,7 @@ SPEC CHECKSUMS:
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
SDWebImage: 7ac2b7ddc5e8484c79aa90fc4e30b149d6a2c88f
SDWebImageSVGKitPlugin: 7542dd07c344ec3415ded0461a1161a6f087e0c9
SDWebImageSwiftUI: a3ed505b65903252560fcf37ff493d9d97648ae5
SDWebImageSwiftUI: fb78b40fe4ca757b6340ca31fc87e2b19044448c
SimpleKeychain: 8193a9e40967eccac933c1fde82de46c07a5ae26
SnapKit: e01d52ebb8ddbc333eefe2132acf85c8227d9c25
SVGKit: 1ad7513f8c74d9652f94ed64ddecda1a23864dea
Expand Down
6 changes: 3 additions & 3 deletions dydx/Pods/Local Podspecs/abacus.podspec.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions dydx/Pods/Manifest.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

116 changes: 58 additions & 58 deletions dydx/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading