git.delta.rocks / unique-network / refs/commits / ccd8d868d81f

difftreelog

Merge remote-tracking branch 'origin/develop' into feature/CORE-180-v2

Yaroslav Bolyukin2021-10-19parents: #acef225 #b24dbee.patch.diff
in: master

3 files changed

modifiedREADME.mddiffbeforeafterboth
--- 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;
modifieddocker-compose-tests-parachain.ymldiffbeforeafterboth
--- 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
modifiedlaunch-config.jsondiffbeforeafterboth
76                    "name": "bob",76                    "name": "bob",
77                    "flags": [77                    "flags": [
78                        "--rpc-cors=all",78                        "--rpc-cors=all",
79                        "--rpc-port=9934"79                        "--rpc-port=9934", "--unsafe-rpc-external"
80                    ]80                    ]
81                }81                }
82            ]82            ]