diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..823533e Binary files /dev/null and b/.DS_Store differ diff --git a/chain/.DS_Store b/chain/.DS_Store new file mode 100644 index 0000000..383ae0c Binary files /dev/null and b/chain/.DS_Store differ diff --git a/chain/deploy/04_deployControllerFactory.ts b/chain/deploy/04_deployControllerFactory.ts index c18df12..5c30dc9 100644 --- a/chain/deploy/04_deployControllerFactory.ts +++ b/chain/deploy/04_deployControllerFactory.ts @@ -51,7 +51,7 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => { //USDC address on Sepolia console.log("Network name", hre.network.name); - let deploymentStableToken = "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"; //USDC address on Mainnet + let deploymentStableToken = "0x4ed4E862860beD51a9570b96d89aF5E1B0Efefed"; //DEGEN address on BASE L2 if (hre.network.name === "sepolia") { deploymentStableToken = "0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238"; } else if (hre.network.name === "base") { @@ -68,22 +68,20 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => { ////////////////////////////Controller Pool Deployment//////////////////////// + const tokenWeightPairs = [ + { token: deploymentA.address, weight: "300000000000000000" }, // 30% = 0.3e18 + { token: deploymentB.address, weight: "150000000000000000" }, // 15% = 0.15e18 + { token: deploymentStableToken, weight: "500000000000000000" }, // 50% = 0.5e18 + { token: deploymentDrawToken.address, weight: "50000000000000000" } // 5% = 0.05e18 + ].sort((a, b) => { + return BigInt(a.token) - BigInt(b.token) > 0n ? 1 : -1; + }); + const minimalParams: ControllerFactory.MinimalPoolParamsStruct = { name: "GameToken", symbol: "GT", - tokens: [ - //TODO - function to sort the token addresses numerically - deploymentStableToken, - deploymentDrawToken.address, - deploymentA.address, - deploymentB.address, - ], //Odds at S:A:B:D 0.5:0.3:0.15:0.05 - normalizedWeights: [ - "500000000000000000", - "50000000000000000", - "300000000000000000", - "150000000000000000", - ], + tokens: tokenWeightPairs.map(pair => pair.token), + normalizedWeights: tokenWeightPairs.map(pair => pair.weight), swapFeePercentage: "10000000000000000", swapEnabledOnStart: true, managementAumFeePercentage: "10000000000000000", diff --git a/chain/deployments/localhost/Controller.json b/chain/deployments/localhost/Controller.json index f945428..9080686 100644 --- a/chain/deployments/localhost/Controller.json +++ b/chain/deployments/localhost/Controller.json @@ -1,5 +1,5 @@ { - "address": "0x72F853E9E202600c5017B5A060168603c3ed7368", + "address": "0x4CF4dd3f71B67a7622ac250f8b10d266Dc5aEbcE", "abi": [ { "inputs": [ @@ -318,22 +318,22 @@ "type": "function" } ], - "transactionHash": "0x844699087d2b57817e034708e595fa006a36f239b8c3ae90ad0f20cdaab63c7f", + "transactionHash": "0xd686417fa91a6d8f9ff27fc17789990fc3cb1b8fe9e7fdc57bde7d77b24fe9a2", "receipt": { "to": null, "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "contractAddress": "0x72F853E9E202600c5017B5A060168603c3ed7368", + "contractAddress": "0x4CF4dd3f71B67a7622ac250f8b10d266Dc5aEbcE", "transactionIndex": 0, "gasUsed": "2801352", - "logsBloom": "0x00000000000000000000000000000000000000000000000000800000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000020000000000000100000800000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000002000000000000000040020000000000000000000000000000000000000000000000000000000000002000000", - "blockHash": "0xbeb3780174ee765260e7fd30356fcb2d632b604138e51accd9cebd1a3c277a4d", - "transactionHash": "0x844699087d2b57817e034708e595fa006a36f239b8c3ae90ad0f20cdaab63c7f", + "logsBloom": "0x00000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000001002000000000000000000000000000000000020000000000000100000800000000000000000000000000000000400000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000002000000000000000000020000000000000000000000000000000000000000000000000000000000000000000", + "blockHash": "0xa73b4847169771633f3760248b74d276faed5f20077b8da8de818123bdceebc8", + "transactionHash": "0xd686417fa91a6d8f9ff27fc17789990fc3cb1b8fe9e7fdc57bde7d77b24fe9a2", "logs": [ { "transactionIndex": 0, - "blockNumber": 20216348, - "transactionHash": "0x844699087d2b57817e034708e595fa006a36f239b8c3ae90ad0f20cdaab63c7f", - "address": "0x72F853E9E202600c5017B5A060168603c3ed7368", + "blockNumber": 23826001, + "transactionHash": "0xd686417fa91a6d8f9ff27fc17789990fc3cb1b8fe9e7fdc57bde7d77b24fe9a2", + "address": "0x4CF4dd3f71B67a7622ac250f8b10d266Dc5aEbcE", "topics": [ "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0", "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -341,17 +341,17 @@ ], "data": "0x", "logIndex": 0, - "blockHash": "0xbeb3780174ee765260e7fd30356fcb2d632b604138e51accd9cebd1a3c277a4d" + "blockHash": "0xa73b4847169771633f3760248b74d276faed5f20077b8da8de818123bdceebc8" } ], - "blockNumber": 20216348, + "blockNumber": 23826001, "cumulativeGasUsed": "2801352", "status": 1, "byzantium": true }, "args": [ "0xBA12222222228d8Ba445958a75a0704d566BF2C8", - "0x5eb6e44968f02f7d5b031634f6ebb73a9667c3560001000000000000000006a5" + "0x64a501c1f7b4efe688b303e2bd1f714e02c3965d0001000000000000000001a9" ], "numDeployments": 1, "solcInputHash": "2391e544a997bf5ce3f3524ee69d8f03", diff --git a/chain/deployments/localhost/ControllerFactory.json b/chain/deployments/localhost/ControllerFactory.json index 66ef012..bf97e4e 100644 --- a/chain/deployments/localhost/ControllerFactory.json +++ b/chain/deployments/localhost/ControllerFactory.json @@ -1,5 +1,5 @@ { - "address": "0xa9efDEf197130B945462163a0B852019BA529a66", + "address": "0x3abBB0D6ad848d64c8956edC9Bf6f18aC22E1485", "abi": [ { "inputs": [ @@ -228,22 +228,22 @@ "type": "function" } ], - "transactionHash": "0x7749d355ada91434bbd8c7b83da9b6aa9cafbde8a2bce6c6a6b7ed348481e240", + "transactionHash": "0x314d47a447f2a655db80319418201b9a4cf318c8c8346cd19fffb4bc29670726", "receipt": { "to": null, "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "contractAddress": "0xa9efDEf197130B945462163a0B852019BA529a66", + "contractAddress": "0x3abBB0D6ad848d64c8956edC9Bf6f18aC22E1485", "transactionIndex": 0, "gasUsed": "5110660", - "logsBloom": "0x00000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000020000000000000100000800000000000000000000000000000000400000000000000000004000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000200000000000000000000000002000000000000000000020000000000000000000000000000000000000000000000000000000000000000000", - "blockHash": "0x1bf8108d7a0d30a39693f80ad36534956e02e8b11f45a539f47dcfffddb0b939", - "transactionHash": "0x7749d355ada91434bbd8c7b83da9b6aa9cafbde8a2bce6c6a6b7ed348481e240", + "logsBloom": "0x00000000000000000000000000000000000040000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000020000000000000100000800000000000000000000000000000000400000000000000000000000000000000000000000000000000000000800000000000000000000000000010000000000000000000000000000000000000000000000000000000000200000000000000000000000002000000000000000000020000000000000000000000000000000000000000000000000000000000000000000", + "blockHash": "0x436dfc94fd03972445dad4d7b200ce770f1261da2222fdeb1ecbe082bccdd205", + "transactionHash": "0x314d47a447f2a655db80319418201b9a4cf318c8c8346cd19fffb4bc29670726", "logs": [ { "transactionIndex": 0, - "blockNumber": 20216345, - "transactionHash": "0x7749d355ada91434bbd8c7b83da9b6aa9cafbde8a2bce6c6a6b7ed348481e240", - "address": "0xa9efDEf197130B945462163a0B852019BA529a66", + "blockNumber": 23825998, + "transactionHash": "0x314d47a447f2a655db80319418201b9a4cf318c8c8346cd19fffb4bc29670726", + "address": "0x3abBB0D6ad848d64c8956edC9Bf6f18aC22E1485", "topics": [ "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0", "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -251,17 +251,17 @@ ], "data": "0x", "logIndex": 0, - "blockHash": "0x1bf8108d7a0d30a39693f80ad36534956e02e8b11f45a539f47dcfffddb0b939" + "blockHash": "0x436dfc94fd03972445dad4d7b200ce770f1261da2222fdeb1ecbe082bccdd205" } ], - "blockNumber": 20216345, + "blockNumber": 23825998, "cumulativeGasUsed": "5110660", "status": 1, "byzantium": true }, "args": [ "0xBA12222222228d8Ba445958a75a0704d566BF2C8", - "0xBF904F9F340745B4f0c4702c7B6Ab1e808eA6b93" + "0x9a62C91626d39D0216b3959112f9D4678E20134d" ], "numDeployments": 1, "solcInputHash": "2391e544a997bf5ce3f3524ee69d8f03", diff --git a/chain/deployments/localhost/DrawToken.json b/chain/deployments/localhost/DrawToken.json index ae0b1cb..fb704ab 100644 --- a/chain/deployments/localhost/DrawToken.json +++ b/chain/deployments/localhost/DrawToken.json @@ -1,5 +1,5 @@ { - "address": "0x49AeF2C4005Bf572665b09014A563B5b9E46Df21", + "address": "0x85495222Fd7069B987Ca38C2142732EbBFb7175D", "abi": [ { "inputs": [ @@ -422,22 +422,22 @@ "type": "function" } ], - "transactionHash": "0xae861e9d656d1578f7eb66439a72acbbd1d3f9f8b76bf7b96bd03b9229729038", + "transactionHash": "0x2b1a32fa7da145da65e10d7f9c2422d9d84b873c2db90d0512279e8c8cce1bf6", "receipt": { "to": null, "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "contractAddress": "0x49AeF2C4005Bf572665b09014A563B5b9E46Df21", + "contractAddress": "0x85495222Fd7069B987Ca38C2142732EbBFb7175D", "transactionIndex": 0, "gasUsed": "1945650", - "logsBloom": "0x00000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000008000000000001000000000000000000000000000000000000020000000000000100000800000000000000000000000010000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000002000000200000000000000000000400002000000000000000000020000000000000000000000000000000000000000000000000000000000000000000", - "blockHash": "0xc7954fc9143b454115bf40e3d86c846017e937f4396265961949df05f6ddb223", - "transactionHash": "0xae861e9d656d1578f7eb66439a72acbbd1d3f9f8b76bf7b96bd03b9229729038", + "logsBloom": "0x00000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000001000000000000000000000000000000000000020002000000000100000800000000000000000000000010000000400000000000000000000000000000000000000000000000000000008000000080000000000000000000000000000000000000000000000000000000000000000000000002000000200000000000000000000000002000000000000000000020000000000000000000000000000000000000000000000000000000000000000000", + "blockHash": "0xaeebd1ac802fbd05a6d6543d2768901b692ffe241b0b198f8cce69d9fb6a34ce", + "transactionHash": "0x2b1a32fa7da145da65e10d7f9c2422d9d84b873c2db90d0512279e8c8cce1bf6", "logs": [ { "transactionIndex": 0, - "blockNumber": 20216343, - "transactionHash": "0xae861e9d656d1578f7eb66439a72acbbd1d3f9f8b76bf7b96bd03b9229729038", - "address": "0x49AeF2C4005Bf572665b09014A563B5b9E46Df21", + "blockNumber": 23825996, + "transactionHash": "0x2b1a32fa7da145da65e10d7f9c2422d9d84b873c2db90d0512279e8c8cce1bf6", + "address": "0x85495222Fd7069B987Ca38C2142732EbBFb7175D", "topics": [ "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0", "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -445,13 +445,13 @@ ], "data": "0x", "logIndex": 0, - "blockHash": "0xc7954fc9143b454115bf40e3d86c846017e937f4396265961949df05f6ddb223" + "blockHash": "0xaeebd1ac802fbd05a6d6543d2768901b692ffe241b0b198f8cce69d9fb6a34ce" }, { "transactionIndex": 0, - "blockNumber": 20216343, - "transactionHash": "0xae861e9d656d1578f7eb66439a72acbbd1d3f9f8b76bf7b96bd03b9229729038", - "address": "0x49AeF2C4005Bf572665b09014A563B5b9E46Df21", + "blockNumber": 23825996, + "transactionHash": "0x2b1a32fa7da145da65e10d7f9c2422d9d84b873c2db90d0512279e8c8cce1bf6", + "address": "0x85495222Fd7069B987Ca38C2142732EbBFb7175D", "topics": [ "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -459,10 +459,10 @@ ], "data": "0x0000000000000000000000000000000000000000000000056bc75e2d63100000", "logIndex": 1, - "blockHash": "0xc7954fc9143b454115bf40e3d86c846017e937f4396265961949df05f6ddb223" + "blockHash": "0xaeebd1ac802fbd05a6d6543d2768901b692ffe241b0b198f8cce69d9fb6a34ce" } ], - "blockNumber": 20216343, + "blockNumber": 23825996, "cumulativeGasUsed": "1945650", "status": 1, "byzantium": true diff --git a/chain/deployments/localhost/PlayerAToken.json b/chain/deployments/localhost/PlayerAToken.json index 64835a6..197e10e 100644 --- a/chain/deployments/localhost/PlayerAToken.json +++ b/chain/deployments/localhost/PlayerAToken.json @@ -1,5 +1,5 @@ { - "address": "0x4E76FbE44fa5Dae076a7f4f676250e7941421fbA", + "address": "0xAe2563b4315469bF6bdD41A6ea26157dE57Ed94e", "abi": [ { "inputs": [ @@ -378,22 +378,22 @@ "type": "function" } ], - "transactionHash": "0x69ac55e3f657231a917440618deefa3ccf650b1f61a25c4fb7796a1cb0607510", + "transactionHash": "0x9199d0fdd72c0ae894b4009e3fff94a9e5894884e7498d2e846a8ab8b6ec531e", "receipt": { "to": null, "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "contractAddress": "0x4E76FbE44fa5Dae076a7f4f676250e7941421fbA", + "contractAddress": "0xAe2563b4315469bF6bdD41A6ea26157dE57Ed94e", "transactionIndex": 0, "gasUsed": "1972192", - "logsBloom": "0x00000000000000000000000000000000000000000000000000800000400000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000008000000000001000000000000000000000000000004000000020000000000000100000800000000000000000000000010000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000200000000000000000000000002000000000000000000020000000000000000000000000000000000000000000000000000000000000000000", - "blockHash": "0x76ef06568043f83d1de4903f2ca11e4a24aa852961779d0f0d3cf92b705a4083", - "transactionHash": "0x69ac55e3f657231a917440618deefa3ccf650b1f61a25c4fb7796a1cb0607510", + "logsBloom": "0x00000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000008000000000001000000000000000000000000000000000000020000000000001100000800000000000000000000000010000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000200000000000000000000000002000000000000000000020000000000000000200000000000000000000000000000000000000000000000000", + "blockHash": "0xb5688f24b09ea6cd456f57db2bd5ef55529ca1b01313a3a56b15232daaae372c", + "transactionHash": "0x9199d0fdd72c0ae894b4009e3fff94a9e5894884e7498d2e846a8ab8b6ec531e", "logs": [ { "transactionIndex": 0, - "blockNumber": 20216339, - "transactionHash": "0x69ac55e3f657231a917440618deefa3ccf650b1f61a25c4fb7796a1cb0607510", - "address": "0x4E76FbE44fa5Dae076a7f4f676250e7941421fbA", + "blockNumber": 23825992, + "transactionHash": "0x9199d0fdd72c0ae894b4009e3fff94a9e5894884e7498d2e846a8ab8b6ec531e", + "address": "0xAe2563b4315469bF6bdD41A6ea26157dE57Ed94e", "topics": [ "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0", "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -401,13 +401,13 @@ ], "data": "0x", "logIndex": 0, - "blockHash": "0x76ef06568043f83d1de4903f2ca11e4a24aa852961779d0f0d3cf92b705a4083" + "blockHash": "0xb5688f24b09ea6cd456f57db2bd5ef55529ca1b01313a3a56b15232daaae372c" }, { "transactionIndex": 0, - "blockNumber": 20216339, - "transactionHash": "0x69ac55e3f657231a917440618deefa3ccf650b1f61a25c4fb7796a1cb0607510", - "address": "0x4E76FbE44fa5Dae076a7f4f676250e7941421fbA", + "blockNumber": 23825992, + "transactionHash": "0x9199d0fdd72c0ae894b4009e3fff94a9e5894884e7498d2e846a8ab8b6ec531e", + "address": "0xAe2563b4315469bF6bdD41A6ea26157dE57Ed94e", "topics": [ "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -415,10 +415,10 @@ ], "data": "0x00000000000000000000000000000000000000000000002086ac351052600000", "logIndex": 1, - "blockHash": "0x76ef06568043f83d1de4903f2ca11e4a24aa852961779d0f0d3cf92b705a4083" + "blockHash": "0xb5688f24b09ea6cd456f57db2bd5ef55529ca1b01313a3a56b15232daaae372c" } ], - "blockNumber": 20216339, + "blockNumber": 23825992, "cumulativeGasUsed": "1972192", "status": 1, "byzantium": true diff --git a/chain/deployments/localhost/PlayerBToken.json b/chain/deployments/localhost/PlayerBToken.json index 6e06ee1..bc71562 100644 --- a/chain/deployments/localhost/PlayerBToken.json +++ b/chain/deployments/localhost/PlayerBToken.json @@ -1,5 +1,5 @@ { - "address": "0x00B0517de6b2b09aBD3a7B69d66D85eFdb2c7d94", + "address": "0x30426D33a78afdb8788597D5BFaBdADc3Be95698", "abi": [ { "inputs": [ @@ -378,22 +378,22 @@ "type": "function" } ], - "transactionHash": "0x08510aa49bd41dca42c0f7b65347c18f0ddef7e3f82d402da201770d0bcfd473", + "transactionHash": "0x71d0e026f29dc8a641b0dfdca26be7a64129958170fb63b16924a90db1067420", "receipt": { "to": null, "from": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "contractAddress": "0x00B0517de6b2b09aBD3a7B69d66D85eFdb2c7d94", + "contractAddress": "0x30426D33a78afdb8788597D5BFaBdADc3Be95698", "transactionIndex": 0, "gasUsed": "1972268", - "logsBloom": "0x00000000000000000000000000000000000000000000000000800000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000001000000000000000000000000000000000000020000000000000100000800000000002000000000000010000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000200000000000000000004000002000000000000000000020000000000000000000000000000000000000000000000000000000000000000000", - "blockHash": "0x490a8c257801ab55083e1003d2e1a77c11e49df372e87f670962d1e945015b47", - "transactionHash": "0x08510aa49bd41dca42c0f7b65347c18f0ddef7e3f82d402da201770d0bcfd473", + "logsBloom": "0x00002000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000008000000000001000000000000000000000000000000000000020000000000000100000800000000000000000000000010000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000200000000000000000000000002000000000000000000020000002000000000000000000000000000000000000000000000000000000000000", + "blockHash": "0x093754abcfeaf1e91f7f9844cb0255739b837d1216b729578186a25edc41807f", + "transactionHash": "0x71d0e026f29dc8a641b0dfdca26be7a64129958170fb63b16924a90db1067420", "logs": [ { "transactionIndex": 0, - "blockNumber": 20216341, - "transactionHash": "0x08510aa49bd41dca42c0f7b65347c18f0ddef7e3f82d402da201770d0bcfd473", - "address": "0x00B0517de6b2b09aBD3a7B69d66D85eFdb2c7d94", + "blockNumber": 23825994, + "transactionHash": "0x71d0e026f29dc8a641b0dfdca26be7a64129958170fb63b16924a90db1067420", + "address": "0x30426D33a78afdb8788597D5BFaBdADc3Be95698", "topics": [ "0x8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0", "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -401,13 +401,13 @@ ], "data": "0x", "logIndex": 0, - "blockHash": "0x490a8c257801ab55083e1003d2e1a77c11e49df372e87f670962d1e945015b47" + "blockHash": "0x093754abcfeaf1e91f7f9844cb0255739b837d1216b729578186a25edc41807f" }, { "transactionIndex": 0, - "blockNumber": 20216341, - "transactionHash": "0x08510aa49bd41dca42c0f7b65347c18f0ddef7e3f82d402da201770d0bcfd473", - "address": "0x00B0517de6b2b09aBD3a7B69d66D85eFdb2c7d94", + "blockNumber": 23825994, + "transactionHash": "0x71d0e026f29dc8a641b0dfdca26be7a64129958170fb63b16924a90db1067420", + "address": "0x30426D33a78afdb8788597D5BFaBdADc3Be95698", "topics": [ "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef", "0x0000000000000000000000000000000000000000000000000000000000000000", @@ -415,10 +415,10 @@ ], "data": "0x00000000000000000000000000000000000000000000001043561a8829300000", "logIndex": 1, - "blockHash": "0x490a8c257801ab55083e1003d2e1a77c11e49df372e87f670962d1e945015b47" + "blockHash": "0x093754abcfeaf1e91f7f9844cb0255739b837d1216b729578186a25edc41807f" } ], - "blockNumber": 20216341, + "blockNumber": 23825994, "cumulativeGasUsed": "1972268", "status": 1, "byzantium": true diff --git a/chain/hardhat.config.ts b/chain/hardhat.config.ts index 00e42fc..9e01aef 100644 --- a/chain/hardhat.config.ts +++ b/chain/hardhat.config.ts @@ -20,6 +20,7 @@ const deployerBasePrivateKey = process.env.BASE_DEPLOYER_PRIVATE_KEY ?? "0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80"; const etherscanApiKey = process.env.ETHERSCAN_API_KEY; +const etherscanBaseApiKey = process.env.BASE_ETHERSCAN_API_KEY; const config: HardhatUserConfig = { solidity: { @@ -71,7 +72,10 @@ const config: HardhatUserConfig = { }, etherscan: { - apiKey: process.env.ETHERSCAN_API_KEY, + apiKey: { + sepolia: etherscanApiKey ?? "API_KEY_NOT_SET", + base: etherscanBaseApiKey ?? "API_KEY_NOT_SET", + }, }, sourcify: { enabled: true, diff --git a/chain/scripts/01poolCheck.ts b/chain/scripts/01poolCheck.ts index ab39f10..986fd82 100644 --- a/chain/scripts/01poolCheck.ts +++ b/chain/scripts/01poolCheck.ts @@ -38,7 +38,7 @@ const func = async () => { console.log("Managed Pool Join Exit Enabled status", poolJoinExitEnabled); const managedPoolControllerAddress = - "0x2b1C7Ed23718936Dc093994627791C5fcd2c7754"; + "0x835309AED8B04C52Fe0dAF35D90F7e5f9A7472Bd"; console.log("Managed Pool Controller Address", managedPoolControllerAddress); const provider = hre.ethers.provider; const managedPoolContract = new ethers.Contract(