Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SWAP Code from @bubafistah #243

Merged
merged 55 commits into from
Jul 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
1b7900d
Build tests and export compile commands
bubafistah Aug 15, 2022
9b31bc0
Save swap addr flag alongside address struct
bubafistah Aug 15, 2022
5f24b29
Additional hash function for short cn hash version
bubafistah Aug 17, 2022
0da7519
Hash func correction
bubafistah Aug 17, 2022
f46a1ee
Structure for swap addr inclusion in extra
bubafistah Aug 17, 2022
6c85518
Frame for swap related unit tests
bubafistah Aug 17, 2022
aa3cca8
Additional chacha crypt funcs
bubafistah Aug 21, 2022
956fd06
Add test swap keys
bubafistah Aug 21, 2022
f8d4596
Functions for building / parsing swap txs
bubafistah Aug 21, 2022
aaab4f9
Add field header for swap data
bubafistah Aug 21, 2022
b57d134
Remove log
bubafistah Aug 21, 2022
2710ecc
Swap tx build test
bubafistah Aug 21, 2022
7685c19
Fix typo
bubafistah Aug 21, 2022
2c94870
Don't build tests by default
bubafistah Aug 21, 2022
2cde206
Merge pull request #237 from bubafistah/swap
Snider Aug 21, 2022
7d5af6c
Func for checking for swap tx
bubafistah Aug 24, 2022
548604b
Swap addr parsing
bubafistah Sep 20, 2022
66c9387
Update unittests
bubafistah Sep 20, 2022
e4a2146
Send swap txs to null addr
bubafistah Sep 20, 2022
7dcf37f
Add swap data to tx when constructing
bubafistah Sep 20, 2022
a845f2f
Add missing func def
bubafistah Sep 20, 2022
b3f28db
Merge pull request #238 from bubafistah/swap
bubafistah Sep 21, 2022
47858d5
Short testnet hf windows
bubafistah Sep 25, 2022
0d47181
Don't use def patment id logic for swap addrs
bubafistah Sep 25, 2022
2eb18ba
Simplewallet swap transfer creation
bubafistah Sep 25, 2022
e734992
Don't allow swap txs on view only wallets
bubafistah Sep 25, 2022
bd3b808
Explicitly null swap tx key
bubafistah Sep 25, 2022
ebd77ce
Use regular wallet for swap
bubafistah Sep 30, 2022
c5cd038
Set swap tx destination inside wallet
bubafistah Oct 1, 2022
beb165c
New rpc command input/output structs
bubafistah Oct 2, 2022
c6ec0f8
on_get_block_swap_txs_by_height rpc implementation
bubafistah Oct 2, 2022
995532c
Reg new rpc command in header
bubafistah Oct 2, 2022
cd85407
Bump rpc version
bubafistah Oct 2, 2022
01b5fa7
Merge pull request #240 from bubafistah/swap_rpc
bubafistah Oct 2, 2022
2c8c847
Change testnet seednode
bubafistah Oct 2, 2022
0baad27
Change swap wallet addr
bubafistah Oct 2, 2022
556c0a3
Merge pull request #241 from bubafistah/swap_rpc
bubafistah Oct 3, 2022
2711a37
Check for zero div
bubafistah Oct 3, 2022
f0c9228
Merge pull request #242 from bubafistah/zero_div
Snider Oct 3, 2022
4e8e587
add manual gha trigger
Snider Jan 7, 2023
9e017d9
gitignore
Snider Jan 25, 2023
bba10ab
version 5.x.x Smile
Snider Jan 25, 2023
316dc84
gui updates
Snider Jan 25, 2023
1e3bef9
removes compile dependencies.
Snider Jun 20, 2023
a78deed
Revert "removes compile dependencies."
Snider Jul 14, 2023
6b02ac4
adds swap wallet pub data
Snider Jul 14, 2023
c322142
use provided dev key from rpc command.
Snider Jul 14, 2023
56640e9
windows compile fix
Snider Jul 14, 2023
23dd104
remove failing extra build
Snider Jul 14, 2023
fc784c7
fixes macos compile
Snider Jul 14, 2023
8edaec6
renames build assets
Snider Jul 14, 2023
93404a4
linux CI fix
Snider Jul 14, 2023
9a6423b
linux CI fix
Snider Jul 14, 2023
bcb9b1a
HF-8 1500000 - Friday, 11 August 2023
Snider Jul 14, 2023
cdb9642
Checkpoint block 1480026
Snider Jul 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 0 additions & 52 deletions .github/workflows/docker-wallet.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
env:
REMOVE_BUNDLED_BOOST : rm -rf /usr/local/share/boost
BUILD_DEFAULT_LINUX: |
make release-static-linux-x86_64
make release-static-linux-x86_64-local-boost
APT_INSTALL_LINUX: 'sudo apt -y install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev libsodium-dev libhidapi-dev libnorm-dev libusb-1.0-0-dev libpgm-dev libprotobuf-dev protobuf-compiler ccache'
APT_SET_CONF: |
echo "Acquire::Retries \"3\";" | sudo tee -a /etc/apt/apt.conf.d/80-custom
Expand All @@ -39,7 +39,7 @@ jobs:
CCACHE_TEMPDIR: /tmp/.ccache-temp
strategy:
matrix:
os: [ubuntu-18.04]
os: [ubuntu-20.04]
steps:
- uses: actions/checkout@v1
with:
Expand All @@ -61,11 +61,11 @@ jobs:
run: |
${{env.CCACHE_SETTINGS}}
${{env.BUILD_DEFAULT_LINUX}}
- run: LETHEAN_RELEASE=linux make zip-release
- run: LETHEAN_RELEASE=lethean-cli-linux make zip-release
- uses: actions/upload-artifact@v2
with:
name: linux.tar
path: ${{ github.workspace }}/build/linux.tar
path: ${{ github.workspace }}/build/lethean-cli-linux.tar
- name: Get the version
id: get_version
if: startsWith(github.ref, 'refs/tags/')
Expand All @@ -74,4 +74,4 @@ jobs:
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: ${{ github.workspace }}/build/linux.tar
files: ${{ github.workspace }}/build/lethean-cli-linux.tar
22 changes: 5 additions & 17 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: macOS

on:
workflow_dispatch:
push:
branches:
- 'main'
Expand Down Expand Up @@ -49,30 +50,17 @@ jobs:
run: |
${{env.CCACHE_SETTINGS}}
make release-static-mac-x86_64 -j${HOMEBREW_MAKE_JOBS}
- name: Import Code-Signing Certificates for macOS
uses: Apple-Actions/import-codesign-certs@v1
with:
p12-file-base64: ${{ secrets.MAC_DEVELOPER_CERT }}
p12-password: ${{ secrets.MAC_DEVELOPER_PASS }}
- run: make ci-release
- run: LETHEAN_RELEASE=lethean-cli-macos make zip-release
- run: chmod +x build/packaged/lethean*
- name: Codesign
env:
APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
run: |
cp LICENSE build/packaged/LICENSE
gon -log-level=info ./.github/gon-notarize.json
- uses: actions/upload-artifact@v2
with:
name: macOS
name: lethean-cli-macos
path: |
lethean-cli-macos.dmg
lethean-cli-macos.zip
lethean-cli-macos.tar
- name: Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: |
lethean-cli-macos.dmg
lethean-cli-macos.zip
lethean-cli-macos.tar

6 changes: 3 additions & 3 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ jobs:
${{env.CCACHE_SETTINGS}}
make release-static-win64-boost
make release-static-win64 -j2
- run: LETHEAN_RELEASE=windows make zip-release
- run: LETHEAN_RELEASE=lethean-cli-windows make zip-release
- uses: actions/upload-artifact@v2
with:
name: windows.tar
path: ${{ github.workspace }}/build/windows.tar
path: ${{ github.workspace }}/build/lethean-cli-windows.tar
- name: Get the version
id: get_version
if: startsWith(github.ref, 'refs/tags/')
Expand All @@ -64,5 +64,5 @@ jobs:
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
files: ${{ github.workspace }}/build/windows.tar
files: ${{ github.workspace }}/build/lethean-cli-windows.tar

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/build
/tags
log/
deps

# vim swap files
*.swp
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ project(LetheanVPN)
# shhhhh sleepy time errors, we know...
add_definitions(-w)

set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

function (die msg)
if (NOT WIN32)
string(ASCII 27 Esc)
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# Provide current version here instead of versin.h.in file
LETHEAN_VERSION?=4.0.7
LETHEAN_VERSION?=5.0.0
LETHEAN_RELEASE?=linux
LETHEAN_CMAKE_FLAGS?=""

Expand Down
2 changes: 1 addition & 1 deletion debian/lethean-wallet-rpc.default
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ LETHEANWALLET=/var/lib/lthn/wallet
RPCPORT=13660

# To redirect to global daemon
#DAEMONHOST=sync.lethean.io
#DAEMONHOST=seed.lethean.io
DAEMONHOST=localhost

RPCLOGIN="user:pass"
Expand Down
2 changes: 1 addition & 1 deletion debian/lethean-wallet-vpn-rpc.default
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ LETHEANWALLET=/var/lib/lthn/wallet
RPCPORT=13660

# To redirect to global daemon
#DAEMONHOST=sync.lethean.io
#DAEMONHOST=seed.lethean.io
DAEMONHOST=localhost

RPCLOGIN="user:pass"
Expand Down
2 changes: 1 addition & 1 deletion external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,6 @@ endif()

add_subdirectory(db_drivers)
add_subdirectory(easylogging++)

add_subdirectory(qrcodegen)
add_subdirectory(argon2)
set(ARGON2_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/argon2/include" PARENT_SCOPE)
8 changes: 8 additions & 0 deletions external/qrcodegen/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
project(libqrcodegen)

add_library(qrcodegen STATIC QrCode.cpp)
set_target_properties(qrcodegen PROPERTIES POSITION_INDEPENDENT_CODE ON)
set_target_properties(qrcodegen PROPERTIES CXX_STANDARD 11)

target_include_directories(qrcodegen PUBLIC
${CMAKE_CURRENT_SOURCE_DIR})
Loading