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.

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

Jump to bottom

Check prepaid balance #86

Closed
wants to merge 3 commits into from
Closed

Check prepaid balance #86

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
2e20a7d
Check prepaid balance
iteyelmp May 16, 2024
320dadb
Merge remote-tracking branch 'origin/main' into pay
iteyelmp Jun 13, 2024
83b72b9
fix deploy.js
iteyelmp Jun 13, 2024
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
1 change: 1 addition & 0 deletions contracts/EthStorageContract.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ contract EthStorageContract is StorageContract, Decoder {
address _treasury,
address _owner
) public payable initializer {
require(msg.value >= prepaidAmount, "prepaid amount is not enough");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

prepaidAmount is not set value yet, is it _prepaidAmount that we should check?
Maybe a better place is inside __init_storage in StorageContract?

__init_storage(_minimumDiff, _prepaidAmount, _nonceLimit, _treasury, _owner);
}

Expand Down
19 changes: 12 additions & 7 deletions scripts/deploy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const config = [
];
const storageCost = 1500000000000000; // storageCost - 1,500,000Gwei forever per blob - https://ethresear.ch/t/ethstorage-scaling-ethereum-storage-via-l2-and-da/14223/6#incentivization-for-storing-m-physical-replicas-1
const dcfFactor = 340282366367469178095360967382638002176n; // dcfFactor, it mean 0.95 for yearly discount
const prepaidAmount = 3145728000000000000000n; // prepaidAmount - 50% * 2^39 / 131072 * 1500000Gwei, it also means 3145 ETH for half of the shard

async function verifyContract(contract, args) {
if (!process.env.ETHERSCAN_API_KEY) {
Expand Down Expand Up @@ -52,16 +53,20 @@ async function deployContract() {

const data = implContract.interface.encodeFunctionData("initialize", [
4718592000, // minimumDiff 5 * 3 * 3600 * 1024 * 1024 / 12 = 4718592000 for 5 replicas that can have 1M IOs in one epoch
3145728000000000000000n, // prepaidAmount - 50% * 2^39 / 131072 * 1500000Gwei, it also means 3145 ETH for half of the shard
prepaidAmount, // prepaidAmount - 50% * 2^39 / 131072 * 1500000Gwei, it also means 3145 ETH for half of the shard
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove comments?
no need "// prepaidAmount - 50% ..."

1048576, // nonceLimit 1024 * 1024 = 1M samples and finish sampling in 1.3s with IO rate 6144 MB/s: 4k * 2(random checks) / 6144 = 1.3s
treasuryAddress, // treasury
ownerAddress,
]);
console.log(impl, ownerAddress, data);
const EthStorageUpgradeableProxy = await hre.ethers.getContractFactory("EthStorageUpgradeableProxy");
const ethStorageProxy = await EthStorageUpgradeableProxy.deploy(impl, ownerAddress, data, { gasPrice: gasPrice });
const ethStorageProxy = await EthStorageUpgradeableProxy.deploy(impl, ownerAddress, data, {
gasPrice: gasPrice,
value: prepaidAmount
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure if we allocate 3145 ETH when deploying the contract. Do we?

});
await ethStorageProxy.deployed();
const admin = await ethStorageProxy.admin();
console.log("balance of " + ethStorageProxy.address, await hre.ethers.provider.getBalance(ethStorageProxy.address));

console.log("storage admin address is ", admin);
console.log("storage contract address is ", ethStorageProxy.address);
Expand All @@ -73,11 +78,11 @@ async function deployContract() {
new Date().toLocaleTimeString([], { hour: "2-digit", minute: "2-digit", second: "2-digit" })
);

// fund 0.5 eth into the storage contract to give reward for empty mining
const ethStorage = StorageContract.attach(ethStorageProxy.address);
const tx = await ethStorage.sendValue({ value: hre.ethers.utils.parseEther("0.5") });
await tx.wait();
console.log("balance of " + ethStorage.address, await hre.ethers.provider.getBalance(ethStorage.address));
// // fund 0.5 eth into the storage contract to give reward for empty mining
// const ethStorage = StorageContract.attach(ethStorageProxy.address);
// const tx = await ethStorage.sendValue({ value: hre.ethers.utils.parseEther("0.5") });
// await tx.wait();
// console.log("balance of " + ethStorageProxy.address, await hre.ethers.provider.getBalance(ethStorageProxy.address));

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes made to deploy.js may need to apply to deployL2.js.

// verify contract
await verifyContract(ethStorageProxy.address);
Expand Down
Loading