address drift for local setups

Signed-off-by: Stefan Adolf <[email protected]>
moleculeprotocol · Dec 18, 2024 · 8d83cfc · 8d83cfc
1 parent e080796
commit 8d83cfc
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 13 deletions.
diff --git a/.env.example b/.env.example
@@ -26,15 +26,15 @@ PRICEFEED_ADDRESS=0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6
 TERMS_ACCEPTED_PERMISSIONER_ADDRESS=0x8A791620dd6260079BF849Dc5567aDC3F2FdC318
 
 TOKENIZER_ADDRESS=0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e
-STAKED_LOCKING_CROWDSALE_ADDRESS=0x0B306BF915C4d645ff596e518fAf3F9669b97016
+#iptoken implementation=0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82
 
-USDC6_ADDRESS=0x68B1D87F95878fE05B998F19b66F4baba5De1aed
-WETH_ADDRESS=0x4ed7c70F96B99c776995fB64377f0d4aB3B0e1C1
-PLAIN_CROWDSALE_ADDRESS=0x7a2088a1bFc9d81c55368AE168C2C02570cB814F
+#timelocked token implementation=0x0B306BF915C4d645ff596e518fAf3F9669b97016
+STAKED_LOCKING_CROWDSALE_ADDRESS=0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1
 
-#this is created during the tokenizer deployment
-IPTOKEN_IMPLEMENTATION_ADDRESS=0x0DCd1Bf9A1b36cE34237eEaFef220932846BCD82
+USDC6_ADDRESS=0x3Aa5ebB10DC797CAC828524e59A333d0A371443c
+WETH_ADDRESS=0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44
+PLAIN_CROWDSALE_ADDRESS=0x09635F643e140090A9A8Dcd712eD6285858ceBef
 
 #these are generated when running the fixture scripts
 IPTS_ADDRESS=0x8dAF17A20c9DBA35f005b6324F493785D239719d
-LOCKED_IPTS_ADDRESS=0x16eBC21B3d38Db5e3EE1a022bEBA8Ec87D4CDbe6
+LOCKED_IPTS_ADDRESS=0x24B3c7704709ed1491473F30393FFc93cFB0FC34
diff --git a/README.md b/README.md
@@ -46,7 +46,10 @@ Deprecated after migrating to Defender 2 (was 0x3D30452c48F2448764d5819a9A2b684A
 | Terms Permissioner | 0xC05D649368d8A5e2E98CAa205d47795de5fCB599 | <a href="https://sepolia.etherscan.io/address/0xC05D649368d8A5e2E98CAa205d47795de5fCB599#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0xC05D649368d8A5e2E98CAa205d47795de5fCB599&theme=dark&chainId=1" alt="View contract" /></a> |
 | Tokenizer          | 0xca63411FF5187431028d003eD74B57531408d2F9 | <a href="https://sepolia.etherscan.io/address/0xca63411FF5187431028d003eD74B57531408d2F9#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0xca63411FF5187431028d003eD74B57531408d2F9&theme=dark&chainId=1" alt="View contract" /></a> |
 | Crowdsale          | 0x8cA737E2cdaE1Ceb332bEf7ba9eA711a3a2f8037 | <a href="https://sepolia.etherscan.io/address/0x8cA737E2cdaE1Ceb332bEf7ba9eA711a3a2f8037#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x8cA737E2cdaE1Ceb332bEf7ba9eA711a3a2f8037&theme=dark&chainId=1" alt="View contract" /></a> |
-| Staked Crowdsale   | 0xd1cE2EA7d3b0C9cAB025A4aD762FC00315141ad7 | <a href="https://sepolia.etherscan.io/address/0xd1cE2EA7d3b0C9cAB025A4aD762FC00315141ad7#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0xd1cE2EA7d3b0C9cAB025A4aD762FC00315141ad7&theme=dark&chainId=1" alt="View contract" /></a> |
+| Staked Crowdsale   | 0x7eeb7113f90893fb95c6666e3930235850f2bc6A | <a href="https://sepolia.etherscan.io/address/0x7eeb7113f90893fb95c6666e3930235850f2bc6A#code" target="_blank"><img width="200" height="45" src="https://badges.thirdweb.com/contract?address=0x7eeb7113f90893fb95c6666e3930235850f2bc6A&theme=dark&chainId=11155111" alt="View contract" /></a> |
+| Old Staked Crowdsale   | 0xd1cE2EA7d3b0C9cAB025A4aD762FC00315141ad7 |  |
+
+timelocked token implementation=0xF8F79c1E02387b0Fc9DE0945cD9A2c06F127D851
 
 #### Subgraphs
 
@@ -204,6 +207,9 @@ The crowdsale computation model can be tried out here: <https://docs.google.com/
 Deploying and verifying a single contract without the help of any script
 `forge create --rpc-url $RPC_URL --private-key $PRIVATE_KEY --chain 5 --etherscan-api-key $ETHERSCAN_API_KEY --verify src/crowdsale/StakedLockingCrowdSale.sol:StakedLockingCrowdSale`
 
+Verifying a the staked crowdsale crowdsale
+`forge verify-contract --chain-id=11155111 --etherscan-api-key=$ETHERSCAN_API_KEY --constructor-args $(cast abi-encode "constructor(address)" 0xF8F79c1E02387b0Fc9DE0945cD9A2c06F127D851) 0x7eeb7113f90893fb95c6666e3930235850f2bc6A src/crowdsale/StakedLockingCrowdSale.sol:StakedLockingCrowdSale`
+
 ### Deploying (vested) test tokens
 
 To test staked / vested token interactions, you need some test tokens. Here are 2 convenient script to get them running:

diff --git a/script/dev/CrowdSale.s.sol b/script/dev/CrowdSale.s.sol
@@ -43,6 +43,7 @@ contract DeployStakedCrowdSale is CommonScript {
         stakedLockingCrowdSale.trustVestingContract(vestedDaoToken);
         vm.stopBroadcast();
 
+        console.log("timelocked token implementation=%s", address(lockingCrowdsaleImplementation));
         console.log("STAKED_LOCKING_CROWDSALE_ADDRESS=%s", address(stakedLockingCrowdSale));
     }
 }

diff --git a/script/dev/Tokenizer.s.sol b/script/dev/Tokenizer.s.sol
@@ -25,7 +25,7 @@ contract DeployTokenizer is CommonScript {
 
         vm.stopBroadcast();
         console.log("TOKENIZER_ADDRESS=%s", address(tokenizer));
-        console.log("IPTOKEN_IMPLEMENTATION_ADDRESS=%s", address(initialIpTokenImplementation));
+        console.log("iptoken implementation=%s", address(initialIpTokenImplementation));
     }
 }
 

diff --git a/setupLocal.sh b/setupLocal.sh
@@ -9,6 +9,14 @@ set +a
 fixtures=false
 extrafixtures=false
 
+show_help() {
+    echo "Usage: setupLocal.sh [OPTION]"
+    echo "Sets up the local environment for the IPNFT contracts."
+    echo "Options:"
+    echo "  -f  also runs basic fixture scripts"
+    echo "  -x  also runs extra fixture scripts (crowdsales)"
+}
+
 # Parse command-line options
 while getopts "fx" opt; do
   case ${opt} in

diff --git a/subgraph/networks.json b/subgraph/networks.json
@@ -65,11 +65,11 @@
       "startBlock": 0
     },
     "CrowdSale": {
-      "address": "0x7a2088a1bFc9d81c55368AE168C2C02570cB814F",
+      "address": "0x09635F643e140090A9A8Dcd712eD6285858ceBef",
       "startBlock": 0
     },
     "StakedLockingCrowdSale": {
-      "address": "0x0B306BF915C4d645ff596e518fAf3F9669b97016",
+      "address": "0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1",
       "startBlock": 0
     },
     "TermsAcceptedPermissioner": {

diff --git a/subgraph/subgraph.yaml b/subgraph/subgraph.yaml
@@ -87,7 +87,7 @@ dataSources:
     network: foundry
     source:
       abi: CrowdSale
-      address: "0x7a2088a1bFc9d81c55368AE168C2C02570cB814F"
+      address: "0x09635F643e140090A9A8Dcd712eD6285858ceBef"
       startBlock: 0
     mapping:
       kind: ethereum/events
@@ -124,7 +124,7 @@ dataSources:
     network: foundry
     source:
       abi: StakedLockingCrowdSale
-      address: "0x0B306BF915C4d645ff596e518fAf3F9669b97016"
+      address: "0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1"
       startBlock: 0
     mapping:
       kind: ethereum/events