Skip to content

Commit

Permalink
`Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
wlsaud619 committed Aug 23, 2020
2 parents c0f4646 + ca3750b commit 4ba0bfb
Show file tree
Hide file tree
Showing 65 changed files with 36,931 additions and 1,707 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
[submodule "scripts/genesis/data/galaxynet/config"]
path = scripts/genesis/data/galaxynet/config
url = https://gist.github.com/davepuchyr/e1482e63cb81443cde1616f353c4779f.git
[submodule "scripts/genesis/data/iov-mainnet-2/config"]
path = scripts/genesis/data/iov-mainnet-2/config
url = https://gist.github.com/davepuchyr/4fe7e002061c537ddb116fee7a2f8e47.git
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ script:
- export CHAIN_ID=$(jq -r .chain_id genesis.json)
- iovnsd init ${CHAIN_ID} --chain-id ${CHAIN_ID} > /dev/null 2> /dev/null
- sed --in-place 's/timeout_commit = "5s"/timeout_commit = "1s"/' ~/.iovnsd/config/config.toml
- mv genesis.json ~/.iovnsd/config
- jq '.genesis_time = "2020-04-15T10:00:00Z"' genesis.json > ~/.iovnsd/config/genesis.json
- iovnscli config chain-id ${CHAIN_ID}
- iovnscli config trust-node true
- iovnscli config keyring-backend test
Expand All @@ -101,6 +101,9 @@ script:
- iovnsd start --minimum-gas-prices='10.0uvoi' > /dev/null &
- iovnscli rest-server --trust-node true --chain-id ${CHAIN_ID} --node http://localhost:26657 > /dev/null &
- ( cd scripts/integration && yarn install && yarn test && killall iovnscli && killall iovnsd )
- git submodule foreach git checkout master
- ( cd scripts/genesis && yarn install && yarn test && node -r esm genesis.js galaxynet && mv data/galaxynet/config/genesis.json ~/.iovnsd/config && iovnsd validate-genesis )
- ( cd scripts/genesis && yarn install && yarn test && node -r esm genesis.js iov-mainnet-2 && mv data/iov-mainnet-2/config/genesis.json ~/.iovnsd/config && iovnsd validate-genesis )

notifications:
email: false
Expand Down
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Changelog

## HEAD
## 0.9.1
- upgrade to cosmos sdk 0.39.1
- fix empty account renewal
- use external crud package
- make controllers API nicer
- enhance executors tests
- allow open domain transfers
- fix filtering when primary key is present
- fix finding the smallest set in the filters
Expand Down
2 changes: 2 additions & 0 deletions build-version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BUILD_TAG="v0.9.1"
BUILD_COMMIT="bf93dfbf241f5d7de7eebce77859ce564a694ee7"
8 changes: 3 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ module github.com/iov-one/iovns
go 1.14

require (
github.com/cosmos/cosmos-sdk v0.39.1-rc1
github.com/cosmos/cosmos-sdk v0.39.1
github.com/fatih/structs v1.1.0
github.com/golang/mock v1.3.1 // indirect
github.com/gorilla/mux v1.7.4
github.com/gorilla/websocket v1.4.2
github.com/iov-one/cosmos-sdk-crud v0.0.0-20200804183153-2b7470a92e52
github.com/jinzhu/gorm v1.9.14
github.com/lib/pq v1.1.1
github.com/onsi/ginkgo v1.8.0 // indirect
Expand All @@ -21,9 +22,6 @@ require (
github.com/spf13/viper v1.6.3
github.com/stretchr/testify v1.6.1
github.com/tendermint/go-amino v0.15.1
github.com/tendermint/tendermint v0.33.6
github.com/tendermint/tendermint v0.33.7
github.com/tendermint/tm-db v0.5.1
)

// patch bech32 decoding, TODO this should not be the fix for the multisig isue
replace github.com/btcsuite/btcutil => github.com/kava-labs/btcutil v0.0.0-20200522184203-886d33430f06
13 changes: 11 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BR
github.com/btcsuite/btcd v0.20.1-beta h1:Ik4hyJqN8Jfyv3S4AGBOmyouMsYE3EdYODkMbQjwPGw=
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
github.com/btcsuite/btcutil v1.0.2 h1:9iZ1Terx9fMIOtq1VrwdqfsATL9MC2l8ZrUY6YZ2uts=
github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts=
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
Expand Down Expand Up @@ -75,6 +79,8 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/cosmos/cosmos-sdk v0.39.1-rc1 h1:Xo+fkvs/4PEDOR1vb5XPbit5ZnP7OnqWYTNqtZ0lKPU=
github.com/cosmos/cosmos-sdk v0.39.1-rc1/go.mod h1:soj4C8lIjJLeUQPBqrM+krbXdnF4cDKaaDgg1JIJYRU=
github.com/cosmos/cosmos-sdk v0.39.1 h1:vhjf9PZh9ph8btAj9aBpHoVITgVVjNBpM3x5Gl/Vwac=
github.com/cosmos/cosmos-sdk v0.39.1/go.mod h1:ry2ROl5n+f2/QXpKJo3rdWNJwll00z7KhIVcxNcl16M=
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d h1:49RLWk1j44Xu4fjHb6JFYmeUnDORVwHNkDxaQ0ctCVU=
github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y=
github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4=
Expand Down Expand Up @@ -239,6 +245,8 @@ github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NH
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d h1:/WZQPMZNsjZ7IlCpsLGdQBINg5bxKQ1K1sh6awxLtkA=
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
github.com/iov-one/cosmos-sdk-crud v0.0.0-20200804183153-2b7470a92e52 h1:fCi/QCX1F8J61LrRsSmWBXpTVIdDFAi3Enf+6FQkd7g=
github.com/iov-one/cosmos-sdk-crud v0.0.0-20200804183153-2b7470a92e52/go.mod h1:wfvPz9CNFOERo+9wnq2jUeDKH6NHSrFtJcNA2oB6UdQ=
github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
github.com/jinzhu/gorm v1.9.14 h1:Kg3ShyTPcM6nzVo148fRrcMO6MNKuqtOUwnzqMgVniM=
github.com/jinzhu/gorm v1.9.14/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs=
Expand All @@ -257,8 +265,6 @@ github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/kava-labs/btcutil v0.0.0-20200522184203-886d33430f06 h1:DphTLE0D9kzg1/lSF6VmVTxJrt04IoQq+VuYu1hRFF8=
github.com/kava-labs/btcutil v0.0.0-20200522184203-886d33430f06/go.mod h1:KX8QzQOxPvCErZUQgLdekcoihlDRaU+7teAvwkuPnE8=
github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d h1:Z+RDyXzjKE0i2sTjZ/b1uxiGtPhFy34Ou/Tk0qwN0kM=
github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
Expand Down Expand Up @@ -464,6 +470,8 @@ github.com/tendermint/iavl v0.14.0/go.mod h1:QmfViflFiXzxKLQE4tAUuWQHq+RSuQFxabl
github.com/tendermint/tendermint v0.33.5/go.mod h1:0yUs9eIuuDq07nQql9BmI30FtYGcEC60Tu5JzB5IezM=
github.com/tendermint/tendermint v0.33.6 h1:W4UOsXY4ROJZ3TLLGVVv71VXD4WK2gJRb3gzeced+mg=
github.com/tendermint/tendermint v0.33.6/go.mod h1:0yUs9eIuuDq07nQql9BmI30FtYGcEC60Tu5JzB5IezM=
github.com/tendermint/tendermint v0.33.7 h1:b5CQD8ggDtl4u0EbXzabi0MaOw9NrcXker6ijEkAE74=
github.com/tendermint/tendermint v0.33.7/go.mod h1:0yUs9eIuuDq07nQql9BmI30FtYGcEC60Tu5JzB5IezM=
github.com/tendermint/tm-db v0.5.1 h1:H9HDq8UEA7Eeg13kdYckkgwwkQLBnJGgX4PgLJRhieY=
github.com/tendermint/tm-db v0.5.1/go.mod h1:g92zWjHpCYlEvQXvy9M168Su8V1IBEeawpXVVBaK4f4=
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
Expand Down Expand Up @@ -502,6 +510,7 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 h1:ULYEB3JvPRE/IfO+9uO7vKV/xzVTO7XPAwm8xbf4w2g=
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200406173513-056763e48d71 h1:DOmugCavvUtnUD114C1Wh+UgTgQZ4pMLzXxi1pSt+/Y=
golang.org/x/crypto v0.0.0-20200406173513-056763e48d71/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88=
Expand Down
42 changes: 42 additions & 0 deletions mock/configuration.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package mock

import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/iov-one/iovns/x/configuration"
"time"
)

type Configuration struct {
fees *configuration.Fees
conf *configuration.Config
}

func NewConfiguration(fees *configuration.Fees, conf *configuration.Config) Configuration {
return Configuration{
fees: fees,
conf: conf,
}
}
func (c Configuration) GetFees(_ sdk.Context) *configuration.Fees {
return c.fees
}

func (c Configuration) GetConfiguration(_ sdk.Context) configuration.Config {
return *c.conf
}

func (c Configuration) IsOwner(_ sdk.Context, addr sdk.AccAddress) bool {
return c.conf.Configurer.Equals(addr)
}

func (c Configuration) GetValidDomainNameRegexp(_ sdk.Context) string {
return c.conf.ValidDomainName
}

func (c Configuration) GetDomainRenewDuration(_ sdk.Context) time.Duration {
return c.conf.DomainRenewalPeriod
}

func (c Configuration) GetDomainGracePeriod(c_ sdk.Context) time.Duration {
return c.conf.DomainGracePeriod
}
14 changes: 0 additions & 14 deletions pkg/crud/aliasing.go

This file was deleted.

71 changes: 0 additions & 71 deletions pkg/crud/internal/filter/filter.go

This file was deleted.

119 changes: 0 additions & 119 deletions pkg/crud/internal/store/index.go

This file was deleted.

Loading

0 comments on commit 4ba0bfb

Please sign in to comment.