From 3de15822eecf3ad4c38a6631a0538a8819c48dd2 Mon Sep 17 00:00:00 2001 From: Mike Casale <46603283+mikewcasale@users.noreply.github.com> Date: Wed, 2 Aug 2023 06:38:14 -0700 Subject: [PATCH 1/5] Creates a bash install script to handle the conda vs pip installation instructions automatically. --- apple-silicon-install.sh | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100755 apple-silicon-install.sh diff --git a/apple-silicon-install.sh b/apple-silicon-install.sh new file mode 100755 index 000000000..f0b694cfe --- /dev/null +++ b/apple-silicon-install.sh @@ -0,0 +1,48 @@ +#!/bin/bash + +# Check if conda is installed +if ! command -v conda &> /dev/null +then + echo "conda could not be found" + exit +fi + +# Prompt user to confirm if the desired conda environment is activated +read -p "Is your desired conda environment activated? (Y/N): " answer +case ${answer:0:1} in + y|Y ) + echo "Proceeding with package installation..." + ;; + * ) + echo "Please create and/or activate the desired conda environment, and then rerun." + exit + ;; +esac + +# Install specific packages with conda +conda install -y pyyaml==5.4.1 scipy osqp + +# Check if pip is installed +if ! command -v pip &> /dev/null +then + echo "pip could not be found" + exit +fi + +# Install remaining packages from requirements.txt with pip +if [ -f requirements.txt ]; then + pip install -r requirements.txt +else + echo "requirements.txt not found in the current directory" + exit 1 +fi + +# Run setup.py to configure brownie +if [ -f setup.py ]; then + python setup.py install +else + echo "setup.py not found in the current directory" + exit 1 +fi + +echo "All packages installed successfully" From bfe9cbba9dfeaa2970ef4d3efe1a2f31a94d7493 Mon Sep 17 00:00:00 2001 From: Mike Casale <46603283+mikewcasale@users.noreply.github.com> Date: Sun, 6 Aug 2023 05:31:00 -0700 Subject: [PATCH 2/5] Fixing failed test. @Lesigh-3100 to review upon return. --- .../NBTest/NBTest_902_ValidatorSlow.ipynb | 623 ++++++++---------- resources/NBTest/NBTest_902_ValidatorSlow.py | 3 +- 2 files changed, 270 insertions(+), 356 deletions(-) diff --git a/resources/NBTest/NBTest_902_ValidatorSlow.ipynb b/resources/NBTest/NBTest_902_ValidatorSlow.ipynb index 5fb6e0590..46d2b023d 100644 --- a/resources/NBTest/NBTest_902_ValidatorSlow.ipynb +++ b/resources/NBTest/NBTest_902_ValidatorSlow.ipynb @@ -2,14 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 28, - "id": "84fa264b", - "metadata": { - "ExecuteTime": { - "end_time": "2023-07-30T12:11:37.954948Z", - "start_time": "2023-07-30T12:11:37.924078Z" - } - }, + "execution_count": 9, "outputs": [ { "name": "stdout", @@ -58,7 +51,15 @@ "plt.rcParams['figure.figsize'] = [12,6]\n", "from fastlane_bot import __VERSION__\n", "require(\"3.0\", __VERSION__)" - ] + ], + "metadata": { + "collapsed": false, + "ExecuteTime": { + "end_time": "2023-08-06T12:29:53.196201Z", + "start_time": "2023-08-06T12:29:53.124133Z" + } + }, + "id": "56224b770915d14" }, { "cell_type": "markdown", @@ -70,12 +71,12 @@ }, { "cell_type": "code", - "execution_count": 29, + "execution_count": 10, "id": "a51e5ec2", "metadata": { "ExecuteTime": { - "end_time": "2023-07-30T12:11:39.298473Z", - "start_time": "2023-07-30T12:11:37.935377Z" + "end_time": "2023-08-06T12:29:54.497241Z", + "start_time": "2023-08-06T12:29:53.143Z" } }, "outputs": [ @@ -83,136 +84,58 @@ "name": "stderr", "output_type": "stream", "text": [ - "2023-07-30 05:11:38,844 [fastlane:INFO] - Time taken to add initial pools: 0.06961727142333984\n", - "2023-07-30 05:11:38,844 [fastlane:INFO] - Time taken to add initial pools: 0.06961727142333984\n", - "2023-07-30 05:11:38,844 [fastlane:INFO] - Time taken to add initial pools: 0.06961727142333984\n", - "2023-07-30 05:11:38,844 [fastlane:INFO] - Time taken to add initial pools: 0.06961727142333984\n", - "2023-07-30 05:11:38,844 [fastlane:INFO] - Time taken to add initial pools: 0.06961727142333984\n", - "2023-07-30 05:11:38,847 [fastlane:INFO] - Initializing the bot...\n", - "2023-07-30 05:11:38,847 [fastlane:INFO] - Initializing the bot...\n", - "2023-07-30 05:11:38,847 [fastlane:INFO] - Initializing the bot...\n", - "2023-07-30 05:11:38,847 [fastlane:INFO] - Initializing the bot...\n", - "2023-07-30 05:11:38,847 [fastlane:INFO] - Initializing the bot...\n", - "2023-07-30 05:11:38,970 [fastlane:INFO] - Removed 3242 unmapped uniswap_v2/sushi pools. 1897 uniswap_v2/sushi pools remaining\n", - "2023-07-30 05:11:38,970 [fastlane:INFO] - Removed 3242 unmapped uniswap_v2/sushi pools. 1897 uniswap_v2/sushi pools remaining\n", - "2023-07-30 05:11:38,970 [fastlane:INFO] - Removed 3242 unmapped uniswap_v2/sushi pools. 1897 uniswap_v2/sushi pools remaining\n", - "2023-07-30 05:11:38,970 [fastlane:INFO] - Removed 3242 unmapped uniswap_v2/sushi pools. 1897 uniswap_v2/sushi pools remaining\n", - "2023-07-30 05:11:38,970 [fastlane:INFO] - Removed 3242 unmapped uniswap_v2/sushi pools. 1897 uniswap_v2/sushi pools remaining\n", - "2023-07-30 05:11:38,971 [fastlane:INFO] - Unmapped uniswap_v2/sushi pools:\n", - "2023-07-30 05:11:38,971 [fastlane:INFO] - Unmapped uniswap_v2/sushi pools:\n", - "2023-07-30 05:11:38,971 [fastlane:INFO] - Unmapped uniswap_v2/sushi pools:\n", - "2023-07-30 05:11:38,971 [fastlane:INFO] - Unmapped uniswap_v2/sushi pools:\n", - "2023-07-30 05:11:38,971 [fastlane:INFO] - Unmapped uniswap_v2/sushi pools:\n", - "2023-07-30 05:11:39,162 [fastlane:INFO] - uniswap_v3: 0\n", - "2023-07-30 05:11:39,162 [fastlane:INFO] - uniswap_v3: 0\n", - "2023-07-30 05:11:39,162 [fastlane:INFO] - uniswap_v3: 0\n", - "2023-07-30 05:11:39,162 [fastlane:INFO] - uniswap_v3: 0\n", - "2023-07-30 05:11:39,162 [fastlane:INFO] - uniswap_v3: 0\n", - "2023-07-30 05:11:39,164 [fastlane:INFO] - uniswap_v2: 3242\n", - "2023-07-30 05:11:39,164 [fastlane:INFO] - uniswap_v2: 3242\n", - "2023-07-30 05:11:39,164 [fastlane:INFO] - uniswap_v2: 3242\n", - "2023-07-30 05:11:39,164 [fastlane:INFO] - uniswap_v2: 3242\n", - "2023-07-30 05:11:39,164 [fastlane:INFO] - uniswap_v2: 3242\n", - "2023-07-30 05:11:39,165 [fastlane:INFO] - sushiswap_v2: 0\n", - "2023-07-30 05:11:39,165 [fastlane:INFO] - sushiswap_v2: 0\n", - "2023-07-30 05:11:39,165 [fastlane:INFO] - sushiswap_v2: 0\n", - "2023-07-30 05:11:39,165 [fastlane:INFO] - sushiswap_v2: 0\n", - "2023-07-30 05:11:39,165 [fastlane:INFO] - sushiswap_v2: 0\n", - "2023-07-30 05:11:39,168 [fastlane:INFO] - uniswap_v3: 636\n", - "2023-07-30 05:11:39,168 [fastlane:INFO] - uniswap_v3: 636\n", - "2023-07-30 05:11:39,168 [fastlane:INFO] - uniswap_v3: 636\n", - "2023-07-30 05:11:39,168 [fastlane:INFO] - uniswap_v3: 636\n", - "2023-07-30 05:11:39,168 [fastlane:INFO] - uniswap_v3: 636\n", - "2023-07-30 05:11:39,169 [fastlane:INFO] - sushiswap_v2: 78\n", - "2023-07-30 05:11:39,169 [fastlane:INFO] - sushiswap_v2: 78\n", - "2023-07-30 05:11:39,169 [fastlane:INFO] - sushiswap_v2: 78\n", - "2023-07-30 05:11:39,169 [fastlane:INFO] - sushiswap_v2: 78\n", - "2023-07-30 05:11:39,169 [fastlane:INFO] - sushiswap_v2: 78\n", - "2023-07-30 05:11:39,170 [fastlane:INFO] - uniswap_v2: 0\n", - "2023-07-30 05:11:39,170 [fastlane:INFO] - uniswap_v2: 0\n", - "2023-07-30 05:11:39,170 [fastlane:INFO] - uniswap_v2: 0\n", - "2023-07-30 05:11:39,170 [fastlane:INFO] - uniswap_v2: 0\n", - "2023-07-30 05:11:39,170 [fastlane:INFO] - uniswap_v2: 0\n", - "2023-07-30 05:11:39,171 [fastlane:INFO] - bancor_v2: 0\n", - "2023-07-30 05:11:39,171 [fastlane:INFO] - bancor_v2: 0\n", - "2023-07-30 05:11:39,171 [fastlane:INFO] - bancor_v2: 0\n", - "2023-07-30 05:11:39,171 [fastlane:INFO] - bancor_v2: 0\n", - "2023-07-30 05:11:39,171 [fastlane:INFO] - bancor_v2: 0\n", - "2023-07-30 05:11:39,172 [fastlane:INFO] - bancor_v3: 34\n", - "2023-07-30 05:11:39,172 [fastlane:INFO] - bancor_v3: 34\n", - "2023-07-30 05:11:39,172 [fastlane:INFO] - bancor_v3: 34\n", - "2023-07-30 05:11:39,172 [fastlane:INFO] - bancor_v3: 34\n", - "2023-07-30 05:11:39,172 [fastlane:INFO] - bancor_v3: 34\n", - "2023-07-30 05:11:39,173 [fastlane:INFO] - carbon_v1: 220\n", - "2023-07-30 05:11:39,173 [fastlane:INFO] - carbon_v1: 220\n", - "2023-07-30 05:11:39,173 [fastlane:INFO] - carbon_v1: 220\n", - "2023-07-30 05:11:39,173 [fastlane:INFO] - carbon_v1: 220\n", - "2023-07-30 05:11:39,173 [fastlane:INFO] - carbon_v1: 220\n", - "2023-07-30 05:11:39,205 [fastlane:INFO] - uniswap_v3_zero_liquidity_pools: 858\n", - "2023-07-30 05:11:39,205 [fastlane:INFO] - uniswap_v3_zero_liquidity_pools: 858\n", - "2023-07-30 05:11:39,205 [fastlane:INFO] - uniswap_v3_zero_liquidity_pools: 858\n", - "2023-07-30 05:11:39,205 [fastlane:INFO] - uniswap_v3_zero_liquidity_pools: 858\n", - "2023-07-30 05:11:39,205 [fastlane:INFO] - uniswap_v3_zero_liquidity_pools: 858\n", - "2023-07-30 05:11:39,206 [fastlane:INFO] - sushiswap_v2_zero_liquidity_pools: 34\n", - "2023-07-30 05:11:39,206 [fastlane:INFO] - sushiswap_v2_zero_liquidity_pools: 34\n", - "2023-07-30 05:11:39,206 [fastlane:INFO] - sushiswap_v2_zero_liquidity_pools: 34\n", - "2023-07-30 05:11:39,206 [fastlane:INFO] - sushiswap_v2_zero_liquidity_pools: 34\n", - "2023-07-30 05:11:39,206 [fastlane:INFO] - sushiswap_v2_zero_liquidity_pools: 34\n", - "2023-07-30 05:11:39,207 [fastlane:INFO] - uniswap_v2_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,207 [fastlane:INFO] - uniswap_v2_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,207 [fastlane:INFO] - uniswap_v2_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,207 [fastlane:INFO] - uniswap_v2_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,207 [fastlane:INFO] - uniswap_v2_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,208 [fastlane:INFO] - bancor_v2_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,208 [fastlane:INFO] - bancor_v2_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,208 [fastlane:INFO] - bancor_v2_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,208 [fastlane:INFO] - bancor_v2_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,208 [fastlane:INFO] - bancor_v2_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,208 [fastlane:INFO] - bancor_v3_zero_liquidity_pools: 37\n", - "2023-07-30 05:11:39,208 [fastlane:INFO] - bancor_v3_zero_liquidity_pools: 37\n", - "2023-07-30 05:11:39,208 [fastlane:INFO] - bancor_v3_zero_liquidity_pools: 37\n", - "2023-07-30 05:11:39,208 [fastlane:INFO] - bancor_v3_zero_liquidity_pools: 37\n", - "2023-07-30 05:11:39,208 [fastlane:INFO] - bancor_v3_zero_liquidity_pools: 37\n", - "2023-07-30 05:11:39,209 [fastlane:INFO] - carbon_v1_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,209 [fastlane:INFO] - carbon_v1_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,209 [fastlane:INFO] - carbon_v1_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,209 [fastlane:INFO] - carbon_v1_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,209 [fastlane:INFO] - carbon_v1_zero_liquidity_pools: 0\n", - "2023-07-30 05:11:39,210 [fastlane:INFO] - Removed 0 unsupported exchanges. 968 pools remaining\n", - "2023-07-30 05:11:39,210 [fastlane:INFO] - Removed 0 unsupported exchanges. 968 pools remaining\n", - "2023-07-30 05:11:39,210 [fastlane:INFO] - Removed 0 unsupported exchanges. 968 pools remaining\n", - "2023-07-30 05:11:39,210 [fastlane:INFO] - Removed 0 unsupported exchanges. 968 pools remaining\n", - "2023-07-30 05:11:39,210 [fastlane:INFO] - Removed 0 unsupported exchanges. 968 pools remaining\n", - "2023-07-30 05:11:39,211 [fastlane:INFO] - Pools remaining per exchange:\n", - "2023-07-30 05:11:39,211 [fastlane:INFO] - Pools remaining per exchange:\n", - "2023-07-30 05:11:39,211 [fastlane:INFO] - Pools remaining per exchange:\n", - "2023-07-30 05:11:39,211 [fastlane:INFO] - Pools remaining per exchange:\n", - "2023-07-30 05:11:39,211 [fastlane:INFO] - Pools remaining per exchange:\n", - "2023-07-30 05:11:39,211 [fastlane:INFO] - uniswap_v3: 636\n", - "2023-07-30 05:11:39,211 [fastlane:INFO] - uniswap_v3: 636\n", - "2023-07-30 05:11:39,211 [fastlane:INFO] - uniswap_v3: 636\n", - "2023-07-30 05:11:39,211 [fastlane:INFO] - uniswap_v3: 636\n", - "2023-07-30 05:11:39,211 [fastlane:INFO] - uniswap_v3: 636\n", - "2023-07-30 05:11:39,212 [fastlane:INFO] - carbon_v1: 220\n", - "2023-07-30 05:11:39,212 [fastlane:INFO] - carbon_v1: 220\n", - "2023-07-30 05:11:39,212 [fastlane:INFO] - carbon_v1: 220\n", - "2023-07-30 05:11:39,212 [fastlane:INFO] - carbon_v1: 220\n", - "2023-07-30 05:11:39,212 [fastlane:INFO] - carbon_v1: 220\n", - "2023-07-30 05:11:39,213 [fastlane:INFO] - uniswap_v2: 0\n", - "2023-07-30 05:11:39,213 [fastlane:INFO] - uniswap_v2: 0\n", - "2023-07-30 05:11:39,213 [fastlane:INFO] - uniswap_v2: 0\n", - "2023-07-30 05:11:39,213 [fastlane:INFO] - uniswap_v2: 0\n", - "2023-07-30 05:11:39,213 [fastlane:INFO] - uniswap_v2: 0\n", - "2023-07-30 05:11:39,214 [fastlane:INFO] - sushiswap_v2: 78\n", - "2023-07-30 05:11:39,214 [fastlane:INFO] - sushiswap_v2: 78\n", - "2023-07-30 05:11:39,214 [fastlane:INFO] - sushiswap_v2: 78\n", - "2023-07-30 05:11:39,214 [fastlane:INFO] - sushiswap_v2: 78\n", - "2023-07-30 05:11:39,214 [fastlane:INFO] - sushiswap_v2: 78\n", - "2023-07-30 05:11:39,215 [fastlane:INFO] - bancor_v3: 34\n", - "2023-07-30 05:11:39,215 [fastlane:INFO] - bancor_v3: 34\n", - "2023-07-30 05:11:39,215 [fastlane:INFO] - bancor_v3: 34\n", - "2023-07-30 05:11:39,215 [fastlane:INFO] - bancor_v3: 34\n", - "2023-07-30 05:11:39,215 [fastlane:INFO] - bancor_v3: 34\n" + "2023-08-06 05:29:54,070 [fastlane:INFO] - Time taken to add initial pools: 0.06647491455078125\n", + "2023-08-06 05:29:54,070 [fastlane:INFO] - Time taken to add initial pools: 0.06647491455078125\n", + "2023-08-06 05:29:54,073 [fastlane:INFO] - Initializing the bot...\n", + "2023-08-06 05:29:54,073 [fastlane:INFO] - Initializing the bot...\n", + "2023-08-06 05:29:54,191 [fastlane:INFO] - Removed 3242 unmapped uniswap_v2/sushi pools. 1897 uniswap_v2/sushi pools remaining\n", + "2023-08-06 05:29:54,191 [fastlane:INFO] - Removed 3242 unmapped uniswap_v2/sushi pools. 1897 uniswap_v2/sushi pools remaining\n", + "2023-08-06 05:29:54,192 [fastlane:INFO] - Unmapped uniswap_v2/sushi pools:\n", + "2023-08-06 05:29:54,192 [fastlane:INFO] - Unmapped uniswap_v2/sushi pools:\n", + "2023-08-06 05:29:54,379 [fastlane:INFO] - uniswap_v3: 0\n", + "2023-08-06 05:29:54,379 [fastlane:INFO] - uniswap_v3: 0\n", + "2023-08-06 05:29:54,380 [fastlane:INFO] - uniswap_v2: 3242\n", + "2023-08-06 05:29:54,380 [fastlane:INFO] - uniswap_v2: 3242\n", + "2023-08-06 05:29:54,380 [fastlane:INFO] - sushiswap_v2: 0\n", + "2023-08-06 05:29:54,380 [fastlane:INFO] - sushiswap_v2: 0\n", + "2023-08-06 05:29:54,382 [fastlane:INFO] - uniswap_v3: 636\n", + "2023-08-06 05:29:54,382 [fastlane:INFO] - uniswap_v3: 636\n", + "2023-08-06 05:29:54,382 [fastlane:INFO] - sushiswap_v2: 78\n", + "2023-08-06 05:29:54,382 [fastlane:INFO] - sushiswap_v2: 78\n", + "2023-08-06 05:29:54,383 [fastlane:INFO] - uniswap_v2: 0\n", + "2023-08-06 05:29:54,383 [fastlane:INFO] - uniswap_v2: 0\n", + "2023-08-06 05:29:54,383 [fastlane:INFO] - bancor_v2: 0\n", + "2023-08-06 05:29:54,383 [fastlane:INFO] - bancor_v2: 0\n", + "2023-08-06 05:29:54,383 [fastlane:INFO] - bancor_v3: 34\n", + "2023-08-06 05:29:54,383 [fastlane:INFO] - bancor_v3: 34\n", + "2023-08-06 05:29:54,384 [fastlane:INFO] - carbon_v1: 220\n", + "2023-08-06 05:29:54,384 [fastlane:INFO] - carbon_v1: 220\n", + "2023-08-06 05:29:54,415 [fastlane:INFO] - uniswap_v3_zero_liquidity_pools: 858\n", + "2023-08-06 05:29:54,415 [fastlane:INFO] - uniswap_v3_zero_liquidity_pools: 858\n", + "2023-08-06 05:29:54,415 [fastlane:INFO] - sushiswap_v2_zero_liquidity_pools: 34\n", + "2023-08-06 05:29:54,415 [fastlane:INFO] - sushiswap_v2_zero_liquidity_pools: 34\n", + "2023-08-06 05:29:54,416 [fastlane:INFO] - uniswap_v2_zero_liquidity_pools: 0\n", + "2023-08-06 05:29:54,416 [fastlane:INFO] - uniswap_v2_zero_liquidity_pools: 0\n", + "2023-08-06 05:29:54,416 [fastlane:INFO] - bancor_v2_zero_liquidity_pools: 0\n", + "2023-08-06 05:29:54,416 [fastlane:INFO] - bancor_v2_zero_liquidity_pools: 0\n", + "2023-08-06 05:29:54,417 [fastlane:INFO] - bancor_v3_zero_liquidity_pools: 37\n", + "2023-08-06 05:29:54,417 [fastlane:INFO] - bancor_v3_zero_liquidity_pools: 37\n", + "2023-08-06 05:29:54,417 [fastlane:INFO] - carbon_v1_zero_liquidity_pools: 0\n", + "2023-08-06 05:29:54,417 [fastlane:INFO] - carbon_v1_zero_liquidity_pools: 0\n", + "2023-08-06 05:29:54,418 [fastlane:INFO] - Removed 0 unsupported exchanges. 968 pools remaining\n", + "2023-08-06 05:29:54,418 [fastlane:INFO] - Removed 0 unsupported exchanges. 968 pools remaining\n", + "2023-08-06 05:29:54,419 [fastlane:INFO] - Pools remaining per exchange:\n", + "2023-08-06 05:29:54,419 [fastlane:INFO] - Pools remaining per exchange:\n", + "2023-08-06 05:29:54,419 [fastlane:INFO] - carbon_v1: 220\n", + "2023-08-06 05:29:54,419 [fastlane:INFO] - carbon_v1: 220\n", + "2023-08-06 05:29:54,419 [fastlane:INFO] - sushiswap_v2: 78\n", + "2023-08-06 05:29:54,419 [fastlane:INFO] - sushiswap_v2: 78\n", + "2023-08-06 05:29:54,420 [fastlane:INFO] - uniswap_v2: 0\n", + "2023-08-06 05:29:54,420 [fastlane:INFO] - uniswap_v2: 0\n", + "2023-08-06 05:29:54,420 [fastlane:INFO] - bancor_v3: 34\n", + "2023-08-06 05:29:54,420 [fastlane:INFO] - bancor_v3: 34\n", + "2023-08-06 05:29:54,420 [fastlane:INFO] - uniswap_v3: 636\n", + "2023-08-06 05:29:54,420 [fastlane:INFO] - uniswap_v3: 636\n" ] } ], @@ -331,12 +254,12 @@ }, { "cell_type": "code", - "execution_count": 30, + "execution_count": 11, "id": "c8f41237", "metadata": { "ExecuteTime": { - "end_time": "2023-07-30T12:11:39.298673Z", - "start_time": "2023-07-30T12:11:39.289074Z" + "end_time": "2023-08-06T12:29:54.497413Z", + "start_time": "2023-08-06T12:29:54.494079Z" } }, "outputs": [], @@ -355,12 +278,12 @@ }, { "cell_type": "code", - "execution_count": 31, + "execution_count": 12, "id": "aaaf7423", "metadata": { "ExecuteTime": { - "end_time": "2023-07-30T12:11:39.298737Z", - "start_time": "2023-07-30T12:11:39.291624Z" + "end_time": "2023-08-06T12:29:54.500387Z", + "start_time": "2023-08-06T12:29:54.496715Z" } }, "outputs": [], @@ -379,12 +302,12 @@ }, { "cell_type": "code", - "execution_count": 32, + "execution_count": 13, "id": "db7ec9ec", "metadata": { "ExecuteTime": { - "end_time": "2023-07-30T12:11:39.579514Z", - "start_time": "2023-07-30T12:11:39.301732Z" + "end_time": "2023-08-06T12:29:54.788652Z", + "start_time": "2023-08-06T12:29:54.508442Z" } }, "outputs": [], @@ -418,12 +341,12 @@ }, { "cell_type": "code", - "execution_count": 33, + "execution_count": 14, "id": "78d0dbc1", "metadata": { "ExecuteTime": { - "end_time": "2023-07-30T12:11:41.693352Z", - "start_time": "2023-07-30T12:11:39.582702Z" + "end_time": "2023-08-06T12:29:58.990699Z", + "start_time": "2023-08-06T12:29:54.793412Z" } }, "outputs": [ @@ -433,7 +356,7 @@ "application/vnd.jupyter.widget-view+json": { "version_major": 2, "version_minor": 0, - "model_id": "0ffd217eaf094ef3aee20c6700f642f0" + "model_id": "56850cdfceff41aab83fda57bbd21b77" } }, "metadata": {}, @@ -441,11 +364,11 @@ }, { "data": { - "text/plain": " 0%| | 0/1 [00:00 CarbonBot: assert arb_opp == validated - # - # ## Test_validator_single From 32ccd3a2f9c886587ff2b28b3c43f006bd6b90bb Mon Sep 17 00:00:00 2001 From: Mike Casale <46603283+mikewcasale@users.noreply.github.com> Date: Mon, 7 Aug 2023 06:22:43 -0700 Subject: [PATCH 3/5] Update apple-silicon-install.sh --- apple-silicon-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apple-silicon-install.sh b/apple-silicon-install.sh index f0b694cfe..c016ff826 100755 --- a/apple-silicon-install.sh +++ b/apple-silicon-install.sh @@ -31,7 +31,7 @@ fi # Install remaining packages from requirements.txt with pip if [ -f requirements.txt ]; then - pip install -r requirements.txt + pip install -r requirements.txt --ignore-installed else echo "requirements.txt not found in the current directory" exit 1 From 4c3b5d2743215bc8e7ecf7548b9ec7613b20c135 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 7 Aug 2023 17:51:11 +0000 Subject: [PATCH 4/5] Bump version [skip ci] --- fastlane_bot/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane_bot/__init__.py b/fastlane_bot/__init__.py index 784d21310..a69fe3a05 100644 --- a/fastlane_bot/__init__.py +++ b/fastlane_bot/__init__.py @@ -1,7 +1,7 @@ from .bot import CarbonBot as Bot, __VERSION__, __DATE__ from .config import Config, ConfigNetwork, ConfigDB, ConfigLogger, ConfigProvider -__version__ = '2.7.3' +__version__ = '2.7.4' From 1f60586f7dbd1907225ca77a11aacd7e966194ed Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 7 Aug 2023 17:51:19 +0000 Subject: [PATCH 5/5] Update changelog [skip ci] --- CHANGELOG.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7639092a4..529092709 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,22 @@ ## [Unreleased](https://github.com/bancorprotocol/fastlane-bot/tree/HEAD) -[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.2...HEAD) +[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.3...HEAD) - Cleanup of Unused Top-Level Files [\#47](https://github.com/bancorprotocol/fastlane-bot/issues/47) + +Closed issues + +- Installation Issue with pyyaml==5.4.1 and Brownie [\#30](https://github.com/bancorprotocol/fastlane-bot/issues/30) + +Merged pull requests + +- Creates a bash install script to handle the conda vs pip installation… [\#51](https://github.com/bancorprotocol/fastlane-bot/pull/51) ([mikewcasale](https://github.com/mikewcasale)) + +## [v2.7.3](https://github.com/bancorprotocol/fastlane-bot/tree/v2.7.3) (2023-08-07) + +[Full Changelog](https://github.com/bancorprotocol/fastlane-bot/compare/v2.7.2...v2.7.3) + - Removes unused files. [\#48](https://github.com/bancorprotocol/fastlane-bot/pull/48) ([mikewcasale](https://github.com/mikewcasale)) Closed issues