Fix conflicts due to geth 1.10.3 upgrade

Snowfork · vgeddes · Jun 28, 2021 · May 29, 2021 · Jun 3, 2021 · Jun 4, 2021
commit 1737aefb9c1da909cafe936536426c2cf07a86ec
diff --git a/relayer/chain/ethereum/header_cache_state.go b/relayer/chain/ethereum/header_cache_state.go
@@ -257,14 +257,15 @@ func (s *HeaderCacheState) GetEthashproofCache(number uint64) (*ethashproof.Data
 	return cacheState.currentCache, nil
 }
 
-func (s *HeaderCacheState) makeTrie(items gethTypes.DerivableList) *gethTrie.Trie {
-	keybuf := new(bytes.Buffer)
+func (s *HeaderCacheState) makeTrie(items gethTypes.Receipts) *gethTrie.Trie {
+	keyBuf := new(bytes.Buffer)
+	valueBuf := new(bytes.Buffer)
 	trie := new(gethTrie.Trie)
-	for i := 0; i < items.Len(); i++ {
-		keybuf.Reset()
-		rlp.Encode(keybuf, uint(i))
-		trie.Update(keybuf.Bytes(), items.GetRlp(i))
-
+	for i, item := range items {
+		keyBuf.Reset()
+		rlp.Encode(keyBuf, uint(i))
+		item.EncodeRLP(valueBuf)
+		trie.Update(keyBuf.Bytes(), valueBuf.Bytes())
 	}
 	return trie
 }

diff --git a/relayer/cmd/fetch_messages.go b/relayer/cmd/fetch_messages.go
@@ -242,13 +242,15 @@ func printEthContractEventForSub(mapping map[common.Address]string, event *gethT
 	return nil
 }
 
-func makeTrie(items gethTypes.DerivableList) *gethTrie.Trie {
-	keybuf := new(bytes.Buffer)
+func makeTrie(items gethTypes.Receipts) *gethTrie.Trie {
+	keyBuf := new(bytes.Buffer)
+	valueBuf := new(bytes.Buffer)
 	trie := new(gethTrie.Trie)
-	for i := 0; i < items.Len(); i++ {
-		keybuf.Reset()
-		rlp.Encode(keybuf, uint(i))
-		trie.Update(keybuf.Bytes(), items.GetRlp(i))
+	for i, item := range items {
+		keyBuf.Reset()
+		rlp.Encode(keyBuf, uint(i))
+		item.EncodeRLP(valueBuf)
+		trie.Update(keyBuf.Bytes(), valueBuf.Bytes())
 	}
 	return trie
 }
diff --git a/relayer/crypto/sr25519/sr25519.go b/relayer/crypto/sr25519/sr25519.go
@@ -18,7 +18,7 @@ type Keypair struct {
 	keyringPair *signature.KeyringPair
 }
 
-func GenerateKeypair(network string) (*Keypair, error) {
+func GenerateKeypair(network uint8) (*Keypair, error) {
 	data := make([]byte, 32)
 	_, err := rand.Read(data)
 	if err != nil {
@@ -27,7 +27,7 @@ func GenerateKeypair(network string) (*Keypair, error) {
 	return NewKeypairFromSeed("//"+hexutil.Encode(data), network)
 }
 
-func NewKeypairFromSeed(seed, network string) (*Keypair, error) {
+func NewKeypairFromSeed(seed string, network uint8) (*Keypair, error) {
 	kp, err := signature.KeyringPairFromSecret(seed, network)
 	return &Keypair{&kp}, err
 }

diff --git a/relayer/crypto/sr25519/sr25519_test.go b/relayer/crypto/sr25519/sr25519_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestNewKeypairFromSeed(t *testing.T) {
-	kp, err := NewKeypairFromSeed("//Alice", "substrate")
+	kp, err := NewKeypairFromSeed("//Alice", 42)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -22,7 +22,7 @@ func TestNewKeypairFromSeed(t *testing.T) {
 }
 
 func TestKeypair_AsKeyringPair(t *testing.T) {
-	kp, err := NewKeypairFromSeed("//Alice", "substrate")
+	kp, err := NewKeypairFromSeed("//Alice", 42)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -38,7 +38,7 @@ func TestKeypair_AsKeyringPair(t *testing.T) {
 }
 
 func TestEncodeAndDecodeKeypair(t *testing.T) {
-	kp, err := NewKeypairFromSeed("//Alice", "substrate")
+	kp, err := NewKeypairFromSeed("//Alice", 42)
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/relayer/workers/ethrelayer/main.go b/relayer/workers/ethrelayer/main.go
@@ -101,7 +101,7 @@ func (w *Worker) queryFinalizedBlockNumber() (uint64, error) {
 }
 
 func (w *Worker) connect(ctx context.Context) error {
-	kpForPara, err := sr25519.NewKeypairFromSeed(w.paraconfig.PrivateKey, "")
+	kpForPara, err := sr25519.NewKeypairFromSeed(w.paraconfig.PrivateKey, 42)
 	if err != nil {
 		return err
 	}