Skip to content

Commit 828fa5e

Browse files
committed
renaming clyos/cleos => infra-cli
1 parent 851be6c commit 828fa5e

28 files changed

+302
-302
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ libraries/wasm-jit/Source/Programs/Disassemble
4747
libraries/wasm-jit/Source/Programs/Test
4848
libraries/wasm-jit/Source/Programs/wavm
4949

50-
programs/cleos/cleos
50+
programs/infra-cli/infra-cli
5151
programs/js_operation_serializer/js_operation_serializer
5252
programs/data-dir
5353
programs/eosio-abigen/eosio-abigen
54-
programs/cleos/config.hpp
54+
programs/infra-cli/config.hpp
5555
programs/eosio-applesedemo/eosio-applesedemo
5656
programs/eosio-launcher/config.hpp
5757
programs/eosio-launcher/eosio-launcher

Docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ docker volume create --name=keyos-data-volume
6666
docker-compose up -d
6767
```
6868

69-
After `docker-compose up -d`, two services named `yosemited` and `keyos` will be started. The yosemited service would expose ports 8888 and 9876 to the host. The keyos service does not expose any port to the host, it is only accessible to infra-cli when running cleos is running inside the keyos container as described in "Execute infra-cli commands" section.
69+
After `docker-compose up -d`, two services named `yosemited` and `keyos` will be started. The yosemited service would expose ports 8888 and 9876 to the host. The keyos service does not expose any port to the host, it is only accessible to infra-cli when running infra-cli is running inside the keyos container as described in "Execute infra-cli commands" section.
7070

7171
### Execute infra-cli commands
7272

contracts/yx.dcontract/README.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
## setting fee for actions
3131
* Transaction fee for operations is set by [yx.txfee](../../contracts/yx.txfee/)::settxfee operation.
3232
```
33-
clyos push action yx.txfee settxfee '{"operation":"tf.dccreate", "fee":"50.00 DKRW"}}' -p yosemite
34-
clyos push action yx.txfee settxfee '{"operation":"tf.dcaddsign", "fee":"10.00 DKRW"}}' -p yosemite
35-
clyos push action yx.txfee settxfee '{"operation":"tf.dcsign", "fee":"30.00 DKRW"}}' -p yosemite
36-
clyos push action yx.txfee settxfee '{"operation":"tf.dcupadd", "fee":"5.00 DKRW"}}' -p yosemite
37-
clyos push action yx.txfee settxfee '{"operation":"tf.dcremove", "fee":"0.00 DKRW"}}' -p yosemite
33+
infra-cli push action yx.txfee settxfee '{"operation":"tf.dccreate", "fee":"50.00 DKRW"}}' -p yosemite
34+
infra-cli push action yx.txfee settxfee '{"operation":"tf.dcaddsign", "fee":"10.00 DKRW"}}' -p yosemite
35+
infra-cli push action yx.txfee settxfee '{"operation":"tf.dcsign", "fee":"30.00 DKRW"}}' -p yosemite
36+
infra-cli push action yx.txfee settxfee '{"operation":"tf.dcupadd", "fee":"5.00 DKRW"}}' -p yosemite
37+
infra-cli push action yx.txfee settxfee '{"operation":"tf.dcremove", "fee":"0.00 DKRW"}}' -p yosemite
3838
```
3939

4040

@@ -44,7 +44,7 @@ clyos push action yx.txfee settxfee '{"operation":"tf.dcremove", "fee":"0.00 DKR
4444
Create a digital contract
4545

4646
```
47-
clyos push action yx.dcontract create '{"dcid":{"creator":"servprovider","sequence":1},"conhash":"123456","adddochash":"","signers":["user1", "user2"],"expiration":"2018-08-31T02:49:57","signer_type":0,"signer_kyc":0,"options":0}' -p servprovider
47+
infra-cli push action yx.dcontract create '{"dcid":{"creator":"servprovider","sequence":1},"conhash":"123456","adddochash":"","signers":["user1", "user2"],"expiration":"2018-08-31T02:49:57","signer_type":0,"signer_kyc":0,"options":0}' -p servprovider
4848
```
4949

5050
### parameters of create
@@ -70,8 +70,8 @@ clyos push action yx.dcontract create '{"dcid":{"creator":"servprovider","sequen
7070
Sign the digital contract by the signer
7171

7272
```
73-
clyos push action yx.dcontract sign '{"dcid":{"creator":"servprovider", "sequence":"1"}, "signer":"user1", "signerinfo":""}' -p user1
74-
clyos push action yx.dcontract sign '{"dcid":{"creator":"servprovider", "sequence":"1"}, "signer":"user2", "signerinfo":"foo"}' -p user2
73+
infra-cli push action yx.dcontract sign '{"dcid":{"creator":"servprovider", "sequence":"1"}, "signer":"user1", "signerinfo":""}' -p user1
74+
infra-cli push action yx.dcontract sign '{"dcid":{"creator":"servprovider", "sequence":"1"}, "signer":"user2", "signerinfo":"foo"}' -p user2
7575
```
7676

7777
### parameters of sign
@@ -86,7 +86,7 @@ Add additional signers to the created digital contract
8686
* The action only succeeds when none of the signers has signed the contract.
8787
* The type and/or the KYC status of the signer account are checked if the creator set `signer_type` and/or `signer_kyc`.
8888
```
89-
clyos push action yx.dcontract addsigners '{"dcid":{"creator":"servprovider", "sequence":"1"}, "signers":["user3"]}' -p servprovider
89+
infra-cli push action yx.dcontract addsigners '{"dcid":{"creator":"servprovider", "sequence":"1"}, "signers":["user3"]}' -p servprovider
9090
```
9191

9292
### parameters of addsigners
@@ -100,7 +100,7 @@ Update the additional document hash string
100100

101101
* This action succeeds even if the signing has all done or the contract has been expired.
102102
```
103-
clyos push action yx.dcontract upadddochash '{"dcid":{"creator":"servprovider", "sequence":"1"}, "adddochash":"updated"}' -p servprovider
103+
infra-cli push action yx.dcontract upadddochash '{"dcid":{"creator":"servprovider", "sequence":"1"}, "adddochash":"updated"}' -p servprovider
104104
```
105105

106106
### parameters of upadddochash
@@ -114,7 +114,7 @@ Remove the digital contract from the YosemiteChain RAM database
114114

115115
* It is recommended to use this action regularly to save the storage of YosemiteChain RAM database.
116116
```
117-
clyos push action yx.dcontract remove '{"dcid":{"creator":"servprovider", "sequence":"1"}}' -p servprovider
117+
infra-cli push action yx.dcontract remove '{"dcid":{"creator":"servprovider", "sequence":"1"}}' -p servprovider
118118
```
119119
### parameters of remove
120120
1. dcid : digital contract identifier provided to `create` action
@@ -126,7 +126,7 @@ clyos push action yx.dcontract remove '{"dcid":{"creator":"servprovider", "seque
126126
Get digital contract information
127127

128128
```
129-
clyos get table yx.dcontract servprovider dcontracts
129+
infra-cli get table yx.dcontract servprovider dcontracts
130130
```
131131
### result of dcontracts
132132
* Other than done_signers, the meaning of paramters are the same as the create action.
@@ -174,15 +174,15 @@ clyos get table yx.dcontract servprovider dcontracts
174174
Get the signer information
175175

176176
```
177-
clyos get table yx.dcontract user1 signers
178-
clyos get table yx.dcontract user2 signers
177+
infra-cli get table yx.dcontract user1 signers
178+
infra-cli get table yx.dcontract user2 signers
179179
```
180180
### result of signers
181181
1. id : This is just for internal managing purpose.
182182
1. dcid : digital contract id type which are creator and sequence
183183
1. signerinfo : additional information string for the signer saved by the sign action
184184
```
185-
$ clyos get table yx.dcontract user1 signers
185+
$ infra-cli get table yx.dcontract user1 signers
186186
{
187187
"rows": [{
188188
"id": 0,
@@ -196,7 +196,7 @@ $ clyos get table yx.dcontract user1 signers
196196
"more": false
197197
}
198198
199-
$ clyos get table yx.dcontract user2 signers
199+
$ infra-cli get table yx.dcontract user2 signers
200200
{
201201
"rows": [{
202202
"id": 0,
@@ -216,5 +216,5 @@ $ clyos get table yx.dcontract user2 signers
216216
* | the creator(64-bit integer) | sequence (64-bit integer) |
217217
* Web Assembly VM follows little endian.
218218
```
219-
clyos get table yx.dcontract user2 signers --index 2 --key-type i128 -L 0x01000000000000007055729bdebaafc2 -l 1
219+
infra-cli get table yx.dcontract user2 signers --index 2 --key-type i128 -L 0x01000000000000007055729bdebaafc2 -l 1
220220
```

contracts/yx.escrow/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* Transaction fee for operations is set by [yx.txfee](../../contracts/yx.txfee/)::settxfee operation.
1414
* It shares with transaction fee of yx.token.
1515
```
16-
clyos push action yx.txfee settxfee '{"operation":"tf.esescrow", "fee":"100.00 DKRW"}}' -p yosemite
17-
clyos push action yx.txfee settxfee '{"operation":"tf.esproceed", "fee":"10.00 DKRW"}}' -p yosemite
18-
clyos push action yx.txfee settxfee '{"operation":"tf.escancel", "fee":"10.00 DKRW"}}' -p yosemite
16+
infra-cli push action yx.txfee settxfee '{"operation":"tf.esescrow", "fee":"100.00 DKRW"}}' -p yosemite
17+
infra-cli push action yx.txfee settxfee '{"operation":"tf.esproceed", "fee":"10.00 DKRW"}}' -p yosemite
18+
infra-cli push action yx.txfee settxfee '{"operation":"tf.escancel", "fee":"10.00 DKRW"}}' -p yosemite
1919
```
2020

2121
# Actions
@@ -26,7 +26,7 @@ Request escrow to the third party to transfer the YOSEMITE token
2626
* The amount of token is transferred to the `thirdparty` account. Only when the third party calls 'proceed' action with the specified id, it is transferred to the 'to' account.
2727
* The native token with the specific system depository can be in escrow with this action.
2828
```
29-
clyos push action yx.escrow escrow '{"thirdparty":"servprovider","id":1,"from":"user2","to":"user1","token":{"amount":"10000.0000 BTC","issuer":"d2"},"memo":"my memo"}' -p servprovider user2
29+
infra-cli push action yx.escrow escrow '{"thirdparty":"servprovider","id":1,"from":"user2","to":"user1","token":{"amount":"10000.0000 BTC","issuer":"d2"},"memo":"my memo"}' -p servprovider user2
3030
```
3131
### parameters of escrow
3232
1. thirdparty : account name of the third party providing escrow service
@@ -51,7 +51,7 @@ Request escrow to the third party to transfer the native token regardless of the
5151

5252
* The amount of native token is transferred to the `thirdparty` account. Only when the third party calls 'proceed' action with the specified id, it is transferred to the 'to' account.
5353
```
54-
clyos push action yx.escrow escrownt '{"thirdparty":"servprovider","id":0,"from":"user1","to":"user2","amount":"10000.00 DKRW","memo":"my memo"}' -p servprovider user1
54+
infra-cli push action yx.escrow escrownt '{"thirdparty":"servprovider","id":0,"from":"user1","to":"user2","amount":"10000.00 DKRW","memo":"my memo"}' -p servprovider user1
5555
```
5656
### parameters of escrownt
5757
1. thirdparty : account name of the third party providing escrow service
@@ -75,7 +75,7 @@ Confirm transfer of token to 'to' account by the third party
7575

7676
* The escrow request pointed by 'id' is removed.
7777
```
78-
clyos push action yx.escrow proceed '{"thirdparty":"servprovider","id":0}' -p servprovider
78+
infra-cli push action yx.escrow proceed '{"thirdparty":"servprovider","id":0}' -p servprovider
7979
```
8080

8181
### inline actions and notifications of proceed
@@ -93,7 +93,7 @@ Cancel transfer of token by the third party
9393
* Token is returned back to 'from' account.
9494
* The escrow request pointed by 'id' is removed.
9595
```
96-
clyos push action yx.escrow cancel '{"thirdparty":"servprovider","id":1}' -p servprovider
96+
infra-cli push action yx.escrow cancel '{"thirdparty":"servprovider","id":1}' -p servprovider
9797
```
9898
### inline actions and notifications of cancel
9999
```
@@ -109,7 +109,7 @@ clyos push action yx.escrow cancel '{"thirdparty":"servprovider","id":1}' -p ser
109109
Get the list of escrow requests of the third party
110110

111111
```
112-
clyos get table yx.escrow servprovider escrows
112+
infra-cli get table yx.escrow servprovider escrows
113113
```
114114
### result of escrows
115115
```

contracts/yx.identity/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ Environment Var.
1717
---
1818

1919
```bash
20-
YOSEMITE_CLYOS=$YOSEMITE_HOME/build/programs/clyos/clyos
20+
YOSEMITE_CLI=$YOSEMITE_HOME/build/programs/infra-cli/infra-cli
2121
YOSEMITE_CONTRACTS_DIR=$YOSEMITE_HOME/build/contracts
2222
```
2323

2424
Install Identity System Contract
2525
---
2626
```bash
27-
$YOSEMITE_CLYOS create account yosemite yx.identity EOS6HrSCEbKTgZLe8stDgFB3Pip2tKtBxTPuffuoynnZnfUxHS3x9
28-
$YOSEMITE_CLYOS set contract yx.identity $YOSEMITE_CONTRACTS_DIR/yx.identity/ -p yx.identity@active
27+
$YOSEMITE_CLI create account yosemite yx.identity EOS6HrSCEbKTgZLe8stDgFB3Pip2tKtBxTPuffuoynnZnfUxHS3x9
28+
$YOSEMITE_CLI set contract yx.identity $YOSEMITE_CONTRACTS_DIR/yx.identity/ -p yx.identity@active
2929
```
3030

3131
YOSEMITE Identity Codes
@@ -56,15 +56,15 @@ Managing Account Identity Info (including KYC)
5656
#### setting identity Information for an account by an authorized Identity Authority
5757
5858
```bash
59-
$YOSEMITE_CLYOS push action yx.identity setidinfo "{\"account\":\"useraccount1\", \"identity_authority\":\"idauth1\", \"type\":$(echo 'ibase=2; 0' | bc), \"kyc\":$(echo 'ibase=2; 0111' | bc), \"state\":$(echo 'ibase=2; 0' | bc), \"data\":\"\"}" -p idauth1@active
60-
$YOSEMITE_CLYOS push action yx.identity setidinfo "{\"account\":\"useraccount2\", \"identity_authority\":\"idauth1\", \"type\":$(echo 'ibase=2; 0' | bc), \"kyc\":$(echo 'ibase=2; 1111' | bc), \"state\":$(echo 'ibase=2; 0' | bc), \"data\":\"23uyiuye\"}" -p idauth1@active
61-
$YOSEMITE_CLYOS push action yx.identity setidinfo "{\"account\":\"useraccount3\", \"identity_authority\":\"idauth1\", \"type\":$(echo 'ibase=2; 0' | bc), \"kyc\":$(echo 'ibase=2; 1111' | bc), \"state\":$(echo 'ibase=2; 0' | bc), \"data\":\"vewv23r3\"}" -p idauth1@active
59+
$YOSEMITE_CLI push action yx.identity setidinfo "{\"account\":\"useraccount1\", \"identity_authority\":\"idauth1\", \"type\":$(echo 'ibase=2; 0' | bc), \"kyc\":$(echo 'ibase=2; 0111' | bc), \"state\":$(echo 'ibase=2; 0' | bc), \"data\":\"\"}" -p idauth1@active
60+
$YOSEMITE_CLI push action yx.identity setidinfo "{\"account\":\"useraccount2\", \"identity_authority\":\"idauth1\", \"type\":$(echo 'ibase=2; 0' | bc), \"kyc\":$(echo 'ibase=2; 1111' | bc), \"state\":$(echo 'ibase=2; 0' | bc), \"data\":\"23uyiuye\"}" -p idauth1@active
61+
$YOSEMITE_CLI push action yx.identity setidinfo "{\"account\":\"useraccount3\", \"identity_authority\":\"idauth1\", \"type\":$(echo 'ibase=2; 0' | bc), \"kyc\":$(echo 'ibase=2; 1111' | bc), \"state\":$(echo 'ibase=2; 0' | bc), \"data\":\"vewv23r3\"}" -p idauth1@active
6262
```
6363

6464
#### Querying identity information for an account
6565

6666
```bash
67-
$YOSEMITE_CLYOS get table -L useraccount1 -l 1 yx.identity yx.identity identity
67+
$YOSEMITE_CLI get table -L useraccount1 -l 1 yx.identity yx.identity identity
6868
{
6969
"rows": [{
7070
"account": "useraccount1",
@@ -83,25 +83,25 @@ $YOSEMITE_CLYOS get table -L useraccount1 -l 1 yx.identity yx.identity identity
8383
#### update user account type
8484

8585
```bash
86-
$YOSEMITE_CLYOS push action yx.identity settype "{\"account\":\"useraccount1\", \"type\":$(echo 'ibase=2; 11111111' | bc)}" -p idauth1@active
86+
$YOSEMITE_CLI push action yx.identity settype "{\"account\":\"useraccount1\", \"type\":$(echo 'ibase=2; 11111111' | bc)}" -p idauth1@active
8787
```
8888

8989
#### update kyc status
9090

9191
```bash
92-
$YOSEMITE_CLYOS push action yx.identity setkyc "{\"account\":\"useraccount1\", \"kyc\":$(echo 'ibase=2; 1111' | bc)}" -p idauth1@active
92+
$YOSEMITE_CLI push action yx.identity setkyc "{\"account\":\"useraccount1\", \"kyc\":$(echo 'ibase=2; 1111' | bc)}" -p idauth1@active
9393
```
9494

9595
#### update account state (e.g. blacklist account)
9696

9797
```bash
98-
$YOSEMITE_CLYOS push action yx.identity setstate "{\"account\":\"useraccount1\", \"state\":$(echo 'ibase=2; 0001' | bc)}" -p idauth1@active
98+
$YOSEMITE_CLI push action yx.identity setstate "{\"account\":\"useraccount1\", \"state\":$(echo 'ibase=2; 0001' | bc)}" -p idauth1@active
9999
```
100100

101101
#### update identity-authority specific data
102102

103103
```bash
104-
$YOSEMITE_CLYOS push action yx.identity setdata "{\"account\":\"useraccount1\", \"data\":\"23fiuygy3\"}" -p idauth1@active
104+
$YOSEMITE_CLI push action yx.identity setdata "{\"account\":\"useraccount1\", \"data\":\"23fiuygy3\"}" -p idauth1@active
105105
```
106106

107107
Checking Identity Information in Smart Contract Code

contracts/yx.nft/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Create NFT with its symbol
4040
* The NFT creator naturally becomes the NFT depository.
4141
* Enabling the setting of options cannot be done any more after creation, because the owners of the NFT should know about what options can be set and it must not be changed after they own.
4242
```
43-
clyos push action yx.nft create '{"ysymbol":{"tsymbol":"0,GIT","issuer":"gameprovider"},"can_set_options":0}' -p gameprovider
43+
infra-cli push action yx.nft create '{"ysymbol":{"tsymbol":"0,GIT","issuer":"gameprovider"},"can_set_options":0}' -p gameprovider
4444
```
4545

4646
### parameters of create
@@ -52,8 +52,8 @@ clyos push action yx.nft create '{"ysymbol":{"tsymbol":"0,GIT","issuer":"gamepro
5252
Issue one or multiple NFTs to an account by the NFT depository
5353

5454
```
55-
clyos push action yx.nft issue '{"to":"user1","ysymbol":{"tsymbol":"0,GIT","issuer":"gameprovider"},"ids":[0],"uris":["item1"],"name":"basicsword","memo":"my memo"}' -p gameprovider
56-
clyos push action yx.nft issue '{"to":"user1","ysymbol":{"tsymbol":"0,GIT","issuer":"gameprovider"},"ids":[1,2],"uris":["item2-1", "item2-2"],"name":"potion1","memo":"my memo"}' -p gameprovider
55+
infra-cli push action yx.nft issue '{"to":"user1","ysymbol":{"tsymbol":"0,GIT","issuer":"gameprovider"},"ids":[0],"uris":["item1"],"name":"basicsword","memo":"my memo"}' -p gameprovider
56+
infra-cli push action yx.nft issue '{"to":"user1","ysymbol":{"tsymbol":"0,GIT","issuer":"gameprovider"},"ids":[1,2],"uris":["item2-1", "item2-2"],"name":"potion1","memo":"my memo"}' -p gameprovider
5757
```
5858

5959
### parameters of issue
@@ -102,11 +102,11 @@ Redeem(burn) NFT from an account by the NFT depository
102102

103103
* At first, the account transfers the NFT to the depository.
104104
```
105-
clyos push action yx.nft transferid '{"from":"user1","to":"gameprovider","issuer":"gameprovider","ids":[0,1],"memo":"transfer for redeem"}' -p user1
105+
infra-cli push action yx.nft transferid '{"from":"user1","to":"gameprovider","issuer":"gameprovider","ids":[0,1],"memo":"transfer for redeem"}' -p user1
106106
```
107107
* Then the NFT depository checks the transfer action is irreversible and calls redeem action.
108108
```
109-
clyos push action yx.nft redeem '{"issuer":"gameprovider","ids":[0,1],"memo":"redeem for user1"}' -p gameprovider
109+
infra-cli push action yx.nft redeem '{"issuer":"gameprovider","ids":[0,1],"memo":"redeem for user1"}' -p gameprovider
110110
```
111111

112112
### parameters of redeem
@@ -119,7 +119,7 @@ Transfer NFTs
119119

120120
* Note that transfer action is not supported for NFT. All NFTs are different each other so that it cannot be distinguishable with just the token symbol and issuer.
121121
```
122-
clyos push action yx.nft transferid '{"from":"user2","to":"user3","issuer":"gameprovider","ids":[0,1],"memo":"my memo"}' -p user2
122+
infra-cli push action yx.nft transferid '{"from":"user2","to":"user3","issuer":"gameprovider","ids":[0,1],"memo":"my memo"}' -p user2
123123
```
124124

125125
### parameters of transferid
@@ -151,7 +151,7 @@ See [`yx.token` taccounts](../../contracts/yx.token#taccounts)
151151
## nftokens
152152
Get all the NFTs issued by the NFT depository
153153
```
154-
clyos get table yx.nft gameprovider nftokens
154+
infra-cli get table yx.nft gameprovider nftokens
155155
```
156156

157157
### results of nftokens
@@ -174,5 +174,5 @@ clyos get table yx.nft gameprovider nftokens
174174

175175
### get the NFTS by the owner
176176
```
177-
clyos get table yx.nft gameprovider nftokens --index 2 --key-type i64 -L user1
177+
infra-cli get table yx.nft gameprovider nftokens --index 2 --key-type i64 -L user1
178178
```

0 commit comments

Comments
 (0)