Skip to content

Commit

Permalink
Merge branch 'manta' into jamie/remove-hooks
Browse files Browse the repository at this point in the history
Signed-off-by: Dengjianping <djptux@gmail.com>
  • Loading branch information
Dengjianping committed Jun 27, 2022
2 parents ab2fb48 + 9fb4e70 commit edc399f
Show file tree
Hide file tree
Showing 7 changed files with 168 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ These checks should be performed on the codebase prior to freezing our release c
- [ ] Verify [benchmarks](#benchmarks) have been updated for any modified
runtime logic.
- [ ] Check for any upstream storage migrations and perform tests with `try-runtime`, if any.
- [ ] Update hard-coded URLs to polkadot/manta binaries/runtimes in `publish_draft_releases.yml` CI workflow.

The following checks can be performed after we have frozen our release candidate:

Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/assign_new_issue_to_project.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---

name: Auto Assign Issues to Projects

# yamllint disable-line rule:truthy
on:
issues:
types: opened

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

jobs:
assign_to_project:
runs-on: ubuntu-latest
name: Assign topic to Project
steps:
- name: Assign issues with new-topic label to GitHub Project
uses: srggrs/assign-one-project-github-action@1.2.0
with:
project: 'https://github.com/orgs/Manta-Network/projects/8'
column_name: 'No Status'
32 changes: 24 additions & 8 deletions .github/workflows/publish_draft_releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env:
AWS_REGION: us-east-1
AWS_SUBNET_ID: subnet-08c26caf0a52b7c19
AWS_SECURITY_GROUP_ID: sg-0315bffea9042ac9b
AWS_INSTANCE_TYPE: c5a.8xlarge # 32 vcpu, 64gb ram, $1.392 hourly
AWS_INSTANCE_TYPE: c5a.8xlarge
AWS_INSTANCE_ROOT_VOLUME_SIZE: 32
AWS_IMAGE_SEARCH_PATTERN: ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*
AWS_IMAGE_SEARCH_OWNERS: '["099720109477"]' # canonical
Expand Down Expand Up @@ -200,6 +200,9 @@ jobs:
-
name: manta
chain-spec: manta-testnet-ci
-
name: dolphin
chain-spec: dolphin-testnet-ci
steps:
-
if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
Expand Down Expand Up @@ -314,6 +317,11 @@ jobs:
--no-autorestart \
-- \
--address=ws://127.0.0.1:9921
-
if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
name: fetch previous ${{ matrix.runtime.name }}_runtime.compact.compressed.wasm
run: |
wget -cO - https://github.com/Manta-Network/Manta/releases/download/v3.1.5-1/${{ matrix.runtime.name }}-runtime-v3151.compact.compressed.wasm > ${{ github.workspace }}/${{ matrix.runtime.name }}_runtime_previous.compact.compressed.wasm
-
if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
name: fetch new ${{ matrix.runtime.name }}_runtime.compact.compressed.wasm
Expand All @@ -332,15 +340,22 @@ jobs:
curl -vH 'Content-Type: application/json' --data '{ "jsonrpc":"2.0", "method":"author_insertKey", "params":["aura", "civil cigar remain hybrid glove symptom review what pole lock concert lamp", "0xb40aa6bd104d0260b60350c2fb30d4882437466d66135130b667799ea6c9f52b"],"id":1 }' localhost:9973
curl -vH 'Content-Type: application/json' --data '{ "jsonrpc":"2.0", "method":"author_insertKey", "params":["aura", "output evidence anger invest country opinion girl mouse direct double carbon usage", "0x4a3aa51469e802be6504422cd9dd03be638ac3f6dc3a7c0c85a6ace3e72f0048"],"id":1 }' localhost:9974
curl -vH 'Content-Type: application/json' --data '{ "jsonrpc":"2.0", "method":"author_insertKey", "params":["aura", "series disorder today argue interest pond flight guess asthma guilt road gadget", "0xa68feb4fe2ea3f8ff288af4254aad2284e1cd0da67cb9ea61c13632bad57eb40"],"id":1 }' localhost:9975
cp ${{ matrix.runtime.name }}_runtime.compact.compressed.wasm ${{ github.workspace }}/dev-tools/runtime-upgrade-test/calamari.wasm
cp ${{ matrix.runtime.name }}_runtime_previous.compact.compressed.wasm ${{ github.workspace }}/dev-tools/runtime-upgrade-test/calamari.wasm
cd ${{ github.workspace }}/dev-tools/runtime-upgrade-test
yarn install
yarn
sleep 120
pm2 start index.js \
--name test-runtime-upgrade-${{ matrix.runtime.chain-spec }} \
--output ${{ github.workspace }}/test-runtime-upgrade-${{ matrix.runtime.chain-spec }}-stdout.log \
--error ${{ github.workspace }}/test-runtime-upgrade-${{ matrix.runtime.chain-spec }}-stderr.log \
--name test-previous-runtime-upgrade-${{ matrix.runtime.chain-spec }} \
--output ${{ github.workspace }}/test-previous-runtime-upgrade-${{ matrix.runtime.chain-spec }}-stdout.log \
--error ${{ github.workspace }}/test-previous-runtime-upgrade-${{ matrix.runtime.chain-spec }}-stderr.log \
--no-autorestart
sleep 120
cp ${{ github.workspace }}/${{ matrix.runtime.name }}_runtime.compact.compressed.wasm ${{ github.workspace }}/dev-tools/runtime-upgrade-test/calamari.wasm
pm2 start index.js \
--name test-new-runtime-upgrade-${{ matrix.runtime.chain-spec }} \
--output ${{ github.workspace }}/test-new-runtime-upgrade-${{ matrix.runtime.chain-spec }}-stdout.log \
--error ${{ github.workspace }}/test-new-runtime-upgrade-${{ matrix.runtime.chain-spec }}-stderr.log \
--no-autorestart
cd ${{ github.workspace }}
sleep 180
Expand All @@ -364,19 +379,20 @@ jobs:
cd ${{ github.workspace }}/manta-pc-launch
pm2 stop measure-block-time-${{ matrix.runtime.chain-spec }}
pm2 stop manta-pc-launch
pm2 stop test-runtime-upgrade-${{ matrix.runtime.chain-spec }}
pm2 stop test-previous-runtime-upgrade-${{ matrix.runtime.chain-spec }}
pm2 stop test-new-runtime-upgrade-${{ matrix.runtime.chain-spec }}
-
if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
uses: actions/upload-artifact@v2
with:
name: runtime-upgrade-test-for-${{ matrix.runtime.chain-spec }}-stdout.log
path: ${{ github.workspace }}/test-runtime-upgrade-${{ matrix.runtime.chain-spec }}-stdout.log
path: ${{ github.workspace }}/test-new-runtime-upgrade-${{ matrix.runtime.chain-spec }}-stdout.log
-
if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
uses: actions/upload-artifact@v2
with:
name: runtime-upgrade-test-for-${{ matrix.runtime.chain-spec }}-stderr.log
path: ${{ github.workspace }}/test-runtime-upgrade-${{ matrix.runtime.chain-spec }}-stderr.log
path: ${{ github.workspace }}/test-new-runtime-upgrade-${{ matrix.runtime.chain-spec }}-stderr.log
-
if: ${{ needs.check-for-runtime-upgrade.outputs.do-versions-match == 'false' }}
name: parse ${{ matrix.runtime.name }} block times
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# CHANGELOG


## [Unreleased]

### Breaking changes

### Features
Expand All @@ -10,6 +10,7 @@
- [\#449](https://github.com/Manta-Network/Manta/pull/449) Remove strip from CI, and add strip profile to production.
- [\#609](https://github.com/Manta-Network/Manta/pull/609) Update parameter path from `sdk` to `manta-parameters`.
- [\#614](https://github.com/Manta-Network/Manta/pull/614) Remove `OnRuntimeUpgrade` from calamari-runtime.
- [\#619](https://github.com/Manta-Network/Manta/pull/619) Add CI runtime upgrade test for Dolphin and improve test scenario.

### Bug fixes

Expand Down
110 changes: 110 additions & 0 deletions genesis/dolphin-testnet-ci-genesis.json

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions node/src/chain_specs/dolphin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -219,3 +219,11 @@ pub fn dolphin_testnet_config() -> Result<DolphinChainSpec, String> {
spec.extensions_mut().para_id = DOLPHIN_PARACHAIN_ID;
Ok(spec)
}

pub fn dolphin_testnet_ci_config() -> Result<DolphinChainSpec, String> {
let mut spec = DolphinChainSpec::from_json_bytes(
&include_bytes!("../../../genesis/dolphin-testnet-ci-genesis.json")[..],
)?;
spec.extensions_mut().para_id = DOLPHIN_PARACHAIN_ID;
Ok(spec)
}
1 change: 1 addition & 0 deletions node/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, St
"dolphin-dev" => Ok(Box::new(chain_specs::dolphin_development_config())),
"dolphin-local" => Ok(Box::new(chain_specs::dolphin_local_config())),
"dolphin-testnet" => Ok(Box::new(chain_specs::dolphin_testnet_config()?)),
"dolphin-testnet-ci" => Ok(Box::new(chain_specs::dolphin_testnet_ci_config()?)),
path => {
let chain_spec = chain_specs::ChainSpec::from_json_file(path.into())?;
if chain_spec.is_manta() {
Expand Down

0 comments on commit edc399f

Please # to comment.