git.delta.rocks / unique-network / refs/commits / 42b88ddc5c27

difftreelog

ci add required specNamePrefix for moonbeam

Yaroslav Bolyukin2023-02-21parent: #69b4e9b.patch.diff
in: master

8 files changed

modified.docker/Dockerfile-xcm.j2diffbeforeafterboth
--- a/.docker/Dockerfile-xcm.j2
+++ b/.docker/Dockerfile-xcm.j2
@@ -23,7 +23,6 @@
 
 COPY ./xcm-config/launch-config-xcm-{{ NETWORK }}.json ./launch-config-xcm-{{ NETWORK }}.json
 COPY ./xcm-config/5validators.jsonnet ./5validators.jsonnet
-COPY ./xcm-config/minBondFix.jsonnet ./minBondFix.jsonnet
 
 RUN git clone -b {{ BRANCH }} https://github.com/UniqueNetwork/unique-chain.git && \
     cd unique-chain && \
@@ -51,7 +50,6 @@
 
 COPY --from=builder-unique /unique_parachain/launch-config-xcm-{{ NETWORK }}.json /polkadot-launch/
 COPY --from=builder-unique /unique_parachain/5validators.jsonnet /polkadot-launch/5validators.jsonnet
-COPY --from=builder-unique /unique_parachain/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet
 
 COPY --from=builder-unique /unique_parachain/unique-chain/target/release/unique-collator /unique-chain/target/release/
 
modified.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.tempdiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.temp
+++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-quartz-rococo.temp
@@ -63,7 +63,6 @@
 
 COPY --from=builder-unique /unique_parachain/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json /polkadot-launch/launch-config.json
 COPY --from=builder-unique /unique_parachain/.docker/xcm-config/5validators.jsonnet /polkadot-launch/5validators.jsonnet
-COPY --from=builder-unique /unique_parachain/.docker/xcm-config/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet
 
 COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/
 COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
modified.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.tempdiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.temp
+++ b/.docker/additional/xcm-rococo/Dockerfile-xcm-unique-rococo.temp
@@ -63,7 +63,6 @@
 
 COPY --from=builder-unique /unique_parachain/.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json /polkadot-launch/launch-config.json
 COPY --from=builder-unique /unique_parachain/.docker/xcm-config/5validators.jsonnet /polkadot-launch/5validators.jsonnet
-COPY --from=builder-unique /unique_parachain/.docker/xcm-config/minBondFix.jsonnet /polkadot-launch/minBondFix.jsonnet
 
 COPY --from=builder-unique /unique_parachain/target/release/unique-collator /unique-chain/target/release/
 COPY --from=polkadot /unique_parachain/polkadot/target/release/polkadot /polkadot/target/release/
modified.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.jsondiffbeforeafterboth
--- a/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json
+++ b/.docker/additional/xcm-rococo/launch-config-xcm-quartz-rococo.json
@@ -124,11 +124,7 @@
             "id": 2023,
             "balance": "1000000000000000000000",
             "chain": "moonriver-local",
-            "chainInitializer": [
-                "chainql",
-                "--tla-code=spec=import '${spec}'",
-                "minBondFix.jsonnet"
-            ],		    
+            "specNamePrefix": "moonriver-local-",
             "nodes": [
                 {
                     "wsPort": 9947,
modified.docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.jsondiffbeforeafterboth
before · .docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json
1{2    "relaychain": {3        "bin": "/polkadot/target/release/polkadot",4        "chain": "rococo-local",5        "chainInitializer": [6                "chainql",7                "--tla-code=spec=import '${spec}'",8                "5validators.jsonnet"9            ],	10        "nodes": [11            {12                "name": "alice",13                "wsPort": 9844,14                "rpcPort": 9843,15                "port": 30444,16                "flags": [17                    "--unsafe-rpc-external",18                    "--unsafe-ws-external",19                    "-lparachain::candidate_validation=debug"20                ]21            },22            {23                "name": "bob",24                "wsPort": 9855,25                "rpcPort": 9854,26                "port": 30555,27                "flags": [28                    "--unsafe-rpc-external",29                    "--unsafe-ws-external",30                    "-lparachain::candidate_validation=debug"31                ]32            },33            {34                "name": "charlie",35                "wsPort": 9866,36                "rpcPort": 9865,37                "port": 30666,38                "flags": [39                    "--unsafe-rpc-external",40                    "--unsafe-ws-external",41                    "-lparachain::candidate_validation=debug"42                ]43            },44            {45                "name": "dave",46                "wsPort": 9877,47                "rpcPort": 9876,48                "port": 30777,49                "flags": [50                    "--unsafe-rpc-external",51                    "--unsafe-ws-external",52                    "-lparachain::candidate_validation=debug"53                ]54            },55            {56                "name": "eve",57                "wsPort": 9888,58                "rpcPort": 9887,59                "port": 30888,60                "flags": [61                    "--unsafe-rpc-external",62                    "--unsafe-ws-external",63                    "-lparachain::candidate_validation=debug"64                ]65            }6667        ],68        "genesis": {69            "runtime": {70                "runtime_genesis_config": {71                    "parachainsConfiguration": {72                        "config": {73                            "validation_upgrade_frequency": 1,74                            "validation_upgrade_delay": 175                        }76                    }77                }78            }79        }80    },81    "parachains": [82        {83            "bin": "/unique-chain/target/release/unique-collator",84            "id": "2037",85            "balance": "1000000000000000000000000",86            "nodes": [87                {88                    "port": 31200,89                    "wsPort": 9944,90                    "rpcPort": 9933,91                    "name": "alice",92                    "flags": [93                        "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",94                        "--unsafe-rpc-external",95                        "--unsafe-ws-external"96		    ]97                }98            ]99        },100        {101            "bin": "/acala/target/release/acala",102            "id": "2000",103            "chain":  "acala-dev",104            "balance": "1000000000000000000000",105            "chainInitializer": [106                    "chainql",107                    "-e",108                    "(import '${spec}') {id+: '-local'}"109            ],	    110            "nodes": [111                {112                    "wsPort": 9946,113                    "port": 31202,114                    "name": "alice",115                    "flags": [116                        "--unsafe-rpc-external",117                        "--unsafe-ws-external"118		            ]119                }120              ]121        },122        {123            "bin": "/moonbeam/target/release/moonbeam",124            "id": "2004",125            "balance": "1000000000000000000000",126            "chain": "moonbeam-local",127            "nodes": [128                {129                    "wsPort": 9947,130                    "port": 31203,131                    "name": "alice",132                    "flags": [133                        "--unsafe-rpc-external",134                        "--unsafe-ws-external",135  			            "--",136                        "--execution=wasm"137                    ]138                }139            ]140        },141        {142            "bin": "/cumulus/target/release/cumulus",143            "id": "1000",144            "chain": "statemint-local",145            "balance": "1000000000000000000000000",146            "nodes": [147                {148                    "wsPort": 9948,149                    "port": 31204,150                    "name": "alice",151                    "flags": [152                        "--unsafe-rpc-external",153                        "--unsafe-ws-external"154		    ]155                }156            ]157        }158    ],159    "simpleParachains": [],160    "hrmpChannels": [161        {162            "sender": 2037,163            "recipient": 2000,164            "maxCapacity": 8,165            "maxMessageSize": 512166        },167        {168            "sender": 2000,169            "recipient": 2037,170            "maxCapacity": 8,171            "maxMessageSize": 512172        },173        {174            "sender": 2037,175            "recipient": 2004,176            "maxCapacity": 8,177            "maxMessageSize": 512178        },179        {180            "sender": 2004,181            "recipient": 2037,182            "maxCapacity": 8,183            "maxMessageSize": 512184        },185        {186            "sender": 2037,187            "recipient": 1000,188            "maxCapacity": 8,189            "maxMessageSize": 512190        },191        {192            "sender": 1000,193            "recipient": 2037,194            "maxCapacity": 8,195            "maxMessageSize": 512196        }197    ],198    "finalization": false199}200
after · .docker/additional/xcm-rococo/launch-config-xcm-unique-rococo.json
1{2    "relaychain": {3        "bin": "/polkadot/target/release/polkadot",4        "chain": "rococo-local",5        "chainInitializer": [6                "chainql",7                "--tla-code=spec=import '${spec}'",8                "5validators.jsonnet"9            ],	10        "nodes": [11            {12                "name": "alice",13                "wsPort": 9844,14                "rpcPort": 9843,15                "port": 30444,16                "flags": [17                    "--unsafe-rpc-external",18                    "--unsafe-ws-external",19                    "-lparachain::candidate_validation=debug"20                ]21            },22            {23                "name": "bob",24                "wsPort": 9855,25                "rpcPort": 9854,26                "port": 30555,27                "flags": [28                    "--unsafe-rpc-external",29                    "--unsafe-ws-external",30                    "-lparachain::candidate_validation=debug"31                ]32            },33            {34                "name": "charlie",35                "wsPort": 9866,36                "rpcPort": 9865,37                "port": 30666,38                "flags": [39                    "--unsafe-rpc-external",40                    "--unsafe-ws-external",41                    "-lparachain::candidate_validation=debug"42                ]43            },44            {45                "name": "dave",46                "wsPort": 9877,47                "rpcPort": 9876,48                "port": 30777,49                "flags": [50                    "--unsafe-rpc-external",51                    "--unsafe-ws-external",52                    "-lparachain::candidate_validation=debug"53                ]54            },55            {56                "name": "eve",57                "wsPort": 9888,58                "rpcPort": 9887,59                "port": 30888,60                "flags": [61                    "--unsafe-rpc-external",62                    "--unsafe-ws-external",63                    "-lparachain::candidate_validation=debug"64                ]65            }6667        ],68        "genesis": {69            "runtime": {70                "runtime_genesis_config": {71                    "parachainsConfiguration": {72                        "config": {73                            "validation_upgrade_frequency": 1,74                            "validation_upgrade_delay": 175                        }76                    }77                }78            }79        }80    },81    "parachains": [82        {83            "bin": "/unique-chain/target/release/unique-collator",84            "id": "2037",85            "balance": "1000000000000000000000000",86            "nodes": [87                {88                    "port": 31200,89                    "wsPort": 9944,90                    "rpcPort": 9933,91                    "name": "alice",92                    "flags": [93                        "-lxcm=trace,parity_ws::handler=debug,jsonrpsee_core=trace,jsonrpsee-core=trace,jsonrpsee_ws_server=debug",94                        "--unsafe-rpc-external",95                        "--unsafe-ws-external"96		    ]97                }98            ]99        },100        {101            "bin": "/acala/target/release/acala",102            "id": "2000",103            "chain":  "acala-dev",104            "balance": "1000000000000000000000",105            "chainInitializer": [106                    "chainql",107                    "-e",108                    "(import '${spec}') {id+: '-local'}"109            ],	    110            "nodes": [111                {112                    "wsPort": 9946,113                    "port": 31202,114                    "name": "alice",115                    "flags": [116                        "--unsafe-rpc-external",117                        "--unsafe-ws-external"118		            ]119                }120              ]121        },122        {123            "bin": "/moonbeam/target/release/moonbeam",124            "id": "2004",125            "balance": "1000000000000000000000",126            "chain": "moonbeam-local",127            "specNamePrefix": "moonbeam-local-",128            "nodes": [129                {130                    "wsPort": 9947,131                    "port": 31203,132                    "name": "alice",133                    "flags": [134                        "--unsafe-rpc-external",135                        "--unsafe-ws-external",136  			            "--",137                        "--execution=wasm"138                    ]139                }140            ]141        },142        {143            "bin": "/cumulus/target/release/cumulus",144            "id": "1000",145            "chain": "statemint-local",146            "balance": "1000000000000000000000000",147            "nodes": [148                {149                    "wsPort": 9948,150                    "port": 31204,151                    "name": "alice",152                    "flags": [153                        "--unsafe-rpc-external",154                        "--unsafe-ws-external"155		    ]156                }157            ]158        }159    ],160    "simpleParachains": [],161    "hrmpChannels": [162        {163            "sender": 2037,164            "recipient": 2000,165            "maxCapacity": 8,166            "maxMessageSize": 512167        },168        {169            "sender": 2000,170            "recipient": 2037,171            "maxCapacity": 8,172            "maxMessageSize": 512173        },174        {175            "sender": 2037,176            "recipient": 2004,177            "maxCapacity": 8,178            "maxMessageSize": 512179        },180        {181            "sender": 2004,182            "recipient": 2037,183            "maxCapacity": 8,184            "maxMessageSize": 512185        },186        {187            "sender": 2037,188            "recipient": 1000,189            "maxCapacity": 8,190            "maxMessageSize": 512191        },192        {193            "sender": 1000,194            "recipient": 2037,195            "maxCapacity": 8,196            "maxMessageSize": 512197        }198    ],199    "finalization": false200}201
modified.docker/xcm-config/launch-config-xcm-quartz.j2diffbeforeafterboth
--- a/.docker/xcm-config/launch-config-xcm-quartz.j2
+++ b/.docker/xcm-config/launch-config-xcm-quartz.j2
@@ -124,11 +124,7 @@
             "id": 2023,
             "balance": "1000000000000000000000",
             "chain": "moonriver-local",
-            "chainInitializer": [
-                "chainql",
-                "--tla-code=spec=import '${spec}'",
-                "minBondFix.jsonnet"
-            ],		    
+            "specNamePrefix": "moonriver-local-",
             "nodes": [
                 {
                     "wsPort": 9947,
modified.docker/xcm-config/launch-config-xcm-unique.j2diffbeforeafterboth
--- a/.docker/xcm-config/launch-config-xcm-unique.j2
+++ b/.docker/xcm-config/launch-config-xcm-unique.j2
@@ -124,6 +124,7 @@
             "id": "2004",
             "balance": "1000000000000000000000",
             "chain": "moonbeam-local",
+            "specNamePrefix": "moonbeam-local-",
             "nodes": [
                 {
                     "wsPort": 9947,
deleted.docker/xcm-config/minBondFix.jsonnetdiffbeforeafterboth
--- a/.docker/xcm-config/minBondFix.jsonnet
+++ /dev/null
@@ -1,10 +0,0 @@
-function(spec)
-spec {
-	genesis+: {
-		runtime+: {
-			parachainStaking+: {
-				candidates: std.map(function(candidate) [candidate[0], candidate[1] * 1000], super.candidates)
-			},
-		},
-	},
-}