From 01bc269bb86c1a0083fabd172fd5cf3bc0457cad Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Fri, 14 Jun 2024 17:14:15 +0200 Subject: [PATCH 01/16] PIP-17: Adjust Emission Rate (#58) --- .github/workflows/test.yml | 4 + src/DefaultEmissionManager.sol | 23 ++++-- src/interfaces/IDefaultEmissionManager.sol | 2 +- test/DefaultEmissionManager.t.sol | 30 +++---- .../DefaultEmissionManager.1.2.0.t.sol | 80 +++++++++++++++++++ test/util/calc.js | 7 +- 6 files changed, 121 insertions(+), 25 deletions(-) create mode 100644 test/upgrade/DefaultEmissionManager.1.2.0.t.sol diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5ea46b3..879320b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,9 +35,13 @@ jobs: run: | forge --version forge build --sizes + env: + MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }} id: build - name: Run Forge tests # ! revert back to FOUNDRY_PROFILE=intense forge test -vvv run: forge test -vvv + env: + MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }} id: test diff --git a/src/DefaultEmissionManager.sol b/src/DefaultEmissionManager.sol index 1c3884a..de18ff2 100644 --- a/src/DefaultEmissionManager.sol +++ b/src/DefaultEmissionManager.sol @@ -11,12 +11,12 @@ import {PowUtil} from "./lib/PowUtil.sol"; /// @title Default Emission Manager /// @author Polygon Labs (@DhairyaSethi, @gretzke, @qedk, @simonDos) /// @notice A default emission manager implementation for the Polygon ERC20 token contract on Ethereum L1 -/// @dev The contract allows for a 3% mint per year (compounded). 2% staking layer and 1% treasury +/// @dev The contract allows for a 2.5% mint per year (compounded). 1.5% staking layer and 1% treasury /// @custom:security-contact security@polygon.technology contract DefaultEmissionManager is Ownable2StepUpgradeable, IDefaultEmissionManager { using SafeERC20 for IPolygonEcosystemToken; - uint256 public constant INTEREST_PER_YEAR_LOG2 = 0.04264433740849372e18; + uint256 public constant INTEREST_PER_YEAR_LOG2 = 0.03562390973072122e18; // log2(1.025) uint256 public constant START_SUPPLY = 10_000_000_000e18; address private immutable DEPLOYER; @@ -27,6 +27,9 @@ contract DefaultEmissionManager is Ownable2StepUpgradeable, IDefaultEmissionMana IPolygonEcosystemToken public token; uint256 public startTimestamp; + // NEW STORAGE 1.2.0 + uint256 public START_SUPPLY_1_2_0; + constructor(address migration_, address stakeManager_, address treasury_) { if (migration_ == address(0) || stakeManager_ == address(0) || treasury_ == address(0)) revert InvalidAddress(); DEPLOYER = msg.sender; @@ -38,6 +41,11 @@ contract DefaultEmissionManager is Ownable2StepUpgradeable, IDefaultEmissionMana _disableInitializers(); } + function reinitialize() external reinitializer(2) { + START_SUPPLY_1_2_0 = token.totalSupply(); + startTimestamp = block.timestamp; + } + function initialize(address token_, address owner_) external initializer { // prevent front-running since we can't initialize on proxy deployment if (DEPLOYER != msg.sender) revert(); @@ -62,7 +70,8 @@ contract DefaultEmissionManager is Ownable2StepUpgradeable, IDefaultEmissionMana uint256 amountToMint = newSupply - currentSupply; if (amountToMint == 0) return; // no minting required - uint256 treasuryAmt = amountToMint / 3; + // 2/5 of 2.5% is 1% going to the treasury + uint256 treasuryAmt = amountToMint * 2 / 5; uint256 stakeManagerAmt = amountToMint - treasuryAmt; emit TokenMint(amountToMint, msg.sender); @@ -75,15 +84,15 @@ contract DefaultEmissionManager is Ownable2StepUpgradeable, IDefaultEmissionMana } /// @inheritdoc IDefaultEmissionManager - function inflatedSupplyAfter(uint256 timeElapsed) public pure returns (uint256 supply) { + function inflatedSupplyAfter(uint256 timeElapsed) public view returns (uint256 supply) { uint256 supplyFactor = PowUtil.exp2((INTEREST_PER_YEAR_LOG2 * timeElapsed) / 365 days); - supply = (supplyFactor * START_SUPPLY) / 1e18; + supply = (supplyFactor * START_SUPPLY_1_2_0) / 1e18; } /// @inheritdoc IDefaultEmissionManager function version() external pure returns (string memory) { - return "1.1.0"; + return "1.2.0"; } - uint256[48] private __gap; + uint256[47] private __gap; } diff --git a/src/interfaces/IDefaultEmissionManager.sol b/src/interfaces/IDefaultEmissionManager.sol index f779b40..03ae50b 100644 --- a/src/interfaces/IDefaultEmissionManager.sol +++ b/src/interfaces/IDefaultEmissionManager.sol @@ -40,7 +40,7 @@ interface IDefaultEmissionManager { /// approximate the compounded interest rate using x^y = 2^(log2(x)*y) /// where x is the interest rate per year and y is the number of seconds elapsed since deployment divided by 365 days in seconds /// log2(interestRatePerYear) = 0.04264433740849372 with 18 decimals, as the interest rate does not change, hard code the value - function inflatedSupplyAfter(uint256 timeElapsedInSeconds) external pure returns (uint256 inflatedSupply); + function inflatedSupplyAfter(uint256 timeElapsedInSeconds) external view returns (uint256 inflatedSupply); /// @notice returns the version of the contract /// @return version version string diff --git a/test/DefaultEmissionManager.t.sol b/test/DefaultEmissionManager.t.sol index 7e07ee7..c1267db 100644 --- a/test/DefaultEmissionManager.t.sol +++ b/test/DefaultEmissionManager.t.sol @@ -55,6 +55,8 @@ contract DefaultEmissionManagerTest is Test { vm.prank(governance); migration.acceptOwnership(); emissionManager.initialize(address(polygon), governance); + emissionManager.reinitialize(); + // POL being emissionary, while MATIC having a constant supply, // the requirement of unmigrating POL to MATIC for StakeManager on each mint // is satisfied by a one-time transfer of MATIC to the migration contract @@ -144,16 +146,17 @@ contract DefaultEmissionManagerTest is Test { assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); uint256 totalAmtMinted = polygon.totalSupply() - initialTotalSupply; - uint256 totalAmtMintedOneThird = totalAmtMinted / 3; - assertEq(matic.balanceOf(stakeManager), totalAmtMinted - totalAmtMintedOneThird); + uint256 totalAmtMintedTwoFifth = totalAmtMinted * 2 / 5; + assertEq(matic.balanceOf(stakeManager), totalAmtMinted - totalAmtMintedTwoFifth); assertEq(matic.balanceOf(treasury), 0); assertEq(polygon.balanceOf(stakeManager), 0); - assertEq(polygon.balanceOf(treasury), totalAmtMintedOneThird); + assertEq(polygon.balanceOf(treasury), totalAmtMintedTwoFifth); } function test_MintDelayTwice(uint128 delay) external { vm.assume(delay <= 5 * 365 days && delay > 0); + // now that we actually pass this to calc.js, we only need to set it once. uint256 initialTotalSupply = polygon.totalSupply(); skip(delay); @@ -164,13 +167,12 @@ contract DefaultEmissionManagerTest is Test { uint256 newSupply = abi.decode(vm.ffi(inputs), (uint256)); assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); - uint256 balance = (polygon.totalSupply() - initialTotalSupply) / 3; + uint256 balance = (polygon.totalSupply() - initialTotalSupply) * 2 / 5; uint256 stakeManagerBalance = (polygon.totalSupply() - initialTotalSupply) - balance; assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); assertEq(polygon.balanceOf(stakeManager), 0); assertEq(polygon.balanceOf(treasury), balance); - initialTotalSupply = polygon.totalSupply(); // for the new run skip(delay); emissionManager.mint(); @@ -180,10 +182,10 @@ contract DefaultEmissionManagerTest is Test { assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); uint256 totalAmtMinted = polygon.totalSupply() - initialTotalSupply; - uint256 totalAmtMintedOneThird = totalAmtMinted / 3; + uint256 totalAmtMintedTwoFifth = totalAmtMinted * 2 / 5; - balance += totalAmtMintedOneThird; - stakeManagerBalance += totalAmtMinted - totalAmtMintedOneThird; + balance = totalAmtMintedTwoFifth; + stakeManagerBalance = totalAmtMinted - totalAmtMintedTwoFifth; assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); assertEq(polygon.balanceOf(stakeManager), 0); @@ -195,10 +197,10 @@ contract DefaultEmissionManagerTest is Test { uint256 balance; uint256 stakeManagerBalance; + // now that we actually pass this to calc.js, we only need to set it once. + uint256 initialTotalSupply = polygon.totalSupply(); for (uint256 cycle; cycle < cycles; cycle++) { - uint256 initialTotalSupply = polygon.totalSupply(); - skip(delay); emissionManager.mint(); @@ -208,10 +210,10 @@ contract DefaultEmissionManagerTest is Test { assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); uint256 totalAmtMinted = polygon.totalSupply() - initialTotalSupply; - uint256 totalAmtMintedOneThird = totalAmtMinted / 3; + uint256 totalAmtMintedTwoFifth = totalAmtMinted * 2 / 5; - balance += totalAmtMintedOneThird; - stakeManagerBalance += totalAmtMinted - totalAmtMintedOneThird; + balance = totalAmtMintedTwoFifth; + stakeManagerBalance = totalAmtMinted - totalAmtMintedTwoFifth; assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); assertEq(polygon.balanceOf(stakeManager), 0); @@ -224,6 +226,6 @@ contract DefaultEmissionManagerTest is Test { inputs[2] = vm.toString(delay); inputs[3] = vm.toString(polygon.totalSupply()); uint256 newSupply = abi.decode(vm.ffi(inputs), (uint256)); - assertApproxEqAbs(newSupply, emissionManager.inflatedSupplyAfter(block.timestamp + delay), 1e20); + assertApproxEqAbs(newSupply, emissionManager.inflatedSupplyAfter(delay), 1e20); } } diff --git a/test/upgrade/DefaultEmissionManager.1.2.0.t.sol b/test/upgrade/DefaultEmissionManager.1.2.0.t.sol new file mode 100644 index 0000000..ba4ecf4 --- /dev/null +++ b/test/upgrade/DefaultEmissionManager.1.2.0.t.sol @@ -0,0 +1,80 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.21; + +import {PolygonEcosystemToken} from "src/PolygonEcosystemToken.sol"; +import {DefaultEmissionManager} from "src/DefaultEmissionManager.sol"; +import {PolygonMigration} from "src/PolygonMigration.sol"; +import {ERC20PresetMinterPauser} from "openzeppelin-contracts/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol"; +import { + ProxyAdmin, + TransparentUpgradeableProxy, + ITransparentUpgradeableProxy +} from "openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol"; +import {Test} from "forge-std/Test.sol"; + +// this test forks mainnet and tests the upgradeability of DefaultEmissionManagerProxy + +contract DefaultEmissionManagerTest is Test { + uint256 mainnetFork; + + address POLYGON_PROTOCOL_COUNCIL = 0x37D085ca4a24f6b29214204E8A8666f12cf19516; + address EM_PROXY = 0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53; + address COMMUNITY_TREASURY = 0x2ff25495d77f380d5F65B95F103181aE8b1cf898; + address EM_PROXY_ADMIN = 0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3; + PolygonEcosystemToken pol = PolygonEcosystemToken(0x455e53CBB86018Ac2B8092FdCd39d8444aFFC3F6); + + uint256 NEW_INTEREST_PER_YEAR_LOG2 = 0.03562390973072122e18; // log2(1.025) + + string[] internal inputs = new string[](5); + + function setUp() public { + string memory MAINNET_RPC_URL = vm.envString("MAINNET_RPC_URL"); + mainnetFork = vm.createFork(MAINNET_RPC_URL); + } + + function testUpgrade() external { + vm.selectFork(mainnetFork); + + address newTreasury = makeAddr("newTreasury"); + + DefaultEmissionManager emProxy = DefaultEmissionManager(EM_PROXY); + + assertEq(emProxy.treasury(), COMMUNITY_TREASURY); + + address migration = address(emProxy.migration()); + address stakeManager = emProxy.stakeManager(); + + DefaultEmissionManager newEmImpl = new DefaultEmissionManager(migration, stakeManager, newTreasury); + + ProxyAdmin admin = ProxyAdmin(EM_PROXY_ADMIN); + + vm.prank(POLYGON_PROTOCOL_COUNCIL); + + admin.upgradeAndCall( + ITransparentUpgradeableProxy(address(emProxy)), + address(newEmImpl), + abi.encodeWithSelector(DefaultEmissionManager.reinitialize.selector) + ); + + // initialize can still not be called + vm.expectRevert("Initializable: contract is already initialized"); + emProxy.initialize(makeAddr("token"), msg.sender); + + assertEq(pol.totalSupply(), emProxy.START_SUPPLY_1_2_0()); + assertEq(block.timestamp, emProxy.startTimestamp()); + + // emission is now 2.5% + inputs[0] = "node"; + inputs[1] = "test/util/calc.js"; + inputs[2] = vm.toString(uint256(365 days)); + inputs[3] = vm.toString(pol.totalSupply()); + // vm.ffi executes the js script which contains the new emission rate + uint256 newSupply = abi.decode(vm.ffi(inputs), (uint256)); + assertApproxEqAbs(newSupply, emProxy.inflatedSupplyAfter(365 days), 1e20); + + // treasury has been updated + assertEq(emProxy.treasury(), newTreasury); + // emission has been updated + assertEq(emProxy.INTEREST_PER_YEAR_LOG2(), NEW_INTEREST_PER_YEAR_LOG2); + } +} diff --git a/test/util/calc.js b/test/util/calc.js index 7b96dbd..73593a5 100644 --- a/test/util/calc.js +++ b/test/util/calc.js @@ -1,9 +1,10 @@ -const interestRatePerYear = 1.03; -const startSupply = 10_000_000_000e18; +const emissionRatePerYear = 1.025; + function main() { const [timeElapsedInSeconds] = process.argv.slice(2); + const [startSupply] = process.argv.slice(3); - const supplyFactor = Math.pow(interestRatePerYear, timeElapsedInSeconds / (365 * 24 * 60 * 60)); + const supplyFactor = Math.pow(emissionRatePerYear, timeElapsedInSeconds / (365 * 24 * 60 * 60)); const newSupply = BigInt(startSupply * supplyFactor); console.log("0x" + newSupply.toString(16).padStart(64, "0")); // abi.encode(toMint) From 5e6504a6b434c8ffefdc0183bdd26134c10f839c Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Sun, 16 Jun 2024 15:05:59 +0200 Subject: [PATCH 02/16] prepare deployment --- .env.example | 1 + .gitignore | 1 + .../11155111/run-1718356769.json | 67 ++++++++++++++++ .../11155111/run-latest.json | 67 ++++++++++++++++ foundry.toml | 5 ++ makefile | 10 +++ script/1.2.0/UpgradeEmissionManager.s.sol | 46 +++++++++++ script/1.2.0/input.json | 12 +++ ...efaultEmissionManager.1.2.0.mainnet.t.sol} | 5 +- ...DefaultEmissionManager.1.2.0.sepolia.t.sol | 79 +++++++++++++++++++ 10 files changed, 290 insertions(+), 3 deletions(-) create mode 100644 broadcast/UpgradeEmissionManager.s.sol/11155111/run-1718356769.json create mode 100644 broadcast/UpgradeEmissionManager.s.sol/11155111/run-latest.json create mode 100644 makefile create mode 100644 script/1.2.0/UpgradeEmissionManager.s.sol create mode 100644 script/1.2.0/input.json rename test/upgrade/{DefaultEmissionManager.1.2.0.t.sol => DefaultEmissionManager.1.2.0.mainnet.t.sol} (94%) create mode 100644 test/upgrade/DefaultEmissionManager.1.2.0.sepolia.t.sol diff --git a/.env.example b/.env.example index 90262f5..b35be43 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,4 @@ RPC_URL= +RPC_MAINNET= PRIVATE_KEY= ETHERSCAN_API_KEY= diff --git a/.gitignore b/.gitignore index 7f8014f..d0131d8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ lcov.info .env broadcast/*/31337 +broadcast/*/*/dry-run deployments/31337.md deployments/json/31337.json diff --git a/broadcast/UpgradeEmissionManager.s.sol/11155111/run-1718356769.json b/broadcast/UpgradeEmissionManager.s.sol/11155111/run-1718356769.json new file mode 100644 index 0000000..01d6e4e --- /dev/null +++ b/broadcast/UpgradeEmissionManager.s.sol/11155111/run-1718356769.json @@ -0,0 +1,67 @@ +{ + "transactions": [ + { + "hash": "0xdfcc2ab74635be94ba8e308173a1cb5c8b4794942faddc9db440eb0b13364e4c", + "transactionType": "CREATE", + "contractName": "DefaultEmissionManager", + "contractAddress": "0x8d4e896981de5e67a3e2a90a43a43be1fa34d0b8", + "function": null, + "arguments": [ + "0x3A3B750E7d4d389Bc1d0be20E5D09530F82B9911", + "0x4AE8f648B1Ec892B6cc68C89cc088583964d08bE", + "0xeE76bECaF80fFe451c8B8AFEec0c21518Def02f9" + ], + "transaction": { + "from": "0x0724d72eb61e508d81ca701881f2248f092953bf", + "to": null, + "gas": "0x1b35b3", + "value": "0x0", + "input": "0x61010034620001c357601f6200195b38819003918201601f191683019291906001600160401b03841183851017620001c8578160609284926040968752833981010312620001c3576200005281620001de565b906200006e836200006660208401620001de565b9201620001de565b916001600160a01b03908116908115908115620001b7575b8115620001ab575b506200019a573360805260a05260c05260e05260005460ff8160081c16620001465760ff808216036200010b575b50516117679081620001f4823960805181610575015260a0518181816105fc015281816108570152610db9015260c0518181816102fb0152610def015260e0518181816104990152610d690152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001c35756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610edd565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a5a565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a3e565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a7c565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a5a565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a5a565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c78565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b67ffffffffffffffff8111610a2857604052565b634e487b7160e01b600052604160045260246000fd5b6040810190811067ffffffffffffffff821117610a2857604052565b90601f8019910116810190811067ffffffffffffffff821117610a2857604052565b60018060a01b031690604051610a9181610a3e565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610bb6573d9167ffffffffffffffff8311610ba25790610b0c93929160405192610aff88601f19601f8401160185610a5a565b83523d868885013e610bc0565b805191821591848315610b7e575b505050905015610b275750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b1a565b634e487b7160e01b85526041600452602485fd5b90610b0c92916060915b91929015610c225750815115610bd4575090565b3b15610bdd5790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c355750805190602001fd5b60405162461bcd60e51b8152908190610c5190600483016108ba565b0390fd5b91908203918211610c6257565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526000926001600160a01b03908116916020908181600481875afa8015610ed3578690610ea0575b610cce9150610cc9610cc460985442610c55565b610edd565b610c55565b928315610e98578360011b848104600203610e84576005900491610cf28386610c55565b947fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc58780518381523385820152a1823b156108175786516340c10f1960e01b81523060048201526024810191909152878160448183875af18015610e7a57610e5d575b50855163a9059cbb60e01b918101919091527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166024820152604480820193909352918252610db79190610db2606483610a5a565b610a7c565b7f00000000000000000000000000000000000000000000000000000000000000001690813b1561045e578251630899d25960e41b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031660048201526024810191909152919083908390604490829084905af1908115610e545750610e43575050565b610e4d8291610a14565b6101a35750565b513d84823e3d90fd5b610db793929197610e70610db292610a14565b9791929350610d55565b87513d8a823e3d90fd5b634e487b7160e01b87526011600452602487fd5b505050505050565b508181813d8311610ecc575b610eb68183610a5a565b81010312610ec857610cce9051610cb0565b8580fd5b503d610eac565b85513d88823e3d90fd5b667e8fc1d5029dc49080820291820403610c6257670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611620575b66ff0000000000008316611518575b65ff00000000008316611418575b64ff000000008316611320575b63ff0000008316611230575b62ff00008316611148575b61ff008316611068575b60ff8316610f91575b02911c60bf031c60995490818102918183041490151715610c62570490565b60808316611056575b838316611044575b60208316611032575b60108316611020575b6008831661100e575b60048316610ffc575b60028316610fea575b6001831615610f72576801000000000000000102831c610f72565b6801000000000000000102831c610fcf565b6801000000000000000302831c610fc6565b6801000000000000000602831c610fbd565b6801000000000000000b02831c610fb4565b6801000000000000001602831c610fab565b6801000000000000002c02831c610fa2565b6801000000000000005902831c610f9a565b6180008316611136575b6140008316611124575b6120008316611112575b6110008316611100575b61080083166110ee575b61040083166110dc575b61020083166110ca575b610100831615610f6957680100000000000000b102831c610f69565b6801000000000000016302831c6110ae565b680100000000000002c602831c6110a4565b6801000000000000058c02831c61109a565b68010000000000000b1702831c611090565b6801000000000000162e02831c611086565b68010000000000002c5d02831c61107c565b680100000000000058b902831c611072565b62800000831661121e575b62400000831661120c575b6220000083166111fa575b6210000083166111e8575b6208000083166111d6575b6204000083166111c4575b6202000083166111b2575b62010000831615610f5f576801000000000000b17202831c610f5f565b680100000000000162e402831c611195565b6801000000000002c5c802831c61118a565b68010000000000058b9102831c61117f565b680100000000000b172102831c611174565b68010000000000162e4302831c611169565b680100000000002c5c8602831c61115e565b6801000000000058b90c02831c611153565b6380000000831661130e575b634000000083166112fc575b632000000083166112ea575b631000000083166112d8575b630800000083166112c6575b630400000083166112b4575b630200000083166112a2575b6301000000831615610f545768010000000000b1721802831c610f54565b6801000000000162e43002831c611284565b68010000000002c5c86002831c611278565b680100000000058b90c002831c61126c565b6801000000000b17217f02831c611260565b680100000000162e42ff02831c611254565b6801000000002c5c85fe02831c611248565b68010000000058b90bfc02831c61123c565b6480000000008316611406575b64400000000083166113f4575b64200000000083166113e2575b64100000000083166113d0575b64080000000083166113be575b64040000000083166113ac575b640200000000831661139a575b640100000000831615610f4857680100000000b17217f802831c610f48565b68010000000162e42ff102831c61137b565b680100000002c5c85fe302831c61136e565b6801000000058b90bfce02831c611361565b68010000000b17217fbb02831c611354565b6801000000162e42fff002831c611347565b68010000002c5c8601cc02831c61133a565b680100000058b90c0b4902831c61132d565b658000000000008316611506575b6540000000000083166114f4575b6520000000000083166114e2575b6510000000000083166114d0575b6508000000000083166114be575b6504000000000083166114ac575b65020000000000831661149a575b65010000000000831615610f3b576801000000b17218355102831c610f3b565b680100000162e430e5a202831c61147a565b6801000002c5c863b73f02831c61146c565b68010000058b90cf1e6e02831c61145e565b680100000b1721bcfc9a02831c611450565b68010000162e43f4f83102831c611442565b680100002c5c89d5ec6d02831c611434565b6801000058b91b5bc9ae02831c611426565b6680000000000000831661160e575b664000000000000083166115fc575b662000000000000083166115ea575b661000000000000083166115d8575b660800000000000083166115c6575b660400000000000083166115b4575b660200000000000083166115a2575b6601000000000000831615610f2d5768010000b17255775c0402831c610f2d565b6801000162e525ee054702831c611581565b68010002c5cc37da949202831c611572565b680100058ba01fb9f96d02831c611563565b6801000b175effdc76ba02831c611554565b680100162f3904051fa102831c611545565b6801002c605e2e8cec5002831c611536565b68010058c86da1c09ea202831c611527565b678000000000000000831661171e575b674000000000000000831661170c575b67200000000000000083166116fa575b67100000000000000083166116e8575b67080000000000000083166116d6575b67040000000000000083166116c4575b67020000000000000083166116b2575b670100000000000000831615610f1e57680100b1afa5abcbed6102831c610f1e565b68010163da9fb33356d802831c611690565b680102c9a3e778060ee702831c611680565b6801059b0d31585743ae02831c611670565b68010b5586cf9890f62a02831c611660565b6801172b83c7d517adce02831c611650565b6801306fe0a31b7152df02831c611640565b5068016a09e667f3bcc909607f1b61163056fea264697066735822122051de1fb3c32307cc00b0a21a4300e96267e072476c0382d060593a6bdc29770264736f6c634300081500330000000000000000000000003a3b750e7d4d389bc1d0be20e5d09530f82b99110000000000000000000000004ae8f648b1ec892b6cc68c89cc088583964d08be000000000000000000000000ee76becaf80ffe451c8b8afeec0c21518def02f9", + "nonce": "0x79", + "chainId": "0xaa36a7", + "accessList": null, + "type": null + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x573b14", + "logs": [ + { + "address": "0x8d4e896981de5e67a3e2a90a43a43be1fa34d0b8", + "topics": [ + "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" + ], + "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", + "blockHash": "0xdfc0a0ec5936bc64a06534dd434aaf3197fca030b6666a75a612f36c759987d5", + "blockNumber": "0x5d2894", + "transactionHash": "0xdfcc2ab74635be94ba8e308173a1cb5c8b4794942faddc9db440eb0b13364e4c", + "transactionIndex": "0x2d", + "logIndex": "0x63", + "removed": false + } + ], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000100000000000000008000000000000000000400000000000000000000000010000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x0", + "transactionHash": "0xdfcc2ab74635be94ba8e308173a1cb5c8b4794942faddc9db440eb0b13364e4c", + "transactionIndex": "0x2d", + "blockHash": "0xdfc0a0ec5936bc64a06534dd434aaf3197fca030b6666a75a612f36c759987d5", + "blockNumber": "0x5d2894", + "gasUsed": "0x14efd7", + "effectiveGasPrice": "0x4d47b32af", + "from": "0x0724d72eb61e508d81ca701881f2248f092953bf", + "to": null, + "contractAddress": "0x8d4e896981de5e67a3e2a90a43a43be1fa34d0b8" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1718356769, + "chain": 11155111, + "commit": "91d4f8f" +} \ No newline at end of file diff --git a/broadcast/UpgradeEmissionManager.s.sol/11155111/run-latest.json b/broadcast/UpgradeEmissionManager.s.sol/11155111/run-latest.json new file mode 100644 index 0000000..01d6e4e --- /dev/null +++ b/broadcast/UpgradeEmissionManager.s.sol/11155111/run-latest.json @@ -0,0 +1,67 @@ +{ + "transactions": [ + { + "hash": "0xdfcc2ab74635be94ba8e308173a1cb5c8b4794942faddc9db440eb0b13364e4c", + "transactionType": "CREATE", + "contractName": "DefaultEmissionManager", + "contractAddress": "0x8d4e896981de5e67a3e2a90a43a43be1fa34d0b8", + "function": null, + "arguments": [ + "0x3A3B750E7d4d389Bc1d0be20E5D09530F82B9911", + "0x4AE8f648B1Ec892B6cc68C89cc088583964d08bE", + "0xeE76bECaF80fFe451c8B8AFEec0c21518Def02f9" + ], + "transaction": { + "from": "0x0724d72eb61e508d81ca701881f2248f092953bf", + "to": null, + "gas": "0x1b35b3", + "value": "0x0", + "input": "0x61010034620001c357601f6200195b38819003918201601f191683019291906001600160401b03841183851017620001c8578160609284926040968752833981010312620001c3576200005281620001de565b906200006e836200006660208401620001de565b9201620001de565b916001600160a01b03908116908115908115620001b7575b8115620001ab575b506200019a573360805260a05260c05260e05260005460ff8160081c16620001465760ff808216036200010b575b50516117679081620001f4823960805181610575015260a0518181816105fc015281816108570152610db9015260c0518181816102fb0152610def015260e0518181816104990152610d690152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001c35756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610edd565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a5a565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a3e565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a7c565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a5a565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a5a565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c78565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b67ffffffffffffffff8111610a2857604052565b634e487b7160e01b600052604160045260246000fd5b6040810190811067ffffffffffffffff821117610a2857604052565b90601f8019910116810190811067ffffffffffffffff821117610a2857604052565b60018060a01b031690604051610a9181610a3e565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610bb6573d9167ffffffffffffffff8311610ba25790610b0c93929160405192610aff88601f19601f8401160185610a5a565b83523d868885013e610bc0565b805191821591848315610b7e575b505050905015610b275750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b1a565b634e487b7160e01b85526041600452602485fd5b90610b0c92916060915b91929015610c225750815115610bd4575090565b3b15610bdd5790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c355750805190602001fd5b60405162461bcd60e51b8152908190610c5190600483016108ba565b0390fd5b91908203918211610c6257565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526000926001600160a01b03908116916020908181600481875afa8015610ed3578690610ea0575b610cce9150610cc9610cc460985442610c55565b610edd565b610c55565b928315610e98578360011b848104600203610e84576005900491610cf28386610c55565b947fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc58780518381523385820152a1823b156108175786516340c10f1960e01b81523060048201526024810191909152878160448183875af18015610e7a57610e5d575b50855163a9059cbb60e01b918101919091527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166024820152604480820193909352918252610db79190610db2606483610a5a565b610a7c565b7f00000000000000000000000000000000000000000000000000000000000000001690813b1561045e578251630899d25960e41b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031660048201526024810191909152919083908390604490829084905af1908115610e545750610e43575050565b610e4d8291610a14565b6101a35750565b513d84823e3d90fd5b610db793929197610e70610db292610a14565b9791929350610d55565b87513d8a823e3d90fd5b634e487b7160e01b87526011600452602487fd5b505050505050565b508181813d8311610ecc575b610eb68183610a5a565b81010312610ec857610cce9051610cb0565b8580fd5b503d610eac565b85513d88823e3d90fd5b667e8fc1d5029dc49080820291820403610c6257670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611620575b66ff0000000000008316611518575b65ff00000000008316611418575b64ff000000008316611320575b63ff0000008316611230575b62ff00008316611148575b61ff008316611068575b60ff8316610f91575b02911c60bf031c60995490818102918183041490151715610c62570490565b60808316611056575b838316611044575b60208316611032575b60108316611020575b6008831661100e575b60048316610ffc575b60028316610fea575b6001831615610f72576801000000000000000102831c610f72565b6801000000000000000102831c610fcf565b6801000000000000000302831c610fc6565b6801000000000000000602831c610fbd565b6801000000000000000b02831c610fb4565b6801000000000000001602831c610fab565b6801000000000000002c02831c610fa2565b6801000000000000005902831c610f9a565b6180008316611136575b6140008316611124575b6120008316611112575b6110008316611100575b61080083166110ee575b61040083166110dc575b61020083166110ca575b610100831615610f6957680100000000000000b102831c610f69565b6801000000000000016302831c6110ae565b680100000000000002c602831c6110a4565b6801000000000000058c02831c61109a565b68010000000000000b1702831c611090565b6801000000000000162e02831c611086565b68010000000000002c5d02831c61107c565b680100000000000058b902831c611072565b62800000831661121e575b62400000831661120c575b6220000083166111fa575b6210000083166111e8575b6208000083166111d6575b6204000083166111c4575b6202000083166111b2575b62010000831615610f5f576801000000000000b17202831c610f5f565b680100000000000162e402831c611195565b6801000000000002c5c802831c61118a565b68010000000000058b9102831c61117f565b680100000000000b172102831c611174565b68010000000000162e4302831c611169565b680100000000002c5c8602831c61115e565b6801000000000058b90c02831c611153565b6380000000831661130e575b634000000083166112fc575b632000000083166112ea575b631000000083166112d8575b630800000083166112c6575b630400000083166112b4575b630200000083166112a2575b6301000000831615610f545768010000000000b1721802831c610f54565b6801000000000162e43002831c611284565b68010000000002c5c86002831c611278565b680100000000058b90c002831c61126c565b6801000000000b17217f02831c611260565b680100000000162e42ff02831c611254565b6801000000002c5c85fe02831c611248565b68010000000058b90bfc02831c61123c565b6480000000008316611406575b64400000000083166113f4575b64200000000083166113e2575b64100000000083166113d0575b64080000000083166113be575b64040000000083166113ac575b640200000000831661139a575b640100000000831615610f4857680100000000b17217f802831c610f48565b68010000000162e42ff102831c61137b565b680100000002c5c85fe302831c61136e565b6801000000058b90bfce02831c611361565b68010000000b17217fbb02831c611354565b6801000000162e42fff002831c611347565b68010000002c5c8601cc02831c61133a565b680100000058b90c0b4902831c61132d565b658000000000008316611506575b6540000000000083166114f4575b6520000000000083166114e2575b6510000000000083166114d0575b6508000000000083166114be575b6504000000000083166114ac575b65020000000000831661149a575b65010000000000831615610f3b576801000000b17218355102831c610f3b565b680100000162e430e5a202831c61147a565b6801000002c5c863b73f02831c61146c565b68010000058b90cf1e6e02831c61145e565b680100000b1721bcfc9a02831c611450565b68010000162e43f4f83102831c611442565b680100002c5c89d5ec6d02831c611434565b6801000058b91b5bc9ae02831c611426565b6680000000000000831661160e575b664000000000000083166115fc575b662000000000000083166115ea575b661000000000000083166115d8575b660800000000000083166115c6575b660400000000000083166115b4575b660200000000000083166115a2575b6601000000000000831615610f2d5768010000b17255775c0402831c610f2d565b6801000162e525ee054702831c611581565b68010002c5cc37da949202831c611572565b680100058ba01fb9f96d02831c611563565b6801000b175effdc76ba02831c611554565b680100162f3904051fa102831c611545565b6801002c605e2e8cec5002831c611536565b68010058c86da1c09ea202831c611527565b678000000000000000831661171e575b674000000000000000831661170c575b67200000000000000083166116fa575b67100000000000000083166116e8575b67080000000000000083166116d6575b67040000000000000083166116c4575b67020000000000000083166116b2575b670100000000000000831615610f1e57680100b1afa5abcbed6102831c610f1e565b68010163da9fb33356d802831c611690565b680102c9a3e778060ee702831c611680565b6801059b0d31585743ae02831c611670565b68010b5586cf9890f62a02831c611660565b6801172b83c7d517adce02831c611650565b6801306fe0a31b7152df02831c611640565b5068016a09e667f3bcc909607f1b61163056fea264697066735822122051de1fb3c32307cc00b0a21a4300e96267e072476c0382d060593a6bdc29770264736f6c634300081500330000000000000000000000003a3b750e7d4d389bc1d0be20e5d09530f82b99110000000000000000000000004ae8f648b1ec892b6cc68c89cc088583964d08be000000000000000000000000ee76becaf80ffe451c8b8afeec0c21518def02f9", + "nonce": "0x79", + "chainId": "0xaa36a7", + "accessList": null, + "type": null + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x573b14", + "logs": [ + { + "address": "0x8d4e896981de5e67a3e2a90a43a43be1fa34d0b8", + "topics": [ + "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" + ], + "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", + "blockHash": "0xdfc0a0ec5936bc64a06534dd434aaf3197fca030b6666a75a612f36c759987d5", + "blockNumber": "0x5d2894", + "transactionHash": "0xdfcc2ab74635be94ba8e308173a1cb5c8b4794942faddc9db440eb0b13364e4c", + "transactionIndex": "0x2d", + "logIndex": "0x63", + "removed": false + } + ], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000100000000000000008000000000000000000400000000000000000000000010000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x0", + "transactionHash": "0xdfcc2ab74635be94ba8e308173a1cb5c8b4794942faddc9db440eb0b13364e4c", + "transactionIndex": "0x2d", + "blockHash": "0xdfc0a0ec5936bc64a06534dd434aaf3197fca030b6666a75a612f36c759987d5", + "blockNumber": "0x5d2894", + "gasUsed": "0x14efd7", + "effectiveGasPrice": "0x4d47b32af", + "from": "0x0724d72eb61e508d81ca701881f2248f092953bf", + "to": null, + "contractAddress": "0x8d4e896981de5e67a3e2a90a43a43be1fa34d0b8" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1718356769, + "chain": 11155111, + "commit": "91d4f8f" +} \ No newline at end of file diff --git a/foundry.toml b/foundry.toml index c0cb5cf..3a743fd 100644 --- a/foundry.toml +++ b/foundry.toml @@ -11,8 +11,13 @@ fs_permissions = [ { access = "read", path = "script/config.json" }, { access = "read", path = "script/1.0.0/input.json" }, { access = "read", path = "script/1.1.0/input.json" }, + { access = "read", path = "script/1.2.0/input.json" }, ] +[rpc_endpoints] +testnet = "${RPC_URL}" +mainnet = "${RPC_MAINNET}" + [profile.intense.fuzz] runs = 10000 max_test_rejects = 999999 diff --git a/makefile b/makefile new file mode 100644 index 0000000..995614e --- /dev/null +++ b/makefile @@ -0,0 +1,10 @@ +# !!! commands do not include --broadcast !!! +# it should be manually and intentionally added only when a real deployment takes place + +# PRIVATE_KEY has to be set in .env +# rpc-url synonyms are in foundry.toml, which points to .env as well +upgrade-emission-manager-testnet: + forge script script/1.2.0/UpgradeEmissionManager.s.sol --legacy --rpc-url testnet + +upgrade-emission-manager-MAINNET: + forge script script/1.2.0/UpgradeEmissionManager.s.sol --legacy --rpc-url mainnet \ No newline at end of file diff --git a/script/1.2.0/UpgradeEmissionManager.s.sol b/script/1.2.0/UpgradeEmissionManager.s.sol new file mode 100644 index 0000000..ab64260 --- /dev/null +++ b/script/1.2.0/UpgradeEmissionManager.s.sol @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.21; + +import {Script, stdJson, console2 as console} from "forge-std/Script.sol"; + +import { + ProxyAdmin, + TransparentUpgradeableProxy, + ITransparentUpgradeableProxy +} from "openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol"; +import {DefaultEmissionManager} from "../../src/DefaultEmissionManager.sol"; + +contract UpgradeEmissionManager is Script { + using stdJson for string; + + function run() public { + uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY"); + + string memory input = vm.readFile("script/1.2.0/input.json"); + string memory chainIdSlug = string(abi.encodePacked('["', vm.toString(block.chainid), '"]')); + address emProxyAddress = input.readAddress(string.concat(chainIdSlug, ".emissionManagerProxy")); + address emProxyAdmin = input.readAddress(string.concat(chainIdSlug, ".emProxyAdmin")); + address newTreasury = input.readAddress(string.concat(chainIdSlug, ".treasury")); + + vm.startBroadcast(deployerPrivateKey); + + DefaultEmissionManager emProxy = DefaultEmissionManager(emProxyAddress); + + address migration = address(emProxy.migration()); + address stakeManager = emProxy.stakeManager(); + + DefaultEmissionManager newEmImpl = new DefaultEmissionManager(migration, stakeManager, newTreasury); + + vm.stopBroadcast(); + + bytes memory payload = abi.encodeWithSelector( + ProxyAdmin.upgradeAndCall.selector, + ITransparentUpgradeableProxy(address(emProxy)), + address(newEmImpl), + abi.encodeWithSelector(DefaultEmissionManager.reinitialize.selector) + ); + + console.log("Send this payload to: ", emProxyAdmin); + console.logBytes(payload); + } +} diff --git a/script/1.2.0/input.json b/script/1.2.0/input.json new file mode 100644 index 0000000..9385a50 --- /dev/null +++ b/script/1.2.0/input.json @@ -0,0 +1,12 @@ +{ + "1": { + "emissionManagerProxy": "0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53", + "emProxyAdmin": "0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3", + "treasury": "TBD" + }, + "11155111": { + "emissionManagerProxy": "0x20393fF3B3C38b72a16eB7d7A474cd38ABD8Ff27", + "emProxyAdmin": "0x28cDCE6FfE44D03da1F7b15b474a0e72243873F2", + "treasury": "0xeE76bECaF80fFe451c8B8AFEec0c21518Def02f9" + } +} diff --git a/test/upgrade/DefaultEmissionManager.1.2.0.t.sol b/test/upgrade/DefaultEmissionManager.1.2.0.mainnet.t.sol similarity index 94% rename from test/upgrade/DefaultEmissionManager.1.2.0.t.sol rename to test/upgrade/DefaultEmissionManager.1.2.0.mainnet.t.sol index ba4ecf4..4ad5c51 100644 --- a/test/upgrade/DefaultEmissionManager.1.2.0.t.sol +++ b/test/upgrade/DefaultEmissionManager.1.2.0.mainnet.t.sol @@ -14,7 +14,7 @@ import {Test} from "forge-std/Test.sol"; // this test forks mainnet and tests the upgradeability of DefaultEmissionManagerProxy -contract DefaultEmissionManagerTest is Test { +contract DefaultEmissionManagerTestMainnet is Test { uint256 mainnetFork; address POLYGON_PROTOCOL_COUNCIL = 0x37D085ca4a24f6b29214204E8A8666f12cf19516; @@ -28,8 +28,7 @@ contract DefaultEmissionManagerTest is Test { string[] internal inputs = new string[](5); function setUp() public { - string memory MAINNET_RPC_URL = vm.envString("MAINNET_RPC_URL"); - mainnetFork = vm.createFork(MAINNET_RPC_URL); + mainnetFork = vm.createFork(vm.rpcUrl("mainnet")); } function testUpgrade() external { diff --git a/test/upgrade/DefaultEmissionManager.1.2.0.sepolia.t.sol b/test/upgrade/DefaultEmissionManager.1.2.0.sepolia.t.sol new file mode 100644 index 0000000..dc4fbde --- /dev/null +++ b/test/upgrade/DefaultEmissionManager.1.2.0.sepolia.t.sol @@ -0,0 +1,79 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.21; + +import {PolygonEcosystemToken} from "src/PolygonEcosystemToken.sol"; +import {DefaultEmissionManager} from "src/DefaultEmissionManager.sol"; +import {PolygonMigration} from "src/PolygonMigration.sol"; +import {ERC20PresetMinterPauser} from "openzeppelin-contracts/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol"; +import { + ProxyAdmin, + TransparentUpgradeableProxy, + ITransparentUpgradeableProxy +} from "openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol"; +import {Test} from "forge-std/Test.sol"; + +// this test forks mainnet and tests the upgradeability of DefaultEmissionManagerProxy + +contract DefaultEmissionManagerTestSepolia is Test { + uint256 fork; + + address POLYGON_PROTOCOL_COUNCIL = 0xeE76bECaF80fFe451c8B8AFEec0c21518Def02f9; + address EM_PROXY = 0x20393fF3B3C38b72a16eB7d7A474cd38ABD8Ff27; + address COMMUNITY_TREASURY = 0xeE76bECaF80fFe451c8B8AFEec0c21518Def02f9; + address EM_PROXY_ADMIN = 0x28cDCE6FfE44D03da1F7b15b474a0e72243873F2; + PolygonEcosystemToken pol = PolygonEcosystemToken(0x44499312f493F62f2DFd3C6435Ca3603EbFCeeBa); + + uint256 NEW_INTEREST_PER_YEAR_LOG2 = 0.03562390973072122e18; // log2(1.025) + + string[] internal inputs = new string[](5); + + function setUp() public { + fork = vm.createFork(vm.rpcUrl("testnet")); + } + + function testUpgrade() external { + vm.selectFork(fork); + + address newTreasury = makeAddr("newTreasury"); + + DefaultEmissionManager emProxy = DefaultEmissionManager(EM_PROXY); + + assertEq(emProxy.treasury(), COMMUNITY_TREASURY); + + address migration = address(emProxy.migration()); + address stakeManager = emProxy.stakeManager(); + + DefaultEmissionManager newEmImpl = new DefaultEmissionManager(migration, stakeManager, newTreasury); + + ProxyAdmin admin = ProxyAdmin(EM_PROXY_ADMIN); + + vm.prank(POLYGON_PROTOCOL_COUNCIL); + + admin.upgradeAndCall( + ITransparentUpgradeableProxy(address(emProxy)), + address(newEmImpl), + abi.encodeWithSelector(DefaultEmissionManager.reinitialize.selector) + ); + + // initialize can still not be called + vm.expectRevert("Initializable: contract is already initialized"); + emProxy.initialize(makeAddr("token"), msg.sender); + + assertEq(pol.totalSupply(), emProxy.START_SUPPLY_1_2_0()); + assertEq(block.timestamp, emProxy.startTimestamp()); + + // emission is now 2.5% + inputs[0] = "node"; + inputs[1] = "test/util/calc.js"; + inputs[2] = vm.toString(uint256(365 days)); + inputs[3] = vm.toString(pol.totalSupply()); + // vm.ffi executes the js script which contains the new emission rate + uint256 newSupply = abi.decode(vm.ffi(inputs), (uint256)); + assertApproxEqAbs(newSupply, emProxy.inflatedSupplyAfter(365 days), 1e20); + + // treasury has been updated + assertEq(emProxy.treasury(), newTreasury); + // emission has been updated + assertEq(emProxy.INTEREST_PER_YEAR_LOG2(), NEW_INTEREST_PER_YEAR_LOG2); + } +} From 87c8be450a6b7e30863efaa1aff712cbf891f149 Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Wed, 8 May 2024 11:50:51 +0200 Subject: [PATCH 03/16] send POL to StakeManager --- src/DefaultEmissionManager.sol | 6 ++++-- test/DefaultEmissionManager.t.sol | 10 +++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/DefaultEmissionManager.sol b/src/DefaultEmissionManager.sol index de18ff2..bc4e9cf 100644 --- a/src/DefaultEmissionManager.sol +++ b/src/DefaultEmissionManager.sol @@ -77,10 +77,12 @@ contract DefaultEmissionManager is Ownable2StepUpgradeable, IDefaultEmissionMana emit TokenMint(amountToMint, msg.sender); IPolygonEcosystemToken _token = token; + _token.mint(address(this), amountToMint); + _token.safeTransfer(treasury, treasuryAmt); - // backconvert POL to MATIC before sending to StakeManager - migration.unmigrateTo(stakeManager, stakeManagerAmt); + + _token.safeTransfer(stakeManager, stakeManagerAmt); } /// @inheritdoc IDefaultEmissionManager diff --git a/test/DefaultEmissionManager.t.sol b/test/DefaultEmissionManager.t.sol index c1267db..0780ed0 100644 --- a/test/DefaultEmissionManager.t.sol +++ b/test/DefaultEmissionManager.t.sol @@ -127,7 +127,6 @@ contract DefaultEmissionManagerTest is Test { emissionManager.mint(); // timeElapsed is zero, so no minting assertEq(polygon.balanceOf(stakeManager), 0); - assertEq(matic.balanceOf(stakeManager), 0); assertEq(polygon.balanceOf(treasury), 0); } @@ -169,8 +168,7 @@ contract DefaultEmissionManagerTest is Test { assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); uint256 balance = (polygon.totalSupply() - initialTotalSupply) * 2 / 5; uint256 stakeManagerBalance = (polygon.totalSupply() - initialTotalSupply) - balance; - assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); - assertEq(polygon.balanceOf(stakeManager), 0); + assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance); assertEq(polygon.balanceOf(treasury), balance); skip(delay); @@ -187,8 +185,7 @@ contract DefaultEmissionManagerTest is Test { balance = totalAmtMintedTwoFifth; stakeManagerBalance = totalAmtMinted - totalAmtMintedTwoFifth; - assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); - assertEq(polygon.balanceOf(stakeManager), 0); + assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance); assertEq(polygon.balanceOf(treasury), balance); } @@ -215,8 +212,7 @@ contract DefaultEmissionManagerTest is Test { balance = totalAmtMintedTwoFifth; stakeManagerBalance = totalAmtMinted - totalAmtMintedTwoFifth; - assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); - assertEq(polygon.balanceOf(stakeManager), 0); + assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance); assertEq(polygon.balanceOf(treasury), balance); } } From a5ad2192decd7183a6235850fa16bb7226a1c413 Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Sun, 16 Jun 2024 15:46:54 +0200 Subject: [PATCH 04/16] fix test --- test/DefaultEmissionManager.t.sol | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/DefaultEmissionManager.t.sol b/test/DefaultEmissionManager.t.sol index 0780ed0..20081ac 100644 --- a/test/DefaultEmissionManager.t.sol +++ b/test/DefaultEmissionManager.t.sol @@ -146,9 +146,7 @@ contract DefaultEmissionManagerTest is Test { assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); uint256 totalAmtMinted = polygon.totalSupply() - initialTotalSupply; uint256 totalAmtMintedTwoFifth = totalAmtMinted * 2 / 5; - assertEq(matic.balanceOf(stakeManager), totalAmtMinted - totalAmtMintedTwoFifth); - assertEq(matic.balanceOf(treasury), 0); - assertEq(polygon.balanceOf(stakeManager), 0); + assertEq(polygon.balanceOf(stakeManager), totalAmtMinted - totalAmtMintedTwoFifth); assertEq(polygon.balanceOf(treasury), totalAmtMintedTwoFifth); } From 336cb2e83091cd50d9f96e502222788dda7c2d8f Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Mon, 17 Jun 2024 12:07:29 +0200 Subject: [PATCH 05/16] update workflow --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 879320b..8cff5f7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,12 +36,14 @@ jobs: forge --version forge build --sizes env: - MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }} + RPC_MAINNET: ${{ secrets.RPC_MAINNET }} + RPC_URL: ${{ secrets.RPC_URL }} id: build - name: Run Forge tests # ! revert back to FOUNDRY_PROFILE=intense forge test -vvv run: forge test -vvv env: - MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }} + RPC_MAINNET: ${{ secrets.RPC_MAINNET }} + RPC_URL: ${{ secrets.RPC_URL }} id: test From 1e0eeb8cc158be9bb9cc531f95ce1c3e40ced97e Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Mon, 24 Jun 2024 16:16:45 +0200 Subject: [PATCH 06/16] add new treasury address --- makefile | 2 +- script/1.2.0/input.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/makefile b/makefile index 995614e..5b0e83c 100644 --- a/makefile +++ b/makefile @@ -7,4 +7,4 @@ upgrade-emission-manager-testnet: forge script script/1.2.0/UpgradeEmissionManager.s.sol --legacy --rpc-url testnet upgrade-emission-manager-MAINNET: - forge script script/1.2.0/UpgradeEmissionManager.s.sol --legacy --rpc-url mainnet \ No newline at end of file + forge script script/1.2.0/UpgradeEmissionManager.s.sol --rpc-url mainnet \ No newline at end of file diff --git a/script/1.2.0/input.json b/script/1.2.0/input.json index 9385a50..698a6b0 100644 --- a/script/1.2.0/input.json +++ b/script/1.2.0/input.json @@ -2,7 +2,7 @@ "1": { "emissionManagerProxy": "0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53", "emProxyAdmin": "0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3", - "treasury": "TBD" + "treasury": "0x86380e136A3AaD5677A210Ad02713694c4E6a5b9" }, "11155111": { "emissionManagerProxy": "0x20393fF3B3C38b72a16eB7d7A474cd38ABD8Ff27", From a283e563463148e179f9ee58df8f5bfca90195c6 Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Wed, 26 Jun 2024 16:52:46 +0200 Subject: [PATCH 07/16] Revert PR60 "send POL to StakeManager" This reverts commit 8b0a0b6a7c9a41e0a4ed8fc7961c10d6a5b9cefb. --- src/DefaultEmissionManager.sol | 6 ++---- test/DefaultEmissionManager.t.sol | 12 ++++++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/DefaultEmissionManager.sol b/src/DefaultEmissionManager.sol index bc4e9cf..de18ff2 100644 --- a/src/DefaultEmissionManager.sol +++ b/src/DefaultEmissionManager.sol @@ -77,12 +77,10 @@ contract DefaultEmissionManager is Ownable2StepUpgradeable, IDefaultEmissionMana emit TokenMint(amountToMint, msg.sender); IPolygonEcosystemToken _token = token; - _token.mint(address(this), amountToMint); - _token.safeTransfer(treasury, treasuryAmt); - - _token.safeTransfer(stakeManager, stakeManagerAmt); + // backconvert POL to MATIC before sending to StakeManager + migration.unmigrateTo(stakeManager, stakeManagerAmt); } /// @inheritdoc IDefaultEmissionManager diff --git a/test/DefaultEmissionManager.t.sol b/test/DefaultEmissionManager.t.sol index 20081ac..7a5fd59 100644 --- a/test/DefaultEmissionManager.t.sol +++ b/test/DefaultEmissionManager.t.sol @@ -127,6 +127,7 @@ contract DefaultEmissionManagerTest is Test { emissionManager.mint(); // timeElapsed is zero, so no minting assertEq(polygon.balanceOf(stakeManager), 0); + assertEq(matic.balanceOf(stakeManager), 0); assertEq(polygon.balanceOf(treasury), 0); } @@ -146,7 +147,7 @@ contract DefaultEmissionManagerTest is Test { assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); uint256 totalAmtMinted = polygon.totalSupply() - initialTotalSupply; uint256 totalAmtMintedTwoFifth = totalAmtMinted * 2 / 5; - assertEq(polygon.balanceOf(stakeManager), totalAmtMinted - totalAmtMintedTwoFifth); + assertEq(matic.balanceOf(stakeManager), totalAmtMinted - totalAmtMintedTwoFifth); assertEq(polygon.balanceOf(treasury), totalAmtMintedTwoFifth); } @@ -166,7 +167,8 @@ contract DefaultEmissionManagerTest is Test { assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); uint256 balance = (polygon.totalSupply() - initialTotalSupply) * 2 / 5; uint256 stakeManagerBalance = (polygon.totalSupply() - initialTotalSupply) - balance; - assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance); + assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); + assertEq(polygon.balanceOf(stakeManager), 0); assertEq(polygon.balanceOf(treasury), balance); skip(delay); @@ -183,7 +185,8 @@ contract DefaultEmissionManagerTest is Test { balance = totalAmtMintedTwoFifth; stakeManagerBalance = totalAmtMinted - totalAmtMintedTwoFifth; - assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance); + assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); + assertEq(polygon.balanceOf(stakeManager), 0); assertEq(polygon.balanceOf(treasury), balance); } @@ -210,7 +213,8 @@ contract DefaultEmissionManagerTest is Test { balance = totalAmtMintedTwoFifth; stakeManagerBalance = totalAmtMinted - totalAmtMintedTwoFifth; - assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance); + assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); + assertEq(polygon.balanceOf(stakeManager), 0); assertEq(polygon.balanceOf(treasury), balance); } } From a632fa7da722206977a4718331e5fec137b275a9 Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Mon, 24 Jun 2024 17:06:44 +0200 Subject: [PATCH 08/16] test mainnet deployment DefaultEmissionManager1.2.0 impl --- .../1/run-1719240627.json | 64 +++++++++++++++++++ .../1/run-latest.json | 64 +++++++++++++++++++ makefile | 4 +- 3 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 broadcast/UpgradeEmissionManager.s.sol/1/run-1719240627.json create mode 100644 broadcast/UpgradeEmissionManager.s.sol/1/run-latest.json diff --git a/broadcast/UpgradeEmissionManager.s.sol/1/run-1719240627.json b/broadcast/UpgradeEmissionManager.s.sol/1/run-1719240627.json new file mode 100644 index 0000000..6f13c5f --- /dev/null +++ b/broadcast/UpgradeEmissionManager.s.sol/1/run-1719240627.json @@ -0,0 +1,64 @@ +{ + "transactions": [ + { + "hash": "0x76a975a5a21c6741521b3c98eeb9da65fe184d0245910055fc04a735e8f73634", + "transactionType": "CREATE", + "contractName": "DefaultEmissionManager", + "contractAddress": "0x46ce937a70412dfdcf01f29d6d4fe15ada1faeb8", + "function": null, + "arguments": [ + "0x29e7DF7b6A1B2b07b731457f499E1696c60E2C4e", + "0x5e3Ef299fDDf15eAa0432E6e66473ace8c13D908", + "0x86380e136A3AaD5677A210Ad02713694c4E6a5b9" + ], + "transaction": { + "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", + "gas": "0x1a9134", + "value": "0x0", + "input": "0x61010034620001bc57601f620018bd38819003918201601f191683019291906001600160401b03841183851017620001c1578160609284926040968752833981010312620001bc576200005281620001d7565b906200006e836200006660208401620001d7565b9201620001d7565b916001600160a01b03908116908115908115620001b0575b8115620001a4575b5062000193573360805260a05260c05260e05260005460ff8160081c166200013f5760ff8082160362000104575b50516116d09081620001ed823960805181610575015260a0518181816105fc0152610857015260c0518181816102fb0152610d71015260e0518181816104990152610d4a0152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001bc5756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610e46565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a46565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a14565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a68565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a46565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a46565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c64565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b6040810190811067ffffffffffffffff821117610a3057604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610a3057604052565b60018060a01b031690604051610a7d81610a14565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610ba2573d9167ffffffffffffffff8311610b8e5790610af893929160405192610aeb88601f19601f8401160185610a46565b83523d868885013e610bac565b805191821591848315610b6a575b505050905015610b135750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b06565b634e487b7160e01b85526041600452602485fd5b90610af892916060915b91929015610c0e5750815115610bc0575090565b3b15610bc95790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c215750805190602001fd5b60405162461bcd60e51b8152908190610c3d90600483016108ba565b0390fd5b91908203918211610c4e57565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526001600160a01b0390921691602081600481865afa8015610dfa57600090610dc7575b610cb69150610cb1610cac60985442610c41565b610e46565b610c41565b918215610dc2578260011b838104600203610c4e576005900492610cda8482610c41565b927fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc5818051848152336020820152a1823b156108b55780516340c10f1960e01b8152306004820152602481019290925260008260448183875af18015610db757610d98575b5050610d6f610d96937f000000000000000000000000000000000000000000000000000000000000000083610e05565b7f000000000000000000000000000000000000000000000000000000000000000090610e05565b565b909367ffffffffffffffff8511610a3057939052610d6f610d96610d3f565b50513d6000823e3d90fd5b505050565b6020823d8211610df2575b81610ddf60209383610a46565b810103126101a35750610cb69051610c98565b3d9150610dd2565b82513d6000823e3d90fd5b60405163a9059cbb60e01b60208201526001600160a01b03929092166024830152604480830193909352918152610d9691610e41606483610a46565b610a68565b667e8fc1d5029dc49080820291820403610c4e57670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611589575b66ff0000000000008316611481575b65ff00000000008316611381575b64ff000000008316611289575b63ff0000008316611199575b62ff000083166110b1575b61ff008316610fd1575b60ff8316610efa575b02911c60bf031c60995490818102918183041490151715610c4e570490565b60808316610fbf575b838316610fad575b60208316610f9b575b60108316610f89575b60088316610f77575b60048316610f65575b60028316610f53575b6001831615610edb576801000000000000000102831c610edb565b6801000000000000000102831c610f38565b6801000000000000000302831c610f2f565b6801000000000000000602831c610f26565b6801000000000000000b02831c610f1d565b6801000000000000001602831c610f14565b6801000000000000002c02831c610f0b565b6801000000000000005902831c610f03565b618000831661109f575b614000831661108d575b612000831661107b575b6110008316611069575b6108008316611057575b6104008316611045575b6102008316611033575b610100831615610ed257680100000000000000b102831c610ed2565b6801000000000000016302831c611017565b680100000000000002c602831c61100d565b6801000000000000058c02831c611003565b68010000000000000b1702831c610ff9565b6801000000000000162e02831c610fef565b68010000000000002c5d02831c610fe5565b680100000000000058b902831c610fdb565b628000008316611187575b624000008316611175575b622000008316611163575b621000008316611151575b62080000831661113f575b62040000831661112d575b62020000831661111b575b62010000831615610ec8576801000000000000b17202831c610ec8565b680100000000000162e402831c6110fe565b6801000000000002c5c802831c6110f3565b68010000000000058b9102831c6110e8565b680100000000000b172102831c6110dd565b68010000000000162e4302831c6110d2565b680100000000002c5c8602831c6110c7565b6801000000000058b90c02831c6110bc565b63800000008316611277575b63400000008316611265575b63200000008316611253575b63100000008316611241575b6308000000831661122f575b6304000000831661121d575b6302000000831661120b575b6301000000831615610ebd5768010000000000b1721802831c610ebd565b6801000000000162e43002831c6111ed565b68010000000002c5c86002831c6111e1565b680100000000058b90c002831c6111d5565b6801000000000b17217f02831c6111c9565b680100000000162e42ff02831c6111bd565b6801000000002c5c85fe02831c6111b1565b68010000000058b90bfc02831c6111a5565b648000000000831661136f575b644000000000831661135d575b642000000000831661134b575b6410000000008316611339575b6408000000008316611327575b6404000000008316611315575b6402000000008316611303575b640100000000831615610eb157680100000000b17217f802831c610eb1565b68010000000162e42ff102831c6112e4565b680100000002c5c85fe302831c6112d7565b6801000000058b90bfce02831c6112ca565b68010000000b17217fbb02831c6112bd565b6801000000162e42fff002831c6112b0565b68010000002c5c8601cc02831c6112a3565b680100000058b90c0b4902831c611296565b65800000000000831661146f575b65400000000000831661145d575b65200000000000831661144b575b651000000000008316611439575b650800000000008316611427575b650400000000008316611415575b650200000000008316611403575b65010000000000831615610ea4576801000000b17218355102831c610ea4565b680100000162e430e5a202831c6113e3565b6801000002c5c863b73f02831c6113d5565b68010000058b90cf1e6e02831c6113c7565b680100000b1721bcfc9a02831c6113b9565b68010000162e43f4f83102831c6113ab565b680100002c5c89d5ec6d02831c61139d565b6801000058b91b5bc9ae02831c61138f565b66800000000000008316611577575b66400000000000008316611565575b66200000000000008316611553575b66100000000000008316611541575b6608000000000000831661152f575b6604000000000000831661151d575b6602000000000000831661150b575b6601000000000000831615610e965768010000b17255775c0402831c610e96565b6801000162e525ee054702831c6114ea565b68010002c5cc37da949202831c6114db565b680100058ba01fb9f96d02831c6114cc565b6801000b175effdc76ba02831c6114bd565b680100162f3904051fa102831c6114ae565b6801002c605e2e8cec5002831c61149f565b68010058c86da1c09ea202831c611490565b6780000000000000008316611687575b6740000000000000008316611675575b6720000000000000008316611663575b6710000000000000008316611651575b670800000000000000831661163f575b670400000000000000831661162d575b670200000000000000831661161b575b670100000000000000831615610e8757680100b1afa5abcbed6102831c610e87565b68010163da9fb33356d802831c6115f9565b680102c9a3e778060ee702831c6115e9565b6801059b0d31585743ae02831c6115d9565b68010b5586cf9890f62a02831c6115c9565b6801172b83c7d517adce02831c6115b9565b6801306fe0a31b7152df02831c6115a9565b5068016a09e667f3bcc909607f1b61159956fea2646970667358221220e8157d604744373673fbd15be261b726af85b1f831e22a152c039d15ffc5322064736f6c6343000815003300000000000000000000000029e7df7b6a1b2b07b731457f499e1696c60e2c4e0000000000000000000000005e3ef299fddf15eaa0432e6e66473ace8c13d90800000000000000000000000086380e136a3aad5677a210ad02713694c4e6a5b9", + "nonce": "0x2", + "chainId": "0x1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0xbf57ed", + "logs": [ + { + "address": "0x46ce937a70412dfdcf01f29d6d4fe15ada1faeb8", + "topics": [ + "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" + ], + "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", + "blockHash": "0x70f463c8e672dd2d070e68e46b5c49e3dc8ace31be96ed717ff8fc55b4308225", + "blockNumber": "0x133a6c8", + "transactionHash": "0x76a975a5a21c6741521b3c98eeb9da65fe184d0245910055fc04a735e8f73634", + "transactionIndex": "0x6a", + "logIndex": "0x163", + "removed": false + } + ], + "logsBloom": "0x00000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000100000000400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000", + "type": "0x0", + "transactionHash": "0x76a975a5a21c6741521b3c98eeb9da65fe184d0245910055fc04a735e8f73634", + "transactionIndex": "0x6a", + "blockHash": "0x70f463c8e672dd2d070e68e46b5c49e3dc8ace31be96ed717ff8fc55b4308225", + "blockNumber": "0x133a6c8", + "gasUsed": "0x147144", + "effectiveGasPrice": "0x1bd261b06", + "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", + "to": null, + "contractAddress": "0x46ce937a70412dfdcf01f29d6d4fe15ada1faeb8" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1719240627, + "chain": 1, + "commit": "f555f12" +} \ No newline at end of file diff --git a/broadcast/UpgradeEmissionManager.s.sol/1/run-latest.json b/broadcast/UpgradeEmissionManager.s.sol/1/run-latest.json new file mode 100644 index 0000000..6f13c5f --- /dev/null +++ b/broadcast/UpgradeEmissionManager.s.sol/1/run-latest.json @@ -0,0 +1,64 @@ +{ + "transactions": [ + { + "hash": "0x76a975a5a21c6741521b3c98eeb9da65fe184d0245910055fc04a735e8f73634", + "transactionType": "CREATE", + "contractName": "DefaultEmissionManager", + "contractAddress": "0x46ce937a70412dfdcf01f29d6d4fe15ada1faeb8", + "function": null, + "arguments": [ + "0x29e7DF7b6A1B2b07b731457f499E1696c60E2C4e", + "0x5e3Ef299fDDf15eAa0432E6e66473ace8c13D908", + "0x86380e136A3AaD5677A210Ad02713694c4E6a5b9" + ], + "transaction": { + "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", + "gas": "0x1a9134", + "value": "0x0", + "input": "0x61010034620001bc57601f620018bd38819003918201601f191683019291906001600160401b03841183851017620001c1578160609284926040968752833981010312620001bc576200005281620001d7565b906200006e836200006660208401620001d7565b9201620001d7565b916001600160a01b03908116908115908115620001b0575b8115620001a4575b5062000193573360805260a05260c05260e05260005460ff8160081c166200013f5760ff8082160362000104575b50516116d09081620001ed823960805181610575015260a0518181816105fc0152610857015260c0518181816102fb0152610d71015260e0518181816104990152610d4a0152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001bc5756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610e46565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a46565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a14565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a68565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a46565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a46565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c64565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b6040810190811067ffffffffffffffff821117610a3057604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610a3057604052565b60018060a01b031690604051610a7d81610a14565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610ba2573d9167ffffffffffffffff8311610b8e5790610af893929160405192610aeb88601f19601f8401160185610a46565b83523d868885013e610bac565b805191821591848315610b6a575b505050905015610b135750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b06565b634e487b7160e01b85526041600452602485fd5b90610af892916060915b91929015610c0e5750815115610bc0575090565b3b15610bc95790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c215750805190602001fd5b60405162461bcd60e51b8152908190610c3d90600483016108ba565b0390fd5b91908203918211610c4e57565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526001600160a01b0390921691602081600481865afa8015610dfa57600090610dc7575b610cb69150610cb1610cac60985442610c41565b610e46565b610c41565b918215610dc2578260011b838104600203610c4e576005900492610cda8482610c41565b927fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc5818051848152336020820152a1823b156108b55780516340c10f1960e01b8152306004820152602481019290925260008260448183875af18015610db757610d98575b5050610d6f610d96937f000000000000000000000000000000000000000000000000000000000000000083610e05565b7f000000000000000000000000000000000000000000000000000000000000000090610e05565b565b909367ffffffffffffffff8511610a3057939052610d6f610d96610d3f565b50513d6000823e3d90fd5b505050565b6020823d8211610df2575b81610ddf60209383610a46565b810103126101a35750610cb69051610c98565b3d9150610dd2565b82513d6000823e3d90fd5b60405163a9059cbb60e01b60208201526001600160a01b03929092166024830152604480830193909352918152610d9691610e41606483610a46565b610a68565b667e8fc1d5029dc49080820291820403610c4e57670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611589575b66ff0000000000008316611481575b65ff00000000008316611381575b64ff000000008316611289575b63ff0000008316611199575b62ff000083166110b1575b61ff008316610fd1575b60ff8316610efa575b02911c60bf031c60995490818102918183041490151715610c4e570490565b60808316610fbf575b838316610fad575b60208316610f9b575b60108316610f89575b60088316610f77575b60048316610f65575b60028316610f53575b6001831615610edb576801000000000000000102831c610edb565b6801000000000000000102831c610f38565b6801000000000000000302831c610f2f565b6801000000000000000602831c610f26565b6801000000000000000b02831c610f1d565b6801000000000000001602831c610f14565b6801000000000000002c02831c610f0b565b6801000000000000005902831c610f03565b618000831661109f575b614000831661108d575b612000831661107b575b6110008316611069575b6108008316611057575b6104008316611045575b6102008316611033575b610100831615610ed257680100000000000000b102831c610ed2565b6801000000000000016302831c611017565b680100000000000002c602831c61100d565b6801000000000000058c02831c611003565b68010000000000000b1702831c610ff9565b6801000000000000162e02831c610fef565b68010000000000002c5d02831c610fe5565b680100000000000058b902831c610fdb565b628000008316611187575b624000008316611175575b622000008316611163575b621000008316611151575b62080000831661113f575b62040000831661112d575b62020000831661111b575b62010000831615610ec8576801000000000000b17202831c610ec8565b680100000000000162e402831c6110fe565b6801000000000002c5c802831c6110f3565b68010000000000058b9102831c6110e8565b680100000000000b172102831c6110dd565b68010000000000162e4302831c6110d2565b680100000000002c5c8602831c6110c7565b6801000000000058b90c02831c6110bc565b63800000008316611277575b63400000008316611265575b63200000008316611253575b63100000008316611241575b6308000000831661122f575b6304000000831661121d575b6302000000831661120b575b6301000000831615610ebd5768010000000000b1721802831c610ebd565b6801000000000162e43002831c6111ed565b68010000000002c5c86002831c6111e1565b680100000000058b90c002831c6111d5565b6801000000000b17217f02831c6111c9565b680100000000162e42ff02831c6111bd565b6801000000002c5c85fe02831c6111b1565b68010000000058b90bfc02831c6111a5565b648000000000831661136f575b644000000000831661135d575b642000000000831661134b575b6410000000008316611339575b6408000000008316611327575b6404000000008316611315575b6402000000008316611303575b640100000000831615610eb157680100000000b17217f802831c610eb1565b68010000000162e42ff102831c6112e4565b680100000002c5c85fe302831c6112d7565b6801000000058b90bfce02831c6112ca565b68010000000b17217fbb02831c6112bd565b6801000000162e42fff002831c6112b0565b68010000002c5c8601cc02831c6112a3565b680100000058b90c0b4902831c611296565b65800000000000831661146f575b65400000000000831661145d575b65200000000000831661144b575b651000000000008316611439575b650800000000008316611427575b650400000000008316611415575b650200000000008316611403575b65010000000000831615610ea4576801000000b17218355102831c610ea4565b680100000162e430e5a202831c6113e3565b6801000002c5c863b73f02831c6113d5565b68010000058b90cf1e6e02831c6113c7565b680100000b1721bcfc9a02831c6113b9565b68010000162e43f4f83102831c6113ab565b680100002c5c89d5ec6d02831c61139d565b6801000058b91b5bc9ae02831c61138f565b66800000000000008316611577575b66400000000000008316611565575b66200000000000008316611553575b66100000000000008316611541575b6608000000000000831661152f575b6604000000000000831661151d575b6602000000000000831661150b575b6601000000000000831615610e965768010000b17255775c0402831c610e96565b6801000162e525ee054702831c6114ea565b68010002c5cc37da949202831c6114db565b680100058ba01fb9f96d02831c6114cc565b6801000b175effdc76ba02831c6114bd565b680100162f3904051fa102831c6114ae565b6801002c605e2e8cec5002831c61149f565b68010058c86da1c09ea202831c611490565b6780000000000000008316611687575b6740000000000000008316611675575b6720000000000000008316611663575b6710000000000000008316611651575b670800000000000000831661163f575b670400000000000000831661162d575b670200000000000000831661161b575b670100000000000000831615610e8757680100b1afa5abcbed6102831c610e87565b68010163da9fb33356d802831c6115f9565b680102c9a3e778060ee702831c6115e9565b6801059b0d31585743ae02831c6115d9565b68010b5586cf9890f62a02831c6115c9565b6801172b83c7d517adce02831c6115b9565b6801306fe0a31b7152df02831c6115a9565b5068016a09e667f3bcc909607f1b61159956fea2646970667358221220e8157d604744373673fbd15be261b726af85b1f831e22a152c039d15ffc5322064736f6c6343000815003300000000000000000000000029e7df7b6a1b2b07b731457f499e1696c60e2c4e0000000000000000000000005e3ef299fddf15eaa0432e6e66473ace8c13d90800000000000000000000000086380e136a3aad5677a210ad02713694c4e6a5b9", + "nonce": "0x2", + "chainId": "0x1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0xbf57ed", + "logs": [ + { + "address": "0x46ce937a70412dfdcf01f29d6d4fe15ada1faeb8", + "topics": [ + "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" + ], + "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", + "blockHash": "0x70f463c8e672dd2d070e68e46b5c49e3dc8ace31be96ed717ff8fc55b4308225", + "blockNumber": "0x133a6c8", + "transactionHash": "0x76a975a5a21c6741521b3c98eeb9da65fe184d0245910055fc04a735e8f73634", + "transactionIndex": "0x6a", + "logIndex": "0x163", + "removed": false + } + ], + "logsBloom": "0x00000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000100000000400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000", + "type": "0x0", + "transactionHash": "0x76a975a5a21c6741521b3c98eeb9da65fe184d0245910055fc04a735e8f73634", + "transactionIndex": "0x6a", + "blockHash": "0x70f463c8e672dd2d070e68e46b5c49e3dc8ace31be96ed717ff8fc55b4308225", + "blockNumber": "0x133a6c8", + "gasUsed": "0x147144", + "effectiveGasPrice": "0x1bd261b06", + "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", + "to": null, + "contractAddress": "0x46ce937a70412dfdcf01f29d6d4fe15ada1faeb8" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1719240627, + "chain": 1, + "commit": "f555f12" +} \ No newline at end of file diff --git a/makefile b/makefile index 5b0e83c..1c7a720 100644 --- a/makefile +++ b/makefile @@ -4,7 +4,7 @@ # PRIVATE_KEY has to be set in .env # rpc-url synonyms are in foundry.toml, which points to .env as well upgrade-emission-manager-testnet: - forge script script/1.2.0/UpgradeEmissionManager.s.sol --legacy --rpc-url testnet + forge script script/1.2.0/UpgradeEmissionManager.s.sol --legacy --verify --rpc-url testnet upgrade-emission-manager-MAINNET: - forge script script/1.2.0/UpgradeEmissionManager.s.sol --rpc-url mainnet \ No newline at end of file + forge script script/1.2.0/UpgradeEmissionManager.s.sol --legacy --verify --rpc-url mainnet From f7fca88b28696febf20ff19522c6f48d25f680ea Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Wed, 26 Jun 2024 17:11:41 +0200 Subject: [PATCH 09/16] Sepolia deployment --- .../11155111/run-1718356769.json | 67 ------------------- .../run-1719405184.json} | 56 ++++++++-------- .../11155111/run-latest.json | 51 +++++++------- deployments/11155111.md | 53 +++++++++++++-- deployments/json/11155111.json | 28 ++++++-- makefile | 4 +- script/utils/extract.js | 4 +- 7 files changed, 128 insertions(+), 135 deletions(-) delete mode 100644 broadcast/UpgradeEmissionManager.s.sol/11155111/run-1718356769.json rename broadcast/UpgradeEmissionManager.s.sol/{1/run-1719240627.json => 11155111/run-1719405184.json} (88%) diff --git a/broadcast/UpgradeEmissionManager.s.sol/11155111/run-1718356769.json b/broadcast/UpgradeEmissionManager.s.sol/11155111/run-1718356769.json deleted file mode 100644 index 01d6e4e..0000000 --- a/broadcast/UpgradeEmissionManager.s.sol/11155111/run-1718356769.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "transactions": [ - { - "hash": "0xdfcc2ab74635be94ba8e308173a1cb5c8b4794942faddc9db440eb0b13364e4c", - "transactionType": "CREATE", - "contractName": "DefaultEmissionManager", - "contractAddress": "0x8d4e896981de5e67a3e2a90a43a43be1fa34d0b8", - "function": null, - "arguments": [ - "0x3A3B750E7d4d389Bc1d0be20E5D09530F82B9911", - "0x4AE8f648B1Ec892B6cc68C89cc088583964d08bE", - "0xeE76bECaF80fFe451c8B8AFEec0c21518Def02f9" - ], - "transaction": { - "from": "0x0724d72eb61e508d81ca701881f2248f092953bf", - "to": null, - "gas": "0x1b35b3", - "value": "0x0", - "input": "0x61010034620001c357601f6200195b38819003918201601f191683019291906001600160401b03841183851017620001c8578160609284926040968752833981010312620001c3576200005281620001de565b906200006e836200006660208401620001de565b9201620001de565b916001600160a01b03908116908115908115620001b7575b8115620001ab575b506200019a573360805260a05260c05260e05260005460ff8160081c16620001465760ff808216036200010b575b50516117679081620001f4823960805181610575015260a0518181816105fc015281816108570152610db9015260c0518181816102fb0152610def015260e0518181816104990152610d690152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001c35756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610edd565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a5a565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a3e565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a7c565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a5a565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a5a565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c78565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b67ffffffffffffffff8111610a2857604052565b634e487b7160e01b600052604160045260246000fd5b6040810190811067ffffffffffffffff821117610a2857604052565b90601f8019910116810190811067ffffffffffffffff821117610a2857604052565b60018060a01b031690604051610a9181610a3e565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610bb6573d9167ffffffffffffffff8311610ba25790610b0c93929160405192610aff88601f19601f8401160185610a5a565b83523d868885013e610bc0565b805191821591848315610b7e575b505050905015610b275750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b1a565b634e487b7160e01b85526041600452602485fd5b90610b0c92916060915b91929015610c225750815115610bd4575090565b3b15610bdd5790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c355750805190602001fd5b60405162461bcd60e51b8152908190610c5190600483016108ba565b0390fd5b91908203918211610c6257565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526000926001600160a01b03908116916020908181600481875afa8015610ed3578690610ea0575b610cce9150610cc9610cc460985442610c55565b610edd565b610c55565b928315610e98578360011b848104600203610e84576005900491610cf28386610c55565b947fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc58780518381523385820152a1823b156108175786516340c10f1960e01b81523060048201526024810191909152878160448183875af18015610e7a57610e5d575b50855163a9059cbb60e01b918101919091527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166024820152604480820193909352918252610db79190610db2606483610a5a565b610a7c565b7f00000000000000000000000000000000000000000000000000000000000000001690813b1561045e578251630899d25960e41b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031660048201526024810191909152919083908390604490829084905af1908115610e545750610e43575050565b610e4d8291610a14565b6101a35750565b513d84823e3d90fd5b610db793929197610e70610db292610a14565b9791929350610d55565b87513d8a823e3d90fd5b634e487b7160e01b87526011600452602487fd5b505050505050565b508181813d8311610ecc575b610eb68183610a5a565b81010312610ec857610cce9051610cb0565b8580fd5b503d610eac565b85513d88823e3d90fd5b667e8fc1d5029dc49080820291820403610c6257670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611620575b66ff0000000000008316611518575b65ff00000000008316611418575b64ff000000008316611320575b63ff0000008316611230575b62ff00008316611148575b61ff008316611068575b60ff8316610f91575b02911c60bf031c60995490818102918183041490151715610c62570490565b60808316611056575b838316611044575b60208316611032575b60108316611020575b6008831661100e575b60048316610ffc575b60028316610fea575b6001831615610f72576801000000000000000102831c610f72565b6801000000000000000102831c610fcf565b6801000000000000000302831c610fc6565b6801000000000000000602831c610fbd565b6801000000000000000b02831c610fb4565b6801000000000000001602831c610fab565b6801000000000000002c02831c610fa2565b6801000000000000005902831c610f9a565b6180008316611136575b6140008316611124575b6120008316611112575b6110008316611100575b61080083166110ee575b61040083166110dc575b61020083166110ca575b610100831615610f6957680100000000000000b102831c610f69565b6801000000000000016302831c6110ae565b680100000000000002c602831c6110a4565b6801000000000000058c02831c61109a565b68010000000000000b1702831c611090565b6801000000000000162e02831c611086565b68010000000000002c5d02831c61107c565b680100000000000058b902831c611072565b62800000831661121e575b62400000831661120c575b6220000083166111fa575b6210000083166111e8575b6208000083166111d6575b6204000083166111c4575b6202000083166111b2575b62010000831615610f5f576801000000000000b17202831c610f5f565b680100000000000162e402831c611195565b6801000000000002c5c802831c61118a565b68010000000000058b9102831c61117f565b680100000000000b172102831c611174565b68010000000000162e4302831c611169565b680100000000002c5c8602831c61115e565b6801000000000058b90c02831c611153565b6380000000831661130e575b634000000083166112fc575b632000000083166112ea575b631000000083166112d8575b630800000083166112c6575b630400000083166112b4575b630200000083166112a2575b6301000000831615610f545768010000000000b1721802831c610f54565b6801000000000162e43002831c611284565b68010000000002c5c86002831c611278565b680100000000058b90c002831c61126c565b6801000000000b17217f02831c611260565b680100000000162e42ff02831c611254565b6801000000002c5c85fe02831c611248565b68010000000058b90bfc02831c61123c565b6480000000008316611406575b64400000000083166113f4575b64200000000083166113e2575b64100000000083166113d0575b64080000000083166113be575b64040000000083166113ac575b640200000000831661139a575b640100000000831615610f4857680100000000b17217f802831c610f48565b68010000000162e42ff102831c61137b565b680100000002c5c85fe302831c61136e565b6801000000058b90bfce02831c611361565b68010000000b17217fbb02831c611354565b6801000000162e42fff002831c611347565b68010000002c5c8601cc02831c61133a565b680100000058b90c0b4902831c61132d565b658000000000008316611506575b6540000000000083166114f4575b6520000000000083166114e2575b6510000000000083166114d0575b6508000000000083166114be575b6504000000000083166114ac575b65020000000000831661149a575b65010000000000831615610f3b576801000000b17218355102831c610f3b565b680100000162e430e5a202831c61147a565b6801000002c5c863b73f02831c61146c565b68010000058b90cf1e6e02831c61145e565b680100000b1721bcfc9a02831c611450565b68010000162e43f4f83102831c611442565b680100002c5c89d5ec6d02831c611434565b6801000058b91b5bc9ae02831c611426565b6680000000000000831661160e575b664000000000000083166115fc575b662000000000000083166115ea575b661000000000000083166115d8575b660800000000000083166115c6575b660400000000000083166115b4575b660200000000000083166115a2575b6601000000000000831615610f2d5768010000b17255775c0402831c610f2d565b6801000162e525ee054702831c611581565b68010002c5cc37da949202831c611572565b680100058ba01fb9f96d02831c611563565b6801000b175effdc76ba02831c611554565b680100162f3904051fa102831c611545565b6801002c605e2e8cec5002831c611536565b68010058c86da1c09ea202831c611527565b678000000000000000831661171e575b674000000000000000831661170c575b67200000000000000083166116fa575b67100000000000000083166116e8575b67080000000000000083166116d6575b67040000000000000083166116c4575b67020000000000000083166116b2575b670100000000000000831615610f1e57680100b1afa5abcbed6102831c610f1e565b68010163da9fb33356d802831c611690565b680102c9a3e778060ee702831c611680565b6801059b0d31585743ae02831c611670565b68010b5586cf9890f62a02831c611660565b6801172b83c7d517adce02831c611650565b6801306fe0a31b7152df02831c611640565b5068016a09e667f3bcc909607f1b61163056fea264697066735822122051de1fb3c32307cc00b0a21a4300e96267e072476c0382d060593a6bdc29770264736f6c634300081500330000000000000000000000003a3b750e7d4d389bc1d0be20e5d09530f82b99110000000000000000000000004ae8f648b1ec892b6cc68c89cc088583964d08be000000000000000000000000ee76becaf80ffe451c8b8afeec0c21518def02f9", - "nonce": "0x79", - "chainId": "0xaa36a7", - "accessList": null, - "type": null - }, - "additionalContracts": [], - "isFixedGasLimit": false - } - ], - "receipts": [ - { - "status": "0x1", - "cumulativeGasUsed": "0x573b14", - "logs": [ - { - "address": "0x8d4e896981de5e67a3e2a90a43a43be1fa34d0b8", - "topics": [ - "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" - ], - "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", - "blockHash": "0xdfc0a0ec5936bc64a06534dd434aaf3197fca030b6666a75a612f36c759987d5", - "blockNumber": "0x5d2894", - "transactionHash": "0xdfcc2ab74635be94ba8e308173a1cb5c8b4794942faddc9db440eb0b13364e4c", - "transactionIndex": "0x2d", - "logIndex": "0x63", - "removed": false - } - ], - "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000100000000000000008000000000000000000400000000000000000000000010000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "type": "0x0", - "transactionHash": "0xdfcc2ab74635be94ba8e308173a1cb5c8b4794942faddc9db440eb0b13364e4c", - "transactionIndex": "0x2d", - "blockHash": "0xdfc0a0ec5936bc64a06534dd434aaf3197fca030b6666a75a612f36c759987d5", - "blockNumber": "0x5d2894", - "gasUsed": "0x14efd7", - "effectiveGasPrice": "0x4d47b32af", - "from": "0x0724d72eb61e508d81ca701881f2248f092953bf", - "to": null, - "contractAddress": "0x8d4e896981de5e67a3e2a90a43a43be1fa34d0b8" - } - ], - "libraries": [], - "pending": [], - "returns": {}, - "timestamp": 1718356769, - "chain": 11155111, - "commit": "91d4f8f" -} \ No newline at end of file diff --git a/broadcast/UpgradeEmissionManager.s.sol/1/run-1719240627.json b/broadcast/UpgradeEmissionManager.s.sol/11155111/run-1719405184.json similarity index 88% rename from broadcast/UpgradeEmissionManager.s.sol/1/run-1719240627.json rename to broadcast/UpgradeEmissionManager.s.sol/11155111/run-1719405184.json index 6f13c5f..cbc4776 100644 --- a/broadcast/UpgradeEmissionManager.s.sol/1/run-1719240627.json +++ b/broadcast/UpgradeEmissionManager.s.sol/11155111/run-1719405184.json @@ -1,23 +1,23 @@ { "transactions": [ { - "hash": "0x76a975a5a21c6741521b3c98eeb9da65fe184d0245910055fc04a735e8f73634", + "hash": "0x0cdb95a3e04d89d600bc767bc26892106bc6d2c23a73f3d32e19434f1f7c6611", "transactionType": "CREATE", "contractName": "DefaultEmissionManager", - "contractAddress": "0x46ce937a70412dfdcf01f29d6d4fe15ada1faeb8", + "contractAddress": "0xbd5b3d1e179457435b368e3d1c019d487869b85e", "function": null, "arguments": [ - "0x29e7DF7b6A1B2b07b731457f499E1696c60E2C4e", - "0x5e3Ef299fDDf15eAa0432E6e66473ace8c13D908", - "0x86380e136A3AaD5677A210Ad02713694c4E6a5b9" + "0x3A3B750E7d4d389Bc1d0be20E5D09530F82B9911", + "0x4AE8f648B1Ec892B6cc68C89cc088583964d08bE", + "0xeE76bECaF80fFe451c8B8AFEec0c21518Def02f9" ], "transaction": { - "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", + "from": "0x0724d72eb61e508d81ca701881f2248f092953bf", "gas": "0x1a9134", "value": "0x0", - "input": "0x61010034620001bc57601f620018bd38819003918201601f191683019291906001600160401b03841183851017620001c1578160609284926040968752833981010312620001bc576200005281620001d7565b906200006e836200006660208401620001d7565b9201620001d7565b916001600160a01b03908116908115908115620001b0575b8115620001a4575b5062000193573360805260a05260c05260e05260005460ff8160081c166200013f5760ff8082160362000104575b50516116d09081620001ed823960805181610575015260a0518181816105fc0152610857015260c0518181816102fb0152610d71015260e0518181816104990152610d4a0152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001bc5756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610e46565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a46565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a14565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a68565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a46565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a46565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c64565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b6040810190811067ffffffffffffffff821117610a3057604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610a3057604052565b60018060a01b031690604051610a7d81610a14565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610ba2573d9167ffffffffffffffff8311610b8e5790610af893929160405192610aeb88601f19601f8401160185610a46565b83523d868885013e610bac565b805191821591848315610b6a575b505050905015610b135750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b06565b634e487b7160e01b85526041600452602485fd5b90610af892916060915b91929015610c0e5750815115610bc0575090565b3b15610bc95790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c215750805190602001fd5b60405162461bcd60e51b8152908190610c3d90600483016108ba565b0390fd5b91908203918211610c4e57565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526001600160a01b0390921691602081600481865afa8015610dfa57600090610dc7575b610cb69150610cb1610cac60985442610c41565b610e46565b610c41565b918215610dc2578260011b838104600203610c4e576005900492610cda8482610c41565b927fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc5818051848152336020820152a1823b156108b55780516340c10f1960e01b8152306004820152602481019290925260008260448183875af18015610db757610d98575b5050610d6f610d96937f000000000000000000000000000000000000000000000000000000000000000083610e05565b7f000000000000000000000000000000000000000000000000000000000000000090610e05565b565b909367ffffffffffffffff8511610a3057939052610d6f610d96610d3f565b50513d6000823e3d90fd5b505050565b6020823d8211610df2575b81610ddf60209383610a46565b810103126101a35750610cb69051610c98565b3d9150610dd2565b82513d6000823e3d90fd5b60405163a9059cbb60e01b60208201526001600160a01b03929092166024830152604480830193909352918152610d9691610e41606483610a46565b610a68565b667e8fc1d5029dc49080820291820403610c4e57670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611589575b66ff0000000000008316611481575b65ff00000000008316611381575b64ff000000008316611289575b63ff0000008316611199575b62ff000083166110b1575b61ff008316610fd1575b60ff8316610efa575b02911c60bf031c60995490818102918183041490151715610c4e570490565b60808316610fbf575b838316610fad575b60208316610f9b575b60108316610f89575b60088316610f77575b60048316610f65575b60028316610f53575b6001831615610edb576801000000000000000102831c610edb565b6801000000000000000102831c610f38565b6801000000000000000302831c610f2f565b6801000000000000000602831c610f26565b6801000000000000000b02831c610f1d565b6801000000000000001602831c610f14565b6801000000000000002c02831c610f0b565b6801000000000000005902831c610f03565b618000831661109f575b614000831661108d575b612000831661107b575b6110008316611069575b6108008316611057575b6104008316611045575b6102008316611033575b610100831615610ed257680100000000000000b102831c610ed2565b6801000000000000016302831c611017565b680100000000000002c602831c61100d565b6801000000000000058c02831c611003565b68010000000000000b1702831c610ff9565b6801000000000000162e02831c610fef565b68010000000000002c5d02831c610fe5565b680100000000000058b902831c610fdb565b628000008316611187575b624000008316611175575b622000008316611163575b621000008316611151575b62080000831661113f575b62040000831661112d575b62020000831661111b575b62010000831615610ec8576801000000000000b17202831c610ec8565b680100000000000162e402831c6110fe565b6801000000000002c5c802831c6110f3565b68010000000000058b9102831c6110e8565b680100000000000b172102831c6110dd565b68010000000000162e4302831c6110d2565b680100000000002c5c8602831c6110c7565b6801000000000058b90c02831c6110bc565b63800000008316611277575b63400000008316611265575b63200000008316611253575b63100000008316611241575b6308000000831661122f575b6304000000831661121d575b6302000000831661120b575b6301000000831615610ebd5768010000000000b1721802831c610ebd565b6801000000000162e43002831c6111ed565b68010000000002c5c86002831c6111e1565b680100000000058b90c002831c6111d5565b6801000000000b17217f02831c6111c9565b680100000000162e42ff02831c6111bd565b6801000000002c5c85fe02831c6111b1565b68010000000058b90bfc02831c6111a5565b648000000000831661136f575b644000000000831661135d575b642000000000831661134b575b6410000000008316611339575b6408000000008316611327575b6404000000008316611315575b6402000000008316611303575b640100000000831615610eb157680100000000b17217f802831c610eb1565b68010000000162e42ff102831c6112e4565b680100000002c5c85fe302831c6112d7565b6801000000058b90bfce02831c6112ca565b68010000000b17217fbb02831c6112bd565b6801000000162e42fff002831c6112b0565b68010000002c5c8601cc02831c6112a3565b680100000058b90c0b4902831c611296565b65800000000000831661146f575b65400000000000831661145d575b65200000000000831661144b575b651000000000008316611439575b650800000000008316611427575b650400000000008316611415575b650200000000008316611403575b65010000000000831615610ea4576801000000b17218355102831c610ea4565b680100000162e430e5a202831c6113e3565b6801000002c5c863b73f02831c6113d5565b68010000058b90cf1e6e02831c6113c7565b680100000b1721bcfc9a02831c6113b9565b68010000162e43f4f83102831c6113ab565b680100002c5c89d5ec6d02831c61139d565b6801000058b91b5bc9ae02831c61138f565b66800000000000008316611577575b66400000000000008316611565575b66200000000000008316611553575b66100000000000008316611541575b6608000000000000831661152f575b6604000000000000831661151d575b6602000000000000831661150b575b6601000000000000831615610e965768010000b17255775c0402831c610e96565b6801000162e525ee054702831c6114ea565b68010002c5cc37da949202831c6114db565b680100058ba01fb9f96d02831c6114cc565b6801000b175effdc76ba02831c6114bd565b680100162f3904051fa102831c6114ae565b6801002c605e2e8cec5002831c61149f565b68010058c86da1c09ea202831c611490565b6780000000000000008316611687575b6740000000000000008316611675575b6720000000000000008316611663575b6710000000000000008316611651575b670800000000000000831661163f575b670400000000000000831661162d575b670200000000000000831661161b575b670100000000000000831615610e8757680100b1afa5abcbed6102831c610e87565b68010163da9fb33356d802831c6115f9565b680102c9a3e778060ee702831c6115e9565b6801059b0d31585743ae02831c6115d9565b68010b5586cf9890f62a02831c6115c9565b6801172b83c7d517adce02831c6115b9565b6801306fe0a31b7152df02831c6115a9565b5068016a09e667f3bcc909607f1b61159956fea2646970667358221220e8157d604744373673fbd15be261b726af85b1f831e22a152c039d15ffc5322064736f6c6343000815003300000000000000000000000029e7df7b6a1b2b07b731457f499e1696c60e2c4e0000000000000000000000005e3ef299fddf15eaa0432e6e66473ace8c13d90800000000000000000000000086380e136a3aad5677a210ad02713694c4e6a5b9", - "nonce": "0x2", - "chainId": "0x1" + "input": "0x61010034620001bc57601f620018bd38819003918201601f191683019291906001600160401b03841183851017620001c1578160609284926040968752833981010312620001bc576200005281620001d7565b906200006e836200006660208401620001d7565b9201620001d7565b916001600160a01b03908116908115908115620001b0575b8115620001a4575b5062000193573360805260a05260c05260e05260005460ff8160081c166200013f5760ff8082160362000104575b50516116d09081620001ed823960805181610575015260a0518181816105fc0152610857015260c0518181816102fb0152610d71015260e0518181816104990152610d4a0152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001bc5756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610e46565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a46565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a14565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a68565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a46565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a46565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c64565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b6040810190811067ffffffffffffffff821117610a3057604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610a3057604052565b60018060a01b031690604051610a7d81610a14565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610ba2573d9167ffffffffffffffff8311610b8e5790610af893929160405192610aeb88601f19601f8401160185610a46565b83523d868885013e610bac565b805191821591848315610b6a575b505050905015610b135750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b06565b634e487b7160e01b85526041600452602485fd5b90610af892916060915b91929015610c0e5750815115610bc0575090565b3b15610bc95790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c215750805190602001fd5b60405162461bcd60e51b8152908190610c3d90600483016108ba565b0390fd5b91908203918211610c4e57565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526001600160a01b0390921691602081600481865afa8015610dfa57600090610dc7575b610cb69150610cb1610cac60985442610c41565b610e46565b610c41565b918215610dc2578260011b838104600203610c4e576005900492610cda8482610c41565b927fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc5818051848152336020820152a1823b156108b55780516340c10f1960e01b8152306004820152602481019290925260008260448183875af18015610db757610d98575b5050610d6f610d96937f000000000000000000000000000000000000000000000000000000000000000083610e05565b7f000000000000000000000000000000000000000000000000000000000000000090610e05565b565b909367ffffffffffffffff8511610a3057939052610d6f610d96610d3f565b50513d6000823e3d90fd5b505050565b6020823d8211610df2575b81610ddf60209383610a46565b810103126101a35750610cb69051610c98565b3d9150610dd2565b82513d6000823e3d90fd5b60405163a9059cbb60e01b60208201526001600160a01b03929092166024830152604480830193909352918152610d9691610e41606483610a46565b610a68565b667e8fc1d5029dc49080820291820403610c4e57670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611589575b66ff0000000000008316611481575b65ff00000000008316611381575b64ff000000008316611289575b63ff0000008316611199575b62ff000083166110b1575b61ff008316610fd1575b60ff8316610efa575b02911c60bf031c60995490818102918183041490151715610c4e570490565b60808316610fbf575b838316610fad575b60208316610f9b575b60108316610f89575b60088316610f77575b60048316610f65575b60028316610f53575b6001831615610edb576801000000000000000102831c610edb565b6801000000000000000102831c610f38565b6801000000000000000302831c610f2f565b6801000000000000000602831c610f26565b6801000000000000000b02831c610f1d565b6801000000000000001602831c610f14565b6801000000000000002c02831c610f0b565b6801000000000000005902831c610f03565b618000831661109f575b614000831661108d575b612000831661107b575b6110008316611069575b6108008316611057575b6104008316611045575b6102008316611033575b610100831615610ed257680100000000000000b102831c610ed2565b6801000000000000016302831c611017565b680100000000000002c602831c61100d565b6801000000000000058c02831c611003565b68010000000000000b1702831c610ff9565b6801000000000000162e02831c610fef565b68010000000000002c5d02831c610fe5565b680100000000000058b902831c610fdb565b628000008316611187575b624000008316611175575b622000008316611163575b621000008316611151575b62080000831661113f575b62040000831661112d575b62020000831661111b575b62010000831615610ec8576801000000000000b17202831c610ec8565b680100000000000162e402831c6110fe565b6801000000000002c5c802831c6110f3565b68010000000000058b9102831c6110e8565b680100000000000b172102831c6110dd565b68010000000000162e4302831c6110d2565b680100000000002c5c8602831c6110c7565b6801000000000058b90c02831c6110bc565b63800000008316611277575b63400000008316611265575b63200000008316611253575b63100000008316611241575b6308000000831661122f575b6304000000831661121d575b6302000000831661120b575b6301000000831615610ebd5768010000000000b1721802831c610ebd565b6801000000000162e43002831c6111ed565b68010000000002c5c86002831c6111e1565b680100000000058b90c002831c6111d5565b6801000000000b17217f02831c6111c9565b680100000000162e42ff02831c6111bd565b6801000000002c5c85fe02831c6111b1565b68010000000058b90bfc02831c6111a5565b648000000000831661136f575b644000000000831661135d575b642000000000831661134b575b6410000000008316611339575b6408000000008316611327575b6404000000008316611315575b6402000000008316611303575b640100000000831615610eb157680100000000b17217f802831c610eb1565b68010000000162e42ff102831c6112e4565b680100000002c5c85fe302831c6112d7565b6801000000058b90bfce02831c6112ca565b68010000000b17217fbb02831c6112bd565b6801000000162e42fff002831c6112b0565b68010000002c5c8601cc02831c6112a3565b680100000058b90c0b4902831c611296565b65800000000000831661146f575b65400000000000831661145d575b65200000000000831661144b575b651000000000008316611439575b650800000000008316611427575b650400000000008316611415575b650200000000008316611403575b65010000000000831615610ea4576801000000b17218355102831c610ea4565b680100000162e430e5a202831c6113e3565b6801000002c5c863b73f02831c6113d5565b68010000058b90cf1e6e02831c6113c7565b680100000b1721bcfc9a02831c6113b9565b68010000162e43f4f83102831c6113ab565b680100002c5c89d5ec6d02831c61139d565b6801000058b91b5bc9ae02831c61138f565b66800000000000008316611577575b66400000000000008316611565575b66200000000000008316611553575b66100000000000008316611541575b6608000000000000831661152f575b6604000000000000831661151d575b6602000000000000831661150b575b6601000000000000831615610e965768010000b17255775c0402831c610e96565b6801000162e525ee054702831c6114ea565b68010002c5cc37da949202831c6114db565b680100058ba01fb9f96d02831c6114cc565b6801000b175effdc76ba02831c6114bd565b680100162f3904051fa102831c6114ae565b6801002c605e2e8cec5002831c61149f565b68010058c86da1c09ea202831c611490565b6780000000000000008316611687575b6740000000000000008316611675575b6720000000000000008316611663575b6710000000000000008316611651575b670800000000000000831661163f575b670400000000000000831661162d575b670200000000000000831661161b575b670100000000000000831615610e8757680100b1afa5abcbed6102831c610e87565b68010163da9fb33356d802831c6115f9565b680102c9a3e778060ee702831c6115e9565b6801059b0d31585743ae02831c6115d9565b68010b5586cf9890f62a02831c6115c9565b6801172b83c7d517adce02831c6115b9565b6801306fe0a31b7152df02831c6115a9565b5068016a09e667f3bcc909607f1b61159956fea2646970667358221220e8157d604744373673fbd15be261b726af85b1f831e22a152c039d15ffc5322064736f6c634300081500330000000000000000000000003a3b750e7d4d389bc1d0be20e5d09530f82b99110000000000000000000000004ae8f648b1ec892b6cc68c89cc088583964d08be000000000000000000000000ee76becaf80ffe451c8b8afeec0c21518def02f9", + "nonce": "0x88", + "chainId": "0xaa36a7" }, "additionalContracts": [], "isFixedGasLimit": false @@ -26,39 +26,39 @@ "receipts": [ { "status": "0x1", - "cumulativeGasUsed": "0xbf57ed", + "cumulativeGasUsed": "0x6f6867", "logs": [ { - "address": "0x46ce937a70412dfdcf01f29d6d4fe15ada1faeb8", + "address": "0xbd5b3d1e179457435b368e3d1c019d487869b85e", "topics": [ "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" ], "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", - "blockHash": "0x70f463c8e672dd2d070e68e46b5c49e3dc8ace31be96ed717ff8fc55b4308225", - "blockNumber": "0x133a6c8", - "transactionHash": "0x76a975a5a21c6741521b3c98eeb9da65fe184d0245910055fc04a735e8f73634", - "transactionIndex": "0x6a", - "logIndex": "0x163", + "blockHash": "0xd79d3d1b0ecd5449f6d15a7c7f7e1610760af3b007419420904503d7e75d244d", + "blockNumber": "0x5e767b", + "transactionHash": "0x0cdb95a3e04d89d600bc767bc26892106bc6d2c23a73f3d32e19434f1f7c6611", + "transactionIndex": "0x3a", + "logIndex": "0x40", "removed": false } ], - "logsBloom": "0x00000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000100000000400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000", - "type": "0x0", - "transactionHash": "0x76a975a5a21c6741521b3c98eeb9da65fe184d0245910055fc04a735e8f73634", - "transactionIndex": "0x6a", - "blockHash": "0x70f463c8e672dd2d070e68e46b5c49e3dc8ace31be96ed717ff8fc55b4308225", - "blockNumber": "0x133a6c8", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000010000400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x0cdb95a3e04d89d600bc767bc26892106bc6d2c23a73f3d32e19434f1f7c6611", + "transactionIndex": "0x3a", + "blockHash": "0xd79d3d1b0ecd5449f6d15a7c7f7e1610760af3b007419420904503d7e75d244d", + "blockNumber": "0x5e767b", "gasUsed": "0x147144", - "effectiveGasPrice": "0x1bd261b06", - "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", + "effectiveGasPrice": "0x3ee0d9a2b", + "from": "0x0724d72eb61e508d81ca701881f2248f092953bf", "to": null, - "contractAddress": "0x46ce937a70412dfdcf01f29d6d4fe15ada1faeb8" + "contractAddress": "0xbd5b3d1e179457435b368e3d1c019d487869b85e" } ], "libraries": [], "pending": [], "returns": {}, - "timestamp": 1719240627, - "chain": 1, - "commit": "f555f12" + "timestamp": 1719405184, + "chain": 11155111, + "commit": "5cd82b5" } \ No newline at end of file diff --git a/broadcast/UpgradeEmissionManager.s.sol/11155111/run-latest.json b/broadcast/UpgradeEmissionManager.s.sol/11155111/run-latest.json index 01d6e4e..cbc4776 100644 --- a/broadcast/UpgradeEmissionManager.s.sol/11155111/run-latest.json +++ b/broadcast/UpgradeEmissionManager.s.sol/11155111/run-latest.json @@ -1,10 +1,10 @@ { "transactions": [ { - "hash": "0xdfcc2ab74635be94ba8e308173a1cb5c8b4794942faddc9db440eb0b13364e4c", + "hash": "0x0cdb95a3e04d89d600bc767bc26892106bc6d2c23a73f3d32e19434f1f7c6611", "transactionType": "CREATE", "contractName": "DefaultEmissionManager", - "contractAddress": "0x8d4e896981de5e67a3e2a90a43a43be1fa34d0b8", + "contractAddress": "0xbd5b3d1e179457435b368e3d1c019d487869b85e", "function": null, "arguments": [ "0x3A3B750E7d4d389Bc1d0be20E5D09530F82B9911", @@ -13,14 +13,11 @@ ], "transaction": { "from": "0x0724d72eb61e508d81ca701881f2248f092953bf", - "to": null, - "gas": "0x1b35b3", + "gas": "0x1a9134", "value": "0x0", - "input": "0x61010034620001c357601f6200195b38819003918201601f191683019291906001600160401b03841183851017620001c8578160609284926040968752833981010312620001c3576200005281620001de565b906200006e836200006660208401620001de565b9201620001de565b916001600160a01b03908116908115908115620001b7575b8115620001ab575b506200019a573360805260a05260c05260e05260005460ff8160081c16620001465760ff808216036200010b575b50516117679081620001f4823960805181610575015260a0518181816105fc015281816108570152610db9015260c0518181816102fb0152610def015260e0518181816104990152610d690152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001c35756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610edd565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a5a565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a3e565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a7c565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a5a565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a5a565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c78565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b67ffffffffffffffff8111610a2857604052565b634e487b7160e01b600052604160045260246000fd5b6040810190811067ffffffffffffffff821117610a2857604052565b90601f8019910116810190811067ffffffffffffffff821117610a2857604052565b60018060a01b031690604051610a9181610a3e565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610bb6573d9167ffffffffffffffff8311610ba25790610b0c93929160405192610aff88601f19601f8401160185610a5a565b83523d868885013e610bc0565b805191821591848315610b7e575b505050905015610b275750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b1a565b634e487b7160e01b85526041600452602485fd5b90610b0c92916060915b91929015610c225750815115610bd4575090565b3b15610bdd5790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c355750805190602001fd5b60405162461bcd60e51b8152908190610c5190600483016108ba565b0390fd5b91908203918211610c6257565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526000926001600160a01b03908116916020908181600481875afa8015610ed3578690610ea0575b610cce9150610cc9610cc460985442610c55565b610edd565b610c55565b928315610e98578360011b848104600203610e84576005900491610cf28386610c55565b947fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc58780518381523385820152a1823b156108175786516340c10f1960e01b81523060048201526024810191909152878160448183875af18015610e7a57610e5d575b50855163a9059cbb60e01b918101919091527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166024820152604480820193909352918252610db79190610db2606483610a5a565b610a7c565b7f00000000000000000000000000000000000000000000000000000000000000001690813b1561045e578251630899d25960e41b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031660048201526024810191909152919083908390604490829084905af1908115610e545750610e43575050565b610e4d8291610a14565b6101a35750565b513d84823e3d90fd5b610db793929197610e70610db292610a14565b9791929350610d55565b87513d8a823e3d90fd5b634e487b7160e01b87526011600452602487fd5b505050505050565b508181813d8311610ecc575b610eb68183610a5a565b81010312610ec857610cce9051610cb0565b8580fd5b503d610eac565b85513d88823e3d90fd5b667e8fc1d5029dc49080820291820403610c6257670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611620575b66ff0000000000008316611518575b65ff00000000008316611418575b64ff000000008316611320575b63ff0000008316611230575b62ff00008316611148575b61ff008316611068575b60ff8316610f91575b02911c60bf031c60995490818102918183041490151715610c62570490565b60808316611056575b838316611044575b60208316611032575b60108316611020575b6008831661100e575b60048316610ffc575b60028316610fea575b6001831615610f72576801000000000000000102831c610f72565b6801000000000000000102831c610fcf565b6801000000000000000302831c610fc6565b6801000000000000000602831c610fbd565b6801000000000000000b02831c610fb4565b6801000000000000001602831c610fab565b6801000000000000002c02831c610fa2565b6801000000000000005902831c610f9a565b6180008316611136575b6140008316611124575b6120008316611112575b6110008316611100575b61080083166110ee575b61040083166110dc575b61020083166110ca575b610100831615610f6957680100000000000000b102831c610f69565b6801000000000000016302831c6110ae565b680100000000000002c602831c6110a4565b6801000000000000058c02831c61109a565b68010000000000000b1702831c611090565b6801000000000000162e02831c611086565b68010000000000002c5d02831c61107c565b680100000000000058b902831c611072565b62800000831661121e575b62400000831661120c575b6220000083166111fa575b6210000083166111e8575b6208000083166111d6575b6204000083166111c4575b6202000083166111b2575b62010000831615610f5f576801000000000000b17202831c610f5f565b680100000000000162e402831c611195565b6801000000000002c5c802831c61118a565b68010000000000058b9102831c61117f565b680100000000000b172102831c611174565b68010000000000162e4302831c611169565b680100000000002c5c8602831c61115e565b6801000000000058b90c02831c611153565b6380000000831661130e575b634000000083166112fc575b632000000083166112ea575b631000000083166112d8575b630800000083166112c6575b630400000083166112b4575b630200000083166112a2575b6301000000831615610f545768010000000000b1721802831c610f54565b6801000000000162e43002831c611284565b68010000000002c5c86002831c611278565b680100000000058b90c002831c61126c565b6801000000000b17217f02831c611260565b680100000000162e42ff02831c611254565b6801000000002c5c85fe02831c611248565b68010000000058b90bfc02831c61123c565b6480000000008316611406575b64400000000083166113f4575b64200000000083166113e2575b64100000000083166113d0575b64080000000083166113be575b64040000000083166113ac575b640200000000831661139a575b640100000000831615610f4857680100000000b17217f802831c610f48565b68010000000162e42ff102831c61137b565b680100000002c5c85fe302831c61136e565b6801000000058b90bfce02831c611361565b68010000000b17217fbb02831c611354565b6801000000162e42fff002831c611347565b68010000002c5c8601cc02831c61133a565b680100000058b90c0b4902831c61132d565b658000000000008316611506575b6540000000000083166114f4575b6520000000000083166114e2575b6510000000000083166114d0575b6508000000000083166114be575b6504000000000083166114ac575b65020000000000831661149a575b65010000000000831615610f3b576801000000b17218355102831c610f3b565b680100000162e430e5a202831c61147a565b6801000002c5c863b73f02831c61146c565b68010000058b90cf1e6e02831c61145e565b680100000b1721bcfc9a02831c611450565b68010000162e43f4f83102831c611442565b680100002c5c89d5ec6d02831c611434565b6801000058b91b5bc9ae02831c611426565b6680000000000000831661160e575b664000000000000083166115fc575b662000000000000083166115ea575b661000000000000083166115d8575b660800000000000083166115c6575b660400000000000083166115b4575b660200000000000083166115a2575b6601000000000000831615610f2d5768010000b17255775c0402831c610f2d565b6801000162e525ee054702831c611581565b68010002c5cc37da949202831c611572565b680100058ba01fb9f96d02831c611563565b6801000b175effdc76ba02831c611554565b680100162f3904051fa102831c611545565b6801002c605e2e8cec5002831c611536565b68010058c86da1c09ea202831c611527565b678000000000000000831661171e575b674000000000000000831661170c575b67200000000000000083166116fa575b67100000000000000083166116e8575b67080000000000000083166116d6575b67040000000000000083166116c4575b67020000000000000083166116b2575b670100000000000000831615610f1e57680100b1afa5abcbed6102831c610f1e565b68010163da9fb33356d802831c611690565b680102c9a3e778060ee702831c611680565b6801059b0d31585743ae02831c611670565b68010b5586cf9890f62a02831c611660565b6801172b83c7d517adce02831c611650565b6801306fe0a31b7152df02831c611640565b5068016a09e667f3bcc909607f1b61163056fea264697066735822122051de1fb3c32307cc00b0a21a4300e96267e072476c0382d060593a6bdc29770264736f6c634300081500330000000000000000000000003a3b750e7d4d389bc1d0be20e5d09530f82b99110000000000000000000000004ae8f648b1ec892b6cc68c89cc088583964d08be000000000000000000000000ee76becaf80ffe451c8b8afeec0c21518def02f9", - "nonce": "0x79", - "chainId": "0xaa36a7", - "accessList": null, - "type": null + "input": "0x61010034620001bc57601f620018bd38819003918201601f191683019291906001600160401b03841183851017620001c1578160609284926040968752833981010312620001bc576200005281620001d7565b906200006e836200006660208401620001d7565b9201620001d7565b916001600160a01b03908116908115908115620001b0575b8115620001a4575b5062000193573360805260a05260c05260e05260005460ff8160081c166200013f5760ff8082160362000104575b50516116d09081620001ed823960805181610575015260a0518181816105fc0152610857015260c0518181816102fb0152610d71015260e0518181816104990152610d4a0152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001bc5756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610e46565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a46565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a14565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a68565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a46565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a46565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c64565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b6040810190811067ffffffffffffffff821117610a3057604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610a3057604052565b60018060a01b031690604051610a7d81610a14565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610ba2573d9167ffffffffffffffff8311610b8e5790610af893929160405192610aeb88601f19601f8401160185610a46565b83523d868885013e610bac565b805191821591848315610b6a575b505050905015610b135750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b06565b634e487b7160e01b85526041600452602485fd5b90610af892916060915b91929015610c0e5750815115610bc0575090565b3b15610bc95790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c215750805190602001fd5b60405162461bcd60e51b8152908190610c3d90600483016108ba565b0390fd5b91908203918211610c4e57565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526001600160a01b0390921691602081600481865afa8015610dfa57600090610dc7575b610cb69150610cb1610cac60985442610c41565b610e46565b610c41565b918215610dc2578260011b838104600203610c4e576005900492610cda8482610c41565b927fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc5818051848152336020820152a1823b156108b55780516340c10f1960e01b8152306004820152602481019290925260008260448183875af18015610db757610d98575b5050610d6f610d96937f000000000000000000000000000000000000000000000000000000000000000083610e05565b7f000000000000000000000000000000000000000000000000000000000000000090610e05565b565b909367ffffffffffffffff8511610a3057939052610d6f610d96610d3f565b50513d6000823e3d90fd5b505050565b6020823d8211610df2575b81610ddf60209383610a46565b810103126101a35750610cb69051610c98565b3d9150610dd2565b82513d6000823e3d90fd5b60405163a9059cbb60e01b60208201526001600160a01b03929092166024830152604480830193909352918152610d9691610e41606483610a46565b610a68565b667e8fc1d5029dc49080820291820403610c4e57670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611589575b66ff0000000000008316611481575b65ff00000000008316611381575b64ff000000008316611289575b63ff0000008316611199575b62ff000083166110b1575b61ff008316610fd1575b60ff8316610efa575b02911c60bf031c60995490818102918183041490151715610c4e570490565b60808316610fbf575b838316610fad575b60208316610f9b575b60108316610f89575b60088316610f77575b60048316610f65575b60028316610f53575b6001831615610edb576801000000000000000102831c610edb565b6801000000000000000102831c610f38565b6801000000000000000302831c610f2f565b6801000000000000000602831c610f26565b6801000000000000000b02831c610f1d565b6801000000000000001602831c610f14565b6801000000000000002c02831c610f0b565b6801000000000000005902831c610f03565b618000831661109f575b614000831661108d575b612000831661107b575b6110008316611069575b6108008316611057575b6104008316611045575b6102008316611033575b610100831615610ed257680100000000000000b102831c610ed2565b6801000000000000016302831c611017565b680100000000000002c602831c61100d565b6801000000000000058c02831c611003565b68010000000000000b1702831c610ff9565b6801000000000000162e02831c610fef565b68010000000000002c5d02831c610fe5565b680100000000000058b902831c610fdb565b628000008316611187575b624000008316611175575b622000008316611163575b621000008316611151575b62080000831661113f575b62040000831661112d575b62020000831661111b575b62010000831615610ec8576801000000000000b17202831c610ec8565b680100000000000162e402831c6110fe565b6801000000000002c5c802831c6110f3565b68010000000000058b9102831c6110e8565b680100000000000b172102831c6110dd565b68010000000000162e4302831c6110d2565b680100000000002c5c8602831c6110c7565b6801000000000058b90c02831c6110bc565b63800000008316611277575b63400000008316611265575b63200000008316611253575b63100000008316611241575b6308000000831661122f575b6304000000831661121d575b6302000000831661120b575b6301000000831615610ebd5768010000000000b1721802831c610ebd565b6801000000000162e43002831c6111ed565b68010000000002c5c86002831c6111e1565b680100000000058b90c002831c6111d5565b6801000000000b17217f02831c6111c9565b680100000000162e42ff02831c6111bd565b6801000000002c5c85fe02831c6111b1565b68010000000058b90bfc02831c6111a5565b648000000000831661136f575b644000000000831661135d575b642000000000831661134b575b6410000000008316611339575b6408000000008316611327575b6404000000008316611315575b6402000000008316611303575b640100000000831615610eb157680100000000b17217f802831c610eb1565b68010000000162e42ff102831c6112e4565b680100000002c5c85fe302831c6112d7565b6801000000058b90bfce02831c6112ca565b68010000000b17217fbb02831c6112bd565b6801000000162e42fff002831c6112b0565b68010000002c5c8601cc02831c6112a3565b680100000058b90c0b4902831c611296565b65800000000000831661146f575b65400000000000831661145d575b65200000000000831661144b575b651000000000008316611439575b650800000000008316611427575b650400000000008316611415575b650200000000008316611403575b65010000000000831615610ea4576801000000b17218355102831c610ea4565b680100000162e430e5a202831c6113e3565b6801000002c5c863b73f02831c6113d5565b68010000058b90cf1e6e02831c6113c7565b680100000b1721bcfc9a02831c6113b9565b68010000162e43f4f83102831c6113ab565b680100002c5c89d5ec6d02831c61139d565b6801000058b91b5bc9ae02831c61138f565b66800000000000008316611577575b66400000000000008316611565575b66200000000000008316611553575b66100000000000008316611541575b6608000000000000831661152f575b6604000000000000831661151d575b6602000000000000831661150b575b6601000000000000831615610e965768010000b17255775c0402831c610e96565b6801000162e525ee054702831c6114ea565b68010002c5cc37da949202831c6114db565b680100058ba01fb9f96d02831c6114cc565b6801000b175effdc76ba02831c6114bd565b680100162f3904051fa102831c6114ae565b6801002c605e2e8cec5002831c61149f565b68010058c86da1c09ea202831c611490565b6780000000000000008316611687575b6740000000000000008316611675575b6720000000000000008316611663575b6710000000000000008316611651575b670800000000000000831661163f575b670400000000000000831661162d575b670200000000000000831661161b575b670100000000000000831615610e8757680100b1afa5abcbed6102831c610e87565b68010163da9fb33356d802831c6115f9565b680102c9a3e778060ee702831c6115e9565b6801059b0d31585743ae02831c6115d9565b68010b5586cf9890f62a02831c6115c9565b6801172b83c7d517adce02831c6115b9565b6801306fe0a31b7152df02831c6115a9565b5068016a09e667f3bcc909607f1b61159956fea2646970667358221220e8157d604744373673fbd15be261b726af85b1f831e22a152c039d15ffc5322064736f6c634300081500330000000000000000000000003a3b750e7d4d389bc1d0be20e5d09530f82b99110000000000000000000000004ae8f648b1ec892b6cc68c89cc088583964d08be000000000000000000000000ee76becaf80ffe451c8b8afeec0c21518def02f9", + "nonce": "0x88", + "chainId": "0xaa36a7" }, "additionalContracts": [], "isFixedGasLimit": false @@ -29,39 +26,39 @@ "receipts": [ { "status": "0x1", - "cumulativeGasUsed": "0x573b14", + "cumulativeGasUsed": "0x6f6867", "logs": [ { - "address": "0x8d4e896981de5e67a3e2a90a43a43be1fa34d0b8", + "address": "0xbd5b3d1e179457435b368e3d1c019d487869b85e", "topics": [ "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" ], "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", - "blockHash": "0xdfc0a0ec5936bc64a06534dd434aaf3197fca030b6666a75a612f36c759987d5", - "blockNumber": "0x5d2894", - "transactionHash": "0xdfcc2ab74635be94ba8e308173a1cb5c8b4794942faddc9db440eb0b13364e4c", - "transactionIndex": "0x2d", - "logIndex": "0x63", + "blockHash": "0xd79d3d1b0ecd5449f6d15a7c7f7e1610760af3b007419420904503d7e75d244d", + "blockNumber": "0x5e767b", + "transactionHash": "0x0cdb95a3e04d89d600bc767bc26892106bc6d2c23a73f3d32e19434f1f7c6611", + "transactionIndex": "0x3a", + "logIndex": "0x40", "removed": false } ], - "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000100000000000000008000000000000000000400000000000000000000000010000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - "type": "0x0", - "transactionHash": "0xdfcc2ab74635be94ba8e308173a1cb5c8b4794942faddc9db440eb0b13364e4c", - "transactionIndex": "0x2d", - "blockHash": "0xdfc0a0ec5936bc64a06534dd434aaf3197fca030b6666a75a612f36c759987d5", - "blockNumber": "0x5d2894", - "gasUsed": "0x14efd7", - "effectiveGasPrice": "0x4d47b32af", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000010000400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0x0cdb95a3e04d89d600bc767bc26892106bc6d2c23a73f3d32e19434f1f7c6611", + "transactionIndex": "0x3a", + "blockHash": "0xd79d3d1b0ecd5449f6d15a7c7f7e1610760af3b007419420904503d7e75d244d", + "blockNumber": "0x5e767b", + "gasUsed": "0x147144", + "effectiveGasPrice": "0x3ee0d9a2b", "from": "0x0724d72eb61e508d81ca701881f2248f092953bf", "to": null, - "contractAddress": "0x8d4e896981de5e67a3e2a90a43a43be1fa34d0b8" + "contractAddress": "0xbd5b3d1e179457435b368e3d1c019d487869b85e" } ], "libraries": [], "pending": [], "returns": {}, - "timestamp": 1718356769, + "timestamp": 1719405184, "chain": 11155111, - "commit": "91d4f8f" + "commit": "5cd82b5" } \ No newline at end of file diff --git a/deployments/11155111.md b/deployments/11155111.md index 54a08c3..bccfe7d 100644 --- a/deployments/11155111.md +++ b/deployments/11155111.md @@ -9,6 +9,7 @@ - [Proxy Admin](#proxy-admin) - [Polygon Ecosystem Token](#polygon-ecosystem-token) - [Deployment History](#deployment-history) + - [1.2.0](#120) - [1.1.0](#110) ## Summary @@ -25,7 +26,7 @@ DefaultEmissionManager 0x20393fF3B3C38b72a16eB7d7A474cd38ABD8Ff27 - 1.1.0 + 1.2.0 ProxyAdmin @@ -94,11 +95,11 @@ Address: [0x20393fF3B3C38b72a16eB7d7A474cd38ABD8Ff27](https://sepolia.etherscan. Deployment Txn: [0x2f5ba33092820287a2f5f58fb34eeddf334785f2925215933b1dc9145d5bc280](https://sepolia.etherscan.io/tx/0x2f5ba33092820287a2f5f58fb34eeddf334785f2925215933b1dc9145d5bc280) -Version: [1.1.0](https://github.com/0xPolygon/pol-token/releases/tag/1.1.0) +Version: [1.2.0](https://github.com/0xPolygon/pol-token/releases/tag/1.2.0) -Commit Hash: [18b8ce1](https://github.com/0xPolygon/pol-token/commit/18b8ce1680539d71c2f244d8fdb2f7368c5a5f02) +Commit Hash: [5cd82b5](https://github.com/0xPolygon/pol-token/commit/5cd82b54935a53bd2aabd5d71805b289b5582afa) -Wed, 20 Mar 2024 13:39:43 UTC +Wed, 26 Jun 2024 12:33:04 UTC _Proxy Information_ @@ -109,7 +110,7 @@ Proxy Type: TransparentUpgradeableProxy -Implementation: [0x9B4D4Fc98C2Aa924a65AB827494159a76Fce6ceD](https://sepolia.etherscan.io/address/0x9B4D4Fc98C2Aa924a65AB827494159a76Fce6ceD) +Implementation: [0xBd5b3D1E179457435b368E3D1C019D487869b85E](https://sepolia.etherscan.io/address/0xBd5b3D1E179457435b368E3D1C019D487869b85E) @@ -125,6 +126,11 @@ Proxy Admin: [0x28cDCE6FfE44D03da1F7b15b474a0e72243873F2](https://sepolia.ethers Address Commit Hash + + 1.2.0 + 0xBd5b3D1E179457435b368E3D1C019D487869b85E + 5cd82b5 + 1.1.0 0x9B4D4Fc98C2Aa924a65AB827494159a76Fce6ceD @@ -170,6 +176,43 @@ Wed, 20 Mar 2024 13:39:43 UTC ### Deployment History +### [1.2.0](https://github.com/0xPolygon/pol-token/releases/tag/1.2.0) + +Wed, 26 Jun 2024 12:33:04 UTC + +Commit Hash: [5cd82b5](https://github.com/0xPolygon/pol-token/commit/5cd82b54935a53bd2aabd5d71805b289b5582afa) + +Deployed contracts: + +- [Default Emission Manager](https://sepolia.etherscan.io/address/0x20393fF3B3C38b72a16eB7d7A474cd38ABD8Ff27) ([Implementation](https://sepolia.etherscan.io/address/0xBd5b3D1E179457435b368E3D1C019D487869b85E)) + +
+Inputs + + + + + + + + + + + + + + + + + + + + +
ParameterValue
emissionManagerProxy0x20393fF3B3C38b72a16eB7d7A474cd38ABD8Ff27
emProxyAdmin0x28cDCE6FfE44D03da1F7b15b474a0e72243873F2
treasury0xeE76bECaF80fFe451c8B8AFEec0c21518Def02f9
+
+ + + ### [1.1.0](https://github.com/0xPolygon/pol-token/releases/tag/1.1.0) Wed, 20 Mar 2024 13:39:43 UTC diff --git a/deployments/json/11155111.json b/deployments/json/11155111.json index 1d38101..394ca16 100644 --- a/deployments/json/11155111.json +++ b/deployments/json/11155111.json @@ -13,15 +13,15 @@ "commitHash": "18b8ce1680539d71c2f244d8fdb2f7368c5a5f02" }, "DefaultEmissionManager": { - "implementation": "0x9B4D4Fc98C2Aa924a65AB827494159a76Fce6ceD", + "implementation": "0xBd5b3D1E179457435b368E3D1C019D487869b85E", "proxyAdmin": "0x28cDCE6FfE44D03da1F7b15b474a0e72243873F2", "address": "0x20393fF3B3C38b72a16eB7d7A474cd38ABD8Ff27", "proxy": true, - "version": "1.1.0", + "version": "1.2.0", "proxyType": "TransparentUpgradeableProxy", - "timestamp": 1710941983, + "timestamp": 1719405184, "deploymentTxn": "0x2f5ba33092820287a2f5f58fb34eeddf334785f2925215933b1dc9145d5bc280", - "commitHash": "18b8ce1680539d71c2f244d8fdb2f7368c5a5f02" + "commitHash": "5cd82b54935a53bd2aabd5d71805b289b5582afa" }, "ProxyAdmin": { "address": "0x28cDCE6FfE44D03da1F7b15b474a0e72243873F2", @@ -40,6 +40,26 @@ } }, "history": [ + { + "contracts": { + "DefaultEmissionManager": { + "implementation": "0xBd5b3D1E179457435b368E3D1C019D487869b85E", + "proxyAdmin": "0x28cDCE6FfE44D03da1F7b15b474a0e72243873F2", + "address": "0x20393fF3B3C38b72a16eB7d7A474cd38ABD8Ff27", + "proxy": true, + "version": "1.2.0", + "proxyType": "TransparentUpgradeableProxy", + "deploymentTxn": "0x2f5ba33092820287a2f5f58fb34eeddf334785f2925215933b1dc9145d5bc280" + } + }, + "input": { + "emissionManagerProxy": "0x20393fF3B3C38b72a16eB7d7A474cd38ABD8Ff27", + "emProxyAdmin": "0x28cDCE6FfE44D03da1F7b15b474a0e72243873F2", + "treasury": "0xeE76bECaF80fFe451c8B8AFEec0c21518Def02f9" + }, + "timestamp": 1719405184, + "commitHash": "5cd82b54935a53bd2aabd5d71805b289b5582afa" + }, { "contracts": { "PolygonMigration": { diff --git a/makefile b/makefile index 1c7a720..04bf4d2 100644 --- a/makefile +++ b/makefile @@ -4,7 +4,7 @@ # PRIVATE_KEY has to be set in .env # rpc-url synonyms are in foundry.toml, which points to .env as well upgrade-emission-manager-testnet: - forge script script/1.2.0/UpgradeEmissionManager.s.sol --legacy --verify --rpc-url testnet + forge script script/1.2.0/UpgradeEmissionManager.s.sol --verify --rpc-url testnet upgrade-emission-manager-MAINNET: - forge script script/1.2.0/UpgradeEmissionManager.s.sol --legacy --verify --rpc-url mainnet + forge script script/1.2.0/UpgradeEmissionManager.s.sol --verify --rpc-url mainnet diff --git a/script/utils/extract.js b/script/utils/extract.js index e129f16..3ff3012 100644 --- a/script/utils/extract.js +++ b/script/utils/extract.js @@ -95,11 +95,11 @@ async function main() { "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc", rpcUrl ); - if (currentImplementation === out.latest[contractName].implementation) + if (currentImplementation.toLowerCase() === out.latest[contractName].implementation.toLowerCase()) throw new Error( `Implementation for ${contractName}(${out.latest[contractName].address}) did not change - ${currentImplementation}, deployed - ${contractAddress}` ); - if (currentImplementation !== contractAddress) + if (currentImplementation.toLowerCase() !== contractAddress.toLowerCase()) throw new Error( `Implementation mismatch for ${contractName}(${out.latest[contractName].address}), onchain - ${currentImplementation}, deployed - ${contractAddress}` ); From 305a8189d16b59054ee909afed94db0ce108aaa8 Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Wed, 26 Jun 2024 17:19:11 +0200 Subject: [PATCH 10/16] mainnet deployment --- .../1/run-1719413975.json | 64 +++++++++++++++++++ .../1/run-latest.json | 46 ++++++------- 2 files changed, 87 insertions(+), 23 deletions(-) create mode 100644 broadcast/UpgradeEmissionManager.s.sol/1/run-1719413975.json diff --git a/broadcast/UpgradeEmissionManager.s.sol/1/run-1719413975.json b/broadcast/UpgradeEmissionManager.s.sol/1/run-1719413975.json new file mode 100644 index 0000000..983e3a4 --- /dev/null +++ b/broadcast/UpgradeEmissionManager.s.sol/1/run-1719413975.json @@ -0,0 +1,64 @@ +{ + "transactions": [ + { + "hash": "0xafd917c394d869e817cb1696aba9d9e4c571805ddd078efd52aeec1a9607a18e", + "transactionType": "CREATE", + "contractName": "DefaultEmissionManager", + "contractAddress": "0x5e875267f65537768435c3c6c81cd313a570b422", + "function": null, + "arguments": [ + "0x29e7DF7b6A1B2b07b731457f499E1696c60E2C4e", + "0x5e3Ef299fDDf15eAa0432E6e66473ace8c13D908", + "0x86380e136A3AaD5677A210Ad02713694c4E6a5b9" + ], + "transaction": { + "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", + "gas": "0x1b35b3", + "value": "0x0", + "input": "0x61010034620001c357601f6200195b38819003918201601f191683019291906001600160401b03841183851017620001c8578160609284926040968752833981010312620001c3576200005281620001de565b906200006e836200006660208401620001de565b9201620001de565b916001600160a01b03908116908115908115620001b7575b8115620001ab575b506200019a573360805260a05260c05260e05260005460ff8160081c16620001465760ff808216036200010b575b50516117679081620001f4823960805181610575015260a0518181816105fc015281816108570152610db9015260c0518181816102fb0152610def015260e0518181816104990152610d690152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001c35756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610edd565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a5a565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a3e565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a7c565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a5a565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a5a565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c78565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b67ffffffffffffffff8111610a2857604052565b634e487b7160e01b600052604160045260246000fd5b6040810190811067ffffffffffffffff821117610a2857604052565b90601f8019910116810190811067ffffffffffffffff821117610a2857604052565b60018060a01b031690604051610a9181610a3e565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610bb6573d9167ffffffffffffffff8311610ba25790610b0c93929160405192610aff88601f19601f8401160185610a5a565b83523d868885013e610bc0565b805191821591848315610b7e575b505050905015610b275750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b1a565b634e487b7160e01b85526041600452602485fd5b90610b0c92916060915b91929015610c225750815115610bd4575090565b3b15610bdd5790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c355750805190602001fd5b60405162461bcd60e51b8152908190610c5190600483016108ba565b0390fd5b91908203918211610c6257565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526000926001600160a01b03908116916020908181600481875afa8015610ed3578690610ea0575b610cce9150610cc9610cc460985442610c55565b610edd565b610c55565b928315610e98578360011b848104600203610e84576005900491610cf28386610c55565b947fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc58780518381523385820152a1823b156108175786516340c10f1960e01b81523060048201526024810191909152878160448183875af18015610e7a57610e5d575b50855163a9059cbb60e01b918101919091527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166024820152604480820193909352918252610db79190610db2606483610a5a565b610a7c565b7f00000000000000000000000000000000000000000000000000000000000000001690813b1561045e578251630899d25960e41b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031660048201526024810191909152919083908390604490829084905af1908115610e545750610e43575050565b610e4d8291610a14565b6101a35750565b513d84823e3d90fd5b610db793929197610e70610db292610a14565b9791929350610d55565b87513d8a823e3d90fd5b634e487b7160e01b87526011600452602487fd5b505050505050565b508181813d8311610ecc575b610eb68183610a5a565b81010312610ec857610cce9051610cb0565b8580fd5b503d610eac565b85513d88823e3d90fd5b667e8fc1d5029dc49080820291820403610c6257670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611620575b66ff0000000000008316611518575b65ff00000000008316611418575b64ff000000008316611320575b63ff0000008316611230575b62ff00008316611148575b61ff008316611068575b60ff8316610f91575b02911c60bf031c60995490818102918183041490151715610c62570490565b60808316611056575b838316611044575b60208316611032575b60108316611020575b6008831661100e575b60048316610ffc575b60028316610fea575b6001831615610f72576801000000000000000102831c610f72565b6801000000000000000102831c610fcf565b6801000000000000000302831c610fc6565b6801000000000000000602831c610fbd565b6801000000000000000b02831c610fb4565b6801000000000000001602831c610fab565b6801000000000000002c02831c610fa2565b6801000000000000005902831c610f9a565b6180008316611136575b6140008316611124575b6120008316611112575b6110008316611100575b61080083166110ee575b61040083166110dc575b61020083166110ca575b610100831615610f6957680100000000000000b102831c610f69565b6801000000000000016302831c6110ae565b680100000000000002c602831c6110a4565b6801000000000000058c02831c61109a565b68010000000000000b1702831c611090565b6801000000000000162e02831c611086565b68010000000000002c5d02831c61107c565b680100000000000058b902831c611072565b62800000831661121e575b62400000831661120c575b6220000083166111fa575b6210000083166111e8575b6208000083166111d6575b6204000083166111c4575b6202000083166111b2575b62010000831615610f5f576801000000000000b17202831c610f5f565b680100000000000162e402831c611195565b6801000000000002c5c802831c61118a565b68010000000000058b9102831c61117f565b680100000000000b172102831c611174565b68010000000000162e4302831c611169565b680100000000002c5c8602831c61115e565b6801000000000058b90c02831c611153565b6380000000831661130e575b634000000083166112fc575b632000000083166112ea575b631000000083166112d8575b630800000083166112c6575b630400000083166112b4575b630200000083166112a2575b6301000000831615610f545768010000000000b1721802831c610f54565b6801000000000162e43002831c611284565b68010000000002c5c86002831c611278565b680100000000058b90c002831c61126c565b6801000000000b17217f02831c611260565b680100000000162e42ff02831c611254565b6801000000002c5c85fe02831c611248565b68010000000058b90bfc02831c61123c565b6480000000008316611406575b64400000000083166113f4575b64200000000083166113e2575b64100000000083166113d0575b64080000000083166113be575b64040000000083166113ac575b640200000000831661139a575b640100000000831615610f4857680100000000b17217f802831c610f48565b68010000000162e42ff102831c61137b565b680100000002c5c85fe302831c61136e565b6801000000058b90bfce02831c611361565b68010000000b17217fbb02831c611354565b6801000000162e42fff002831c611347565b68010000002c5c8601cc02831c61133a565b680100000058b90c0b4902831c61132d565b658000000000008316611506575b6540000000000083166114f4575b6520000000000083166114e2575b6510000000000083166114d0575b6508000000000083166114be575b6504000000000083166114ac575b65020000000000831661149a575b65010000000000831615610f3b576801000000b17218355102831c610f3b565b680100000162e430e5a202831c61147a565b6801000002c5c863b73f02831c61146c565b68010000058b90cf1e6e02831c61145e565b680100000b1721bcfc9a02831c611450565b68010000162e43f4f83102831c611442565b680100002c5c89d5ec6d02831c611434565b6801000058b91b5bc9ae02831c611426565b6680000000000000831661160e575b664000000000000083166115fc575b662000000000000083166115ea575b661000000000000083166115d8575b660800000000000083166115c6575b660400000000000083166115b4575b660200000000000083166115a2575b6601000000000000831615610f2d5768010000b17255775c0402831c610f2d565b6801000162e525ee054702831c611581565b68010002c5cc37da949202831c611572565b680100058ba01fb9f96d02831c611563565b6801000b175effdc76ba02831c611554565b680100162f3904051fa102831c611545565b6801002c605e2e8cec5002831c611536565b68010058c86da1c09ea202831c611527565b678000000000000000831661171e575b674000000000000000831661170c575b67200000000000000083166116fa575b67100000000000000083166116e8575b67080000000000000083166116d6575b67040000000000000083166116c4575b67020000000000000083166116b2575b670100000000000000831615610f1e57680100b1afa5abcbed6102831c610f1e565b68010163da9fb33356d802831c611690565b680102c9a3e778060ee702831c611680565b6801059b0d31585743ae02831c611670565b68010b5586cf9890f62a02831c611660565b6801172b83c7d517adce02831c611650565b6801306fe0a31b7152df02831c611640565b5068016a09e667f3bcc909607f1b61163056fea264697066735822122051de1fb3c32307cc00b0a21a4300e96267e072476c0382d060593a6bdc29770264736f6c6343000815003300000000000000000000000029e7df7b6a1b2b07b731457f499e1696c60e2c4e0000000000000000000000005e3ef299fddf15eaa0432e6e66473ace8c13d90800000000000000000000000086380e136a3aad5677a210ad02713694c4e6a5b9", + "nonce": "0x3", + "chainId": "0x1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x9b9256", + "logs": [ + { + "address": "0x5e875267f65537768435c3c6c81cd313a570b422", + "topics": [ + "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" + ], + "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", + "blockHash": "0x855dcb4682138978bce4b977135f8638273a8599da08331532503b2e6e4ced8d", + "blockNumber": "0x133dee7", + "transactionHash": "0xafd917c394d869e817cb1696aba9d9e4c571805ddd078efd52aeec1a9607a18e", + "transactionIndex": "0x29", + "logIndex": "0xaf", + "removed": false + } + ], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000080000000000000000000000000000000000000000000000480000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0xafd917c394d869e817cb1696aba9d9e4c571805ddd078efd52aeec1a9607a18e", + "transactionIndex": "0x29", + "blockHash": "0x855dcb4682138978bce4b977135f8638273a8599da08331532503b2e6e4ced8d", + "blockNumber": "0x133dee7", + "gasUsed": "0x14efd7", + "effectiveGasPrice": "0x441f103ed", + "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", + "to": null, + "contractAddress": "0x5e875267f65537768435c3c6c81cd313a570b422" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1719413975, + "chain": 1, + "commit": "6849c18" +} \ No newline at end of file diff --git a/broadcast/UpgradeEmissionManager.s.sol/1/run-latest.json b/broadcast/UpgradeEmissionManager.s.sol/1/run-latest.json index 6f13c5f..983e3a4 100644 --- a/broadcast/UpgradeEmissionManager.s.sol/1/run-latest.json +++ b/broadcast/UpgradeEmissionManager.s.sol/1/run-latest.json @@ -1,10 +1,10 @@ { "transactions": [ { - "hash": "0x76a975a5a21c6741521b3c98eeb9da65fe184d0245910055fc04a735e8f73634", + "hash": "0xafd917c394d869e817cb1696aba9d9e4c571805ddd078efd52aeec1a9607a18e", "transactionType": "CREATE", "contractName": "DefaultEmissionManager", - "contractAddress": "0x46ce937a70412dfdcf01f29d6d4fe15ada1faeb8", + "contractAddress": "0x5e875267f65537768435c3c6c81cd313a570b422", "function": null, "arguments": [ "0x29e7DF7b6A1B2b07b731457f499E1696c60E2C4e", @@ -13,10 +13,10 @@ ], "transaction": { "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", - "gas": "0x1a9134", + "gas": "0x1b35b3", "value": "0x0", - "input": "0x61010034620001bc57601f620018bd38819003918201601f191683019291906001600160401b03841183851017620001c1578160609284926040968752833981010312620001bc576200005281620001d7565b906200006e836200006660208401620001d7565b9201620001d7565b916001600160a01b03908116908115908115620001b0575b8115620001a4575b5062000193573360805260a05260c05260e05260005460ff8160081c166200013f5760ff8082160362000104575b50516116d09081620001ed823960805181610575015260a0518181816105fc0152610857015260c0518181816102fb0152610d71015260e0518181816104990152610d4a0152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001bc5756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610e46565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a46565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a14565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a68565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a46565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a46565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c64565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b6040810190811067ffffffffffffffff821117610a3057604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610a3057604052565b60018060a01b031690604051610a7d81610a14565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610ba2573d9167ffffffffffffffff8311610b8e5790610af893929160405192610aeb88601f19601f8401160185610a46565b83523d868885013e610bac565b805191821591848315610b6a575b505050905015610b135750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b06565b634e487b7160e01b85526041600452602485fd5b90610af892916060915b91929015610c0e5750815115610bc0575090565b3b15610bc95790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c215750805190602001fd5b60405162461bcd60e51b8152908190610c3d90600483016108ba565b0390fd5b91908203918211610c4e57565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526001600160a01b0390921691602081600481865afa8015610dfa57600090610dc7575b610cb69150610cb1610cac60985442610c41565b610e46565b610c41565b918215610dc2578260011b838104600203610c4e576005900492610cda8482610c41565b927fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc5818051848152336020820152a1823b156108b55780516340c10f1960e01b8152306004820152602481019290925260008260448183875af18015610db757610d98575b5050610d6f610d96937f000000000000000000000000000000000000000000000000000000000000000083610e05565b7f000000000000000000000000000000000000000000000000000000000000000090610e05565b565b909367ffffffffffffffff8511610a3057939052610d6f610d96610d3f565b50513d6000823e3d90fd5b505050565b6020823d8211610df2575b81610ddf60209383610a46565b810103126101a35750610cb69051610c98565b3d9150610dd2565b82513d6000823e3d90fd5b60405163a9059cbb60e01b60208201526001600160a01b03929092166024830152604480830193909352918152610d9691610e41606483610a46565b610a68565b667e8fc1d5029dc49080820291820403610c4e57670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611589575b66ff0000000000008316611481575b65ff00000000008316611381575b64ff000000008316611289575b63ff0000008316611199575b62ff000083166110b1575b61ff008316610fd1575b60ff8316610efa575b02911c60bf031c60995490818102918183041490151715610c4e570490565b60808316610fbf575b838316610fad575b60208316610f9b575b60108316610f89575b60088316610f77575b60048316610f65575b60028316610f53575b6001831615610edb576801000000000000000102831c610edb565b6801000000000000000102831c610f38565b6801000000000000000302831c610f2f565b6801000000000000000602831c610f26565b6801000000000000000b02831c610f1d565b6801000000000000001602831c610f14565b6801000000000000002c02831c610f0b565b6801000000000000005902831c610f03565b618000831661109f575b614000831661108d575b612000831661107b575b6110008316611069575b6108008316611057575b6104008316611045575b6102008316611033575b610100831615610ed257680100000000000000b102831c610ed2565b6801000000000000016302831c611017565b680100000000000002c602831c61100d565b6801000000000000058c02831c611003565b68010000000000000b1702831c610ff9565b6801000000000000162e02831c610fef565b68010000000000002c5d02831c610fe5565b680100000000000058b902831c610fdb565b628000008316611187575b624000008316611175575b622000008316611163575b621000008316611151575b62080000831661113f575b62040000831661112d575b62020000831661111b575b62010000831615610ec8576801000000000000b17202831c610ec8565b680100000000000162e402831c6110fe565b6801000000000002c5c802831c6110f3565b68010000000000058b9102831c6110e8565b680100000000000b172102831c6110dd565b68010000000000162e4302831c6110d2565b680100000000002c5c8602831c6110c7565b6801000000000058b90c02831c6110bc565b63800000008316611277575b63400000008316611265575b63200000008316611253575b63100000008316611241575b6308000000831661122f575b6304000000831661121d575b6302000000831661120b575b6301000000831615610ebd5768010000000000b1721802831c610ebd565b6801000000000162e43002831c6111ed565b68010000000002c5c86002831c6111e1565b680100000000058b90c002831c6111d5565b6801000000000b17217f02831c6111c9565b680100000000162e42ff02831c6111bd565b6801000000002c5c85fe02831c6111b1565b68010000000058b90bfc02831c6111a5565b648000000000831661136f575b644000000000831661135d575b642000000000831661134b575b6410000000008316611339575b6408000000008316611327575b6404000000008316611315575b6402000000008316611303575b640100000000831615610eb157680100000000b17217f802831c610eb1565b68010000000162e42ff102831c6112e4565b680100000002c5c85fe302831c6112d7565b6801000000058b90bfce02831c6112ca565b68010000000b17217fbb02831c6112bd565b6801000000162e42fff002831c6112b0565b68010000002c5c8601cc02831c6112a3565b680100000058b90c0b4902831c611296565b65800000000000831661146f575b65400000000000831661145d575b65200000000000831661144b575b651000000000008316611439575b650800000000008316611427575b650400000000008316611415575b650200000000008316611403575b65010000000000831615610ea4576801000000b17218355102831c610ea4565b680100000162e430e5a202831c6113e3565b6801000002c5c863b73f02831c6113d5565b68010000058b90cf1e6e02831c6113c7565b680100000b1721bcfc9a02831c6113b9565b68010000162e43f4f83102831c6113ab565b680100002c5c89d5ec6d02831c61139d565b6801000058b91b5bc9ae02831c61138f565b66800000000000008316611577575b66400000000000008316611565575b66200000000000008316611553575b66100000000000008316611541575b6608000000000000831661152f575b6604000000000000831661151d575b6602000000000000831661150b575b6601000000000000831615610e965768010000b17255775c0402831c610e96565b6801000162e525ee054702831c6114ea565b68010002c5cc37da949202831c6114db565b680100058ba01fb9f96d02831c6114cc565b6801000b175effdc76ba02831c6114bd565b680100162f3904051fa102831c6114ae565b6801002c605e2e8cec5002831c61149f565b68010058c86da1c09ea202831c611490565b6780000000000000008316611687575b6740000000000000008316611675575b6720000000000000008316611663575b6710000000000000008316611651575b670800000000000000831661163f575b670400000000000000831661162d575b670200000000000000831661161b575b670100000000000000831615610e8757680100b1afa5abcbed6102831c610e87565b68010163da9fb33356d802831c6115f9565b680102c9a3e778060ee702831c6115e9565b6801059b0d31585743ae02831c6115d9565b68010b5586cf9890f62a02831c6115c9565b6801172b83c7d517adce02831c6115b9565b6801306fe0a31b7152df02831c6115a9565b5068016a09e667f3bcc909607f1b61159956fea2646970667358221220e8157d604744373673fbd15be261b726af85b1f831e22a152c039d15ffc5322064736f6c6343000815003300000000000000000000000029e7df7b6a1b2b07b731457f499e1696c60e2c4e0000000000000000000000005e3ef299fddf15eaa0432e6e66473ace8c13d90800000000000000000000000086380e136a3aad5677a210ad02713694c4e6a5b9", - "nonce": "0x2", + "input": "0x61010034620001c357601f6200195b38819003918201601f191683019291906001600160401b03841183851017620001c8578160609284926040968752833981010312620001c3576200005281620001de565b906200006e836200006660208401620001de565b9201620001de565b916001600160a01b03908116908115908115620001b7575b8115620001ab575b506200019a573360805260a05260c05260e05260005460ff8160081c16620001465760ff808216036200010b575b50516117679081620001f4823960805181610575015260a0518181816105fc015281816108570152610db9015260c0518181816102fb0152610def015260e0518181816104990152610d690152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001c35756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610edd565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a5a565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a3e565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a7c565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a5a565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a5a565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c78565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b67ffffffffffffffff8111610a2857604052565b634e487b7160e01b600052604160045260246000fd5b6040810190811067ffffffffffffffff821117610a2857604052565b90601f8019910116810190811067ffffffffffffffff821117610a2857604052565b60018060a01b031690604051610a9181610a3e565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610bb6573d9167ffffffffffffffff8311610ba25790610b0c93929160405192610aff88601f19601f8401160185610a5a565b83523d868885013e610bc0565b805191821591848315610b7e575b505050905015610b275750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b1a565b634e487b7160e01b85526041600452602485fd5b90610b0c92916060915b91929015610c225750815115610bd4575090565b3b15610bdd5790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c355750805190602001fd5b60405162461bcd60e51b8152908190610c5190600483016108ba565b0390fd5b91908203918211610c6257565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526000926001600160a01b03908116916020908181600481875afa8015610ed3578690610ea0575b610cce9150610cc9610cc460985442610c55565b610edd565b610c55565b928315610e98578360011b848104600203610e84576005900491610cf28386610c55565b947fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc58780518381523385820152a1823b156108175786516340c10f1960e01b81523060048201526024810191909152878160448183875af18015610e7a57610e5d575b50855163a9059cbb60e01b918101919091527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166024820152604480820193909352918252610db79190610db2606483610a5a565b610a7c565b7f00000000000000000000000000000000000000000000000000000000000000001690813b1561045e578251630899d25960e41b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031660048201526024810191909152919083908390604490829084905af1908115610e545750610e43575050565b610e4d8291610a14565b6101a35750565b513d84823e3d90fd5b610db793929197610e70610db292610a14565b9791929350610d55565b87513d8a823e3d90fd5b634e487b7160e01b87526011600452602487fd5b505050505050565b508181813d8311610ecc575b610eb68183610a5a565b81010312610ec857610cce9051610cb0565b8580fd5b503d610eac565b85513d88823e3d90fd5b667e8fc1d5029dc49080820291820403610c6257670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611620575b66ff0000000000008316611518575b65ff00000000008316611418575b64ff000000008316611320575b63ff0000008316611230575b62ff00008316611148575b61ff008316611068575b60ff8316610f91575b02911c60bf031c60995490818102918183041490151715610c62570490565b60808316611056575b838316611044575b60208316611032575b60108316611020575b6008831661100e575b60048316610ffc575b60028316610fea575b6001831615610f72576801000000000000000102831c610f72565b6801000000000000000102831c610fcf565b6801000000000000000302831c610fc6565b6801000000000000000602831c610fbd565b6801000000000000000b02831c610fb4565b6801000000000000001602831c610fab565b6801000000000000002c02831c610fa2565b6801000000000000005902831c610f9a565b6180008316611136575b6140008316611124575b6120008316611112575b6110008316611100575b61080083166110ee575b61040083166110dc575b61020083166110ca575b610100831615610f6957680100000000000000b102831c610f69565b6801000000000000016302831c6110ae565b680100000000000002c602831c6110a4565b6801000000000000058c02831c61109a565b68010000000000000b1702831c611090565b6801000000000000162e02831c611086565b68010000000000002c5d02831c61107c565b680100000000000058b902831c611072565b62800000831661121e575b62400000831661120c575b6220000083166111fa575b6210000083166111e8575b6208000083166111d6575b6204000083166111c4575b6202000083166111b2575b62010000831615610f5f576801000000000000b17202831c610f5f565b680100000000000162e402831c611195565b6801000000000002c5c802831c61118a565b68010000000000058b9102831c61117f565b680100000000000b172102831c611174565b68010000000000162e4302831c611169565b680100000000002c5c8602831c61115e565b6801000000000058b90c02831c611153565b6380000000831661130e575b634000000083166112fc575b632000000083166112ea575b631000000083166112d8575b630800000083166112c6575b630400000083166112b4575b630200000083166112a2575b6301000000831615610f545768010000000000b1721802831c610f54565b6801000000000162e43002831c611284565b68010000000002c5c86002831c611278565b680100000000058b90c002831c61126c565b6801000000000b17217f02831c611260565b680100000000162e42ff02831c611254565b6801000000002c5c85fe02831c611248565b68010000000058b90bfc02831c61123c565b6480000000008316611406575b64400000000083166113f4575b64200000000083166113e2575b64100000000083166113d0575b64080000000083166113be575b64040000000083166113ac575b640200000000831661139a575b640100000000831615610f4857680100000000b17217f802831c610f48565b68010000000162e42ff102831c61137b565b680100000002c5c85fe302831c61136e565b6801000000058b90bfce02831c611361565b68010000000b17217fbb02831c611354565b6801000000162e42fff002831c611347565b68010000002c5c8601cc02831c61133a565b680100000058b90c0b4902831c61132d565b658000000000008316611506575b6540000000000083166114f4575b6520000000000083166114e2575b6510000000000083166114d0575b6508000000000083166114be575b6504000000000083166114ac575b65020000000000831661149a575b65010000000000831615610f3b576801000000b17218355102831c610f3b565b680100000162e430e5a202831c61147a565b6801000002c5c863b73f02831c61146c565b68010000058b90cf1e6e02831c61145e565b680100000b1721bcfc9a02831c611450565b68010000162e43f4f83102831c611442565b680100002c5c89d5ec6d02831c611434565b6801000058b91b5bc9ae02831c611426565b6680000000000000831661160e575b664000000000000083166115fc575b662000000000000083166115ea575b661000000000000083166115d8575b660800000000000083166115c6575b660400000000000083166115b4575b660200000000000083166115a2575b6601000000000000831615610f2d5768010000b17255775c0402831c610f2d565b6801000162e525ee054702831c611581565b68010002c5cc37da949202831c611572565b680100058ba01fb9f96d02831c611563565b6801000b175effdc76ba02831c611554565b680100162f3904051fa102831c611545565b6801002c605e2e8cec5002831c611536565b68010058c86da1c09ea202831c611527565b678000000000000000831661171e575b674000000000000000831661170c575b67200000000000000083166116fa575b67100000000000000083166116e8575b67080000000000000083166116d6575b67040000000000000083166116c4575b67020000000000000083166116b2575b670100000000000000831615610f1e57680100b1afa5abcbed6102831c610f1e565b68010163da9fb33356d802831c611690565b680102c9a3e778060ee702831c611680565b6801059b0d31585743ae02831c611670565b68010b5586cf9890f62a02831c611660565b6801172b83c7d517adce02831c611650565b6801306fe0a31b7152df02831c611640565b5068016a09e667f3bcc909607f1b61163056fea264697066735822122051de1fb3c32307cc00b0a21a4300e96267e072476c0382d060593a6bdc29770264736f6c6343000815003300000000000000000000000029e7df7b6a1b2b07b731457f499e1696c60e2c4e0000000000000000000000005e3ef299fddf15eaa0432e6e66473ace8c13d90800000000000000000000000086380e136a3aad5677a210ad02713694c4e6a5b9", + "nonce": "0x3", "chainId": "0x1" }, "additionalContracts": [], @@ -26,39 +26,39 @@ "receipts": [ { "status": "0x1", - "cumulativeGasUsed": "0xbf57ed", + "cumulativeGasUsed": "0x9b9256", "logs": [ { - "address": "0x46ce937a70412dfdcf01f29d6d4fe15ada1faeb8", + "address": "0x5e875267f65537768435c3c6c81cd313a570b422", "topics": [ "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" ], "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", - "blockHash": "0x70f463c8e672dd2d070e68e46b5c49e3dc8ace31be96ed717ff8fc55b4308225", - "blockNumber": "0x133a6c8", - "transactionHash": "0x76a975a5a21c6741521b3c98eeb9da65fe184d0245910055fc04a735e8f73634", - "transactionIndex": "0x6a", - "logIndex": "0x163", + "blockHash": "0x855dcb4682138978bce4b977135f8638273a8599da08331532503b2e6e4ced8d", + "blockNumber": "0x133dee7", + "transactionHash": "0xafd917c394d869e817cb1696aba9d9e4c571805ddd078efd52aeec1a9607a18e", + "transactionIndex": "0x29", + "logIndex": "0xaf", "removed": false } ], - "logsBloom": "0x00000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000100000000400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000", - "type": "0x0", - "transactionHash": "0x76a975a5a21c6741521b3c98eeb9da65fe184d0245910055fc04a735e8f73634", - "transactionIndex": "0x6a", - "blockHash": "0x70f463c8e672dd2d070e68e46b5c49e3dc8ace31be96ed717ff8fc55b4308225", - "blockNumber": "0x133a6c8", - "gasUsed": "0x147144", - "effectiveGasPrice": "0x1bd261b06", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000080000000000000000000000000000000000000000000000480000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "type": "0x2", + "transactionHash": "0xafd917c394d869e817cb1696aba9d9e4c571805ddd078efd52aeec1a9607a18e", + "transactionIndex": "0x29", + "blockHash": "0x855dcb4682138978bce4b977135f8638273a8599da08331532503b2e6e4ced8d", + "blockNumber": "0x133dee7", + "gasUsed": "0x14efd7", + "effectiveGasPrice": "0x441f103ed", "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", "to": null, - "contractAddress": "0x46ce937a70412dfdcf01f29d6d4fe15ada1faeb8" + "contractAddress": "0x5e875267f65537768435c3c6c81cd313a570b422" } ], "libraries": [], "pending": [], "returns": {}, - "timestamp": 1719240627, + "timestamp": 1719413975, "chain": 1, - "commit": "f555f12" + "commit": "6849c18" } \ No newline at end of file From 4cb7792943133cefee34246241b21866cd5297e8 Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Wed, 26 Jun 2024 18:12:12 +0200 Subject: [PATCH 11/16] send pol directly to StakeManager, update script 1.3.0 --- src/DefaultEmissionManager.sol | 7 +- test/DefaultEmissionManager.t.sol | 14 ++-- ...DefaultEmissionManager.1.2.0.sepolia.t.sol | 79 ------------------- ...efaultEmissionManager.1.3.0.mainnet.t.sol} | 31 +------- 4 files changed, 15 insertions(+), 116 deletions(-) delete mode 100644 test/upgrade/DefaultEmissionManager.1.2.0.sepolia.t.sol rename test/upgrade/{DefaultEmissionManager.1.2.0.mainnet.t.sol => DefaultEmissionManager.1.3.0.mainnet.t.sol} (62%) diff --git a/src/DefaultEmissionManager.sol b/src/DefaultEmissionManager.sol index de18ff2..ab80113 100644 --- a/src/DefaultEmissionManager.sol +++ b/src/DefaultEmissionManager.sol @@ -78,9 +78,10 @@ contract DefaultEmissionManager is Ownable2StepUpgradeable, IDefaultEmissionMana IPolygonEcosystemToken _token = token; _token.mint(address(this), amountToMint); + _token.safeTransfer(treasury, treasuryAmt); - // backconvert POL to MATIC before sending to StakeManager - migration.unmigrateTo(stakeManager, stakeManagerAmt); + + _token.safeTransfer(stakeManager, stakeManagerAmt); } /// @inheritdoc IDefaultEmissionManager @@ -91,7 +92,7 @@ contract DefaultEmissionManager is Ownable2StepUpgradeable, IDefaultEmissionMana /// @inheritdoc IDefaultEmissionManager function version() external pure returns (string memory) { - return "1.2.0"; + return "1.3.0"; } uint256[47] private __gap; diff --git a/test/DefaultEmissionManager.t.sol b/test/DefaultEmissionManager.t.sol index 7a5fd59..2ec1d44 100644 --- a/test/DefaultEmissionManager.t.sol +++ b/test/DefaultEmissionManager.t.sol @@ -147,7 +147,7 @@ contract DefaultEmissionManagerTest is Test { assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); uint256 totalAmtMinted = polygon.totalSupply() - initialTotalSupply; uint256 totalAmtMintedTwoFifth = totalAmtMinted * 2 / 5; - assertEq(matic.balanceOf(stakeManager), totalAmtMinted - totalAmtMintedTwoFifth); + assertEq(polygon.balanceOf(stakeManager), totalAmtMinted - totalAmtMintedTwoFifth); assertEq(polygon.balanceOf(treasury), totalAmtMintedTwoFifth); } @@ -167,8 +167,8 @@ contract DefaultEmissionManagerTest is Test { assertApproxEqAbs(newSupply, polygon.totalSupply(), _MAX_PRECISION_DELTA); uint256 balance = (polygon.totalSupply() - initialTotalSupply) * 2 / 5; uint256 stakeManagerBalance = (polygon.totalSupply() - initialTotalSupply) - balance; - assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); - assertEq(polygon.balanceOf(stakeManager), 0); + assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance); + assertEq(matic.balanceOf(stakeManager), 0); assertEq(polygon.balanceOf(treasury), balance); skip(delay); @@ -185,8 +185,8 @@ contract DefaultEmissionManagerTest is Test { balance = totalAmtMintedTwoFifth; stakeManagerBalance = totalAmtMinted - totalAmtMintedTwoFifth; - assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); - assertEq(polygon.balanceOf(stakeManager), 0); + assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance); + assertEq(matic.balanceOf(stakeManager), 0); assertEq(polygon.balanceOf(treasury), balance); } @@ -213,8 +213,8 @@ contract DefaultEmissionManagerTest is Test { balance = totalAmtMintedTwoFifth; stakeManagerBalance = totalAmtMinted - totalAmtMintedTwoFifth; - assertEq(matic.balanceOf(stakeManager), stakeManagerBalance); - assertEq(polygon.balanceOf(stakeManager), 0); + assertEq(polygon.balanceOf(stakeManager), stakeManagerBalance); + assertEq(matic.balanceOf(stakeManager), 0); assertEq(polygon.balanceOf(treasury), balance); } } diff --git a/test/upgrade/DefaultEmissionManager.1.2.0.sepolia.t.sol b/test/upgrade/DefaultEmissionManager.1.2.0.sepolia.t.sol deleted file mode 100644 index dc4fbde..0000000 --- a/test/upgrade/DefaultEmissionManager.1.2.0.sepolia.t.sol +++ /dev/null @@ -1,79 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity 0.8.21; - -import {PolygonEcosystemToken} from "src/PolygonEcosystemToken.sol"; -import {DefaultEmissionManager} from "src/DefaultEmissionManager.sol"; -import {PolygonMigration} from "src/PolygonMigration.sol"; -import {ERC20PresetMinterPauser} from "openzeppelin-contracts/contracts/token/ERC20/presets/ERC20PresetMinterPauser.sol"; -import { - ProxyAdmin, - TransparentUpgradeableProxy, - ITransparentUpgradeableProxy -} from "openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol"; -import {Test} from "forge-std/Test.sol"; - -// this test forks mainnet and tests the upgradeability of DefaultEmissionManagerProxy - -contract DefaultEmissionManagerTestSepolia is Test { - uint256 fork; - - address POLYGON_PROTOCOL_COUNCIL = 0xeE76bECaF80fFe451c8B8AFEec0c21518Def02f9; - address EM_PROXY = 0x20393fF3B3C38b72a16eB7d7A474cd38ABD8Ff27; - address COMMUNITY_TREASURY = 0xeE76bECaF80fFe451c8B8AFEec0c21518Def02f9; - address EM_PROXY_ADMIN = 0x28cDCE6FfE44D03da1F7b15b474a0e72243873F2; - PolygonEcosystemToken pol = PolygonEcosystemToken(0x44499312f493F62f2DFd3C6435Ca3603EbFCeeBa); - - uint256 NEW_INTEREST_PER_YEAR_LOG2 = 0.03562390973072122e18; // log2(1.025) - - string[] internal inputs = new string[](5); - - function setUp() public { - fork = vm.createFork(vm.rpcUrl("testnet")); - } - - function testUpgrade() external { - vm.selectFork(fork); - - address newTreasury = makeAddr("newTreasury"); - - DefaultEmissionManager emProxy = DefaultEmissionManager(EM_PROXY); - - assertEq(emProxy.treasury(), COMMUNITY_TREASURY); - - address migration = address(emProxy.migration()); - address stakeManager = emProxy.stakeManager(); - - DefaultEmissionManager newEmImpl = new DefaultEmissionManager(migration, stakeManager, newTreasury); - - ProxyAdmin admin = ProxyAdmin(EM_PROXY_ADMIN); - - vm.prank(POLYGON_PROTOCOL_COUNCIL); - - admin.upgradeAndCall( - ITransparentUpgradeableProxy(address(emProxy)), - address(newEmImpl), - abi.encodeWithSelector(DefaultEmissionManager.reinitialize.selector) - ); - - // initialize can still not be called - vm.expectRevert("Initializable: contract is already initialized"); - emProxy.initialize(makeAddr("token"), msg.sender); - - assertEq(pol.totalSupply(), emProxy.START_SUPPLY_1_2_0()); - assertEq(block.timestamp, emProxy.startTimestamp()); - - // emission is now 2.5% - inputs[0] = "node"; - inputs[1] = "test/util/calc.js"; - inputs[2] = vm.toString(uint256(365 days)); - inputs[3] = vm.toString(pol.totalSupply()); - // vm.ffi executes the js script which contains the new emission rate - uint256 newSupply = abi.decode(vm.ffi(inputs), (uint256)); - assertApproxEqAbs(newSupply, emProxy.inflatedSupplyAfter(365 days), 1e20); - - // treasury has been updated - assertEq(emProxy.treasury(), newTreasury); - // emission has been updated - assertEq(emProxy.INTEREST_PER_YEAR_LOG2(), NEW_INTEREST_PER_YEAR_LOG2); - } -} diff --git a/test/upgrade/DefaultEmissionManager.1.2.0.mainnet.t.sol b/test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol similarity index 62% rename from test/upgrade/DefaultEmissionManager.1.2.0.mainnet.t.sol rename to test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol index 4ad5c51..f9c2fa3 100644 --- a/test/upgrade/DefaultEmissionManager.1.2.0.mainnet.t.sol +++ b/test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol @@ -34,46 +34,23 @@ contract DefaultEmissionManagerTestMainnet is Test { function testUpgrade() external { vm.selectFork(mainnetFork); - address newTreasury = makeAddr("newTreasury"); - DefaultEmissionManager emProxy = DefaultEmissionManager(EM_PROXY); assertEq(emProxy.treasury(), COMMUNITY_TREASURY); address migration = address(emProxy.migration()); address stakeManager = emProxy.stakeManager(); + address treasury = emProxy.treasury(); - DefaultEmissionManager newEmImpl = new DefaultEmissionManager(migration, stakeManager, newTreasury); + DefaultEmissionManager newEmImpl = new DefaultEmissionManager(migration, stakeManager, treasury); ProxyAdmin admin = ProxyAdmin(EM_PROXY_ADMIN); vm.prank(POLYGON_PROTOCOL_COUNCIL); - admin.upgradeAndCall( + admin.upgrade( ITransparentUpgradeableProxy(address(emProxy)), - address(newEmImpl), - abi.encodeWithSelector(DefaultEmissionManager.reinitialize.selector) + address(newEmImpl) ); - - // initialize can still not be called - vm.expectRevert("Initializable: contract is already initialized"); - emProxy.initialize(makeAddr("token"), msg.sender); - - assertEq(pol.totalSupply(), emProxy.START_SUPPLY_1_2_0()); - assertEq(block.timestamp, emProxy.startTimestamp()); - - // emission is now 2.5% - inputs[0] = "node"; - inputs[1] = "test/util/calc.js"; - inputs[2] = vm.toString(uint256(365 days)); - inputs[3] = vm.toString(pol.totalSupply()); - // vm.ffi executes the js script which contains the new emission rate - uint256 newSupply = abi.decode(vm.ffi(inputs), (uint256)); - assertApproxEqAbs(newSupply, emProxy.inflatedSupplyAfter(365 days), 1e20); - - // treasury has been updated - assertEq(emProxy.treasury(), newTreasury); - // emission has been updated - assertEq(emProxy.INTEREST_PER_YEAR_LOG2(), NEW_INTEREST_PER_YEAR_LOG2); } } From 1fd7286650d5c495c9b503690007edad859ec7b6 Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Mon, 15 Jul 2024 11:06:25 +0200 Subject: [PATCH 12/16] add 1.3.0 deployment script --- script/1.3.0/UpgradeEmissionManager.s.sol | 45 +++++++++++++++++++++++ script/1.3.0/input.json | 10 +++++ 2 files changed, 55 insertions(+) create mode 100644 script/1.3.0/UpgradeEmissionManager.s.sol create mode 100644 script/1.3.0/input.json diff --git a/script/1.3.0/UpgradeEmissionManager.s.sol b/script/1.3.0/UpgradeEmissionManager.s.sol new file mode 100644 index 0000000..34846d4 --- /dev/null +++ b/script/1.3.0/UpgradeEmissionManager.s.sol @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.21; + +import {Script, stdJson, console2 as console} from "forge-std/Script.sol"; + +import { + ProxyAdmin, + TransparentUpgradeableProxy, + ITransparentUpgradeableProxy +} from "openzeppelin-contracts/contracts/proxy/transparent/ProxyAdmin.sol"; +import {DefaultEmissionManager} from "../../src/DefaultEmissionManager.sol"; + +contract UpgradeEmissionManager is Script { + using stdJson for string; + + function run() public { + uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY"); + + string memory input = vm.readFile("script/1.2.0/input.json"); + string memory chainIdSlug = string(abi.encodePacked('["', vm.toString(block.chainid), '"]')); + address emProxyAddress = input.readAddress(string.concat(chainIdSlug, ".emissionManagerProxy")); + address emProxyAdmin = input.readAddress(string.concat(chainIdSlug, ".emProxyAdmin")); + + vm.startBroadcast(deployerPrivateKey); + + DefaultEmissionManager emProxy = DefaultEmissionManager(emProxyAddress); + + address migration = address(emProxy.migration()); + address stakeManager = emProxy.stakeManager(); + address treasury = emProxy.treasury(); + + DefaultEmissionManager newEmImpl = new DefaultEmissionManager(migration, stakeManager, treasury); + + vm.stopBroadcast(); + + bytes memory payload = abi.encodeWithSelector( + ProxyAdmin.upgrade.selector, + ITransparentUpgradeableProxy(address(emProxy)), + address(newEmImpl) + ); + + console.log("Send this payload to: ", emProxyAdmin); + console.logBytes(payload); + } +} diff --git a/script/1.3.0/input.json b/script/1.3.0/input.json new file mode 100644 index 0000000..06cd42f --- /dev/null +++ b/script/1.3.0/input.json @@ -0,0 +1,10 @@ +{ + "1": { + "emissionManagerProxy": "0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53", + "emProxyAdmin": "0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3" + }, + "11155111": { + "emissionManagerProxy": "0x20393fF3B3C38b72a16eB7d7A474cd38ABD8Ff27", + "emProxyAdmin": "0x28cDCE6FfE44D03da1F7b15b474a0e72243873F2" + } +} From eb2353ceb55f823d104e27c0a7f2d136840f4910 Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Tue, 23 Jul 2024 12:07:42 +0200 Subject: [PATCH 13/16] fix: update treasury address --- test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol b/test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol index f9c2fa3..ae4c156 100644 --- a/test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol +++ b/test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol @@ -19,7 +19,7 @@ contract DefaultEmissionManagerTestMainnet is Test { address POLYGON_PROTOCOL_COUNCIL = 0x37D085ca4a24f6b29214204E8A8666f12cf19516; address EM_PROXY = 0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53; - address COMMUNITY_TREASURY = 0x2ff25495d77f380d5F65B95F103181aE8b1cf898; + address COMMUNITY_TREASURY = 0x86380e136A3AaD5677A210Ad02713694c4E6a5b9; address EM_PROXY_ADMIN = 0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3; PolygonEcosystemToken pol = PolygonEcosystemToken(0x455e53CBB86018Ac2B8092FdCd39d8444aFFC3F6); From 3deabccf103c6be738d18e3aef9f2f8faf612f06 Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Thu, 22 Aug 2024 12:05:39 +0200 Subject: [PATCH 14/16] test upgrade --- makefile | 2 +- test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/makefile b/makefile index 04bf4d2..8eb8951 100644 --- a/makefile +++ b/makefile @@ -7,4 +7,4 @@ upgrade-emission-manager-testnet: forge script script/1.2.0/UpgradeEmissionManager.s.sol --verify --rpc-url testnet upgrade-emission-manager-MAINNET: - forge script script/1.2.0/UpgradeEmissionManager.s.sol --verify --rpc-url mainnet + forge script script/1.3.0/UpgradeEmissionManager.s.sol --verify --rpc-url mainnet diff --git a/test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol b/test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol index ae4c156..9cf25c2 100644 --- a/test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol +++ b/test/upgrade/DefaultEmissionManager.1.3.0.mainnet.t.sol @@ -52,5 +52,13 @@ contract DefaultEmissionManagerTestMainnet is Test { ITransparentUpgradeableProxy(address(emProxy)), address(newEmImpl) ); + + // minting in POL from now on + uint256 currentPolBalance = pol.balanceOf(address(stakeManager)); + + emProxy.mint(); + uint256 newPolBalance = pol.balanceOf(address(stakeManager)); + + assert(newPolBalance > currentPolBalance); } } From 518d8be72671315e99f10cd858bece5dbbb15ab4 Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Thu, 22 Aug 2024 12:11:48 +0200 Subject: [PATCH 15/16] deploy v1.3.0 mainnet --- .../1/run-1724276577.json | 64 +++++++++++++++++++ .../1/run-latest.json | 44 ++++++------- 2 files changed, 86 insertions(+), 22 deletions(-) create mode 100644 broadcast/UpgradeEmissionManager.s.sol/1/run-1724276577.json diff --git a/broadcast/UpgradeEmissionManager.s.sol/1/run-1724276577.json b/broadcast/UpgradeEmissionManager.s.sol/1/run-1724276577.json new file mode 100644 index 0000000..6cc971c --- /dev/null +++ b/broadcast/UpgradeEmissionManager.s.sol/1/run-1724276577.json @@ -0,0 +1,64 @@ +{ + "transactions": [ + { + "hash": "0xdbd5e6cd554c2f36c5912e262098941a171016f83bea8a699bfdb712ef6f9bb3", + "transactionType": "CREATE", + "contractName": "DefaultEmissionManager", + "contractAddress": "0x152442d77e9fb9c210953d583cbb2da88027fcb9", + "function": null, + "arguments": [ + "0x29e7DF7b6A1B2b07b731457f499E1696c60E2C4e", + "0x5e3Ef299fDDf15eAa0432E6e66473ace8c13D908", + "0x86380e136A3AaD5677A210Ad02713694c4E6a5b9" + ], + "transaction": { + "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", + "gas": "0x1a9134", + "value": "0x0", + "input": "0x61010034620001bc57601f620018bd38819003918201601f191683019291906001600160401b03841183851017620001c1578160609284926040968752833981010312620001bc576200005281620001d7565b906200006e836200006660208401620001d7565b9201620001d7565b916001600160a01b03908116908115908115620001b0575b8115620001a4575b5062000193573360805260a05260c05260e05260005460ff8160081c166200013f5760ff8082160362000104575b50516116d09081620001ed823960805181610575015260a0518181816105fc0152610857015260c0518181816102fb0152610d71015260e0518181816104990152610d4a0152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001bc5756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610e46565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a46565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a14565b60058252640312e332e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a68565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a46565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a46565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c64565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b6040810190811067ffffffffffffffff821117610a3057604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610a3057604052565b60018060a01b031690604051610a7d81610a14565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610ba2573d9167ffffffffffffffff8311610b8e5790610af893929160405192610aeb88601f19601f8401160185610a46565b83523d868885013e610bac565b805191821591848315610b6a575b505050905015610b135750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b06565b634e487b7160e01b85526041600452602485fd5b90610af892916060915b91929015610c0e5750815115610bc0575090565b3b15610bc95790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c215750805190602001fd5b60405162461bcd60e51b8152908190610c3d90600483016108ba565b0390fd5b91908203918211610c4e57565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526001600160a01b0390921691602081600481865afa8015610dfa57600090610dc7575b610cb69150610cb1610cac60985442610c41565b610e46565b610c41565b918215610dc2578260011b838104600203610c4e576005900492610cda8482610c41565b927fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc5818051848152336020820152a1823b156108b55780516340c10f1960e01b8152306004820152602481019290925260008260448183875af18015610db757610d98575b5050610d6f610d96937f000000000000000000000000000000000000000000000000000000000000000083610e05565b7f000000000000000000000000000000000000000000000000000000000000000090610e05565b565b909367ffffffffffffffff8511610a3057939052610d6f610d96610d3f565b50513d6000823e3d90fd5b505050565b6020823d8211610df2575b81610ddf60209383610a46565b810103126101a35750610cb69051610c98565b3d9150610dd2565b82513d6000823e3d90fd5b60405163a9059cbb60e01b60208201526001600160a01b03929092166024830152604480830193909352918152610d9691610e41606483610a46565b610a68565b667e8fc1d5029dc49080820291820403610c4e57670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611589575b66ff0000000000008316611481575b65ff00000000008316611381575b64ff000000008316611289575b63ff0000008316611199575b62ff000083166110b1575b61ff008316610fd1575b60ff8316610efa575b02911c60bf031c60995490818102918183041490151715610c4e570490565b60808316610fbf575b838316610fad575b60208316610f9b575b60108316610f89575b60088316610f77575b60048316610f65575b60028316610f53575b6001831615610edb576801000000000000000102831c610edb565b6801000000000000000102831c610f38565b6801000000000000000302831c610f2f565b6801000000000000000602831c610f26565b6801000000000000000b02831c610f1d565b6801000000000000001602831c610f14565b6801000000000000002c02831c610f0b565b6801000000000000005902831c610f03565b618000831661109f575b614000831661108d575b612000831661107b575b6110008316611069575b6108008316611057575b6104008316611045575b6102008316611033575b610100831615610ed257680100000000000000b102831c610ed2565b6801000000000000016302831c611017565b680100000000000002c602831c61100d565b6801000000000000058c02831c611003565b68010000000000000b1702831c610ff9565b6801000000000000162e02831c610fef565b68010000000000002c5d02831c610fe5565b680100000000000058b902831c610fdb565b628000008316611187575b624000008316611175575b622000008316611163575b621000008316611151575b62080000831661113f575b62040000831661112d575b62020000831661111b575b62010000831615610ec8576801000000000000b17202831c610ec8565b680100000000000162e402831c6110fe565b6801000000000002c5c802831c6110f3565b68010000000000058b9102831c6110e8565b680100000000000b172102831c6110dd565b68010000000000162e4302831c6110d2565b680100000000002c5c8602831c6110c7565b6801000000000058b90c02831c6110bc565b63800000008316611277575b63400000008316611265575b63200000008316611253575b63100000008316611241575b6308000000831661122f575b6304000000831661121d575b6302000000831661120b575b6301000000831615610ebd5768010000000000b1721802831c610ebd565b6801000000000162e43002831c6111ed565b68010000000002c5c86002831c6111e1565b680100000000058b90c002831c6111d5565b6801000000000b17217f02831c6111c9565b680100000000162e42ff02831c6111bd565b6801000000002c5c85fe02831c6111b1565b68010000000058b90bfc02831c6111a5565b648000000000831661136f575b644000000000831661135d575b642000000000831661134b575b6410000000008316611339575b6408000000008316611327575b6404000000008316611315575b6402000000008316611303575b640100000000831615610eb157680100000000b17217f802831c610eb1565b68010000000162e42ff102831c6112e4565b680100000002c5c85fe302831c6112d7565b6801000000058b90bfce02831c6112ca565b68010000000b17217fbb02831c6112bd565b6801000000162e42fff002831c6112b0565b68010000002c5c8601cc02831c6112a3565b680100000058b90c0b4902831c611296565b65800000000000831661146f575b65400000000000831661145d575b65200000000000831661144b575b651000000000008316611439575b650800000000008316611427575b650400000000008316611415575b650200000000008316611403575b65010000000000831615610ea4576801000000b17218355102831c610ea4565b680100000162e430e5a202831c6113e3565b6801000002c5c863b73f02831c6113d5565b68010000058b90cf1e6e02831c6113c7565b680100000b1721bcfc9a02831c6113b9565b68010000162e43f4f83102831c6113ab565b680100002c5c89d5ec6d02831c61139d565b6801000058b91b5bc9ae02831c61138f565b66800000000000008316611577575b66400000000000008316611565575b66200000000000008316611553575b66100000000000008316611541575b6608000000000000831661152f575b6604000000000000831661151d575b6602000000000000831661150b575b6601000000000000831615610e965768010000b17255775c0402831c610e96565b6801000162e525ee054702831c6114ea565b68010002c5cc37da949202831c6114db565b680100058ba01fb9f96d02831c6114cc565b6801000b175effdc76ba02831c6114bd565b680100162f3904051fa102831c6114ae565b6801002c605e2e8cec5002831c61149f565b68010058c86da1c09ea202831c611490565b6780000000000000008316611687575b6740000000000000008316611675575b6720000000000000008316611663575b6710000000000000008316611651575b670800000000000000831661163f575b670400000000000000831661162d575b670200000000000000831661161b575b670100000000000000831615610e8757680100b1afa5abcbed6102831c610e87565b68010163da9fb33356d802831c6115f9565b680102c9a3e778060ee702831c6115e9565b6801059b0d31585743ae02831c6115d9565b68010b5586cf9890f62a02831c6115c9565b6801172b83c7d517adce02831c6115b9565b6801306fe0a31b7152df02831c6115a9565b5068016a09e667f3bcc909607f1b61159956fea2646970667358221220e4cf06e58d18f8f30eea170949dec98536662854621cd6f35b2acc15699d4c1664736f6c6343000815003300000000000000000000000029e7df7b6a1b2b07b731457f499e1696c60e2c4e0000000000000000000000005e3ef299fddf15eaa0432e6e66473ace8c13d90800000000000000000000000086380e136a3aad5677a210ad02713694c4e6a5b9", + "nonce": "0x4", + "chainId": "0x1" + }, + "additionalContracts": [], + "isFixedGasLimit": false + } + ], + "receipts": [ + { + "status": "0x1", + "cumulativeGasUsed": "0x602119", + "logs": [ + { + "address": "0x152442d77e9fb9c210953d583cbb2da88027fcb9", + "topics": [ + "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" + ], + "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", + "blockHash": "0xdd9346e88982782bfe9fb9231fec984d73334f22302f127463d0ab975fb1965e", + "blockNumber": "0x13a05a4", + "transactionHash": "0xdbd5e6cd554c2f36c5912e262098941a171016f83bea8a699bfdb712ef6f9bb3", + "transactionIndex": "0x23", + "logIndex": "0x8c", + "removed": false + } + ], + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000020000000000000000000000000008000000000000000000000000", + "type": "0x2", + "transactionHash": "0xdbd5e6cd554c2f36c5912e262098941a171016f83bea8a699bfdb712ef6f9bb3", + "transactionIndex": "0x23", + "blockHash": "0xdd9346e88982782bfe9fb9231fec984d73334f22302f127463d0ab975fb1965e", + "blockNumber": "0x13a05a4", + "gasUsed": "0x147144", + "effectiveGasPrice": "0x93b973c7", + "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", + "to": null, + "contractAddress": "0x152442d77e9fb9c210953d583cbb2da88027fcb9" + } + ], + "libraries": [], + "pending": [], + "returns": {}, + "timestamp": 1724276577, + "chain": 1, + "commit": "b3d6f4f" +} \ No newline at end of file diff --git a/broadcast/UpgradeEmissionManager.s.sol/1/run-latest.json b/broadcast/UpgradeEmissionManager.s.sol/1/run-latest.json index 983e3a4..6cc971c 100644 --- a/broadcast/UpgradeEmissionManager.s.sol/1/run-latest.json +++ b/broadcast/UpgradeEmissionManager.s.sol/1/run-latest.json @@ -1,10 +1,10 @@ { "transactions": [ { - "hash": "0xafd917c394d869e817cb1696aba9d9e4c571805ddd078efd52aeec1a9607a18e", + "hash": "0xdbd5e6cd554c2f36c5912e262098941a171016f83bea8a699bfdb712ef6f9bb3", "transactionType": "CREATE", "contractName": "DefaultEmissionManager", - "contractAddress": "0x5e875267f65537768435c3c6c81cd313a570b422", + "contractAddress": "0x152442d77e9fb9c210953d583cbb2da88027fcb9", "function": null, "arguments": [ "0x29e7DF7b6A1B2b07b731457f499E1696c60E2C4e", @@ -13,10 +13,10 @@ ], "transaction": { "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", - "gas": "0x1b35b3", + "gas": "0x1a9134", "value": "0x0", - "input": "0x61010034620001c357601f6200195b38819003918201601f191683019291906001600160401b03841183851017620001c8578160609284926040968752833981010312620001c3576200005281620001de565b906200006e836200006660208401620001de565b9201620001de565b916001600160a01b03908116908115908115620001b7575b8115620001ab575b506200019a573360805260a05260c05260e05260005460ff8160081c16620001465760ff808216036200010b575b50516117679081620001f4823960805181610575015260a0518181816105fc015281816108570152610db9015260c0518181816102fb0152610def015260e0518181816104990152610d690152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001c35756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610edd565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a5a565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a3e565b60058252640312e322e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a7c565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a5a565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a5a565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c78565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b67ffffffffffffffff8111610a2857604052565b634e487b7160e01b600052604160045260246000fd5b6040810190811067ffffffffffffffff821117610a2857604052565b90601f8019910116810190811067ffffffffffffffff821117610a2857604052565b60018060a01b031690604051610a9181610a3e565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610bb6573d9167ffffffffffffffff8311610ba25790610b0c93929160405192610aff88601f19601f8401160185610a5a565b83523d868885013e610bc0565b805191821591848315610b7e575b505050905015610b275750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b1a565b634e487b7160e01b85526041600452602485fd5b90610b0c92916060915b91929015610c225750815115610bd4575090565b3b15610bdd5790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c355750805190602001fd5b60405162461bcd60e51b8152908190610c5190600483016108ba565b0390fd5b91908203918211610c6257565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526000926001600160a01b03908116916020908181600481875afa8015610ed3578690610ea0575b610cce9150610cc9610cc460985442610c55565b610edd565b610c55565b928315610e98578360011b848104600203610e84576005900491610cf28386610c55565b947fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc58780518381523385820152a1823b156108175786516340c10f1960e01b81523060048201526024810191909152878160448183875af18015610e7a57610e5d575b50855163a9059cbb60e01b918101919091527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166024820152604480820193909352918252610db79190610db2606483610a5a565b610a7c565b7f00000000000000000000000000000000000000000000000000000000000000001690813b1561045e578251630899d25960e41b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031660048201526024810191909152919083908390604490829084905af1908115610e545750610e43575050565b610e4d8291610a14565b6101a35750565b513d84823e3d90fd5b610db793929197610e70610db292610a14565b9791929350610d55565b87513d8a823e3d90fd5b634e487b7160e01b87526011600452602487fd5b505050505050565b508181813d8311610ecc575b610eb68183610a5a565b81010312610ec857610cce9051610cb0565b8580fd5b503d610eac565b85513d88823e3d90fd5b667e8fc1d5029dc49080820291820403610c6257670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611620575b66ff0000000000008316611518575b65ff00000000008316611418575b64ff000000008316611320575b63ff0000008316611230575b62ff00008316611148575b61ff008316611068575b60ff8316610f91575b02911c60bf031c60995490818102918183041490151715610c62570490565b60808316611056575b838316611044575b60208316611032575b60108316611020575b6008831661100e575b60048316610ffc575b60028316610fea575b6001831615610f72576801000000000000000102831c610f72565b6801000000000000000102831c610fcf565b6801000000000000000302831c610fc6565b6801000000000000000602831c610fbd565b6801000000000000000b02831c610fb4565b6801000000000000001602831c610fab565b6801000000000000002c02831c610fa2565b6801000000000000005902831c610f9a565b6180008316611136575b6140008316611124575b6120008316611112575b6110008316611100575b61080083166110ee575b61040083166110dc575b61020083166110ca575b610100831615610f6957680100000000000000b102831c610f69565b6801000000000000016302831c6110ae565b680100000000000002c602831c6110a4565b6801000000000000058c02831c61109a565b68010000000000000b1702831c611090565b6801000000000000162e02831c611086565b68010000000000002c5d02831c61107c565b680100000000000058b902831c611072565b62800000831661121e575b62400000831661120c575b6220000083166111fa575b6210000083166111e8575b6208000083166111d6575b6204000083166111c4575b6202000083166111b2575b62010000831615610f5f576801000000000000b17202831c610f5f565b680100000000000162e402831c611195565b6801000000000002c5c802831c61118a565b68010000000000058b9102831c61117f565b680100000000000b172102831c611174565b68010000000000162e4302831c611169565b680100000000002c5c8602831c61115e565b6801000000000058b90c02831c611153565b6380000000831661130e575b634000000083166112fc575b632000000083166112ea575b631000000083166112d8575b630800000083166112c6575b630400000083166112b4575b630200000083166112a2575b6301000000831615610f545768010000000000b1721802831c610f54565b6801000000000162e43002831c611284565b68010000000002c5c86002831c611278565b680100000000058b90c002831c61126c565b6801000000000b17217f02831c611260565b680100000000162e42ff02831c611254565b6801000000002c5c85fe02831c611248565b68010000000058b90bfc02831c61123c565b6480000000008316611406575b64400000000083166113f4575b64200000000083166113e2575b64100000000083166113d0575b64080000000083166113be575b64040000000083166113ac575b640200000000831661139a575b640100000000831615610f4857680100000000b17217f802831c610f48565b68010000000162e42ff102831c61137b565b680100000002c5c85fe302831c61136e565b6801000000058b90bfce02831c611361565b68010000000b17217fbb02831c611354565b6801000000162e42fff002831c611347565b68010000002c5c8601cc02831c61133a565b680100000058b90c0b4902831c61132d565b658000000000008316611506575b6540000000000083166114f4575b6520000000000083166114e2575b6510000000000083166114d0575b6508000000000083166114be575b6504000000000083166114ac575b65020000000000831661149a575b65010000000000831615610f3b576801000000b17218355102831c610f3b565b680100000162e430e5a202831c61147a565b6801000002c5c863b73f02831c61146c565b68010000058b90cf1e6e02831c61145e565b680100000b1721bcfc9a02831c611450565b68010000162e43f4f83102831c611442565b680100002c5c89d5ec6d02831c611434565b6801000058b91b5bc9ae02831c611426565b6680000000000000831661160e575b664000000000000083166115fc575b662000000000000083166115ea575b661000000000000083166115d8575b660800000000000083166115c6575b660400000000000083166115b4575b660200000000000083166115a2575b6601000000000000831615610f2d5768010000b17255775c0402831c610f2d565b6801000162e525ee054702831c611581565b68010002c5cc37da949202831c611572565b680100058ba01fb9f96d02831c611563565b6801000b175effdc76ba02831c611554565b680100162f3904051fa102831c611545565b6801002c605e2e8cec5002831c611536565b68010058c86da1c09ea202831c611527565b678000000000000000831661171e575b674000000000000000831661170c575b67200000000000000083166116fa575b67100000000000000083166116e8575b67080000000000000083166116d6575b67040000000000000083166116c4575b67020000000000000083166116b2575b670100000000000000831615610f1e57680100b1afa5abcbed6102831c610f1e565b68010163da9fb33356d802831c611690565b680102c9a3e778060ee702831c611680565b6801059b0d31585743ae02831c611670565b68010b5586cf9890f62a02831c611660565b6801172b83c7d517adce02831c611650565b6801306fe0a31b7152df02831c611640565b5068016a09e667f3bcc909607f1b61163056fea264697066735822122051de1fb3c32307cc00b0a21a4300e96267e072476c0382d060593a6bdc29770264736f6c6343000815003300000000000000000000000029e7df7b6a1b2b07b731457f499e1696c60e2c4e0000000000000000000000005e3ef299fddf15eaa0432e6e66473ace8c13d90800000000000000000000000086380e136a3aad5677a210ad02713694c4e6a5b9", - "nonce": "0x3", + "input": "0x61010034620001bc57601f620018bd38819003918201601f191683019291906001600160401b03841183851017620001c1578160609284926040968752833981010312620001bc576200005281620001d7565b906200006e836200006660208401620001d7565b9201620001d7565b916001600160a01b03908116908115908115620001b0575b8115620001a4575b5062000193573360805260a05260c05260e05260005460ff8160081c166200013f5760ff8082160362000104575b50516116d09081620001ed823960805181610575015260a0518181816105fc0152610857015260c0518181816102fb0152610d71015260e0518181816104990152610d4a0152f35b60ff90811916176000557f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024986020825160ff8152a138620000bc565b815162461bcd60e51b815260206004820152602760248201527f496e697469616c697a61626c653a20636f6e747261637420697320696e697469604482015266616c697a696e6760c81b6064820152608490fd5b835163e6c4247b60e01b8152600490fd5b9050831615386200008e565b83811615915062000086565b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001bc5756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081631249c58b146108865781631705a3bd1461084257816321daf0851461081b578163485cc9551461050957816354fd4d50146104c857816361d027b3146104845781636c2eb35014610391578163715018a61461032a5781637542ff95146102e657816379ba50971461025957816387b1103414610232575080638da5cb5b1461020a578063e30c3978146101e2578063e6fd48bc146101c4578063edff5610146101a6578063f2fde38b14610135578063f6908f7c146101145763fc0c546a146100e957600080fd5b3461011057816003193601126101105760975490516001600160a01b039091168152602090f35b5080fd5b503461011057816003193601126101105760209051667e8fc1d5029dc48152f35b82346101a35760203660031901126101a35761014f61089f565b610157610959565b606580546001600160a01b0319166001600160a01b039283169081179091556033549091167f38d16b8cac22d99fc7c124b9cd0de2d3fa1faef420bfe791d8c362d765e227008380a380f35b80fd5b50346101105781600319360112610110576020906099549051908152f35b50346101105781600319360112610110576020906098549051908152f35b503461011057816003193601126101105760655490516001600160a01b039091168152602090f35b503461011057816003193601126101105760335490516001600160a01b039091168152602090f35b8284346101a35760203660031901126101a3575061025260209235610e46565b9051908152f35b919050346102e257826003193601126102e257606554336001600160a01b039091160361028d578261028a33610903565b80f35b906020608492519162461bcd60e51b8352820152602960248201527f4f776e61626c6532537465703a2063616c6c6572206973206e6f7420746865206044820152683732bb9037bbb732b960b91b6064820152fd5b8280fd5b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a357610343610959565b606580546001600160a01b031990811690915560338054918216905581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b9050346102e257826003193601126102e257825460ff8160081c161580610477575b6103bc906109b1565b61ffff19169061010282178455602060018060a01b03609754168451928380926318160ddd60e01b82525afa90811561046a578491610432575b509160026020927f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249894609955426098551784555160028152a180f35b9290506020833d8211610462575b8161044d60209383610a46565b8101031261045e57915160026103f6565b8380fd5b3d9150610440565b50505051903d90823e3d90fd5b50600260ff8216106103b3565b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101105781600319360112610110578051610505916104e982610a14565b60058252640312e332e360dc1b602083015251918291826108ba565b0390f35b9050346102e257816003193601126102e25761052361089f565b6001600160a01b03916024803591848316908184036108175787549460ff8660081c16159586809761080a575b80156107f3575b610560906109b1565b60ff1981166001178a55866107e2575b5033877f000000000000000000000000000000000000000000000000000000000000000016036107de5786169182159081156107d5575b506107c757609780546001600160a01b031916831790554260985586516318160ddd60e01b81526020969087818481875afa90811561077e578a9161079a575b506b204fce5e3e2502611000000003610788577f000000000000000000000000000000000000000000000000000000000000000016928751636eb1769f60e11b8152308382015284828201528781604481875afa90811561077e578a9161074d575b506106ec5787519363095ea7b360e01b8886015281850152600019604485015260448452608084019184831067ffffffffffffffff8411176106db575050865261069c929161069791610a68565b610903565b6106a4578280f35b7f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989161ff001984541684555160018152a138808280f35b634e487b7160e01b8a526041905288fd5b875162461bcd60e51b81529182018790526036908201527f5361666545524332303a20617070726f76652066726f6d206e6f6e2d7a65726f60448201527520746f206e6f6e2d7a65726f20616c6c6f77616e636560501b6064820152608490fd5b90508781813d8311610777575b6107648183610a46565b81010312610773575138610649565b8980fd5b503d61075a565b89513d8c823e3d90fd5b634e487b7160e01b8952600182528389fd5b90508781813d83116107c0575b6107b18183610a46565b810103126107735751386105e7565b503d6107a7565b865163e6c4247b60e01b8152fd5b905015386105a7565b8880fd5b61ffff191661010117895538610570565b50303b158015610557575060ff8116600114610557565b50600160ff821610610550565b8780fd5b505034610110578160031936011261011057602090516b204fce5e3e250261100000008152f35b505034610110578160031936011261011057517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b83346101a357806003193601126101a35761028a610c64565b600435906001600160a01b03821682036108b557565b600080fd5b6020808252825181830181905290939260005b8281106108ef57505060409293506000838284010152601f8019910116010190565b8181018601518482016040015285016108cd565b6bffffffffffffffffffffffff60a01b90816065541660655560335460018060a01b038092168093821617603355167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3565b6033546001600160a01b0316330361096d57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b156109b857565b60405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b6040810190811067ffffffffffffffff821117610a3057604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610a3057604052565b60018060a01b031690604051610a7d81610a14565b6020928382527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564848301526000808486829651910182855af13d15610ba2573d9167ffffffffffffffff8311610b8e5790610af893929160405192610aeb88601f19601f8401160185610a46565b83523d868885013e610bac565b805191821591848315610b6a575b505050905015610b135750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b919381809450010312610110578201519081151582036101a3575080388084610b06565b634e487b7160e01b85526041600452602485fd5b90610af892916060915b91929015610c0e5750815115610bc0575090565b3b15610bc95790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610c215750805190602001fd5b60405162461bcd60e51b8152908190610c3d90600483016108ba565b0390fd5b91908203918211610c4e57565b634e487b7160e01b600052601160045260246000fd5b609754604080516318160ddd60e01b81526001600160a01b0390921691602081600481865afa8015610dfa57600090610dc7575b610cb69150610cb1610cac60985442610c41565b610e46565b610c41565b918215610dc2578260011b838104600203610c4e576005900492610cda8482610c41565b927fcae919fa60d0c9867c5b3e0a9529934bca78c09d353736e3327f74837594adc5818051848152336020820152a1823b156108b55780516340c10f1960e01b8152306004820152602481019290925260008260448183875af18015610db757610d98575b5050610d6f610d96937f000000000000000000000000000000000000000000000000000000000000000083610e05565b7f000000000000000000000000000000000000000000000000000000000000000090610e05565b565b909367ffffffffffffffff8511610a3057939052610d6f610d96610d3f565b50513d6000823e3d90fd5b505050565b6020823d8211610df2575b81610ddf60209383610a46565b810103126101a35750610cb69051610c98565b3d9150610dd2565b82513d6000823e3d90fd5b60405163a9059cbb60e01b60208201526001600160a01b03929092166024830152604480830193909352918152610d9691610e41606483610a46565b610a68565b667e8fc1d5029dc49080820291820403610c4e57670de0b6b3a764000090816301e1338060409204821b0482600160bf1b67ff000000000000008316611589575b66ff0000000000008316611481575b65ff00000000008316611381575b64ff000000008316611289575b63ff0000008316611199575b62ff000083166110b1575b61ff008316610fd1575b60ff8316610efa575b02911c60bf031c60995490818102918183041490151715610c4e570490565b60808316610fbf575b838316610fad575b60208316610f9b575b60108316610f89575b60088316610f77575b60048316610f65575b60028316610f53575b6001831615610edb576801000000000000000102831c610edb565b6801000000000000000102831c610f38565b6801000000000000000302831c610f2f565b6801000000000000000602831c610f26565b6801000000000000000b02831c610f1d565b6801000000000000001602831c610f14565b6801000000000000002c02831c610f0b565b6801000000000000005902831c610f03565b618000831661109f575b614000831661108d575b612000831661107b575b6110008316611069575b6108008316611057575b6104008316611045575b6102008316611033575b610100831615610ed257680100000000000000b102831c610ed2565b6801000000000000016302831c611017565b680100000000000002c602831c61100d565b6801000000000000058c02831c611003565b68010000000000000b1702831c610ff9565b6801000000000000162e02831c610fef565b68010000000000002c5d02831c610fe5565b680100000000000058b902831c610fdb565b628000008316611187575b624000008316611175575b622000008316611163575b621000008316611151575b62080000831661113f575b62040000831661112d575b62020000831661111b575b62010000831615610ec8576801000000000000b17202831c610ec8565b680100000000000162e402831c6110fe565b6801000000000002c5c802831c6110f3565b68010000000000058b9102831c6110e8565b680100000000000b172102831c6110dd565b68010000000000162e4302831c6110d2565b680100000000002c5c8602831c6110c7565b6801000000000058b90c02831c6110bc565b63800000008316611277575b63400000008316611265575b63200000008316611253575b63100000008316611241575b6308000000831661122f575b6304000000831661121d575b6302000000831661120b575b6301000000831615610ebd5768010000000000b1721802831c610ebd565b6801000000000162e43002831c6111ed565b68010000000002c5c86002831c6111e1565b680100000000058b90c002831c6111d5565b6801000000000b17217f02831c6111c9565b680100000000162e42ff02831c6111bd565b6801000000002c5c85fe02831c6111b1565b68010000000058b90bfc02831c6111a5565b648000000000831661136f575b644000000000831661135d575b642000000000831661134b575b6410000000008316611339575b6408000000008316611327575b6404000000008316611315575b6402000000008316611303575b640100000000831615610eb157680100000000b17217f802831c610eb1565b68010000000162e42ff102831c6112e4565b680100000002c5c85fe302831c6112d7565b6801000000058b90bfce02831c6112ca565b68010000000b17217fbb02831c6112bd565b6801000000162e42fff002831c6112b0565b68010000002c5c8601cc02831c6112a3565b680100000058b90c0b4902831c611296565b65800000000000831661146f575b65400000000000831661145d575b65200000000000831661144b575b651000000000008316611439575b650800000000008316611427575b650400000000008316611415575b650200000000008316611403575b65010000000000831615610ea4576801000000b17218355102831c610ea4565b680100000162e430e5a202831c6113e3565b6801000002c5c863b73f02831c6113d5565b68010000058b90cf1e6e02831c6113c7565b680100000b1721bcfc9a02831c6113b9565b68010000162e43f4f83102831c6113ab565b680100002c5c89d5ec6d02831c61139d565b6801000058b91b5bc9ae02831c61138f565b66800000000000008316611577575b66400000000000008316611565575b66200000000000008316611553575b66100000000000008316611541575b6608000000000000831661152f575b6604000000000000831661151d575b6602000000000000831661150b575b6601000000000000831615610e965768010000b17255775c0402831c610e96565b6801000162e525ee054702831c6114ea565b68010002c5cc37da949202831c6114db565b680100058ba01fb9f96d02831c6114cc565b6801000b175effdc76ba02831c6114bd565b680100162f3904051fa102831c6114ae565b6801002c605e2e8cec5002831c61149f565b68010058c86da1c09ea202831c611490565b6780000000000000008316611687575b6740000000000000008316611675575b6720000000000000008316611663575b6710000000000000008316611651575b670800000000000000831661163f575b670400000000000000831661162d575b670200000000000000831661161b575b670100000000000000831615610e8757680100b1afa5abcbed6102831c610e87565b68010163da9fb33356d802831c6115f9565b680102c9a3e778060ee702831c6115e9565b6801059b0d31585743ae02831c6115d9565b68010b5586cf9890f62a02831c6115c9565b6801172b83c7d517adce02831c6115b9565b6801306fe0a31b7152df02831c6115a9565b5068016a09e667f3bcc909607f1b61159956fea2646970667358221220e4cf06e58d18f8f30eea170949dec98536662854621cd6f35b2acc15699d4c1664736f6c6343000815003300000000000000000000000029e7df7b6a1b2b07b731457f499e1696c60e2c4e0000000000000000000000005e3ef299fddf15eaa0432e6e66473ace8c13d90800000000000000000000000086380e136a3aad5677a210ad02713694c4e6a5b9", + "nonce": "0x4", "chainId": "0x1" }, "additionalContracts": [], @@ -26,39 +26,39 @@ "receipts": [ { "status": "0x1", - "cumulativeGasUsed": "0x9b9256", + "cumulativeGasUsed": "0x602119", "logs": [ { - "address": "0x5e875267f65537768435c3c6c81cd313a570b422", + "address": "0x152442d77e9fb9c210953d583cbb2da88027fcb9", "topics": [ "0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498" ], "data": "0x00000000000000000000000000000000000000000000000000000000000000ff", - "blockHash": "0x855dcb4682138978bce4b977135f8638273a8599da08331532503b2e6e4ced8d", - "blockNumber": "0x133dee7", - "transactionHash": "0xafd917c394d869e817cb1696aba9d9e4c571805ddd078efd52aeec1a9607a18e", - "transactionIndex": "0x29", - "logIndex": "0xaf", + "blockHash": "0xdd9346e88982782bfe9fb9231fec984d73334f22302f127463d0ab975fb1965e", + "blockNumber": "0x13a05a4", + "transactionHash": "0xdbd5e6cd554c2f36c5912e262098941a171016f83bea8a699bfdb712ef6f9bb3", + "transactionIndex": "0x23", + "logIndex": "0x8c", "removed": false } ], - "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000080000000000000000000000000000000000000000000000480000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000020000000000000000000000000008000000000000000000000000", "type": "0x2", - "transactionHash": "0xafd917c394d869e817cb1696aba9d9e4c571805ddd078efd52aeec1a9607a18e", - "transactionIndex": "0x29", - "blockHash": "0x855dcb4682138978bce4b977135f8638273a8599da08331532503b2e6e4ced8d", - "blockNumber": "0x133dee7", - "gasUsed": "0x14efd7", - "effectiveGasPrice": "0x441f103ed", + "transactionHash": "0xdbd5e6cd554c2f36c5912e262098941a171016f83bea8a699bfdb712ef6f9bb3", + "transactionIndex": "0x23", + "blockHash": "0xdd9346e88982782bfe9fb9231fec984d73334f22302f127463d0ab975fb1965e", + "blockNumber": "0x13a05a4", + "gasUsed": "0x147144", + "effectiveGasPrice": "0x93b973c7", "from": "0x32bdc6a4e8c654df65503cbb0edc82b4ce9158e6", "to": null, - "contractAddress": "0x5e875267f65537768435c3c6c81cd313a570b422" + "contractAddress": "0x152442d77e9fb9c210953d583cbb2da88027fcb9" } ], "libraries": [], "pending": [], "returns": {}, - "timestamp": 1719413975, + "timestamp": 1724276577, "chain": 1, - "commit": "6849c18" + "commit": "b3d6f4f" } \ No newline at end of file From c059ef7d09e9c69a8e4e56d490528684353c6bab Mon Sep 17 00:00:00 2001 From: DhairyaSethi <55102840+DhairyaSethi@users.noreply.github.com> Date: Thu, 5 Sep 2024 18:49:39 +0530 Subject: [PATCH 16/16] doc: add 1.2.0 & 1.3.0 EM deployments --- deployments/1.md | 91 ++++++++++++++++++++++++++++++++++++++--- deployments/json/1.json | 47 +++++++++++++++++++-- 2 files changed, 129 insertions(+), 9 deletions(-) diff --git a/deployments/1.md b/deployments/1.md index 70f6ded..58d5253 100644 --- a/deployments/1.md +++ b/deployments/1.md @@ -9,6 +9,8 @@ - [Proxy Admin](#proxy-admin) - [Polygon Ecosystem Token](#polygon-ecosystem-token) - [Deployment History](#deployment-history) + - [1.3.0](#130) + - [1.2.0](#120) - [1.1.0](#110) ## Summary @@ -25,7 +27,7 @@ DefaultEmissionManager 0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53 - 1.1.0 + 1.3.0 ProxyAdmin @@ -94,11 +96,11 @@ Address: [0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53](https://etherscan.io/addre Deployment Txn: [0xeb8da48615884160b61712096c4d770d0f8374b0c3d2686afb798cc3f7b40610](https://etherscan.io/tx/0xeb8da48615884160b61712096c4d770d0f8374b0c3d2686afb798cc3f7b40610) -Version: [1.1.0](https://github.com/0xPolygon/pol-token/releases/tag/1.1.0) +Version: [1.3.0](https://github.com/0xPolygon/pol-token/releases/tag/1.3.0) -Commit Hash: [4d110d7](https://github.com/0xPolygon/pol-token/commit/4d110d71d5904bb7fb6ef4ffabd774aee519d1ad) +Commit Hash: [ce66e1d](https://github.com/0xPolygon/pol-token/commit/ce66e1df19277a5dabcd6aa97dbd4f588409567e) -Wed, 25 Oct 2023 09:07:47 UTC +Wed, 21 Aug 2024 21:42:57 UTC _Proxy Information_ @@ -109,7 +111,7 @@ Proxy Type: TransparentUpgradeableProxy -Implementation: [0x2126E6952C3af75C9D4CF21f63F509195C79ce44](https://etherscan.io/address/0x2126E6952C3af75C9D4CF21f63F509195C79ce44) +Implementation: [0x152442D77E9fB9C210953d583Cbb2da88027fCB9](https://etherscan.io/address/0x152442D77E9fB9C210953d583Cbb2da88027fCB9) @@ -125,6 +127,16 @@ Proxy Admin: [0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3](https://etherscan.io/a Address Commit Hash + + 1.3.0 + 0x152442D77E9fB9C210953d583Cbb2da88027fCB9 + ce66e1d + + + 1.2.0 + 0x5e875267f65537768435C3C6C81cd313a570B422 + f555f12 + 1.1.0 0x2126E6952C3af75C9D4CF21f63F509195C79ce44 @@ -170,6 +182,75 @@ Wed, 25 Oct 2023 09:07:47 UTC ### Deployment History +### [1.3.0](https://github.com/0xPolygon/pol-token/releases/tag/1.3.0) + +Wed, 21 Aug 2024 21:42:57 UTC + +Commit Hash: [ce66e1d](https://github.com/0xPolygon/pol-token/commit/ce66e1df19277a5dabcd6aa97dbd4f588409567e) + +Deployed contracts: + +- [Default Emission Manager](https://etherscan.io/address/0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53) ([Implementation](https://etherscan.io/address/0x152442D77E9fB9C210953d583Cbb2da88027fCB9)) + +
+Inputs + + + + + + + + + + + + + + + +
ParameterValue
emissionManagerProxy0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53
emProxyAdmin0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3
+
+ + + +### [1.2.0](https://github.com/0xPolygon/pol-token/releases/tag/1.2.0) + +Mon, 24 Jun 2024 03:26:29 UTC + +Commit Hash: [f555f12](https://github.com/0xPolygon/pol-token/commit/f555f1245af276b416089ba2cecbe94a16f9a54d) + +Deployed contracts: + +- [Default Emission Manager](https://etherscan.io/address/0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53) ([Implementation](https://etherscan.io/address/0x5e875267f65537768435C3C6C81cd313a570B422)) + +
+Inputs + + + + + + + + + + + + + + + + + + + + +
ParameterValue
emissionManagerProxy0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53
emProxyAdmin0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3
treasury0x86380e136A3AaD5677A210Ad02713694c4E6a5b9
+
+ + + ### [1.1.0](https://github.com/0xPolygon/pol-token/releases/tag/1.1.0) Wed, 25 Oct 2023 09:07:47 UTC diff --git a/deployments/json/1.json b/deployments/json/1.json index 5563045..777870e 100644 --- a/deployments/json/1.json +++ b/deployments/json/1.json @@ -13,15 +13,15 @@ "commitHash": "4d110d71d5904bb7fb6ef4ffabd774aee519d1ad" }, "DefaultEmissionManager": { - "implementation": "0x2126E6952C3af75C9D4CF21f63F509195C79ce44", + "implementation": "0x152442D77E9fB9C210953d583Cbb2da88027fCB9", "proxyAdmin": "0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3", "address": "0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53", "proxy": true, - "version": "1.1.0", + "version": "1.3.0", "proxyType": "TransparentUpgradeableProxy", - "timestamp": 1698224867, + "timestamp": 1724276577, "deploymentTxn": "0xeb8da48615884160b61712096c4d770d0f8374b0c3d2686afb798cc3f7b40610", - "commitHash": "4d110d71d5904bb7fb6ef4ffabd774aee519d1ad" + "commitHash": "ce66e1df19277a5dabcd6aa97dbd4f588409567e" }, "ProxyAdmin": { "address": "0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3", @@ -40,6 +40,45 @@ } }, "history": [ + { + "contracts": { + "DefaultEmissionManager": { + "implementation": "0x152442D77E9fB9C210953d583Cbb2da88027fCB9", + "proxyAdmin": "0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3", + "address": "0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53", + "proxy": true, + "version": "1.3.0", + "proxyType": "TransparentUpgradeableProxy", + "deploymentTxn": "0xeb8da48615884160b61712096c4d770d0f8374b0c3d2686afb798cc3f7b40610" + } + }, + "input": { + "emissionManagerProxy": "0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53", + "emProxyAdmin": "0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3" + }, + "timestamp": 1724276577, + "commitHash": "ce66e1df19277a5dabcd6aa97dbd4f588409567e" + }, + { + "contracts": { + "DefaultEmissionManager": { + "implementation": "0x5e875267f65537768435C3C6C81cd313a570B422", + "proxyAdmin": "0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3", + "address": "0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53", + "proxy": true, + "version": "1.2.0", + "proxyType": "TransparentUpgradeableProxy", + "deploymentTxn": "0xeb8da48615884160b61712096c4d770d0f8374b0c3d2686afb798cc3f7b40610" + } + }, + "input": { + "emissionManagerProxy": "0xbC9f74b3b14f460a6c47dCdDFd17411cBc7b6c53", + "emProxyAdmin": "0xEBea33f2c92D03556b417F4F572B2FbbE62C39c3", + "treasury": "0x86380e136A3AaD5677A210Ad02713694c4E6a5b9" + }, + "timestamp": 1719199589, + "commitHash": "f555f1245af276b416089ba2cecbe94a16f9a54d" + }, { "contracts": { "PolygonMigration": {