diff --git a/buildkite/scripts/build-js-tests.sh b/buildkite/scripts/build-js-tests.sh index 880dffd6b1a..ef33ac983ff 100755 --- a/buildkite/scripts/build-js-tests.sh +++ b/buildkite/scripts/build-js-tests.sh @@ -8,9 +8,9 @@ make snarkyjs echo "Prepare SnarkyJS test module and pack into archive" npm pack src/lib/snarkyjs -mv snarkyjs-*.tgz snarkyjs.tgz +mv o1js-*.tgz o1js.tgz cd src/lib/snarkyjs/tests/integration -npm i ../../../../../snarkyjs.tgz +npm i ../../../../../o1js.tgz cp $(which node) ./node cd ../../../../.. tar -chzf snarkyjs_test.tar.gz src/lib/snarkyjs/tests/integration diff --git a/buildkite/scripts/build-test-executive.sh b/buildkite/scripts/build-test-executive.sh deleted file mode 100755 index d41af619530..00000000000 --- a/buildkite/scripts/build-test-executive.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -set -eo pipefail - -echo "--- setup opam config environment" -eval `opam config env` -export PATH=/home/opam/.cargo/bin:/usr/lib/go/bin:$PATH -export GO=/usr/lib/go/bin/go - -echo "--- build test-executive" -dune build --verbose --profile=${DUNE_PROFILE} src/app/test_executive/test_executive.exe src/app/logproc/logproc.exe - -echo "--- build complete, preparing test-executive for caching" -# copy built binary to current location and adjust permissions -cp _build/default/src/app/test_executive/test_executive.exe . -chmod +rwx test_executive.exe - -cp _build/default/src/app/logproc/logproc.exe . -chmod +rwx logproc.exe diff --git a/buildkite/scripts/run-test-executive.sh b/buildkite/scripts/run-test-executive.sh index 4b65aef3c7b..4636bdcc5e2 100755 --- a/buildkite/scripts/run-test-executive.sh +++ b/buildkite/scripts/run-test-executive.sh @@ -10,9 +10,21 @@ if [[ "${TEST_NAME:0:15}" == "block-prod-prio" ]] && [[ "$RUN_OPT_TESTS" == "" ] exit 0 fi -./test_executive.exe cloud "$TEST_NAME" \ +# Don't prompt for answers during apt-get install +export DEBIAN_FRONTEND=noninteractive + +echo "deb [trusted=yes] https://apt.releases.hashicorp.com $MINA_DEB_CODENAME main" | tee /etc/apt/sources.list.d/hashicorp.list +apt-get update +apt-get install -y "terraform" + +echo "Installing mina daemon package: mina-test-executive=${MINA_DEB_VERSION}" +echo "deb [trusted=yes] http://packages.o1test.net $MINA_DEB_CODENAME $MINA_DEB_RELEASE" | tee /etc/apt/sources.list.d/mina.list +apt-get update +apt-get install --allow-downgrades -y "mina-test-executive=$MINA_DEB_VERSION" "mina-logproc=$MINA_DEB_VERSION" + +mina-test-executive cloud "$TEST_NAME" \ --mina-image "$MINA_IMAGE" \ --archive-image "$ARCHIVE_IMAGE" \ --mina-automation-location ./automation \ | tee "$TEST_NAME.test.log" \ - | ./logproc.exe -i inline -f '!(.level in ["Debug", "Spam"])' + | mina-logproc -i inline -f '!(.level in ["Debug", "Spam"])' diff --git a/buildkite/src/Command/MinaArtifact.dhall b/buildkite/src/Command/MinaArtifact.dhall index 89ed25e662b..6ef33dfd9ff 100644 --- a/buildkite/src/Command/MinaArtifact.dhall +++ b/buildkite/src/Command/MinaArtifact.dhall @@ -5,6 +5,9 @@ let S = ../Lib/SelectFiles.dhall let D = S.PathPattern let Pipeline = ../Pipeline/Dsl.dhall +let PipelineTag = ../Pipeline/Tag.dhall +let PipelineMode = ../Pipeline/Mode.dhall + let JobSpec = ../Pipeline/JobSpec.dhall let Command = ./Base.dhall @@ -16,13 +19,16 @@ let DebianVersions = ../Constants/DebianVersions.dhall in -let pipeline : DebianVersions.DebVersion -> Pipeline.Config.Type = \(debVersion : DebianVersions.DebVersion) -> +let pipeline : DebianVersions.DebVersion -> PipelineMode.Type -> Pipeline.Config.Type = \(debVersion : DebianVersions.DebVersion) -> +\(mode: PipelineMode.Type) -> Pipeline.Config::{ spec = JobSpec::{ dirtyWhen = DebianVersions.dirtyWhen debVersion, path = "Release", - name = "MinaArtifact${DebianVersions.capitalName debVersion}" + name = "MinaArtifact${DebianVersions.capitalName debVersion}", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Release ], + mode = mode }, steps = [ Libp2p.step debVersion, @@ -119,7 +125,7 @@ let pipeline : DebianVersions.DebVersion -> Pipeline.Config.Type = \(debVersion in { - bullseye = pipeline DebianVersions.DebVersion.Bullseye - , buster = pipeline DebianVersions.DebVersion.Buster - , focal = pipeline DebianVersions.DebVersion.Focal + bullseye = pipeline DebianVersions.DebVersion.Bullseye PipelineMode.Type.PullRequest + , buster = pipeline DebianVersions.DebVersion.Buster PipelineMode.Type.PullRequest + , focal = pipeline DebianVersions.DebVersion.Focal PipelineMode.Type.PullRequest } diff --git a/buildkite/src/Command/TestExecutive.dhall b/buildkite/src/Command/TestExecutive.dhall index 8e7eaa2b164..c8541dccd2d 100644 --- a/buildkite/src/Command/TestExecutive.dhall +++ b/buildkite/src/Command/TestExecutive.dhall @@ -15,36 +15,11 @@ let B/SoftFail = B.definitions/commandStep/properties/soft_fail/Type in { - build = \(duneProfile : Text) -> - Command.build - Command.Config::{ - commands = - -- Build test executive binary - RunInToolchain.runInToolchain [ - "DUNE_PROFILE=${duneProfile}" - ] "./buildkite/scripts/build-test-executive.sh" - - # - - [ - -- Cache test-executive binary - Cmd.run "artifact-cache-helper.sh test_executive.exe --upload", - Cmd.run "artifact-cache-helper.sh logproc.exe --upload" - ], - label = "Build test-executive", - key = "build-test-executive", - target = Size.XLarge - }, - execute = \(testName : Text) -> \(dependsOn : List Command.TaggedKey.Type) -> Command.build Command.Config::{ commands = [ - -- Download test dependencies - Cmd.run "artifact-cache-helper.sh test_executive.exe && chmod +x test_executive.exe", - Cmd.run "artifact-cache-helper.sh logproc.exe && chmod +x logproc.exe", - -- Execute test based on BUILD image Cmd.run "MINA_DEB_CODENAME=bullseye ; source ./buildkite/scripts/export-git-env-vars.sh && ./buildkite/scripts/run-test-executive.sh ${testName}" ], @@ -78,9 +53,6 @@ in Command.Config::{ commands = [ - -- Download test dependencies - Cmd.run "artifact-cache-helper.sh test_executive.exe && chmod +x test_executive.exe", - Cmd.run "artifact-cache-helper.sh logproc.exe && chmod +x logproc.exe", Cmd.run "artifact-cache-helper.sh snarkyjs_test.tar.gz && tar -xzf snarkyjs_test.tar.gz", -- Execute test based on BUILD image diff --git a/buildkite/src/Jobs/Lint/Fast.dhall b/buildkite/src/Jobs/Lint/Fast.dhall index d9645e5b545..fc96486a180 100644 --- a/buildkite/src/Jobs/Lint/Fast.dhall +++ b/buildkite/src/Jobs/Lint/Fast.dhall @@ -5,6 +5,7 @@ let B = ../../External/Buildkite.dhall let S = ../../Lib/SelectFiles.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let JobSpec = ../../Pipeline/JobSpec.dhall @@ -36,6 +37,7 @@ in Pipeline.build ] , path = "Lint" , name = "Fast" + , tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Lint ] } , steps = [ Command.build diff --git a/buildkite/src/Jobs/Lint/HelmChart.dhall b/buildkite/src/Jobs/Lint/HelmChart.dhall index 2b0e602117c..f0f93b132f1 100644 --- a/buildkite/src/Jobs/Lint/HelmChart.dhall +++ b/buildkite/src/Jobs/Lint/HelmChart.dhall @@ -4,6 +4,7 @@ let S = ../../Lib/SelectFiles.dhall let Cmd = ../../Lib/Cmds.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -23,7 +24,8 @@ Pipeline.build S.exactly "buildkite/scripts/helm-ci" "sh" ], path = "Lint", - name = "HelmChart" + name = "HelmChart", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Lint ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Lint/Merge.dhall b/buildkite/src/Jobs/Lint/Merge.dhall index cd81f4276c3..7701fffd052 100644 --- a/buildkite/src/Jobs/Lint/Merge.dhall +++ b/buildkite/src/Jobs/Lint/Merge.dhall @@ -4,6 +4,7 @@ let B = ../../External/Buildkite.dhall let SelectFiles = ../../Lib/SelectFiles.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Cmd = ../../Lib/Cmds.dhall @@ -20,7 +21,8 @@ Pipeline.build spec = JobSpec::{ dirtyWhen = [ SelectFiles.everything ], path = "Lint", - name = "Merge" + name = "Merge", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Lint ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Lint/OCaml.dhall b/buildkite/src/Jobs/Lint/OCaml.dhall index a79f1e00026..3dec98290af 100644 --- a/buildkite/src/Jobs/Lint/OCaml.dhall +++ b/buildkite/src/Jobs/Lint/OCaml.dhall @@ -7,6 +7,7 @@ let JobSpec = ../../Pipeline/JobSpec.dhall let Cmd = ../../Lib/Cmds.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let RunInToolchain = ../../Command/RunInToolchain.dhall @@ -31,6 +32,7 @@ in Pipeline.build [ dirtyDhallDir, S.strictlyStart (S.contains "src/") ] , path = "Lint" , name = "OCaml" + , tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Lint ] } , steps = [ Command.build diff --git a/buildkite/src/Jobs/Lint/Rust.dhall b/buildkite/src/Jobs/Lint/Rust.dhall index a551272308d..c099d225646 100644 --- a/buildkite/src/Jobs/Lint/Rust.dhall +++ b/buildkite/src/Jobs/Lint/Rust.dhall @@ -4,6 +4,8 @@ let S = ../../Lib/SelectFiles.dhall let Cmd = ../../Lib/Cmds.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -19,7 +21,8 @@ Pipeline.build spec = JobSpec::{ dirtyWhen = [ S.contains "src/app/trace-tool", S.strictlyStart (S.contains "buildkite/src/Jobs/Lint/Rust") ], path = "Lint", - name = "Rust" + name = "Rust", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Lint ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Lint/TestnetAlerts.dhall b/buildkite/src/Jobs/Lint/TestnetAlerts.dhall index 90b69b3f91e..c60772c198b 100644 --- a/buildkite/src/Jobs/Lint/TestnetAlerts.dhall +++ b/buildkite/src/Jobs/Lint/TestnetAlerts.dhall @@ -7,6 +7,8 @@ let S = ../../Lib/SelectFiles.dhall let Cmd = ../../Lib/Cmds.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -25,7 +27,8 @@ Pipeline.build S.strictlyStart (S.contains "buildkite/src/Jobs/Release/TestnetAlerts") ], path = "Lint", - name = "TestnetAlerts" + name = "TestnetAlerts", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Lint ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Lint/ValidationService.dhall b/buildkite/src/Jobs/Lint/ValidationService.dhall index 96fe9d19bf8..a2469a29ef0 100644 --- a/buildkite/src/Jobs/Lint/ValidationService.dhall +++ b/buildkite/src/Jobs/Lint/ValidationService.dhall @@ -4,6 +4,8 @@ let List/map = Prelude.List.map let S = ../../Lib/SelectFiles.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let Cmd = ../../Lib/Cmds.dhall let Command = ../../Command/Base.dhall let JobSpec = ../../Pipeline/JobSpec.dhall @@ -52,7 +54,8 @@ in Pipeline.build Pipeline.Config::{ S.strictlyStart (S.contains ValidationService.rootPath) ], path = "Lint", - name = "ValidationService" + name = "ValidationService", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Lint ] }, steps = [ Command.build Command.Config::{ diff --git a/buildkite/src/Jobs/Lint/Xrefcheck.dhall b/buildkite/src/Jobs/Lint/Xrefcheck.dhall index 139687b4a5b..28a9268420c 100644 --- a/buildkite/src/Jobs/Lint/Xrefcheck.dhall +++ b/buildkite/src/Jobs/Lint/Xrefcheck.dhall @@ -4,6 +4,8 @@ let B = ../../External/Buildkite.dhall let SelectFiles = ../../Lib/SelectFiles.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let JobSpec = ../../Pipeline/JobSpec.dhall let Cmd = ../../Lib/Cmds.dhall @@ -23,7 +25,8 @@ Pipeline.build SelectFiles.strictly (SelectFiles.contains ".xrefcheck.yml") ], path = "Lint", - name = "Xrefcheck" + name = "Xrefcheck", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Lint ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Release/HelmRelease.dhall b/buildkite/src/Jobs/Release/HelmRelease.dhall index 7fa74079dda..8e843171ab7 100644 --- a/buildkite/src/Jobs/Release/HelmRelease.dhall +++ b/buildkite/src/Jobs/Release/HelmRelease.dhall @@ -4,6 +4,8 @@ let S = ../../Lib/SelectFiles.dhall let Cmd = ../../Lib/Cmds.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -21,7 +23,8 @@ Pipeline.build S.exactly "buildkite/scripts/helm-ci" "sh" ], path = "Release", - name = "HelmRelease" + name = "HelmRelease", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Release ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Release/ItnOrchestratorArtifact.dhall b/buildkite/src/Jobs/Release/ItnOrchestratorArtifact.dhall index e1232b6278e..99e193cf299 100644 --- a/buildkite/src/Jobs/Release/ItnOrchestratorArtifact.dhall +++ b/buildkite/src/Jobs/Release/ItnOrchestratorArtifact.dhall @@ -5,6 +5,8 @@ let S = ../../Lib/SelectFiles.dhall let D = S.PathPattern let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -29,7 +31,8 @@ Pipeline.build S.strictlyStart (S.contains "src/app/itn_orchestrator") ], path = "Release", - name = "ItnOrchestratorArtifact" + name = "ItnOrchestratorArtifact", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Release ] }, steps = [ DockerImage.generateStep spec diff --git a/buildkite/src/Jobs/Release/LeaderboardArtifact.dhall b/buildkite/src/Jobs/Release/LeaderboardArtifact.dhall index f8b657359fd..252cd012e22 100644 --- a/buildkite/src/Jobs/Release/LeaderboardArtifact.dhall +++ b/buildkite/src/Jobs/Release/LeaderboardArtifact.dhall @@ -5,6 +5,8 @@ let S = ../../Lib/SelectFiles.dhall let D = S.PathPattern let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -27,7 +29,8 @@ Pipeline.build S.strictlyStart (S.contains "frontend/leaderboard") ], path = "Release", - name = "LeaderboardArtifact" + name = "LeaderboardArtifact", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Release ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Release/MinaToolchainArtifactBullseye.dhall b/buildkite/src/Jobs/Release/MinaToolchainArtifactBullseye.dhall new file mode 100644 index 00000000000..0e2b4f198ea --- /dev/null +++ b/buildkite/src/Jobs/Release/MinaToolchainArtifactBullseye.dhall @@ -0,0 +1,50 @@ +let Prelude = ../../External/Prelude.dhall + +let Cmd = ../../Lib/Cmds.dhall +let S = ../../Lib/SelectFiles.dhall + +let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall +let JobSpec = ../../Pipeline/JobSpec.dhall + +let Command = ../../Command/Base.dhall +let Size = ../../Command/Size.dhall +let DockerImage = ../../Command/DockerImage.dhall +let DockerLogin = ../../Command/DockerLogin/Type.dhall + + +in + +Pipeline.build + Pipeline.Config::{ + spec = + JobSpec::{ + dirtyWhen = [ + S.strictlyStart (S.contains "dockerfiles/stages/1-"), + S.strictlyStart (S.contains "dockerfiles/stages/2-"), + S.strictlyStart (S.contains "dockerfiles/stages/3-"), + S.strictlyStart (S.contains "buildkite/src/Jobs/Release/MinaToolchainArtifact"), + S.strictly (S.contains "opam.export"), + -- Rust version has changed + S.strictlyEnd (S.contains "rust-toolchain.toml") + ], + path = "Release", + name = "MinaToolchainArtifactBullseye", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Release ] + }, + steps = [ + + -- mina-toolchain Debian 11 "Bullseye" Toolchain + let toolchainBullseyeSpec = DockerImage.ReleaseSpec::{ + service="mina-toolchain", + deb_codename="bullseye", + extra_args="--no-cache", + step_key="toolchain-bullseye-docker-image" + } + + in + + DockerImage.generateStep toolchainBullseyeSpec + + ] + } \ No newline at end of file diff --git a/buildkite/src/Jobs/Release/MinaToolchainArtifact.dhall b/buildkite/src/Jobs/Release/MinaToolchainArtifactBuster.dhall similarity index 77% rename from buildkite/src/Jobs/Release/MinaToolchainArtifact.dhall rename to buildkite/src/Jobs/Release/MinaToolchainArtifactBuster.dhall index 3780943bb12..f478a107890 100644 --- a/buildkite/src/Jobs/Release/MinaToolchainArtifact.dhall +++ b/buildkite/src/Jobs/Release/MinaToolchainArtifactBuster.dhall @@ -4,6 +4,8 @@ let Cmd = ../../Lib/Cmds.dhall let S = ../../Lib/SelectFiles.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall +let PipelineMode = ../../Pipeline/Mode.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -28,22 +30,12 @@ Pipeline.build S.strictlyEnd (S.contains "rust-toolchain.toml") ], path = "Release", - name = "MinaToolchainArtifact" + name = "MinaToolchainArtifactBuster", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Release ], + mode = PipelineMode.Type.Stable }, steps = [ - -- mina-toolchain Debian 11 "Bullseye" Toolchain - let toolchainBullseyeSpec = DockerImage.ReleaseSpec::{ - service="mina-toolchain", - deb_codename="bullseye", - extra_args="--no-cache", - step_key="toolchain-bullseye-docker-image" - } - - in - - DockerImage.generateStep toolchainBullseyeSpec, - -- mina-toolchain Debian 10 "Buster" Toolchain let toolchainBusterSpec = DockerImage.ReleaseSpec::{ service="mina-toolchain", diff --git a/buildkite/src/Jobs/Release/TestnetAlerts.dhall b/buildkite/src/Jobs/Release/TestnetAlerts.dhall index 06125455a8c..e444c4e7a33 100644 --- a/buildkite/src/Jobs/Release/TestnetAlerts.dhall +++ b/buildkite/src/Jobs/Release/TestnetAlerts.dhall @@ -7,6 +7,8 @@ let S = ../../Lib/SelectFiles.dhall let Cmd = ../../Lib/Cmds.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -24,7 +26,8 @@ Pipeline.build S.strictlyStart (S.contains "buildkite/src/Jobs/Release/TestnetAlerts") ], path = "Release", - name = "TestnetAlerts" + name = "TestnetAlerts", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Release ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Release/TraceTool.dhall b/buildkite/src/Jobs/Release/TraceTool.dhall index d4a0e4997f4..0d6770523e5 100644 --- a/buildkite/src/Jobs/Release/TraceTool.dhall +++ b/buildkite/src/Jobs/Release/TraceTool.dhall @@ -4,6 +4,8 @@ let S = ../../Lib/SelectFiles.dhall let Cmd = ../../Lib/Cmds.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -20,7 +22,8 @@ Pipeline.build spec = JobSpec::{ dirtyWhen = [ S.contains "src/app/trace-tool", S.strictlyStart (S.contains "buildkite/src/Jobs/TraceTool") ], path = "Release", - name = "TraceTool" + name = "TraceTool", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Release ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Test/ArchiveNodeUnitTest.dhall b/buildkite/src/Jobs/Test/ArchiveNodeUnitTest.dhall index e92cf6be77b..16fa19b1cc1 100644 --- a/buildkite/src/Jobs/Test/ArchiveNodeUnitTest.dhall +++ b/buildkite/src/Jobs/Test/ArchiveNodeUnitTest.dhall @@ -2,6 +2,7 @@ let Prelude = ../../External/Prelude.dhall let Cmd = ../../Lib/Cmds.dhall let S = ../../Lib/SelectFiles.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall let RunInToolchain = ../../Command/RunInToolchain.dhall @@ -27,6 +28,7 @@ Pipeline.build ] , path = "Test" , name = "ArchiveNodeUnitTest" + , tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Test ] } , steps = let outerDir : Text = diff --git a/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall b/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall index 31bd7c22eea..e1e165be74d 100644 --- a/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall +++ b/buildkite/src/Jobs/Test/BerkeleyCompatibility.dhall @@ -1,6 +1,7 @@ let JobSpec = ../../Pipeline/JobSpec.dhall let Pipeline = ../../Pipeline/Dsl.dhall - +let PipelineMode = ../../Pipeline/Mode.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let Prelude = ../../External/Prelude.dhall let Cmd = ../../Lib/Cmds.dhall @@ -25,6 +26,7 @@ in Pipeline.build Pipeline.Config::{ S.exactly "buildkite/src/Jobs/Test/BerkeleyCompatibility" "dhall" ], path = "Test", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ], name = "BerkeleyCompatibility" }, steps = [ diff --git a/buildkite/src/Jobs/Test/CheckDhall.dhall b/buildkite/src/Jobs/Test/CheckDhall.dhall index 34f8c78476e..18cace107aa 100644 --- a/buildkite/src/Jobs/Test/CheckDhall.dhall +++ b/buildkite/src/Jobs/Test/CheckDhall.dhall @@ -3,6 +3,7 @@ let D = S.PathPattern let JobSpec = ../../Pipeline/JobSpec.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let Command = ../../Command/Base.dhall let Docker = ../../Command/Docker/Type.dhall let Size = ../../Command/Size.dhall @@ -23,7 +24,8 @@ Pipeline.build S.exactly "buildkite/scripts/generate-jobs" "sh" ], path = "Test", - name = "CheckDhall" + name = "CheckDhall", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Test ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Test/CheckGraphQLSchema.dhall b/buildkite/src/Jobs/Test/CheckGraphQLSchema.dhall index be248e22210..4583a5b38bc 100644 --- a/buildkite/src/Jobs/Test/CheckGraphQLSchema.dhall +++ b/buildkite/src/Jobs/Test/CheckGraphQLSchema.dhall @@ -2,6 +2,7 @@ let S = ../../Lib/SelectFiles.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let CheckGraphQLSchema = ../../Command/CheckGraphQLSchema.dhall @@ -18,7 +19,8 @@ in Pipeline.build Pipeline.Config::{ S.strictly (S.contains "Makefile") ], path = "Test", - name = "CheckGraphQLSchema" + name = "CheckGraphQLSchema", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ] }, steps = [ CheckGraphQLSchema.step dependsOn diff --git a/buildkite/src/Jobs/Test/ConnectToBerkeley.dhall b/buildkite/src/Jobs/Test/ConnectToBerkeley.dhall index d6f404bfcf5..4537de014e9 100644 --- a/buildkite/src/Jobs/Test/ConnectToBerkeley.dhall +++ b/buildkite/src/Jobs/Test/ConnectToBerkeley.dhall @@ -2,6 +2,7 @@ let S = ../../Lib/SelectFiles.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let ConnectToTestnet = ../../Command/ConnectToTestnet.dhall @@ -19,7 +20,8 @@ in Pipeline.build Pipeline.Config::{ S.exactly "buildkite/src/Command/ConnectToTestnet" "dhall" ], path = "Test", - name = "ConnectToBerkeley" + name = "ConnectToBerkeley", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ] }, steps = [ ConnectToTestnet.step dependsOn diff --git a/buildkite/src/Jobs/Test/CoverageTearDown.dhall b/buildkite/src/Jobs/Test/CoverageTearDown.dhall index bba020d8025..aa10f2a5ff8 100644 --- a/buildkite/src/Jobs/Test/CoverageTearDown.dhall +++ b/buildkite/src/Jobs/Test/CoverageTearDown.dhall @@ -8,7 +8,7 @@ let Size = ../../Command/Size.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Pipeline = ../../Pipeline/Dsl.dhall let PipelineMode = ../../Pipeline/Mode.dhall -let PipelineStage = ../../Pipeline/Stage.dhall +let PipelineTag = ../../Pipeline/Tag.dhall in Pipeline.build Pipeline.Config::{ @@ -16,7 +16,7 @@ in Pipeline.build JobSpec::{ dirtyWhen = [ S.everything ], path = "Test", - stage = PipelineStage.Type.TearDown, + tags = [ PipelineTag.Type.TearDown ], name = "CoverageTearDown" } , steps = [ diff --git a/buildkite/src/Jobs/Test/DaemonUnitTest.dhall b/buildkite/src/Jobs/Test/DaemonUnitTest.dhall index 7b769901aa7..a21bc935750 100644 --- a/buildkite/src/Jobs/Test/DaemonUnitTest.dhall +++ b/buildkite/src/Jobs/Test/DaemonUnitTest.dhall @@ -5,6 +5,8 @@ let S = ../../Lib/SelectFiles.dhall let D = S.PathPattern let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -44,7 +46,8 @@ Pipeline.build JobSpec::{ dirtyWhen = unitDirtyWhen, path = "Test", - name = "DaemonUnitTest" + name = "DaemonUnitTest", + tags = [ PipelineTag.Type.VeryLong, PipelineTag.Type.Test ] }, steps = [ buildTestCmd "dev" "src/lib" Size.XLarge diff --git a/buildkite/src/Jobs/Test/DelegationBackendUnitTest.dhall b/buildkite/src/Jobs/Test/DelegationBackendUnitTest.dhall index f0b8e42f78e..a41a66fce87 100644 --- a/buildkite/src/Jobs/Test/DelegationBackendUnitTest.dhall +++ b/buildkite/src/Jobs/Test/DelegationBackendUnitTest.dhall @@ -4,6 +4,8 @@ let Cmd = ../../Lib/Cmds.dhall let S = ../../Lib/SelectFiles.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -22,7 +24,8 @@ Pipeline.build S.exactly "buildkite/src/Jobs/Test/DelegationBackendUnitTest" "dhall" ], path = "Test", - name = "DelegationBackendUnitTest" + name = "DelegationBackendUnitTest", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Test ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Test/DevelopCompatibility.dhall b/buildkite/src/Jobs/Test/DevelopCompatibility.dhall index 8a385706e70..b67d4e1a107 100644 --- a/buildkite/src/Jobs/Test/DevelopCompatibility.dhall +++ b/buildkite/src/Jobs/Test/DevelopCompatibility.dhall @@ -1,6 +1,7 @@ let JobSpec = ../../Pipeline/JobSpec.dhall let Pipeline = ../../Pipeline/Dsl.dhall - +let PipelineMode = ../../Pipeline/Mode.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let Prelude = ../../External/Prelude.dhall let Cmd = ../../Lib/Cmds.dhall @@ -25,6 +26,7 @@ in Pipeline.build Pipeline.Config::{ S.exactly "buildkite/src/Jobs/Test/DevelopCompatibility" "dhall" ], path = "Test", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ], name = "DevelopCompatibility" }, steps = [ diff --git a/buildkite/src/Jobs/Test/FuzzyZkappTest.dhall b/buildkite/src/Jobs/Test/FuzzyZkappTest.dhall index 235c34cb22a..87c03c14483 100644 --- a/buildkite/src/Jobs/Test/FuzzyZkappTest.dhall +++ b/buildkite/src/Jobs/Test/FuzzyZkappTest.dhall @@ -6,6 +6,8 @@ let D = S.PathPattern let Pipeline = ../../Pipeline/Dsl.dhall let PipelineMode = ../../Pipeline/Mode.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall let RunInToolchain = ../../Command/RunInToolchain.dhall @@ -45,6 +47,7 @@ Pipeline.build dirtyWhen = unitDirtyWhen, path = "Test", name = "FuzzyZkappTest", + tags = [ PipelineTag.Type.VeryLong, PipelineTag.Type.Test ], mode = PipelineMode.Type.Stable }, steps = [ diff --git a/buildkite/src/Jobs/Test/Libp2pUnitTest.dhall b/buildkite/src/Jobs/Test/Libp2pUnitTest.dhall index e22384dc2ba..76098a7f444 100644 --- a/buildkite/src/Jobs/Test/Libp2pUnitTest.dhall +++ b/buildkite/src/Jobs/Test/Libp2pUnitTest.dhall @@ -4,6 +4,7 @@ let Cmd = ../../Lib/Cmds.dhall let S = ../../Lib/SelectFiles.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -23,7 +24,8 @@ Pipeline.build S.exactly "buildkite/src/Jobs/Test/Libp2pUnitTest" "dhall" ], path = "Test", - name = "Libp2pUnitTest" + name = "Libp2pUnitTest", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Test ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Test/RosettaIntegrationTests.dhall b/buildkite/src/Jobs/Test/RosettaIntegrationTests.dhall index 4b8d0c73302..06f2b20473c 100644 --- a/buildkite/src/Jobs/Test/RosettaIntegrationTests.dhall +++ b/buildkite/src/Jobs/Test/RosettaIntegrationTests.dhall @@ -5,6 +5,7 @@ let Cmd = ../../Lib/Cmds.dhall let S = ../../Lib/SelectFiles.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -32,7 +33,8 @@ Pipeline.build JobSpec::{ dirtyWhen = dirtyWhen, path = "Test", - name = "RosettaIntegrationTests" + name = "RosettaIntegrationTests", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ] } , steps = [ Command.build diff --git a/buildkite/src/Jobs/Test/RosettaUnitTest.dhall b/buildkite/src/Jobs/Test/RosettaUnitTest.dhall index 7e802917eff..6375974d206 100644 --- a/buildkite/src/Jobs/Test/RosettaUnitTest.dhall +++ b/buildkite/src/Jobs/Test/RosettaUnitTest.dhall @@ -5,6 +5,7 @@ let S = ../../Lib/SelectFiles.dhall let D = S.PathPattern let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -41,7 +42,8 @@ Pipeline.build JobSpec::{ dirtyWhen = unitDirtyWhen, path = "Test", - name = "RosettaUnitTest" + name = "RosettaUnitTest", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ] }, steps = [ buildTestCmd "dev" "src/app/rosetta" Size.Small diff --git a/buildkite/src/Jobs/Test/RunSnarkProfiler.dhall b/buildkite/src/Jobs/Test/RunSnarkProfiler.dhall index dee246854be..7a8b0251f5a 100644 --- a/buildkite/src/Jobs/Test/RunSnarkProfiler.dhall +++ b/buildkite/src/Jobs/Test/RunSnarkProfiler.dhall @@ -5,6 +5,7 @@ let S = ../../Lib/SelectFiles.dhall let D = S.PathPattern let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -54,7 +55,8 @@ Pipeline.build JobSpec::{ dirtyWhen = lintDirtyWhen, path = "Test", - name = "RunSnarkProfiler" + name = "RunSnarkProfiler", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ] }, steps = [ buildTestCmd Size.Small dependsOn diff --git a/buildkite/src/Jobs/Test/SingleNodeTest.dhall b/buildkite/src/Jobs/Test/SingleNodeTest.dhall index 06ed548a2f3..8f85ec04140 100644 --- a/buildkite/src/Jobs/Test/SingleNodeTest.dhall +++ b/buildkite/src/Jobs/Test/SingleNodeTest.dhall @@ -5,6 +5,8 @@ let S = ../../Lib/SelectFiles.dhall let D = S.PathPattern let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -56,7 +58,8 @@ Pipeline.build JobSpec::{ dirtyWhen = unitDirtyWhen, path = "Test", - name = "SingleNodeTest" + name = "SingleNodeTest", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ] }, steps = [ buildTestCmd "dev" "src/test/command_line_tests/command_line_tests.exe" Size.XLarge diff --git a/buildkite/src/Jobs/Test/SnarkyJSTest.dhall b/buildkite/src/Jobs/Test/SnarkyJSTest.dhall index d5054981a12..b2027f9863b 100644 --- a/buildkite/src/Jobs/Test/SnarkyJSTest.dhall +++ b/buildkite/src/Jobs/Test/SnarkyJSTest.dhall @@ -2,6 +2,7 @@ let S = ../../Lib/SelectFiles.dhall let B = ../../External/Buildkite.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -24,7 +25,8 @@ Pipeline.build S.strictlyStart (S.contains "src/lib") ], path = "Test", - name = "SnarkyJSTest" + name = "SnarkyJSTest", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ] }, steps = [ Command.build diff --git a/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall b/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall index be2e42fee41..2e918ff3432 100644 --- a/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall +++ b/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall @@ -3,15 +3,15 @@ let S = ../../Lib/SelectFiles.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Pipeline = ../../Pipeline/Dsl.dhall let PipelineMode = ../../Pipeline/Mode.dhall +let PipelineTag = ../../Pipeline/Tag.dhall + let TestExecutive = ../../Command/TestExecutive.dhall let dependsOn = [ - { name = "TestnetIntegrationTests", key = "build-test-executive" }, { name = "MinaArtifactBullseye", key = "daemon-berkeley-bullseye-docker-image" }, { name = "MinaArtifactBullseye", key = "archive-bullseye-docker-image" } ] let dependsOnJs = [ - { name = "TestnetIntegrationTests", key = "build-test-executive" }, { name = "TestnetIntegrationTests", key = "build-js-tests" }, { name = "MinaArtifactBullseye", key = "daemon-berkeley-bullseye-docker-image" }, { name = "MinaArtifactBullseye", key = "archive-bullseye-docker-image" } @@ -30,10 +30,10 @@ in Pipeline.build Pipeline.Config::{ ], path = "Test", name = "TestnetIntegrationTests", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ], mode = PipelineMode.Type.Stable }, steps = [ - TestExecutive.build "integration_tests", TestExecutive.buildJs "integration_tests", TestExecutive.execute "peers-reliability" dependsOn, TestExecutive.execute "chain-reliability" dependsOn, diff --git a/buildkite/src/Jobs/Test/TestnetIntegrationTestsLong.dhall b/buildkite/src/Jobs/Test/TestnetIntegrationTestsLong.dhall index feef489902b..271a99d08e9 100644 --- a/buildkite/src/Jobs/Test/TestnetIntegrationTestsLong.dhall +++ b/buildkite/src/Jobs/Test/TestnetIntegrationTestsLong.dhall @@ -3,10 +3,10 @@ let S = ../../Lib/SelectFiles.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Pipeline = ../../Pipeline/Dsl.dhall let PipelineMode = ../../Pipeline/Mode.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let TestExecutive = ../../Command/TestExecutive.dhall let dependsOn = [ - { name = "TestnetIntegrationTests", key = "build-test-executive" }, { name = "MinaArtifactBullseye", key = "daemon-berkeley-bullseye-docker-image" }, { name = "MinaArtifactBullseye", key = "archive-bullseye-docker-image" } ] @@ -24,7 +24,8 @@ in Pipeline.build Pipeline.Config::{ ], path = "Test", name = "TestnetIntegrationTestsLong", - mode = PipelineMode.Type.Stable + mode = PipelineMode.Type.Stable, + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ] }, steps = [ TestExecutive.execute "hard-fork" dependsOn diff --git a/buildkite/src/Jobs/Test/ValidationService.dhall b/buildkite/src/Jobs/Test/ValidationService.dhall index 1c2ee6fa571..cce41331433 100644 --- a/buildkite/src/Jobs/Test/ValidationService.dhall +++ b/buildkite/src/Jobs/Test/ValidationService.dhall @@ -1,6 +1,7 @@ let S = ../../Lib/SelectFiles.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let Command = ../../Command/Base.dhall let Docker = ../../Command/Docker/Type.dhall let Size = ../../Command/Size.dhall @@ -15,7 +16,8 @@ in Pipeline.build Pipeline.Config::{ S.strictlyStart (S.contains ValidationService.rootPath) ], path = "Test", - name = "ValidationService" + name = "ValidationService", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Test ] }, steps = [ Command.build Command.Config::{ diff --git a/buildkite/src/Jobs/Test/VersionLint.dhall b/buildkite/src/Jobs/Test/VersionLint.dhall index fcbdc34f21a..a0aa132649a 100644 --- a/buildkite/src/Jobs/Test/VersionLint.dhall +++ b/buildkite/src/Jobs/Test/VersionLint.dhall @@ -5,6 +5,7 @@ let S = ../../Lib/SelectFiles.dhall let D = S.PathPattern let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -56,7 +57,8 @@ Pipeline.build JobSpec::{ dirtyWhen = lintDirtyWhen, path = "Test", - name = "VersionLint" + name = "VersionLint", + tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ] }, steps = [ buildTestCmd "develop" Size.Small dependsOn diff --git a/buildkite/src/Jobs/Test/ZkappMetrics.dhall b/buildkite/src/Jobs/Test/ZkappMetrics.dhall index 4bf912a70c4..31ec5072d7b 100644 --- a/buildkite/src/Jobs/Test/ZkappMetrics.dhall +++ b/buildkite/src/Jobs/Test/ZkappMetrics.dhall @@ -2,6 +2,7 @@ let Prelude = ../../External/Prelude.dhall let S = ../../Lib/SelectFiles.dhall let Cmd = ../../Lib/Cmds.dhall let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let Command = ../../Command/Base.dhall let RunInToolchain = ../../Command/RunInToolchain.dhall let WithCargo = ../../Command/WithCargo.dhall @@ -20,6 +21,7 @@ Pipeline.build ] , path = "Test" , name = "ZkappMetrics" + , tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Test ] } , steps = [ Command.build diff --git a/buildkite/src/Jobs/Test/ZkappTestToolUnitTest.dhall b/buildkite/src/Jobs/Test/ZkappTestToolUnitTest.dhall index 45b00d8c2b5..7d0996abe30 100644 --- a/buildkite/src/Jobs/Test/ZkappTestToolUnitTest.dhall +++ b/buildkite/src/Jobs/Test/ZkappTestToolUnitTest.dhall @@ -5,6 +5,7 @@ let S = ../../Lib/SelectFiles.dhall let D = S.PathPattern let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -41,7 +42,8 @@ Pipeline.build JobSpec::{ dirtyWhen = unitDirtyWhen, path = "Test", - name = "ZkappTestToolUnitTest" + name = "ZkappTestToolUnitTest", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Test ] }, steps = [ buildTestCmd "dev" "src/app/zkapp_test_transaction" Size.Small diff --git a/buildkite/src/Jobs/Test/ZkappsExamplesTest.dhall b/buildkite/src/Jobs/Test/ZkappsExamplesTest.dhall index 0fcdc592d98..9a6e4be6c95 100644 --- a/buildkite/src/Jobs/Test/ZkappsExamplesTest.dhall +++ b/buildkite/src/Jobs/Test/ZkappsExamplesTest.dhall @@ -5,6 +5,7 @@ let S = ../../Lib/SelectFiles.dhall let D = S.PathPattern let Pipeline = ../../Pipeline/Dsl.dhall +let PipelineTag = ../../Pipeline/Tag.dhall let JobSpec = ../../Pipeline/JobSpec.dhall let Command = ../../Command/Base.dhall @@ -43,7 +44,8 @@ Pipeline.build JobSpec::{ dirtyWhen = unitDirtyWhen, path = "Test", - name = "ZkappsExamplesTest" + name = "ZkappsExamplesTest", + tags = [ PipelineTag.Type.Fast, PipelineTag.Type.Test ] }, steps = [ buildTestCmd "dev" Size.XLarge diff --git a/buildkite/src/Monorepo.dhall b/buildkite/src/Monorepo.dhall index 64783a0582f..3281333b8e6 100644 --- a/buildkite/src/Monorepo.dhall +++ b/buildkite/src/Monorepo.dhall @@ -11,12 +11,14 @@ let Docker = ./Command/Docker/Type.dhall let JobSpec = ./Pipeline/JobSpec.dhall let Pipeline = ./Pipeline/Dsl.dhall let PipelineMode = ./Pipeline/Mode.dhall -let PipelineStage = ./Pipeline/Stage.dhall +let PipelineFilter = ./Pipeline/Filter.dhall +let PipelineTag = ./Pipeline/Tag.dhall let Size = ./Command/Size.dhall let triggerCommand = ./Pipeline/TriggerCommand.dhall let mode = env:BUILDKITE_PIPELINE_MODE as Text ? "PullRequest" -let stage = env:BUILDKITE_PIPELINE_STAGE as Text ? "Test" +let include_tags = env:BUILDKITE_PIPELINE_TAGS_INCL as Text ? "Fast" +let exclude_tags = env:BUILDKITE_PIPELINE_TAGS_EXCL as Text ? "" let jobs : List JobSpec.Type = List/map @@ -33,34 +35,36 @@ let prefixCommands = [ -- Run a job if we touched a dirty path -let commands: Text -> Text -> List Cmd.Type = \(targetStage: Text) -> \(targetMode: Text) -> +let commands: PipelineFilter.Type -> PipelineMode.Type -> List Cmd.Type = \(filter: PipelineFilter.Type) -> \(mode: PipelineMode.Type) -> Prelude.List.map JobSpec.Type Cmd.Type (\(job: JobSpec.Type) -> let jobMode = PipelineMode.capitalName job.mode - let jobStage = PipelineStage.capitalName job.stage - + let targetMode = PipelineMode.capitalName mode + let targetTags = PipelineFilter.tags filter + let filter = PipelineFilter.show filter + let isIncluded = Prelude.Bool.show (PipelineTag.contains job.tags targetTags) let dirtyWhen = SelectFiles.compile job.dirtyWhen let trigger = triggerCommand "src/Jobs/${job.path}/${job.name}.dhall" let pipelineHandlers = { PullRequest = '' if [ "${targetMode}" == "PullRequest" ]; then - if [ "${jobStage}" == "${targetStage}" ]; then + if [ "${isIncluded}" == "True" ]; then if (cat _computed_diff.txt | egrep -q '${dirtyWhen}'); then echo "Triggering ${job.name} for reason:" cat _computed_diff.txt | egrep '${dirtyWhen}' ${Cmd.format trigger} fi else - echo "Skipping ${job.name} because this is a ${targetStage} stage" + echo "Skipping ${job.name} because this is a ${filter} stage" fi else - if [ "${jobStage}" == "${targetStage}" ]; then + if [ "${isIncluded}" == "True" ]; then echo "Triggering ${job.name} because this is a stable buildkite run" ${Cmd.format trigger} else - echo "Skipping ${job.name} because this is a ${targetStage} stage" + echo "Skipping ${job.name} because this is a ${filter} stage" fi fi '', @@ -68,11 +72,11 @@ let commands: Text -> Text -> List Cmd.Type = \(targetStage: Text) -> \(target if [ "${targetMode}" == "PullRequest" ]; then echo "Skipping ${job.name} because this is a PR buildkite run" else - if [ "${jobStage}" == "${targetStage}" ]; then + if [ "${isIncluded}" == "True" ]; then echo "Triggering ${job.name} because this is a stable buildkite run" ${Cmd.format trigger} else - echo "Skipping ${job.name} because this is a ${targetStage} stage" + echo "Skipping ${job.name} because this is a ${filter} stage" fi fi '' @@ -81,23 +85,29 @@ let commands: Text -> Text -> List Cmd.Type = \(targetStage: Text) -> \(target ) jobs -in Pipeline.build Pipeline.Config::{ - spec = JobSpec::{ - name = "monorepo-triage", - -- TODO: Clean up this code so we don't need an unused dirtyWhen here - dirtyWhen = [ SelectFiles.everything ] - }, - steps = [ - Command.build - Command.Config::{ - commands = prefixCommands # (commands stage mode), - label = "Monorepo triage ${stage}", - key = "cmds-${stage}", - target = Size.Small, - docker = Some Docker::{ - image = (./Constants/ContainerImages.dhall).toolchainBase, - environment = ["BUILDKITE_AGENT_ACCESS_TOKEN", "BUILDKITE_INCREMENTAL"] - } - } - ] -} +in + +(\(args : { filter : PipelineFilter.Type, mode: PipelineMode.Type }) -> + let pipelineType = Pipeline.build Pipeline.Config::{ + spec = JobSpec::{ + name = "monorepo-triage-${PipelineFilter.show args.filter}", + -- TODO: Clean up this code so we don't need an unused dirtyWhen here + dirtyWhen = [ SelectFiles.everything ] + }, + steps = [ + Command.build + Command.Config::{ + commands = prefixCommands # (commands args.filter args.mode), + label = "Monorepo triage ${PipelineFilter.show args.filter}", + key = "cmds-${PipelineFilter.show args.filter}", + target = Size.Small, + docker = Some Docker::{ + image = (./Constants/ContainerImages.dhall).toolchainBase, + environment = ["BUILDKITE_AGENT_ACCESS_TOKEN", "BUILDKITE_INCREMENTAL"] + } + } + ] + } + in pipelineType.pipeline +) + diff --git a/buildkite/src/Pipeline/Filter.dhall b/buildkite/src/Pipeline/Filter.dhall new file mode 100644 index 00000000000..fc9cd7dd5ac --- /dev/null +++ b/buildkite/src/Pipeline/Filter.dhall @@ -0,0 +1,33 @@ +-- Tag defines pipeline +-- Using tags one can tailor pipeline for any need. Each job should be tagged with one or several tags +-- then on pipeline settings we can define which tagged jobs to include or exclue in pipeline + +let Prelude = ../External/Prelude.dhall +let Tag = ./Tag.dhall + +let Filter : Type = < FastOnly | Long | LongAndVeryLong | TearDownOnly | AllTests > + +let tags: Filter -> List Tag.Type = \(filter: Filter) -> + merge { + FastOnly = [ Tag.Type.Fast ] + , LongAndVeryLong = [ Tag.Type.Long, Tag.Type.VeryLong ] + , Long = [ Tag.Type.Long ] + , TearDownOnly = [ Tag.Type.TearDown ] + , AllTests = [ Tag.Type.Lint, Tag.Type.Release, Tag.Type.Test ] + } filter + +let show: Filter -> Text = \(filter: Filter) -> + merge { + FastOnly = "FastOnly" + , LongAndVeryLong = "LongAndVeryLong" + , Long = "Long" + , TearDownOnly = "TearDownOnly" + , AllTests = "AllTests" + } filter + +in +{ + Type = Filter, + tags = tags, + show = show +} \ No newline at end of file diff --git a/buildkite/src/Pipeline/JobSpec.dhall b/buildkite/src/Pipeline/JobSpec.dhall index 187835c7d90..ea0373a0c2d 100644 --- a/buildkite/src/Pipeline/JobSpec.dhall +++ b/buildkite/src/Pipeline/JobSpec.dhall @@ -1,6 +1,6 @@ let SelectFiles = ../Lib/SelectFiles.dhall let PipelineMode = ./Mode.dhall -let PipelineStage = ./Stage.dhall +let PipelineTag = ./Tag.dhall in @@ -11,12 +11,12 @@ in path: Text, name: Text, mode: PipelineMode.Type, - stage: PipelineStage.Type, + tags: List PipelineTag.Type, dirtyWhen: List SelectFiles.Type }, default = { path = ".", mode = PipelineMode.Type.PullRequest, - stage = PipelineStage.Type.Test + tags = [ PipelineTag.Type.Fast ] } } diff --git a/buildkite/src/Pipeline/Stage.dhall b/buildkite/src/Pipeline/Stage.dhall deleted file mode 100644 index fffad54c7a2..00000000000 --- a/buildkite/src/Pipeline/Stage.dhall +++ /dev/null @@ -1,44 +0,0 @@ --- Mode defines pipeline stages --- --- A pipeline in order to be faster and more cost efficient can have up to 3 stages --- Between each stages there is a '- wait' step defined which cause buildkite to wait --- for ALL jobs to complete before running any job from next stage. --- Current design defines three stages: --- - Stage 1 -> contains fastest and most independent jobs which are supposed to provide quickest feedback possible --- - Stage 2 -> contains heavy jobs that should be run only on clean code (no merges issues or lints problems) --- - Tear down -> should contains all clean up or reporting jobs. For example test coverage gathering - -let Prelude = ../External/Prelude.dhall - -let Stage : Type = < Test | TearDown > - -let toNatural: Stage -> Natural = \(stage: Stage) -> - merge { - Test = 1 - , TearDown = 2 - } stage - -let equal: Stage -> Stage -> Bool = \(left: Stage) -> \(right: Stage) -> - Prelude.Natural.equal (toNatural left) (toNatural right) - -let capitalName = \(stage : Stage) -> - merge { - Test = "Test" - , TearDown = "TearDown" - } stage - -let lowerName = \(stage : Stage) -> - merge { - Test = "test" - , TearDown = "tearDown" - } stage - - -in -{ - Type = Stage, - capitalName = capitalName, - lowerName = lowerName, - toNatural = toNatural, - equal = equal -} \ No newline at end of file diff --git a/buildkite/src/Pipeline/Tag.dhall b/buildkite/src/Pipeline/Tag.dhall new file mode 100644 index 00000000000..b6018062e67 --- /dev/null +++ b/buildkite/src/Pipeline/Tag.dhall @@ -0,0 +1,63 @@ +-- Tag defines pipeline +-- Using tags one can tailor pipeline for any need. Each job should be tagged with one or several tags +-- then on pipeline settings we can define which tagged jobs to include or exclue in pipeline + +let Prelude = ../External/Prelude.dhall +let List/any = Prelude.List.any + +let Tag : Type = < Fast | Long | VeryLong | TearDown | Lint | Release | Test > + +let toNatural: Tag -> Natural = \(tag: Tag) -> + merge { + Fast = 1 + , Long = 2 + , VeryLong = 3 + , TearDown = 4 + , Lint = 5 + , Release = 6 + , Test = 7 + } tag + +let equal: Tag -> Tag -> Bool = \(left: Tag) -> \(right: Tag) -> + Prelude.Natural.equal (toNatural left) (toNatural right) + + +let hasAny: Tag -> List Tag -> Bool = \(input: Tag) -> \(tags: List Tag) -> + List/any Tag (\(x: Tag) -> equal x input ) tags + +let contains: List Tag -> List Tag -> Bool = \(input: List Tag) -> \(tags: List Tag) -> + List/any Tag (\(x: Tag) -> hasAny x tags ) input + +let capitalName = \(tag : Tag) -> + merge { + Fast = "Fast" + , Long = "Long" + , VeryLong = "VeryLong" + , TearDown = "TearDown" + , Lint = "Lint" + , Release = "Release" + , Test = "Test" + } tag + +let lowerName = \(tag : Tag) -> + merge { + Fast = "fast" + , Long = "long" + , VeryLong = "veryLong" + , TearDown = "tearDown" + , Lint = "lint" + , Release = "release" + , Test = "test" + } tag + + +in +{ + Type = Tag, + capitalName = capitalName, + lowerName = lowerName, + toNatural = toNatural, + equal = equal, + hasAny = hasAny, + contains = contains +} \ No newline at end of file diff --git a/buildkite/src/Prepare.dhall b/buildkite/src/Prepare.dhall index 101e22be770..5b78ff24369 100644 --- a/buildkite/src/Prepare.dhall +++ b/buildkite/src/Prepare.dhall @@ -8,11 +8,14 @@ let Command = ./Command/Base.dhall let Docker = ./Command/Docker/Type.dhall let JobSpec = ./Pipeline/JobSpec.dhall let Pipeline = ./Pipeline/Dsl.dhall +let PipelineMode = ./Pipeline/Mode.dhall +let PipelineFilter = ./Pipeline/Filter.dhall +let PipelineTag = ./Pipeline/Tag.dhall let Size = ./Command/Size.dhall let triggerCommand = ./Pipeline/TriggerCommand.dhall let mode = env:BUILDKITE_PIPELINE_MODE as Text ? "PullRequest" -let stage = env:BUILDKITE_PIPELINE_STAGE as Text ? "Test" +let filter = env:BUILDKITE_PIPELINE_FILTER as Text ? "FastOnly" let config : Pipeline.Config.Type = Pipeline.Config::{ spec = JobSpec::{ @@ -24,12 +27,12 @@ let config : Pipeline.Config.Type = Pipeline.Config::{ Command.build Command.Config::{ commands = [ Cmd.run "export BUILDKITE_PIPELINE_MODE=${mode}", - Cmd.run "export BUILDKITE_PIPELINE_STAGE=${stage}", + Cmd.run "export BUILDKITE_PIPELINE_FILTER=${filter}", Cmd.run "./buildkite/scripts/generate-jobs.sh > buildkite/src/gen/Jobs.dhall", - triggerCommand "src/Monorepo.dhall" + Cmd.quietly "dhall-to-yaml --quoted <<< '(./buildkite/src/Monorepo.dhall) { mode=(./buildkite/src/Pipeline/Mode.dhall).Type.${mode}, filter=(./buildkite/src/Pipeline/Filter.dhall).Type.${filter} }' | buildkite-agent pipeline upload" ], label = "Prepare monorepo triage", - key = "monorepo-${stage}", + key = "monorepo-${mode}-${filter}", target = Size.Small, docker = Some Docker::{ image = (./Constants/ContainerImages.dhall).toolchainBase, diff --git a/genesis_ledgers/berkeley.json b/genesis_ledgers/berkeley.json index 7e5a8f1e025..2aee5eb3f0a 100644 --- a/genesis_ledgers/berkeley.json +++ b/genesis_ledgers/berkeley.json @@ -1,6 +1,6 @@ { "genesis": { - "genesis_state_timestamp": "2023-07-05T19:01:01Z" + "genesis_state_timestamp": "2023-09-13T13:01:01Z" }, "ledger": { "name": "berkeley", @@ -18,9 +18,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -31,9 +31,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -44,9 +44,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -57,9 +57,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -70,9 +70,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -83,9 +83,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -96,9 +96,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -109,9 +109,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -122,9 +122,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -135,9 +135,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -148,9 +148,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -161,9 +161,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -174,9 +174,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -187,9 +187,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -200,9 +200,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -213,9 +213,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -226,9 +226,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -239,9 +239,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -252,9 +252,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -265,9 +265,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -278,9 +278,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -291,9 +291,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -304,9 +304,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -317,9 +317,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -330,9 +330,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -343,9 +343,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -356,9 +356,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -369,9 +369,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -382,9 +382,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -395,9 +395,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -408,9 +408,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -421,9 +421,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -434,9 +434,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -447,9 +447,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -460,9 +460,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -473,9 +473,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -486,9 +486,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -499,9 +499,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -512,9 +512,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -525,9 +525,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -538,9 +538,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -551,9 +551,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -564,9 +564,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -577,9 +577,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -590,9 +590,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -603,9 +603,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -616,9 +616,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -629,9 +629,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -642,9 +642,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -655,9 +655,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -668,9 +668,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -681,9 +681,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -694,9 +694,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -707,9 +707,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -720,9 +720,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -733,9 +733,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -746,9 +746,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -759,9 +759,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -772,9 +772,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -785,9 +785,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -798,9 +798,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -811,9 +811,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -824,9 +824,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -837,9 +837,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -850,9 +850,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -863,9 +863,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -876,9 +876,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -889,9 +889,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -902,9 +902,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -915,9 +915,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -928,9 +928,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -941,9 +941,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -954,9 +954,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -967,9 +967,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -980,9 +980,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -993,9 +993,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1006,9 +1006,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1019,9 +1019,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1032,9 +1032,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1045,9 +1045,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1058,9 +1058,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1071,9 +1071,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1084,9 +1084,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1097,9 +1097,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1110,9 +1110,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1123,9 +1123,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1136,9 +1136,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1149,9 +1149,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1162,9 +1162,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1175,9 +1175,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1188,9 +1188,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1201,9 +1201,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1214,9 +1214,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1227,9 +1227,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1240,9 +1240,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1253,9 +1253,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1266,9 +1266,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1279,9 +1279,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1292,9 +1292,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1305,9 +1305,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1318,9 +1318,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1331,9 +1331,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1344,9 +1344,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1357,9 +1357,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1370,9 +1370,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1383,9 +1383,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1396,9 +1396,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1409,9 +1409,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1422,9 +1422,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1435,9 +1435,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1448,9 +1448,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1461,9 +1461,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1474,9 +1474,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1487,9 +1487,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1500,9 +1500,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1513,9 +1513,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1526,9 +1526,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1539,9 +1539,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1552,9 +1552,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1565,9 +1565,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1578,9 +1578,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1591,9 +1591,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1604,9 +1604,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1617,9 +1617,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1630,9 +1630,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1643,9 +1643,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1656,9 +1656,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1669,9 +1669,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1682,9 +1682,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1695,9 +1695,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1708,9 +1708,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1721,9 +1721,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1734,9 +1734,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1747,9 +1747,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1760,9 +1760,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1773,9 +1773,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1786,9 +1786,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1799,9 +1799,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1812,9 +1812,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1825,9 +1825,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1838,9 +1838,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1851,9 +1851,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1864,9 +1864,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1877,9 +1877,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1890,9 +1890,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1903,9 +1903,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1916,9 +1916,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1929,9 +1929,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1942,9 +1942,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1955,9 +1955,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1968,9 +1968,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1981,9 +1981,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -1994,9 +1994,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2007,9 +2007,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2020,9 +2020,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2033,9 +2033,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2046,9 +2046,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2059,9 +2059,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2072,9 +2072,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2085,9 +2085,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2098,9 +2098,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2111,9 +2111,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2124,9 +2124,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2137,9 +2137,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2150,9 +2150,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2163,9 +2163,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2176,9 +2176,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2189,9 +2189,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2202,9 +2202,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2215,9 +2215,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2228,9 +2228,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2241,9 +2241,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2254,9 +2254,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2267,9 +2267,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2280,9 +2280,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2293,9 +2293,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2306,9 +2306,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2319,9 +2319,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2332,9 +2332,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2345,9 +2345,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2358,9 +2358,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2371,9 +2371,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2384,9 +2384,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2397,9 +2397,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2410,9 +2410,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2423,9 +2423,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2436,9 +2436,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2449,9 +2449,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2462,9 +2462,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2475,9 +2475,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2488,9 +2488,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2501,9 +2501,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2514,9 +2514,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2527,9 +2527,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2540,9 +2540,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2553,9 +2553,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2566,9 +2566,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2579,9 +2579,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2592,9 +2592,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, @@ -2605,9 +2605,9 @@ "sk": null, "timing": { "initial_minimum_balance": "1000000", - "cliff_time": ["Since_genesis","12000"], + "cliff_time": ["Since_genesis", "12000"], "cliff_amount": "500000", - "vesting_period": ["Global_slot_span","6"], + "vesting_period": ["Global_slot_span", "6"], "vesting_increment": "150" } }, diff --git a/src/lib/consensus/proof_of_stake.ml b/src/lib/consensus/proof_of_stake.ml index a9ef8cf0755..b67cd45c0d6 100644 --- a/src/lib/consensus/proof_of_stake.ml +++ b/src/lib/consensus/proof_of_stake.ml @@ -842,9 +842,9 @@ module Make_str (A : Wire_types.Concrete) = struct | _ -> respond (Provide - (Snarky_backendless.Request.Handler.run handlers - [ "Ledger Handler"; "Pending Coinbase Handler" ] - request ) ) + (Option.value_exn ~message:"unhandled request" + (Snarky_backendless.Request.Handler.run handlers request) ) + ) end let check ~context:(module Context : CONTEXT) @@ -2579,9 +2579,9 @@ module Make_str (A : Wire_types.Concrete) = struct | _ -> respond (Provide - (Snarky_backendless.Request.Handler.run handlers - [ "Ledger Handler"; "Pending Coinbase Handler" ] - request ) ) + (Option.value_exn ~message:"unhandled request" + (Snarky_backendless.Request.Handler.run handlers request) ) + ) let ledger_depth { ledger; _ } = ledger.depth end diff --git a/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml b/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml index 4e3bb0b6a95..9c8cadca30f 100644 --- a/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml +++ b/src/lib/crypto/kimchi_backend/common/plonk_constraint_system.ml @@ -1372,8 +1372,8 @@ end = struct let reduce_lincom sys (x : Fp.t Snarky_backendless.Cvar.t) = let constant, terms = Fp.( - Snarky_backendless.Cvar.to_constant_and_terms ~add ~mul ~zero:(of_int 0) - ~equal ~one:(of_int 1)) + Snarky_backendless.Cvar.to_constant_and_terms ~add ~mul ~zero ~equal + ~one) x in let terms = accumulate_terms terms in diff --git a/src/lib/crypto/proof-systems b/src/lib/crypto/proof-systems index 0467bcec007..b270e38a9fe 160000 --- a/src/lib/crypto/proof-systems +++ b/src/lib/crypto/proof-systems @@ -1 +1 @@ -Subproject commit 0467bcec00792b590239e15107718dabfc84d10a +Subproject commit b270e38a9fe6525bf8f4aef924de8dcfdf7e3fc5 diff --git a/src/lib/pickles/README.md b/src/lib/pickles/README.md index b356c606570..e12164e98f0 100644 --- a/src/lib/pickles/README.md +++ b/src/lib/pickles/README.md @@ -20,7 +20,7 @@ A particularity of Pickles is to use the power of the OCaml type system to encode runtime invariants like vector sizes, heterogeneous lists and others at the type level to avoid constructing some statements that might be wrong at compile time. Some encoded theories can be found in -[`Pickles_types`](pickles_types). +[`Pickles_types`](../pickles_types/). Some types are parametrized by type-level defined naturals. ## Coding guidelines diff --git a/src/lib/snarky b/src/lib/snarky index e72bb2246ba..94b2df82129 160000 --- a/src/lib/snarky +++ b/src/lib/snarky @@ -1 +1 @@ -Subproject commit e72bb2246ba5ed2a15d4750ccf84dd977261c4d3 +Subproject commit 94b2df82129658d505b612806a5804bc192f13f0 diff --git a/src/lib/snarkyjs b/src/lib/snarkyjs index a7e2cc77ad5..d4e4cfbba77 160000 --- a/src/lib/snarkyjs +++ b/src/lib/snarkyjs @@ -1 +1 @@ -Subproject commit a7e2cc77ad586d589629f4781f7d7b5303915142 +Subproject commit d4e4cfbba7705a0667d59c888123f32d44d35aba