Skip to content
This repository was archived by the owner on Apr 18, 2023. It is now read-only.

Commit 4c8ac97

Browse files
gbalabasquergbalabasquer
committed
Adapt new dapptools + fix some shellcheck issues + export a json file with addresses
1 parent 94c891d commit 4c8ac97

File tree

4 files changed

+85
-47
lines changed

4 files changed

+85
-47
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/out
22
load-env*
33
load-fab*
4+
addresses.json

‎bin/deploy

+64-30
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,52 @@ export SOLC_FLAGS=${SOLC_FLAGS:-"--optimize"}
55
export ETH_GAS=${ETH_GAS:-"4500000"}
66
export ETH_FROM=${ETH_FROM:-$(seth rpc eth_coinbase)}
77

8-
dapp --use solc:0.4.25 build
8+
dapp --use solc:0.4.25 build --extract
99

10-
(test -z $GEM_FAB || test -z $VOX_FAB || test -z $TUB_FAB || test -z $TAP_FAB || test -z $TOP_FAB || test -z $MOM_FAB || test -z $DAD_FAB) && exit 1
10+
# shellcheck disable=SC2153
11+
{ test -z "$GEM_FAB" || test -z "$VOX_FAB" || test -z "$TUB_FAB" || \
12+
test -z "$TAP_FAB" || test -z "$TOP_FAB" || test -z "$MOM_FAB" || \
13+
test -z "$DAD_FAB"; } && \
14+
exit 1
1115

1216
export SETH_ASYNC=yes
13-
test -z $SAI_GEM && GEMtx=$(dapp create DSToken $(seth --to-bytes32 $(seth --from-ascii 'ETH')))
14-
test -z $SAI_GOV && GOVtx=$(dapp create DSToken $(seth --to-bytes32 $(seth --from-ascii 'GOV')))
15-
test -z $SAI_PIP && PIPtx=$(dapp create DSValue)
16-
test -z $SAI_PEP && PEPtx=$(dapp create DSValue)
17+
test -z "$SAI_GEM" && GEMtx=$(dapp create DSToken "$(seth --to-bytes32 "$(seth --from-ascii 'ETH')")")
18+
test -z "$SAI_GOV" && GOVtx=$(dapp create DSToken "$(seth --to-bytes32 "$(seth --from-ascii 'GOV')")")
19+
test -z "$SAI_PIP" && PIPtx=$(dapp create DSValue)
20+
test -z "$SAI_PEP" && PEPtx=$(dapp create DSValue)
1721
export SETH_ASYNC=no
18-
test -z $SAI_GEM && SAI_GEM=$(seth receipt $GEMtx contractAddress)
19-
test -z $SAI_GOV && SAI_GOV=$(seth receipt $GOVtx contractAddress)
20-
test -z $SAI_PIP && SAI_PIP=$(seth receipt $PIPtx contractAddress)
21-
test -z $SAI_PEP && SAI_PEP=$(seth receipt $PEPtx contractAddress)
22-
test -z $SAI_PIT && SAI_PIT="0x0000000000000000000000000000000000000123"
22+
test -z "$SAI_GEM" && SAI_GEM=$(seth receipt "$GEMtx" contractAddress)
23+
test -z "$SAI_GOV" && SAI_GOV=$(seth receipt "$GOVtx" contractAddress)
24+
test -z "$SAI_PIP" && SAI_PIP=$(seth receipt "$PIPtx" contractAddress)
25+
test -z "$SAI_PEP" && SAI_PEP=$(seth receipt "$PEPtx" contractAddress)
26+
test -z "$SAI_PIT" && SAI_PIT="0x0000000000000000000000000000000000000123"
2327

24-
DAI_FAB=$(dapp create DaiFab $GEM_FAB $VOX_FAB $TUB_FAB $TAP_FAB $TOP_FAB $MOM_FAB $DAD_FAB)
28+
DAI_FAB=$(dapp create DaiFab "$GEM_FAB" "$VOX_FAB" "$TUB_FAB" "$TAP_FAB" "$TOP_FAB" "$MOM_FAB" "$DAD_FAB")
2529

26-
if [ -z $SAI_ADM ]
30+
if [ -z "$SAI_ADM" ]
2731
then
2832
SAI_ADM=$(dapp create DSRoles)
29-
seth send $SAI_ADM 'setRootUser(address,bool)' $ETH_FROM true
33+
seth send "$SAI_ADM" 'setRootUser(address,bool)' "$ETH_FROM" true
3034
fi
3135

32-
seth send $DAI_FAB 'makeTokens()'
33-
seth send $DAI_FAB 'makeVoxTub(address,address,address,address,address)' $SAI_GEM $SAI_GOV $SAI_PIP $SAI_PEP $SAI_PIT
34-
seth send $DAI_FAB 'makeTapTop()'
35-
seth send $DAI_FAB 'configParams()'
36-
seth send $DAI_FAB 'verifyParams()'
37-
seth send $DAI_FAB 'configAuth(address)' $SAI_ADM
36+
seth send "$DAI_FAB" 'makeTokens()'
37+
seth send "$DAI_FAB" 'makeVoxTub(address,address,address,address,address)' "$SAI_GEM" "$SAI_GOV" "$SAI_PIP" "$SAI_PEP" "$SAI_PIT"
38+
seth send "$DAI_FAB" 'makeTapTop()'
39+
seth send "$DAI_FAB" 'configParams()'
40+
seth send "$DAI_FAB" 'verifyParams()'
41+
seth send "$DAI_FAB" 'configAuth(address)' "$SAI_ADM"
3842

39-
cat > load-env-$(seth chain) << EOF
43+
SAI_SAI=0x$(seth call "$DAI_FAB" 'sai()(address)')
44+
SAI_SIN=0x$(seth call "$DAI_FAB" 'sin()(address)')
45+
SAI_SKR=0x$(seth call "$DAI_FAB" 'skr()(address)')
46+
SAI_DAD=0x$(seth call "$DAI_FAB" 'dad()(address)')
47+
SAI_MOM=0x$(seth call "$DAI_FAB" 'mom()(address)')
48+
SAI_VOX=0x$(seth call "$DAI_FAB" 'vox()(address)')
49+
SAI_TUB=0x$(seth call "$DAI_FAB" 'tub()(address)')
50+
SAI_TAP=0x$(seth call "$DAI_FAB" 'tap()(address)')
51+
SAI_TOP=0x$(seth call "$DAI_FAB" 'top()(address)')
52+
53+
cat > "load-env-$(seth chain)" << EOF
4054
#!/bin/bash
4155
4256
# sai deployment on $(seth chain) from $(git rev-parse HEAD)
@@ -48,13 +62,33 @@ export SAI_PIP=$SAI_PIP
4862
export SAI_PEP=$SAI_PEP
4963
export SAI_PIT=$SAI_PIT
5064
export SAI_ADM=$SAI_ADM
51-
export SAI_SAI=0x$(seth call $DAI_FAB 'sai()(address)')
52-
export SAI_SIN=0x$(seth call $DAI_FAB 'sin()(address)')
53-
export SAI_SKR=0x$(seth call $DAI_FAB 'skr()(address)')
54-
export SAI_DAD=0x$(seth call $DAI_FAB 'dad()(address)')
55-
export SAI_MOM=0x$(seth call $DAI_FAB 'mom()(address)')
56-
export SAI_VOX=0x$(seth call $DAI_FAB 'vox()(address)')
57-
export SAI_TUB=0x$(seth call $DAI_FAB 'tub()(address)')
58-
export SAI_TAP=0x$(seth call $DAI_FAB 'tap()(address)')
59-
export SAI_TOP=0x$(seth call $DAI_FAB 'top()(address)')
65+
export SAI_SAI=$SAI_SAI
66+
export SAI_SIN=$SAI_SIN
67+
export SAI_SKR=$SAI_SKR
68+
export SAI_DAD=$SAI_DAD
69+
export SAI_MOM=$SAI_MOM
70+
export SAI_VOX=$SAI_VOX
71+
export SAI_TUB=$SAI_TUB
72+
export SAI_TAP=$SAI_TAP
73+
export SAI_TOP=$SAI_TOP
74+
EOF
75+
76+
cat > addresses.json << EOF
77+
{
78+
"SAI_GEM": "$SAI_GEM",
79+
"SAI_GOV": "$SAI_GOV",
80+
"SAI_PIP": "$SAI_PIP",
81+
"SAI_PEP": "$SAI_PEP",
82+
"SAI_PIT": "$SAI_PIT",
83+
"SAI_ADM": "$SAI_ADM",
84+
"SAI_SAI": "$SAI_SAI",
85+
"SAI_SIN": "$SAI_SIN",
86+
"SAI_SKR": "$SAI_SKR",
87+
"SAI_DAD": "$SAI_DAD",
88+
"SAI_MOM": "$SAI_MOM",
89+
"SAI_VOX": "$SAI_VOX",
90+
"SAI_TUB": "$SAI_TUB",
91+
"SAI_TAP": "$SAI_TAP",
92+
"SAI_TOP": "$SAI_TOP"
93+
}
6094
EOF

‎bin/deploy-fab

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export SOLC_FLAGS=${SOLC_FLAGS:-"--optimize"}
55
export ETH_GAS=${ETH_GAS:-"3500000"}
66
export ETH_FROM=${ETH_FROM:-$(seth rpc eth_coinbase)}
77

8-
dapp --use solc:0.4.25 build
8+
dapp --use solc:0.4.25 build --extract
99

1010
export SETH_ASYNC=yes
1111

@@ -19,15 +19,15 @@ DAD_FABtx=$(dapp create DadFab)
1919

2020
export SETH_ASYNC=no
2121

22-
GEM_FAB=$(seth receipt $GEM_FABtx contractAddress)
23-
VOX_FAB=$(seth receipt $VOX_FABtx contractAddress)
24-
TUB_FAB=$(seth receipt $TUB_FABtx contractAddress)
25-
TAP_FAB=$(seth receipt $TAP_FABtx contractAddress)
26-
TOP_FAB=$(seth receipt $TOP_FABtx contractAddress)
27-
MOM_FAB=$(seth receipt $MOM_FABtx contractAddress)
28-
DAD_FAB=$(seth receipt $DAD_FABtx contractAddress)
22+
GEM_FAB=$(seth receipt "$GEM_FABtx" contractAddress)
23+
VOX_FAB=$(seth receipt "$VOX_FABtx" contractAddress)
24+
TUB_FAB=$(seth receipt "$TUB_FABtx" contractAddress)
25+
TAP_FAB=$(seth receipt "$TAP_FABtx" contractAddress)
26+
TOP_FAB=$(seth receipt "$TOP_FABtx" contractAddress)
27+
MOM_FAB=$(seth receipt "$MOM_FABtx" contractAddress)
28+
DAD_FAB=$(seth receipt "$DAD_FABtx" contractAddress)
2929

30-
cat > load-fab-$(seth chain) << EOF
30+
cat > "load-fab-$(seth chain)" << EOF
3131
#!/bin/bash
3232
3333
# fab deployment on $(seth chain) from $(git rev-parse HEAD)

‎bin/deploy-pre

+11-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export SOLC_FLAGS=${SOLC_FLAGS:-"--optimize"}
55
export ETH_GAS=${ETH_GAS:-"3500000"}
66
export ETH_FROM=${ETH_FROM:-$(seth rpc eth_coinbase)}
77

8-
dapp --use solc:0.4.25 build
8+
dapp --use solc:0.4.25 build --extract
99

1010
# ETHUSD feed
1111
export SAI_PIP='0x729D19f657BD0614b4985Cf1D82531c67569197B'
@@ -17,19 +17,22 @@ export SAI_PEP='0x99041F808D598B782D5a3e498681C2452A31da08'
1717
export SAI_GEM='0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2'
1818

1919
# Token burner
20-
export SAI_PIT=$(dapp create GemPit)
20+
SAI_PIT=$(dapp create GemPit)
21+
export SAI_PIT
2122

2223
# MKR address
2324
export SAI_GOV='0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2'
2425

2526
# Chief
2627
## Voting IOU
27-
export SAI_IOU=$(dapp create DSToken $(seth --to-bytes32 $(seth --from-ascii 'IOU')))
28-
export SAI_ADM=$(dapp create DSChief $SAI_GOV $SAI_IOU 5)
29-
seth send $SAI_IOU 'setOwner(address)' $SAI_ADM
30-
31-
cat > load-pre-$(seth chain) << EOF
32-
test -z $SAI_GEM && GEMtx=$(dapp create DSToken $(seth --to-bytes32 $(seth --from-ascii 'ETH')))
28+
SAI_IOU=$(dapp create DSToken "$(seth --to-bytes32 "$(seth --from-ascii 'IOU')")")
29+
SAI_ADM=$(dapp create DSChief "$SAI_GOV" "$SAI_IOU" 5)
30+
export SAI_IOU
31+
export SAI_ADM
32+
seth send "$SAI_IOU" 'setOwner(address)' "$SAI_ADM"
33+
34+
cat > "load-pre-$(seth chain)" << EOF
35+
test -z $SAI_GEM && GEMtx=$(dapp create DSToken "$(seth --to-bytes32 "$(seth --from-ascii 'ETH')")")
3336
#!/bin/bash
3437
3538
# pre-sai deployment on $(seth chain) from $(git rev-parse HEAD)

0 commit comments

Comments
 (0)