diff --git a/.docker/subzero-dev.Dockerfile b/.docker/subzero-dev.Dockerfile index e389d8e222..4b902b51ba 100644 --- a/.docker/subzero-dev.Dockerfile +++ b/.docker/subzero-dev.Dockerfile @@ -2,10 +2,10 @@ # because they're too often out of date, # preventing them from being used to build subzero/Polkadot. +# FROM phusion/baseimage:jammy-1.0.1 as baseimage FROM phusion/baseimage:focal-1.2.0 as baseimage ENV DEBIAN_FRONTEND=noninteractive - RUN apt-get update && \ apt-get dist-upgrade -y -o Dpkg::Options::="--force-confold" && \ apt-get install -y cmake pkg-config libssl-dev git clang diff --git a/Cargo.lock b/Cargo.lock index edf747cef2..73f67549cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -84,7 +84,7 @@ dependencies = [ [[package]] name = "alphaville" -version = "3.2.62" +version = "3.2.67" dependencies = [ "alphaville-runtime", "assert_cmd", @@ -169,7 +169,7 @@ dependencies = [ [[package]] name = "alphaville-runtime" -version = "3.2.62" +version = "3.2.67" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -179,6 +179,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", + "gamedao-battlepass", "gamedao-control", "gamedao-flow", "gamedao-sense", @@ -3060,6 +3061,34 @@ dependencies = [ "byteorder", ] +[[package]] +name = "gamedao-battlepass" +version = "1.2.0" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-support-test", + "frame-system", + "gamedao-control", + "gamedao-traits", + "orml-currencies", + "orml-tokens", + "orml-traits", + "pallet-balances", + "pallet-rmrk-core", + "pallet-uniques", + "parity-scale-codec", + "rand 0.8.5", + "rmrk-traits", + "scale-info", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", + "sp-storage", +] + [[package]] name = "gamedao-control" version = "1.2.0" @@ -11599,7 +11628,7 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subzero-dev-node" -version = "3.2.63" +version = "3.2.67" dependencies = [ "clap 3.2.17", "cumulus-client-cli", @@ -11670,7 +11699,7 @@ dependencies = [ [[package]] name = "subzero-dev-runtime" -version = "3.2.63" +version = "3.2.67" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-dmp-queue", @@ -11688,6 +11717,7 @@ dependencies = [ "frame-system-benchmarking", "frame-system-rpc-runtime-api", "frame-try-runtime", + "gamedao-battlepass", "gamedao-control", "gamedao-flow", "gamedao-sense", diff --git a/bin/alphaville/cli/Cargo.toml b/bin/alphaville/cli/Cargo.toml index 009043d0f4..cbf4719551 100644 --- a/bin/alphaville/cli/Cargo.toml +++ b/bin/alphaville/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alphaville" -version = "3.2.62" +version = "3.2.67" authors = ["ZERO "] description = "build video games and beyond" build = "build.rs" diff --git a/bin/alphaville/runtime/Cargo.toml b/bin/alphaville/runtime/Cargo.toml index 61738af97c..9f28cfedfd 100644 --- a/bin/alphaville/runtime/Cargo.toml +++ b/bin/alphaville/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "alphaville-runtime" -version = "3.2.62" +version = "3.2.67" authors = ["ZERO "] edition = "2021" build = "build.rs" diff --git a/bin/alphaville/runtime/src/lib.rs b/bin/alphaville/runtime/src/lib.rs index a9ba16e3e1..2a0b77165a 100644 --- a/bin/alphaville/runtime/src/lib.rs +++ b/bin/alphaville/runtime/src/lib.rs @@ -139,7 +139,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // and set impl_version to 0. If only runtime // implementation changes and behavior does not, then leave spec_version as // is and increment impl_version. - spec_version: 62, + spec_version: 67, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, diff --git a/bin/subzero-dev/node/Cargo.toml b/bin/subzero-dev/node/Cargo.toml index 82da4abe7a..dccfb484db 100644 --- a/bin/subzero-dev/node/Cargo.toml +++ b/bin/subzero-dev/node/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subzero-dev-node" -version = "3.2.66" +version = "3.2.67" authors = ["ZERO "] description = "A substrate node for video games and beyond." license = "GPL-3.0-or-later WITH Classpath-exception-2.0" diff --git a/bin/subzero-dev/runtime/Cargo.toml b/bin/subzero-dev/runtime/Cargo.toml index f92c27e159..e8b59290b9 100644 --- a/bin/subzero-dev/runtime/Cargo.toml +++ b/bin/subzero-dev/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subzero-dev-runtime" -version = "3.2.66" +version = "3.2.67" authors = ["ZERO "] license = "GPL-3.0-or-later WITH Classpath-exception-2.0" homepage = "https://zero.io" diff --git a/bin/subzero-dev/runtime/src/lib.rs b/bin/subzero-dev/runtime/src/lib.rs index 95b5e55822..b71a30e3d3 100644 --- a/bin/subzero-dev/runtime/src/lib.rs +++ b/bin/subzero-dev/runtime/src/lib.rs @@ -160,7 +160,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("subzero"), impl_name: create_runtime_str!("dev"), authoring_version: 75, - spec_version: 66, + spec_version: 67, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, diff --git a/makefile b/makefile index 9d605381b3..4f03be0aed 100644 --- a/makefile +++ b/makefile @@ -1,18 +1,18 @@ -# build alphaville docker - +# alphaville docker alphaville-docker: docker build -t playzero/alphaville:local -f .docker/alphaville.Dockerfile . - alphaville-run: docker run \ -p 9933:9933 -p 9944:9944 -p 30333:30333 \ playzero/alphaville:local /usr/local/bin/alphaville \ --dev --name alphaville --ws-external \ --rpc-external --rpc-cors all --rpc-methods unsafe +# build subzero-dev docker +dev-docker-build: + docker build -t playzero/subzero:dev -f .docker/subzero-dev.Dockerfile . # # -# reset: cargo clean diff --git a/modules/gamedao-protocol b/modules/gamedao-protocol index e6b8f77f6a..a91178e582 160000 --- a/modules/gamedao-protocol +++ b/modules/gamedao-protocol @@ -1 +1 @@ -Subproject commit e6b8f77f6ac8f03a814e9907a93e407cfee09219 +Subproject commit a91178e5829eab76c5504f33c3ba58cf341f26d5