#40 Clean Up Clippy Warnings & Docker

.gitignore

@@ -1,5 +1,6 @@
 # Generated by Cargo
 # will have compiled files and executables
+context
 target
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries

Dockerfile

@@ -8,23 +8,16 @@ RUN sh -c "$(curl -sSfL https://release.solana.com/stable/install)" && \
     /root/.local/share/solana/install/active_release/bin/sdk/bpf/scripts/install.sh
 ENV PATH=/root/.local/share/solana/install/active_release/bin:/usr/local/cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
-
 # Build governance
 # Note: create stub Cargo.toml to speedup build
 FROM builder AS governance-builder
 COPY ./ /opt/neon-governance/
-WORKDIR /opt/neon-governance/addin-fixed-weights
-RUN cd program
-# RUN cd program && /opt/evm_loader/ci_checks.sh
-# ARG REVISION
-# ENV NEON_REVISION=${REVISION}
-RUN cargo clippy && \
-    # cargo build --release && \
-    cargo build-bpf
-    # cargo build-bpf --features no-logs,testnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-testnet.so && \
-    # cargo build-bpf --features no-logs,alpha && cp target/deploy/evm_loader.so target/deploy/evm_loader-alpha.so && \
-    # cargo build-bpf --features no-logs,mainnet && cp target/deploy/evm_loader.so target/deploy/evm_loader-mainnet.so && \
-    # cargo build-bpf --features no-logs
+
+WORKDIR /opt/neon-governance
+RUN cargo clippy && cargo build-bpf
+
+WORKDIR /opt/neon-governance/solana-program-library/governance/program
+RUN cargo build-bpf
 
 # Define solana-image that contains utility
 FROM neonlabsorg/solana:${SOLANA_REVISION} AS solana
@@ -33,6 +26,14 @@ FROM neonlabsorg/solana:${SOLANA_REVISION} AS solana
 FROM ubuntu:20.04 AS base
 WORKDIR /opt
 
-COPY --from=solana /opt/solana/bin/solana /opt/solana/bin/solana-keygen /opt/solana/bin/solana-faucet /opt/solana/bin/
+COPY --from=solana /opt/solana/bin/solana /opt/solana/bin/solana-keygen /opt/solana/bin/
+COPY --from=governance-builder /opt/neon-governance/solana-program-library/target/deploy/*.so /opt/
 COPY --from=governance-builder /opt/neon-governance/target/deploy/*.so /opt/
-COPY artifacts/*.keypair /opt/
+COPY context/spl-token /opt/solana/bin/
+COPY context/libssl.so.1.1 context/libcrypto.so.1.1 /usr/lib/x86_64-linux-gnu/
+COPY artifacts/creator.keypair /root/.config/solana/id.json
+COPY artifacts/*.keypair /opt/artifacts/
+COPY artifacts/voters/*.keypair /opt/artifacts/voters/
+COPY init-governance.sh /opt/
+
+ENV PATH=/opt/solana/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt

artifacts/community-mint.keypair

@@ -0,0 +1 @@
+[104,71,183,70,237,93,190,230,225,170,51,115,62,164,211,167,22,98,218,158,209,115,152,48,79,216,75,200,177,113,74,19,204,0,28,215,46,84,179,89,226,218,174,164,129,209,213,9,65,238,97,180,94,137,255,206,239,141,217,100,32,181,38,223]

init-governance.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+solana -v --url http://localhost:8899 --keypair /opt/artifacts/creator.keypair airdrop 100
+solana -v --url http://localhost:8899 --keypair /opt/artifacts/payer.keypair airdrop 100
+
+solana -v --url http://localhost:8899 --keypair /opt/artifacts/voters/voter1.keypair airdrop 100
+solana -v --url http://localhost:8899 --keypair /opt/artifacts/voters/voter2.keypair airdrop 100
+solana -v --url http://localhost:8899 --keypair /opt/artifacts/voters/voter3.keypair airdrop 100
+solana -v --url http://localhost:8899 --keypair /opt/artifacts/voters/voter4.keypair airdrop 100
+solana -v --url http://localhost:8899 --keypair /opt/artifacts/voters/voter5.keypair airdrop 100
+
+spl-token --url http://localhost:8899 create-token --decimals 6 --fee-payer /opt/artifacts/payer.keypair /opt/artifacts/community-mint.keypair
+
+solana program deploy --url http://localhost:8899 --program-id /opt/artifacts/spl-governance.keypair -v /opt/spl_governance.so
+
+solana program deploy --url http://localhost:8899 --program-id /opt/artifacts/addin-fixed-weights.keypair -v /opt/spl_governance_addin_fixed_weights.so
+
+solana program deploy --url http://localhost:8899 --program-id /opt/artifacts/addin-vesting.keypair -v /opt/spl_governance_addin_vesting.so
+
+solana program deploy --url http://localhost:8899 --program-id /opt/artifacts/maintenance.keypair -v /opt/maintenance.so