Skip to content

Commit 0688d41

Browse files
authored
Merge pull request #88 from Agoric/ms/cleanup
Cleanup DApp - Remove Unused Stuff, Reorganize Rest
2 parents c4ea224 + 3b12483 commit 0688d41

38 files changed

+126
-1740
lines changed

.github/workflows/pr.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
yarn link-cli
4444
echo "$HOME/bin" >> $GITHUB_PATH
4545
46-
- name: Build dapp-agoric-basics
46+
- name: Build dapp-orchestration-basics
4747
run: yarn build
4848

4949
- name: Setup Starship Infrastructure
@@ -86,10 +86,10 @@ jobs:
8686
if: always()
8787
run: kubectl logs hermes-agoric-osmosis-0 --container=relayer || true
8888

89-
- name: Capture and print agoric-cosmos relayer logs
89+
- name: Capture and print agoric-gaia relayer logs
9090
if: always()
9191
run: kubectl logs hermes-agoric-gaia-0 --container=relayer || true
9292

93-
- name: verify contracts started onchain
93+
- name: verify contract(s) started onchain
9494
run: |
9595
curl http://localhost:1317/agoric/vstorage/data/published.agoricNames.instance | grep orca

.gitignore

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
contract/startOrcaContract-permit.json
33
contract/startOrcaContract-plan.json
44
contract/startOrcaContract.js
5-
5+
contract/bundles
66

77
# Logs
88
logs
@@ -37,3 +37,8 @@ dist-ssr
3737
!.yarn/releases
3838
!.yarn/sdks
3939
!.yarn/versions
40+
41+
e2e-testing/revise-chain-info-permit.json
42+
e2e-testing/revise-chain-info-plan.json
43+
e2e-testing/revise-chain-info.js
44+
e2e-testing/starship-chain-info.js

Makefile

-24
This file was deleted.

README-local-chain.md

-21
This file was deleted.

README.md

+26-9
Original file line numberDiff line numberDiff line change
@@ -6,83 +6,102 @@
66

77
The Orchestration Basics dApp showcases various features of the orchestration API running inside of an end-to-end environment, and a user interface:
88

9-
109
## Set up the local environment
1110

1211
- Follow the instructions in `agoric-sdk/multichain-testing/README.md` to setup local multi-chain environment needed to run and test dApp. You can run `agd status` to check if this was successful.
1312

1413
- Run the following in the top level directory of `dapp-orchestration-basics` to run `hermes update` in the background:
1514

1615
```sh
17-
make hermes-update &
16+
make hermes-update &
1817
```
1918

2019
## Fund the account
20+
2121
- Run the following in the `contract/` directory of `dapp-orchestration-basics`:
22+
2223
```
2324
make fund
2425
```
26+
2527
This will fund `ADDR`, `CLIENTADDR`, and `CLIENT_OSMO_ADDR` as defined in `contract/Makefile`.
2628

2729
## Build & Deploy the dapp
30+
2831
- From the `contract/` directory of `dapp-orchestration-basics`, run:
32+
2933
```
3034
make e2e
3135
```
36+
3237
Wait for this step to complete (this could take a while!) before you start UI in the next.
38+
3339
## Start UI
40+
3441
- Run the following inside of the `ui/` directory of `dapp-orchestration-basics`:
42+
3543
```sh
3644
yarn dev
3745
```
3846

3947
<img src="./images/ui.png" width="100%" />
4048

41-
---
49+
---
4250

4351
# Tests
52+
4453
From top-level directory:
54+
4555
```
4656
make test-orca
4757
```
4858

4959
# tests from root directory
60+
5061
```
5162
yarn cache clean; yarn; yarn workspace dapp-agoric-orca-contract test ; rm -rf -v yarn.lock package-lock.json node_modules contract/node_modules; yarn; yarn workspace dapp-agoric-orca-contract test
5263
```
5364

5465
without clean:
66+
5567
```
5668
yarn workspace dapp-agoric-orca-contract deploy
5769
```
5870

59-
# deploy from root directory
71+
# deploy from root directory
72+
6073
```
6174
yarn cache clean; yarn; yarn workspace dapp-agoric-orca-contract test ; rm -rf -v yarn.lock package-lock.json node_modules contract/node_modules; yarn; yarn workspace dapp-agoric-orca contract:deploy
6275
```
6376

6477
without clean:
78+
6579
```
6680
yarn workspace dapp-agoric-orca-contract deploy
6781
```
6882

6983
# e2e build/deploy
84+
7085
```
7186
yarn workspace dapp-agoric-orca-contract deployc
7287
```
7388

7489
# e2e environment using `multichain-testing`
90+
7591
using starship
92+
7693
```
7794
make teardown ; make stop; make stop-forward; make clean; make; make port-forward
7895
```
7996

8097
# e2e workspaces
98+
8199
```
82100
yarn workspace dapp-agoric-orca-contract build; yarn workspace dapp-agoric-orca-contract e2e
83101
```
84102

85103
# note
104+
86105
Troubleshooting remote calls
87106

88107
If an ordinary synchronous call (obj.method()) fails because the method doesn't exist, the obj may be remote, in which case E(obj).method() might work.
@@ -95,21 +114,19 @@ make override-chain-registry
95114
```
96115

97116
# funding on osmosis
117+
98118
```console
99119
osmosisd tx bank send faucet osmo1dw3nep8yqy5szzxn6hmma6j2z77vp4wz8tkh0w3gyrruwny0w03s070kaa 299999999uosmo --chain-id osmosislocal --gas-adjustment 2 --gas auto --from faucet --gas-prices 0.0025uosmo
100120
```
101121

102122
example rpc for balances:
123+
103124
```
104125
http://127.0.0.1:26657/abci_query?path=%22/cosmos.bank.v1beta1.Query/AllBalances%22&data=%22%5Cn-agoric12j5kzvrwunqvrga5vm4zpy3mkeh3lvyld0amz5%22
105126
```
106127

107128
# tmp fund ica
129+
108130
```console
109131
agd tx bank send keplr1 agoric15ch7da0d8nvqc8hk6dguq4ext0lvskpjcwm3patf8sygm63chmpqjlzt74 1000uist -y --chain-id agoriclocal
110132
```
111-
112-
# Interface
113-
you can run `yarn dev` inside of the `ui` folder.
114-
115-
<img src="./images/ui.png" width="100%" />

0 commit comments

Comments
 (0)