Skip to content
This repository was archived by the owner on Jul 13, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
a1d1455
add contracts
GregTheGreek Dec 12, 2019
444633f
cleanup code
GregTheGreek Dec 12, 2019
55ac252
remove multisig code
GregTheGreek Dec 12, 2019
0d597ff
remove admin
GregTheGreek Dec 12, 2019
1686a07
add validator
GregTheGreek Dec 12, 2019
b40915b
remove null from vote
GregTheGreek Dec 12, 2019
0eb8aef
add prefix Deposit to vote and proposals
GregTheGreek Dec 12, 2019
07c6dcd
address changes
GregTheGreek Dec 12, 2019
0d14c1f
fix final change
GregTheGreek Dec 12, 2019
9bf0974
rename contacts dir
GregTheGreek Dec 12, 2019
653b1b4
truffle
GregTheGreek Dec 12, 2019
e8bbd1d
remove embark
GregTheGreek Dec 12, 2019
4119882
add vlaidator count
GregTheGreek Dec 12, 2019
096d8c3
test work
GregTheGreek Dec 14, 2019
bcd0c58
add validator proposal tests
GregTheGreek Dec 15, 2019
2e7eeb6
add node workflow
GregTheGreek Dec 15, 2019
34c3875
clean up node yaml
GregTheGreek Dec 15, 2019
74a850a
cd to correct dir
GregTheGreek Dec 15, 2019
8e64762
rename to receiver
GregTheGreek Dec 15, 2019
387f3f7
minor changes
GregTheGreek Dec 15, 2019
67ebea5
add basic deposit tests
GregTheGreek Dec 15, 2019
3c15a4b
remove pacakge
GregTheGreek Dec 15, 2019
0bdae3b
seperate tests
GregTheGreek Dec 15, 2019
0ddfa20
stuff
GregTheGreek Dec 15, 2019
f0ca6a3
add more tests
GregTheGreek Dec 15, 2019
22fdbc7
rename contrat tests
GregTheGreek Dec 15, 2019
b3e74ea
refactor
GregTheGreek Dec 15, 2019
fd4bca1
add theshold tests
GregTheGreek Dec 16, 2019
a842ee7
add edge case
GregTheGreek Dec 17, 2019
34d7e51
refactor tests to individual files
GregTheGreek Dec 17, 2019
58b68cf
update Makefile
noot Dec 17, 2019
9395b2c
address comments
GregTheGreek Dec 17, 2019
00b0363
Merge branch 'greg/contracts/intial' of github.com:ChainSafe/ChainBri…
GregTheGreek Dec 17, 2019
1325de8
add coments
GregTheGreek Dec 17, 2019
47c6ae0
fix test
GregTheGreek Dec 17, 2019
b89ee51
Merge branch 'master' into greg/contracts/intial
GregTheGreek Dec 18, 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
22 changes: 22 additions & 0 deletions .github/workflows/node.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Node CI

on: [push]

jobs:
test:
name: EVM Contract Tests
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- name: Use Node.js 12.x
uses: actions/setup-node@v1
with:
node-version: 12.x
- name: npm install, and test
run: |
cd contracts/evm-contracts/
npm install
./node_modules/.bin/truffle test
env:
CI: true
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,7 @@ run:
test:
@echo " > \033[32mRunning tests...\033[0m "
./scripts/test.sh

truffle_test:
@echo " > \033[32mRunning truffle test... \033[0m "
@cd contracts/evm-contracts && node_modules/.bin/truffle test
23 changes: 23 additions & 0 deletions contracts/evm-contracts/contracts/Migrations.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
pragma solidity >=0.4.21 <0.6.0;

contract Migrations {
address public owner;
uint public last_completed_migration;

constructor() public {
owner = msg.sender;
}

modifier restricted() {
if (msg.sender == owner) _;
}

function setCompleted(uint completed) public restricted {
last_completed_migration = completed;
}

function upgrade(address new_address) public restricted {
Migrations upgraded = Migrations(new_address);
upgraded.setCompleted(last_completed_migration);
}
}
Loading