LBRYCommunity/ytsync
1
0
Fork 0
Code Issues 39 Pull requests 8 Projects Releases 197 Packages Wiki Activity

Update to leverage lbrycrd v0.17.2.1, lbrynet v0.39.1, walletserver v0.39.1

Browse source
This commit is contained in:
Mark Beamer Jr 2019-08-19 22:18:09 -04:00 committed by Niko Storni
parent d63aba568d
commit 9a5b6b4e56
4 changed files with 42 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
e2e/docker-compose.yml
View file

@ -4,8 +4,8 @@ services:
## Lbrycrd ## ## Lbrycrd ##
############# #############
lbrycrd: lbrycrd:
image: lbry/lbrycrd:v0.12.4.1 image: lbry/lbrycrd:v0.17.2.1
restart: always restart: "no"
ports: ports:
- "15201:29246" - "15201:29246"
- "15200:29245" - "15200:29245"
@ -21,7 +21,7 @@ services:
## Wallet Server ## ## Wallet Server ##
################### ###################
walletserver: walletserver:
image: lbry/wallet-server:v0.38.5 image: lbry/wallet-server:v0.39.1
restart: always restart: always
environment: environment:
- DB_DIRECTORY=/database - DB_DIRECTORY=/database
@ -47,7 +47,7 @@ services:
## Lbrynet ## ## Lbrynet ##
############# #############
lbrynet: lbrynet:
image: lbry/lbrynet:v0.38.6 image: lbry/lbrynet:v0.39.1
restart: always restart: always
ports: ports:
- "15100:5279" - "15100:5279"

11
e2e/lbrycrd/docker/start.sh
View file

@ -44,6 +44,9 @@ function set_config() {
echo "rpcallowip=${RPC_ALLOW_IP=127.0.0.1/24}" >> $CONFIG_PATH echo "rpcallowip=${RPC_ALLOW_IP=127.0.0.1/24}" >> $CONFIG_PATH
echo "rpcport=${RPC_PORT=9245}" >> $CONFIG_PATH echo "rpcport=${RPC_PORT=9245}" >> $CONFIG_PATH
echo "rpcbind=${RPC_BIND=0.0.0.0}" >> $CONFIG_PATH echo "rpcbind=${RPC_BIND=0.0.0.0}" >> $CONFIG_PATH
echo "deprecatedrpc=accounts" >> $CONFIG_PATH
echo "deprecatedrpc=validateaddress" >> $CONFIG_PATH
echo "deprecatedrpc=signrawtransaction" >> $CONFIG_PATH
fi fi
echo "Config: " echo "Config: "
cat $CONFIG_PATH cat $CONFIG_PATH
@ -86,6 +89,11 @@ case $RUN_MODE in
echo "txindex=1" >> $CONFIG_PATH echo "txindex=1" >> $CONFIG_PATH
echo "server=1" >> $CONFIG_PATH echo "server=1" >> $CONFIG_PATH
echo "printtoconsole=1" >> $CONFIG_PATH echo "printtoconsole=1" >> $CONFIG_PATH
echo "deprecatedrpc=accounts" >> $CONFIG_PATH
echo "deprecatedrpc=validateaddress" >> $CONFIG_PATH
echo "deprecatedrpc=signrawtransaction" >> $CONFIG_PATH
echo "vbparams=segwit:0:999999999999" >> $CONFIG_PATH
echo "addresstype=legacy" >> $CONFIG_PATH
#nohup advance &>/dev/null & #nohup advance &>/dev/null &
lbrycrdd -conf=$CONFIG_PATH $1 lbrycrdd -conf=$CONFIG_PATH $1
@ -103,6 +111,9 @@ case $RUN_MODE in
echo "txindex=1" >> $CONFIG_PATH echo "txindex=1" >> $CONFIG_PATH
echo "server=1" >> $CONFIG_PATH echo "server=1" >> $CONFIG_PATH
echo "printtoconsole=1" >> $CONFIG_PATH echo "printtoconsole=1" >> $CONFIG_PATH
echo "deprecatedrpc=accounts" >> $CONFIG_PATH
echo "deprecatedrpc=validateaddress" >> $CONFIG_PATH
echo "deprecatedrpc=signrawtransaction" >> $CONFIG_PATH
#nohup advance &>/dev/null & #nohup advance &>/dev/null &
lbrycrdd -conf=$CONFIG_PATH $1 lbrycrdd -conf=$CONFIG_PATH $1

2
e2e/walletserver/docker-compose.yml
View file

@ -8,7 +8,7 @@ services:
## Wallet Server ## ## Wallet Server ##
################### ###################
walletserver: walletserver:
image: lbry/wallet-server:v0.38.5 image: lbry/wallet-server:v0.38.6
restart: always restart: always
networks: networks:
lbry-network: lbry-network:

6
manager/setup.go
View file

@ -55,7 +55,7 @@ func (s *Sync) walletSetup() error {
} else if balanceResp == nil { } else if balanceResp == nil {
return errors.Err("no response") return errors.Err("no response")
} }
balance, err := strconv.ParseFloat((string)(*balanceResp), 64) balance, err := strconv.ParseFloat(balanceResp.Total.String(), 64)
if err != nil { if err != nil {
return errors.Err(err) return errors.Err(err)
} }
@ -188,7 +188,7 @@ func (s *Sync) ensureEnoughUTXOs() error {
return errors.Err("no response") return errors.Err("no response")
} }
balanceAmount, err := strconv.ParseFloat((string)(*balance), 64) balanceAmount, err := strconv.ParseFloat(balance.Total.String(), 64)
if err != nil { if err != nil {
return errors.Err(err) return errors.Err(err)
} }
@ -312,7 +312,7 @@ func (s *Sync) ensureChannelOwnership() error {
} else if balanceResp == nil { } else if balanceResp == nil {
return errors.Err("no response") return errors.Err("no response")
} }
balance, err := decimal.NewFromString((string)(*balanceResp)) balance, err := decimal.NewFromString(balanceResp.Total.String())
if err != nil { if err != nil {
return errors.Err(err) return errors.Err(err)
} }