AstarNetwork · Dinonard · Jan 23, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/runtime/astar/src/lib.rs b/runtime/astar/src/lib.rs
@@ -29,7 +29,6 @@ use frame_support::{
     genesis_builder_helper, parameter_types,
     traits::{
         fungible::{Balanced, Credit, HoldConsideration},
-        tokens::{PayFromAccount, UnityAssetBalanceConversion},
         AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, Contains,
         EqualPrivilegeOnly, FindAuthor, Get, Imbalance, InstanceFilter, LinearStoragePrice,
         Nothing, OnFinalize, OnUnbalanced, Randomness, WithdrawReasons,
@@ -63,8 +62,7 @@ use sp_runtime::{
     create_runtime_str, generic, impl_opaque_keys,
     traits::{
         AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto,
-        DispatchInfoOf, Dispatchable, IdentityLookup, OpaqueKeys, PostDispatchInfoOf,
-        UniqueSaturatedInto, Zero,
+        DispatchInfoOf, Dispatchable, OpaqueKeys, PostDispatchInfoOf, UniqueSaturatedInto, Zero,
     },
     transaction_validity::{TransactionSource, TransactionValidity, TransactionValidityError},
     ApplyExtrinsicResult, FixedPointNumber, FixedU128, Perbill, Permill, Perquintill, RuntimeDebug,
@@ -1404,20 +1402,8 @@ impl pallet_treasury::Config<MainTreasuryInst> for Runtime {
     type Burn = ();
     type BurnDestination = ();
     type SpendFunds = ();
-
     type MaxApprovals = ConstU32<64>;
-    type AssetKind = (); // Only native asset is supported
-    type Beneficiary = AccountId;
-    type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
-    type Paymaster = PayFromAccount<Balances, MainTreasuryAccount>;
-    type BalanceConverter = UnityAssetBalanceConversion;
-
-    // New approach to using treasury, useful for OpenGov but not necessarily for us.
-    type SpendOrigin = frame_support::traits::NeverEnsureOrigin<Balance>;
-    // Only used by 'spend' approach which is disabled
-    type PayoutPeriod = ConstU32<0>;
-    #[cfg(feature = "runtime-benchmarks")]
-    type BenchmarkHelper = ();
+
     type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
 }
 
@@ -1444,20 +1430,8 @@ impl pallet_treasury::Config<CommunityTreasuryInst> for Runtime {
     type Burn = ();
     type BurnDestination = ();
     type SpendFunds = ();
-
     type MaxApprovals = ConstU32<64>;
-    type AssetKind = (); // Only native asset is supported
-    type Beneficiary = AccountId;
-    type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
-    type Paymaster = PayFromAccount<Balances, MainTreasuryAccount>;
-    type BalanceConverter = UnityAssetBalanceConversion;
-
-    // New approach to using treasury, useful for OpenGov but not necessarily for us.
-    type SpendOrigin = frame_support::traits::NeverEnsureOrigin<Balance>;
-    // Only used by 'spend' approach which is disabled
-    type PayoutPeriod = ConstU32<0>;
-    #[cfg(feature = "runtime-benchmarks")]
-    type BenchmarkHelper = ();
+
     type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
 }
 

diff --git a/runtime/local/src/lib.rs b/runtime/local/src/lib.rs
@@ -28,7 +28,6 @@ use frame_support::{
     construct_runtime, genesis_builder_helper, parameter_types,
     traits::{
         fungible::{Balanced, Credit, HoldConsideration},
-        tokens::{PayFromAccount, UnityAssetBalanceConversion},
         AsEnsureOriginWithArg, ConstU128, ConstU32, ConstU64, Contains, EqualPrivilegeOnly,
         FindAuthor, Get, InsideBoth, InstanceFilter, LinearStoragePrice, Nothing, OnFinalize,
         WithdrawReasons,
@@ -56,8 +55,7 @@ use sp_runtime::{
     create_runtime_str, generic, impl_opaque_keys,
     traits::{
         AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto,
-        DispatchInfoOf, Dispatchable, IdentityLookup, NumberFor, PostDispatchInfoOf,
-        UniqueSaturatedInto,
+        DispatchInfoOf, Dispatchable, NumberFor, PostDispatchInfoOf, UniqueSaturatedInto,
     },
     transaction_validity::{TransactionSource, TransactionValidity, TransactionValidityError},
     ApplyExtrinsicResult, FixedPointNumber, FixedU128, Perbill, Permill, Perquintill, RuntimeDebug,
@@ -1048,20 +1046,8 @@ impl pallet_treasury::Config<MainTreasuryInst> for Runtime {
     type Burn = ();
     type BurnDestination = ();
     type SpendFunds = ();
-
     type MaxApprovals = ConstU32<64>;
-    type AssetKind = (); // Only native asset is supported
-    type Beneficiary = AccountId;
-    type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
-    type Paymaster = PayFromAccount<Balances, MainTreasuryAccount>;
-    type BalanceConverter = UnityAssetBalanceConversion;
-
-    // New approach to using treasury, useful for OpenGov but not necessarily for us.
-    type SpendOrigin = frame_support::traits::NeverEnsureOrigin<Balance>;
-    // Only used by 'spend' approach which is disabled
-    type PayoutPeriod = ConstU32<0>;
-    #[cfg(feature = "runtime-benchmarks")]
-    type BenchmarkHelper = ();
+
     type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
 }
 
@@ -1088,20 +1074,8 @@ impl pallet_treasury::Config<CommunityTreasuryInst> for Runtime {
     type Burn = ();
     type BurnDestination = ();
     type SpendFunds = ();
-
     type MaxApprovals = ConstU32<64>;
-    type AssetKind = (); // Only native asset is supported
-    type Beneficiary = AccountId;
-    type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
-    type Paymaster = PayFromAccount<Balances, MainTreasuryAccount>;
-    type BalanceConverter = UnityAssetBalanceConversion;
-
-    // New approach to using treasury, useful for OpenGov but not necessarily for us.
-    type SpendOrigin = frame_support::traits::NeverEnsureOrigin<Balance>;
-    // Only used by 'spend' approach which is disabled
-    type PayoutPeriod = ConstU32<0>;
-    #[cfg(feature = "runtime-benchmarks")]
-    type BenchmarkHelper = ();
+
     type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
 }
 

diff --git a/runtime/shibuya/src/lib.rs b/runtime/shibuya/src/lib.rs
@@ -29,7 +29,6 @@ use frame_support::{
     genesis_builder_helper, parameter_types,
     traits::{
         fungible::{Balanced, Credit, HoldConsideration},
-        tokens::{PayFromAccount, UnityAssetBalanceConversion},
         AsEnsureOriginWithArg, ConstBool, ConstU128, ConstU32, ConstU64, Contains,
         EqualPrivilegeOnly, FindAuthor, Get, Imbalance, InsideBoth, InstanceFilter,
         LinearStoragePrice, Nothing, OnFinalize, OnUnbalanced, WithdrawReasons,
@@ -62,8 +61,7 @@ use sp_runtime::{
     create_runtime_str, generic, impl_opaque_keys,
     traits::{
         AccountIdConversion, AccountIdLookup, BlakeTwo256, Block as BlockT, ConvertInto,
-        DispatchInfoOf, Dispatchable, IdentityLookup, OpaqueKeys, PostDispatchInfoOf,
-        UniqueSaturatedInto,
+        DispatchInfoOf, Dispatchable, OpaqueKeys, PostDispatchInfoOf, UniqueSaturatedInto,
     },
     transaction_validity::{TransactionSource, TransactionValidity, TransactionValidityError},
     ApplyExtrinsicResult, FixedPointNumber, FixedU128, Perbill, Permill, Perquintill, RuntimeDebug,
@@ -1444,20 +1442,8 @@ impl pallet_treasury::Config<MainTreasuryInst> for Runtime {
     type Burn = ();
     type BurnDestination = ();
     type SpendFunds = ();
-
     type MaxApprovals = ConstU32<64>;
-    type AssetKind = (); // Only native asset is supported
-    type Beneficiary = AccountId;
-    type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
-    type Paymaster = PayFromAccount<Balances, MainTreasuryAccount>;
-    type BalanceConverter = UnityAssetBalanceConversion;
-
-    // New approach to using treasury, useful for OpenGov but not necessarily for us.
-    type SpendOrigin = frame_support::traits::NeverEnsureOrigin<Balance>;
-    // Only used by 'spend' approach which is disabled
-    type PayoutPeriod = ConstU32<0>;
-    #[cfg(feature = "runtime-benchmarks")]
-    type BenchmarkHelper = ();
+
     type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
 }
 
@@ -1484,20 +1470,8 @@ impl pallet_treasury::Config<CommunityTreasuryInst> for Runtime {
     type Burn = ();
     type BurnDestination = ();
     type SpendFunds = ();
-
     type MaxApprovals = ConstU32<64>;
-    type AssetKind = (); // Only native asset is supported
-    type Beneficiary = AccountId;
-    type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
-    type Paymaster = PayFromAccount<Balances, MainTreasuryAccount>;
-    type BalanceConverter = UnityAssetBalanceConversion;
-
-    // New approach to using treasury, useful for OpenGov but not necessarily for us.
-    type SpendOrigin = frame_support::traits::NeverEnsureOrigin<Balance>;
-    // Only used by 'spend' approach which is disabled
-    type PayoutPeriod = ConstU32<0>;
-    #[cfg(feature = "runtime-benchmarks")]
-    type BenchmarkHelper = ();
+
     type WeightInfo = pallet_treasury::weights::SubstrateWeight<Runtime>;
 }
 

diff --git a/vendor/treasury/Cargo.toml b/vendor/treasury/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-treasury"
-version = "36.0.1"
+version = "37.0.0"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 homepage = "https://paritytech.github.io/polkadot-sdk/"

diff --git a/vendor/treasury/README.md b/vendor/treasury/README.md
@@ -20,28 +20,3 @@ and use the funds to pay developers.
 - **Deposit:** Funds that a proposer must lock when making a proposal. The deposit will be returned
   or slashed if the proposal is approved or rejected respectively.
 - **Pot:** Unspent funds accumulated by the treasury pallet.
-
-## Interface
-
-### Dispatchable Functions
-
-General spending/proposal protocol:
-- `spend_local` - Propose and approve a spend of treasury funds, enables the
-  creation of spends using the native currency of the chain, utilizing the funds
-  stored in the pot
-- `spend` - Propose and approve a spend of treasury funds, allows spending any
-  asset kind managed by the treasury
-- `remove_approval` - Force a previously approved proposal to be removed from
-  the approval queue
-- `payout` - Claim a spend
-- `check_status` - Check the status of the spend and remove it from the storage
-  if processed
-- `void_spend` - Void previously approved spend
-
-
-## Release
-
-polkadot v1.15.0
-- `propose_spend` - Make a spending proposal and stake the required deposit.
-- `reject_proposal` - Reject a proposal, slashing the deposit.
-- `approve_proposal` - Accept the proposal, returning the deposit.