WIP: Crowdfunding

ci/deploy.sh

@@ -12,13 +12,13 @@ cat /dev/null > .env
 LOCAL_REPO="localhost"
 echo "LOCAL_REPO=$LOCAL_REPO" >> .env
 
-export BUILD_SCRIPT="event-proxy/build.sh"
-export BUILD_WORKDIR="event-proxy"
-export BINARY_NAME="event-proxy"
-export APP_IMAGE="$BINARY_NAME:$REVISION"
-./build_img.sh && docker tag $APP_IMAGE "$LOCAL_REPO/$APP_IMAGE"
-echo "EVENT_PROXY_IMG=$APP_IMAGE" >> .env
-echo "EVENT_PROXY_BIN=$BINARY_NAME" >> .env
+#export BUILD_SCRIPT="event-proxy/build.sh"
+#export BUILD_WORKDIR="event-proxy"
+#export BINARY_NAME="event-proxy"
+#export APP_IMAGE="$BINARY_NAME:$REVISION"
+#./build_img.sh && docker tag $APP_IMAGE "$LOCAL_REPO/$APP_IMAGE"
+#echo "EVENT_PROXY_IMG=$APP_IMAGE" >> .env
+#echo "EVENT_PROXY_BIN=$BINARY_NAME" >> .env
 
 export BUILD_SCRIPT="node/build.sh"
 export BUILD_WORKDIR="."
@@ -27,13 +27,13 @@ export APP_IMAGE="$BINARY_NAME:$REVISION"
 ./build_img.sh && docker tag $APP_IMAGE "$LOCAL_REPO/$APP_IMAGE"
 echo "BLOCKCHAIN_NODE_IMG=$APP_IMAGE" >> .env
 echo "BLOCKCHAIN_NODE_BIN=$BINARY_NAME" >> .env
-
-export BUILD_SCRIPT="event-proxy-client/build.sh"
-export BUILD_WORKDIR="event-proxy-client"
-export BINARY_NAME="event-proxy-client"
-export APP_IMAGE="$BINARY_NAME:$REVISION"
-./build_img.sh && docker tag $APP_IMAGE "$LOCAL_REPO/$APP_IMAGE"
-echo "EVENT_PROXY_CLIENT_IMG=$APP_IMAGE" >> .env
-echo "EVENT_PROXY_CLIENT_BIN=$BINARY_NAME" >> .env
-
+#
+#export BUILD_SCRIPT="event-proxy-client/build.sh"
+#export BUILD_WORKDIR="event-proxy-client"
+#export BINARY_NAME="event-proxy-client"
+#export APP_IMAGE="$BINARY_NAME:$REVISION"
+#./build_img.sh && docker tag $APP_IMAGE "$LOCAL_REPO/$APP_IMAGE"
+#echo "EVENT_PROXY_CLIENT_IMG=$APP_IMAGE" >> .env
+#echo "EVENT_PROXY_CLIENT_BIN=$BINARY_NAME" >> .env
+#
 docker-compose up -d --no-build

ci/docker-compose.yml

@@ -1,34 +1,34 @@
 version: "3.3"
 
 services:
-  zookeeper:
-    image: bitnami/zookeeper:3.7
-    ports:
-      - "2181:2181"
-    volumes:
-      - "zookeeper_data:/bitnami"
-    environment:
-      - ALLOW_ANONYMOUS_LOGIN=yes
-  kafka:
-    image: bitnami/kafka:2
-    ports:
-      - "9092:9092"
-    volumes:
-      - "kafka_data:/bitnami"
-    environment:
-      - KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper:2181
-      - ALLOW_PLAINTEXT_LISTENER=yes
-    depends_on:
-      - zookeeper
-  deip-event-proxy:
-   image: "$LOCAL_REPO/$EVENT_PROXY_IMG"
-   command: $EVENT_PROXY_BIN --config=/event-proxy.toml
-   environment:
-     RUST_LOG: "error,librdkafka=error,rdkafka::client=error"
-   volumes:
-     - "./event-proxy.toml:/event-proxy.toml"
-   depends_on:
-     - kafka
+#  zookeeper:
+#    image: bitnami/zookeeper:3.7
+#    ports:
+#      - "2181:2181"
+#    volumes:
+#      - "zookeeper_data:/bitnami"
+#    environment:
+#      - ALLOW_ANONYMOUS_LOGIN=yes
+#  kafka:
+#    image: bitnami/kafka:2
+#    ports:
+#      - "9092:9092"
+#    volumes:
+#      - "kafka_data:/bitnami"
+#    environment:
+#      - KAFKA_CFG_ZOOKEEPER_CONNECT=zookeeper:2181
+#      - ALLOW_PLAINTEXT_LISTENER=yes
+#    depends_on:
+#      - zookeeper
+#  deip-event-proxy:
+#   image: "$LOCAL_REPO/$EVENT_PROXY_IMG"
+#   command: $EVENT_PROXY_BIN --config=/event-proxy.toml
+#   environment:
+#     RUST_LOG: "error,librdkafka=error,rdkafka::client=error"
+#   volumes:
+#     - "./event-proxy.toml:/event-proxy.toml"
+#   depends_on:
+#     - kafka
   deip-blockchain-node:
     image: "$LOCAL_REPO/$BLOCKCHAIN_NODE_IMG"
     command: |
@@ -41,13 +41,13 @@ services:
     ports:
       - "9944:9944"
       - "9933:9933"
-  deip-event-proxy-client:
-    image: "$LOCAL_REPO/$EVENT_PROXY_CLIENT_IMG"
-    command: $EVENT_PROXY_CLIENT_BIN
-    environment:
-      KAFKA_BOOTSTRAP_SERVERS: "kafka:9092"
-    depends_on:
-      - kafka
+#  deip-event-proxy-client:
+#    image: "$LOCAL_REPO/$EVENT_PROXY_CLIENT_IMG"
+#    command: $EVENT_PROXY_CLIENT_BIN
+#    environment:
+#      KAFKA_BOOTSTRAP_SERVERS: "kafka:9092"
+#    depends_on:
+#      - kafka
 
 volumes:
   zookeeper_data:

deip_common/deip_asset_system/Cargo.toml

@@ -13,7 +13,6 @@ sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "po
 sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.13", default-features = false }
 sp-core = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.13", default-features = false }
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-deip-assets-error = { path = "../deip_assets_error", default-features = false }
 deip_serializable_u128 = { path = "../../deip_common/deip_serializable_u128", default-features = false }
 
 # alias "parity-scale-code" to "codec"
@@ -35,6 +34,5 @@ std = [
     "sp-core/std",
     "frame-system/std",
     "frame-support/std",
-    "deip-assets-error/std",
     "deip_serializable_u128/std",
 ]

deip_common/deip_asset_system/src/lib.rs

@@ -1,7 +1,5 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
-extern crate core;
-
 pub mod asset;
 pub mod nft_impl;
 pub mod fnft;
@@ -13,7 +11,6 @@ pub use nft_impl::*;
 pub use fnft::*;
 pub use ft_impl::*;
 
-pub use deip_assets_error::{ReserveError, UnreserveError};
 use sp_std::prelude::*;
 
 #[derive(Debug, Clone, Copy)]

deip_common/deip_call/Cargo.toml

@@ -16,7 +16,7 @@ pallet-deip = { path = "../../pallets/deip", default-features = false }
 pallet-deip-assets = { path = "../../pallets/deip_assets", default-features = false }
 pallet-deip-dao = { path = "../../pallets/deip_dao", default-features = false }
 pallet-deip-proposal = { path = "../../pallets/deip_proposal", default-features = false }
-pallet-deip-investment-opportunity = { path = "../../pallets/deip_investment_opportunity", default-features = false }
+pallet-deip-crowdfunding = { path = "../../pallets/deip_crowdfunding", default-features = false }
 serde = { version = "1.0.130", features = ["derive"], optional = true }
 sp-runtime = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.13", default-features = false }
 sp-std = { git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v0.9.13", default-features = false }
@@ -36,5 +36,5 @@ std = [
     "pallet-deip-dao/std",
     "pallet-deip/std",
     "pallet-deip-assets/std",
-    "pallet-deip-investment-opportunity/std",
+    "pallet-deip-crowdfunding/std",
 ]

event-proxy/Cargo.toml

@@ -34,7 +34,7 @@ pallet-deip-portal = { path = "../pallets/deip_portal" }
 pallet-deip = { path = "../pallets/deip"}
 pallet-deip-assets = { path = "../pallets/deip_assets"}
 pallet-deip-vesting = { path = "../pallets/deip_vesting"}
-pallet-deip-investment-opportunity = { path = "../pallets/deip_investment_opportunity"}
+pallet-deip-crowdfunding = { path = "../pallets/deip_crowdfunding" }
 node-template-runtime = { package = "appchain-deip-runtime", path = "../runtime"}
 deip-call = { package = "common-deip-call", path = "../deip_common/deip_call" }
 

node/src/chain_spec.rs

@@ -4,7 +4,7 @@ use appchain_deip_runtime::{
     AccountId, DeipAssetsConfig, BabeConfig, DeipConfig, DeipDaoConfig,
     DeipPortalConfig, DeipProposalConfig, DeipVestingConfig, GenesisConfig, GrandpaConfig,
     BalancesConfig, Signature, SudoConfig, SystemConfig, DeipUniquesConfig, SessionConfig,
-    OctopusLposConfig, WASM_BINARY, DeipEcosystemFundConfig, DeipInvestmentOpportunityConfig,
+    OctopusLposConfig, WASM_BINARY, DeipEcosystemFundConfig, DeipCrowdfundingConfig,
 };
 
 use sc_chain_spec::ChainSpecExtension;
@@ -316,6 +316,6 @@ fn genesis(
         deip_ecosystem_fund: DeipEcosystemFundConfig {
             fee_recipient: ecosystem_fund_key.clone()
         },
-        deip_investment_opportunity: DeipInvestmentOpportunityConfig {},
+        deip_crowdfunding: DeipCrowdfundingConfig {},
     }
 }