Skip to content

Fix addresses #13

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

Open
livnev wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix addresses #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac188d0
bin/conf/hevm.sh: fix address constants for latest version of hevm
hermetic-himbo Apr 1, 2020
517406c
Makefile: pin solc version with --use
hermetic-himbo Apr 1, 2020
a28d2cd
chai.t.sol: update addresses in tests
hermetic-himbo Apr 1, 2020
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
SOLC_VERSION="0.5.12"

all :; dapp build
clean :; dapp clean
deploy :; dapp create Chai
test:
NETWORK=hevm ./bin/set_constants
dapp test || NETWORK=mainnet ./bin/set_constants
dapp --use solc:${SOLC_VERSION} test || NETWORK=mainnet ./bin/set_constants
NETWORK=mainnet ./bin/set_constants
10 changes: 5 additions & 5 deletions bin/conf/hevm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CHAIN_ID=99
ADDRESS=0xd122f8f92737fc00fb3d62d4ed9244d393663870
VAT=0x0F1c6673615352379AFC1a60e3D0234101D67eb2
POT=0xc351B89C286288B9201835f78dbbccaDA357671e
JOIN=0x2D6B98058E84Dcb8b57fb8C79613bD858af65975
DAI=0x959DC1D68ba3a9f6959239135bcbc854b781eb9a
ADDRESS=0x3fa733B07a7cEBB28aE4da05054fbcb53eC4ee4c
VAT=0xE58d97b6622134C0436d60daeE7FBB8b965D9713
POT=0xDB356e865AAaFa1e37764121EA9e801Af13eEb83
JOIN=0x956378240adc1e2Ce39bCA0e957bE5324e846a4E
DAI=0xEcEDFd8BA8ae39a6Bd346Fe9E5e0aBeA687fFF31
6 changes: 3 additions & 3 deletions src/test/chai.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ contract ChaiTest is DSTest, ChaiSetup {
}

function test_chai() public {
assertEq(address(chai), address(0xd122F8f92737FC00Fb3d62d4eD9244D393663870));
assertEq(address(chai), address(0x3fa733B07a7cEBB28aE4da05054fbcb53eC4ee4c));
}

function test_join_then_exit() public {
Expand Down Expand Up @@ -435,15 +435,15 @@ contract TokenTest is DSTest, ChaiSetup {
function testChaiAddress() public {
//The dai address generated by hevm
//used for signature generation testing
assertEq(address(chai), address(0xd122F8f92737FC00Fb3d62d4eD9244D393663870));
assertEq(address(chai), address(0x3fa733B07a7cEBB28aE4da05054fbcb53eC4ee4c));
}

function testTypehash() public {
assertEq(chai.PERMIT_TYPEHASH(), 0xea2aa0a1be11a07ed86d755c93467f4f82362b452371d1ba94d1715123511acb);
}

function testDomain_Separator() public {
assertEq(chai.DOMAIN_SEPARATOR(), 0x388ddaf68a6d95f0638353feb69385f7b35449d69961073c34f6977bc907fb8c);
assertEq(chai.DOMAIN_SEPARATOR(), 0x9e181843763782d3938b68be3f5e957c1fe62ef2b84b0669f36a91214edb4806);
}

function testPermit() public {
Expand Down