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

Merge main into zenlink rpc branch #223

Merged
merged 2 commits into from
Apr 21, 2023

Conversation

RustNinja
Copy link
Contributor

update zenlink rpc branch according to latest changes in main.

RustNinja and others added 2 commits April 21, 2023 12:50
* add bifrost-farming and bifrost-farming-rpc-runtime-api dependency

* introduce T::CurrencyId to bifrost farming pallet

* add farming runtime rpc to foucoco

* Update runtime/foucoco/src/lib.rs

Co-authored-by: Marcel Ebert <[email protected]>

* fix build in foucoco runtime with FoucocoTreasuryAccount

* add patch for git and crates io

* update pr according to request changes in PR

#208

* Add farming rpc api intou pendulum node for foucoco runtime (#216)

add farming rpc api for foucoco

* move PoolId type declaration to runtime common

* renaming

create_full_spacewalk_foucoco -> create_full_foucoco
create_full_spacewalk -> create_full_amplitude
create_full -> create_full_pendulum

* replace "introduce-abstraction-for-currency-id" to "polkadot-v0.9.37"

* Update runtime/common/src/lib.rs

Co-authored-by: Marcel Ebert <[email protected]>

* renaming 

start_node_impl() -> start_node_impl_pendulum()
start_node_impl_spacewalk_foucoco() -> start_node_impl_foucoco()
start_node_impl_spacewalk_amplitude() -> start_node_impl_amplitude()

---------

Co-authored-by: Marcel Ebert <[email protected]>
@RustNinja RustNinja merged commit 152f5fc into zenlink-rpc Apr 21, 2023
@RustNinja RustNinja deleted the merge-main-into-zenlink-rpc-branch branch April 21, 2023 12:33
RustNinja added a commit that referenced this pull request Apr 24, 2023
* add bifrost-farming and bifrost-farming-rpc-runtime-api dependency

* introduce T::CurrencyId to bifrost farming pallet

* add farming runtime rpc to foucoco

* Update runtime/foucoco/src/lib.rs

Co-authored-by: Marcel Ebert <[email protected]>

* fix build in foucoco runtime with FoucocoTreasuryAccount

* add patch for git and crates io

* update pr according to request changes in PR

#208

* Add farming rpc api intou pendulum node for foucoco runtime (#216)

add farming rpc api for foucoco

* move PoolId type declaration to runtime common

* renaming

create_full_spacewalk_foucoco -> create_full_foucoco
create_full_spacewalk -> create_full_amplitude
create_full -> create_full_pendulum

* replace "introduce-abstraction-for-currency-id" to "polkadot-v0.9.37"

* Update runtime/common/src/lib.rs

Co-authored-by: Marcel Ebert <[email protected]>

* renaming 

start_node_impl() -> start_node_impl_pendulum()
start_node_impl_spacewalk_foucoco() -> start_node_impl_foucoco()
start_node_impl_spacewalk_amplitude() -> start_node_impl_amplitude()

* expose zenlink runtime rpc endpoints in pendulum-node

* Merge main into zenlink rpc branch (#223)

207 implement lp rewards on amm (#208)

* add bifrost-farming and bifrost-farming-rpc-runtime-api dependency

* introduce T::CurrencyId to bifrost farming pallet

* add farming runtime rpc to foucoco

* Update runtime/foucoco/src/lib.rs



* fix build in foucoco runtime with FoucocoTreasuryAccount

* add patch for git and crates io

* update pr according to request changes in PR

#208

* Add farming rpc api intou pendulum node for foucoco runtime (#216)

add farming rpc api for foucoco

* move PoolId type declaration to runtime common

* renaming

create_full_spacewalk_foucoco -> create_full_foucoco
create_full_spacewalk -> create_full_amplitude
create_full -> create_full_pendulum

* replace "introduce-abstraction-for-currency-id" to "polkadot-v0.9.37"

* Update runtime/common/src/lib.rs



* renaming 

start_node_impl() -> start_node_impl_pendulum()
start_node_impl_spacewalk_foucoco() -> start_node_impl_foucoco()
start_node_impl_spacewalk_amplitude() -> start_node_impl_amplitude()

---------

Co-authored-by: Marcel Ebert <[email protected]>

* remove duplicates in foucoco cargo toml

* remove duplication

C::Api: ZenlinkProtocolRuntimeApi<Block, AccountId, AssetId>,

* remove unnecessary clone for TransactionPayment instance

---------

Co-authored-by: Marcel Ebert <[email protected]>
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.

1 participant