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

Merge remove .idea #1

Open
wants to merge 31 commits into
base: docker
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
088e4ab
Use libeosdac
michaeljyeates Sep 14, 2019
02ffe52
Remove test code
michaeljyeates Sep 21, 2019
6a59f3b
Add run_tests.sh
michaeljyeates Sep 21, 2019
4b2ed05
Merge branch 'master' of github.com:EOS-DAO/eosdao-contracts
michaeljyeates Sep 21, 2019
60dcded
Merge branch 'master' into docker
michaeljyeates Sep 21, 2019
debecc5
Add NO_CMAKE_FIND_ROOT_PATH
michaeljyeates Sep 21, 2019
b5b4175
Configure custodian account and fix vote decay test
michaeljyeates Sep 21, 2019
771d360
Fix eosio symbol file and split tests into smaller files
michaeljyeates Sep 22, 2019
4f6731b
Use libeosdac
michaeljyeates Sep 22, 2019
abdf4d0
Remove extra debug statements
michaeljyeates Sep 22, 2019
57c7c81
Reorganise scripts and remove unused files
michaeljyeates Sep 22, 2019
c2b70b4
Update daccustodian
michaeljyeates Sep 22, 2019
c0383c4
Enable weightobsv again
michaeljyeates Sep 22, 2019
e5c39a1
Requireauth of self to clear weights
michaeljyeates Sep 22, 2019
3ecb302
Add ricardian contract for voting contract
michaeljyeates Sep 22, 2019
758bd20
Add tests for direct issue
michaeljyeates Sep 22, 2019
63d7870
_self -> get_self()
michaeljyeates Sep 22, 2019
b37f72a
Fix error message
michaeljyeates Sep 22, 2019
6486826
Add transfer_locked to stats
michaeljyeates Sep 22, 2019
a5ea527
Add voting test
michaeljyeates Sep 22, 2019
dafd7b1
Add check for new period failing
michaeljyeates Sep 22, 2019
086a39f
Add check for new period failing
michaeljyeates Sep 22, 2019
b40e9cc
Update to use token types from libeosdac
michaeljyeates Sep 22, 2019
e1ffff8
Use assertunlock
michaeljyeates Sep 22, 2019
69b0907
Remove verbose output
michaeljyeates Sep 22, 2019
5f7f059
Add entrypoint to dockerfile
michaeljyeates Sep 22, 2019
a2446bb
Run image after build
michaeljyeates Sep 22, 2019
233b205
Use weight type from libeosdac
michaeljyeates Sep 22, 2019
7848a5a
Add activation directory entry
michaeljyeates Sep 22, 2019
00c8407
Update daccustodian wasm
michaeljyeates Sep 22, 2019
adf5af8
Remove .idea folder
michaeljyeates Sep 26, 2019
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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "external/libeosdac"]
path = external/libeosdac
url = https://github.com/eosdac/libeosdac.git
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include(ExternalProject)

find_package(eosio.cdt)

message(STATUS "Building eosio.contracts v${VERSION_FULL}")
message(STATUS "Building eosdao.contracts v${VERSION_FULL}")

set(EOSIO_CDT_VERSION_MIN "1.6")
set(EOSIO_CDT_VERSION_SOFT_MAX "1.6")
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,7 @@ COPY /docker/run_compile.sh /
RUN mkdir /src
COPY . /src

RUN /run_compile.sh
CMD ["/run_compile.sh"]

ENTRYPOINT ["/bin/bash", "-l", "-c"]

23 changes: 0 additions & 23 deletions contracts/custodian/CMakeLists.txt

This file was deleted.

365 changes: 0 additions & 365 deletions contracts/custodian/README.md

This file was deleted.

3 changes: 0 additions & 3 deletions contracts/custodian/compile.sh

This file was deleted.

26 changes: 0 additions & 26 deletions contracts/custodian/config.cpp

This file was deleted.

5 changes: 0 additions & 5 deletions contracts/custodian/daccustodian.clauses.md

This file was deleted.

427 changes: 0 additions & 427 deletions contracts/custodian/daccustodian.contracts.md

This file was deleted.

22 changes: 0 additions & 22 deletions contracts/custodian/daccustodian.cpp

This file was deleted.

242 changes: 0 additions & 242 deletions contracts/custodian/daccustodian.hpp

This file was deleted.

Loading