Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

polymesh_schema: add Scheduled" variant to ProposalState` #618

Merged
merged 4 commits into from Sep 20, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 18, 2020

No description provided.

@adamdossa adamdossa added the merge-after-ci PR can be merged after CI has completed label Sep 20, 2020
@poly-auto-merge poly-auto-merge bot merged commit 8ccfcaf into develop Sep 20, 2020
@Centril Centril deleted the pips-fix-schema branch September 21, 2020 10:03
adamdossa added a commit that referenced this pull request Sep 23, 2020
* MESH-1244: add `#[migrate_from($ty_old)]` form to `#[derive(Migrate)]`. (#592)

* mesh-1244: add `#[migrate_from($ty_old)]` form to `#[derive(Migrate)]`.

* mesh-1244: simplify `extract_migrate_refs` using `get_ident`.

Co-authored-by: poly-auto-merge[bot] <65769705+poly-auto-merge[bot]@users.noreply.github.com>

* DEVOPS-220/alcyone-pipelines (#582)

* Add `alcyone` pipelines.
* Make the `alcyone` pipelines bump versions
* Make `tooling` pipelines not bump versions
* Change PR artifact labeling to distinguish between `develop` and
  `tooling` artifacts

Co-authored-by: Adam Dossa <adam.dossa@gmail.com>
Co-authored-by: poly-auto-merge[bot] <65769705+poly-auto-merge[bot]@users.noreply.github.com>

* MESH-1166/Scope of Claim refactor (#560)

* first go

* Update base.rs

* fix non-settlement tests

* first go at upgrade

* fix bad submodule

* formatting

* fix bad merge

* formatting

* submodule bump

* Update primitives/src/identity_claim.rs

Co-authored-by: Mazdak Farrokhzad <twingoow@gmail.com>

* upgrade compliance manager storage

* update schema

* wip

* wip

Co-authored-by: Mazdak Farrokhzad <twingoow@gmail.com>
Co-authored-by: Adam Dossa <adam.dossa@gmail.com>

* DEVOPS-174/purge-cache (#595)

* DEVOPS-174/purge-cache

* Add cargo-sweep to cached rust tasks

* DEVOPS-174/purge-cache

* Fix `cargo test` / `cargo sweep`

* DEVOPS-174/purge-cache

* DEVOPS-227 / reduce `npm test` noise

* DEVOPS-174/purge-cache

DEVOPS-228: improve timeout conditions

* Move the `npm test` timeout inside the script and use coreutils
  timeout instead
* Remove archived `master` pipelines

* DEVOPS-174/purge-cache

* More aggressive cache purging
* Fix `npm test` redirect bug

* DEVOPS-174/purge-cache

* Remove timeout from alcyone pipelines
* Set tooling pipelines to not `put` semver updates

* DEVOPS-174/purge-cache

* Reset cargo cache when it reaches 10GB

* DEVOPS-174/purge-cache

* Handle undeletable `target/` directory (because it's a volume mount)

Co-authored-by: Adam Dossa <adam.dossa@gmail.com>

* MESH-1074/Enforce scope claim to assets transfer (#583)

* enforce scope claim to assets

* Centril: feedback addressed

* fix linting

* fix: avoid returning default as true for sender

* add implicit requirements within the granular_verification

* update schema

* add additional test

* use doc comments

* simplify rpc

* remove debug from wasm

* code rearrangement

* minor improvement

* lint fix

Co-authored-by: satyam <satyam@secureblocks.io>
Co-authored-by: Adam Dossa <adam.dossa@gmail.com>

* removed staking fuzzer from workplace (#597)

Co-authored-by: poly-auto-merge[bot] <65769705+poly-auto-merge[bot]@users.noreply.github.com>

* mesh-1243: add migrate_double_map_keys (#604)

* DEVOPS-232/move-polymesh-pipelines (#602)

* DEVOPS-232/move-polymesh-pipelines

* Remove deprecated Concourse files

* trigger

* DEVOPS-232/move-polymesh-pipelines

* Missing && in cli test

* trigger

* trigger

* DEVOPS-232/move-polymesh-pipelines

Undo 0c69bbd

* DEVOPS-232/move-polymesh-pipelines

Update CODEOWNERS file

Co-authored-by: Adam Dossa <adam.dossa@gmail.com>

* MESH-1257: Runtime upgrade functionality for CDD_ID. (#600)

* mesh-1257: Runtime upgrade functionality for CDD_ID.

This amends `Migrate` with `type Context`.
To `derive(Migrate)` we add `migrate_context`, `migrate_with`,
and `migrate_from` on enum variants.

* mesh-1257: more migrate_context docs

Co-authored-by: poly-auto-merge[bot] <65769705+poly-auto-merge[bot]@users.noreply.github.com>

* Update README (#605)

* MESH-1262: Infer `Proposer<_>` from `origin` on `Pips::propose`. (#606)

* mesh-1262: infer proposer from origin on `Pips::propose`.

* mesh-1262: fix governance js test

* Portfolio, Custodianship, and Settlement changes (#518)

* Portfolio custodian

* accept portfolio custody

* tests fixed

* removed dispatchables for old custody approach

* wip

* merge fixes

* verify_portfolio

* wip

* added portoflio transfer fn

* lock unlock tokens

* build fix

* wip

* custodian check

* wip

* portfolio subtrait

* wip

* wip

* rpc fixed

* submodule update

* schema update

* wip

* cli fix

* use PortfolioId in PortfolioCustody auth

* minor refactoring

* parameter reordering

* submodule update

* api for moving portfolio funds updated

* Documentation wip

* fixed tests

* Added token lock and custody tests

* some code comments

* wip

* wip

* refactored tests

* settlement tests

* import fix

* Added settlement tests

* removed mut

* copy schema script

* fixed tests

* updated submodule

* Removed internal transfer function

* cleaned up comments

* review suggestions

Co-authored-by: Satyam Agrawal <satyam0499@gmail.com>

* Bump substrate rc4 => rc5+2 => rc6 (#587)

* substrate: rc4 -> rc5+2 in deps

* substrate upgrade -> rc5: fix fallout

* substrate: rc5+2 -> rc6 in deps

* substrate upgrade -> rc6: fix fallout

* substrate upgrade: bump another crate to rc6

* substrate -> rc6: cleanup

* substrate -> rc6: add ValidateUnsigned to Babe

* substrate -> rc6: cargo update

* substrate -> rc6: fix rebase fallout

* Removed submodules (#609)

* settlement module moved to main repo

* Import cryptography library from GH via cargo dependency

* Updated CircleCI to not use submodules

* Updated test scirpts to use dummy wasm

* updated cryptography branch

* removed gitignore from settlement folder

* trigger

* run it again

Co-authored-by: Claus Strommer <claus@polymath.network>

* Updated cryptography branch (#612)

* Update max inflation from 20% to 14% (#611)

* change payout_stakers dispatch weight to the 1/4 of the actual weight (#614)

Co-authored-by: satyam <satyam@secureblocks.io>

* Update REWARD_CURVE for testnet (#617)

* mesh-1141: add 'PipsMetadata::transaction_version' (#610)

Co-authored-by: CJP10 <14205938+CJP10@users.noreply.github.com>
Co-authored-by: poly-auto-merge[bot] <65769705+poly-auto-merge[bot]@users.noreply.github.com>

* MESH-820/Validate format and schema for different asset identifiers (#586)

* settlement module moved to main repo

* Import cryptography library from GH via cargo dependency

* Updated CircleCI to not use submodules

* Updated test scirpts to use dummy wasm

* updated cryptography branch

* removed gitignore from settlement folder

* WIP

* WIP

* WIP

* WIP

* wip

* wip

* wip

* hook up to asset module

* use no-std

* runtime upgrade

* formatting

* formatting

* imports

* schema

* WIP

* validate func

* docs

* validate

* move to primitives

* Update primitives/src/identifier.rs

Co-authored-by: Mazdak Farrokhzad <twingoow@gmail.com>

* Update polymesh_schema.json

Co-authored-by: Mazdak Farrokhzad <twingoow@gmail.com>

* cleanup

* fixed rebase

Co-authored-by: Mudit Gupta <guptamudit@ymail.com>
Co-authored-by: Mazdak Farrokhzad <twingoow@gmail.com>

* polymesh_schema: add `Scheduled" variant to `ProposalState` (#618)

* polymesh_schema: add `Scheduled" variant to `ProposalState`

* polymesh_schema: fix `ProposalState` variants order

Co-authored-by: Adam Dossa <adam.dossa@gmail.com>

* Schema: fix `Vote`'s definition due to changes (#622)

* Mesh 1106/reserve currency ticker symbols on genesis (#598)

* added country currencies json file

* working on reserving currency tickers

* made change to chain spec and asset module

* added currency symbols to chain_spec and made minor changes

* made changes to chain_spec and asset module

* added FiatTickerReservation Systematic User

* fixed linting issue

* created function for currency symbol conversion in chain_spec and made minor changes

* minor change

* fixed linting issue

* minor change

* moved FiatCurrency Struct to chain_spec and optimized currency_codes function

* minor changes and linting

* aded POLY and POLYX to currency_symbols file

* Empty commit to trigger build

* rerun CI

* minor changes

* minor change

Co-authored-by: Claus Strommer <claus@polymath.network>
Co-authored-by: poly-auto-merge[bot] <65769705+poly-auto-merge[bot]@users.noreply.github.com>

* AssetIdentifier::isin: remove allocation (#621)

Co-authored-by: Adam Dossa <adam.dossa@gmail.com>

* Revert: MESH-1235/remove batch functions (#578)

* Revert: MESH-1074/Enforce scope claim to assets transfer (#583)

* Revert "Merge branch 'tooling' into develop_for_tooling"

This reverts commit 3c35c4e, reversing
changes made to 39da6e2.

* Bump Version

Co-authored-by: Mazdak Farrokhzad <twingoow@gmail.com>
Co-authored-by: poly-auto-merge[bot] <65769705+poly-auto-merge[bot]@users.noreply.github.com>
Co-authored-by: Claus Strommer <63645659+cwsatpolymath@users.noreply.github.com>
Co-authored-by: CJP10 <14205938+CJP10@users.noreply.github.com>
Co-authored-by: Satyam Agrawal <satyam0499@gmail.com>
Co-authored-by: satyam <satyam@secureblocks.io>
Co-authored-by: Mudit Gupta <guptamudit@ymail.com>
Co-authored-by: Claus Strommer <claus@polymath.network>
Co-authored-by: Joel Moore <47923231+JMoore96@users.noreply.github.com>
adamdossa added a commit that referenced this pull request Oct 2, 2020
adamdossa added a commit that referenced this pull request Oct 6, 2020
poly-auto-merge bot pushed a commit that referenced this pull request Oct 7, 2020
* Revert "polymesh_schema: add `Scheduled" variant to `ProposalState` (#618)"

This reverts commit 8ccfcaf.

* Revert "mesh-1141: add 'PipsMetadata::transaction_version' (#610)"

* Revert "MESH-1262: Infer `Proposer<_>` from `origin` on `Pips::propose`. (#606)"

This reverts commit 376f20d.

* Revert "MESH-1252 & MESH-1253 (#590)"

This reverts commit 3ad6668.

* Revert "MESH-1240, MESH-1239, MESH-1238 (#579)"

This reverts commit 797d6e1.

* Revert "groups: add active members limit + config (#535)"

* Revert "MESH-1143: Link bonding POLYX to both staking & governance (#521)"

* Revert "Implement Governance v2 (#519)"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge-after-ci PR can be merged after CI has completed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants