Skip to content

Commit

Permalink
update toolkit to 2.2.0-dev8, fix core api dependency.
Browse files Browse the repository at this point in the history
  • Loading branch information
PawelPawelec-RDX committed Nov 1, 2024
1 parent bbfd912 commit 72a548c
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<PackageVersion Include="prometheus-net" Version="8.2.1" />
<PackageVersion Include="prometheus-net.AspNetCore" Version="8.2.1" />
<PackageVersion Include="prometheus-net.AspNetCore.HealthChecks" Version="8.2.1" />
<PackageVersion Include="RadixDlt.RadixEngineToolkit" Version="2.2.0-dev7" />
<PackageVersion Include="RadixDlt.RadixEngineToolkit" Version="2.2.0-dev8" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<!-- build time dependencies -->
<PackageVersion Include="coverlet.collector" Version="6.0.1" />
Expand Down
10 changes: 5 additions & 5 deletions apps/DataAggregator/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -652,7 +652,7 @@
"Microsoft.Extensions.Http.Polly": "[8.0.2, )",
"RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.GatewayApiSdk": "[1.9.0-develop, )",
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
}
},
"radixdlt.networkgateway.gatewayapisdk": {
Expand All @@ -677,7 +677,7 @@
"RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.DataAggregator": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.GatewayApi": "[1.9.0-develop, )",
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
}
},
"radixdlt.networkgateway.prometheusintegration": {
Expand Down Expand Up @@ -864,9 +864,9 @@
},
"RadixDlt.RadixEngineToolkit": {
"type": "CentralTransitive",
"requested": "[2.2.0-dev6, )",
"resolved": "2.2.0-dev7",
"contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
"requested": "[2.2.0-dev7, )",
"resolved": "2.2.0-dev8",
"contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions apps/DatabaseMigrations/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@
"Microsoft.Extensions.Http.Polly": "[8.0.2, )",
"RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.GatewayApiSdk": "[1.9.0-develop, )",
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
}
},
"radixdlt.networkgateway.gatewayapisdk": {
Expand All @@ -610,7 +610,7 @@
"RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.DataAggregator": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.GatewayApi": "[1.9.0-develop, )",
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
}
},
"Dapper": {
Expand Down Expand Up @@ -789,9 +789,9 @@
},
"RadixDlt.RadixEngineToolkit": {
"type": "CentralTransitive",
"requested": "[2.2.0-dev6, )",
"resolved": "2.2.0-dev7",
"contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
"requested": "[2.2.0-dev7, )",
"resolved": "2.2.0-dev8",
"contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions apps/GatewayApi/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@
"Microsoft.Extensions.Http.Polly": "[8.0.2, )",
"RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.GatewayApiSdk": "[1.9.0-develop, )",
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
}
},
"radixdlt.networkgateway.gatewayapisdk": {
Expand All @@ -735,7 +735,7 @@
"RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.DataAggregator": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.GatewayApi": "[1.9.0-develop, )",
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
}
},
"radixdlt.networkgateway.prometheusintegration": {
Expand Down Expand Up @@ -922,9 +922,9 @@
},
"RadixDlt.RadixEngineToolkit": {
"type": "CentralTransitive",
"requested": "[2.2.0-dev6, )",
"resolved": "2.2.0-dev7",
"contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
"requested": "[2.2.0-dev7, )",
"resolved": "2.2.0-dev8",
"contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions deployment/ci.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Git commit version of most recent Node compatible with this Network Gateway (only used in CI/CD environments)
FULLNODE_COMMIT=778a8bccf3c38832fd30e9f877ea15e52a292c0a
FULLNODE_VERSION=sha-778a8bc
FULLNODE_COMMIT=ab1926a2d8123dec062f57a4108580b42b6c8b76
FULLNODE_VERSION=sha-616a186
POSTGRES_VERSION=15.2.0
6 changes: 3 additions & 3 deletions src/RadixDlt.NetworkGateway.GatewayApi/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
},
"RadixDlt.RadixEngineToolkit": {
"type": "Direct",
"requested": "[2.2.0-dev7, )",
"resolved": "2.2.0-dev7",
"contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
"requested": "[2.2.0-dev8, )",
"resolved": "2.2.0-dev8",
"contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
},
"StyleCop.Analyzers": {
"type": "Direct",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public static ManifestAddresses ExtractAddresses(ToolkitModel.TransactionManifes
{
var allAddresses = manifest.ExtractAddresses();

var manifestSummary = manifest.StaticAnalysisAndValidate(networkId);
var manifestSummary = manifest.StaticallyAnalyze(networkId);

var presentedProofs = ExtractProofs(manifestSummary.presentedProofs);
var accountsRequiringAuth = manifestSummary.accountsRequiringAuth.Select(x => (EntityAddress)x.AddressString()).ToList();
Expand Down Expand Up @@ -166,7 +166,7 @@ public static ManifestAddresses ExtractAddresses(ToolkitModel.TransactionManifes
{
var allAddresses = manifest.ExtractAddresses();

var manifestSummary = manifest.StaticAnalysisAndValidate(networkId);
var manifestSummary = manifest.StaticallyAnalyze(networkId);

var presentedProofs = ExtractProofs(manifestSummary.presentedProofs);
var accountsRequiringAuth = manifestSummary.accountsRequiringAuth.Select(x => (EntityAddress)x.AddressString()).ToList();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public LedgerTransactionManifestClass[] GetManifestClasses(long stateVersion)

private void AnalyzeManifestClasses(ToolkitModel.TransactionManifestV1 toolkitManifest, long stateVersion)
{
var manifestSummary = toolkitManifest.StaticAnalysisAndValidate(_networkConfiguration.Id);
var manifestSummary = toolkitManifest.StaticallyAnalyze(_networkConfiguration.Id);

foreach (var manifestClass in manifestSummary.classification)
{
Expand All @@ -174,7 +174,7 @@ private void AnalyzeManifestClasses(ToolkitModel.TransactionManifestV1 toolkitMa
// TODO PP: that's ugly duplication, consider refactoring that.
private void AnalyzeManifestClasses(ToolkitModel.TransactionManifestV2 toolkitManifest, long stateVersion)
{
var manifestSummary = toolkitManifest.StaticAnalysisAndValidate(_networkConfiguration.Id);
var manifestSummary = toolkitManifest.StaticallyAnalyze(_networkConfiguration.Id);

foreach (var manifestClass in manifestSummary.classification)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@
},
"RadixDlt.RadixEngineToolkit": {
"type": "Direct",
"requested": "[2.2.0-dev7, )",
"resolved": "2.2.0-dev7",
"contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
"requested": "[2.2.0-dev8, )",
"resolved": "2.2.0-dev8",
"contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
},
"StyleCop.Analyzers": {
"type": "Direct",
Expand Down Expand Up @@ -661,7 +661,7 @@
"Microsoft.Extensions.Http.Polly": "[8.0.2, )",
"RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.GatewayApiSdk": "[1.9.0-develop, )",
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
}
},
"radixdlt.networkgateway.gatewayapisdk": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
"Microsoft.Extensions.Http.Polly": "[8.0.2, )",
"RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.GatewayApiSdk": "[1.9.0-develop, )",
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
}
},
"radixdlt.networkgateway.gatewayapisdk": {
Expand Down Expand Up @@ -507,9 +507,9 @@
},
"RadixDlt.RadixEngineToolkit": {
"type": "CentralTransitive",
"requested": "[2.2.0-dev6, )",
"resolved": "2.2.0-dev7",
"contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
"requested": "[2.2.0-dev7, )",
"resolved": "2.2.0-dev8",
"contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions tests/RadixDlt.NetworkGateway.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@
"Microsoft.Extensions.Http.Polly": "[8.0.2, )",
"RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.GatewayApiSdk": "[1.9.0-develop, )",
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
}
},
"radixdlt.networkgateway.gatewayapisdk": {
Expand All @@ -744,7 +744,7 @@
"RadixDlt.NetworkGateway.Abstractions": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.DataAggregator": "[1.9.0-develop, )",
"RadixDlt.NetworkGateway.GatewayApi": "[1.9.0-develop, )",
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev7, )"
"RadixDlt.RadixEngineToolkit": "[2.2.0-dev8, )"
}
},
"Dapper": {
Expand Down Expand Up @@ -923,9 +923,9 @@
},
"RadixDlt.RadixEngineToolkit": {
"type": "CentralTransitive",
"requested": "[2.2.0-dev6, )",
"resolved": "2.2.0-dev7",
"contentHash": "pelTlaGFYo/c0JZona5Q/XETESOaCZj+OxIog+bOTRBYJ0SAGJGD+MU6XTWP3ijmnbNuk9WCW/Xqp80sobpRIg=="
"requested": "[2.2.0-dev7, )",
"resolved": "2.2.0-dev8",
"contentHash": "jngrwh6yj09Wt8KevTQoVgspZ8g0ydR3dvXpY0mAeQrt2RZ+KeQqRModr8u2NIy/dTBznaCBnq5yEqf5QEW7mg=="
}
}
}
Expand Down

0 comments on commit 72a548c

Please sign in to comment.