Skip to content

Commit 9bcf0dc

Browse files
authored
Merge branch 'BoltzExchange:master' into master
2 parents fdb0ba9 + c20411c commit 9bcf0dc

File tree

13 files changed

+2193
-1735
lines changed

13 files changed

+2193
-1735
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
matrix:
99
platform: [ubuntu-latest]
10-
node-version: [16]
10+
node-version: [16, 18]
1111

1212
runs-on: ${{ matrix.platform }}
1313

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ site/
6565

6666
# Virtual Python environment
6767
.venv
68+
.ruff_cache
6869

6970
# Visual Studio Code configuration
7071
.vscode/

docker/build.py

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,13 @@ def list_images(to_list: List[str]):
156156

157157
print()
158158

159-
def build_images(to_build: List[str], organisation: str, no_cache: bool, buildx: bool, platform = ""):
159+
def build_images(
160+
to_build: List[str],
161+
organisation: str,
162+
no_cache: bool,
163+
buildx: bool,
164+
platform = "",
165+
):
160166
"""Builds one or more images"""
161167

162168
change_working_directory()
@@ -177,11 +183,13 @@ def build_images(to_build: List[str], organisation: str, no_cache: bool, buildx:
177183
value=argument.value,
178184
))
179185

180-
# Add the prefix "--build-arg " to every entry and join the array to a string
186+
# Add the prefix "--build-arg " to every entry and
187+
# join the array to a string
181188
build_args = " ".join(["--build-arg " + entry for entry in build_args])
182189

183190
if buildx:
184-
command = "docker buildx build --push {args} --platform " + platform + " --file {dockerfile} --tag {name}:{tag} ."
191+
command = "docker buildx build --push {args} --platform " + \
192+
platform + " --file {dockerfile} --tag {name}:{tag} ."
185193
else:
186194
command = "docker build -t {name}:{tag} -f {dockerfile} {args} ."
187195

@@ -232,7 +240,11 @@ def parse_images(to_parse: List[str]) -> List[str]:
232240

233241
BUILD_PARSER.add_argument("images", type=str, nargs="*")
234242
BUILD_PARSER.add_argument("--no-cache", dest="no_cache", action="store_true")
235-
BUILD_PARSER.add_argument("--organisation", default="boltz", help="The organisation to use for the image names")
243+
BUILD_PARSER.add_argument(
244+
"--organisation",
245+
default="boltz",
246+
help="The organisation to use for the image names",
247+
)
236248

237249
BUILDX_PARSER.add_argument("images", type=str, nargs="*")
238250
BUILDX_PARSER.add_argument("--no-cache", dest="no_cache", action="store_true")
@@ -241,7 +253,11 @@ def parse_images(to_parse: List[str]) -> List[str]:
241253
default="linux/amd64,linux/arm64",
242254
help="The platforms to build for",
243255
)
244-
BUILDX_PARSER.add_argument("--organisation", default="boltz", help="The organisation to use for the image names")
256+
BUILDX_PARSER.add_argument(
257+
"--organisation",
258+
default="boltz",
259+
help="The organisation to use for the image names",
260+
)
245261

246262
ARGS = PARSER.parse_args()
247263

@@ -252,4 +268,10 @@ def parse_images(to_parse: List[str]) -> List[str]:
252268
elif ARGS.command == "build":
253269
build_images(PARSED_IMAGES, ARGS.organisation, ARGS.no_cache, False)
254270
elif ARGS.command == "buildx":
255-
build_images(PARSED_IMAGES, ARGS.organisation, ARGS.no_cache, True, ARGS.platform)
271+
build_images(
272+
PARSED_IMAGES,
273+
ARGS.organisation,
274+
ARGS.no_cache,
275+
True,
276+
ARGS.platform,
277+
)

lib/chain/MempoolSpace.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Axios, { AxiosResponse } from 'axios';
1+
import axios, { AxiosResponse } from 'axios';
22
import Logger from '../Logger';
33
import { formatError, stringify } from '../Utils';
44

@@ -44,7 +44,7 @@ class MempoolSpace {
4444

4545
private fetchRecommendedFees = async () => {
4646
try {
47-
const response = await Axios.get<any, AxiosResponse<RecommendedFees>>(`${this.apiUrl}/v1/fees/recommended`);
47+
const response = await axios.get<any, AxiosResponse<RecommendedFees>>(`${this.apiUrl}/v1/fees/recommended`);
4848

4949
if (typeof response.data.fastestFee !== 'number') {
5050
this.handleCouldNotFetch('invalid response');

0 commit comments

Comments
 (0)