Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update polkadot dependencies #417

Merged
merged 27 commits into from
Jun 28, 2021
Merged

Update polkadot dependencies #417

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d07086a
Upgrade cumulus
conectado May 29, 2021
57b896d
Remove spurious yarn.lock
conectado Jun 3, 2021
c800e61
Merge branch 'main' into update-cumulus
vgeddes Jun 4, 2021
f14d587
Fix merge conflict in previous commit
vgeddes Jun 4, 2021
b708971
Upgrade to Polkadot v0.9.4
vgeddes Jun 8, 2021
17100ad
update snowbridge-runtime for new dependencies
vgeddes Jun 8, 2021
0e25810
foo
vgeddes Jun 13, 2021
802e628
Fix bug
vgeddes Jun 15, 2021
3590b23
fixbugs
vgeddes Jun 15, 2021
38a9083
fixes
vgeddes Jun 15, 2021
14fd1cc
Make code compile
vgeddes Jun 16, 2021
660959b
Update to latest go-substrate-rpc-client
vgeddes Jun 17, 2021
79bfc6e
Downgrade to go-ethereum v.1.10.3 to prevent clashes with other depen…
vgeddes Jun 17, 2021
1737aef
Fix conflicts due to geth 1.10.3 upgrade
vgeddes Jun 17, 2021
846070d
More upgrade work
vgeddes Jun 22, 2021
4f8ed74
Update receipts trie generation to work with GSRPC 1.10.3
vgeddes Jun 22, 2021
2fbe0e6
upgrade
vgeddes Jun 22, 2021
5c6644b
Merge branch 'main' into update-cumulus
vgeddes Jun 22, 2021
e7eb9ec
fixbugs
vgeddes Jun 22, 2021
0739e8f
update
vgeddes Jun 22, 2021
01ecca8
fixes
vgeddes Jun 22, 2021
8df3ca7
Merge branch 'main' into update-cumulus
musnit Jun 28, 2021
2e1c275
Update READMEs
vgeddes Jun 28, 2021
689b669
Merge branch 'update-cumulus' of https://github.com/Snowfork/polkadot…
vgeddes Jun 28, 2021
b03a190
Fix merge conflicts
vgeddes Jun 28, 2021
c9a18a8
Switch GSRPC branches
vgeddes Jun 28, 2021
022fbfe
Fix docs
vgeddes Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update to latest go-substrate-rpc-client
  • Loading branch information
@vgeddes
vgeddes committed Jun 17, 2021
commit 660959b03e2ff040dfbe3b961ef36e68a58a687c
2 changes: 1 addition & 1 deletion relayer/chain/chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package chain
import (
"context"

"github.com/snowfork/go-substrate-rpc-client/v2/types"
"github.com/snowfork/go-substrate-rpc-client/v3/types"
"golang.org/x/sync/errgroup"

"github.com/snowfork/polkadot-ethereum/relayer/substrate"
Expand Down
2 changes: 1 addition & 1 deletion relayer/chain/ethereum/header.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/snowfork/ethashproof"
"github.com/snowfork/ethashproof/ethash"
types "github.com/snowfork/go-substrate-rpc-client/v2/types"
types "github.com/snowfork/go-substrate-rpc-client/v3/types"
"github.com/snowfork/polkadot-ethereum/relayer/chain"
)

Expand Down
2 changes: 1 addition & 1 deletion relayer/chain/ethereum/header_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
ecommon "github.com/ethereum/go-ethereum/common"
etypes "github.com/ethereum/go-ethereum/core/types"
"github.com/snowfork/ethashproof"
"github.com/snowfork/go-substrate-rpc-client/v2/scale"
"github.com/snowfork/go-substrate-rpc-client/v3/scale"
"github.com/snowfork/polkadot-ethereum/relayer/chain/ethereum"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion relayer/chain/ethereum/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/rlp"
etrie "github.com/ethereum/go-ethereum/trie"
"github.com/sirupsen/logrus"
"github.com/snowfork/go-substrate-rpc-client/v2/types"
"github.com/snowfork/go-substrate-rpc-client/v3/types"
"github.com/snowfork/polkadot-ethereum/relayer/chain"
"github.com/snowfork/polkadot-ethereum/relayer/substrate"
)
Expand Down
6 changes: 3 additions & 3 deletions relayer/chain/parachain/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/sirupsen/logrus"

gsrpc "github.com/snowfork/go-substrate-rpc-client/v2"
"github.com/snowfork/go-substrate-rpc-client/v2/signature"
"github.com/snowfork/go-substrate-rpc-client/v2/types"
gsrpc "github.com/snowfork/go-substrate-rpc-client/v3"
"github.com/snowfork/go-substrate-rpc-client/v3/signature"
"github.com/snowfork/go-substrate-rpc-client/v3/types"
)

type Connection struct {
Expand Down
2 changes: 1 addition & 1 deletion relayer/chain/parachain/mortal_era.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package parachain
import (
"math"

"github.com/snowfork/go-substrate-rpc-client/v2/types"
"github.com/snowfork/go-substrate-rpc-client/v3/types"
)

// Must be a power of two between 4 and 65536 (inclusive)
Expand Down
2 changes: 1 addition & 1 deletion relayer/chain/parachain/outgoing_extrinsics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/sirupsen/logrus"
"github.com/snowfork/go-substrate-rpc-client/v2/types"
"github.com/snowfork/go-substrate-rpc-client/v3/types"
"golang.org/x/sync/errgroup"
)

Expand Down
4 changes: 2 additions & 2 deletions relayer/chain/parachain/storage_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package parachain
import (
"bytes"

"github.com/snowfork/go-substrate-rpc-client/v2/scale"
"github.com/snowfork/go-substrate-rpc-client/v2/types"
"github.com/snowfork/go-substrate-rpc-client/v3/scale"
"github.com/snowfork/go-substrate-rpc-client/v3/types"
chainTypes "github.com/snowfork/polkadot-ethereum/relayer/substrate"
)

Expand Down
4 changes: 2 additions & 2 deletions relayer/chain/relaychain/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/sirupsen/logrus"

gsrpc "github.com/snowfork/go-substrate-rpc-client/v2"
"github.com/snowfork/go-substrate-rpc-client/v2/types"
gsrpc "github.com/snowfork/go-substrate-rpc-client/v3"
"github.com/snowfork/go-substrate-rpc-client/v3/types"
)

type Connection struct {
Expand Down
2 changes: 1 addition & 1 deletion relayer/cmd/fetch_messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
gethTypes "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/rlp"
gethTrie "github.com/ethereum/go-ethereum/trie"
"github.com/snowfork/go-substrate-rpc-client/v2/types"
"github.com/snowfork/go-substrate-rpc-client/v3/types"
"github.com/snowfork/polkadot-ethereum/relayer/chain/ethereum"
"github.com/snowfork/polkadot-ethereum/relayer/contracts/outbound"
"github.com/snowfork/polkadot-ethereum/relayer/core"
Expand Down
2 changes: 1 addition & 1 deletion relayer/cmd/getblock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/spf13/cobra"

gethTypes "github.com/ethereum/go-ethereum/core/types"
"github.com/snowfork/go-substrate-rpc-client/v2/scale"
"github.com/snowfork/go-substrate-rpc-client/v3/scale"
"github.com/snowfork/polkadot-ethereum/relayer/chain/ethereum"
"github.com/snowfork/polkadot-ethereum/relayer/core"
)
Expand Down
2 changes: 1 addition & 1 deletion relayer/cmd/subscribe_beefy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"github.com/snowfork/go-substrate-rpc-client/v2/types"
"github.com/snowfork/go-substrate-rpc-client/v3/types"
"github.com/snowfork/polkadot-ethereum/relayer/chain/parachain"
"github.com/snowfork/polkadot-ethereum/relayer/chain/relaychain"
"github.com/snowfork/polkadot-ethereum/relayer/core"
Expand Down
2 changes: 1 addition & 1 deletion relayer/crypto/sr25519/keyring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package sr25519
// Keypairs for use in tests

import (
"github.com/snowfork/go-substrate-rpc-client/v2/signature"
"github.com/snowfork/go-substrate-rpc-client/v3/signature"
)

func Alice() *Keypair {
Expand Down
4 changes: 2 additions & 2 deletions relayer/crypto/sr25519/sr25519.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"crypto/rand"

"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/snowfork/go-substrate-rpc-client/v2/signature"
"github.com/snowfork/go-substrate-rpc-client/v2/types"
"github.com/snowfork/go-substrate-rpc-client/v3/signature"
"github.com/snowfork/go-substrate-rpc-client/v3/types"
"github.com/snowfork/polkadot-ethereum/relayer/crypto"
)

Expand Down
2 changes: 1 addition & 1 deletion relayer/crypto/sr25519/sr25519_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"reflect"
"testing"

"github.com/snowfork/go-substrate-rpc-client/v2/signature"
"github.com/snowfork/go-substrate-rpc-client/v3/signature"
)

func TestNewKeypairFromSeed(t *testing.T) {
Expand Down
26 changes: 10 additions & 16 deletions relayer/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,40 @@ module github.com/snowfork/polkadot-ethereum/relayer
go 1.14

require (
github.com/ChainSafe/go-schnorrkel v0.0.0-20210527232834-58622d036665 // indirect
github.com/allegro/bigcache v1.2.1 // indirect
github.com/aristanetworks/goarista v0.0.0-20210107181124-fad53805024e // indirect
github.com/btcsuite/btcd v0.21.0-beta // indirect
github.com/cbergoon/merkletree v0.2.0 // indirect
github.com/ethereum/go-ethereum v1.9.25
github.com/ethereum/go-ethereum v1.10.4
github.com/go-ole/go-ole v1.2.5 // indirect
github.com/hashicorp/go-memdb v1.3.2
github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883
github.com/influxdata/influxdb v1.8.3
github.com/jinzhu/gorm v1.9.16
github.com/jinzhu/now v1.1.2 // indirect
github.com/magefile/mage v1.11.0
github.com/magiconair/properties v1.8.4 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-runewidth v0.0.10 // indirect
github.com/mattn/go-sqlite3 v1.14.5
github.com/mgechev/revive v1.0.3 // indirect
github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/olekukonko/tablewriter v0.0.5 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pelletier/go-toml v1.8.1 // indirect
github.com/prometheus/tsdb v0.10.0 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
github.com/rs/cors v1.7.0 // indirect
github.com/shirou/gopsutil v3.20.12+incompatible // indirect
github.com/sirupsen/logrus v1.7.0
github.com/snowfork/ethashproof v0.0.0-20210106050330-7fb8adbe0892
github.com/snowfork/go-substrate-rpc-client/v2 v2.0.2-0.20210428122320-4d6675ae3db9
github.com/snowfork/go-substrate-rpc-client/v3 v3.0.0-20210617125713-6d4919bb7df7
github.com/spf13/afero v1.5.1 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cobra v1.1.1
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/viper v1.7.1
github.com/stretchr/testify v1.7.0
github.com/wealdtech/go-merkletree v1.0.0
golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a
golang.org/x/sys v0.0.0-20210314195730-07df6a141424 // indirect
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
golang.org/x/text v0.3.5 // indirect
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gorm.io/driver/sqlite v1.1.4
gorm.io/gorm v1.21.6
)
Loading