bane-labs
diff --git a/‎config/genesis_testnet.json‎
Lines changed: 1 addition & 1 deletion b/‎config/genesis_testnet.json‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎contracts/solidity/GovProxyAdmin.sol‎
Lines changed: 6 additions & 5 deletions b/‎contracts/solidity/GovProxyAdmin.sol‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎privnet/four/genesis_privnet.json‎
Lines changed: 1 addition & 1 deletion b/‎privnet/four/genesis_privnet.json‎
Lines changed: 1 addition & 1 deletion
@@ -34,7 +34,7 @@
   "alloc": {
     "0x1212000000000000000000000000000000000000": {
       "balance": "0",
-      "code": "0x6080604052600436106100345760003560e01c8063701b70ac1461003957806389dc5c841461006e5780639623609d146100a2575b600080fd5b34801561004557600080fd5b5061005961005436600461053f565b6100b7565b60405190151581526020015b60405180910390f35b34801561007a57600080fd5b5061008a600361090960911b0181565b6040516001600160a01b039091168152602001610065565b6100b56100b03660046105aa565b610184565b005b600080600361090960911b016001600160a01b0316631633da6e6040518163ffffffff1660e01b8152600401600060405180830381865afa158015610100573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526101289190810190610664565b905060005b815181101561017a5781818151811061014857610148610716565b60200260200101516001600160a01b0316846001600160a01b031603610172575060019392505050565b60010161012d565b5060009392505050565b7fe739b9109d83c1c6d0d640fe9ed476fc5862a6de5483b00678a3fffa7a2be2f68383836040516020016101ba93929190610772565b604051602081830303815290604052805190602001206101d9336100b7565b6102155760405162461bcd60e51b81526020600482015260096024820152682737ba1026b4b732b960b91b604482015260640160405180910390fd5b61021f82826102e0565b610229828261033e565b156102d95760405163278f794360e11b81526001600160a01b03861690634f1ef28690349061025e90889088906004016107a7565b6000604051808303818588803b15801561027757600080fd5b505af115801561028b573d6000803e3d6000fd5b505060408051868152602081018690527ff5aa3d6492eaf1a4d6787c5bd36e8ec61c245d4af2fd1fd387e387a50de9f8c594500191506102c89050565b60405180910390a16102d982610450565b5050505050565b6000828152602081815260408083203380855290835292819020849055805192835290820184905281018290527f61699483e2a58589628399a22e34da872b583143ab99b3245ba6dacf4974d2e39060600160405180910390a15050565b600080600361090960911b016001600160a01b0316631633da6e6040518163ffffffff1660e01b8152600401600060405180830381865afa158015610387573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526103af9190810190610664565b90506000805b8251811015610429578460008088815260200190815260200160002060008584815181106103e5576103e5610716565b60200260200101516001600160a01b03166001600160a01b031681526020019081526020016000205403610421578161041d816107e9565b9250505b6001016103b5565b5060028251600161043a9190610802565b6104449190610815565b11159150505b92915050565b6000600361090960911b016001600160a01b0316631633da6e6040518163ffffffff1660e01b8152600401600060405180830381865afa158015610498573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104c09190810190610664565b905060005b81518110156105225760008084815260200190815260200160002060008383815181106104f4576104f4610716565b6020908102919091018101516001600160a01b031682528101919091526040016000908120556001016104c5565b505050565b6001600160a01b038116811461053c57600080fd5b50565b60006020828403121561055157600080fd5b813561055c81610527565b9392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff811182821017156105a2576105a2610563565b604052919050565b6000806000606084860312156105bf57600080fd5b83356105ca81610527565b92506020848101356105db81610527565b9250604085013567ffffffffffffffff808211156105f857600080fd5b818701915087601f83011261060c57600080fd5b81358181111561061e5761061e610563565b610630601f8201601f19168501610579565b9150808252888482850101111561064657600080fd5b80848401858401376000848284010152508093505050509250925092565b6000602080838503121561067757600080fd5b825167ffffffffffffffff8082111561068f57600080fd5b818501915085601f8301126106a357600080fd5b8151818111156106b5576106b5610563565b8060051b91506106c6848301610579565b81815291830184019184810190888411156106e057600080fd5b938501935b8385101561070a57845192506106fa83610527565b82825293850193908501906106e5565b98975050505050505050565b634e487b7160e01b600052603260045260246000fd5b6000815180845260005b8181101561075257602081850181015186830182015201610736565b506000602082860101526020601f19601f83011685010191505092915050565b6001600160a01b0384811682528316602082015260606040820181905260009061079e9083018461072c565b95945050505050565b6001600160a01b03831681526040602082018190526000906107cb9083018461072c565b949350505050565b634e487b7160e01b600052601160045260246000fd5b6000600182016107fb576107fb6107d3565b5060010190565b8082018082111561044a5761044a6107d3565b60008261083257634e487b7160e01b600052601260045260246000fd5b50049056fea26469706673582212209e61d38d47b2583b6176290ca9691082e36c167c502217e5f59481c644e946dc64736f6c63430008180033"
+      "code": "0x608060405260043610610033575f3560e01c8063701b70ac1461003757806389dc5c841461006b5780639623609d1461009e575b5f80fd5b348015610042575f80fd5b5061005661005136600461051a565b6100b3565b60405190151581526020015b60405180910390f35b348015610076575f80fd5b50610086600361090960911b0181565b6040516001600160a01b039091168152602001610062565b6100b16100ac366004610581565b610179565b005b5f80600361090960911b016001600160a01b0316631633da6e6040518163ffffffff1660e01b81526004015f60405180830381865afa1580156100f8573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f1916820160405261011f9190810190610634565b90505f5b81518110156101705781818151811061013e5761013e6106e1565b60200260200101516001600160a01b0316846001600160a01b031603610168575060019392505050565b600101610123565b505f9392505050565b7fe739b9109d83c1c6d0d640fe9ed476fc5862a6de5483b00678a3fffa7a2be2f68383836040516020016101af93929190610738565b604051602081830303815290604052805190602001206101ce336100b3565b61020a5760405162461bcd60e51b81526020600482015260096024820152682737ba1026b4b732b960b91b604482015260640160405180910390fd5b61021482826102d1565b61021e828261032e565b156102ca5760405163278f794360e11b81526001600160a01b03861690634f1ef286903490610253908890889060040161076c565b5f604051808303818588803b15801561026a575f80fd5b505af115801561027c573d5f803e3d5ffd5b505060408051868152602081018690527ff5aa3d6492eaf1a4d6787c5bd36e8ec61c245d4af2fd1fd387e387a50de9f8c594500191506102b99050565b60405180910390a16102ca82610436565b5050505050565b5f828152602081815260408083203380855290835292819020849055805192835290820184905281018290527f61699483e2a58589628399a22e34da872b583143ab99b3245ba6dacf4974d2e39060600160405180910390a15050565b5f80600361090960911b016001600160a01b0316631633da6e6040518163ffffffff1660e01b81526004015f60405180830381865afa158015610373573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f1916820160405261039a9190810190610634565b90505f805b825181101561040f57845f808881526020019081526020015f205f8584815181106103cc576103cc6106e1565b60200260200101516001600160a01b03166001600160a01b031681526020019081526020015f2054036104075781610403816107ab565b9250505b60010161039f565b5060028251600161042091906107c3565b61042a91906107d6565b11159150505b92915050565b5f600361090960911b016001600160a01b0316631633da6e6040518163ffffffff1660e01b81526004015f60405180830381865afa15801561047a573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526104a19190810190610634565b90505f5b81518110156104fe575f808481526020019081526020015f205f8383815181106104d1576104d16106e1565b6020908102919091018101516001600160a01b031682528101919091526040015f908120556001016104a5565b505050565b6001600160a01b0381168114610517575f80fd5b50565b5f6020828403121561052a575f80fd5b813561053581610503565b9392505050565b634e487b7160e01b5f52604160045260245ffd5b604051601f8201601f1916810167ffffffffffffffff811182821017156105795761057961053c565b604052919050565b5f805f60608486031215610593575f80fd5b833561059e81610503565b92506020848101356105af81610503565b9250604085013567ffffffffffffffff808211156105cb575f80fd5b818701915087601f8301126105de575f80fd5b8135818111156105f0576105f061053c565b610602601f8201601f19168501610550565b91508082528884828501011115610617575f80fd5b80848401858401375f848284010152508093505050509250925092565b5f6020808385031215610645575f80fd5b825167ffffffffffffffff8082111561065c575f80fd5b818501915085601f83011261066f575f80fd5b8151818111156106815761068161053c565b8060051b9150610692848301610550565b81815291830184019184810190888411156106ab575f80fd5b938501935b838510156106d557845192506106c583610503565b82825293850193908501906106b0565b98975050505050505050565b634e487b7160e01b5f52603260045260245ffd5b5f81518084525f5b81811015610719576020818501810151868301820152016106fd565b505f602082860101526020601f19601f83011685010191505092915050565b6001600160a01b038481168252831660208201526060604082018190525f90610763908301846106f5565b95945050505050565b6001600160a01b03831681526040602082018190525f9061078f908301846106f5565b949350505050565b634e487b7160e01b5f52601160045260245ffd5b5f600182016107bc576107bc610797565b5060010190565b8082018082111561043057610430610797565b5f826107f057634e487b7160e01b5f52601260045260245ffd5b50049056fea26469706673582212208b5abf9068d280c8882fefb135628450824597b22a5188a2b2be9cc20531f25064736f6c63430008180033"
     },
     "0x1212000000000000000000000000000000000001": {
       "balance": "0",
 
@@ -10,26 +10,27 @@ import "./GovernanceVote.sol";
  */
 contract GovProxyAdmin is GovernanceVote {
     /**
-     * @dev Upgrades `proxy` to `implementation` and calls a function on the new implementation. See
-     * {TransparentUpgradeableProxy-upgradeToAndCall}.
+     * @dev Upgrades the implementation in proxy to `newImplementation`, and
+     * subsequently executes the function call encoded in `data`. See
+     * {UUPSUpgradeable-upgradeToAndCall}.
      *
      * Requirements:
      *
      * - This contract must be the admin of `proxy`.
      */
     function upgradeAndCall(
         UUPSUpgradeable proxy,
-        address implementation,
+        address newImplementation,
         bytes memory data
     )
         public
         payable
         virtual
         needVote(
             keccak256("upgradeAndCall"),
-            keccak256(abi.encode(proxy, implementation, data))
+            keccak256(abi.encode(proxy, newImplementation, data))
         )
     {
-        proxy.upgradeToAndCall{value: msg.value}(implementation, data);
+        proxy.upgradeToAndCall{value: msg.value}(newImplementation, data);
     }
 }
@@ -46,7 +46,7 @@
     },
     "0x1212000000000000000000000000000000000000": {
       "balance": "0",
-      "code": "0x6080604052600436106100345760003560e01c8063701b70ac1461003957806389dc5c841461006e5780639623609d146100a2575b600080fd5b34801561004557600080fd5b5061005961005436600461053f565b6100b7565b60405190151581526020015b60405180910390f35b34801561007a57600080fd5b5061008a600361090960911b0181565b6040516001600160a01b039091168152602001610065565b6100b56100b03660046105aa565b610184565b005b600080600361090960911b016001600160a01b0316631633da6e6040518163ffffffff1660e01b8152600401600060405180830381865afa158015610100573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526101289190810190610664565b905060005b815181101561017a5781818151811061014857610148610716565b60200260200101516001600160a01b0316846001600160a01b031603610172575060019392505050565b60010161012d565b5060009392505050565b7fe739b9109d83c1c6d0d640fe9ed476fc5862a6de5483b00678a3fffa7a2be2f68383836040516020016101ba93929190610772565b604051602081830303815290604052805190602001206101d9336100b7565b6102155760405162461bcd60e51b81526020600482015260096024820152682737ba1026b4b732b960b91b604482015260640160405180910390fd5b61021f82826102e0565b610229828261033e565b156102d95760405163278f794360e11b81526001600160a01b03861690634f1ef28690349061025e90889088906004016107a7565b6000604051808303818588803b15801561027757600080fd5b505af115801561028b573d6000803e3d6000fd5b505060408051868152602081018690527ff5aa3d6492eaf1a4d6787c5bd36e8ec61c245d4af2fd1fd387e387a50de9f8c594500191506102c89050565b60405180910390a16102d982610450565b5050505050565b6000828152602081815260408083203380855290835292819020849055805192835290820184905281018290527f61699483e2a58589628399a22e34da872b583143ab99b3245ba6dacf4974d2e39060600160405180910390a15050565b600080600361090960911b016001600160a01b0316631633da6e6040518163ffffffff1660e01b8152600401600060405180830381865afa158015610387573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526103af9190810190610664565b90506000805b8251811015610429578460008088815260200190815260200160002060008584815181106103e5576103e5610716565b60200260200101516001600160a01b03166001600160a01b031681526020019081526020016000205403610421578161041d816107e9565b9250505b6001016103b5565b5060028251600161043a9190610802565b6104449190610815565b11159150505b92915050565b6000600361090960911b016001600160a01b0316631633da6e6040518163ffffffff1660e01b8152600401600060405180830381865afa158015610498573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104c09190810190610664565b905060005b81518110156105225760008084815260200190815260200160002060008383815181106104f4576104f4610716565b6020908102919091018101516001600160a01b031682528101919091526040016000908120556001016104c5565b505050565b6001600160a01b038116811461053c57600080fd5b50565b60006020828403121561055157600080fd5b813561055c81610527565b9392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff811182821017156105a2576105a2610563565b604052919050565b6000806000606084860312156105bf57600080fd5b83356105ca81610527565b92506020848101356105db81610527565b9250604085013567ffffffffffffffff808211156105f857600080fd5b818701915087601f83011261060c57600080fd5b81358181111561061e5761061e610563565b610630601f8201601f19168501610579565b9150808252888482850101111561064657600080fd5b80848401858401376000848284010152508093505050509250925092565b6000602080838503121561067757600080fd5b825167ffffffffffffffff8082111561068f57600080fd5b818501915085601f8301126106a357600080fd5b8151818111156106b5576106b5610563565b8060051b91506106c6848301610579565b81815291830184019184810190888411156106e057600080fd5b938501935b8385101561070a57845192506106fa83610527565b82825293850193908501906106e5565b98975050505050505050565b634e487b7160e01b600052603260045260246000fd5b6000815180845260005b8181101561075257602081850181015186830182015201610736565b506000602082860101526020601f19601f83011685010191505092915050565b6001600160a01b0384811682528316602082015260606040820181905260009061079e9083018461072c565b95945050505050565b6001600160a01b03831681526040602082018190526000906107cb9083018461072c565b949350505050565b634e487b7160e01b600052601160045260246000fd5b6000600182016107fb576107fb6107d3565b5060010190565b8082018082111561044a5761044a6107d3565b60008261083257634e487b7160e01b600052601260045260246000fd5b50049056fea26469706673582212209e61d38d47b2583b6176290ca9691082e36c167c502217e5f59481c644e946dc64736f6c63430008180033"
+      "code": "0x608060405260043610610033575f3560e01c8063701b70ac1461003757806389dc5c841461006b5780639623609d1461009e575b5f80fd5b348015610042575f80fd5b5061005661005136600461051a565b6100b3565b60405190151581526020015b60405180910390f35b348015610076575f80fd5b50610086600361090960911b0181565b6040516001600160a01b039091168152602001610062565b6100b16100ac366004610581565b610179565b005b5f80600361090960911b016001600160a01b0316631633da6e6040518163ffffffff1660e01b81526004015f60405180830381865afa1580156100f8573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f1916820160405261011f9190810190610634565b90505f5b81518110156101705781818151811061013e5761013e6106e1565b60200260200101516001600160a01b0316846001600160a01b031603610168575060019392505050565b600101610123565b505f9392505050565b7fe739b9109d83c1c6d0d640fe9ed476fc5862a6de5483b00678a3fffa7a2be2f68383836040516020016101af93929190610738565b604051602081830303815290604052805190602001206101ce336100b3565b61020a5760405162461bcd60e51b81526020600482015260096024820152682737ba1026b4b732b960b91b604482015260640160405180910390fd5b61021482826102d1565b61021e828261032e565b156102ca5760405163278f794360e11b81526001600160a01b03861690634f1ef286903490610253908890889060040161076c565b5f604051808303818588803b15801561026a575f80fd5b505af115801561027c573d5f803e3d5ffd5b505060408051868152602081018690527ff5aa3d6492eaf1a4d6787c5bd36e8ec61c245d4af2fd1fd387e387a50de9f8c594500191506102b99050565b60405180910390a16102ca82610436565b5050505050565b5f828152602081815260408083203380855290835292819020849055805192835290820184905281018290527f61699483e2a58589628399a22e34da872b583143ab99b3245ba6dacf4974d2e39060600160405180910390a15050565b5f80600361090960911b016001600160a01b0316631633da6e6040518163ffffffff1660e01b81526004015f60405180830381865afa158015610373573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f1916820160405261039a9190810190610634565b90505f805b825181101561040f57845f808881526020019081526020015f205f8584815181106103cc576103cc6106e1565b60200260200101516001600160a01b03166001600160a01b031681526020019081526020015f2054036104075781610403816107ab565b9250505b60010161039f565b5060028251600161042091906107c3565b61042a91906107d6565b11159150505b92915050565b5f600361090960911b016001600160a01b0316631633da6e6040518163ffffffff1660e01b81526004015f60405180830381865afa15801561047a573d5f803e3d5ffd5b505050506040513d5f823e601f3d908101601f191682016040526104a19190810190610634565b90505f5b81518110156104fe575f808481526020019081526020015f205f8383815181106104d1576104d16106e1565b6020908102919091018101516001600160a01b031682528101919091526040015f908120556001016104a5565b505050565b6001600160a01b0381168114610517575f80fd5b50565b5f6020828403121561052a575f80fd5b813561053581610503565b9392505050565b634e487b7160e01b5f52604160045260245ffd5b604051601f8201601f1916810167ffffffffffffffff811182821017156105795761057961053c565b604052919050565b5f805f60608486031215610593575f80fd5b833561059e81610503565b92506020848101356105af81610503565b9250604085013567ffffffffffffffff808211156105cb575f80fd5b818701915087601f8301126105de575f80fd5b8135818111156105f0576105f061053c565b610602601f8201601f19168501610550565b91508082528884828501011115610617575f80fd5b80848401858401375f848284010152508093505050509250925092565b5f6020808385031215610645575f80fd5b825167ffffffffffffffff8082111561065c575f80fd5b818501915085601f83011261066f575f80fd5b8151818111156106815761068161053c565b8060051b9150610692848301610550565b81815291830184019184810190888411156106ab575f80fd5b938501935b838510156106d557845192506106c583610503565b82825293850193908501906106b0565b98975050505050505050565b634e487b7160e01b5f52603260045260245ffd5b5f81518084525f5b81811015610719576020818501810151868301820152016106fd565b505f602082860101526020601f19601f83011685010191505092915050565b6001600160a01b038481168252831660208201526060604082018190525f90610763908301846106f5565b95945050505050565b6001600160a01b03831681526040602082018190525f9061078f908301846106f5565b949350505050565b634e487b7160e01b5f52601160045260245ffd5b5f600182016107bc576107bc610797565b5060010190565b8082018082111561043057610430610797565b5f826107f057634e487b7160e01b5f52601260045260245ffd5b50049056fea26469706673582212208b5abf9068d280c8882fefb135628450824597b22a5188a2b2be9cc20531f25064736f6c63430008180033"
     },
     "0x1212000000000000000000000000000000000001": {
       "balance": "0",
Original file line number	Diff line number	Diff line change
`@@ -10,26 +10,27 @@ import "./GovernanceVote.sol";`
`10`	`10`	`*/`
`11`	`11`	`contract GovProxyAdmin is GovernanceVote {`
`12`	`12`	`/**`
`13`		- * @dev Upgrades `proxy` to `implementation` and calls a function on the new implementation. See
`14`		`- * {TransparentUpgradeableProxy-upgradeToAndCall}.`
	`13`	+ * @dev Upgrades the implementation in proxy to `newImplementation`, and
	`14`	+ * subsequently executes the function call encoded in `data`. See
	`15`	`+ * {UUPSUpgradeable-upgradeToAndCall}.`
`15`	`16`	`*`
`16`	`17`	`* Requirements:`
`17`	`18`	`*`
`18`	`19`	* - This contract must be the admin of `proxy`.
`19`	`20`	`*/`
`20`	`21`	`function upgradeAndCall(`
`21`	`22`	`UUPSUpgradeable proxy,`
`22`		`- address implementation,`
	`23`	`+ address newImplementation,`
`23`	`24`	`bytes memory data`
`24`	`25`	`)`
`25`	`26`	`public`
`26`	`27`	`payable`
`27`	`28`	`virtual`
`28`	`29`	`needVote(`
`29`	`30`	`keccak256("upgradeAndCall"),`
`30`		`- keccak256(abi.encode(proxy, implementation, data))`
	`31`	`+ keccak256(abi.encode(proxy, newImplementation, data))`
`31`	`32`	`)`
`32`	`33`	`{`
`33`		`- proxy.upgradeToAndCall{value: msg.value}(implementation, data);`
	`34`	`+ proxy.upgradeToAndCall{value: msg.value}(newImplementation, data);`
`34`	`35`	`}`
`35`	`36`	`}`