Aldebaran 1.1.1 (#447)

* Added staking events (#421) * MESH-790/ Add RPC filtering by Link type (#398) * Misc. fixes (#416) * Misc. fixes * Fix * lint * lint Co-authored-by: Satyam Agrawal <[email protected]> * Batch Dispath in Utility Module (#414) * UT added * Update V1 * CodeReview: Remove unused elements * UT added * Update V1 * CodeReview: Remove unused elements Co-authored-by: Adam Dossa <[email protected]> Co-authored-by: poly-auto-merge[bot] <65769705+poly-auto-merge[bot]@users.noreply.github.com> * Mesh 1040/Add reserved peer logging (#417) * logging resered nodes * rename peers to nodes Co-authored-by: satyam <[email protected]> Co-authored-by: Adam Dossa <[email protected]> * Mesh 991/granular errors (#402) * wip * Added internal functions * wired the rpc * Added new structure * Updated structure * some fixes * Added test cases * updated schema * fixed typo in schema * fixed merge Co-authored-by: Adam Dossa <[email protected]> Co-authored-by: poly-auto-merge[bot] <65769705+poly-auto-merge[bot]@users.noreply.github.com> * Mesh 1049/Allow signing keys to leave their identities (#422) * functions for leaving an identity * Added tests * review comments * Mesh 1042/rename validator to operator (#425) * introduced --operator as the alias for the validator * add dev comment * fix linting Co-authored-by: satyam <[email protected]> Co-authored-by: poly-auto-merge[bot] <65769705+poly-auto-merge[bot]@users.noreply.github.com> * fix: handle optional parameters correctly (#426) * Workaround in Committe module (#424) * Remove unused functions Incorrectly chosen by cherry-pick * bump spec_version & impl_version * MESH-972/ Add new getDidStatus() RPC (#431) * Remove incorrect cherry-picked code * Mesh 1033: Transfer events (#435) * Simplify transfer events * Fix tests * Remove bootnodes 4 - 10 (#436) Co-authored-by: poly-auto-merge[bot] <65769705+poly-auto-merge[bot]@users.noreply.github.com> * linting * RPC to get historical pip voting by address (#433) * Fix lock file (#440) * Bridge batching fix (#445) * Bump versions * Fix fees and adjust bridge limit (#446) * Fix for multisig refactor * Adjust base fee from 0.01 POLYX to 1 POLYX (#448) * Change chain_spec back to reflect genesis Co-authored-by: Mudit Gupta <[email protected]> Co-authored-by: Satyam Agrawal <[email protected]> Co-authored-by: Francisco Miguel García <[email protected]> Co-authored-by: poly-auto-merge[bot] <65769705+poly-auto-merge[bot]@users.noreply.github.com> Co-authored-by: satyam <[email protected]> Co-authored-by: Jeremías Díaz <[email protected]> Co-authored-by: Vladimir Komendantskiy <[email protected]>
PolymeshAssociation · Jun 22, 2020 · be18173 · be18173
1 parent d620f5c
commit be18173
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/pallets/runtime/common/src/bridge.rs b/pallets/runtime/common/src/bridge.rs
@@ -785,13 +785,18 @@ impl<T: Trait> Module<T> {
  bridge_txs: Vec<BridgeTx<T::AccountId, T::Balance>>,
  ) -> DispatchResult {
  let sender_signer = Signatory::from(AccountKey::try_from(sender.encode())?);
- let proposal = <T as Trait>::Proposal::from(Call::<T>::handle_bridge_txs(bridge_txs));
- let boxed_proposal = Box::new(proposal.into());
- <multisig::Module<T>>::create_or_approve_proposal(
- Self::controller(),
- sender_signer,
- boxed_proposal,
- )
+ let propose = |tx| {
+ let proposal = <T as Trait>::Proposal::from(Call::<T>::handle_bridge_tx(tx));
+ let boxed_proposal = Box::new(proposal.into());
+ <multisig::Module<T>>::create_or_approve_proposal(
+ Self::controller(),
+ sender_signer.clone(),
+ boxed_proposal,
+ )
+ };
+ let stati = Self::apply_handler(propose, bridge_txs);
+ Self::deposit_event(RawEvent::TxsHandled(stati));
+ Ok(())
  }
 
  /// Handles an approved bridge transaction proposal.

diff --git a/pallets/runtime/develop/src/runtime.rs b/pallets/runtime/develop/src/runtime.rs
@@ -95,8 +95,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
  spec_name: create_runtime_str!("polymesh"),
  impl_name: create_runtime_str!("polymath-polymesh"),
  authoring_version: 1,
- spec_version: 1005,
- impl_version: 1005,
+ spec_version: 1006,
+ impl_version: 1006,
  apis: RUNTIME_API_VERSIONS,
 };
 
@@ -208,7 +208,7 @@ impl balances::Trait for Runtime {
 }
 
 parameter_types! {
- pub const TransactionBaseFee: Balance = 1 * CENTS;
+ pub const TransactionBaseFee: Balance = 1 * DOLLARS;
  pub const TransactionByteFee: Balance = 10 * MILLICENTS;
  // setting this to zero will disable the weight fee.
  pub const WeightFeeCoefficient: Balance = 1;
@@ -222,7 +222,7 @@ impl pallet_transaction_payment::Trait for Runtime {
  type TransactionBaseFee = TransactionBaseFee;
  type TransactionByteFee = TransactionByteFee;
  type WeightToFee = LinearWeightToFee<WeightFeeCoefficient>;
- type FeeMultiplierUpdate = TargetedFeeAdjustment<TargetBlockFullness, Self>;
+ type FeeMultiplierUpdate = ();
  type CddHandler = CddHandler;
 }
 

diff --git a/pallets/runtime/testnet-v1/src/runtime.rs b/pallets/runtime/testnet-v1/src/runtime.rs
@@ -86,8 +86,8 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
  spec_name: create_runtime_str!("polymesh"),
  impl_name: create_runtime_str!("polymath-polymesh"),
  authoring_version: 1,
- spec_version: 1005,
- impl_version: 1005,
+ spec_version: 1006,
+ impl_version: 1006,
  apis: RUNTIME_API_VERSIONS,
 };
 
@@ -199,7 +199,7 @@ impl balances::Trait for Runtime {
 }
 
 parameter_types! {
- pub const TransactionBaseFee: Balance = 1 * CENTS;
+ pub const TransactionBaseFee: Balance = 1 * DOLLARS;
  pub const TransactionByteFee: Balance = 10 * MILLICENTS;
  // setting this to zero will disable the weight fee.
  pub const WeightFeeCoefficient: Balance = 1;
@@ -213,7 +213,7 @@ impl pallet_transaction_payment::Trait for Runtime {
  type TransactionBaseFee = TransactionBaseFee;
  type TransactionByteFee = TransactionByteFee;
  type WeightToFee = LinearWeightToFee<WeightFeeCoefficient>;
- type FeeMultiplierUpdate = TargetedFeeAdjustment<TargetBlockFullness, Self>;
+ type FeeMultiplierUpdate = ();
  type CddHandler = CddHandler;
 }