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.

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

[ECO-2489] Add emojicoin arena Move prototype #408

Merged
merged 65 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
65 commits
Select commit Hold shift + click to select a range
95de171
Add rewards escrow
alnoki Nov 22, 2024
7e4c9c3
Update README
alnoki Nov 22, 2024
dfcd42c
Add arena stub
alnoki Nov 22, 2024
c3c52a3
Add first melee init
alnoki Nov 22, 2024
a517ccc
Revert tiered rewards changes
alnoki Nov 22, 2024
4e91f77
Add entry entry func
alnoki Nov 23, 2024
7c3c726
Add swap API
alnoki Nov 23, 2024
9da045f
Finalize prototype
alnoki Nov 23, 2024
6de06c9
Update few params from review
alnoki Nov 23, 2024
566bf30
Relocate to new dir
alnoki Dec 2, 2024
0952fc5
Make compilation succed
alnoki Dec 2, 2024
08fe32f
Use concise type args
alnoki Dec 2, 2024
db71ab8
Rename module
alnoki Dec 2, 2024
1a76472
Add helper to get number of registered markets
alnoki Dec 2, 2024
b3a8cd9
Add psuedo-randomness module
alnoki Dec 2, 2024
62f444e
Finalize pseudo-randomness, tidy up vars
alnoki Dec 2, 2024
75a3184
Add indexing fields
alnoki Dec 3, 2024
846b949
Add fields to track coin escrow holdings
alnoki Dec 3, 2024
4e60e0f
Add assorted abstractions
alnoki Dec 3, 2024
fd76e2f
Add new melee parameter setters
alnoki Dec 3, 2024
3dbe1d9
Add more abstractions, tuning
alnoki Dec 3, 2024
ce98ef5
Add matching abstraction
alnoki Dec 3, 2024
d851509
Add entered/exited melee indexing
alnoki Dec 10, 2024
75c7570
Switch to interpolation without lock-in period
alnoki Dec 14, 2024
3142571
Add abort for unsuccessful lock in
alnoki Dec 14, 2024
129d45e
Abstract swap buy into escrow
alnoki Dec 14, 2024
72d9af5
Add swap within escrow helper
alnoki Dec 14, 2024
57b0388
Abstract swapping with stats
alnoki Dec 14, 2024
b8afef6
Simplify side selection logic
alnoki Dec 14, 2024
2043f04
Add additional indexing, spell escapes
alnoki Dec 14, 2024
29e3d43
Revert rewards module changes
alnoki Dec 14, 2024
93fc7ee
Alphabetize inline func
alnoki Dec 14, 2024
cdc1a95
Tweak match amount math
alnoki Dec 14, 2024
6243746
Remove admin setter guardrails
alnoki Dec 17, 2024
88c4770
Clarify table helper func names
alnoki Dec 17, 2024
3b50bcd
Refactor crank burden during error handling
alnoki Dec 17, 2024
e40c8ac
Add pseudo-randomness rationale
alnoki Dec 17, 2024
75a668e
Run mdformat, fix spell error
alnoki Dec 17, 2024
7534bf9
Refactor inline exit func var passing
alnoki Dec 17, 2024
cd5b9e2
Add available rewards setter funcs
alnoki Dec 17, 2024
03ca8d1
Update src/move/emojicoin_arena/README.md
alnoki Dec 18, 2024
a6a4eb5
Fix line breaking
alnoki Dec 18, 2024
ce7856b
Add swap buy/sell wrappers
alnoki Dec 18, 2024
5e71013
Update src/move/emojicoin_arena/sources/pseudo_randomness.move
alnoki Dec 18, 2024
78c992e
Update available rewards comment
alnoki Dec 18, 2024
4561196
Update src/move/emojicoin_arena/sources/emojicoin_arena.move
alnoki Dec 18, 2024
b240f04
Update melee ID typo
alnoki Dec 18, 2024
331da3e
Update doc comment on tap out fee
alnoki Dec 18, 2024
8155b7f
Update src/move/emojicoin_arena/sources/emojicoin_arena.move
alnoki Dec 18, 2024
f694f3b
Specify next vs new melee
alnoki Dec 18, 2024
12b9848
Update src/move/emojicoin_arena/sources/emojicoin_arena.move
alnoki Dec 18, 2024
f219e9c
Clarify match math
alnoki Dec 18, 2024
05b84a5
Add assorted escrow/index update logic
alnoki Dec 18, 2024
63e7e80
Add more melee-level indexing
alnoki Dec 18, 2024
c93ece6
Update locked in exit indexing
alnoki Dec 18, 2024
21441ea
Update entered/matched fields
alnoki Dec 19, 2024
68b273f
Add total emojicoins locked calculations
alnoki Dec 19, 2024
3e13dbe
Add struct prefix
alnoki Dec 19, 2024
cac0d71
Simplify fields schema
alnoki Dec 19, 2024
324bed3
Rename to escrow
alnoki Dec 19, 2024
ea2b5d8
Add assorted onchain indexing
alnoki Dec 19, 2024
ba1d1d8
Add preliminary indexing logic
alnoki Dec 19, 2024
cf2e7e8
Update src/move/emojicoin_arena/sources/emojicoin_arena.move
alnoki Dec 20, 2024
d7d8e92
Update line breaking
alnoki Dec 20, 2024
2cb919a
Merge branch 'main' into ECO-2489
alnoki Dec 20, 2024
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
4 changes: 3 additions & 1 deletion cfg/cspell-dictionary.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
ADBEEF
adbeef
aland
allowlister
aptn
aptos
aptoslabs
auid
autoscale
barthelemy
bento
Expand Down Expand Up @@ -66,6 +67,7 @@ marino
mayen
melilla
merperson
metadatas
moai
mosquitto
mqtt
Expand Down
18 changes: 18 additions & 0 deletions src/move/emojicoin_arena/Move.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[addresses]
arena = "_"
integrator = "_"

[dependencies.EmojicoinDotFun]
local = "../emojicoin_dot_fun"

[dev-addresses]
arena = "0xaaa"
coin_factory = "0xbbb"
emojicoin_dot_fun = "0xc0de"
integrator = "0xddd"

[package]
authors = ["Econia Labs ([email protected])"]
name = "EmojicoinArena"
upgrade_policy = "compatible"
alnoki marked this conversation as resolved.
Show resolved Hide resolved
version = "1.0.0"
11 changes: 11 additions & 0 deletions src/move/emojicoin_arena/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Emojicoin Arena

## A note on pseudo-randomness

Since randomness is not supported in `init_module` per [`aptos-core` #15436],
psuedo-random proxies are used for the first crank. For a detailed rationale
alnoki marked this conversation as resolved.
Show resolved Hide resolved
that explains how this is effectively random in practice, see
[this `emojicoin-dot-fun` pull request comment].

[this `emojicoin-dot-fun` pull request comment]: https://github.com/econia-labs/emojicoin-dot-fun/pull/408#discussion_r1887856202
[`aptos-core` #15436]: https://github.com/aptos-labs/aptos-core/issues/15436
Loading
Loading