From b9450aee1e072b83e3acc041f93bf0c2ed00c2ff Mon Sep 17 00:00:00 2001 From: fiatjaf Date: Sun, 29 Sep 2024 14:01:44 -0300 Subject: [PATCH] use libsecp256k1 with musl for signature verification. --- .gitignore | 1 + go.mod | 2 +- go.sum | 4 ++-- justfile | 9 ++++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 8648910..b933896 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ yarn.lock package-lock.json *_templ.go .models +secp256k1-master diff --git a/go.mod b/go.mod index 734a21c..11cb669 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/microcosm-cc/bluemonday v1.0.24 github.com/nbd-wtf/emoji v0.0.3 - github.com/nbd-wtf/go-nostr v0.37.5 + github.com/nbd-wtf/go-nostr v0.38.0 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 github.com/pelletier/go-toml v1.9.5 github.com/puzpuzpuz/xsync/v3 v3.4.0 diff --git a/go.sum b/go.sum index a54e82e..f5528ad 100644 --- a/go.sum +++ b/go.sum @@ -188,8 +188,8 @@ github.com/mna/pigeon v1.1.0 h1:EjlvVbkGnNGemf8OrjeJX0nH8orujY/HkJgzJtd7kxc= github.com/mna/pigeon v1.1.0/go.mod h1:rkFeDZ0gc+YbnrXPw0q2RlI0QRuKBBPu67fgYIyGRNg= github.com/nbd-wtf/emoji v0.0.3 h1:YtkT7MVPXvqU1SQjvC/CShlWexnREzqNCxmhUnL00CA= github.com/nbd-wtf/emoji v0.0.3/go.mod h1:tS6D9iI34qwBmWc5g8X7tVDkWXulqbTJRsvsM6QsS88= -github.com/nbd-wtf/go-nostr v0.37.5 h1:w/8aBgSf3lC2OoqAJXnYUO0Nxqv+YAdxDC8X3FbLYS8= -github.com/nbd-wtf/go-nostr v0.37.5/go.mod h1:TGKGj00BmJRXvRe0LlpDN3KKbELhhPXgBwUEhzu3Oq0= +github.com/nbd-wtf/go-nostr v0.38.0 h1:WSRMxKdlL2otCtHrpyXUUKOG77SGookqqWk6yX2MKCU= +github.com/nbd-wtf/go-nostr v0.38.0/go.mod h1:TGKGj00BmJRXvRe0LlpDN3KKbELhhPXgBwUEhzu3Oq0= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= diff --git a/justfile b/justfile index 3b09b90..8a9afa7 100644 --- a/justfile +++ b/justfile @@ -7,14 +7,17 @@ build: templ tailwind go build -o ./njump deploy target: templ tailwind - GOOS=linux GOARCH=amd64 CC=$(which musl-gcc) go build -ldflags="-s -w -linkmode external -extldflags '-static' -X main.compileTimeTs=$(date '+%s')" -o ./njump + CGO_CFLAGS="-I$(pwd)/secp256k1-master/musl/include/" CGO_LDFLAGS="-L$(pwd)/secp256k1-master/musl/lib" GOOS=linux GOARCH=amd64 CC=$(which musl-gcc) go build -tags libsecp256k1 -ldflags="-s -w -linkmode external -extldflags '-static' -X main.compileTimeTs=$(date '+%s')" -o ./njump scp njump {{target}}:njump/njump-new ssh njump 'systemctl stop njump' ssh njump 'mv njump/njump-new njump/njump' ssh njump 'systemctl start njump' -debug-build: templ tailwind - go build -o /tmp/njump . +libsecp256k1: + wget https://github.com/bitcoin-core/secp256k1/archive/refs/heads/master.zip + unzip master.zip + rm master.zip + cd secp256k1-master && ./autogen.sh && CC=$(musl-cc) ./configure --enable-module-extrakeys --enable-module-schnorrsig --prefix=$(pwd)/musl && make install templ: templ generate