Skip to content

Commit d046663

Browse files
wlsaud619wlsaud619
committed
add IRISnet
1 parent 118a686 commit d046663

File tree

7 files changed

+104
-51
lines changed

7 files changed

+104
-51
lines changed

‎cmd/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
)
2323

2424
var (
25-
version string = "v3.0.0"
25+
version string = "v3.0.2"
2626

2727
// versionCmd represents the version command
2828
versionCmd = &cobra.Command{

‎exporter/run.go

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ import (
66
"go.uber.org/zap"
77

88
sdk "github.com/cosmos/cosmos-sdk/types"
9+
iris "github.com/irisnet/irishub/address"
10+
11+
912
terra "github.com/terra-project/core/types"
1013
// kava "github.com/kava-labs/kava/app"
1114
emoney "github.com/e-money/em-ledger/types"
@@ -42,17 +45,20 @@ func setConfig(chain string) {
4245
config := sdk.GetConfig()
4346

4447
switch chain {
45-
case "terra":
46-
config.SetCoinType(terra.CoinType)
47-
config.SetFullFundraiserPath(terra.FullFundraiserPath)
48-
config.SetBech32PrefixForAccount(terra.Bech32PrefixAccAddr, terra.Bech32PrefixAccPub)
49-
config.SetBech32PrefixForValidator(terra.Bech32PrefixValAddr, terra.Bech32PrefixValPub)
50-
config.SetBech32PrefixForConsensusNode(terra.Bech32PrefixConsAddr, terra.Bech32PrefixConsPub)
48+
case "iris":
49+
iris.ConfigureBech32Prefix()
50+
51+
case "terra":
52+
config.SetCoinType(terra.CoinType)
53+
config.SetFullFundraiserPath(terra.FullFundraiserPath)
54+
config.SetBech32PrefixForAccount(terra.Bech32PrefixAccAddr, terra.Bech32PrefixAccPub)
55+
config.SetBech32PrefixForValidator(terra.Bech32PrefixValAddr, terra.Bech32PrefixValPub)
56+
config.SetBech32PrefixForConsensusNode(terra.Bech32PrefixConsAddr, terra.Bech32PrefixConsPub)
5157
// case "kava":
5258
// kava.SetBech32AddressPrefixes(config)
5359
// kava.SetBip44CoinType(config)
54-
case "emoney":
55-
emoney.ConfigureSDK()
60+
case "emoney":
61+
emoney.ConfigureSDK()
5662

5763
}
5864

‎exporter/types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,9 @@ func getDenomList(chain string) []string {
125125
case "cosmos":
126126
// dList = []string{"uatom"}
127127
dList = []string{"uatom"}
128+
case "iris":
129+
dList = []string{"uiris"}
130+
// dList = []string{"ubif"}
128131
case "terra":
129132
dList = []string{"uluna",
130133
"ukrw", "usdr", "uusd", "umnt"}

‎go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ module github.com/node-a-team/Cosmos-IE
33
go 1.15
44

55
require (
6-
github.com/cosmos/cosmos-sdk v0.41.0
6+
github.com/cosmos/cosmos-sdk v0.41.3
77
github.com/e-money/em-ledger v0.9.4
8+
github.com/irisnet/irishub v1.0.1
89
github.com/kava-labs/kava v0.12.2
910
github.com/mitchellh/go-homedir v1.1.0
1011
github.com/prometheus/client_golang v1.8.0
1112
github.com/spf13/cobra v1.1.1
1213
github.com/spf13/viper v1.7.1
13-
github.com/tendermint/tendermint v0.34.3
14+
github.com/tendermint/tendermint v0.34.7
1415
github.com/terra-project/core v0.4.2
1516
go.uber.org/zap v1.13.0
1617
)

‎go.sum

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ github.com/cosmos/cosmos-sdk v0.39.1/go.mod h1:ry2ROl5n+f2/QXpKJo3rdWNJwll00z7Kh
101101
github.com/cosmos/cosmos-sdk v0.39.2/go.mod h1:VNUluciWBFj2vkhpMcp8rYZL/kCw0FtNc7SseUjE1KM=
102102
github.com/cosmos/cosmos-sdk v0.41.0 h1:U614TXkI/+T8HY6V9krC0/mKaDm6qSs9EMFSIKuomCo=
103103
github.com/cosmos/cosmos-sdk v0.41.0/go.mod h1:vlgqdPpUGSxgqSbZea6fjszoLkPKwCuiqSBySLlv4ro=
104+
github.com/cosmos/cosmos-sdk v0.41.3 h1:FQusz1vO0iyri5RBke2aMdx7aqj5Ma2/5c/4W9+u7ko=
105+
github.com/cosmos/cosmos-sdk v0.41.3/go.mod h1:yKN705My5fGGT93DrdoeZ96GPFLCVZrzDBciGf8/Ldo=
104106
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
105107
github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY=
106108
github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw=
@@ -283,6 +285,9 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO
283285
github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg=
284286
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
285287
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
288+
github.com/irisnet/irishub v1.0.1 h1:TgIjA0re1LBv8Uo+PgakG85mjGjBfmVs4JVlHZuqGOg=
289+
github.com/irisnet/irishub v1.0.1/go.mod h1:WKQPK9SwgiLlTQswOdku27r6Lhklcz6UUqH7rLEfdAw=
290+
github.com/irisnet/irismod v1.3.1/go.mod h1:5Ye17WorhxHwrGDZvSkmrfiFq5PXi3roINw1JcB4IB0=
286291
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
287292
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
288293
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
@@ -364,6 +369,7 @@ github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI
364369
github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs=
365370
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
366371
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
372+
github.com/olebedev/config v0.0.0-20190528211619-364964f3a8e4/go.mod h1:RL5+WRxWTAXqqCi9i+eZlHrUtO7AQujUqWi+xMohmc4=
367373
github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
368374
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
369375
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -468,6 +474,7 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD
468474
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
469475
github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
470476
github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10=
477+
github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
471478
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
472479
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
473480
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
@@ -543,15 +550,23 @@ github.com/tendermint/tendermint v0.34.0/go.mod h1:Aj3PIipBFSNO21r+Lq3TtzQ+uKESx
543550
github.com/tendermint/tendermint v0.34.3 h1:9yEsf3WO5VAwPVwrmM+RffDMiijmNfWaBwNttHm0q5w=
544551
github.com/tendermint/tendermint v0.34.3/go.mod h1:h57vnXeOlrdvvNFCqPBSaOrpOivl+2swWEtlUAqStYE=
545552
github.com/tendermint/tendermint v0.34.4 h1:E7qkvFGx27d8ugVLiAY2iWP6DL5cep3l/mpTaWKHyBA=
553+
github.com/tendermint/tendermint v0.34.7 h1:lvBJFNqpDuEzKfLZKtUXOL5dMOpqHonHlO6LCujyl6E=
554+
github.com/tendermint/tendermint v0.34.7/go.mod h1:JVuu3V1ZexOaZG8VJMRl8lnfrGw6hEB2TVnoUwKRbss=
546555
github.com/tendermint/tm-db v0.5.1/go.mod h1:g92zWjHpCYlEvQXvy9M168Su8V1IBEeawpXVVBaK4f4=
547556
github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI=
548557
github.com/tendermint/tm-db v0.6.3 h1:ZkhQcKnB8/2jr5EaZwGndN4owkPsGezW2fSisS9zGbg=
549558
github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8=
559+
github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ=
560+
github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw=
561+
github.com/tendermint/tmlibs v0.9.0/go.mod h1:4L0tAKpLTioy14VnmbXYTLIJN0pCMiehxDMdN6zZfM8=
550562
github.com/terra-project/core v0.4.2 h1:+7NxCtg8WV26ueTxgkP8tQJ070eJpo+dj/wyAknBr+0=
551563
github.com/terra-project/core v0.4.2/go.mod h1:U8uN91QNHhKiCMRZtPpvQ637IJt2udDjhzIO3rUhUqE=
552564
github.com/tidwall/gjson v1.3.2/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
565+
github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
566+
github.com/tidwall/gjson v1.6.1/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
553567
github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
554568
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
569+
github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
555570
github.com/tidwall/sjson v1.0.4/go.mod h1:bURseu1nuBkFpIES5cz6zBtjmYeOQmEESshn7VpF15Y=
556571
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
557572
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
@@ -560,6 +575,9 @@ github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGr
560575
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
561576
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
562577
github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
578+
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
579+
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
580+
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
563581
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
564582
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
565583
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -782,6 +800,8 @@ google.golang.org/genproto v0.0.0-20201111145450-ac7456db90a6/go.mod h1:FWY/as6D
782800
google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
783801
google.golang.org/genproto v0.0.0-20210114201628-6edceaf6022f h1:izedQ6yVIc5mZsRuXzmSreCOlzI0lCU1HpG8yEdMiKw=
784802
google.golang.org/genproto v0.0.0-20210114201628-6edceaf6022f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
803+
google.golang.org/genproto v0.0.0-20210204154452-deb828366460 h1:pvsg2TgyP8bWrYqyL10tbNHu5KypD5DWJPrCjaTkwZA=
804+
google.golang.org/genproto v0.0.0-20210204154452-deb828366460/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
785805
google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o=
786806
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
787807
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=

‎main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
var (
2323
// chainList = []string{"cosmos", "terra", "iris", "kava", "iov", "emoney", "band"}
24-
chainList = []string{"cosmos"}
24+
chainList = []string{"cosmos", "iris"}
2525
)
2626

2727

‎rest/common/inflation.go

Lines changed: 62 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package rest
22

33
import (
4+
// "fmt"
45
"strings"
56
"go.uber.org/zap"
67
"encoding/json"
@@ -13,6 +14,13 @@ type inflation struct {
1314
Result string `json:"result"`
1415
}
1516

17+
type inflation_iris struct {
18+
Params struct {
19+
Mint_Denom string
20+
Inflation string
21+
}
22+
}
23+
1624
type inflation_Emoney struct {
1725
Height string `json:"height"`
1826
Result struct {
@@ -30,47 +38,62 @@ func getInflation(chain string, denom string, log *zap.Logger) float64 {
3038
var result string
3139

3240
switch chain {
33-
case "terra":
34-
break
35-
case "emoney":
36-
var i inflation_Emoney
37-
38-
res, _ := runRESTCommand("/inflation/current")
39-
json.Unmarshal(res, &i)
40-
41-
// log
42-
if strings.Contains(string(res), "not found") {
43-
// handle error
44-
log.Fatal("", zap.Bool("Success", false), zap.String("err", string(res),))
45-
} else {
46-
47-
for _, value := range i.Result.Assets {
48-
if value.Denom == denom {
49-
result = value.Inflation
50-
}
51-
}
52-
53-
log.Info("\t", zap.Bool("Success", true), zap.String("Inflation", result),)
54-
}
55-
56-
default:
57-
var i inflation
58-
59-
// Does not work
60-
// res, _ := runRESTCommand("/cosmos/mint/v1beta1/inflation")
61-
62-
res, _ := runRESTCommand("/minting/inflation")
63-
json.Unmarshal(res, &i)
64-
65-
// log
66-
if strings.Contains(string(res), "not found") {
67-
// handle error
68-
log.Fatal("", zap.Bool("Success", false), zap.String("err", string(res),))
69-
} else {
70-
result = i.Result
71-
log.Info("\t", zap.Bool("Success", true), zap.String("Inflation", result),)
41+
case "iris":
42+
var i inflation_iris
43+
44+
res, _ := runRESTCommand("/irishub/mint/params")
45+
json.Unmarshal(res, &i)
46+
47+
// log
48+
if strings.Contains(string(res), "not found") {
49+
// handle error
50+
log.Fatal("", zap.Bool("Success", false), zap.String("err", string(res),))
51+
} else {
52+
result = i.Params.Inflation
53+
log.Info("\t", zap.Bool("Success", true), zap.String("Inflation", result),)
54+
}
55+
56+
case "terra":
57+
break
58+
case "emoney":
59+
var i inflation_Emoney
60+
61+
res, _ := runRESTCommand("/inflation/current")
62+
json.Unmarshal(res, &i)
63+
64+
// log
65+
if strings.Contains(string(res), "not found") {
66+
// handle error
67+
log.Fatal("", zap.Bool("Success", false), zap.String("err", string(res),))
68+
} else {
69+
70+
for _, value := range i.Result.Assets {
71+
if value.Denom == denom {
72+
result = value.Inflation
73+
}
74+
}
75+
76+
log.Info("\t", zap.Bool("Success", true), zap.String("Inflation", result),)
77+
}
78+
default:
79+
var i inflation
80+
81+
// Does not work
82+
// res, _ := runRESTCommand("/cosmos/mint/v1beta1/inflation")
83+
84+
res, _ := runRESTCommand("/minting/inflation")
85+
json.Unmarshal(res, &i)
86+
87+
// log
88+
if strings.Contains(string(res), "not found") {
89+
// handle error
90+
log.Fatal("", zap.Bool("Success", false), zap.String("err", string(res),))
91+
} else {
92+
result = i.Result
93+
log.Info("\t", zap.Bool("Success", true), zap.String("Inflation", result),)
7294
}
7395
}
7496

7597
return utils.StringToFloat64(result)
7698
}
99+

0 commit comments

Comments
 (0)