Skip to content

Commit 2bbfa21

Browse files
HashEngineeringHashEngineering
authored
Merge pull request #749 from dashpay/fix/update-dashsync-multisig
fix: update dashsync to support multisig outputs in transactions
2 parents 4b1cf20 + f136ec2 commit 2bbfa21

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

‎DashSyncCurrentCommit‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c97bdeaadada89fbe7f1a59ceea89ae531a1bcb9
1+
5e4545e0fefb2b2aa98c2209394898ea6cfcd43b

‎DashWallet.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10483,7 +10483,7 @@
1048310483
"$(inherited)",
1048410484
"@executable_path/Frameworks",
1048510485
);
10486-
MARKETING_VERSION = 8.5.3;
10486+
MARKETING_VERSION = 8.5.4;
1048710487
OTHER_LDFLAGS = (
1048810488
"$(inherited)",
1048910489
"-ObjC",
@@ -10624,7 +10624,7 @@
1062410624
"$(inherited)",
1062510625
"@executable_path/Frameworks",
1062610626
);
10627-
MARKETING_VERSION = 8.5.3;
10627+
MARKETING_VERSION = 8.5.4;
1062810628
OTHER_LDFLAGS = (
1062910629
"$(inherited)",
1063010630
"-ObjC",
@@ -10799,7 +10799,7 @@
1079910799
EXCLUDED_ARCHS = "";
1080010800
IBSC_MODULE = WatchApp_Extension;
1080110801
INFOPLIST_FILE = WatchApp/Info.plist;
10802-
MARKETING_VERSION = 8.5.3;
10802+
MARKETING_VERSION = 8.5.4;
1080310803
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp;
1080410804
PRODUCT_NAME = "$(TARGET_NAME)";
1080510805
SDKROOT = watchos;
@@ -10821,7 +10821,7 @@
1082110821
EXCLUDED_ARCHS = "";
1082210822
IBSC_MODULE = WatchApp_Extension;
1082310823
INFOPLIST_FILE = WatchApp/Info.plist;
10824-
MARKETING_VERSION = 8.5.3;
10824+
MARKETING_VERSION = 8.5.4;
1082510825
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp;
1082610826
PRODUCT_NAME = "$(TARGET_NAME)";
1082710827
SDKROOT = watchos;
@@ -10846,7 +10846,7 @@
1084610846
"@executable_path/Frameworks",
1084710847
"@executable_path/../../Frameworks",
1084810848
);
10849-
MARKETING_VERSION = 8.5.3;
10849+
MARKETING_VERSION = 8.5.4;
1085010850
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension;
1085110851
PRODUCT_NAME = "${TARGET_NAME}";
1085210852
SDKROOT = watchos;
@@ -10873,7 +10873,7 @@
1087310873
"@executable_path/Frameworks",
1087410874
"@executable_path/../../Frameworks",
1087510875
);
10876-
MARKETING_VERSION = 8.5.3;
10876+
MARKETING_VERSION = 8.5.4;
1087710877
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension;
1087810878
PRODUCT_NAME = "${TARGET_NAME}";
1087910879
SDKROOT = watchos;
@@ -10905,7 +10905,7 @@
1090510905
"@executable_path/Frameworks",
1090610906
"@executable_path/../../Frameworks",
1090710907
);
10908-
MARKETING_VERSION = 8.5.3;
10908+
MARKETING_VERSION = 8.5.4;
1090910909
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.TodayExtension;
1091010910
PRODUCT_NAME = "$(TARGET_NAME)";
1091110911
SKIP_INSTALL = YES;
@@ -10934,7 +10934,7 @@
1093410934
"@executable_path/Frameworks",
1093510935
"@executable_path/../../Frameworks",
1093610936
);
10937-
MARKETING_VERSION = 8.5.3;
10937+
MARKETING_VERSION = 8.5.4;
1093810938
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.TodayExtension;
1093910939
PRODUCT_NAME = "$(TARGET_NAME)";
1094010940
SKIP_INSTALL = YES;
@@ -10984,7 +10984,7 @@
1098410984
"$(inherited)",
1098510985
"@executable_path/Frameworks",
1098610986
);
10987-
MARKETING_VERSION = 8.5.3;
10987+
MARKETING_VERSION = 8.5.4;
1098810988
OTHER_LDFLAGS = (
1098910989
"$(inherited)",
1099010990
"-ObjC",
@@ -11119,7 +11119,7 @@
1111911119
"$(inherited)",
1112011120
"@executable_path/Frameworks",
1112111121
);
11122-
MARKETING_VERSION = 8.5.3;
11122+
MARKETING_VERSION = 8.5.4;
1112311123
OTHER_LDFLAGS = (
1112411124
"$(inherited)",
1112511125
"-ObjC",
@@ -11265,7 +11265,7 @@
1126511265
"$(inherited)",
1126611266
"@executable_path/Frameworks",
1126711267
);
11268-
MARKETING_VERSION = 8.5.3;
11268+
MARKETING_VERSION = 8.5.4;
1126911269
OTHER_LDFLAGS = (
1127011270
"$(inherited)",
1127111271
"-ObjC",
@@ -11409,7 +11409,7 @@
1140911409
"$(inherited)",
1141011410
"@executable_path/Frameworks",
1141111411
);
11412-
MARKETING_VERSION = 8.5.3;
11412+
MARKETING_VERSION = 8.5.4;
1141311413
OTHER_LDFLAGS = (
1141411414
"$(inherited)",
1141511415
"-ObjC",
@@ -11613,7 +11613,7 @@
1161311613
"$(inherited)",
1161411614
"@executable_path/Frameworks",
1161511615
);
11616-
MARKETING_VERSION = 8.5.3;
11616+
MARKETING_VERSION = 8.5.4;
1161711617
OTHER_LDFLAGS = (
1161811618
"$(inherited)",
1161911619
"-ObjC",
@@ -11727,7 +11727,7 @@
1172711727
"@executable_path/Frameworks",
1172811728
"@executable_path/../../Frameworks",
1172911729
);
11730-
MARKETING_VERSION = 8.5.3;
11730+
MARKETING_VERSION = 8.5.4;
1173111731
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.TodayExtension;
1173211732
PRODUCT_NAME = "$(TARGET_NAME)";
1173311733
SKIP_INSTALL = YES;
@@ -11783,7 +11783,7 @@
1178311783
EXCLUDED_ARCHS = "";
1178411784
IBSC_MODULE = WatchApp_Extension;
1178511785
INFOPLIST_FILE = WatchApp/Info.plist;
11786-
MARKETING_VERSION = 8.5.3;
11786+
MARKETING_VERSION = 8.5.4;
1178711787
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp;
1178811788
PRODUCT_NAME = "$(TARGET_NAME)";
1178911789
SDKROOT = watchos;
@@ -11808,7 +11808,7 @@
1180811808
"@executable_path/Frameworks",
1180911809
"@executable_path/../../Frameworks",
1181011810
);
11811-
MARKETING_VERSION = 8.5.3;
11811+
MARKETING_VERSION = 8.5.4;
1181211812
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension;
1181311813
PRODUCT_NAME = "${TARGET_NAME}";
1181411814
SDKROOT = watchos;
@@ -11925,7 +11925,7 @@
1192511925
"$(inherited)",
1192611926
"@executable_path/Frameworks",
1192711927
);
11928-
MARKETING_VERSION = 8.5.3;
11928+
MARKETING_VERSION = 8.5.4;
1192911929
OTHER_LDFLAGS = (
1193011930
"$(inherited)",
1193111931
"-ObjC",
@@ -12038,7 +12038,7 @@
1203812038
"@executable_path/Frameworks",
1203912039
"@executable_path/../../Frameworks",
1204012040
);
12041-
MARKETING_VERSION = 8.5.3;
12041+
MARKETING_VERSION = 8.5.4;
1204212042
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.TodayExtension;
1204312043
PRODUCT_NAME = "$(TARGET_NAME)";
1204412044
SKIP_INSTALL = YES;
@@ -12093,7 +12093,7 @@
1209312093
EXCLUDED_ARCHS = "";
1209412094
IBSC_MODULE = WatchApp_Extension;
1209512095
INFOPLIST_FILE = WatchApp/Info.plist;
12096-
MARKETING_VERSION = 8.5.3;
12096+
MARKETING_VERSION = 8.5.4;
1209712097
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp;
1209812098
PRODUCT_NAME = "$(TARGET_NAME)";
1209912099
SDKROOT = watchos;
@@ -12118,7 +12118,7 @@
1211812118
"@executable_path/Frameworks",
1211912119
"@executable_path/../../Frameworks",
1212012120
);
12121-
MARKETING_VERSION = 8.5.3;
12121+
MARKETING_VERSION = 8.5.4;
1212212122
PRODUCT_BUNDLE_IDENTIFIER = org.dashfoundation.dash.watchkitapp.watchkitextension;
1212312123
PRODUCT_NAME = "${TARGET_NAME}";
1212412124
SDKROOT = watchos;

‎Podfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -591,11 +591,11 @@ PODS:
591591
- "!ProtoCompiler-gRPCPlugin (~> 1.0)"
592592
- DAPI-GRPC/Messages
593593
- gRPC-ProtoRPC
594-
- DashSharedCore (0.5.1)
594+
- DashSharedCore (0.5.2)
595595
- DashSync (0.1.0):
596596
- CocoaLumberjack (= 3.7.2)
597597
- DAPI-GRPC (= 0.22.0-dev.8)
598-
- DashSharedCore (= 0.5.1)
598+
- DashSharedCore (= 0.5.2)
599599
- DSDynamicOptions (= 0.1.2)
600600
- DWAlertController (= 0.2.1)
601601
- TinyCborObjc (= 0.4.6)
@@ -838,8 +838,8 @@ SPEC CHECKSUMS:
838838
CocoaImageHashing: 8656031d0899abe6c1c415827de43e9798189c53
839839
CocoaLumberjack: b7e05132ff94f6ae4dfa9d5bce9141893a21d9da
840840
DAPI-GRPC: 138d62523bbfe7e88a39896f1053c0bc12390d9f
841-
DashSharedCore: b8481feb5f08acf162b548edbfc7a9b1ce491141
842-
DashSync: 1f5741aad267dcc0cfc04b6903490d304232ddf2
841+
DashSharedCore: 7bc3263c03a8401e5b61da6ce708f09808eba1ab
842+
DashSync: f424df65a185fac14cd0cb7ff52acc838d5bc805
843843
DSDynamicOptions: 347cc5d2c4e080eb3de6a86719ad3d861b82adfc
844844
DWAlertController: 5f4cd8adf90336331c054857f709f5f8d4b16a5b
845845
Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d

0 commit comments

Comments
 (0)