Testdev

.github/workflows/build.yml

@@ -3,22 +3,23 @@ on:
   push:
     branches:
       - development
+      - feature/dev
   release:
     types: [created]
 jobs:
-   sonar:
-     name: Sonarqube
-     runs-on: ubuntu-latest
-     steps:
-       - uses: actions/checkout@v2
-         with:
-           fetch-depth: 0
-       - uses: sonarsource/sonarqube-scan-action@master
-         env:
-           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-           SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-           
-   build:
+  sonar:
+    name: Sonarqube
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: sonarsource/sonarqube-scan-action@master
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+
+  build:
     name: Build
     runs-on: ubuntu-latest
     steps:
@@ -38,4 +39,4 @@ jobs:
         run: make verify
 
       - name: Build Release
-        run: make build
+        run: make build

.github/workflows/lint.yaml

@@ -0,0 +1,24 @@
+name: Lint
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+jobs:
+  golangci:
+    name: golangci-lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: technote-space/get-diff-action@v4
+        with:
+          PATTERN: |
+            .go
+            .mod
+            .sum
+      - uses: golangci/golangci-lint-action@v2
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          args: -e SA1019 --timeout 10m
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+        if: "env.GIT_DIFF != ''"

.scripts/proto-gen.sh

@@ -8,17 +8,17 @@ for directory in ${directories}; do
   for file in ${files}; do
     protoc \
       --proto_path="proto" \
-      --proto_path="vendor/github.com/cosmos/cosmos-sdk/proto" \
-      --proto_path="vendor/github.com/cosmos/cosmos-sdk/third_party/proto" \
-      --proto_path="vendor/github.com/cosmos/ibc-go/v2/proto" \
+      --proto_path="github.com/cosmos/cosmos-sdk/proto" \
+      --proto_path="github.com/cosmos/cosmos-sdk/third_party/proto" \
+      --proto_path="github.com/cosmos/ibc-go/v3/proto" \
       --gocosmos_out="plugins=interfacetype+grpc,Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:${GOPATH}/src" \
       "${file}"
 
     protoc \
       --proto_path="proto" \
-      --proto_path="vendor/github.com/cosmos/cosmos-sdk/proto" \
-      --proto_path="vendor/github.com/cosmos/cosmos-sdk/third_party/proto" \
-      --proto_path="vendor/github.com/cosmos/ibc-go/v2/proto" \
+      --proto_path="github.com/cosmos/cosmos-sdk/proto" \
+      --proto_path="github.com/cosmos/cosmos-sdk/third_party/proto" \
+      --proto_path="github.com/cosmos/ibc-go/v3/proto" \
       --grpc-gateway_out="logtostderr=true:${GOPATH}/src" \
       "${file}"
   done

.scripts/setup.sh

@@ -1,14 +1,49 @@
-make all
+make install
 
 rm -rf ~/.comdex
 
 mkdir ~/.comdex
 
 comdex init --chain-id test test
-comdex keys add test --recover<<<"y
+comdex keys add test --recover --keyring-backend test<<<"y
 wage thunder live sense resemble foil apple course spin horse glass mansion midnight laundry acoustic rhythm loan scale talent push green direct brick please"
-comdex add-genesis-account test 100000000000000stake
-comdex gentx test 1000000000stake --chain-id test
+comdex add-genesis-account test 100000000000000stake --keyring-backend test
+comdex gentx test 1000000000stake --chain-id test --keyring-backend test
 comdex collect-gentxs
-# Make sure to add the admin account address in params after running this script and before starting the chain.
-# use this account to generate assets and asset pairs
+comdex start
+
+comdex tx gov submit-proposal add-app-mapping composite com 10000 1000000 --title "Adding New Assets" --description "adding cmdx and atom" --deposit 1000000000stake --from test --chain-id test --keyring-backend test --gas auto -y
+
+comdex tx gov vote 1  --from test --chain-id test --keyring-backend test --gas auto -y
+
+# wait for proposal to pass
+comdex tx gov submit-proposal add-assets CMDX,OSMO,ATOM,CMST,HARBOR ucmdx,uosmo,uatom,ucmst,uharbor 1000000,1000000,1000000,1000000,1000000 1,1,1,1,0 --title "Adding New Assets" --description "adding cmdx and atom" --deposit 1000000000stake --from test --chain-id test --keyring-backend test --gas auto -y
+
+comdex tx gov vote 2  --from test --chain-id test --keyring-backend test --gas auto -y
+
+# wait for proposal to pass
+comdex tx gov submit-proposal add-pairs 1,1,1,1 2,3,4,5 --title "Adding New Assets" --description "adding cmdx and atom" --deposit 1000000000stake --from test --chain-id test --keyring-backend test --gas auto -y
+
+comdex tx gov vote 3  --from test --chain-id test --keyring-backend test --gas auto -y
+
+# wait for proposal to pass
+comdex tx gov submit-proposal add-pairs-vault 1 1 1.4 0.1 0.01 0.0013 0.01 1 1000000 10000 0 1.5 CMDX-A 0 1 --title addAsset --description addingAsset --from test --deposit 10000000stake --chain-id test --keyring-backend test -y
+
+comdex tx gov vote 4  --from test --chain-id test --keyring-backend test --gas auto -y
+
+# wait for proposal to pass
+comdex tx gov submit-proposal add-asset-mapping 1 1 10000 1 comdex1pkkayn066msg6kn33wnl5srhdt3tnu2v9jjqu0 --title "Adding New Assets" --description "adding cmdx and atom" --deposit 1000000000stake --from test --chain-id test --keyring-backend test --gas auto
+
+comdex tx gov vote 5  --from test --chain-id test --keyring-backend test --gas auto -y
+
+# wait for proposal to pass
+comdex tx liquidation  whitelist-app-id 1 --from test --chain-id test --keyring-backend test -y
+
+# create vault
+comdex tx locker whitelist-asset-locker 0 1 --from test --chain-id test --keyring-backend test -y
+
+# whitelist asset locker
+comdex tx vault create 1 1 5000 10000 --from test --chain-id test --keyring-backend test -y
+
+#mint cmst
+comdex tx tokenmint tokenmint 1 1 --from test --chain-id test --keyring-backend test -y

Makefile

@@ -1,87 +1,96 @@
-PACKAGES := $(shell go list ./...)
-VERSION := $(shell echo $(shell git describe --tags) | sed 's/^v//')
-COMMIT := $(shell git log -1 --format='%H')
-TENDERMINT_VERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::')
+#!/usr/bin/make -f
 
-BUILD_TAGS := $(strip netgo,ledger)
-LD_FLAGS := -s -w \
-    -X github.com/cosmos/cosmos-sdk/version.Name=comdex \
-    -X github.com/cosmos/cosmos-sdk/version.AppName=comdex \
-    -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} \
-    -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TENDERMINT_VERSION)
+BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+COMMIT := $(shell git log -1 --format='%H')
 
-BUILD_FLAGS += -ldflags "${LD_FLAGS}" -tags "${BUILD_TAGS}"
+# don't override user values
+ifeq (,$(VERSION))
+  VERSION := $(shell git describe --tags)
+  # if VERSION is empty, then populate it with branch's name and raw commit hash
+  ifeq (,$(VERSION))
+    VERSION := $(BRANCH)-$(COMMIT)
+  endif
+endif
 
-GOBIN = $(shell go env GOPATH)/bin
-GOARCH = $(shell go env GOARCH)
-GOOS = $(shell go env GOOS)
+PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation')
+LEDGER_ENABLED ?= true
+SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed  's/ /\@/g')
+TM_VERSION := $(shell go list -m github.com/tendermint/tendermint | sed 's:.* ::') # grab everything after the space in "github.com/tendermint/tendermint v0.34.7"
+BUILDDIR ?= $(CURDIR)/build
+
+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
 
-.PHONY: benchmark
-benchmark:
-	@go test -mod=readonly -v -bench ${PACKAGES}
+ifeq (cleveldb,$(findstring cleveldb,$(COMDEX_BUILD_OPTIONS)))
+  build_tags += gcc cleveldb
+endif
+build_tags += $(BUILD_TAGS)
+build_tags := $(strip $(build_tags))
 
-.PHONY: all install build verify
+whitespace :=
+whitespace += $(whitespace)
+comma := ,
+build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))
 
-.PHONY: clean
-clean:
-	rm -rf ./bin ./vendor
+# process linker flags
 
-all: verify build
+ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=comdex \
+		  -X github.com/cosmos/cosmos-sdk/version.AppName=comdex \
+		  -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)" \
+			-X github.com/tendermint/tendermint/version.TMCoreSemVer=$(TM_VERSION)
 
-install: mod-vendor
-ifeq (${OS},Windows_NT)
-	go build -mod=readonly ${BUILD_FLAGS} -o ${GOBIN}/comdex.exe ./node
-else
-	go build -mod=readonly ${BUILD_FLAGS} -o ${GOBIN}/comdex ./node
+ifeq (cleveldb,$(findstring cleveldb,$(COMDEX_BUILD_OPTIONS)))
+  ldflags += -X github.com/cosmos/cosmos-sdk/types.DBBackend=cleveldb
 endif
-
-build:
-ifeq (${OS},Windows_NT)
-	go build  ${BUILD_FLAGS} -o build/${GOOS}/${GOARCH}/comdex.exe ./node
-else
-	go build  ${BUILD_FLAGS} -o build/${GOOS}/${GOARCH}/comdex ./node
+ifeq ($(LINK_STATICALLY),true)
+  ldflags += -linkmode=external -extldflags "-Wl,-z,muldefs -static"
 endif
+ifeq (,$(findstring nostrip,$(COMDEX_BUILD_OPTIONS)))
+  ldflags += -w -s
+endif
+ldflags += $(LDFLAGS)
+ldflags := $(strip $(ldflags))
 
-release: build
-	mkdir -p release
-ifeq (${OS},Windows_NT)
-	tar -czvf release/comdex-${GOOS}-${GOARCH}.tar.gz --directory=build/${GOOS}/${GOARCH} comdex.exe
-else
-	tar -czvf release/comdex-${GOOS}-${GOARCH}.tar.gz --directory=build/${GOOS}/${GOARCH} comdex
+BUILD_FLAGS := -tags "$(build_tags)" -ldflags '$(ldflags)'
+# check for nostrip option
+ifeq (,$(findstring nostrip,$(COMDEX_BUILD_OPTIONS)))
+  BUILD_FLAGS += -trimpath
 endif
 
-.PHONY: go-lint
-go-lint:
-	@golangci-lint run --fix
-
-.PHONY: mod-vendor
-mod-vendor: tools
-	@go mod vendor
-	@modvendor -copy="**/*.proto" -include=github.com/cosmos/cosmos-sdk/proto,github.com/cosmos/cosmos-sdk/third_party/proto,github.com/cosmos/ibc-go/v2/proto
-
-.PHONY: proto-gen
-proto-gen:
-	@.scripts/proto-gen.sh
-
-.PHONY: proto-lint
-proto-lint:
-	@find proto -name *.proto -exec clang-format-12 -i {} \;
-
-.PHONY: test
-test:
-	@go test -mod=readonly -timeout 15m -v ${PACKAGES}
-
-.PHONT: test-coverage
-test-coverage:
-	@go test -mod=readonly -timeout 15m -v -covermode=atomic -coverprofile=coverage.txt ${PACKAGES}
-
-.PHONY: tools
-tools:
-	@go install github.com/bufbuild/buf/cmd/[email protected]
-	@go install github.com/golangci/golangci-lint/cmd/[email protected]
-	@go install github.com/goware/[email protected]
-	@go install github.com/grpc-ecosystem/grpc-gateway/[email protected]
-	@go get gopkg.in/go-playground/[email protected]
-	@go get gopkg.in/go-playground/[email protected]
+#$(info $$BUILD_FLAGS is [$(BUILD_FLAGS)])
+
+
+all: install
+
+install: go.sum
+	go install -mod=readonly $(BUILD_FLAGS) ./cmd/comdex
+
+build:
+	go build $(BUILD_FLAGS) -o bin/comdex ./cmd/comdex

README.md

@@ -7,13 +7,14 @@
 <h4> An ecosystem of solutions built with an aim of bridging DeFi & CeFi </h4>
 </div>
 
-Comdex is a decentralized synthetics protocol built on Cosmos.
-Users can collateralize their holdings from the Cosmos ecosystem to take exposure to a range of synthetic assets.
-Comdex builds solutions to democratize finance by giving investors exposure to a large range of asset classes.
+A DeFi infrastructure layer for the Cosmos ecosystem
+A layer-1 infrastructure for seamless deployment of DeFi applications in the Cosmos ecosystem, powering DeFi in the multi-chain future.
+
+Plug & play customizable Comdex modules to deliver bleeding edge dApps
 
 ## Docs
 
-We will be soon releasing out documentations.
+checkout the documents here [docs.comdex.one](https://docs.comdex.one).
 
 If you have technical questions or concerns, ask a developer or community member in the [Comdex discord](https://discord.com/invite/7vjPvWKKMT).
 
@@ -33,18 +34,18 @@ make install
 
 ## Testnet
 
+To verify latest testnet and main net version check 
+[Version](https://github.com/comdex-official/networks/blob/main/README.md)
+
 For further information on joining the testnet, head over to the 
 [Comdex Networks TestNet](https://github.com/comdex-official/networks/tree/main/testnet).
 
 The explorer for this chain is hosted [TestNet Explorer](https://comets-test.comdex.one/)
 
-Latest testnet version - [0.1.0](https://github.com/comdex-official/comdex/releases/tag/v0.1.0)
-
 ## MainNet
 For further information on joining the mainnet, head over to the
 [Comdex Networks MainNet](https://github.com/comdex-official/networks/tree/main/mainnet).
 
-Latest Mainnet verion - [0.1.1](https://github.com/comdex-official/comdex/releases/tag/v0.1.1)
 
 ## Mainet Explorers 
 The explorer for this chain is hosted