Support Miniscript as a separate dll. by joemphilips · Pull Request #675 · MetacoSA/NBitcoin

joemphilips · 2019-03-26T11:34:10Z

Complete implementation
Create C# Facade as an extension methods in NBitcoin namespace
Create NBitcoin.nuspec file so that I can include Miniscript.dll to NBitcoin's nupkg.
Tweak AssemblyInfo and .fsproj

NicolasDorier · 2019-03-27T01:53:24Z

I think you should not manually touch nuspec. The nuspec is generated by MSBuild. There is MSBuild properties to influence the nuget package. I think you should use this.

joemphilips · 2019-03-27T11:25:48Z

I've been trying a solution 2 in this answer (and solutions in the issue linked from there.)But this does not work in case we have circular dependency.

I will keep looking. But I'm not sure there is a way to workaround without .nuspec

knocte · 2019-03-27T11:33:18Z

NBitcoin/NBitcoin.csproj

 	</PropertyGroup>
 	<PropertyGroup>
-		<TargetFrameworks>net461;net452;netstandard1.3;netstandard1.1;netcoreapp2.1;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>netstandard1.3;netstandard1.1;netcoreapp2.1;netstandard2.0</TargetFrameworks>


why removing net4xx profiles?

Uups. By mistake. I will fix

joemphilips · 2019-04-03T12:55:34Z

NBitcoin/NBitcoin.csproj

 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\NBitcoin.xml</DocumentationFile>
 	</PropertyGroup>
+
+	<!-- Include Miniscript dll only if it is ready. -->


hacky workaround to include Miniscript.dll to .nupkg as a separate dll

knocte · 2019-04-04T05:50:30Z

NBitcoin.Miniscript/Program.fs

+[<EntryPoint>]
+let main argv =
+    printfn "Hello World from F#!"
+    0 // return an integer exit code


I'm guessing you can remove this file now

knocte · 2019-04-04T05:50:54Z

NBitcoin.Miniscript.Tests/AssemblyInfo.fs

+open System.Reflection
+
+[<assembly:AssemblyTitleAttribute("FNBitcoin.Tests")>]
+[<assembly:AssemblyProductAttribute("FNBitcoin")>]


knocte · 2019-04-04T05:51:04Z

NBitcoin.Miniscript.Tests/AssemblyInfo.fs

+    let AssemblyTitle = "FNBitcoin.Tests"
+
+    [<Literal>]
+    let AssemblyProduct = "FNBitcoin"


knocte · 2019-04-04T05:51:27Z

NBitcoin.Miniscript.Tests/Contract.fs

+                Expect.isTrue true "skip"
+    ]
+
+*)


remove file?

knocte · 2019-04-05T06:02:01Z

NBitcoin.Miniscript.Tests/CSharp/MiniscriptPSBTTests.cs

+
+        private TransactionSignature DummyKeyFn(PubKey key) => null;
+        public void ShouldSatisfyMiniscript()
+		{


FYI mixed tabs and spaces, misconfigured editor? ;)

😭
I will fix later.

* Rename `Policy` -> `AbstractPolicy` * Model `ProviderSet` member as optional * Reorganize Miniscript as facade module.

* Tweak public api visibility in Miniscript. * Add Unsafe version to Miniscript.Satisfy * Implement satisfyCost in `Satisfy.fs` s Please enter the commit message for your changes. Lines starting

* Move every PSBT-related tests to NBitcoin.Tests.Miniscript * Add reference from NBitcoin.Tests.Miniscript to NBitcoin.Tests|TestFramework * Append TargetFrameworks `netcoreapp2.1;netcoreapp2.2` to TestFramework * Rewrite PSBT.Finalize as an extension method in NBitcoin.Miniscript

…n in Miniscript

nopara73 · 2019-04-14T10:37:58Z

Guys, what is miniscript? I keep seeing this issue in my notifications for quite a while:)

joemphilips · 2019-04-14T18:52:10Z

@nopara73
In short, it is a high-level DSL which compiles to actual bitcoin script, like Ivy.

You can see general overview here. The page also has links to whole other resources.
https://www.youtube.com/watch?v=xOQulGTknQo

I couldn't found reference implementation by Sipa so I'm treating rust-miniscript as a reference.

joemphilips · 2019-04-22T09:10:07Z

Closing in favor of #684

joemphilips changed the title ~~Support Miniscript as separate dll.~~ WIP: Support Miniscript as separate dll. Mar 26, 2019

joemphilips changed the title ~~WIP: Support Miniscript as separate dll.~~ WIP: Support Miniscript as a separate dll. Mar 26, 2019

knocte reviewed Mar 27, 2019

View reviewed changes

joemphilips force-pushed the MiniScript branch from 5b352a5 to 532fd6f Compare April 3, 2019 12:45

joemphilips commented Apr 3, 2019

View reviewed changes

joemphilips force-pushed the MiniScript branch from 44f83f0 to f1d384d Compare April 3, 2019 13:00

knocte reviewed Apr 4, 2019

View reviewed changes

NBitcoin.Miniscript.Tests/Contract.fs Outdated

Expect.isTrue true "skip"

]

*)

Copy link

Contributor

knocte Apr 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove file?

knocte reviewed Apr 5, 2019

View reviewed changes

joemphilips force-pushed the MiniScript branch from f056162 to ea5301e Compare April 8, 2019 12:09

joemphilips added 16 commits April 11, 2019 02:44

Add Miniscript folder as separate dll

d4e820b

Move Miniscript to independent Directory

f254c5b

Stop using the work FNBitcoin

0a641be

Fromat: Fix some casing

788d459

fixup! Move Miniscript to independent Directory

a53651e

pack Miniscript without editing .nuspec manually

3d2abb3

pack Miniscript without editing .nuspec manually.

c76955f

Start Writing Tests for Miniscript

47e3a46

Update csproj a bit

3c3227e

Include Miniscript to solution

d43bf48

Fix compile error in Miniscript.Tests

50f9de3

Fix every compile warning when testing Miniscript

2d6a63d

Fix bug in all Miniscript Test

d6b8c42

Refactor Miniscript

0684c0f

* Rename `Policy` -> `AbstractPolicy` * Model `ProviderSet` member as optional * Reorganize Miniscript as facade module.

Rename MiniScript -> Miniscript

1a2677d

Small refactor

7ea97ca

joemphilips added 8 commits April 11, 2019 02:44

Fix bug when satisfying LockTime

cb21a50

Update MiniscriptPSBTTests.cs

55b2e3d

* Tweak public api visibility in Miniscript. * Add Unsafe version to Miniscript.Satisfy * Implement satisfyCost in `Satisfy.fs` s Please enter the commit message for your changes. Lines starting

Remove all unnecessary files from Miniscript

2da2ff3

Fix bug in E.Or

c871a27

Fix bug in Satisfy

39e3534

Delete PSBT.Finalize() and reimplement it as Extension

88c8ee5

Fix all bug in finalization

872fc09

joemphilips force-pushed the MiniScript branch from 3a960c8 to 872fc09 Compare April 10, 2019 17:45

Tweak *.[c|f]sproj files

7e036ac

joemphilips force-pushed the MiniScript branch from 2248287 to 7e036ac Compare April 11, 2019 08:07

joemphilips added 2 commits April 11, 2019 17:29

Delete useless file in Miniscript.Tests.CSharp

67588fd

Add description about netfx.props

4f9a80f

joemphilips mentioned this pull request Apr 11, 2019

Miniscript support? #668

Closed

joemphilips added 4 commits April 11, 2019 19:12

Remove meaningless testcase in SatifyTests.fs

ff38b8d

Run Miniscript test in appveyor

c706db8

Speed up property test

e443fec

Run Miniscript tests in travis

6facd74

joemphilips force-pushed the MiniScript branch from 95c9b95 to 6facd74 Compare April 11, 2019 10:43

joemphilips added 3 commits April 11, 2019 23:57

Specify FSharp.Core as dep in FSharp test and bump Fsharp.Core versio…

32ef31f

…n in Miniscript

Specify framework version in appveyor

43b19b0

Pass HTLC test for psbt

fc619da

joemphilips changed the title ~~WIP: Support Miniscript as a separate dll.~~ Support Miniscript as a separate dll. Apr 12, 2019

joemphilips added 2 commits April 14, 2019 04:15

Remove unnecessary props from Miniscript/AssemblyInfo.fs

cfed1ab

remove nits

f7f453a

joemphilips mentioned this pull request Apr 22, 2019

Support Miniscript (with C#) #684

Closed

joemphilips closed this Apr 22, 2019

Comments

Conversation

joemphilips commented Mar 26, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

NicolasDorier commented Mar 27, 2019

Uh oh!

joemphilips commented Mar 27, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nopara73 commented Apr 14, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joemphilips commented Apr 14, 2019

Uh oh!

joemphilips commented Apr 22, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

joemphilips commented Mar 26, 2019 •

edited

Loading

nopara73 commented Apr 14, 2019 •

edited

Loading