Merge pull request #83 from arik-so/2022-10-nit-fixes

Fix nits and improve release process.

Author: arik-so

.github/actions/upload-xcframework-artifact/action.yml

@@ -7,8 +7,16 @@ runs:
             shell: bash
             run: |
                 ditto -c -k --sequesterRsrc --keepParent /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LightningDevKit.xcframework LightningDevKit.xcframework.zip
+        -   name: Create desymlinked xcframework variant
+            shell: bash
+            run: |
+                cp -r /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LightningDevKit.xcframework /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LightningDevKit-no-symlinks.xcframework
+                python3 ./src/scripts/symlink_resolver.py /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LightningDevKit-no-symlinks.xcframework
+                ditto -c -k --sequesterRsrc --keepParent /Users/runner/work/ldk-swift/ldk-swift/bindings/bin/release/LightningDevKit-no-symlinks.xcframework LightningDevKit-no-symlinks.xcframework.zip
         -   name: Upload Framework Artifact
             uses: actions/upload-artifact@v3
             with:
                 name: LightningDevKit
-                path: LightningDevKit.xcframework.zip
+                path: |
+                    LightningDevKit.xcframework.zip
+                    LightningDevKit-no-symlinks.xcframework.zip

.github/workflows/release-framework.yml

@@ -49,8 +49,8 @@ jobs:
                 if: ${{ github.event.inputs.tag != null && github.event.inputs.tag != '' }}
                 run: |
                     git tag ${{ github.event.inputs.tag }}
-                    git push origin HEAD:main
-                    git push origin --tags
+                    git push -u origin HEAD:release-${{ github.event.inputs.tag }}
+                    git push --tags
 
     release:
         name: Publish Release
@@ -66,4 +66,4 @@ jobs:
                 if: ${{ github.event.inputs.tag != null && github.event.inputs.tag != '' }}
                 with:
                     tag: ${{ github.event.inputs.tag }}
-                    artifacts: LightningDevKit.xcframework.zip
+                    artifacts: LightningDevKit.xcframework.zip,LightningDevKit-no-symlinks.xcframework.zip

ci/LDKSwift/Sources/LDKSwift/batteries/ChannelManagerConstructor.swift

@@ -73,7 +73,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
 
             let blockHash = Bindings.LDKThirtyTwoBytes_to_array(nativeType: a);
             let clonedChannelMonitor = ChannelMonitor(pointer: b).dangle().clone()
-            
+
             if let channelFundingOutpoint = clonedChannelMonitor.get_funding_txo().getA() {
                 let fundingOutpointHash = "\(channelFundingOutpoint.get_txid()):\(channelFundingOutpoint.get_index())"
                 if monitorFundingSet.contains(fundingOutpointHash) {
@@ -82,7 +82,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
                 }
                 monitorFundingSet.insert(fundingOutpointHash)
             }
-            
+
             clonedChannelMonitor.cOpaqueStruct?.is_owned = false // is_owned should never have to be modified
 
             monitors.append(clonedChannelMonitor.cOpaqueStruct!)
@@ -214,7 +214,7 @@ public class ChannelManagerConstructor: NativeTypeWrapper {
             print("watching channel")
             let monitorWatchResult = chainMonitorWatch.watch_channel(funding_txo: outPoint, monitor: monitorClone)
             if monitorWatchResult != LDKChannelMonitorUpdateStatus_Completed {
-                print("Some error occurred with a chainMonitorWatch.watch_channel call: \(monitorWatchResult)")
+                Bindings.print("Some issue occurred with a chainMonitorWatch.watch_channel call: \(monitorWatchResult)", severity: .WARNING)
             }
             monitorClone.cOpaqueStruct?.is_owned = true
         }
@@ -314,7 +314,7 @@ fileprivate class CustomChannelManagerPersister: Persister {
     override func persist_graph(network_graph: NetworkGraph) -> Result_NoneErrorZ {
         return self.handler.persist_graph(network_graph: network_graph)
     }
-    
+
     override func persist_scorer(scorer: Bindings.WriteableScore) -> Bindings.Result_NoneErrorZ {
         return self.handler.persist_scorer(scorer: scorer)
     }