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

Pallet: Atomic Swap #6349

Merged
merged 21 commits into from
Jun 18, 2020
Merged

Pallet: Atomic Swap #6349

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b029265
Init atomic swap pallet
sorpaas Jun 14, 2020
eb0fbef
Implement module swap operations
sorpaas Jun 14, 2020
b08c1ea
Add successful swap test
sorpaas Jun 14, 2020
0b4454f
Bump node spec_version
sorpaas Jun 14, 2020
c3f88f5
Fix storage name
sorpaas Jun 14, 2020
f885efb
Add ProofLimit parameter to prevent proof size being too large
sorpaas Jun 14, 2020
8ce4cce
Add missing events
sorpaas Jun 14, 2020
3088ff1
Basic weight support
sorpaas Jun 14, 2020
8e18344
Add basic docs
sorpaas Jun 14, 2020
47877fa
Mark swap on claim
sorpaas Jun 16, 2020
d51b1de
Add additional expire handler
sorpaas Jun 16, 2020
fe70944
Update frame/atomic-swap/src/lib.rs
sorpaas Jun 16, 2020
fa2a85e
Add docs on ProofLimit
sorpaas Jun 16, 2020
7148509
Merge branch 'sp-atomic-swap' of https://github.com/paritytech/substr…
sorpaas Jun 16, 2020
b71ca91
Fix test
sorpaas Jun 16, 2020
2aa173b
Return Ok(()) even when the transfer fails
sorpaas Jun 16, 2020
ad36185
Remove retry logic
sorpaas Jun 16, 2020
a46db72
succeed -> succeeded
sorpaas Jun 16, 2020
96b1392
Add docs on duration -- revealer should use duration shorter than cou…
sorpaas Jun 17, 2020
fad3708
Merge branch 'master' of https://github.com/paritytech/substrate into…
sorpaas Jun 17, 2020
9cc2350
Missing trait type
sorpaas Jun 17, 2020
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
Prev Previous commit
Next Next commit
Basic weight support
  • Loading branch information
@sorpaas
sorpaas committed Jun 14, 2020
commit 3088ff198267b02a35ae7ab036f32917d6b775f3
10 changes: 7 additions & 3 deletions frame/atomic-swap/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use sp_io::hashing::blake2_256;
use frame_support::{
decl_module, decl_storage, decl_event, decl_error, ensure,
traits::{Get, Currency, ReservableCurrency, BalanceStatus},
weights::Weight,
};
use frame_system::{self as system, ensure_signed};
use codec::{Encode, Decode};
Expand Down Expand Up @@ -114,7 +115,7 @@ decl_module! {

fn deposit_event() = default;

#[weight = 0]
#[weight = T::DbWeight::get().reads_writes(1, 1).saturating_add(40_000_000)]
fn create_swap(
origin,
target: AccountIdFor<T>,
Expand Down Expand Up @@ -142,7 +143,10 @@ decl_module! {
);
}

#[weight = 0]
#[weight = T::DbWeight::get().reads_writes(1, 1)
sorpaas marked this conversation as resolved.
Show resolved Hide resolved
.saturating_add(40_000_000)
.saturating_add((proof.len() as Weight).saturating_mul(100))
]
fn claim_swap(
origin,
proof: Vec<u8>,
Expand Down Expand Up @@ -170,7 +174,7 @@ decl_module! {
);
}

#[weight = 0]
#[weight = T::DbWeight::get().reads_writes(1, 1).saturating_add(40_000_000)]
fn cancel_swap(
origin,
target: AccountIdFor<T>,
Expand Down