diff --git a/Dockerfile b/Dockerfile index 21f3a4e..7cd1020 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM recksato/robosats-client:v0.7.3-alpha +FROM recksato/robosats-client:v0.7.4-alpha RUN apk add bash curl sudo tini wget yq; \ rm -f /var/cache/apk/* -ENV APP_HOST robosats.embassy -ENV APP_PORT 12596 -ENV TOR_PROXY_IP embassy -ENV TOR_PROXY_PORT 9050 +ENV APP_HOST=robosats.embassy +ENV APP_PORT=12596 +ENV TOR_PROXY_IP=embassy +ENV TOR_PROXY_PORT=9050 ADD ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh RUN chmod a+x /usr/local/bin/*.sh diff --git a/LICENSE b/LICENSE index 599ad42..ec3ecc6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2024 Start9 Labs +Copyright (c) 2025 Start9 Labs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Makefile b/Makefile index fe34832..187d560 100644 --- a/Makefile +++ b/Makefile @@ -14,13 +14,22 @@ install: $(PKG_ID).s9pk start-cli package install $(PKG_ID).s9pk clean: + docker run --rm -it -v "$(shell pwd)"/configurator:/home/rust/src messense/rust-musl-cross:x86_64-musl cargo clean -q rm -rf docker-images rm -f image.tar rm -f $(PKG_ID).s9pk rm -f scripts/*.js +# for rebuilding just the arm image. will include docker-images/x86_64.tar into the s9pk if it exists +arm: docker-images/aarch64.tar scripts/embassy.js + start-sdk pack + +# for rebuilding just the x86 image. will include docker-images/aarch64.tar into the s9pk if it exists +x86: docker-images/x86_64.tar scripts/embassy.js + start-sdk pack + scripts/embassy.js: $(TS_FILES) - deno bundle scripts/embassy.ts scripts/embassy.js + deno run --allow-read --allow-write --allow-env --allow-net scripts/bundle.ts docker-images/x86_64.tar: Dockerfile docker_entrypoint.sh mkdir -p docker-images @@ -30,5 +39,5 @@ docker-images/aarch64.tar: Dockerfile docker_entrypoint.sh mkdir -p docker-images docker buildx build --tag start9/$(PKG_ID)/main:$(PKG_VERSION) --platform=linux/arm64 --build-arg PLATFORM=arm64 -o type=docker,dest=docker-images/aarch64.tar . -$(PKG_ID).s9pk: manifest.yaml instructions.md LICENSE icon.png scripts/embassy.js docker-images/aarch64.tar docker-images/x86_64.tar +$(PKG_ID).s9pk: manifest.yaml instructions.md LICENSE icon.png scripts/embassy.js docker-images/x86_64.tar docker-images/aarch64.tar start-sdk pack diff --git a/manifest.yaml b/manifest.yaml index e43a519..3a52321 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -1,8 +1,8 @@ id: robosats title: "RoboSats" -version: 0.7.3 +version: 0.7.4 release-notes: | - * Updated to RoboSats v0.7.3-alpha [Release Notes](https://github.com/RoboSats/robosats/releases/tag/v0.7.3-alpha) + * Updated to RoboSats v0.7.4-alpha [Release Notes](https://github.com/RoboSats/robosats/releases/tag/v0.7.4-alpha) license: mit wrapper-repo: "https://github.com/RoboSats/robosats-startos" upstream-repo: "https://github.com/Reckless-Satoshi/robosats" diff --git a/scripts/bundle.ts b/scripts/bundle.ts new file mode 100644 index 0000000..dbf577b --- /dev/null +++ b/scripts/bundle.ts @@ -0,0 +1,3 @@ +import { bundle } from "https://deno.land/x/emit@0.40.0/mod.ts"; +const result = await bundle("scripts/embassy.ts"); +await Deno.writeTextFile("scripts/embassy.js", result.code); diff --git a/scripts/deps.ts b/scripts/deps.ts index 43bec43..409c077 100644 --- a/scripts/deps.ts +++ b/scripts/deps.ts @@ -1 +1,2 @@ -export * from "https://deno.land/x/embassyd_sdk@v0.3.3.0.9/mod.ts"; +export * from "https://deno.land/x/embassyd_sdk@v0.3.3.0.11/mod.ts"; +export * from "https://deno.land/x/embassyd_sdk@v0.3.3.0.11/util.ts"; diff --git a/scripts/procedures/bundle.ts b/scripts/procedures/bundle.ts new file mode 100644 index 0000000..dbf577b --- /dev/null +++ b/scripts/procedures/bundle.ts @@ -0,0 +1,3 @@ +import { bundle } from "https://deno.land/x/emit@0.40.0/mod.ts"; +const result = await bundle("scripts/embassy.ts"); +await Deno.writeTextFile("scripts/embassy.js", result.code); diff --git a/scripts/procedures/migrations.ts b/scripts/procedures/migrations.ts index e38f2c9..ffcedc1 100644 --- a/scripts/procedures/migrations.ts +++ b/scripts/procedures/migrations.ts @@ -1,4 +1,4 @@ import { compat, types as T } from "../deps.ts"; export const migration: T.ExpectedExports.migration = - compat.migrations.fromMapping({}, "0.7.3"); + compat.migrations.fromMapping({}, "0.7.4");