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

Feature/41 install governance pallet #78

Merged
merged 23 commits into from
Jan 14, 2021

Conversation

ayushmishra2005
Copy link
Contributor

@ayushmishra2005 ayushmishra2005 commented Jan 13, 2021

Integrated Treasury and Collective Pallet

  1. Integrated Below Pallets in runtime/testnet
    • pallet_bounties
    • pallet_collective
    • pallet_treasury
  2. Added pallet_collective_Instance1 and pallet_treasury in GenesisConfig of node/chain_spec

Fixes #41

runtime/testnet/src/lib.rs Outdated Show resolved Hide resolved
jaxter03 and others added 12 commits January 14, 2021 10:05
Co-authored-by: Gautham <Gauthamastro@gmail.com>
1) Integrated Below Pallets in runtime/testnet
	* pallet_bounties
	* pallet_collective
	* pallet_treasury
2) Added pallet_collective_Instance1 and pallet_treasury in GenesisConfig of node/chain_spec
Co-authored-by: Gautham <Gauthamastro@gmail.com>
@Gauthamastro Gauthamastro merged commit 2fb406c into develop Jan 14, 2021
@Gauthamastro Gauthamastro deleted the feature/41-install-governance-pallet branch January 14, 2021 08:22
Gauthamastro added a commit that referenced this pull request Jan 14, 2021
* #37 Modify Market Data storage from StorageDoubleMap to StorageMap (#67)

* Runtime upgradation (#72)

* error from_frac

* Updated code

* resolved error

* resolved error

* Updated service.rs to new version

* resolved errors

* all four pallets are implemented

* Update pallets/polkadex-uniswap/src/lib.rs

Co-authored-by: Gautham <Gauthamastro@gmail.com>

* resolved error

* resolved error

* Changed H256::zero to H256::random

Co-authored-by: Gautham J <Gauthamastro@gmail.com>

* mainnet runtime updated

* Feature/41 install governance pallet (#78)

* Added pallet-collective in cargo.toml

* Changed version

* #41 added dependency of treasury pallet

* #41 Moved dependecy version back to master

* Added pallet-collective in cargo.toml

* Changed version

* #41 added dependency of treasury pallet

* #41 Moved dependecy version back to master

* Integrated Treasury and Collective Pallet
1) Integrated Below Pallets in runtime/testnet
	* pallet_bounties
	* pallet_collective
	* pallet_treasury
2) Added pallet_collective_Instance1 and pallet_treasury in GenesisConfig of node/chain_spec

* mainnet runtime updated

* Update runtime/testnet/src/lib.rs

Co-authored-by: Gautham <Gauthamastro@gmail.com>

* Added pallet-collective in cargo.toml

* Changed version

* #41 added dependency of treasury pallet

* #41 Moved dependecy version back to master

* Changed version

* #41 Moved dependecy version back to master

* Integrated Treasury and Collective Pallet
1) Integrated Below Pallets in runtime/testnet
	* pallet_bounties
	* pallet_collective
	* pallet_treasury
2) Added pallet_collective_Instance1 and pallet_treasury in GenesisConfig of node/chain_spec

* Update runtime/testnet/src/lib.rs

Co-authored-by: Gautham <Gauthamastro@gmail.com>

* resolved error

Co-authored-by: ksr30 <krishna.singh9926@gmail.com>
Co-authored-by: Gautham <Gauthamastro@gmail.com>

Co-authored-by: Ayush Mishra <ayushmishra2005@gmail.com>
Co-authored-by: Gautham J <Gauthamastro@gmail.com>
Gauthamastro added a commit that referenced this pull request Jan 17, 2021
* #37 Modify Market Data storage from StorageDoubleMap to StorageMap (#67)

* Runtime upgradation (#72)

* error from_frac

* Updated code

* resolved error

* resolved error

* Updated service.rs to new version

* resolved errors

* all four pallets are implemented

* Update pallets/polkadex-uniswap/src/lib.rs

Co-authored-by: Gautham <Gauthamastro@gmail.com>

* resolved error

* resolved error

* Changed H256::zero to H256::random

Co-authored-by: Gautham J <Gauthamastro@gmail.com>

* mainnet runtime updated

* Feature/41 install governance pallet (#78)

* Added pallet-collective in cargo.toml

* Changed version

* #41 added dependency of treasury pallet

* #41 Moved dependecy version back to master

* Added pallet-collective in cargo.toml

* Changed version

* #41 added dependency of treasury pallet

* #41 Moved dependecy version back to master

* Integrated Treasury and Collective Pallet
1) Integrated Below Pallets in runtime/testnet
	* pallet_bounties
	* pallet_collective
	* pallet_treasury
2) Added pallet_collective_Instance1 and pallet_treasury in GenesisConfig of node/chain_spec

* mainnet runtime updated

* Update runtime/testnet/src/lib.rs

Co-authored-by: Gautham <Gauthamastro@gmail.com>

* Added pallet-collective in cargo.toml

* Changed version

* #41 added dependency of treasury pallet

* #41 Moved dependecy version back to master

* Changed version

* #41 Moved dependecy version back to master

* Integrated Treasury and Collective Pallet
1) Integrated Below Pallets in runtime/testnet
	* pallet_bounties
	* pallet_collective
	* pallet_treasury
2) Added pallet_collective_Instance1 and pallet_treasury in GenesisConfig of node/chain_spec

* Update runtime/testnet/src/lib.rs

Co-authored-by: Gautham <Gauthamastro@gmail.com>

* resolved error

Co-authored-by: ksr30 <krishna.singh9926@gmail.com>
Co-authored-by: Gautham <Gauthamastro@gmail.com>

* reolved build error and added script (#82)

Co-authored-by: Ayush Mishra <ayushmishra2005@gmail.com>
Co-authored-by: Gautham J <Gauthamastro@gmail.com>
Gauthamastro added a commit that referenced this pull request Feb 22, 2021
* #37 Modify Market Data storage from StorageDoubleMap to StorageMap (#67)

* Runtime upgradation (#72)

* error from_frac

* Updated code

* resolved error

* resolved error

* Updated service.rs to new version

* resolved errors

* all four pallets are implemented

* Update pallets/polkadex-uniswap/src/lib.rs

Co-authored-by: Gautham <Gauthamastro@gmail.com>

* resolved error

* resolved error

* Changed H256::zero to H256::random

Co-authored-by: Gautham J <Gauthamastro@gmail.com>

* mainnet runtime updated

* Feature/41 install governance pallet (#78)

* Added pallet-collective in cargo.toml

* Changed version

* #41 added dependency of treasury pallet

* #41 Moved dependecy version back to master

* Added pallet-collective in cargo.toml

* Changed version

* #41 added dependency of treasury pallet

* #41 Moved dependecy version back to master

* Integrated Treasury and Collective Pallet
1) Integrated Below Pallets in runtime/testnet
	* pallet_bounties
	* pallet_collective
	* pallet_treasury
2) Added pallet_collective_Instance1 and pallet_treasury in GenesisConfig of node/chain_spec

* mainnet runtime updated

* Update runtime/testnet/src/lib.rs

Co-authored-by: Gautham <Gauthamastro@gmail.com>

* Added pallet-collective in cargo.toml

* Changed version

* #41 added dependency of treasury pallet

* #41 Moved dependecy version back to master

* Changed version

* #41 Moved dependecy version back to master

* Integrated Treasury and Collective Pallet
1) Integrated Below Pallets in runtime/testnet
	* pallet_bounties
	* pallet_collective
	* pallet_treasury
2) Added pallet_collective_Instance1 and pallet_treasury in GenesisConfig of node/chain_spec

* Update runtime/testnet/src/lib.rs

Co-authored-by: Gautham <Gauthamastro@gmail.com>

* resolved error

Co-authored-by: ksr30 <krishna.singh9926@gmail.com>
Co-authored-by: Gautham <Gauthamastro@gmail.com>

* reolved build error and added script (#82)

* Changed staructure

* #31 Addded workspace in root cargo

* resolved errors

* code with erros

* building successful

* added new changes

* added load tester

* Added json script

* added new changes

* resolved new errors

* Resolved errors

* #80 Added benchmarking method for add_registrar

* * Fixed the nodejs script for working with the customAssets
* Added related code for getting assetID from createToken tx events

* Fixed compilation issue

* Resolved errors

* #80 Added benchmarking method for add_registrar

* Implemted and tested wothdraw function

* resolved error

* #80 Added infrasturcture for benchmarking

* #80 Modify add_registrat banchmarking

* #80 Added/modified benchmarking of idenity pallet

* #80 Added weight info in idenity pallet

* #80 Added benchmarking of freeze_account

* 93/implement randomness (#99)

* added code for randomness

* resolved error

* resolved error

* Added test case

* updated code

* removed target file

* updated code

* removed target

* Update package-test.yml

* Fixed simulate-trades.js

* Update package.json

* changed ip

* added spec file

* removed target

* added substrate

* Update simulate-trades.js

* updated scripts

* Comment out all the custom asset stuff

* Added Bob Address

* Update simulate-trades.js

* Clean Code

* Update simulate-trades.js

* updated script

* resolved errors

* Fixed develop branch dependency issue

* Parachain Upgradation (#130)

* installed parachain

* Updated versio

* removed target files

* Runtime Upgrade

* Upgrade to aura (#132)

* Upgrade Develop to Aura

* Updated service.rs and some cargo paths

* Update README.md and Downgrade Engine from Frame v2

* Add gitignore

* Added assets.rs for AssetID primitives (#133)

* feature/gj-engine (#137)

* Added The logic for trade settlement

* Basic layout is set for trade settlement

* Added binary Tree based map for storing balances in orderbook engine

* Added binary Tree based map for storing balances in orderbook engine

* added Folders(aws-scripts,prometheus) & ccs.sh file

* updated the build spec file 1.1

* Updated Binary name

Co-authored-by: Ayush Mishra <ayushmishra2005@gmail.com>
Co-authored-by: Krishna Singh <krishna.singh9926@gmail.com>
Co-authored-by: Ubuntu <ubuntu@ip-172-31-34-114.us-east-2.compute.internal>
Co-authored-by: Pranayagaram <50867481+Pranayagaram@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.

3 participants