Skip to content
Open

Lp #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
8ef7340
fix(termination): add prev_timestamp offset
alexaunter Feb 2, 2022
737fef3
fix(terminate): remove empty final lockups instantly
alexaunter Feb 3, 2022
3a9275a
Merge commit '737fef3' into with_fixes
alexaunter Feb 3, 2022
ff7addd
fix(views): convert static view methods to regular ones
alexaunter Feb 4, 2022
289b351
Merge branch 'static_view_method_fix' into with_fixes
alexaunter Feb 4, 2022
daae567
test(termination): test basic termination with no vesting schedule
alexaunter Jan 31, 2022
e4ffb9d
test(hash_schedule): add test hash_schedule method
alexaunter Feb 4, 2022
fd37265
test(view): add validate schedule method tests
alexaunter Feb 5, 2022
30fb513
test(termination): add pre cliff termination test
alexaunter Feb 1, 2022
3ce4084
Merge pull request #2 from galactic3/early_release_fix
Apr 2, 2022
718b3dc
Merge remote-tracking branch 'origin' into galactic3-unremovable_empt…
Apr 3, 2022
06cbeea
Merge pull request #6 from NearDeFi/galactic3-unremovable_empty_locku…
Apr 3, 2022
5ebbbc3
Merge branch 'static_view_method_fix' of http://github.com/galactic3/…
Apr 3, 2022
404bc2c
Merge pull request #7 from NearDeFi/galactic3-static_view_method_fix
Apr 3, 2022
70fb349
Merge remote-tracking branch 'upstream/main'
alexaunter Apr 11, 2022
536e7c0
style: cargo fmt
alexaunter Apr 16, 2022
b470447
refactor(tests): move shared test contants
alexaunter Apr 16, 2022
65e0065
refactor(tests): split tests by feature
alexaunter Apr 16, 2022
6cb81ab
test(termination): add termination tests for different moments
alexaunter Jan 31, 2022
caa5b70
test(termination): add terminate after fully vested test
alexaunter Feb 7, 2022
419097c
test(deposit_whitelist): add deposit_whitelist tests
alexaunter Feb 7, 2022
afbf16c
test(view): add view methods tests
alexaunter Feb 7, 2022
f7e44cf
feat(view): expose token_account_id in contract api
alexaunter Feb 16, 2022
7468e77
refactor(tests): fix unit test issues
alexaunter Apr 18, 2022
e7892f8
Merge pull request #8 from galactic3/add_termination_tests
Apr 20, 2022
7f0bfc0
feat(terminate): add termination at specific timestamp
alexaunter Apr 17, 2022
6a29a0b
Merge pull request #10 from galactic3/custom_termination_date
May 24, 2022
dbb4d9a
feat(terminate): add one yocto check in terminate
alexaunter May 23, 2022
8dfd602
Merge pull request #16 from galactic3/make_terminate_payable
May 30, 2022
15a5b07
Merge pull request #1 from NearDeFi/main
vitalii427 Jun 3, 2022
4f89198
Add flag to Lockup
Jun 3, 2022
5b23405
Add incent
Jun 3, 2022
f1c9a39
Add draft
Jun 3, 2022
64028e0
Merge branch 'modify-ft-on-transfer' into add-mft-on-transfer
Jun 3, 2022
099c5e3
Add get pool
Jun 3, 2022
bd160dd
Make fmt
Jun 3, 2022
7d8692b
Add some math
Jun 3, 2022
f791bff
Add Lockup construct
Jun 3, 2022
f8b3ce2
Merge pull request #3 from PembROCK-Finance/add-mft-on-transfer
HolyGrease Jun 3, 2022
4931224
Merge pull request #2 from PembROCK-Finance/modify-ft-on-transfer
HolyGrease Jun 3, 2022
f04a1af
Fix
HolyGrease Jun 3, 2022
aa7d095
Add whitelist
Jun 3, 2022
a90b395
Add gas check
Jun 3, 2022
5a48db6
Set gas values
Jun 3, 2022
17a7f74
Merge pull request #4 from PembROCK-Finance/fix-gas
HolyGrease Jun 3, 2022
cb39380
Fix promise result
Jun 3, 2022
2353a7e
Merge branch 'lp' of https://github.com/PembROCK-Finance/ft-lockup-co…
Jun 3, 2022
03f845e
Fix token find
Jun 3, 2022
bbfc3c0
Fix overflow
Jun 3, 2022
aa62329
Fix build error
Jun 3, 2022
325ead1
Add whitelist
Jun 3, 2022
ce50ae8
Merge branch 'lp' into add-whitelist
Jun 3, 2022
0f8089c
Merge pull request #5 from PembROCK-Finance/add-whitelist
HolyGrease Jun 3, 2022
194209f
Minor changes
Jun 3, 2022
9998d21
Revert "Minor changes"
Jun 3, 2022
58bbea8
Revert "Revert "Minor changes""
Jun 3, 2022
8563b7c
Minor changes
Jun 3, 2022
c745bf5
Merge pull request #6 from PembROCK-Finance/refactor
HolyGrease Jun 3, 2022
cc775f9
Add amount to logs
Jun 3, 2022
66fd491
Clean up
Jun 3, 2022
277581c
Merge pull request #7 from PembROCK-Finance/more-info-in-log
HolyGrease Jun 3, 2022
186dd62
Enable/disable contract
vitalii427 Jun 3, 2022
3a90add
Merge pull request #8 from PembROCK-Finance/enable-disable
vitalii427 Jun 6, 2022
eb63dc6
Change storage
Jun 6, 2022
8dff0f3
Save shares
Jun 6, 2022
6044a7f
Impl fmt transfer & call
Jun 6, 2022
d9c304e
Add incent locked amount
Jun 6, 2022
52f396e
Impl mft transfer & call
Jun 6, 2022
995438a
Add view method
Jun 6, 2022
d38e8df
Minor changes
Jun 6, 2022
94086b8
Change storage
Jun 6, 2022
dc91873
Add view fn
Jun 6, 2022
39d33b1
Minor changes
Jun 7, 2022
68a5a04
recalc gas for mft_on_transfer
vitalii427 Jun 7, 2022
49222be
recalc gas for mft
vitalii427 Jun 7, 2022
633b6c5
fix warning
vitalii427 Jun 7, 2022
60da180
small fix
vitalii427 Jun 7, 2022
a269c64
Merge pull request #9 from PembROCK-Finance/PEM-314-mft-transfer-call…
vitalii427 Jun 7, 2022
1602bc0
Add assert one yocto
Jun 7, 2022
b65dac0
Add owner check
Jun 7, 2022
ee6d928
Add comment
Jun 7, 2022
af55751
Fix tests&add draft
Jun 7, 2022
1c0c7eb
minor changes
vitalii427 Jun 7, 2022
9aaf541
rlib
vitalii427 Jun 7, 2022
ca7f32b
fix
vitalii427 Jun 7, 2022
ae23a5b
Minor changes
Jun 7, 2022
f8a6f73
Ignore not impl tests
Jun 7, 2022
a20bea8
Merge pull request #10 from PembROCK-Finance/checks-for-mft-proxy
vitalii427 Jun 7, 2022
a1fe393
rebuild wasm
vitalii427 Jun 7, 2022
fab88cb
Impl tests for proxy mft
Jun 7, 2022
9e54300
Add workflow for tests/fmt/lint
Jun 7, 2022
e1ba5a6
Remove for incent field
Jun 7, 2022
bac0ca3
Test to check owner
Jun 8, 2022
0fcc118
Merge pull request #11 from PembROCK-Finance/add-workflows
vitalii427 Jun 8, 2022
29c9aa7
Merge pull request #12 from PembROCK-Finance/save-storage
vitalii427 Jun 8, 2022
fa36971
Add success test
Jun 8, 2022
a8f3f3b
View get_state
Jun 8, 2022
82419b3
Add check contract enabled
Jun 8, 2022
8679efd
Move
Jun 8, 2022
2cc83cb
Lockup duration const
Jun 8, 2022
5dfccae
Merge pull request #14 from PembROCK-Finance/get-state
vitalii427 Jun 8, 2022
4c249cb
Return key as string
Jun 8, 2022
d4c6147
quick fix
vitalii427 Jun 8, 2022
53c8bfe
Merge pull request #16 from PembROCK-Finance/fix-get-tokens
vitalii427 Jun 8, 2022
e758a75
Draft full flow test
Jun 8, 2022
ecfa60f
Merge branch 'lp' into unit-tests
Jun 8, 2022
19dbaa1
Impl test
Jun 8, 2022
e4e8cb4
Fix
Jun 8, 2022
ee5e77e
Merge branch 'lp' into unit-tests
vitalii427 Jun 8, 2022
525f033
fix
vitalii427 Jun 8, 2022
8e7d2e6
rename
vitalii427 Jun 8, 2022
6d22edf
fix
vitalii427 Jun 8, 2022
03b9b14
real data
vitalii427 Jun 8, 2022
7f737c1
fmt
vitalii427 Jun 8, 2022
e5aae3e
check shares
vitalii427 Jun 8, 2022
fb9f279
rename
vitalii427 Jun 8, 2022
41fd6a9
Merge pull request #13 from PembROCK-Finance/unit-tests
vitalii427 Jun 8, 2022
866bd46
Rebuild res/ft_lockup.wasm
valar999 Jun 15, 2022
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
75 changes: 75 additions & 0 deletions .github/worflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: Linter

on: push

jobs:
fmt:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: cargo fmt --all --check

build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/cache@v3
with:
path: |
~/.cargo/registry/index
~/.cargo/registry/cache
target
key: cargo-build-${{ hashFiles('Cargo.*') }}

- run: cargo build

build-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/cache@v3
with:
path: |
~/.cargo/registry/index
~/.cargo/registry/cache
target
key: cargo-build-release-${{ hashFiles('Cargo.*') }}

- run: rustup target add wasm32-unknown-unknown

- run: cargo build --target wasm32-unknown-unknown --release

check-warnings:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/cache@v3
with:
path: |
~/.cargo/registry/index
~/.cargo/registry/cache
target
key: cargo-warnings-${{ hashFiles('Cargo.*') }}

- run: cargo build
env:
RUSTFLAGS: "-D warnings"

clippy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/cache@v3
with:
path: |
~/.cargo/registry/index
~/.cargo/registry/cache
target
key: cargo-clippy-${{ hashFiles('Cargo.*') }}

- run: cargo clippy

19 changes: 19 additions & 0 deletions .github/worflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Tests

on: push

jobs:
unit-tests:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/cache@v3
with:
path: |
~/.cargo/registry/index
~/.cargo/registry/cache
target
key: cargo-unittests-${{ hashFiles('Cargo.*') }}

- run: cargo test
Loading