git.delta.rocks / unique-network / refs/commits / 019c2ca599b7

difftreelog

Fix broken dependency on ed25519-dalek

Greg Zaitsev2020-07-17parent: #37abce6.patch.diff
in: master

6 files changed

deletedDockerfile-productiondiffbeforeafterboth
--- a/Dockerfile-production
+++ /dev/null
@@ -1,47 +0,0 @@
-# ===== BUILD ======
-
-FROM phusion/baseimage:0.10.2 as builder
-LABEL maintainer="gz@usetech.com"
-
-ENV WASM_TOOLCHAIN=nightly-2020-05-01
-
-ARG PROFILE=release
-
-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
-
-# Get project and run it
-#RUN git clone https://github.com/usetech-llc/nft_parachain /nft_parachain
-RUN mkdir nft_parachain
-WORKDIR /nft_parachain
-COPY . .
-
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
-	export PATH="$PATH:$HOME/.cargo/bin" && \
-	rustup toolchain uninstall $(rustup toolchain list) && \
-	rustup default 1.44.0 && \
-	rustup toolchain install $WASM_TOOLCHAIN && \
-	rustup target add wasm32-unknown-unknown --toolchain $WASM_TOOLCHAIN && \
-    rustup target list --installed && \
-    rustup show && \
-	cargo build "--$PROFILE" 
-	# && \
-	# cargo test
-
-RUN cd target/release && ls -la
-
-# ===== RUN ======
-
-FROM phusion/baseimage:0.10.2
-ARG PROFILE=release
-
-COPY --from=builder /nft_parachain/target/$PROFILE/nft /usr/local/bin
-
-EXPOSE 9944
-VOLUME ["/chain-data"]
-
-# Copy and run start script
-COPY ["./run.sh", "./run.sh"]
-RUN chmod +x ./run.sh
-CMD ["bash", "-c", "./run.sh"]
addedDockerfile-testnetdiffbeforeafterboth
--- /dev/null
+++ b/Dockerfile-testnet
@@ -0,0 +1,47 @@
+# ===== BUILD ======
+
+FROM phusion/baseimage:0.10.2 as builder
+LABEL maintainer="gz@usetech.com"
+
+ENV WASM_TOOLCHAIN=nightly-2020-05-01
+
+ARG PROFILE=release
+
+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
+
+# Get project and run it
+#RUN git clone https://github.com/usetech-llc/nft_parachain /nft_parachain
+RUN mkdir nft_parachain
+WORKDIR /nft_parachain
+COPY . .
+
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
+	export PATH="$PATH:$HOME/.cargo/bin" && \
+	rustup toolchain uninstall $(rustup toolchain list) && \
+	rustup default 1.44.0 && \
+	rustup toolchain install $WASM_TOOLCHAIN && \
+	rustup target add wasm32-unknown-unknown --toolchain $WASM_TOOLCHAIN && \
+    rustup target list --installed && \
+    rustup show && \
+	cargo build "--$PROFILE" 
+	# && \
+	# cargo test
+
+RUN cd target/release && ls -la
+
+# ===== RUN ======
+
+FROM phusion/baseimage:0.10.2
+ARG PROFILE=release
+
+COPY --from=builder /nft_parachain/target/$PROFILE/nft /usr/local/bin
+
+EXPOSE 9944
+VOLUME ["/chain-data"]
+
+# Copy and run start script
+COPY ["./run.sh", "./run.sh"]
+RUN chmod +x ./run.sh
+CMD ["bash", "-c", "./run.sh"]
deleteddocker-compose-production.ymldiffbeforeafterboth
--- a/docker-compose-production.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-version: "3.5"
-
-services:
-  node_einstein:
-    image: nft-parachain
-    ports:
-      - 9944:9944
-    build:
-      context: ./
-      dockerfile: Dockerfile-production
-    volumes:
-      - ./chain-data-einstein:/chain-data
-    networks: 
-      - substrate_network
-    environment:
-      - NODE=einstein
-
-  node_newton:
-    image: nft-parachain
-    ports:
-      - 9945:9944
-    build:
-      context: ./
-      dockerfile: Dockerfile-production
-    volumes:
-      - ./chain-data-newton:/chain-data
-    networks: 
-      - substrate_network
-    environment:
-      - NODE=newton
-
-networks: 
-  substrate_network:
-    driver: bridge
-    name: substrate_network
addeddocker-compose-testnet.ymldiffbeforeafterboth
--- /dev/null
+++ b/docker-compose-testnet.yml
@@ -0,0 +1,35 @@
+version: "3.5"
+
+services:
+  node_einstein:
+    image: nft-parachain
+    ports:
+      - 9944:9944
+    build:
+      context: ./
+      dockerfile: Dockerfile-production
+    volumes:
+      - ./chain-data-einstein:/chain-data
+    networks: 
+      - substrate_network
+    environment:
+      - NODE=einstein
+
+  node_newton:
+    image: nft-parachain
+    ports:
+      - 9945:9944
+    build:
+      context: ./
+      dockerfile: Dockerfile-production
+    volumes:
+      - ./chain-data-newton:/chain-data
+    networks: 
+      - substrate_network
+    environment:
+      - NODE=newton
+
+networks: 
+  substrate_network:
+    driver: bridge
+    name: substrate_network
modifiedsmart_contract/ink-types-node-runtime/Cargo.tomldiffbeforeafterboth
--- a/smart_contract/ink-types-node-runtime/Cargo.toml
+++ b/smart_contract/ink-types-node-runtime/Cargo.toml
@@ -7,8 +7,7 @@
 license = "GPL-3.0"
 readme = "README.md"
 
-repository = "https://github.com/paritytech/ink"
-documentation = "https://github.com/paritytech/ink/wiki"
+repository = "https://github.com/usetech-llc/ink"
 homepage = "https://www.parity.io/"
 
 description = "[ink!] Rust based eDSL for writing smart contracts for Substrate"
@@ -18,12 +17,12 @@
 include = ["/Cargo.toml", "src/**/*.rs", "/README.md", "/LICENSE"]
 
 [dependencies]
-ink_core = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_core", default-features = false }
-frame-system = { git = "https://github.com/paritytech/substrate/", tag = "v2.0.0-rc3", package = "frame-system", default-features = false }
-pallet-indices = { git = "https://github.com/paritytech/substrate/", tag = "v2.0.0-rc3", package = "pallet-indices", default-features = false }
-sp-core = { git = "https://github.com/paritytech/substrate/", tag = "v2.0.0-rc3", package = "sp-core", default-features = false }
-sp-io = { git = "https://github.com/paritytech/substrate/", tag = "v2.0.0-rc3", package = "sp-io", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
-sp-runtime = { git = "https://github.com/paritytech/substrate/", tag = "v2.0.0-rc3", package = "sp-runtime", default-features = false }
+ink_core = { version = "2", git = "https://github.com/usetech-llc/ink", tag = "latest-v2", package = "ink_core", default-features = false }
+frame-system = { git = "https://github.com/usetech-llc/substrate/", branch = "nft_rc3", package = "frame-system", default-features = false }
+pallet-indices = { git = "https://github.com/usetech-llc/substrate/", branch = "nft_rc3", package = "pallet-indices", default-features = false }
+sp-core = { git = "https://github.com/usetech-llc/substrate/", branch = "nft_rc3", package = "sp-core", default-features = false }
+sp-io = { git = "https://github.com/usetech-llc/substrate/", branch = "nft_rc3", package = "sp-io", default-features = false, features = ["disable_panic_handler", "disable_oom", "disable_allocator"] }
+sp-runtime = { git = "https://github.com/usetech-llc/substrate/", branch = "nft_rc3", package = "sp-runtime", default-features = false }
 scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }
 
 [dependencies.type-metadata]
modifiedsmart_contract/ink-types-node-runtime/examples/calls/Cargo.tomldiffbeforeafterboth
before · smart_contract/ink-types-node-runtime/examples/calls/Cargo.toml
1[package]2name = "calls"3version = "0.1.0"4authors = ["Parity Technologies <admin@parity.io>"]5edition = "2018"67[dependencies]8ink_abi = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_abi", default-features = false, features = ["derive"], optional = true }9ink_primitives = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_primitives", default-features = false }10ink_core = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_core", default-features = false }11ink_lang = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_lang", default-features = false }12ink_prelude = { version = "2", git = "https://github.com/paritytech/ink", tag = "latest-v2", package = "ink_prelude", default-features = false }1314sp-runtime = { git = "https://github.com/paritytech/substrate/", tag = "v2.0.0-rc3", package = "sp-runtime", default-features = false }15scale = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive"] }16sp-keyring = { git = "https://github.com/paritytech/substrate/", tag = "v2.0.0-rc3", package = "sp-keyring", optional = true }17ink_types_node_runtime = { path = "../../", default-features = false }1819[dependencies.type-metadata]20git = "https://github.com/type-metadata/type-metadata.git"21rev = "02eae9f35c40c943b56af5b60616219f2b72b47d"22default-features = false23features = ["derive"]24optional = true2526[lib]27name = "calls"28path = "lib.rs"29crate-type = [30	# Used for normal contract Wasm blobs.31	"cdylib",32	# Used for ABI generation.33	"rlib",34]3536[features]37default = ["test-env"]38std = [39    "ink_abi/std",40    "ink_core/std",41    "ink_primitives/std",42    "scale/std",43    "type-metadata/std",44    "ink_types_node_runtime/std",45    "sp-keyring",46]47test-env = [48    "std",49    "ink_lang/test-env",50]51ink-generate-abi = [52    "std",53    "ink_abi",54    "type-metadata",55    "ink_core/ink-generate-abi",56    "ink_lang/ink-generate-abi",57    "ink_types_node_runtime/ink-generate-abi",58]59ink-as-dependency = []6061[profile.release]62panic = "abort"63lto = true64opt-level = "z"65overflow-checks = true66codegen-units = 16768[workspace]69members = [70	".ink/abi_gen"71]72exclude = [73	".ink"74]