Skip to content

Avoiding initial set transactions by updating in constructors #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
othernamesweretaken wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Avoiding initial set transactions by updating in constructors #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions hh-integration-test/integration-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ describe("Mirakai Full integration tests", function () {
[owner, addr1, addr2, ...addrs] = await ethers.getSigners();

mirakaiScrolls = await mirakaiScrollsFactory.deploy();
mirakaiScrollsRenderer = await mirakaiScrollsRendererFactory.deploy();
mirakaiDnaParser = await mirakaiDnaParserFactory.deploy();
mirakaiScrollsRenderer = await mirakaiScrollsRendererFactory.deploy(mirakaiDnaParser.address);
mirakaiHeroes = await mirakaiHeroesFactory.deploy();
mirakaiHeroesRenderer = await mirakaiHeroesRendererFactory.deploy("mock.com/");
mirakaiDnaParser = await mirakaiDnaParserFactory.deploy();
orbs = await orbsFactory.deploy("mock", "mock", 18, 10);
orbs = await orbsFactory.deploy("mock", "mock", 18, 10, mirakaiScrolls.address);

await mirakaiScrolls.initialize(
mirakaiScrollsRenderer.address,
Expand All @@ -65,8 +65,8 @@ describe("Mirakai Full integration tests", function () {
0
);

await mirakaiScrollsRenderer.setmirakaiDnaParser(mirakaiDnaParser.address);
await orbs.setmirakaiScrolls(mirakaiScrolls.address);
//await mirakaiScrollsRenderer.setmirakaiDnaParser(mirakaiDnaParser.address);
//await orbs.setmirakaiScrolls(mirakaiScrolls.address);

const files = [];

Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions script/deploy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,15 @@ contract Deploy is TestVm {

MirakaiDnaParser mirakaiDnaParser = new MirakaiDnaParser();

MirakaiScrollsRenderer mirakaiScrollsRenderer = new MirakaiScrollsRenderer();
mirakaiScrollsRenderer.setmirakaiDnaParser(address(mirakaiDnaParser));

OrbsToken orbsToken = new OrbsToken("test", "test", 18, 2500);
MirakaiScrollsRenderer mirakaiScrollsRenderer = new MirakaiScrollsRenderer(address(mirakaiDnaParser));
//mirakaiScrollsRenderer.setmirakaiDnaParser(address(mirakaiDnaParser));

MirakaiHeroesRenderer mirakaiHeroesRenderer = new MirakaiHeroesRenderer(
"mock.com/"
);

MirakaiScrolls mirakaiScrolls = new MirakaiScrolls();
OrbsToken orbsToken = new OrbsToken("test", "test", 18, 2500, address(mirakaiScrolls));
mirakaiScrolls.initialize(
address(mirakaiScrollsRenderer),
address(orbsToken),
Expand All @@ -53,8 +52,8 @@ contract Deploy is TestVm {
0,
928374
);

orbsToken.setmirakaiScrolls(address(mirakaiScrolls));
//orbsToken.setmirakaiScrolls(address(mirakaiScrolls));

MirakaiHeroes mirakaiHeroes = new MirakaiHeroes();
mirakaiHeroes.initialize(
Expand Down
4 changes: 3 additions & 1 deletion src/MirakaiScrollsRenderer.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ contract MirakaiScrollsRenderer is Ownable {
string colorFour;
}

constructor() {}
constructor(address _mirakaDnaParser) {
mirakaDnaParser = _mirakaDnaParser;
}

/**
* @dev essentially creating jsonify by constructing the metadata json + SVG image. Pain.
Expand Down
7 changes: 5 additions & 2 deletions src/OrbsToken/OrbsToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ contract OrbsToken is Ownable, GIGADRIP20 {
string memory _name,
string memory _symbol,
uint8 _decimals,
uint256 _emissionRatePerBlock
) GIGADRIP20(_name, _symbol, _decimals, _emissionRatePerBlock) {}
uint256 _emissionRatePerBlock,
address _mirakaiScrolls
) GIGADRIP20(_name, _symbol, _decimals, _emissionRatePerBlock) {
mirakaiScrolls = _mirakaiScrolls;
}

/*==============================================================
== Dripping Functions ==
Expand Down
8 changes: 4 additions & 4 deletions test/MirakaiHeroes.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ contract MirakaiHeroesTest is DSTest, TestVm {
function setUp() public {
mirakaiHeroes = new MirakaiHeroes();
mirakaiHeroesRenderer = new MirakaiHeroesRenderer("mock.com/");
mirakaiScrollsRenderer = new MirakaiScrollsRenderer();
mirakaiDnaParser = new MirakaiDnaParser();
mirakaiScrollsRenderer = new MirakaiScrollsRenderer(address(mirakaiDnaParser));
mirakaiScrolls = new MirakaiScrolls();
orbs = new OrbsToken("mock", "mock", 18, 10);
orbs = new OrbsToken("mock", "mock", 18, 10, address(mirakaiScrolls));

mirakaiHeroes.initialize(
address(mirakaiHeroesRenderer),
Expand All @@ -53,8 +53,8 @@ contract MirakaiHeroesTest is DSTest, TestVm {
0 // seed
);

mirakaiScrollsRenderer.setmirakaiDnaParser(address(mirakaiDnaParser));
orbs.setmirakaiScrolls(address(mirakaiScrolls));
//mirakaiScrollsRenderer.setmirakaiDnaParser(address(mirakaiDnaParser));
//orbs.setmirakaiScrolls(address(mirakaiScrolls));
setDnaParserTraitsAndWeights();
}

Expand Down
8 changes: 4 additions & 4 deletions test/MirakaiScrolls.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ contract MirakaiScrollsTest is DSTest, TestVm {
address user3 = 0xdb3f55B9559566c57987e523Be1aFb09Dd5df59c;

function setUp() public {
mirakaiScrollsRenderer = new MirakaiScrollsRenderer();
mirakaiDnaParser = new MirakaiDnaParser();
mirakaiScrollsRenderer = new MirakaiScrollsRenderer(address(mirakaiDnaParser));
mirakaiScrolls = new MirakaiScrolls();
orbs = new OrbsToken("mock", "mock", 18, 10);
orbs = new OrbsToken("mock", "mock", 18, 10, address(mirakaiScrolls));

mirakaiScrolls.initialize(
address(mirakaiScrollsRenderer),
Expand All @@ -40,8 +40,8 @@ contract MirakaiScrollsTest is DSTest, TestVm {
0, // rerollTraitCost
0 // seed
);
mirakaiScrollsRenderer.setmirakaiDnaParser(address(mirakaiDnaParser));
orbs.setmirakaiScrolls(address(mirakaiScrolls));
//mirakaiScrollsRenderer.setmirakaiDnaParser(address(mirakaiDnaParser));
//orbs.setmirakaiScrolls(address(mirakaiScrolls));
setDnaParserTraitsAndWeights();
}

Expand Down
5 changes: 2 additions & 3 deletions test/MirakaiScrollsRenderer.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ contract MirakaiScrollsRendererTest is DSTest, TestVm {
MirakaiDnaParser private mirakaiDnaParser;

function setUp() public {
mirakaiScrollsRenderer = new MirakaiScrollsRenderer();
mirakaiDnaParser = new MirakaiDnaParser();

mirakaiScrollsRenderer.setmirakaiDnaParser(address(mirakaiDnaParser));
mirakaiScrollsRenderer = new MirakaiScrollsRenderer(address(mirakaiDnaParser));
//mirakaiScrollsRenderer.setmirakaiDnaParser(address(mirakaiDnaParser));

string[] memory inputs = new string[](2);
inputs[0] = "cat";
Expand Down