Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/boscore/ibc_contracts
Browse files Browse the repository at this point in the history
  • Loading branch information
justfortest2 committed Jul 1, 2020
2 parents cf833bb + 71fe81a commit 691391f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
16 changes: 15 additions & 1 deletion docs/BOSIBC_Cmdline_Demo.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ yascleos push action ${contract_token} setglobal '['${p_chain}',true]' -p ${cont
params='["bos","'${bos_organization}'","bosibc.io","'${contract_chain}'","'${ibc_free_act}'",5,1000,1000,true]'
yascleos push action ${contract_token} regpeerchain "${params}" -p ${contract_token}
# set administrator after the permission resign
# set administrator before the permission resign
yascleos push action ${contract_token} setadmin '['${yas_admin_act}']' -p ${contract_token}
yascleos push action ${contract_chain} setadmin '['${yas_admin_act}']' -p ${contract_chain}
```
Expand Down Expand Up @@ -208,3 +208,17 @@ cleos push action ${peerchain_contract} transfer '[ "YOU_EOS_ACT", "bosibc.io","
# transfer TPT from EOS to TELOS
cleos push action ${peerchain_contract} transfer '[ "YOU_EOS_ACT", "bosibc.io","10.0000 TPT", "hub.io@bos >> YOUR_ACT_BOS@bos Hello TELOS" ]' -p YOU_EOS_ACT@active
```

## Resign the IBC account permission into eosio.prods
## 将 IBC 账户的权限指定给 eosio.prods
```
# for contract_token
yascleos set account permission ${contract_token} active '{"threshold": 1, "keys":[], "accounts":[ {"permission":{"actor":"'${contract_token}'","permission":"eosio.code"},"weight":1},{"permission":{"actor":"eosio.prods","permission":"active"},"weight":1}], "waits":[] }' owner -p ${contract_token}
yascleos set account permission ${contract_token} owner '{"threshold": 1, "keys":[], "accounts":[{"permission":{"actor":"eosio.prods","permission":"active"},"weight":1}], "waits":[] }' -p ${contract_token}@owner
# for contract_chain
yascleos set account permission ${contract_chain} active '{"threshold": 1, "keys":[], "accounts":[{"permission":{"actor":"eosio.prods","permission":"active"},"weight":1}], "waits":[] }' owner -p ${contract_chain}
yascleos set account permission ${contract_chain} owner '{"threshold": 1, "keys":[], "accounts":[{"permission":{"actor":"eosio.prods","permission":"active"},"weight":1}], "waits":[] }' -p ${contract_chain}@owner
```
2 changes: 1 addition & 1 deletion docs/User_Guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ It takes so long time to wait when transfer form EOS mainnet to BOS mainet,
because the consensus of EOS mainnet is pipeline-pbft, and it need long time to let a block inter LIB,
but only 10 seconds to wait when transfer form BOS mainnet to EOS miannet,
because BOS use a very fast finality consensus algorithem, that's batch-pbft.
for more IBC theory please refer to [EOSIO IBC Priciple and Design](../../Documentation/IBC/EOSIO_IBC_Priciple_and_Design.md).
for more IBC theory please refer to [EOSIO IBC Priciple and Design](https://github.com/boscore/Documentation/blob/master/IBC/EOSIO_IBC_Priciple_and_Design.md).

So users can transfer assets across the chains by using any existing mobile app eosio wallets,
the existing wallets only need to support the ibc.token contract, because the transfer action interface definition of ibc.token
Expand Down

0 comments on commit 691391f

Please sign in to comment.