mirror of
https://github.com/onsonr/sonr.git
synced 2025-03-10 13:07:09 +00:00
* refactor: remove redundant branch trigger for scheduled releases * refactor: simplify process-compose commands and improve logging * refactor: remove redundant command * refactor: remove unused error variables and simplify database configuration * feat: introduce task runner for project automation * refactor: Remove hardcoded action and method from form components * refactor: move server setup to main.go and add prometheus metrics * refactor: move index handlers to render handlers * refactor: improve user identification logic in gateway and vault handlers * refactor: rename TitleDescription to TitleDesc for consistency * feat: integrate go-useragent library for enhanced user agent parsing * feat: enhance initial view rendering based on device type * feat: Add support for PostgreSQL database * fix: Use formatPsqlDSN() to properly set PostgreSQL DSN from command flags * feat: Add PostgreSQL support with fallback to SQLite in NewGormDB * feat: Add PostgreSQL connection validation with SQLite fallback * chore: update golang.org/x/crypto dependency to v0.31.0 * feat: add PKL-based configuration initialization * refactor: improve file naming consistency in cmd/sonrd * refactor: Improve init-pkl command with safer config file generation and error handling * fix: add logging for pkl evaluation results * refactor: Move credential handling to gateway context * refactor: Migrate session models to gateway package * refactor: rename models and update User model * chore: initial commit for address and pubkey functionality * refactor: move pubkey package to keys package * refactor: Rename models and add resolver service * feat: add gRPC clients for bank, DID, DWN, and SVC modules * refactor: Migrate title and description components from text package to hero package * refactor: improve file naming conventions * feat: add user credential validation * refactor: rename registration handlers and routes for clarity * <no value> * refactor: Decouple database and IPFS interactions from server setup * refactor: Migrate configuration from class-based to TOML-based structure * refactor: move network configuration files to sonr.net module * feature/1120-leverage-service-authorization * fix: correct DID identifier creation function name * feat: add compressed and uncompressed public keys to keyset * refactor: move address packages to crypto/address * feat: implement pubkey verification * refactor: remove ECDSA-related functions from keyshare and protocol modules * feat: Implement ECDSA signature serialization * <no value> * feat: add vault service for IPFS token storage * refactor: update ucan codec to use new DID generation method * refactor: refactor key management and move address parsers to keys package * refactor: rename key parsers and move to parsers package * fix: resolved import issues with the new spec * feat: improve user onboarding experience by updating button text and functionality * refactor: update point marshaling and unmarshaling methods to use JSON * refactor: remove unnecessary DID method from PubKey * refactor: Rename and refactor MPC key generation functions * test: Add comprehensive test suite for keyshare generation and validation * test: Fix keyshare role validation and encoding tests * feat: Update key share role tests with enclave initialization validation * test(mpc): refactor tests to focus on public API and remove internal role checks * refactor: Remove unnecessary role check in initKeyEnclave function * fix: Enforce strict order for validator and user keyshares in enclave initialization * fix: Update codec_test to match latest codec implementation * refactor: Update KeyEnclave to use string-based key shares and improve error handling * fix: Refactor MPC enclave to use string-based encoding and simplify key management * refactor: Remove redundant keyshare decoding tests in codec_test.go * fix: Resolve type conversion issues in MPC crypto enclave initialization * fix: Convert CID to byte slice in addEnclaveIPFS function * fix: Resolve type conversion and constant definition errors in MPC crypto utils * refactor: Simplify KeyShare encoding and role handling in MPC codec * fix: Resolve JSON unmarshaling type mismatch in KeyShare.Message() * fix: Refactor KeyEnclave to use struct and Enclave interface * fix: Resolve type and naming conflicts in MPC crypto package * refactor: Update codec_test.go to use new KeyEnclave struct fields * refactor: remove keyshare encoding and decoding logic * refactor: Remove unused JSON marshaling functions for curve points * fix: Improve signature serialization and deserialization in MPC crypto This commit addresses several issues with signature handling: - Fixed signature length to 65 bytes - Added proper padding for R and S values - Added nil and zero value checks - Improved error messages for signature parsing The changes ensure more robust signature encoding and decoding, preventing potential nil pointer and invalid signature issues. * fix: Update signature serialization to match protocol test approach * refactor: Simplify KeyEnclave struct and improve message handling * fix: Improve signature serialization and verification in MPC crypto module * refactor: Simplify enclave validation using IsValid method in test * refactor: Add marshaling and comprehensive tests for KeyEnclave * feat: Add JSON marshaling support for Point in KeyEnclave * refactor: Rename KeyEnclave to Enclave and update related functions * refactor: Update PubKey verification to use SHA3-256 hashing * test: Add comprehensive tests for DID and PubKey implementations * refactor: simplify DID key retrieval * test: refactor CI workflow and remove unused DIDAuth middleware * The changes look good! The updated workflows will now: 1. Run tests on push to master 2. Bump the version if the commit doesn't already start with 'bump:' 3. Trigger a release workflow automatically with the new version tag 4. Create and publish the release A few things to note: - Make sure you have the `peter-evans/repository-dispatch` action installed/available - The `commitizen-tools/commitizen-action` should output the new tag for this to work - Ensure your release workflow can handle the repository dispatch event Would you like me to review or suggest any additional modifications to the workflows? * ci(github actions): add build stage dependency for tests * fix(workflow): update workflow to trigger on PR edits * test: Update unit test dependencies * ci: Add GoReleaser dry-run check for merge group events * test: remove unnecessary dependencies between test jobs * ci: Make race and coverage tests depend on build tests
384 lines
13 KiB
Makefile
384 lines
13 KiB
Makefile
#!/usr/bin/make -f
|
|
|
|
PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation')
|
|
VERSION := $(shell echo $(shell git describe --tags) | sed 's/^v//')
|
|
COMMIT := $(shell git log -1 --format='%H')
|
|
LEDGER_ENABLED ?= true
|
|
SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed 's/ /\@/g')
|
|
BINDIR ?= $(GOPATH)/bin
|
|
SIMAPP = ./app
|
|
|
|
PC_PORT_NUM=42069
|
|
PC_LOG_FILE=./sonr.log
|
|
PC_SOCKET_PATH=/tmp/sonr-net.sock
|
|
|
|
# for dockerized protobuf tools
|
|
DOCKER := $(shell which docker)
|
|
HTTPS_GIT := github.com/onsonr/sonr.git
|
|
PROCESS_COMPOSE := $(shell which process-compose)
|
|
|
|
export GO111MODULE = on
|
|
|
|
# process build tags
|
|
|
|
build_tags = netgo
|
|
ifeq ($(LEDGER_ENABLED),true)
|
|
ifeq ($(OS),Windows_NT)
|
|
GCCEXE = $(shell where gcc.exe 2> NUL)
|
|
ifeq ($(GCCEXE),)
|
|
$(error gcc.exe not installed for ledger support, please install or set LEDGER_ENABLED=false)
|
|
else
|
|
build_tags += ledger
|
|
endif
|
|
else
|
|
UNAME_S = $(shell uname -s)
|
|
ifeq ($(UNAME_S),OpenBSD)
|
|
$(warning OpenBSD detected, disabling ledger support (https://github.com/cosmos/cosmos-sdk/issues/1988))
|
|
else
|
|
GCC = $(shell command -v gcc 2> /dev/null)
|
|
ifeq ($(GCC),)
|
|
$(error gcc not installed for ledger support, please install or set LEDGER_ENABLED=false)
|
|
else
|
|
build_tags += ledger
|
|
endif
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(WITH_CLEVELDB),yes)
|
|
build_tags += gcc
|
|
endif
|
|
build_tags += $(BUILD_TAGS)
|
|
build_tags := $(strip $(build_tags))
|
|
|
|
whitespace :=
|
|
empty = $(whitespace) $(whitespace)
|
|
comma := ,
|
|
build_tags_comma_sep := $(subst $(empty),$(comma),$(build_tags))
|
|
|
|
# process linker flags
|
|
ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=sonr \
|
|
-X github.com/cosmos/cosmos-sdk/version.AppName=sonrd \
|
|
-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
|
|
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
|
|
-X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(build_tags_comma_sep)"
|
|
|
|
ifeq ($(WITH_CLEVELDB),yes)
|
|
ldflags += -X github.com/cosmos/cosmos-sdk/types.DBBackend=cleveldb
|
|
endif
|
|
ifeq ($(LINK_STATICALLY),true)
|
|
ldflags += -linkmode=external -extldflags "-Wl,-z,muldefs -static"
|
|
endif
|
|
ldflags += $(LDFLAGS)
|
|
ldflags := $(strip $(ldflags))
|
|
|
|
BUILD_FLAGS := -tags "$(build_tags_comma_sep)" -ldflags '$(ldflags)' -trimpath
|
|
|
|
# The below include contains the tools and runsim targets.
|
|
include contrib/devtools/Makefile
|
|
|
|
all: install lint test
|
|
|
|
build: go.sum
|
|
ifeq ($(OS),Windows_NT)
|
|
$(error wasmd server not supported. Use "make build-windows-client" for client)
|
|
exit 1
|
|
else
|
|
go build -mod=readonly $(BUILD_FLAGS) -o build/sonrd ./cmd/sonrd
|
|
endif
|
|
|
|
build-windows-client: go.sum
|
|
GOOS=windows GOARCH=amd64 go build -mod=readonly $(BUILD_FLAGS) -o build/sonrd.exe ./cmd/sonrd
|
|
|
|
build-contract-tests-hooks:
|
|
ifeq ($(OS),Windows_NT)
|
|
go build -mod=readonly $(BUILD_FLAGS) -o build/contract_tests.exe ./cmd/contract_tests
|
|
else
|
|
go build -mod=readonly $(BUILD_FLAGS) -o build/contract_tests ./cmd/contract_tests
|
|
endif
|
|
|
|
install: go.sum
|
|
go install -mod=readonly $(BUILD_FLAGS) ./cmd/sonrd
|
|
|
|
########################################
|
|
### Tools & dependencies
|
|
|
|
go-mod-cache: go.sum
|
|
@echo "--> Download go modules to local cache"
|
|
@go mod download
|
|
|
|
go.sum: go.mod
|
|
@echo "--> Ensure dependencies have not been modified"
|
|
@go mod verify
|
|
|
|
draw-deps:
|
|
@# requires brew install graphviz or apt-get install graphviz
|
|
go install github.com/RobotsAndPencils/goviz@latest
|
|
@goviz -i ./cmd/sonrd -d 2 | dot -Tpng -o dependency-graph.png
|
|
|
|
clean:
|
|
rm -rf .aider*
|
|
rm -rf static
|
|
rm -rf .out
|
|
rm -rf hway.db
|
|
rm -rf snapcraft-local.yaml build/
|
|
rm -rf build
|
|
|
|
distclean: clean
|
|
rm -rf vendor/
|
|
|
|
init-env:
|
|
@echo "Installing process-compose"
|
|
sh scripts/init_env.sh
|
|
|
|
########################################
|
|
### Testing
|
|
|
|
test: test-unit
|
|
test-all: test-race test-cover test-system
|
|
|
|
test-unit:
|
|
@VERSION=$(VERSION) go test -mod=readonly -tags='ledger test_ledger_mock' ./...
|
|
|
|
test-race:
|
|
@VERSION=$(VERSION) go test -mod=readonly -race -tags='ledger test_ledger_mock' ./...
|
|
|
|
test-cover:
|
|
@go test -mod=readonly -timeout 30m -race -coverprofile=coverage.txt -covermode=atomic -tags='ledger test_ledger_mock' ./...
|
|
|
|
benchmark:
|
|
@go test -mod=readonly -bench=. ./...
|
|
|
|
test-sim-import-export: runsim
|
|
@echo "Running application import/export simulation. This may take several minutes..."
|
|
@$(BINDIR)/runsim -Jobs=4 -SimAppPkg=$(SIMAPP) -ExitOnFail 50 5 TestAppImportExport
|
|
|
|
test-sim-multi-seed-short: runsim
|
|
@echo "Running short multi-seed application simulation. This may take awhile!"
|
|
@$(BINDIR)/runsim -Jobs=4 -SimAppPkg=$(SIMAPP) -ExitOnFail 50 5 TestFullAppSimulation
|
|
|
|
test-sim-deterministic: runsim
|
|
@echo "Running application deterministic simulation. This may take awhile!"
|
|
@$(BINDIR)/runsim -Jobs=4 -SimAppPkg=$(SIMAPP) -ExitOnFail 1 1 TestAppStateDeterminism
|
|
|
|
test-system: install
|
|
$(MAKE) -C tests/system/ test
|
|
|
|
###############################################################################
|
|
### Linting ###
|
|
###############################################################################
|
|
|
|
format-tools:
|
|
go install mvdan.cc/gofumpt@v0.4.0
|
|
go install github.com/client9/misspell/cmd/misspell@v0.3.4
|
|
go install github.com/daixiang0/gci@v0.11.2
|
|
|
|
lint: format-tools
|
|
golangci-lint run --tests=false
|
|
find . -name '*.go' -type f -not -path "./vendor*" -not -path "./tests/system/vendor*" -not -path "*.git*" -not -path "*_test.go" | xargs gofumpt -d
|
|
|
|
format: format-tools
|
|
find . -name '*.go' -type f -not -path "./vendor*" -not -path "./tests/system/vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" | xargs gofumpt -w
|
|
find . -name '*.go' -type f -not -path "./vendor*" -not -path "./tests/system/vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" | xargs misspell -w
|
|
find . -name '*.go' -type f -not -path "./vendor*" -not -path "./tests/system/vendor*" -not -path "*.git*" -not -path "./client/lcd/statik/statik.go" | xargs gci write --skip-generated -s standard -s default -s "prefix(cosmossdk.io)" -s "prefix(github.com/cosmos/cosmos-sdk)" -s "prefix(github.com/CosmWasm/wasmd)" --custom-order
|
|
|
|
mod-tidy:
|
|
go mod tidy
|
|
|
|
.PHONY: format-tools lint format mod-tidy
|
|
|
|
|
|
###############################################################################
|
|
### Protobuf ###
|
|
###############################################################################
|
|
protoVer=0.15.1
|
|
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
|
|
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
|
|
|
|
proto-gen:
|
|
@echo "Generating Protobuf files"
|
|
@go install cosmossdk.io/orm/cmd/protoc-gen-go-cosmos-orm@latest
|
|
@$(protoImage) sh ./scripts/protocgen.sh
|
|
spawn stub-gen
|
|
|
|
proto-format:
|
|
@echo "Formatting Protobuf files"
|
|
@$(protoImage) find ./ -name "*.proto" -exec clang-format -i {} \;
|
|
|
|
proto-lint:
|
|
@$(protoImage) buf lint --error-format=json
|
|
|
|
proto-check-breaking:
|
|
@$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=master
|
|
|
|
.PHONY: all install install-debug \
|
|
go-mod-cache draw-deps clean build format \
|
|
test test-all test-build test-cover test-unit test-race \
|
|
test-sim-import-export build-windows-client \
|
|
test-system
|
|
|
|
## --- Testnet Utilities ---
|
|
get-localic:
|
|
@echo "Installing local-interchain"
|
|
git clone --branch v8.7.0 https://github.com/strangelove-ventures/interchaintest.git interchaintest-downloader
|
|
cd interchaintest-downloader/local-interchain && make install
|
|
@echo ✅ local-interchain installed $(shell which local-ic)
|
|
|
|
is-localic-installed:
|
|
ifeq (,$(shell which local-ic))
|
|
make get-localic
|
|
endif
|
|
|
|
get-heighliner:
|
|
git clone https://github.com/strangelove-ventures/heighliner.git
|
|
cd heighliner && go install
|
|
|
|
local-image:
|
|
ifeq (,$(shell which heighliner))
|
|
echo 'heighliner' binary not found. Consider running `make get-heighliner`
|
|
else
|
|
heighliner build -c sonrd --local -f chains.yaml
|
|
endif
|
|
|
|
.PHONY: get-heighliner local-image is-localic-installed
|
|
|
|
###############################################################################
|
|
### e2e ###
|
|
###############################################################################
|
|
|
|
ictest-basic:
|
|
@echo "Running basic interchain tests"
|
|
@cd interchaintest && go test -race -v -run TestBasicChain .
|
|
|
|
ictest-ibc:
|
|
@echo "Running IBC interchain tests"
|
|
@cd interchaintest && go test -race -v -run TestIBC .
|
|
|
|
ictest-wasm:
|
|
@echo "Running cosmwasm interchain tests"
|
|
@cd interchaintest && go test -race -v -run TestCosmWasmIntegration .
|
|
|
|
ictest-packetforward:
|
|
@echo "Running packet forward middleware interchain tests"
|
|
@cd interchaintest && go test -race -v -run TestPacketForwardMiddleware .
|
|
|
|
ictest-poa:
|
|
@echo "Running proof of authority interchain tests"
|
|
@cd interchaintest && go test -race -v -run TestPOA .
|
|
|
|
ictest-tokenfactory:
|
|
@echo "Running token factory interchain tests"
|
|
@cd interchaintest && go test -race -v -run TestTokenFactory .
|
|
|
|
###############################################################################
|
|
### testnet ###
|
|
###############################################################################
|
|
|
|
setup-ipfs:
|
|
./scripts/ipfs_config.sh
|
|
|
|
setup-testnet: mod-tidy is-localic-installed install local-image set-testnet-configs setup-testnet-keys
|
|
|
|
# Run this before testnet keys are added
|
|
# chainid-1 is used in the testnet.json
|
|
set-testnet-configs:
|
|
sonrd config set client chain-id sonr-testnet-1
|
|
sonrd config set client keyring-backend test
|
|
sonrd config set client output text
|
|
|
|
# import keys from testnet.json into test keyring
|
|
setup-testnet-keys:
|
|
-`echo "decorate bright ozone fork gallery riot bus exhaust worth way bone indoor calm squirrel merry zero scheme cotton until shop any excess stage laundry" | sonrd keys add acc0 --recover`
|
|
-`echo "wealth flavor believe regret funny network recall kiss grape useless pepper cram hint member few certain unveil rather brick bargain curious require crowd raise" | sonrd keys add acc1 --recover`
|
|
|
|
# default testnet is with IBC
|
|
testnet: setup-testnet
|
|
spawn local-ic start ibc-testnet
|
|
|
|
testnet-basic: setup-testnet
|
|
spawn local-ic start testnet
|
|
|
|
sh-testnet: mod-tidy
|
|
CHAIN_ID="sonr-testnet-1" BLOCK_TIME="1000ms" CLEAN=true sh scripts/test_node.sh
|
|
|
|
.PHONY: setup-testnet set-testnet-configs testnet testnet-basic sh-testnet
|
|
|
|
###############################################################################
|
|
### generation ###
|
|
###############################################################################
|
|
.PHONY: gen-pkl gen-templ
|
|
|
|
gen-pkl: init-env
|
|
pkl-gen-go pkl/sonr.orm/UCAN.pkl
|
|
pkl-gen-go pkl/sonr.orm/Models.pkl
|
|
pkl-gen-go pkl/sonr.net/Hway.pkl
|
|
pkl-gen-go pkl/sonr.net/Motr.pkl
|
|
|
|
gen-templ: init-env
|
|
templ generate
|
|
|
|
|
|
###############################################################################
|
|
### custom builds ###
|
|
###############################################################################
|
|
.PHONY: build-motr build-hway logs-hway logs-sonr
|
|
|
|
build-motr:
|
|
GOOS=js GOARCH=wasm go build -o static/wasm/app.wasm ./cmd/motr/main.go
|
|
|
|
build-hway: gen-templ
|
|
go build -o build/hway ./cmd/hway
|
|
|
|
logs-hway: init-env
|
|
bin/process-compose process logs hway --port $(PC_PORT_NUM) --follow
|
|
|
|
logs-sonr: init-env
|
|
bin/process-compose process logs sonr --port $(PC_PORT_NUM) --follow
|
|
|
|
###############################################################################
|
|
### Network Start/Stop ###
|
|
###############################################################################
|
|
|
|
.PHONY: deploy start start-tui start-uds stop stop-uds restart status
|
|
|
|
start: build-hway init-env
|
|
bin/process-compose up --port $(PC_PORT_NUM) --log-file $(PC_LOG_FILE) -f deploy/process-compose.yaml
|
|
|
|
start-uds: build-hway init-env
|
|
bin/process-compose up --use-uds --unix-socket $(PC_SOCKET_PATH) --log-file $(PC_LOG_FILE) --detached -f deploy/process-compose.yaml
|
|
|
|
stop: init-env
|
|
bin/process-compose down --port $(PC_PORT_NUM)
|
|
|
|
stop-uds: init-env
|
|
bin/process-compose down --use-uds --unix-socket $(PC_SOCKET_PATH)
|
|
|
|
status: init-env
|
|
bin/process-compose project state --port $(PC_PORT_NUM)
|
|
|
|
status-uds: init-env
|
|
bin/process-compose project state --use-uds --unix-socket $(PC_SOCKET_PATH)
|
|
###############################################################################
|
|
### help ###
|
|
###############################################################################
|
|
|
|
deploy:
|
|
cd ./proto && bunx buf dep update && bunx buf build && bunx buf push
|
|
sh ./.github/scripts/upload_cdn.sh
|
|
|
|
help:
|
|
@echo "Usage: make <target>"
|
|
@echo ""
|
|
@echo "Available targets:"
|
|
@echo " install : Install the binary"
|
|
@echo " local-image : Install the docker image"
|
|
@echo " proto-gen : Generate code from proto files"
|
|
@echo " testnet : Local devnet with IBC"
|
|
@echo " sh-testnet : Shell local devnet"
|
|
@echo " ictest-basic : Basic end-to-end test"
|
|
@echo " ictest-ibc : IBC end-to-end test"
|
|
@echo " templ : Generate templ files"
|
|
@echo " vault : Build vault.wasm"
|
|
|
|
.PHONY: help
|