added new address and generated new hash

owanemi · Dec 5, 2024 · 1869577 · 1869577
1 parent 0b5f2c4
commit 1869577
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 73 deletions.
diff --git a/script/DeployMerkleAirdrop.s.sol b/script/DeployMerkleAirdrop.s.sol
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.24;
+
+import {Script} from "forge-std/Script.sol";
+import { MerkleAirdrop } from "../src/MerkleAirdrop.sol";
+import {IERC20, SafeERC20} from "lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol"; 
+
+contract DeployMerkleAirdrop is Script {
+    using SafeERC20 for IERC20;
+    address public constant TOKEN = 0xBF68a24e5Be60B0c07247f054bb1564E7DC554F8;
+    bytes32 public constant s_merkleRootHash = 0x0f6c57ab57c9e81c1bc0c199923fb0eb300c775e342f11eb2764de29b995e509;
+
+
+    function deployMerkleAirdrop() public returns (MerkleAirdrop) {
+        vm.startBroadcast();
+        MerkleAirdrop airdrop = new MerkleAirdrop(s_merkleRootHash, IERC20(TOKEN));
+        return airdrop;
+        vm.stopBroadcast();
+    }
+
+    function run() external returns (MerkleAirdrop) {
+        return deployMerkleAirdrop();
+    }
+}
diff --git a/script/GenerateInput.s.sol b/script/GenerateInput.s.sol
@@ -18,7 +18,7 @@ contract GenerateInput is Script {
         types[1] = "uint";
         whitelist[0] = "0x6CA6d1e2D5347Bfab1d91e883F1915560e09129D";
         whitelist[1] = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266";
-        whitelist[2] = "0x2ea3970Ed82D5b30be821FAAD4a731D35964F7dd";
+        whitelist[2] = "0x63C6dF524ff9cC45B5824746bD4594504a50AAa4";
         whitelist[3] = "0xf6dBa02C01AF48Cf926579F77C9f874Ca640D91D";
         count = whitelist.length;
         string memory input = _createJSON();

diff --git a/script/target/input.json b/script/target/input.json
@@ -1,22 +1 @@
-{
-  "types": ["address", "uint"],
-  "count": 4,
-  "values": {
-    "0": {
-      "0": "0x6CA6d1e2D5347Bfab1d91e883F1915560e09129D",
-      "1": "25000000000000000000"
-    },
-    "1": {
-      "0": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-      "1": "25000000000000000000"
-    },
-    "2": {
-      "0": "0x2ea3970Ed82D5b30be821FAAD4a731D35964F7dd",
-      "1": "25000000000000000000"
-    },
-    "3": {
-      "0": "0xf6dBa02C01AF48Cf926579F77C9f874Ca640D91D",
-      "1": "25000000000000000000"
-    }
-  }
-}
+{ "types": ["address", "uint"], "count":4,"values": {"0": { "0":"0x6CA6d1e2D5347Bfab1d91e883F1915560e09129D", "1":"25000000000000000000" },"1": { "0":"0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", "1":"25000000000000000000" },"2": { "0":"0x63C6dF524ff9cC45B5824746bD4594504a50AAa4", "1":"25000000000000000000" },"3": { "0":"0xf6dBa02C01AF48Cf926579F77C9f874Ca640D91D", "1":"25000000000000000000" }} }
diff --git a/script/target/output.json b/script/target/output.json
@@ -1,50 +1 @@
-[
-  {
-    "inputs": [
-      "0x6CA6d1e2D5347Bfab1d91e883F1915560e09129D",
-      "25000000000000000000"
-    ],
-    "proof": [
-      "0x0fd7c981d39bece61f7499702bf59b3114a90e66b51ba2c53abdf7b62986c00a",
-      "0xe5ebd1e1b5a5478a944ecab36a9a954ac3b6b8216875f6524caa7a1d87096576"
-    ],
-    "root": "0xaa5d581231e596618465a56aa0f5870ba6e20785fe436d5bfb82b08662ccc7c4",
-    "leaf": "0xd1445c931158119b00449ffcac3c947d028c0c359c34a6646d95962b3b55c6ad"
-  },
-  {
-    "inputs": [
-      "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-      "25000000000000000000"
-    ],
-    "proof": [
-      "0xd1445c931158119b00449ffcac3c947d028c0c359c34a6646d95962b3b55c6ad",
-      "0xe5ebd1e1b5a5478a944ecab36a9a954ac3b6b8216875f6524caa7a1d87096576"
-    ],
-    "root": "0xaa5d581231e596618465a56aa0f5870ba6e20785fe436d5bfb82b08662ccc7c4",
-    "leaf": "0x0fd7c981d39bece61f7499702bf59b3114a90e66b51ba2c53abdf7b62986c00a"
-  },
-  {
-    "inputs": [
-      "0x2ea3970Ed82D5b30be821FAAD4a731D35964F7dd",
-      "25000000000000000000"
-    ],
-    "proof": [
-      "0x4fd31fee0e75780cd67704fbc43caee70fddcaa43631e2e1bc9fb233fada2394",
-      "0x81f0e530b56872b6fc3e10f8873804230663f8407e21cef901b8aeb06a25e5e2"
-    ],
-    "root": "0xaa5d581231e596618465a56aa0f5870ba6e20785fe436d5bfb82b08662ccc7c4",
-    "leaf": "0x0c7ef881bb675a5858617babe0eb12b538067e289d35d5b044ee76b79d335191"
-  },
-  {
-    "inputs": [
-      "0xf6dBa02C01AF48Cf926579F77C9f874Ca640D91D",
-      "25000000000000000000"
-    ],
-    "proof": [
-      "0x0c7ef881bb675a5858617babe0eb12b538067e289d35d5b044ee76b79d335191",
-      "0x81f0e530b56872b6fc3e10f8873804230663f8407e21cef901b8aeb06a25e5e2"
-    ],
-    "root": "0xaa5d581231e596618465a56aa0f5870ba6e20785fe436d5bfb82b08662ccc7c4",
-    "leaf": "0x4fd31fee0e75780cd67704fbc43caee70fddcaa43631e2e1bc9fb233fada2394"
-  }
-]
+[{"inputs":["0x6CA6d1e2D5347Bfab1d91e883F1915560e09129D","25000000000000000000"],"proof":["0x0fd7c981d39bece61f7499702bf59b3114a90e66b51ba2c53abdf7b62986c00a","0x28a5b69acde4c4eb34ceb405a8c0f7e6702c95b2d41ac53c5d3855f6a0de325f"],"root":"0x0f6c57ab57c9e81c1bc0c199923fb0eb300c775e342f11eb2764de29b995e509","leaf":"0xd1445c931158119b00449ffcac3c947d028c0c359c34a6646d95962b3b55c6ad"},{"inputs":["0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266","25000000000000000000"],"proof":["0xd1445c931158119b00449ffcac3c947d028c0c359c34a6646d95962b3b55c6ad","0x28a5b69acde4c4eb34ceb405a8c0f7e6702c95b2d41ac53c5d3855f6a0de325f"],"root":"0x0f6c57ab57c9e81c1bc0c199923fb0eb300c775e342f11eb2764de29b995e509","leaf":"0x0fd7c981d39bece61f7499702bf59b3114a90e66b51ba2c53abdf7b62986c00a"},{"inputs":["0x63C6dF524ff9cC45B5824746bD4594504a50AAa4","25000000000000000000"],"proof":["0x4fd31fee0e75780cd67704fbc43caee70fddcaa43631e2e1bc9fb233fada2394","0x81f0e530b56872b6fc3e10f8873804230663f8407e21cef901b8aeb06a25e5e2"],"root":"0x0f6c57ab57c9e81c1bc0c199923fb0eb300c775e342f11eb2764de29b995e509","leaf":"0x18b38d903394f1b0b20901f2ce4cc307f1ae35f15c1dffaaef8f25a2655842fb"},{"inputs":["0xf6dBa02C01AF48Cf926579F77C9f874Ca640D91D","25000000000000000000"],"proof":["0x18b38d903394f1b0b20901f2ce4cc307f1ae35f15c1dffaaef8f25a2655842fb","0x81f0e530b56872b6fc3e10f8873804230663f8407e21cef901b8aeb06a25e5e2"],"root":"0x0f6c57ab57c9e81c1bc0c199923fb0eb300c775e342f11eb2764de29b995e509","leaf":"0x4fd31fee0e75780cd67704fbc43caee70fddcaa43631e2e1bc9fb233fada2394"}]