update

Snowfork · vgeddes · Jun 28, 2021 · May 29, 2021 · Jun 3, 2021 · Jun 4, 2021
commit 0739e8f8eea630949042534891e15b1cffde9dec
diff --git a/parachain/config.json b/parachain/config.json
@@ -44,16 +44,5 @@
         }
 		  ]
 		}
-	],
-	"simpleParachains": [
-    {
-      "bin": "/tmp/polkadot/target/release/adder-collator",
-      "id": 201,
-      "port": 9977,
-      "name": "alice"
-    }
-  ],
-	"hrmpChannels": [],
-	"types": {
-	}
+	]
 }
diff --git a/relayer/chain/ethereum/header_cache_state.go b/relayer/chain/ethereum/header_cache_state.go
@@ -195,7 +195,12 @@ func (s *HeaderCacheState) GetReceiptTrie(ctx context.Context, hash gethCommon.H
 	if err != nil {
 		return nil, err
 	}
-	receiptTrie = MakeTrie(receipts)
+
+	receiptTrie, err = MakeTrie(receipts)
+	if err != nil {
+		return nil, err
+	}
+
 	if receiptTrie.Hash() != block.ReceiptHash() {
 		return nil, fmt.Errorf("Receipt trie does not match block receipt hash")
 	}

diff --git a/relayer/chain/ethereum/message_test.go b/relayer/chain/ethereum/message_test.go
@@ -46,7 +46,11 @@ func TestMessage_Proof(t *testing.T) {
 	}
 
 	// Construct Merkle Patricia Trie for receipts
-	receiptTrie := ethereum.MakeTrie(receipts)
+	receiptTrie, err := ethereum.MakeTrie(receipts)
+	if err != nil {
+		panic(err)
+	}
+
 	fmt.Println("Hash", receiptTrie.Hash())
 
 	if receiptTrie.Hash() != block.ReceiptHash() {

diff --git a/relayer/chain/ethereum/trie.go b/relayer/chain/ethereum/trie.go
@@ -8,18 +8,20 @@ import (
 	"github.com/ethereum/go-ethereum/trie"
 )
 
-func MakeTrie(items types.Receipts) *trie.Trie {
+func MakeTrie(items types.Receipts) (*trie.Trie, error) {
 	keyBuf := new(bytes.Buffer)
-	valueBuf := new(bytes.Buffer)
 	trie := new(trie.Trie)
 
 	for i := 0; i < items.Len(); i++ {
 		keyBuf.Reset()
-		valueBuf.Reset()
-
 		rlp.Encode(keyBuf, uint(i))
-		items.EncodeIndex(i, valueBuf)
-		trie.Update(keyBuf.Bytes(), valueBuf.Bytes())
+
+		value, err := rlp.EncodeToBytes(items[i])
+		if err != nil {
+			return nil, err
+		}
+
+		trie.Update(keyBuf.Bytes(), value)
 	}
-	return trie
+	return trie, nil
 }
diff --git a/relayer/cmd/fetch_messages.go b/relayer/cmd/fetch_messages.go
@@ -112,7 +112,11 @@ func getEthContractEventsAndTrie(
 	if err != nil {
 		return nil, nil, err
 	}
-	trie := ethereum.MakeTrie(receipts)
+
+	trie, err := ethereum.MakeTrie(receipts)
+	if err != nil {
+		return nil, nil, err
+	}
 
 	allEvents := make([]*gethTypes.Log, 0)
 

diff --git a/test/config/launchConfigOverridesDup.json b/test/config/launchConfigOverridesDup.json
@@ -2,30 +2,48 @@
   "parachains": [
     {
       "id": "200",
-      "wsPort": 11144,
-      "port": 31200,
-      "flags": [
-        "--execution=native",
-        "-lruntime=debug,import_header=trace,bridge=trace",
-        "--rpc-cors=all",
-        "--offchain-worker=Always",
-        "--enable-offchain-indexing=true",
-        "--",
-        "--execution=wasm"
+      "nodes": [
+        {
+          "wsPort": 11144,
+          "port": 31200,
+          "name": "alice",
+          "flags": [
+            "-lruntime=debug",
+            "--rpc-port=8081",
+            "--rpc-cors=all",
+            "--ws-external",
+            "--rpc-external",
+            "--rpc-methods=Unsafe",
+            "--offchain-worker=Always",
+            "--enable-offchain-indexing=true",
+            "--execution=native",
+            "--",
+            "--execution=wasm"
+          ]
+        }
       ]
     },
     {
       "id": "201",
-      "wsPort": 11145,
-      "port": 31201,
-      "flags": [
-        "--execution=native",
-        "-lruntime=debug,import_header=trace,bridge=trace",
-        "--rpc-cors=all",
-        "--offchain-worker=Always",
-        "--enable-offchain-indexing=true",
-        "--",
-        "--execution=wasm"
+      "nodes": [
+        {
+          "wsPort": 11155,
+          "port": 31201,
+          "name": "alice",
+          "flags": [
+            "-lruntime=debug",
+            "--rpc-port=8082",
+            "--rpc-cors=all",
+            "--ws-external",
+            "--rpc-external",
+            "--rpc-methods=Unsafe",
+            "--offchain-worker=Always",
+            "--enable-offchain-indexing=true",
+            "--execution=native",
+            "--",
+            "--execution=wasm"
+          ]
+        }
       ]
     }
   ]