Skip to content

Commit

Permalink
Merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
Groxan committed Feb 28, 2021
2 parents 9c26add + 76c1957 commit d772f50
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 11 deletions.
47 changes: 47 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Build
on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build
runs-on: windows-latest
steps:
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 1.11
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Cache SonarCloud packages
uses: actions/cache@v1
with:
path: ~\sonar\cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache SonarCloud scanner
id: cache-sonar-scanner
uses: actions/cache@v1
with:
path: .\.sonar\scanner
key: ${{ runner.os }}-sonar-scanner
restore-keys: ${{ runner.os }}-sonar-scanner
- name: Install SonarCloud scanner
if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
shell: powershell
run: |
New-Item -Path .\.sonar\scanner -ItemType Directory
dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
shell: powershell
run: |
.\.sonar\scanner\dotnet-sonarscanner begin /k:"baking-bad_tzkt" /o:"baking-bad" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
dotnet build
.\.sonar\scanner\dotnet-sonarscanner end /d:sonar.login="${{ secrets.SONAR_TOKEN }}"
2 changes: 1 addition & 1 deletion Dockerfile-snapshot
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM cirrusci/wget

RUN wget "https://tzkt-snapshots.s3.eu-central-1.amazonaws.com/tzkt_309.backup" -O tzkt_db.backup
RUN wget "https://tzkt-snapshots.s3.eu-central-1.amazonaws.com/tzkt_329.backup" -O tzkt_db.backup
17 changes: 16 additions & 1 deletion Tzkt.Sync/Protocols/Handlers/Proto8/Activation/ProtoActivator.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
namespace Tzkt.Sync.Protocols.Proto8
using Newtonsoft.Json.Linq;
using Tzkt.Data.Models;

namespace Tzkt.Sync.Protocols.Proto8
{
class ProtoActivator : Proto7.ProtoActivator
{
public ProtoActivator(ProtocolHandler proto) : base(proto) { }

protected override void SetParameters(Protocol protocol, JToken parameters)
{
base.SetParameters(protocol, parameters);
protocol.BlocksPerVoting = parameters["blocks_per_voting_period"]?.Value<int>() ?? 20_480;
}

protected override void UpgradeParameters(Protocol protocol, Protocol prev)
{
base.UpgradeParameters(protocol, prev);
protocol.BlocksPerVoting = 20_480;
}
}
}
22 changes: 13 additions & 9 deletions Tzkt.Sync/Protocols/Handlers/Proto8/Validation/Validator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ protected override async Task ValidateBlockVoting(JsonElement metadata)
{
var rawPeriod = metadata.Required("voting_period_info").Required("voting_period");
var periodIndex = rawPeriod.RequiredInt32("index");

if (Cache.AppState.Get().VotingPeriod != periodIndex)
throw new ValidationException("invalid voting period index");

var period = await Cache.Periods.GetAsync(periodIndex);

var kind = rawPeriod.RequiredString("kind") switch
{
"proposal" => PeriodKind.Proposal,
Expand All @@ -29,15 +23,25 @@ protected override async Task ValidateBlockVoting(JsonElement metadata)
_ => throw new ValidationException("invalid voting period kind")
};

var period = await Cache.Periods.GetAsync(Cache.AppState.Get().VotingPeriod);

if (Level < period.LastLevel)
{
if (period.Kind != kind)
if (periodIndex != period.Index)
throw new ValidationException("invalid voting period index");

if (kind != period.Kind)
throw new ValidationException("unexpected voting period");
}
else
{
if (kind != PeriodKind.Proposal && (int)kind != (int)period.Kind + 1)
throw new ValidationException("inconsistent voting period");
// WTF: period start time on mainnet [level:1363968] differs from edo2net [level:45056]

//if (periodIndex != period.Index + 1)
// throw new ValidationException("invalid voting period index");

//if (kind != PeriodKind.Proposal && (int)kind != (int)period.Kind + 1)
// throw new ValidationException("inconsistent voting period");
}
}
}
Expand Down

0 comments on commit d772f50

Please sign in to comment.