Merge development branch

LiskHQ · Jun 21, 2024 · 14e983c · 14e983c
1 parent e297aa7
commit 14e983c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.env.mainnet b/.env.mainnet
@@ -35,7 +35,7 @@ L2_VESTING_WALLET_OWNER_ADDRESS=0x394Ae9d48eeca1C69a989B5A8C787081595c55A7
 L2_AIRDROP_OWNER_ADDRESS=0x394Ae9d48eeca1C69a989B5A8C787081595c55A7
 
 # Airdrop wallet address where LSK tokens are transferred to after airdrop period ends
-L2_AIRDROP_WALLET_ADDRESS=0x38eA61E8084E27a087cF5CdBC3f22584f18773e6
+L2_AIRDROP_WALLET_ADDRESS=0x0
 
 # Salt for deterministic smart contract address generation
 DETERMINISTIC_ADDRESS_SALT="lisk_l2_token_deterministic_salt"

diff --git a/script/data/mainnet/airdrop-merkle-root.json b/script/data/mainnet/airdrop-merkle-root.json
@@ -0,0 +1,3 @@
+{
+  "merkleRoot": "0xc9c5c3ff2bc0e187905fe3434e17655c1e2c2aed85f008c04156d8ddb7d4b151"
+}
diff --git a/script/data/testnet/airdrop-merkle-root.json b/script/data/testnet/airdrop-merkle-root.json
@@ -0,0 +1,3 @@
+{
+  "merkleRoot": "0x9062cfbcd3feb028693b125d9507e3e3abf363a0e08524216145ea093b1909c0"
+}