Skip to content

Orion v2: fix conflicts#100

Merged
Lezek123 merged 4 commits intoJoystream:orion-v2from
Lezek123:orion-v2-fix-conflicts
Mar 30, 2023
Merged

Orion v2: fix conflicts#100
Lezek123 merged 4 commits intoJoystream:orion-v2from
Lezek123:orion-v2-fix-conflicts

Conversation

@Lezek123
Copy link
Copy Markdown

Fix conflicts with master to allow releasing Orion v2

attemka and others added 4 commits February 24, 2023 12:22
* add support for AppAction signatures (Joystream#51)

fixes Joystream#50

* New way to generate commitment and algorithm switch (Joystream#66)

* New way to generate commitment and algorithm switch

* Comment update

* Update secret key comments

Co-authored-by: l1.media <31551045+traumschule@users.noreply.github.com>

---------

Co-authored-by: l1.media <31551045+traumschule@users.noreply.github.com>

---------

Co-authored-by: WRadoslaw <92513933+WRadoslaw@users.noreply.github.com>
Co-authored-by: l1.media <31551045+traumschule@users.noreply.github.com>
…adata (Joystream#81)

* Update app action commitment, disallow signing arbitrary appActionMetadata

* Linter fix
@Lezek123 Lezek123 requested a review from attemka March 30, 2023 13:12
@Lezek123 Lezek123 merged commit c11a68a into Joystream:orion-v2 Mar 30, 2023
@Lezek123 Lezek123 mentioned this pull request Mar 30, 2023
dobertRowneySr pushed a commit to dobertRowneySr/orion that referenced this pull request Jul 3, 2023
* App-actions functionality (Joystream#75)

* add support for AppAction signatures (Joystream#51)

fixes Joystream#50

* New way to generate commitment and algorithm switch (Joystream#66)

* New way to generate commitment and algorithm switch

* Comment update

* Update secret key comments

Co-authored-by: l1.media <31551045+traumschule@users.noreply.github.com>

---------

Co-authored-by: l1.media <31551045+traumschule@users.noreply.github.com>

---------

Co-authored-by: WRadoslaw <92513933+WRadoslaw@users.noreply.github.com>
Co-authored-by: l1.media <31551045+traumschule@users.noreply.github.com>

* Update app action commitment, disallow signing arbitrary appActionMetadata (Joystream#81)

* Update app action commitment, disallow signing arbitrary appActionMetadata

* Linter fix

* Update `generateAppActionCommitment` impl. (Joystream#85)

---------

Co-authored-by: attemka <attemka@gmail.com>
Co-authored-by: WRadoslaw <92513933+WRadoslaw@users.noreply.github.com>
Co-authored-by: l1.media <31551045+traumschule@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants