Skip to content

Commit

Permalink
Merge pull request #10196 from MarnixCroes/nbitcoin-fix
Browse files Browse the repository at this point in the history
[silent release] Upgrade NBitcoin version from 7.0.14 to 7.0.24
  • Loading branch information
molnard committed Feb 27, 2023
2 parents 6cc32be + 40e3ceb commit 58d2a1c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions WalletWasabi.Fluent.Desktop/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,8 @@
},
"NBitcoin": {
"type": "Transitive",
"resolved": "7.0.14",
"contentHash": "P5M1IeJbFuClYo0v4dzgf3MGA/z03EaL+HzfCsQRm70l2irTN8RonEuRX5QSuUOPc4oUbKFPR+K7OTGMT/gL4Q==",
"resolved": "7.0.24",
"contentHash": "+K8o9WH09/o8oTl0aV/IR2y+1leR7e1vvZ2S6A7IozvMsWGh/Wi3TYWhasAskEYryQJr2f4gQsy67eAO7YExAg==",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "1.0.0",
"Newtonsoft.Json": "13.0.1"
Expand Down Expand Up @@ -664,7 +664,7 @@
"dependencies": {
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[7.0.0, )",
"Microsoft.Win32.SystemEvents": "[7.0.0, )",
"NBitcoin": "[7.0.14, )",
"NBitcoin": "[7.0.24, )",
"NBitcoin.Secp256k1": "[3.0.1, )"
}
},
Expand Down
6 changes: 3 additions & 3 deletions WalletWasabi.Fluent/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@
},
"NBitcoin": {
"type": "Transitive",
"resolved": "7.0.14",
"contentHash": "P5M1IeJbFuClYo0v4dzgf3MGA/z03EaL+HzfCsQRm70l2irTN8RonEuRX5QSuUOPc4oUbKFPR+K7OTGMT/gL4Q==",
"resolved": "7.0.24",
"contentHash": "+K8o9WH09/o8oTl0aV/IR2y+1leR7e1vvZ2S6A7IozvMsWGh/Wi3TYWhasAskEYryQJr2f4gQsy67eAO7YExAg==",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "1.0.0",
"Newtonsoft.Json": "13.0.1"
Expand Down Expand Up @@ -591,7 +591,7 @@
"dependencies": {
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[7.0.0, )",
"Microsoft.Win32.SystemEvents": "[7.0.0, )",
"NBitcoin": "[7.0.14, )",
"NBitcoin": "[7.0.24, )",
"NBitcoin.Secp256k1": "[3.0.1, )"
}
}
Expand Down
6 changes: 3 additions & 3 deletions WalletWasabi.Packager/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
},
"NBitcoin": {
"type": "Transitive",
"resolved": "7.0.14",
"contentHash": "P5M1IeJbFuClYo0v4dzgf3MGA/z03EaL+HzfCsQRm70l2irTN8RonEuRX5QSuUOPc4oUbKFPR+K7OTGMT/gL4Q==",
"resolved": "7.0.24",
"contentHash": "+K8o9WH09/o8oTl0aV/IR2y+1leR7e1vvZ2S6A7IozvMsWGh/Wi3TYWhasAskEYryQJr2f4gQsy67eAO7YExAg==",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "1.0.0",
"Newtonsoft.Json": "13.0.1"
Expand Down Expand Up @@ -275,7 +275,7 @@
"dependencies": {
"Microsoft.AspNetCore.Mvc.NewtonsoftJson": "[7.0.0, )",
"Microsoft.Win32.SystemEvents": "[7.0.0, )",
"NBitcoin": "[7.0.14, )",
"NBitcoin": "[7.0.24, )",
"NBitcoin.Secp256k1": "[3.0.1, )"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ public void SubtractFeeFromTooSmallOutput()
new DestinationRequest(key3, Money.Coins(0.3m))
});
var feeRate = new FeeRate(20m);
var ex = Assert.Throws<NotEnoughFundsException>(() => transactionFactory.BuildTransaction(payment, feeRate));
var ex = Assert.Throws<OutputTooSmallException>(() => transactionFactory.BuildTransaction(payment, feeRate));

Assert.Equal(Money.Satoshis(3240), ex.Missing);
}
Expand Down
2 changes: 1 addition & 1 deletion WalletWasabi/WalletWasabi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0" />
<PackageReference Include="Microsoft.Win32.SystemEvents" Version="7.0.0" />
<PackageReference Include="NBitcoin" Version="7.0.14" />
<PackageReference Include="NBitcoin" Version="7.0.24" />
<PackageReference Include="NBitcoin.Secp256k1" Version="3.0.1" />
</ItemGroup>

Expand Down
6 changes: 3 additions & 3 deletions WalletWasabi/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
},
"NBitcoin": {
"type": "Direct",
"requested": "[7.0.14, )",
"resolved": "7.0.14",
"contentHash": "P5M1IeJbFuClYo0v4dzgf3MGA/z03EaL+HzfCsQRm70l2irTN8RonEuRX5QSuUOPc4oUbKFPR+K7OTGMT/gL4Q==",
"requested": "[7.0.24, )",
"resolved": "7.0.24",
"contentHash": "+K8o9WH09/o8oTl0aV/IR2y+1leR7e1vvZ2S6A7IozvMsWGh/Wi3TYWhasAskEYryQJr2f4gQsy67eAO7YExAg==",
"dependencies": {
"Microsoft.Extensions.Logging.Abstractions": "1.0.0",
"Newtonsoft.Json": "13.0.1"
Expand Down

0 comments on commit 58d2a1c

Please sign in to comment.