Skip to content

S
sidecar-client-chain33
Commit 6fc82c43 authored by harrylee's avatar harrylee
Browse files
Options

update chain33-sdk-go dep

parent b44680dd
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 17 deletions
client.go
View file @ 6fc82c43
......@@ -45,10 +45,7 @@ const (
type ContractMeta struct {
EventFilter string `json:"event_filter"`
// Username string `json:"username"`
CCID string `json:"ccid"`
// ChannelID string `json:"channel_id"`
// ORG string `json:"org"`
PrivateKey string `json:"private_key"`
TimeoutHeight int64 `json:"timeout_height"`
ChainID string `json:"chain_id"`
......@@ -293,8 +290,8 @@ func (c *Client) SubmitIBTP(ibtp *pb.IBTP) (*pb.SubmitIBTPResponse, error) {
//}
return ret, nil
}
// var result [][]byte
//FIXME 修复
var result [][]byte
var chResp string
callFunc := CallFunc{
Func: content.Func,
......@@ -311,6 +308,7 @@ func (c *Client) SubmitIBTP(ibtp *pb.IBTP) (*pb.SubmitIBTPResponse, error) {
}
chResp = res
} else {
//ibtp.Category() 对ibtp消息进行类型转换，判断是请求消息还是响应消息，响应消息不需要执行回调
res, resp, err := c.InvokeInterchain(srcChainServiceID, ibtp.Nonce, serviceID, uint64(ibtp.Category()), bizData)
if err != nil {
return nil, fmt.Errorf("invoke interchain for ibtp %s to call %s: %w", ibtp.ID(), content.Func, err)
......@@ -318,6 +316,9 @@ func (c *Client) SubmitIBTP(ibtp *pb.IBTP) (*pb.SubmitIBTPResponse, error) {
ret.Status = resp.OK
ret.Message = resp.Message
// 将查询结果，作为参数传递到回调函数中
result = util.ToChaincodeArgs(strings.Split(string(resp.Data), ",")...)
chResp = res
}
......@@ -331,10 +332,10 @@ func (c *Client) SubmitIBTP(ibtp *pb.IBTP) (*pb.SubmitIBTPResponse, error) {
return ret, err
}
//ret.Result, err = c.generateCallback(ibtp, result, ret.Status)
//if err != nil {
// return nil, err
//}
ret.Result, err = c.generateCallback(ibtp, result, ret.Status)
if err != nil {
return nil, err
}
ret.Result.Proof = proof
......@@ -359,7 +360,7 @@ func (c *Client) InvokeInterchain(from string, index uint64, destAddr string, re
var err error
if err := retry.Retry(func(attempt uint) error {
// TODO 改为客户端去执行
res, err = c.consumer.jsonClient.Execute(request)
res, err = c.consumer.jsonClient.Execute(request,c.config.Chain33.PrivateKey)
if err != nil {
logger.Error("execute request failed", "err", err.Error())
return nil
......
config.go
View file @ 6fc82c43
......@@ -12,7 +12,7 @@ const (
)
type Config struct {
Chain33 Chain33 `toml:"fabric" json:"fabric"`
Chain33 Chain33 `toml:"chain33" json:"chain33"`
Services []Service `mapstructure:"services" json:"services"`
}
......
go.mod
View file @ 6fc82c43
......@@ -8,8 +8,8 @@ require (
github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd
github.com/hashicorp/go-plugin v1.3.0
github.com/spf13/viper v1.7.0
gitlab.33.cn/link33/chain33-sdk-go v0.0.0-20211026072656-659d145568bf
gitlab.33.cn/link33/sidecar v0.0.0-20211028080238-67f4248825bb
gitlab.33.cn/link33/chain33-sdk-go v0.0.0-20211109083921-bd668bac2a45
gitlab.33.cn/link33/sidecar v0.0.0-20211105031147-f9e9df1e4f1f
)
replace (
......
go.sum
View file @ 6fc82c43
......@@ -278,6 +278,7 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p
github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M=
github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
github.com/herumi/bls-eth-go-binary v0.0.0-20210917013441-d37c07cfda4e/go.mod h1:luAnRm3OsMQeokhGzpYmc0ZKwawY7o87PUEP11Z7r7U=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/huandu/go-assert v1.1.5 h1:fjemmA7sSfYHJD7CUqs9qTwwfdNAx7/j2/ZlHXzNB3c=
github.com/huandu/go-assert v1.1.5/go.mod h1:yOLvuqZwmcHIC5rIzrBhT7D3Q9c3GFnd0JrPVhn/06U=
......@@ -755,6 +756,7 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
github.com/supranational/blst v0.3.6/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
github.com/sykesm/zap-logfmt v0.0.3/go.mod h1:AuBd9xQjAe3URrWT1BBDk2v2onAZHkZkWRMiYZXiZWA=
github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d/go.mod h1:9OrXJhf154huy1nPWmuSrkgjPUtUNhA+Zmy+6AESzuA=
......@@ -808,12 +810,14 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
gitlab.33.cn/link33/chain33-sdk-go v0.0.0-20211026072656-659d145568bf h1:bU0i+pvpY43nF8X1e8C0z+Yw0MkEcidSLThBWuqUBAk=
gitlab.33.cn/link33/chain33-sdk-go v0.0.0-20211026072656-659d145568bf/go.mod h1:UCLBolS9ETAR94H+RgdkR9n5XpU7A0zPecmokb7bkfk=
gitlab.33.cn/link33/sidecar v0.0.0-20211026064749-b0d3bccb1dda h1:m0GNYW9YZRB7Bevdtun09D3tMRqzemHQUGc0MyrLXxA=
gitlab.33.cn/link33/sidecar v0.0.0-20211026064749-b0d3bccb1dda/go.mod h1:s/qrfybcmaH6VguLhze6/iyNE7pCJKVKndLaN37vqOs=
gitlab.33.cn/link33/sidecar v0.0.0-20211028072116-253080ef6f2b h1:f1ZLCTzOo0EnMjim8k1Q2mIju117p2hU/E784hlxOcE=
gitlab.33.cn/link33/sidecar v0.0.0-20211028072116-253080ef6f2b/go.mod h1:s/qrfybcmaH6VguLhze6/iyNE7pCJKVKndLaN37vqOs=
gitlab.33.cn/link33/chain33-sdk-go v0.0.0-20211109083921-bd668bac2a45 h1:fZIzcFqIsbgDIQ9TR6QxxtV0e7/z3B6YYvdfIBz8lBg=
gitlab.33.cn/link33/chain33-sdk-go v0.0.0-20211109083921-bd668bac2a45/go.mod h1:UCLBolS9ETAR94H+RgdkR9n5XpU7A0zPecmokb7bkfk=
gitlab.33.cn/link33/sidecar v0.0.0-20211028080238-67f4248825bb h1:L1SK4l+DMV2WhKkifYr3cW9hxHU/bDQ/XAO7SZ1S94U=
gitlab.33.cn/link33/sidecar v0.0.0-20211028080238-67f4248825bb/go.mod h1:s/qrfybcmaH6VguLhze6/iyNE7pCJKVKndLaN37vqOs=
gitlab.33.cn/link33/sidecar v0.0.0-20211104022541-aeda6e51e6aa h1:DXloOgq8p/rrFr9tXZFj/BmgyW5DZ1SKWfskZFF5jOk=
gitlab.33.cn/link33/sidecar v0.0.0-20211104022541-aeda6e51e6aa/go.mod h1:bq/K3Ga8m1sdRJjSbd43P7dhCiwj+eO358vvu55Cpu4=
gitlab.33.cn/link33/sidecar v0.0.0-20211105031147-f9e9df1e4f1f h1:REbyqCuWDxubdcqW41o1gt+6vj7WTnr3rOwSEm0NICw=
gitlab.33.cn/link33/sidecar v0.0.0-20211105031147-f9e9df1e4f1f/go.mod h1:bq/K3Ga8m1sdRJjSbd43P7dhCiwj+eO358vvu55Cpu4=
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment