From 7b3b78a3e5222bc26746f2ad5471b5ade925c807 Mon Sep 17 00:00:00 2001 From: Kenny Rowe Date: Sun, 16 Jul 2017 12:54:57 -0700 Subject: [PATCH 1/9] dapp install ds-group --- .gitmodules | 3 +++ lib/ds-group | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/ds-group diff --git a/.gitmodules b/.gitmodules index e69de29..3e41dc6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "lib/ds-group"] + path = lib/ds-group + url = https://github.com/dapphub/ds-group diff --git a/lib/ds-group b/lib/ds-group new file mode 160000 index 0000000..04ac218 --- /dev/null +++ b/lib/ds-group @@ -0,0 +1 @@ +Subproject commit 04ac2187d353ffa09497e2f77f11177580478654 From e2ae483f01fd759313590723a22f98e1a2772ec9 Mon Sep 17 00:00:00 2001 From: Kenny Rowe Date: Thu, 1 Feb 2018 16:08:17 -0800 Subject: [PATCH 2/9] change testnet settings --- lib/ds-group | 2 +- lib/ds-token | 1 + libexec/.DS_Store | Bin 0 -> 8196 bytes libexec/dapp/dapp---testnet-launch | 44 +++++++++++++---------------- 4 files changed, 22 insertions(+), 25 deletions(-) create mode 160000 lib/ds-token create mode 100644 libexec/.DS_Store diff --git a/lib/ds-group b/lib/ds-group index 04ac218..2778205 160000 --- a/lib/ds-group +++ b/lib/ds-group @@ -1 +1 @@ -Subproject commit 04ac2187d353ffa09497e2f77f11177580478654 +Subproject commit 2778205821a1dcc8f3e92f8306f34598b3e5f47a diff --git a/lib/ds-token b/lib/ds-token new file mode 160000 index 0000000..fdfcb07 --- /dev/null +++ b/lib/ds-token @@ -0,0 +1 @@ +Subproject commit fdfcb073f739b080255b49fd0c8034e67543dc66 diff --git a/libexec/.DS_Store b/libexec/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..26e8ce17037f9768897e0c24abe6dc1c04352fec GIT binary patch literal 8196 zcmeHMU2GIZ9G_oXVAt-_Eg!Z;3I~lqphD$Z`AERyTBv+U!(D0lJoau^Sl#X(yL(r# zsTQLN8sSk<@WDipi25Xg556cdCTOCjBq}c^%B#^tUyKj_XJ@Y|t$i{m2|LNmf9C%& zv-6wZ?B2{V#*i)<4>Q)t7?UV-snt^P4~g4(o|LL0O$|vCmAVA-2o}?+h`@$NRF#<6H_ap-R{g9x{Wh#;*LWZvnD#9ZGNqz(f z6V)|dA(@C|Dv~2Yl7$jPC`l2D=!gLkPWnXTmx|a0kP!UoYNYIhLXvS)Y87>6_ha1+%C?*~t4!0_RSYcG@%NaXPco;~`Gm~Yg6s5nCb#Fb`hsp3 zN;YA!$+k1r)2827aP887<8$wV=h}9U>s!2=z5RiCJm5Z)O#S%+ zeOhI+i+c9^EgF&sYLKN%b&bu7m#k>(SiiAzRI8sgTbZjg^p!2&%G+k|AYY}ux?eCI z!*Y)7Bix<9dcrb2xgM=@*3k#d(b@I0w5EBg+F#0B$4XXkLTiyE(bqzCk*r;o4j44< zPS@a(MrctNst-!iey;EIOe%$1S*9+RHC@X3^mw9+hm=*a=F8cqXst!)YNcJ$47u0V z^QJ9SYm{}8wq5Qk3uuLMuChUr`wQ;C06nxXbSX70X&aGloD%Zt63N8XNQ@`hS+I#mR({WvX9smc9mUYU$GnP zCcDLcWxuiC>8k5bR71f`)ImcN=3zdXu^dUXqXV0;4coC3k0XNvIEWk$!-NAD$Kc^O zPU1N{j~8$nui#aj#hZ8+m+(G5z$f?|U*j8mi<|fvx5TqmRk*voG65m+3(4`^jV|J< zUYvrvTe`P2C|mDh?tWj#2|H)*{SA$amMmYHT)QDXw%ij|_%;TPr(MW2L8Xvl6$%Mz zH_dxse)9rF?IrS=$0u%w$~Mtv@Xa8Na__}0s;Y5{iDvCmRiOT~1>NYuZe-DmJw!?!c@$uW#4O?jhA@n0@GMT@CA>`JJVWGs4d-wk zZ{Pwhh9rFtmvIGG@i9Kdb$mI2pxY)8^u~CCmNTAXyUr2PRS12%d)&J72vmz98u|Hu z^VIkMcm6@*5n=>l1pYS!P}7y^O4IODy^8r+J3;v{WuCa-h>&3j6}MdkP] ... @@ -7,9 +7,9 @@ dapp testnet --help rpc-port=port change RPC port (default: 8545) chain-id=number change chain ID (default: 99) period=seconds use a block time instead of instamine -accounts=number create multiple accounts (default: 1) save=name after finishing, save snapshot load=name start from a previously saved snapshot +rpc-host=host change RPC host (default: \`localhost') " eval "$( @@ -19,18 +19,17 @@ eval "$( RPC_PORT=8545 PERIOD=0 CHAINID=99 -ACCOUNTS=0 while [[ $1 ]]; do case $1 in --) shift; break;; --rpc-port) shift; RPC_PORT=$1;; + --rpc-host) shift; RPC_HOST=$1;; --chain-id) shift; CHAINID=$1;; --period) shift; PERIOD=$1;; - --accounts) shift; ACCOUNTS=$(($1 - 1));; --save) shift; SAVE=$1;; --load) shift; LOAD=$1;; - *) printf "${0##*/}: internal error: %q\\n" "$1"; exit 1 + *) printf "${0##*/}: internal error: %q\n" "$1"; exit 1 esac; shift done @@ -42,7 +41,7 @@ if [[ $LOAD ]]; then cp -r "$gethdir/snapshots/$LOAD"/{keystore,config} "$chaindir" geth >/dev/null 2>&1 --datadir "$chaindir" init "$chaindir/config/genesis.json" geth >/dev/null 2>&1 --datadir "$chaindir" import "$gethdir/snapshots/$LOAD/backup" - address+=( "$(jq <"$chaindir/config/genesis.json" -r ".alloc | keys | .[]")" ) + address=$(jq <"$chaindir/config/genesis.json" -r ".alloc | keys | .[]") CHAINID=$(jq <"$chaindir/config/genesis.json" -r ".config.chainId") else while true; do @@ -51,13 +50,9 @@ else done mkdir -p "$chaindir/config" - for i in $(seq 0 "$ACCOUNTS"); do - address+=( "$( - geth 2>/dev/null account new --datadir "$chaindir" --password=<(exit) 2>/dev/null \ - | grep Address | sed 's/Address: {\(.*\)}/\1/')" ) - balance+=(-n {} -s "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" -i balance \ - -i "${address[i]}") - done + address=$( + geth 2>/dev/null account new --datadir "$chaindir" --password=<(exit) 2>/dev/null \ + | grep Address | sed 's/Address: {\(.*\)}/\1/') jshon >"$chaindir/config/genesis.json" \ -n {} \ -n {} \ @@ -70,14 +65,15 @@ else -i config \ -s 0x1 -i difficulty \ -s 0xffffffffffffffff -i gaslimit \ - -s "0x3132333400000000000000000000000000000000000000000000000000000000""${address[0]}""0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" -i extraData \ + -s "0x3132333400000000000000000000000000000000000000000000000000000000""$address""0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" -i extraData \ -n {} \ - "${balance[@]}" \ + -n {} -s "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" -i balance \ + -i "$address" \ -i alloc geth 2>/dev/null --datadir "$chaindir" init "$chaindir/config/genesis.json" fi -export ETH_RPC_URL=http://127.0.0.1:$RPC_PORT +export ETH_RPC_URL=http://${RPC_HOST-localhost}:$RPC_PORT port=$((RPC_PORT + 30000)) @@ -87,17 +83,18 @@ echo >&2 "dapp-testnet: Chain ID: $CHAINID" echo >&2 "dapp-testnet: Database: $chaindir" echo >&2 "dapp-testnet: Geth log: $chaindir/geth.log" -printf "%s\\n" "${address[@]}" > "$chaindir/config/account" -echo "$ETH_RPC_URL" > "$chaindir/config/rpc-url" -echo "$port" > "$chaindir/config/node-port" +echo "$address" > "$chaindir/config/account" +echo "$ETH_RPC_URL" > "$chaindir/config/rpc-url" +echo "$port" > "$chaindir/config/node-port" set +m geth \ 2> >(tee "$chaindir/geth.log" | grep --line-buffered Success | sed 's/^/geth: /' >&2) \ --datadir "$chaindir" --networkid "$CHAINID" --port="$port" \ + --rpcaddr "${RPC_HOST-localhost}" \ --mine --minerthreads=1 \ - --rpc --rpcapi "web3,eth,net,debug" --rpccorsdomain '*' --nodiscover \ - --rpcport="$RPC_PORT" --unlock="$(IFS=,; echo "${address[*]}")" --password=<(exit) & + --rpc --rpcapi "web3,eth,net,debug" --rpccorsdomain '*' \ + --rpcport="$RPC_PORT" --unlock="$address" --password=<(exit) & gethpid=$! @@ -121,11 +118,10 @@ ETH_FROM=$(seth rpc eth_coinbase) export ETH_FROM export ETH_KEYSTORE=$chaindir/keystore export ETH_PASSWORD=/dev/null -printf 'dapp-testnet: Account: %s (default)\n' "${address[0]}" >&2 -[[ "${#address[@]}" -gt 1 ]] && printf 'dapp-testnet: Account: %s\n' "${address[@]:1}" >&2 +echo >&2 "dapp-testnet: Account: $ETH_FROM" if [[ $1 ]]; then "$@" else while true; do sleep 3600; done -fi +fi \ No newline at end of file From af757eb5cd88973debe541c310a61889390a7274 Mon Sep 17 00:00:00 2001 From: Kenny Rowe Date: Thu, 1 Feb 2018 16:10:55 -0800 Subject: [PATCH 3/9] remove ds_store --- libexec/.DS_Store | Bin 8196 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 libexec/.DS_Store diff --git a/libexec/.DS_Store b/libexec/.DS_Store deleted file mode 100644 index 26e8ce17037f9768897e0c24abe6dc1c04352fec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMU2GIZ9G_oXVAt-_Eg!Z;3I~lqphD$Z`AERyTBv+U!(D0lJoau^Sl#X(yL(r# zsTQLN8sSk<@WDipi25Xg556cdCTOCjBq}c^%B#^tUyKj_XJ@Y|t$i{m2|LNmf9C%& zv-6wZ?B2{V#*i)<4>Q)t7?UV-snt^P4~g4(o|LL0O$|vCmAVA-2o}?+h`@$NRF#<6H_ap-R{g9x{Wh#;*LWZvnD#9ZGNqz(f z6V)|dA(@C|Dv~2Yl7$jPC`l2D=!gLkPWnXTmx|a0kP!UoYNYIhLXvS)Y87>6_ha1+%C?*~t4!0_RSYcG@%NaXPco;~`Gm~Yg6s5nCb#Fb`hsp3 zN;YA!$+k1r)2827aP887<8$wV=h}9U>s!2=z5RiCJm5Z)O#S%+ zeOhI+i+c9^EgF&sYLKN%b&bu7m#k>(SiiAzRI8sgTbZjg^p!2&%G+k|AYY}ux?eCI z!*Y)7Bix<9dcrb2xgM=@*3k#d(b@I0w5EBg+F#0B$4XXkLTiyE(bqzCk*r;o4j44< zPS@a(MrctNst-!iey;EIOe%$1S*9+RHC@X3^mw9+hm=*a=F8cqXst!)YNcJ$47u0V z^QJ9SYm{}8wq5Qk3uuLMuChUr`wQ;C06nxXbSX70X&aGloD%Zt63N8XNQ@`hS+I#mR({WvX9smc9mUYU$GnP zCcDLcWxuiC>8k5bR71f`)ImcN=3zdXu^dUXqXV0;4coC3k0XNvIEWk$!-NAD$Kc^O zPU1N{j~8$nui#aj#hZ8+m+(G5z$f?|U*j8mi<|fvx5TqmRk*voG65m+3(4`^jV|J< zUYvrvTe`P2C|mDh?tWj#2|H)*{SA$amMmYHT)QDXw%ij|_%;TPr(MW2L8Xvl6$%Mz zH_dxse)9rF?IrS=$0u%w$~Mtv@Xa8Na__}0s;Y5{iDvCmRiOT~1>NYuZe-DmJw!?!c@$uW#4O?jhA@n0@GMT@CA>`JJVWGs4d-wk zZ{Pwhh9rFtmvIGG@i9Kdb$mI2pxY)8^u~CCmNTAXyUr2PRS12%d)&J72vmz98u|Hu z^VIkMcm6@*5n=>l1pYS!P}7y^O4IODy^8r+J3;v{WuCa-h>&3j6}MdkP Date: Fri, 2 Feb 2018 22:15:28 -0800 Subject: [PATCH 4/9] remove lib --- lib/ds-group | 1 - lib/ds-token | 1 - 2 files changed, 2 deletions(-) delete mode 160000 lib/ds-group delete mode 160000 lib/ds-token diff --git a/lib/ds-group b/lib/ds-group deleted file mode 160000 index 2778205..0000000 --- a/lib/ds-group +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2778205821a1dcc8f3e92f8306f34598b3e5f47a diff --git a/lib/ds-token b/lib/ds-token deleted file mode 160000 index fdfcb07..0000000 --- a/lib/ds-token +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fdfcb073f739b080255b49fd0c8034e67543dc66 From 50917b7e08553e8afe99aeb779b1689b775db93a Mon Sep 17 00:00:00 2001 From: Kenny Rowe Date: Fri, 2 Feb 2018 22:58:28 -0800 Subject: [PATCH 5/9] sync version --- .gitmodules | 4 +--- libexec/.DS_Store | Bin 0 -> 8196 bytes libexec/dapp/dapp---testnet-launch | 35 +++++++++++++++++------------ 3 files changed, 22 insertions(+), 17 deletions(-) create mode 100644 libexec/.DS_Store diff --git a/.gitmodules b/.gitmodules index 3e41dc6..8b13789 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1 @@ -[submodule "lib/ds-group"] - path = lib/ds-group - url = https://github.com/dapphub/ds-group + diff --git a/libexec/.DS_Store b/libexec/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..26e8ce17037f9768897e0c24abe6dc1c04352fec GIT binary patch literal 8196 zcmeHMU2GIZ9G_oXVAt-_Eg!Z;3I~lqphD$Z`AERyTBv+U!(D0lJoau^Sl#X(yL(r# zsTQLN8sSk<@WDipi25Xg556cdCTOCjBq}c^%B#^tUyKj_XJ@Y|t$i{m2|LNmf9C%& zv-6wZ?B2{V#*i)<4>Q)t7?UV-snt^P4~g4(o|LL0O$|vCmAVA-2o}?+h`@$NRF#<6H_ap-R{g9x{Wh#;*LWZvnD#9ZGNqz(f z6V)|dA(@C|Dv~2Yl7$jPC`l2D=!gLkPWnXTmx|a0kP!UoYNYIhLXvS)Y87>6_ha1+%C?*~t4!0_RSYcG@%NaXPco;~`Gm~Yg6s5nCb#Fb`hsp3 zN;YA!$+k1r)2827aP887<8$wV=h}9U>s!2=z5RiCJm5Z)O#S%+ zeOhI+i+c9^EgF&sYLKN%b&bu7m#k>(SiiAzRI8sgTbZjg^p!2&%G+k|AYY}ux?eCI z!*Y)7Bix<9dcrb2xgM=@*3k#d(b@I0w5EBg+F#0B$4XXkLTiyE(bqzCk*r;o4j44< zPS@a(MrctNst-!iey;EIOe%$1S*9+RHC@X3^mw9+hm=*a=F8cqXst!)YNcJ$47u0V z^QJ9SYm{}8wq5Qk3uuLMuChUr`wQ;C06nxXbSX70X&aGloD%Zt63N8XNQ@`hS+I#mR({WvX9smc9mUYU$GnP zCcDLcWxuiC>8k5bR71f`)ImcN=3zdXu^dUXqXV0;4coC3k0XNvIEWk$!-NAD$Kc^O zPU1N{j~8$nui#aj#hZ8+m+(G5z$f?|U*j8mi<|fvx5TqmRk*voG65m+3(4`^jV|J< zUYvrvTe`P2C|mDh?tWj#2|H)*{SA$amMmYHT)QDXw%ij|_%;TPr(MW2L8Xvl6$%Mz zH_dxse)9rF?IrS=$0u%w$~Mtv@Xa8Na__}0s;Y5{iDvCmRiOT~1>NYuZe-DmJw!?!c@$uW#4O?jhA@n0@GMT@CA>`JJVWGs4d-wk zZ{Pwhh9rFtmvIGG@i9Kdb$mI2pxY)8^u~CCmNTAXyUr2PRS12%d)&J72vmz98u|Hu z^VIkMcm6@*5n=>l1pYS!P}7y^O4IODy^8r+J3;v{WuCa-h>&3j6}MdkP] ... @@ -7,6 +7,7 @@ dapp testnet --help rpc-port=port change RPC port (default: 8545) chain-id=number change chain ID (default: 99) period=seconds use a block time instead of instamine +accounts=number create multiple accounts (default: 1) save=name after finishing, save snapshot load=name start from a previously saved snapshot rpc-host=host change RPC host (default: \`localhost') @@ -19,6 +20,7 @@ eval "$( RPC_PORT=8545 PERIOD=0 CHAINID=99 +ACCOUNTS=0 while [[ $1 ]]; do case $1 in @@ -27,9 +29,10 @@ while [[ $1 ]]; do --rpc-host) shift; RPC_HOST=$1;; --chain-id) shift; CHAINID=$1;; --period) shift; PERIOD=$1;; + --accounts) shift; ACCOUNTS=$(($1 - 1));; --save) shift; SAVE=$1;; --load) shift; LOAD=$1;; - *) printf "${0##*/}: internal error: %q\n" "$1"; exit 1 + *) printf "${0##*/}: internal error: %q\\n" "$1"; exit 1 esac; shift done @@ -41,7 +44,7 @@ if [[ $LOAD ]]; then cp -r "$gethdir/snapshots/$LOAD"/{keystore,config} "$chaindir" geth >/dev/null 2>&1 --datadir "$chaindir" init "$chaindir/config/genesis.json" geth >/dev/null 2>&1 --datadir "$chaindir" import "$gethdir/snapshots/$LOAD/backup" - address=$(jq <"$chaindir/config/genesis.json" -r ".alloc | keys | .[]") + address+=( "$(jq <"$chaindir/config/genesis.json" -r ".alloc | keys | .[]")" ) CHAINID=$(jq <"$chaindir/config/genesis.json" -r ".config.chainId") else while true; do @@ -50,9 +53,12 @@ else done mkdir -p "$chaindir/config" - address=$( - geth 2>/dev/null account new --datadir "$chaindir" --password=<(exit) 2>/dev/null \ - | grep Address | sed 's/Address: {\(.*\)}/\1/') + for i in $(seq 0 "$ACCOUNTS"); do + address+=( "$(geth 2>/dev/null account new --datadir "$chaindir" --password=<(exit) 2>/dev/null \ + | grep Address | sed 's/Address: {\(.*\)}/\1/')" ) + balance+=(-n {} -s "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" -i balance \ + -i "${address[i]}") + done jshon >"$chaindir/config/genesis.json" \ -n {} \ -n {} \ @@ -65,10 +71,9 @@ else -i config \ -s 0x1 -i difficulty \ -s 0xffffffffffffffff -i gaslimit \ - -s "0x3132333400000000000000000000000000000000000000000000000000000000""$address""0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" -i extraData \ + -s "0x3132333400000000000000000000000000000000000000000000000000000000""${address[0]}""0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" -i extraData \ -n {} \ - -n {} -s "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" -i balance \ - -i "$address" \ + "${balance[@]}" \ -i alloc geth 2>/dev/null --datadir "$chaindir" init "$chaindir/config/genesis.json" fi @@ -83,9 +88,9 @@ echo >&2 "dapp-testnet: Chain ID: $CHAINID" echo >&2 "dapp-testnet: Database: $chaindir" echo >&2 "dapp-testnet: Geth log: $chaindir/geth.log" -echo "$address" > "$chaindir/config/account" -echo "$ETH_RPC_URL" > "$chaindir/config/rpc-url" -echo "$port" > "$chaindir/config/node-port" +printf "%s\\n" "${address[@]}" > "$chaindir/config/account" +echo "$ETH_RPC_URL" > "$chaindir/config/rpc-url" +echo "$port" > "$chaindir/config/node-port" set +m geth \ @@ -94,7 +99,7 @@ geth \ --rpcaddr "${RPC_HOST-localhost}" \ --mine --minerthreads=1 \ --rpc --rpcapi "web3,eth,net,debug" --rpccorsdomain '*' \ - --rpcport="$RPC_PORT" --unlock="$address" --password=<(exit) & + --rpcport="$RPC_PORT" --unlock=(IFS=,; echo "${address[*]}") --password=<(exit) & gethpid=$! @@ -118,7 +123,9 @@ ETH_FROM=$(seth rpc eth_coinbase) export ETH_FROM export ETH_KEYSTORE=$chaindir/keystore export ETH_PASSWORD=/dev/null -echo >&2 "dapp-testnet: Account: $ETH_FROM" +printf 'dapp-testnet: Account: %s (default)\n' "${address[0]}" >&2 +-[[ "${#address[@]}" -gt 1 ]] && printf 'dapp-testnet: Account: %s\n' +"${address[@]:1}" >&2 if [[ $1 ]]; then "$@" From 628da22634419e6984e6ea3d2a34a1417410e192 Mon Sep 17 00:00:00 2001 From: Kenny Rowe Date: Fri, 2 Feb 2018 22:59:18 -0800 Subject: [PATCH 6/9] sync versions --- libexec/.DS_Store | Bin 8196 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 libexec/.DS_Store diff --git a/libexec/.DS_Store b/libexec/.DS_Store deleted file mode 100644 index 26e8ce17037f9768897e0c24abe6dc1c04352fec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMU2GIZ9G_oXVAt-_Eg!Z;3I~lqphD$Z`AERyTBv+U!(D0lJoau^Sl#X(yL(r# zsTQLN8sSk<@WDipi25Xg556cdCTOCjBq}c^%B#^tUyKj_XJ@Y|t$i{m2|LNmf9C%& zv-6wZ?B2{V#*i)<4>Q)t7?UV-snt^P4~g4(o|LL0O$|vCmAVA-2o}?+h`@$NRF#<6H_ap-R{g9x{Wh#;*LWZvnD#9ZGNqz(f z6V)|dA(@C|Dv~2Yl7$jPC`l2D=!gLkPWnXTmx|a0kP!UoYNYIhLXvS)Y87>6_ha1+%C?*~t4!0_RSYcG@%NaXPco;~`Gm~Yg6s5nCb#Fb`hsp3 zN;YA!$+k1r)2827aP887<8$wV=h}9U>s!2=z5RiCJm5Z)O#S%+ zeOhI+i+c9^EgF&sYLKN%b&bu7m#k>(SiiAzRI8sgTbZjg^p!2&%G+k|AYY}ux?eCI z!*Y)7Bix<9dcrb2xgM=@*3k#d(b@I0w5EBg+F#0B$4XXkLTiyE(bqzCk*r;o4j44< zPS@a(MrctNst-!iey;EIOe%$1S*9+RHC@X3^mw9+hm=*a=F8cqXst!)YNcJ$47u0V z^QJ9SYm{}8wq5Qk3uuLMuChUr`wQ;C06nxXbSX70X&aGloD%Zt63N8XNQ@`hS+I#mR({WvX9smc9mUYU$GnP zCcDLcWxuiC>8k5bR71f`)ImcN=3zdXu^dUXqXV0;4coC3k0XNvIEWk$!-NAD$Kc^O zPU1N{j~8$nui#aj#hZ8+m+(G5z$f?|U*j8mi<|fvx5TqmRk*voG65m+3(4`^jV|J< zUYvrvTe`P2C|mDh?tWj#2|H)*{SA$amMmYHT)QDXw%ij|_%;TPr(MW2L8Xvl6$%Mz zH_dxse)9rF?IrS=$0u%w$~Mtv@Xa8Na__}0s;Y5{iDvCmRiOT~1>NYuZe-DmJw!?!c@$uW#4O?jhA@n0@GMT@CA>`JJVWGs4d-wk zZ{Pwhh9rFtmvIGG@i9Kdb$mI2pxY)8^u~CCmNTAXyUr2PRS12%d)&J72vmz98u|Hu z^VIkMcm6@*5n=>l1pYS!P}7y^O4IODy^8r+J3;v{WuCa-h>&3j6}MdkP Date: Fri, 2 Feb 2018 23:04:55 -0800 Subject: [PATCH 7/9] sync changes --- libexec/dapp/dapp---testnet-launch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libexec/dapp/dapp---testnet-launch b/libexec/dapp/dapp---testnet-launch index 8cf36ef..93218b3 100755 --- a/libexec/dapp/dapp---testnet-launch +++ b/libexec/dapp/dapp---testnet-launch @@ -88,9 +88,9 @@ echo >&2 "dapp-testnet: Chain ID: $CHAINID" echo >&2 "dapp-testnet: Database: $chaindir" echo >&2 "dapp-testnet: Geth log: $chaindir/geth.log" -printf "%s\\n" "${address[@]}" > "$chaindir/config/account" -echo "$ETH_RPC_URL" > "$chaindir/config/rpc-url" -echo "$port" > "$chaindir/config/node-port" +printf "%s\\n" "${address[@]}" > "$chaindir/config/account" +echo "$ETH_RPC_URL" > "$chaindir/config/rpc-url" +echo "$port" > "$chaindir/config/node-port" set +m geth \ @@ -99,7 +99,7 @@ geth \ --rpcaddr "${RPC_HOST-localhost}" \ --mine --minerthreads=1 \ --rpc --rpcapi "web3,eth,net,debug" --rpccorsdomain '*' \ - --rpcport="$RPC_PORT" --unlock=(IFS=,; echo "${address[*]}") --password=<(exit) & + --rpcport="$RPC_PORT" --unlock="$(IFS=,; echo "${address[*]}")" --password=<(exit) & gethpid=$! @@ -124,8 +124,7 @@ export ETH_FROM export ETH_KEYSTORE=$chaindir/keystore export ETH_PASSWORD=/dev/null printf 'dapp-testnet: Account: %s (default)\n' "${address[0]}" >&2 --[[ "${#address[@]}" -gt 1 ]] && printf 'dapp-testnet: Account: %s\n' -"${address[@]:1}" >&2 +[[ "${#address[@]}" -gt 1 ]] && printf 'dapp-testnet: Account: %s\n' "${address[@]:1}" >&2 if [[ $1 ]]; then "$@" From c1c5e9cd4668ac1717b76c401d35ecf1732ca67e Mon Sep 17 00:00:00 2001 From: Kenny Rowe Date: Fri, 2 Feb 2018 23:08:12 -0800 Subject: [PATCH 8/9] sync changes --- libexec/dapp/dapp---testnet-launch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libexec/dapp/dapp---testnet-launch b/libexec/dapp/dapp---testnet-launch index 93218b3..ae64b5a 100755 --- a/libexec/dapp/dapp---testnet-launch +++ b/libexec/dapp/dapp---testnet-launch @@ -54,10 +54,11 @@ else mkdir -p "$chaindir/config" for i in $(seq 0 "$ACCOUNTS"); do - address+=( "$(geth 2>/dev/null account new --datadir "$chaindir" --password=<(exit) 2>/dev/null \ - | grep Address | sed 's/Address: {\(.*\)}/\1/')" ) + address+=( "$( + geth 2>/dev/null account new --datadir "$chaindir" --password=<(exit) 2>/dev/null \ + | grep Address | sed 's/Address: {\(.*\)}/\1/')" ) balance+=(-n {} -s "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" -i balance \ - -i "${address[i]}") + -i "${address[i]}") done jshon >"$chaindir/config/genesis.json" \ -n {} \ From e44bf3b461223c480efc21e9f9d1037d94a79a33 Mon Sep 17 00:00:00 2001 From: Kenny Rowe Date: Fri, 2 Feb 2018 23:23:38 -0800 Subject: [PATCH 9/9] remove carriage return