Skip to content

Commit 08786a0

Browse files
troiantroian
committed
refactor: pull latest codegen
Signed-off-by: Artur Troian <troian@users.noreply.github.com>
1 parent fef79eb commit 08786a0

86 files changed

Lines changed: 2139 additions & 2660 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎_run/common-commands.mk‎

Lines changed: 221 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
KEY_NAME ?= main
1+
KEY_NAME ?= main
2+
KEY_ADDRESS ?= $(shell $(AKASH) $(KEY_OPTS) keys show "$(KEY_NAME)" -a)
3+
4+
SDL_PATH ?= deployment.yaml
5+
6+
DSEQ ?= 1
7+
GSEQ ?= 1
8+
OSEQ ?= 1
9+
PRICE ?= 10uakt
10+
CERT_HOSTNAME ?= localhost
11+
LEASE_SERVICES ?= web
212

313
.PHONY: multisig-send
414
multisig-send:
@@ -26,6 +36,216 @@ multisig-send:
2636
> "$(AKASH_HOME)/multisig-final.json"
2737
$(AKASH) $(CHAIN_OPTS) tx broadcast "$(AKASH_HOME)/multisig-final.json"
2838

39+
.PHONY: provider-create
40+
provider-create:
41+
$(AKASH) tx provider create "$(PROVIDER_CONFIG_PATH)" --from "$(PROVIDER_KEY_NAME)"
42+
43+
.PHONY: provider-update
44+
provider-update:
45+
$(AKASH) tx provider update "$(PROVIDER_CONFIG_PATH)" --from "$(PROVIDER_KEY_NAME)"
46+
47+
.PHONY: provider-status
48+
provider-status:
49+
$(PROVIDER_SERVICES) status $(PROVIDER_ADDRESS)
50+
51+
.PHONY: authenticate
52+
authenticate:
53+
$(PROVIDER_SERVICES) authenticate \
54+
--from "$(KEY_ADDRESS)" \
55+
--provider "$(PROVIDER_ADDRESS)"
56+
57+
.PHONY: auth-server
58+
auth-server:
59+
$(PROVIDER_SERVICES) auth-server \
60+
--from "$(PROVIDER_KEY_NAME)" \
61+
--jwt-auth-listen-address "$(JWT_AUTH_HOST)" \
62+
63+
.PHONY: run-resource-server
64+
run-resource-server:
65+
$(PROVIDER_SERVICES) run-resource-server \
66+
--from "$(PROVIDER_KEY_NAME)" \
67+
--resource-server-listen-address "$(RESOURCE_SERVER_HOST)" \
68+
--loki-gateway-listen-address localhost:3100 \
69+
70+
.PHONY: send-manifest
71+
send-manifest:
72+
$(PROVIDER_SERVICES) send-manifest "$(SDL_PATH)" \
73+
--dseq "$(DSEQ)" \
74+
--from "$(KEY_NAME)" \
75+
--provider "$(PROVIDER_ADDRESS)" \
76+
--auth-type "$(GW_AUTH_TYPE)"
77+
78+
.PHONY: get-manifest
79+
get-manifest:
80+
$(PROVIDER_SERVICES) get-manifest \
81+
--dseq "$(DSEQ)" \
82+
--from "$(KEY_NAME)" \
83+
--provide "$(PROVIDER_ADDRESS)" \
84+
--auth-type "$(GW_AUTH_TYPE)"
85+
86+
87+
.PHONY: deployment-create
88+
deployment-create:
89+
$(AKASH) tx deployment create "$(SDL_PATH)" \
90+
--dseq "$(DSEQ)" \
91+
--from "$(KEY_NAME)"
92+
93+
.PHONY: deployment-deposit
94+
deployment-deposit:
95+
$(AKASH) tx escrow deposit deployment "$(PRICE)" \
96+
--dseq "$(DSEQ)" \
97+
--from "$(KEY_NAME)"
98+
99+
.PHONY: deployment-update
100+
deployment-update:
101+
$(AKASH) tx deployment update "$(SDL_PATH)" \
102+
--dseq "$(DSEQ)" \
103+
--from "$(KEY_NAME)"
104+
105+
.PHONY: deployment-close
106+
deployment-close:
107+
$(AKASH) tx deployment close \
108+
--owner "$(MAIN_ADDR)" \
109+
--dseq "$(DSEQ)" \
110+
--from "$(KEY_NAME)"
111+
112+
.PHONY: group-close
113+
group-close:
114+
$(AKASH) tx deployment group close \
115+
--owner "$(KEY_ADDRESS)" \
116+
--dseq "$(DSEQ)" \
117+
--gseq "$(GSEQ)" \
118+
--from "$(KEY_NAME)"
119+
120+
.PHONY: group-pause
121+
group-pause:
122+
$(AKASH) tx deployment group pause \
123+
--owner "$(KEY_ADDRESS)" \
124+
--dseq "$(DSEQ)" \
125+
--gseq "$(GSEQ)" \
126+
--from "$(KEY_NAME)"
127+
128+
.PHONY: group-start
129+
group-start:
130+
$(AKASH) tx deployment group start \
131+
--owner "$(KEY_ADDRESS)" \
132+
--dseq "$(DSEQ)" \
133+
--gseq "$(GSEQ)" \
134+
--from "$(KEY_NAME)"
135+
136+
.PHONY: bid-create
137+
bid-create:
138+
$(AKASH) tx market bid create \
139+
--owner "$(KEY_ADDRESS)" \
140+
--dseq "$(DSEQ)" \
141+
--gseq "$(GSEQ)" \
142+
--oseq "$(OSEQ)" \
143+
--from "$(PROVIDER_KEY_NAME)" \
144+
--price "$(PRICE)"
145+
146+
.PHONY: bid-close
147+
bid-close:
148+
$(AKASH) tx market bid close \
149+
--owner "$(KEY_ADDRESS)" \
150+
--dseq "$(DSEQ)" \
151+
--gseq "$(GSEQ)" \
152+
--oseq "$(OSEQ)" \
153+
--from "$(PROVIDER_KEY_NAME)"
154+
155+
.PHONY: lease-create
156+
lease-create:
157+
$(AKASH) tx market lease create \
158+
--owner "$(KEY_ADDRESS)" \
159+
--dseq "$(DSEQ)" \
160+
--gseq "$(GSEQ)" \
161+
--oseq "$(OSEQ)" \
162+
--provider "$(PROVIDER_ADDRESS)" \
163+
--from "$(KEY_NAME)"
164+
165+
.PHONY: lease-withdraw
166+
lease-withdraw:
167+
$(AKASH) tx market lease withdraw \
168+
--owner "$(KEY_ADDRESS)" \
169+
--dseq "$(DSEQ)" \
170+
--gseq "$(GSEQ)" \
171+
--oseq "$(OSEQ)" \
172+
--provider "$(PROVIDER_ADDRESS)" \
173+
--from "$(PROVIDER_KEY_NAME)"
174+
175+
.PHONY: lease-close
176+
lease-close:
177+
$(AKASH) tx market lease close \
178+
--owner "$(KEY_ADDRESS)" \
179+
--dseq "$(DSEQ)" \
180+
--gseq "$(GSEQ)" \
181+
--oseq "$(OSEQ)" \
182+
--provider "$(PROVIDER_ADDRESS)" \
183+
--from "$(KEY_NAME)"
184+
185+
.PHONY: query-accounts
186+
query-accounts: $(patsubst %, query-account-%,$(GENESIS_ACCOUNTS))
187+
188+
.PHONY: query-account-%
189+
query-account-%:
190+
$(AKASH) query bank balances "$(shell $(AKASH) $(KEY_OPTS) keys show -a "$(@:query-account-%=%)")"
191+
$(AKASH) query account "$(shell $(AKASH) $(KEY_OPTS) keys show -a "$(@:query-account-%=%)")"
192+
193+
.PHONY: query-provider
194+
query-provider:
195+
$(AKASH) query provider get "$(PROVIDER_ADDRESS)"
196+
197+
.PHONY: query-providers
198+
query-providers:
199+
$(AKASH) query provider list
200+
201+
.PHONY: query-deployment
202+
query-deployment:
203+
$(AKASH) query deployment get \
204+
--owner "$(KEY_ADDRESS)" \
205+
--dseq "$(DSEQ)"
206+
207+
.PHONY: query-deployments
208+
query-deployments:
209+
$(AKASH) query deployment list
210+
211+
.PHONY: query-order
212+
query-order:
213+
$(AKASH) query market order get \
214+
--owner "$(KEY_ADDRESS)" \
215+
--dseq "$(DSEQ)" \
216+
--gseq "$(GSEQ)" \
217+
--oseq "$(OSEQ)"
218+
219+
.PHONY: query-orders
220+
query-orders:
221+
$(AKASH) query market order list
222+
223+
.PHONY: query-bid
224+
query-bid:
225+
$(AKASH) query market bid get \
226+
--owner "$(KEY_ADDRESS)" \
227+
--dseq "$(DSEQ)" \
228+
--gseq "$(GSEQ)" \
229+
--oseq "$(OSEQ)" \
230+
--provider "$(PROVIDER_ADDRESS)"
231+
232+
.PHONY: query-bids
233+
query-bids:
234+
$(AKASH) query market bid list
235+
236+
.PHONY: query-lease
237+
query-lease:
238+
$(AKASH) query market lease get \
239+
--owner "$(KEY_ADDRESS)" \
240+
--dseq "$(DSEQ)" \
241+
--gseq "$(GSEQ)" \
242+
--oseq "$(OSEQ)" \
243+
--provider "$(PROVIDER_ADDRESS)"
244+
245+
.PHONY: query-leases
246+
query-leases:
247+
$(AKASH) query market lease list
248+
29249
.PHONY: akash-node-ready
30250
akash-node-ready: SHELL=$(BASH_PATH)
31251
akash-node-ready:

‎_run/common.mk‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,12 @@ node-init-genesis:
8787
jq -M '.app_state.gov.voting_params.voting_period = "60s"' | \
8888
jq -M '.app_state.gov.params.voting_period = "60s"' | \
8989
jq -M '.app_state.gov.params.expedited_voting_period = "30s"' | \
90-
jq -M '.app_state.gov.params.max_deposit_period = "60s"' | \
91-
jq -rM '(..|objects|select(has("denom"))).denom |= "$(CHAIN_TOKEN_DENOM)"' | \
92-
jq -rM '(..|objects|select(has("bond_denom"))).bond_denom |= "$(CHAIN_TOKEN_DENOM)"' | \
93-
jq -rM '(..|objects|select(has("mint_denom"))).mint_denom |= "$(CHAIN_TOKEN_DENOM)"' > \
94-
"$(GENESIS_PATH)"
90+
jq -M '.app_state.gov.params.max_deposit_period = "60s"' \
91+
> "$(GENESIS_PATH)"
92+
# jq -rM '(..|objects|select(has("denom"))).denom |= "$(CHAIN_TOKEN_DENOM)"' | \
93+
# jq -rM '(..|objects|select(has("bond_denom"))).bond_denom |= "$(CHAIN_TOKEN_DENOM)"' | \
94+
# jq -rM '(..|objects|select(has("mint_denom"))).mint_denom |= "$(CHAIN_TOKEN_DENOM)"' > \
95+
# "$(GENESIS_PATH)"
9596

9697
.INTERMEDIATE: node-init-genesis-certs
9798
node-init-genesis-certs: $(patsubst %,node-init-genesis-client-cert-%,$(CLIENT_CERTS)) $(patsubst %,node-init-genesis-server-cert-%,$(SERVER_CERTS))

‎_run/node/deployment.yaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
---
2+
version: "2.0"
3+
4+
services:
5+
web:
6+
image: quay.io/ovrclk/demo-app
7+
expose:
8+
- port: 80
9+
as: 80
10+
http_options:
11+
max_body_size: 2097152
12+
next_cases:
13+
- off
14+
accept:
15+
- hello.localhost
16+
to:
17+
- global: true
18+
bew:
19+
image: quay.io/ovrclk/demo-app
20+
expose:
21+
- port: 80
22+
as: 80
23+
accept:
24+
- hello1.localhost
25+
to:
26+
- global: true
27+
28+
profiles:
29+
compute:
30+
web:
31+
resources:
32+
cpu:
33+
units: 0.1
34+
memory:
35+
size: 16Mi
36+
storage:
37+
size: 128Mi
38+
placement:
39+
westcoast:
40+
attributes:
41+
region: us-west
42+
pricing:
43+
web:
44+
denom: uakt
45+
amount: 1000
46+
47+
deployment:
48+
web:
49+
westcoast:
50+
profile: web
51+
count: 1
52+
bew:
53+
westcoast:
54+
profile: web
55+
count: 1

‎_run/node/prop.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
"authority": "akash10d07y265gmmuvt4z0w9aw880jnsr700jhe7z0f",
66
"params": {
77
"sources": [
8-
"akash1yd535w6kyzlwjrj0zzf2vxqwpd5mx4m88xjmtf"
8+
"akash1xcfl5u6g2yprvpr4q8j2pp5h6l5ys3nuf529qa"
99
],
10-
"min_price_sources": 0,
11-
"max_price_staleness_blocks": "0",
12-
"twap_window": "0",
13-
"max_price_deviation_bps": "0",
10+
"min_price_sources": 1,
11+
"max_price_staleness_blocks": "60",
12+
"twap_window": "50",
13+
"max_price_deviation_bps": "150",
1414
"feed_contracts_params": [
1515
{
1616
"@type": "/akash.oracle.v1.PythContractParams",
17-
"akt_price_feed_id": "0x1c5d745dc0e0c8a0034b6c3d3a8e5d34e4e9b79c9ab2f4b3e6a8e7f0c9e8a5b4"
17+
"akt_price_feed_id": "0x4ea5bb4d2f5900cc2e97ba534240950740b4d3b89fe712a94a7304fd2fd92702"
1818
}
1919
]
2020
}
2121
}
2222
],
2323
"deposit": "50000000uakt",
24-
"title": "Add Oracle Price Feeder Source",
24+
"title": "Add Oracle Price Feeder Source"
2525
"summary": "Authorize price feeder address for AKT/USD oracle",
2626
"expedited": true
2727
}

‎app/genesis.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ func genesisFilterTokens(from GenesisState) GenesisState {
6060

6161
// NewDefaultGenesisState generates the default state for the application.
6262
func NewDefaultGenesisState(cdc codec.Codec) GenesisState {
63-
genesis := ModuleBasics().DefaultGenesis(cdc)
64-
return genesisFilterTokens(genesis)
63+
return ModuleBasics().DefaultGenesis(cdc)
64+
//return genesisFilterTokens(genesis)
6565
}
6666

6767
func GenesisStateWithValSet(cdc codec.Codec) GenesisState {

‎app/sim_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import (
4747
atypes "pkg.akt.dev/go/node/audit/v1"
4848
ctypes "pkg.akt.dev/go/node/cert/v1"
4949
dtypes "pkg.akt.dev/go/node/deployment/v1"
50-
mtypes "pkg.akt.dev/go/node/market/v2beta1"
50+
mtypes "pkg.akt.dev/go/node/market/v1"
5151
ptypes "pkg.akt.dev/go/node/provider/v1beta4"
5252
taketypes "pkg.akt.dev/go/node/take/v1"
5353
"pkg.akt.dev/go/sdkutil"

0 commit comments

Comments
 (0)