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.

Sign up for GitHub

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

ICS100 Atomic Swap #867

Merged
merged 98 commits into from
Mar 6, 2023
Merged

ICS100 Atomic Swap #867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
ffc54df
create a clean copy to for PR
liangping Oct 19, 2022
90a8ef2
Update spec/app/ics-100-atomic-swap/README.md
liangping Nov 2, 2022
a0b8455
Update spec/app/ics-100-atomic-swap/README.md
liangping Nov 2, 2022
f35e89c
Update spec/app/ics-100-atomic-swap/README.md
liangping Nov 2, 2022
806a3e6
Update spec/app/ics-100-atomic-swap/README.md
liangping Nov 2, 2022
a398191
Update spec/app/ics-100-atomic-swap/README.md
liangping Nov 2, 2022
a990bc8
incorporate feedbacks
egunawan85 Nov 5, 2022
38f3115
incorporate feedbacks
egunawan85 Nov 5, 2022
93bffc3
Merge pull request #8 from s16rv/atomic-swap
liangping Nov 5, 2022
c434e88
remove cancel functions
liangping Nov 7, 2022
7d2ed9c
re-organize the flow and code
liangping Nov 8, 2022
cf028bf
save taker to the order when it is filled
liangping Nov 8, 2022
14983d8
polish language
egunawan85 Nov 8, 2022
f7bea6e
change order status when refund
liangping Nov 9, 2022
f22ce34
improve the cancel flow
liangping Nov 11, 2022
ffcf8e4
Merge branch 'liangping:atomic-swap-draft' into atomic-swap-draft
egunawan85 Nov 11, 2022
07873c2
polish text
egunawan85 Nov 11, 2022
097ec4e
Merge pull request #10 from s16rv/atomic-swap-draft
liangping Nov 12, 2022
f0392a7
Merge pull request #9 from liangping/atomic-swap-draft
liangping Nov 12, 2022
879c30b
add source_port and source_channel
liangping Nov 12, 2022
c86eb43
Merge pull request #11 from liangping/atomic-swap-draft
liangping Nov 12, 2022
3881594
fix incorrect comment in OnReceive and OnAcknowledgement
liangping Nov 13, 2022
fb05f25
Merge branch 'atomic-swap-draft' into atomic-swap
liangping Nov 13, 2022
1460316
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 14, 2022
2bbc831
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 14, 2022
1e0204f
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 14, 2022
573bcde
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 14, 2022
551c386
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 14, 2022
6ce60d9
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 14, 2022
2640dc5
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 14, 2022
f055478
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 14, 2022
485bb98
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 14, 2022
860e21c
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 14, 2022
8db2a7b
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 14, 2022
8230374
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 14, 2022
d7e80c4
Apply suggestions from code review
liangping Dec 14, 2022
12fddfc
improve spec
liangping Dec 15, 2022
445ff8c
fix typo
liangping Dec 15, 2022
d76308d
Update spec/app/ics-100-atomic-swap/README.md
liangping Dec 20, 2022
c58a6f0
modify destination reference
egunawan85 Dec 20, 2022
62b8b2b
return ack on receivePacket(), use channelId + orderId as store key f…
liangping Dec 20, 2022
695e81c
add nonce in Maker Msg in order to make the order id unique
liangping Dec 20, 2022
6be9eb5
add channel in messages
liangping Dec 20, 2022
fd964ac
refactor the channel name
liangping Dec 20, 2022
396a09d
Merge pull request #12 from s16rv/atomic-swap
liangping Dec 20, 2022
f92686a
additional info on cancels and timeouts
egunawan85 Dec 20, 2022
8405957
additional info on cancels and timeouts
egunawan85 Dec 20, 2022
259224e
additional info on cancels and timeouts
egunawan85 Dec 20, 2022
c087b81
additional info on cancels and timeouts
egunawan85 Dec 20, 2022
596f8e7
additional info on cancels and timeouts
egunawan85 Dec 20, 2022
f34854a
formatting style and consistency fixes
crodriguezvega Dec 22, 2022
c3e1ac5
fix alignment
crodriguezvega Dec 22, 2022
c960fc8
more style fixes
crodriguezvega Dec 22, 2022
4bc7899
fixed portId issue on takeMsg
liangping Dec 22, 2022
9f6b3fb
use both portId and channelId field in the order
liangping Dec 22, 2022
4fdcb64
Merge branch 'atomic-swap' into atomic-swap
egunawan85 Dec 22, 2022
7ed5f82
Merge pull request #13 from s16rv/atomic-swap
liangping Dec 22, 2022
ebbf7c8
refund if orderId is not empty
liangping Dec 22, 2022
a98deeb
Merge remote-tracking branch 'origin/atomic-swap' into atomic-swap
liangping Dec 22, 2022
8706436
fix typo
liangping Dec 22, 2022
aaa17dd
change order expiration to message expiration.
liangping Dec 22, 2022
9c54999
change typo
liangping Dec 22, 2022
0adfbb1
improve the refund
liangping Dec 23, 2022
5690e86
Clarify regarding timeout window
egunawan85 Dec 23, 2022
03eb6fb
Merge pull request #14 from s16rv/atomic-swap
liangping Dec 23, 2022
562f8f0
changed timestamp types to unit64 + fixed some nits
crodriguezvega Jan 10, 2023
5c4a3bb
replaced []byte with bytes
crodriguezvega Jan 10, 2023
1f93541
Update spec/app/ics-100-atomic-swap/README.md
liangping Feb 6, 2023
55831ac
Update spec/app/ics-100-atomic-swap/README.md
liangping Feb 6, 2023
dd0f362
Update spec/app/ics-100-atomic-swap/README.md
liangping Feb 6, 2023
df88515
replace > with >=
liangping Feb 6, 2023
f349b76
use token.amount and denom in sendCoin
liangping Feb 6, 2023
28cb0b1
change store to privateStore, ICS24
liangping Feb 6, 2023
1698375
update get balance
liangping Feb 6, 2023
e15d46b
added more regarding atomicity
egunawan85 Feb 6, 2023
7243252
added more regarding atomicity
egunawan85 Feb 6, 2023
cfa9981
Merge pull request #15 from s16rv/atomic-swap
liangping Feb 6, 2023
b63cbc4
Update spec/app/ics-100-atomic-swap/README.md
liangping Feb 9, 2023
d484620
fixed wrong argument
liangping Feb 9, 2023
45f6d9b
Merge branch 'atomic-swap' of https://github.com/liangping/ibc into a…
liangping Feb 9, 2023
5e50b07
add ibc path to Order. and change algo for order id.
liangping Feb 9, 2023
b4d421c
write ack error instead of abort execution
liangping Feb 9, 2023
e132898
write ack error instead of abort execution
liangping Feb 9, 2023
b29832f
remove unused code
liangping Feb 9, 2023
98177c3
fixed escrow address error
liangping Feb 9, 2023
5aa3cae
use packet to generate order id
liangping Feb 12, 2023
3a1857c
update diagram
liangping Feb 15, 2023
23ddada
add lock / unlock order
liangping Feb 15, 2023
5d218e9
update diagram
liangping Feb 15, 2023
544419e
disable status check for now
liangping Feb 17, 2023
10f1fe8
update diagram
liangping Feb 17, 2023
ff58c9d
add token state changing
liangping Feb 24, 2023
c3a5d59
use Cancel Request instead of Cancel Order
liangping Feb 24, 2023
ac20c37
add status checker back on receive taker Msg
liangping Feb 24, 2023
4034e47
Update CODEOWNERS
crodriguezvega Feb 27, 2023
53dbbaf
Update CODEOWNERS
crodriguezvega Feb 27, 2023
ab74221
add banner message at the top of spec
crodriguezvega Feb 27, 2023
0689d43
Update CODEOWNERS
crodriguezvega Feb 27, 2023
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: 11 additions & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
# Default owners for repository
# 2/n quorum required for merge

* @mpoke @adityasripal @cwgoes @colin-axner
* @mpoke @adityasripal @cwgoes @colin-axner @angbrav

# CODEOWNERS for the CODEOWNER file

/.github/CODEOWNERS @mpoke @adityasripal @cwgoes @colin-axner @angbrav

# CODEOWNERS for the specs

/spec/app @adityasripal @cwgoes @colin-axner @angbrav

/spec/app/ics-028-cross-chain-validation @mpoke @adityasripal @cwgoes @angbrav
Loading