Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Assets: Remove zombies, introduce approvals #8220

Merged
merged 66 commits into from
Mar 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
5cfffff
Initial work
gavofyork Jan 19, 2021
386efbf
Merge remote-tracking branch 'origin/master' into gav-assets-approve-api
gavofyork Feb 27, 2021
9a5b28b
Tests for frame system
gavofyork Feb 27, 2021
177baef
Merge remote-tracking branch 'origin/master' into gav-assets-approve-api
gavofyork Feb 27, 2021
1a5e42c
Self-sufficient account ref-counting
gavofyork Feb 27, 2021
853218d
Merge branch 'gav-self-sufficient-ref-count' into gav-assets-approve-api
gavofyork Feb 27, 2021
fcaa301
Fixes
gavofyork Feb 27, 2021
ee28626
Merge branch 'gav-self-sufficient-ref-count' into gav-assets-approve-api
gavofyork Feb 27, 2021
296e4b6
Benchmarks building.
gavofyork Feb 27, 2021
3902598
Update frame/system/src/lib.rs
gavofyork Feb 27, 2021
9f63908
Fixes
gavofyork Feb 27, 2021
442f7cc
Fixes
gavofyork Feb 28, 2021
ba0740d
Fixes
gavofyork Feb 28, 2021
b0a31da
Merge branch 'gav-self-sufficient-ref-count' of github.com:paritytech…
gavofyork Feb 28, 2021
ffda2b0
Merge branch 'gav-self-sufficient-ref-count' into gav-assets-approve-api
gavofyork Feb 28, 2021
3f55cf9
Fixes
gavofyork Feb 28, 2021
796e2d7
Merge branch 'gav-self-sufficient-ref-count' into gav-assets-approve-api
gavofyork Feb 28, 2021
b10e9ce
Fixes
gavofyork Feb 28, 2021
fc2c8de
Fixes
gavofyork Feb 28, 2021
a590d75
Merge branch 'gav-self-sufficient-ref-count' into gav-assets-approve-api
gavofyork Feb 28, 2021
c57af01
Test approvals
gavofyork Feb 28, 2021
e3db10c
Fixes
gavofyork Feb 28, 2021
319e691
Merge branch 'gav-self-sufficient-ref-count' into gav-assets-approve-api
gavofyork Feb 28, 2021
12c99ea
Report assets pallet tests
gavofyork Feb 28, 2021
45e0a74
Tests for approvals & force_cancel_approval
gavofyork Feb 28, 2021
391988e
Use structs rather than tuples for approval data
gavofyork Feb 28, 2021
110013a
Add force_asset_status, force_set_metadata
gavofyork Feb 28, 2021
431824b
Add clear_metadata.
gavofyork Feb 28, 2021
84f4526
approval benchmarks
gavofyork Feb 28, 2021
7e45efe
force_asset_status benchmarks
gavofyork Feb 28, 2021
9f1efca
final benchmarks
gavofyork Feb 28, 2021
5449a19
Merge remote-tracking branch 'origin/master' into gav-assets-approve-api
Feb 28, 2021
65cc507
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Feb 28, 2021
a31055f
Update frame/system/src/lib.rs
gavofyork Mar 2, 2021
8dd46fc
Update frame/system/src/lib.rs
gavofyork Mar 2, 2021
2f1e7ab
Update frame/system/src/lib.rs
gavofyork Mar 2, 2021
efaba28
Merge branch 'master' into gav-self-sufficient-ref-count
gavofyork Mar 2, 2021
6347d53
Merge branch 'gav-self-sufficient-ref-count' into gav-assets-approve-api
gavofyork Mar 2, 2021
ec94be6
Merge remote-tracking branch 'origin/master' into gav-assets-approve-api
gavofyork Mar 5, 2021
05e9fe7
Docs for new approval dispatches.
gavofyork Mar 6, 2021
859018f
Merge remote-tracking branch 'origin/master' into gav-assets-approve-api
gavofyork Mar 6, 2021
8d1c6d1
Docs for pallet.
gavofyork Mar 6, 2021
ccdc266
Remove accidental code.
gavofyork Mar 6, 2021
44d8319
Merge remote-tracking branch 'origin/master' into gav-assets-approve-api
Mar 7, 2021
8988dd1
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Mar 7, 2021
84f2b1f
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Mar 7, 2021
cdc1aa8
Fixes
gavofyork Mar 7, 2021
74f5ba5
Merge branch 'gav-assets-approve-api' of github.com:paritytech/substr…
gavofyork Mar 7, 2021
e72bb39
Update frame/assets/src/lib.rs
gavofyork Mar 8, 2021
3529fd9
Grumbles.
gavofyork Mar 8, 2021
1c83d86
Merge branch 'gav-assets-approve-api' of github.com:paritytech/substr…
gavofyork Mar 8, 2021
2c79242
Merge branch 'master' into gav-assets-approve-api
shawntabrizi Mar 8, 2021
d0fbb1d
Transfer zero works, use DispatchResult
gavofyork Mar 8, 2021
85e7f46
Merge branch 'gav-assets-approve-api' of github.com:paritytech/substr…
gavofyork Mar 8, 2021
1f1a031
fix test
shawntabrizi Mar 8, 2021
affe515
Merge branch 'gav-assets-approve-api' of https://github.com/paritytec…
shawntabrizi Mar 8, 2021
93af7b2
Remove force_destroy
gavofyork Mar 8, 2021
08f82d4
Merge branch 'gav-assets-approve-api' of github.com:paritytech/substr…
gavofyork Mar 8, 2021
3b583b3
Remove TODO
gavofyork Mar 8, 2021
eb414ae
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Mar 8, 2021
11fd0a6
transfer_keep_alive
gavofyork Mar 8, 2021
db64fc5
Merge branch 'gav-assets-approve-api' of github.com:paritytech/substr…
gavofyork Mar 8, 2021
402c43a
Fixes
gavofyork Mar 8, 2021
c54d34f
Fixes
gavofyork Mar 8, 2021
b112a9b
Fixes
gavofyork Mar 8, 2021
5a48ee4
cargo run --release --features=runtime-benchmarks --manifest-path=bin…
Mar 8, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions bin/node/runtime/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1013,9 +1013,9 @@ parameter_types! {
impl pallet_lottery::Config for Runtime {
type ModuleId = LotteryModuleId;
type Call = Call;
type Event = Event;
type Currency = Balances;
type Randomness = RandomnessCollectiveFlip;
type Event = Event;
type ManagerOrigin = EnsureRoot<AccountId>;
type MaxCalls = MaxCalls;
type ValidateCall = Lottery;
Expand All @@ -1024,8 +1024,8 @@ impl pallet_lottery::Config for Runtime {
}

parameter_types! {
pub const AssetDepositBase: Balance = 100 * DOLLARS;
pub const AssetDepositPerZombie: Balance = 1 * DOLLARS;
pub const AssetDeposit: Balance = 100 * DOLLARS;
pub const ApprovalDeposit: Balance = 1 * DOLLARS;
pub const StringLimit: u32 = 50;
pub const MetadataDepositBase: Balance = 10 * DOLLARS;
pub const MetadataDepositPerByte: Balance = 1 * DOLLARS;
Expand All @@ -1037,11 +1037,11 @@ impl pallet_assets::Config for Runtime {
type AssetId = u32;
type Currency = Balances;
type ForceOrigin = EnsureRoot<AccountId>;
type AssetDepositBase = AssetDepositBase;
type AssetDepositPerZombie = AssetDepositPerZombie;
type StringLimit = StringLimit;
type AssetDeposit = AssetDeposit;
type MetadataDepositBase = MetadataDepositBase;
type MetadataDepositPerByte = MetadataDepositPerByte;
type ApprovalDeposit = ApprovalDeposit;
type StringLimit = StringLimit;
type WeightInfo = pallet_assets::weights::SubstrateWeight<Runtime>;
}

Expand Down
Loading