From ccd8d868d81f4a628572110ead6acbe4a5164344 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Tue, 19 Oct 2021 07:53:35 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into feature/CORE-180-v2


---
--- a/README.md
+++ b/README.md
@@ -302,8 +302,6 @@
 ```
 // use pallet_contracts::weights::WeightInfo;
 ...
-// use pallet_contracts::chain_extension::UncheckedFrom;
-...
 // pub use pallet_timestamp::Call as TimestampCall;
 ...
 // mod chain_extension;
--- a/docker-compose-tests-parachain.yml
+++ b/docker-compose-tests-parachain.yml
@@ -7,7 +7,7 @@
     ports:
       - 9944:9944
       - 9844:9844
-      - 9933:9933
+      - 9933:9934
     build:
       context: ./
       dockerfile: Dockerfile-parachain
--- a/launch-config.json
+++ b/launch-config.json
@@ -76,7 +76,7 @@
                     "name": "bob",
                     "flags": [
                         "--rpc-cors=all",
-                        "--rpc-port=9934"
+                        "--rpc-port=9934", "--unsafe-rpc-external"
                     ]
                 }
             ]

-- 
gitstuff