Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/irisnet/core-sdk-go into sy…
Browse files Browse the repository at this point in the history
…b/format_page_request
  • Loading branch information
孙 莹波 committed Jul 8, 2022
2 parents 18609ba + 798813c commit b2e8282
Show file tree
Hide file tree
Showing 6 changed files with 638 additions and 99 deletions.
1 change: 1 addition & 0 deletions client/base_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ func (base *baseClient) BuildAndSend(msg []sdktypes.Msg, baseTx sdktypes.BaseTx)
retry.Attempts(tryThreshold),
retry.RetryIf(retryIfFunc),
retry.OnRetry(onRetryFunc),
retry.LastErrorOnly(true),
)

if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion client/grpc_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package client
import (
grpc1 "github.com/gogo/protobuf/grpc"
"github.com/irisnet/core-sdk-go/types"
"github.com/prometheus/common/log"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion client/tx.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ func (base baseClient) broadcastTxSync(tx []byte) (sdk.ResultTx, sdk.Error) {
}

if res.Code != 0 {
return sdk.ResultTx{}, sdk.GetError(sdk.RootCodespace, res.Code, res.Log)
return sdk.ResultTx{}, sdk.GetError(res.Codespace, res.Code, res.Log)
}

return sdk.ResultTx{Hash: res.Hash.String()}, nil
Expand Down
38 changes: 25 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,49 @@ go 1.16

require (
github.com/99designs/keyring v1.1.6
github.com/tharsis/ethermint v0.8.1
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da
github.com/DataDog/zstd v1.4.8 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/armon/go-metrics v0.3.9
github.com/avast/retry-go v3.0.0+incompatible
github.com/bluele/gcache v0.0.2
github.com/btcsuite/btcd v0.21.0-beta
github.com/btcsuite/btcutil v1.0.2
github.com/btcsuite/btcd v0.22.0-beta
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
github.com/cosmos/cosmos-sdk v0.44.3
github.com/cosmos/go-bip39 v1.0.0
github.com/dvsekhvalnov/jose2go v0.0.0-20201001154944-b09cfaf05951
github.com/ethereum/go-ethereum v1.10.16
github.com/gogo/protobuf v1.3.3
github.com/golang/protobuf v1.5.2
github.com/google/btree v1.0.1 // indirect
github.com/gorilla/websocket v1.4.2
github.com/magiconair/properties v1.8.5
github.com/mitchellh/go-homedir v1.1.0
github.com/mtibben/percent v0.2.1
github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
github.com/onsi/ginkgo v1.16.5 // indirect
github.com/onsi/gomega v1.17.0 // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.8.0
github.com/prometheus/common v0.23.0
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/common v0.29.0
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
github.com/regen-network/cosmos-proto v0.3.1
github.com/sirupsen/logrus v1.6.0
github.com/rs/cors v1.8.0 // indirect
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa // indirect
github.com/sirupsen/logrus v1.7.0
github.com/spf13/viper v1.9.0 // indirect
github.com/stretchr/testify v1.7.0
github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15
github.com/tendermint/go-amino v0.16.0
github.com/tendermint/tendermint v0.34.11
github.com/tendermint/tendermint v0.34.14
github.com/tendermint/tm-db v0.6.4
github.com/tjfoc/gmsm v1.4.0
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
google.golang.org/genproto v0.0.0-20210114201628-6edceaf6022f
google.golang.org/grpc v1.37.0
github.com/tklauser/go-sysconf v0.3.7 // indirect
go.etcd.io/bbolt v1.3.6 // indirect
golang.org/x/crypto v0.0.0-20211115234514-b4de73f9ece8
golang.org/x/net v0.0.0-20211111160137-58aab5ef257a // indirect
golang.org/x/sys v0.0.0-20211111213525-f221eed1c01e // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20211116182654-e63d96a377c4
google.golang.org/grpc v1.41.0
google.golang.org/protobuf v1.27.1
gopkg.in/yaml.v2 v2.4.0
)
Expand Down
Loading

0 comments on commit b2e8282

Please sign in to comment.