certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixes to make demo work

This commit is contained in:
Ethan Buchman 2017-01-29 22:43:07 -08:00
parent 8636946f80
commit e578d1f07b
6 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/basecoin/ibc.go
View File

@ -44,8 +44,6 @@ func cmdIBCRegisterTx(c *cli.Context) error {
} }
func cmdIBCUpdateTx(c *cli.Context) error { func cmdIBCUpdateTx(c *cli.Context) error {
parent := c.Parent()
headerBytes, err := hex.DecodeString(stripHex(c.String("header"))) headerBytes, err := hex.DecodeString(stripHex(c.String("header")))
if err != nil { if err != nil {
return errors.New(cmn.Fmt("Header (%v) is invalid hex: %v", c.String("header"), err)) return errors.New(cmn.Fmt("Header (%v) is invalid hex: %v", c.String("header"), err))
@ -77,7 +75,7 @@ func cmdIBCUpdateTx(c *cli.Context) error {
}{ibcTx})) }{ibcTx}))
name := "IBC" name := "IBC"
return appTx(parent, name, data) return appTx(c.Parent(), name, data)
} }
func cmdIBCPacketCreateTx(c *cli.Context) error { func cmdIBCPacketCreateTx(c *cli.Context) error {
@ -126,7 +124,7 @@ func cmdIBCPacketPostTx(c *cli.Context) error {
} }
var packet ibc.Packet var packet ibc.Packet
var proof merkle.IAVLProof proof := new(merkle.IAVLProof)
if err := wire.ReadBinaryBytes(packetBytes, &packet); err != nil { if err := wire.ReadBinaryBytes(packetBytes, &packet); err != nil {
return errors.New(cmn.Fmt("Error unmarshalling packet: %v", err)) return errors.New(cmn.Fmt("Error unmarshalling packet: %v", err))

8
cmd/basecoin/query.go
View File

@ -81,10 +81,10 @@ func cmdBlock(c *cli.Context) error {
return errors.New(cmn.Fmt("Height must be an int, got %v: %v", heightString, err)) return errors.New(cmn.Fmt("Height must be an int, got %v: %v", heightString, err))
} }
block, err := getBlock(c, height) /*block, err := getBlock(c, height)
if err != nil { if err != nil {
return err return err
} }*/
nextBlock, err := getBlock(c, height+1) nextBlock, err := getBlock(c, height+1)
if err != nil { if err != nil {
return err return err
@ -95,11 +95,11 @@ func cmdBlock(c *cli.Context) error {
JSON BlockJSON `json:"json"` JSON BlockJSON `json:"json"`
}{ }{
BlockHex{ BlockHex{
Header: wire.BinaryBytes(block.Header), Header: wire.BinaryBytes(nextBlock.Header),
Commit: wire.BinaryBytes(nextBlock.LastCommit), Commit: wire.BinaryBytes(nextBlock.LastCommit),
}, },
BlockJSON{ BlockJSON{
Header: block.Header, Header: nextBlock.Header,
Commit: nextBlock.LastCommit, Commit: nextBlock.LastCommit,
}, },
}))) })))

2
demo/data/chain1/tendermint/genesis.json
View File

@ -1,6 +1,6 @@
{ {
"app_hash": "", "app_hash": "",
"chain_id": "test-chain-AtzVUw", "chain_id": "test_chain_1",
"genesis_time": "0001-01-01T00:00:00.000Z", "genesis_time": "0001-01-01T00:00:00.000Z",
"validators": [ "validators": [
{ {

2
demo/data/chain2/tendermint/genesis.json
View File

@ -1,6 +1,6 @@
{ {
"app_hash": "", "app_hash": "",
"chain_id": "test-chain-cLhwLM", "chain_id": "test_chain_2",
"genesis_time": "0001-01-01T00:00:00.000Z", "genesis_time": "0001-01-01T00:00:00.000Z",
"validators": [ "validators": [
{ {

26
demo/start.sh
View File

@ -35,7 +35,7 @@ basecoin start --address tcp://localhost:36658 --ibc-plugin --dir ./data/chain2/
echo "" echo ""
echo "... waiting for chains to start" echo "... waiting for chains to start"
echo "" echo ""
sleep 5 sleep 10
echo "... registering chain1 on chain2" echo "... registering chain1 on chain2"
echo "" echo ""
@ -57,18 +57,30 @@ QUERY_RESULT=$(basecoin query ibc,egress,$CHAIN_ID1,$CHAIN_ID2,1)
HEIGHT=$(echo $QUERY_RESULT | jq .height) HEIGHT=$(echo $QUERY_RESULT | jq .height)
PACKET=$(echo $QUERY_RESULT | jq .value) PACKET=$(echo $QUERY_RESULT | jq .value)
PROOF=$(echo $QUERY_RESULT | jq .proof) PROOF=$(echo $QUERY_RESULT | jq .proof)
PACKET=$(removeQuotes $PACKET)
PROOF=$(removeQuotes $PROOF)
echo ""
echo "QUERY_RESULT: $QUERY_RESULT" echo "QUERY_RESULT: $QUERY_RESULT"
echo "HEIGHT: $HEIGHT" echo "HEIGHT: $HEIGHT"
echo "PACKET: $PACKET" echo "PACKET: $PACKET"
echo "PROOF: $PROOF" echo "PROOF: $PROOF"
echo ""
echo "... waiting for some blocks to be mined"
echo ""
sleep 5
echo "" echo ""
echo "... querying for block data" echo "... querying for block data"
echo "" echo ""
# get the header and commit for the height # get the header and commit for the height
HEADER_AND_COMMIT=$(basecoin block $HEIGHT) HEADER_AND_COMMIT=$(basecoin block $HEIGHT)
HEADER=$(echo $HEADER_AND_COMMIT | jq.hex.header) HEADER=$(echo $HEADER_AND_COMMIT | jq .hex.header)
COMMIT=$(echo $HEADER_AND_COMMIT | jq.hex.commit) HEADER=$(removeQuotes $HEADER)
COMMIT=$(echo $HEADER_AND_COMMIT | jq .hex.commit)
COMMIT=$(removeQuotes $COMMIT)
echo ""
echo "HEADER_AND_COMMIT: $HEADER_AND_COMMIT" echo "HEADER_AND_COMMIT: $HEADER_AND_COMMIT"
echo "HEADER: $HEADER" echo "HEADER: $HEADER"
echo "COMMIT: $COMMIT" echo "COMMIT: $COMMIT"
@ -83,4 +95,10 @@ echo ""
echo "... posting packet from chain1 on chain2" echo "... posting packet from chain1 on chain2"
echo "" echo ""
# post the packet from chain1 to chain2 # post the packet from chain1 to chain2
basecoin ibc --amount 10 $CHAIN_FLAGS2 packet post --from $CHAIN_ID1 --height $HEIGHT --packet $PACKET --proof $PROOF basecoin ibc --amount 10 $CHAIN_FLAGS2 packet post --from $CHAIN_ID1 --height $((HEIGHT + 1)) --packet 0x$PACKET --proof 0x$PROOF
echo ""
echo "... checking if the packet is present on chain2"
echo ""
# query for the packet on chain2 !
basecoin query --node tcp://localhost:36657 ibc,ingress,test_chain_2,test_chain_1,1

2
plugins/ibc/ibc.go
View File

@ -337,7 +337,7 @@ func (sm *IBCStateMachine) runPacketPostTx(tx IBCPacketPostTx) {
} }
if !exists { if !exists {
sm.res.Code = IBCCodeUnknownHeight sm.res.Code = IBCCodeUnknownHeight
sm.res.Log = cmn.Fmt("Loading Header: %v", err.Error()) sm.res.Log = cmn.Fmt("Loading Header: Unknown height")
return return
} }