Skip to content

Commit

Permalink
refactor: clean up _run/lite
Browse files Browse the repository at this point in the history
* make: extract common utils
* make: standardize parameters
* readme: refresh, run provider services
  • Loading branch information
boz committed Jun 21, 2020
1 parent 5110daf commit f1c6e67
Show file tree
Hide file tree
Showing 7 changed files with 563 additions and 312 deletions.
23 changes: 23 additions & 0 deletions _run/common-base.mk
@@ -0,0 +1,23 @@
AKASH_ROOT := ../..
AKASHCTL_BIN := $(AKASH_ROOT)/akashctl
AKASHD_BIN := $(AKASH_ROOT)/akashd

.PHONY: all
all:
(cd "$(AKASH_ROOT)" && make all)

.PHONY: bins
bins:
(cd "$(AKASH_ROOT)" && make bins)

.PHONY: akashctl
akashctl:
(cd "$(AKASH_ROOT)" && make akashctl)

.PHONY: akashd
akashd:
(cd "$(AKASH_ROOT)" && make akashd)

.PHONY: image-minikube
image-minikube:
(cd "$(AKASH_ROOT)" && make image-minikube)
127 changes: 127 additions & 0 deletions _run/common-commands.mk
@@ -0,0 +1,127 @@
KEY_NAME ?= main
KEY_ADDRESS ?= $(shell $(AKASHCTL) keys show "$(KEY_NAME)" -a)

PROVIDER_KEY_NAME ?= provider
PROVIDER_ADDRESS ?= $(shell $(AKASHCTL) keys show "$(PROVIDER_KEY_NAME)" -a)
PROVIDER_CONFIG_PATH ?= provider.yaml

SDL_PATH ?= deployment.yaml

DSEQ ?= 1
GSEQ ?= 1
OSEQ ?= 1
PRICE ?= 10akash

.PHONY: provider-create
provider-create:
$(AKASHCTL) tx provider create "$(PROVIDER_CONFIG_PATH)" -y \
--from "$(PROVIDER_KEY_NAME)"

.PHONY: provider-update
provider-update:
$(AKASHCTL) tx provider update "$(PROVIDER_CONFIG_PATH)" -y \
--from "$(PROVIDER_KEY_NAME)"

.PHONY: deployment-create
deployment-create:
$(AKASHCTL) tx deployment create "$(SDL_PATH)" -y \
--dseq "$(DSEQ)" \
--from "$(KEY_NAME)"

.PHONY: deployment-close
deployment-close:
$(AKASHCTL) tx deployment close -y \
--owner "$(MAIN_ADDR)" \
--dseq "$(DSEQ)" \
--from "$(KEY_NAME)" -y

.PHONY: order-close
order-close:
$(AKASHCTL) tx market order-close -y \
--owner "$(KEY_ADDRESS)" \
--dseq "$(DSEQ)" \
--gseq "$(GSEQ)" \
--oseq "$(OSEQ)" \
--from "$(KEY_NAME)"

.PHONY: bid-create
bid-create:
$(AKASHCTL) tx market bid-create -y \
--owner "$(KEY_ADDRESS)" \
--dseq "$(DSEQ)" \
--gseq "$(GSEQ)" \
--oseq "$(OSEQ)" \
--from "$(PROVIDER_KEY_NAME)" \
--price "$(PRICE)"

.PHONY: bid-close
bid-close:
$(AKASHCTL) tx market bid-close -y \
--owner "$(KEY_ADDRESS)" \
--dseq "$(DSEQ)" \
--gseq "$(GSEQ)" \
--oseq "$(OSEQ)" \
--from "$(PROVIDER_KEY_NAME)"

.PHONY: query-accounts
query-accounts: $(patsubst %, query-account-%,$(KEY_NAMES))

.PHONY: query-account-%
query-account-%:
$(AKASHCTL) query account "$(shell $(AKASHCTL) keys show -a "$(@:query-account-%=%)")"

.PHONY: query-provider
query-provider:
$(AKASHCTL) query provider get "$(PROVIDER_ADDRESS)"

.PHONY: query-providers
query-providers:
$(AKASHCTL) query provider list

.PHONY: query-deployment
query-deployment:
$(AKASHCTL) query deployment get \
--owner "$(KEY_ADDRESS)" \
--dseq "$(DSEQ)"

.PHONY: query-deployments
query-deployments:
$(AKASHCTL) query deployment list

.PHONY: query-order
query-order:
$(AKASHCTL) query market order get \
--owner "$(KEY_ADDRESS)" \
--dseq "$(DSEQ)" \
--gseq "$(GSEQ)" \
--oseq "$(OSEQ)"

.PHONY: query-orders
query-orders:
$(AKASHCTL) query market order list

.PHONY: query-bid
query-bid:
$(AKASHCTL) query market bid get \
--owner "$(KEY_ADDRESS)" \
--dseq "$(DSEQ)" \
--gseq "$(GSEQ)" \
--oseq "$(OSEQ)" \
--provider "$(PROVIDER_ADDRESS)"

.PHONY: query-bids
query-bids:
$(AKASHCTL) query market bid list

.PHONY: query-lease
query-lease:
$(AKASHCTL) query market lease get \
--owner "$(KEY_ADDRESS)" \
--dseq "$(DSEQ)" \
--gseq "$(GSEQ)" \
--oseq "$(OSEQ)" \
--provider "$(PROVIDER_ADDRESS)"

.PHONY: query-leases
query-leases:
$(AKASHCTL) query market lease list
110 changes: 85 additions & 25 deletions _run/common.mk
@@ -1,36 +1,96 @@
AKASH_ROOT := ../..
include ../common-base.mk

AKASHCTL := $(AKASH_ROOT)/akashctl
AKASHD := $(AKASH_ROOT)/akashd
DATA_ROOT := $(PWD)/cache
NODE_HOME := $(DATA_ROOT)/node
CLIENT_HOME := $(DATA_ROOT)/client

DATA_ROOT = cache
NODE_HOME = $(DATA_ROOT)/node
CLIENT_HOME = $(DATA_ROOT)/client
CHAIN_NAME := local
CHAIN_OPTS := --chain-id $(CHAIN_NAME)
GENESIS_PATH := $(NODE_HOME)/config/genesis.json

CHAIN_NAME = local
CHAIN_OPTS = --chain-id $(CHAIN_NAME)
GENESIS_PATH = $(NODE_HOME)/config/genesis.json
CHAIN_MIN_DEPOSIT := 10000000
CHAIN_ACCOUNT_DEPOSIT := $(shell echo $$(($(CHAIN_MIN_DEPOSIT) * 10)))
CHAIN_TOKEN_DENOM := akash

CHAIN_MIN_DEPOSIT = 10000000
CHAIN_ACCOUNT_DEPOSIT = $(shell echo $$(($(CHAIN_MIN_DEPOSIT) * 10)))
CHAIN_TOKEN_DENOM = akash
AKASHCTL := $(AKASHCTL_BIN) --home "$(CLIENT_HOME)"
AKASHD := $(AKASHD_BIN) --home "$(NODE_HOME)"
KEY_OPTS := --keyring-backend=test

all:
(cd $(AKASH_ROOT) && make all)
KEY_NAMES := main provider validator other

bins:
(cd $(AKASH_ROOT) && make bins)
.PHONY: init
init: bins client-init node-init

akashctl:
(cd $(AKASH_ROOT) && make akashctl)
.PHONY: client-init
client-init: init-dirs client-init-config client-init-keys

akashd:
(cd $(AKASH_ROOT) && make akashd)
.PHONY: init-dirs
init-dirs:
mkdir -p "$(CLIENT_HOME)" "$(NODE_HOME)"

image-minikube:
(cd $(AKASH_ROOT) && make image-minikube)
.PHONY: client-init-config
client-init-config:
$(AKASHCTL) config chain-id "$(CHAIN_NAME)"
$(AKASHCTL) config output json
$(AKASHCTL) config indent true
$(AKASHCTL) config trust-node true
$(AKASHCTL) config keyring-backend test
$(AKASHCTL) config broadcast-mode block

clean:
rm -rf $(DATA_ROOT)
.PHONY: client-init-keys
client-init-keys: $(patsubst %,client-init-key-%,$(KEY_NAMES))

.PHONY: client-init-key-%
client-init-key-%:
$(AKASHCTL) keys add "$(@:client-init-key-%=%)"

.PHONY: node-init
node-init: node-init-genesis node-init-genesis-accounts node-init-gentx node-init-finalize

.PHONY: node-init-genesis
node-init-genesis: init-dirs
$(AKASHD) init node0 $(CHAIN_OPTS)
cp "$(GENESIS_PATH)" "$(GENESIS_PATH).orig"
cat "$(GENESIS_PATH).orig" | \
jq -rM '(..|objects|select(has("denom"))).denom |= "$(CHAIN_TOKEN_DENOM)"' | \
jq -rM '(..|objects|select(has("bond_denom"))).bond_denom |= "$(CHAIN_TOKEN_DENOM)"' | \
jq -rM '(..|objects|select(has("mint_denom"))).mint_denom |= "$(CHAIN_TOKEN_DENOM)"' > \
"$(GENESIS_PATH)"

.PHONY: node-init-genesis-accounts
node-init-genesis-accounts: $(patsubst %,node-init-genesis-account-%,$(KEY_NAMES))
$(AKASHD) validate-genesis

.PHONY: node-init-genesis-account-%
node-init-genesis-account-%:
$(AKASHD) add-genesis-account \
"$(shell $(AKASHCTL) keys show "$(@:node-init-genesis-account-%=%)" -a)" \
"$(CHAIN_MIN_DEPOSIT)$(CHAIN_TOKEN_DENOM)"

.PHONY: all build akash akashd image-minikube
.PHONY: node-init-gentx
node-init-gentx:
$(AKASHD) $(KEY_OPTS) gentx \
--name validator \
--home-client "$(CLIENT_HOME)" \
--amount "$(CHAIN_MIN_DEPOSIT)$(CHAIN_TOKEN_DENOM)"

.PHONY: node-init-finalize
node-init-finalize:
$(AKASHD) collect-gentxs
$(AKASHD) validate-genesis

.PHONY: node-run
node-run:
$(AKASHD) start

.PHONY: node-status
node-status:
$(AKASHCTL) status

.PHONY: rest-server-run
rest-server-run:
$(AKASHCTL) rest-server

.PHONY: clean
clean:
rm -rf "$(DATA_ROOT)"
17 changes: 0 additions & 17 deletions _run/common.sh

This file was deleted.

0 comments on commit f1c6e67

Please sign in to comment.