diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml index 73e67b0..9416bd5 100644 --- a/e2e/docker-compose.yml +++ b/e2e/docker-compose.yml @@ -4,8 +4,8 @@ services: ## Lbrycrd ## ############# lbrycrd: - image: lbry/lbrycrd:v0.12.4.1 - restart: always + image: lbry/lbrycrd:v0.17.2.1 + restart: "no" ports: - "15201:29246" - "15200:29245" @@ -21,7 +21,7 @@ services: ## Wallet Server ## ################### walletserver: - image: lbry/wallet-server:v0.38.5 + image: lbry/wallet-server:v0.39.1 restart: always environment: - DB_DIRECTORY=/database @@ -47,7 +47,7 @@ services: ## Lbrynet ## ############# lbrynet: - image: lbry/lbrynet:v0.38.6 + image: lbry/lbrynet:v0.39.1 restart: always ports: - "15100:5279" diff --git a/e2e/lbrycrd/docker/start.sh b/e2e/lbrycrd/docker/start.sh index 89bbb76..0f25414 100644 --- a/e2e/lbrycrd/docker/start.sh +++ b/e2e/lbrycrd/docker/start.sh @@ -38,12 +38,15 @@ function set_config() { else echo "Creating a fresh config file from environment variables." ## Set config params - echo "port=${PORT=9246}" > $CONFIG_PATH - echo "rpcuser=${RPC_USER=lbry}" >> $CONFIG_PATH - echo "rpcpassword=${RPC_PASSWORD=lbry}" >> $CONFIG_PATH + echo "port=${PORT=9246}" > $CONFIG_PATH + echo "rpcuser=${RPC_USER=lbry}" >> $CONFIG_PATH + echo "rpcpassword=${RPC_PASSWORD=lbry}" >> $CONFIG_PATH echo "rpcallowip=${RPC_ALLOW_IP=127.0.0.1/24}" >> $CONFIG_PATH - echo "rpcport=${RPC_PORT=9245}" >> $CONFIG_PATH - echo "rpcbind=${RPC_BIND=0.0.0.0}" >> $CONFIG_PATH + echo "rpcport=${RPC_PORT=9245}" >> $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 echo "Config: " cat $CONFIG_PATH @@ -77,15 +80,20 @@ case $RUN_MODE in ## Set config params ## TODO: Make this more automagic in the future. mkdir -p `dirname $CONFIG_PATH` - echo "rpcuser=lbry" > $CONFIG_PATH - echo "rpcpassword=lbry" >> $CONFIG_PATH - echo "rpcport=29245" >> $CONFIG_PATH - echo "rpcbind=0.0.0.0" >> $CONFIG_PATH - echo "rpcallowip=0.0.0.0/0" >> $CONFIG_PATH - echo "regtest=1" >> $CONFIG_PATH - echo "txindex=1" >> $CONFIG_PATH - echo "server=1" >> $CONFIG_PATH - echo "printtoconsole=1" >> $CONFIG_PATH + echo "rpcuser=lbry" > $CONFIG_PATH + echo "rpcpassword=lbry" >> $CONFIG_PATH + echo "rpcport=29245" >> $CONFIG_PATH + echo "rpcbind=0.0.0.0" >> $CONFIG_PATH + echo "rpcallowip=0.0.0.0/0" >> $CONFIG_PATH + echo "regtest=1" >> $CONFIG_PATH + echo "txindex=1" >> $CONFIG_PATH + echo "server=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 & lbrycrdd -conf=$CONFIG_PATH $1 @@ -94,15 +102,18 @@ case $RUN_MODE in ## Set config params ## TODO: Make this more automagic in the future. mkdir -p `dirname $CONFIG_PATH` - echo "rpcuser=lbry" > $CONFIG_PATH - echo "rpcpassword=lbry" >> $CONFIG_PATH - echo "rpcport=29245" >> $CONFIG_PATH - echo "rpcbind=0.0.0.0" >> $CONFIG_PATH - echo "rpcallowip=0.0.0.0/0" >> $CONFIG_PATH - echo "testnet=1" >> $CONFIG_PATH - echo "txindex=1" >> $CONFIG_PATH - echo "server=1" >> $CONFIG_PATH - echo "printtoconsole=1" >> $CONFIG_PATH + echo "rpcuser=lbry" > $CONFIG_PATH + echo "rpcpassword=lbry" >> $CONFIG_PATH + echo "rpcport=29245" >> $CONFIG_PATH + echo "rpcbind=0.0.0.0" >> $CONFIG_PATH + echo "rpcallowip=0.0.0.0/0" >> $CONFIG_PATH + echo "testnet=1" >> $CONFIG_PATH + echo "txindex=1" >> $CONFIG_PATH + echo "server=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 & lbrycrdd -conf=$CONFIG_PATH $1 diff --git a/e2e/walletserver/docker-compose.yml b/e2e/walletserver/docker-compose.yml index a3104ba..034b0cc 100644 --- a/e2e/walletserver/docker-compose.yml +++ b/e2e/walletserver/docker-compose.yml @@ -8,7 +8,7 @@ services: ## Wallet Server ## ################### walletserver: - image: lbry/wallet-server:v0.38.5 + image: lbry/wallet-server:v0.38.6 restart: always networks: lbry-network: diff --git a/manager/setup.go b/manager/setup.go index 4672d90..c57b8c8 100644 --- a/manager/setup.go +++ b/manager/setup.go @@ -55,7 +55,7 @@ func (s *Sync) walletSetup() error { } else if balanceResp == nil { return errors.Err("no response") } - balance, err := strconv.ParseFloat((string)(*balanceResp), 64) + balance, err := strconv.ParseFloat(balanceResp.Total.String(), 64) if err != nil { return errors.Err(err) } @@ -188,7 +188,7 @@ func (s *Sync) ensureEnoughUTXOs() error { return errors.Err("no response") } - balanceAmount, err := strconv.ParseFloat((string)(*balance), 64) + balanceAmount, err := strconv.ParseFloat(balance.Total.String(), 64) if err != nil { return errors.Err(err) } @@ -312,7 +312,7 @@ func (s *Sync) ensureChannelOwnership() error { } else if balanceResp == nil { return errors.Err("no response") } - balance, err := decimal.NewFromString((string)(*balanceResp)) + balance, err := decimal.NewFromString(balanceResp.Total.String()) if err != nil { return errors.Err(err) }