Skip to content

Commit

Permalink
Prod deployment + small updates
Browse files Browse the repository at this point in the history
  • Loading branch information
XertroV committed Jun 25, 2018
1 parent 3fc599f commit 886810b
Show file tree
Hide file tree
Showing 261 changed files with 8,204 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ scTopics
deploy*.log
tmp*
_solDist
_distEns
.DS_Store
33 changes: 33 additions & 0 deletions compileProd.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/bin/bash

set -e

DIST_DIR="dist"
C_SRC_DIR="contracts"
SOLC_VER=$(solc --version | tail -n 1 | cut -d ' ' -f 2 | cut -d '+' -f 1)

rm -rf ./$DIST_DIR/* || true
mkdir -p $DIST_DIR || true

doSvCompile(){
cname="$(echo $1 | sed 's/\.sol$//g')"
cfile="$cname.sol"
dist_src="$DIST_DIR/$cfile"
# sensible snake case
distname=$(echo "$cname" | sed -E 's/([A-Z])([a-z])/_\L\1\2/g' | sed -E 's/([A-Z])([A-Z]*)/_\L\1\L\2/g' | sed 's/^_//')
outdir="dist/$distname"
solidity_flattener "./$C_SRC_DIR/$cfile" --solc-paths './lib,./ens,' > "$dist_src"
sed -i "s/pragma solidity \^0\.4\.13;/pragma solidity $SOLC_VER;/" "$dist_src"
mkdir -p "$outdir"
./bin/compile.sh -d "$DIST_DIR" -c "$cfile" -o "$outdir"
echo "-------------"
echo "$cname compile to $outdir"
echo "-------------"
}

doSvCompile SVIndex
doSvCompile SVIndexBackend
doSvCompile SVPayments
doSvCompile BBFarm
doSvCompile CommunityAuction
doSvCompile EnsOwnerProxy
2 changes: 1 addition & 1 deletion contracts/CommunityAuction.sol
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ interface CommAuctionIface {
}


contract CommunityAuctionSimple is owned {
contract CommunityAuctionSimple is owned, CommAuctionIface {
// about $1USD at $600usd/eth
uint public commBallotPriceWei = 1666666666000000;

Expand Down
Loading

0 comments on commit 886810b

Please sign in to comment.