From 0cf4586342a64d4a4bd8e318e786dec2b247219a Mon Sep 17 00:00:00 2001 From: Miguel Rojo Date: Thu, 18 Aug 2022 11:02:08 +0100 Subject: [PATCH] smart contracts adapted, changed bytecodes Signed-off-by: Miguel Rojo --- .../besu/ethereum/privacy/group/FlexibleGroupManagement.java | 4 ++-- .../DefaultFlexiblePrivacyGroupManagementContract.sol | 4 ++-- .../src/main/solidity/FlexiblePrivacyGroupManagementProxy.sol | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/group/FlexibleGroupManagement.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/group/FlexibleGroupManagement.java index 0aaf53eb911..b85342d8993 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/group/FlexibleGroupManagement.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/privacy/group/FlexibleGroupManagement.java @@ -19,11 +19,11 @@ public class FlexibleGroupManagement { public static final Bytes PROXY_RUNTIME_BYTECODE = Bytes.fromHexString( - "608060405234801561001057600080fd5b506004361061009e5760003560e01c806378b903371161006657806378b9033714610149578063965a25ef146101675780639738968c14610197578063a69df4b5146101b5578063f83d08ba146101bf5761009e565b80630d8e6e2c146100a35780631f52a8ee146100c15780633659cfe6146100f15780635aa68ac01461010d5780635c60da1b1461012b575b600080fd5b6100ab6101c9565b6040516100b891906110ba565b60405180910390f35b6100db60048036038101906100d69190610dc7565b610273565b6040516100e8919061109f565b60405180910390f35b61010b60048036038101906101069190610cca565b610370565b005b6101156106c2565b604051610122919061107d565b60405180910390f35b610133610773565b6040516101409190611062565b60405180910390f35b610151610797565b60405161015e919061109f565b60405180910390f35b610181600480360381019061017c9190610cf3565b610841565b60405161018e919061109f565b60405180910390f35b61019f6108fa565b6040516101ac919061109f565b60405180910390f35b6101bd6109a6565b005b6101c7610a2f565b005b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16630d8e6e2c6040518163ffffffff1660e01b815260040160206040518083038186803b15801561023557600080fd5b505afa158015610249573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061026d9190610d9e565b91505090565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905060008173ffffffffffffffffffffffffffffffffffffffff16631f52a8ee856040518263ffffffff1660e01b81526004016102d491906110d5565b602060405180830381600087803b1580156102ee57600080fd5b505af1158015610302573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103269190610d75565b90508015610366577f52213552a930e6de0c0d7df74ece31dac1306b2c7e200ceded7a4442853189b58460405161035d91906110d5565b60405180910390a15b8092505050919050565b3073ffffffffffffffffffffffffffffffffffffffff166378b903376040518163ffffffff1660e01b815260040160206040518083038186803b1580156103b657600080fd5b505afa1580156103ca573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103ee9190610d75565b61042d576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610424906110f7565b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614156104bc576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016104b390611117565b60405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff16639738968c6040518163ffffffff1660e01b8152600401602060405180830381600087803b15801561050457600080fd5b505af1158015610518573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061053c9190610d75565b61057b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161057290611137565b60405180910390fd5b60603073ffffffffffffffffffffffffffffffffffffffff16635aa68ac06040518163ffffffff1660e01b815260040160006040518083038186803b1580156105c357600080fd5b505afa1580156105d7573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052508101906106009190610d34565b905061060b82610ab8565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663965a25ef836040518263ffffffff1660e01b815260040161066a919061107d565b602060405180830381600087803b15801561068457600080fd5b505af1158015610698573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106bc9190610d75565b50505050565b606060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16635aa68ac06040518163ffffffff1660e01b815260040160006040518083038186803b15801561073057600080fd5b505afa158015610744573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f8201168201806040525081019061076d9190610d34565b91505090565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff166378b903376040518163ffffffff1660e01b815260040160206040518083038186803b15801561080357600080fd5b505afa158015610817573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061083b9190610d75565b91505090565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663965a25ef846040518263ffffffff1660e01b81526004016108a0919061107d565b602060405180830381600087803b1580156108ba57600080fd5b505af11580156108ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108f29190610d75565b915050919050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16639738968c6040518163ffffffff1660e01b8152600401602060405180830381600087803b15801561096857600080fd5b505af115801561097c573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109a09190610d75565b91505090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663a69df4b56040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610a1457600080fd5b505af1158015610a28573d6000803e3d6000fd5b5050505050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663f83d08ba6040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610a9d57600080fd5b505af1158015610ab1573d6000803e3d6000fd5b5050505050565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600081359050610b0a816112ea565b92915050565b600082601f830112610b2157600080fd5b8135610b34610b2f82611184565b611157565b9150818183526020840193506020810190508360005b83811015610b7a5781358601610b608882610c22565b845260208401935060208301925050600181019050610b4a565b5050505092915050565b600082601f830112610b9557600080fd5b8151610ba8610ba382611184565b611157565b9150818183526020840193506020810190508360005b83811015610bee5781518601610bd48882610c76565b845260208401935060208301925050600181019050610bbe565b5050505092915050565b600081519050610c0781611301565b92915050565b600081519050610c1c81611318565b92915050565b600082601f830112610c3357600080fd5b8135610c46610c41826111ac565b611157565b91508082526020830160208301858383011115610c6257600080fd5b610c6d838284611297565b50505092915050565b600082601f830112610c8757600080fd5b8151610c9a610c95826111ac565b611157565b91508082526020830160208301858383011115610cb657600080fd5b610cc18382846112a6565b50505092915050565b600060208284031215610cdc57600080fd5b6000610cea84828501610afb565b91505092915050565b600060208284031215610d0557600080fd5b600082013567ffffffffffffffff811115610d1f57600080fd5b610d2b84828501610b10565b91505092915050565b600060208284031215610d4657600080fd5b600082015167ffffffffffffffff811115610d6057600080fd5b610d6c84828501610b84565b91505092915050565b600060208284031215610d8757600080fd5b6000610d9584828501610bf8565b91505092915050565b600060208284031215610db057600080fd5b6000610dbe84828501610c0d565b91505092915050565b600060208284031215610dd957600080fd5b600082013567ffffffffffffffff811115610df357600080fd5b610dff84828501610c22565b91505092915050565b6000610e148383610ebe565b905092915050565b610e258161124f565b82525050565b6000610e36826111e8565b610e40818561120b565b935083602082028501610e52856111d8565b8060005b85811015610e8e5784840389528151610e6f8582610e08565b9450610e7a836111fe565b925060208a01995050600181019050610e56565b50829750879550505050505092915050565b610ea981611261565b82525050565b610eb88161126d565b82525050565b6000610ec9826111f3565b610ed3818561121c565b9350610ee38185602086016112a6565b610eec816112d9565b840191505092915050565b6000610f02826111f3565b610f0c818561122d565b9350610f1c8185602086016112a6565b610f25816112d9565b840191505092915050565b6000610f3d60178361123e565b91507f54686520636f6e7472616374206973206c6f636b65642e0000000000000000006000830152602082019050919050565b6000610f7d60548361123e565b91507f54686520636f6e747261637420746f207570677261646520746f20686173207460008301527f6f20626520646966666572656e742066726f6d207468652063757272656e742060208301527f6d616e6167656d656e7420636f6e74726163742e0000000000000000000000006040830152606082019050919050565b6000611009602f8361123e565b91507f4e6f7420616c6c6f77656420746f207570677261646520746865206d616e616760008301527f656d656e7420636f6e74726163742e00000000000000000000000000000000006020830152604082019050919050565b60006020820190506110776000830184610e1c565b92915050565b600060208201905081810360008301526110978184610e2b565b905092915050565b60006020820190506110b46000830184610ea0565b92915050565b60006020820190506110cf6000830184610eaf565b92915050565b600060208201905081810360008301526110ef8184610ef7565b905092915050565b6000602082019050818103600083015261111081610f30565b9050919050565b6000602082019050818103600083015261113081610f70565b9050919050565b6000602082019050818103600083015261115081610ffc565b9050919050565b6000604051905081810181811067ffffffffffffffff8211171561117a57600080fd5b8060405250919050565b600067ffffffffffffffff82111561119b57600080fd5b602082029050602081019050919050565b600067ffffffffffffffff8211156111c357600080fd5b601f19601f8301169050602081019050919050565b6000819050602082019050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600061125a82611277565b9050919050565b60008115159050919050565b6000819050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b82818337600083830152505050565b60005b838110156112c45780820151818401526020810190506112a9565b838111156112d3576000848401525b50505050565b6000601f19601f8301169050919050565b6112f38161124f565b81146112fe57600080fd5b50565b61130a81611261565b811461131557600080fd5b50565b6113218161126d565b811461132c57600080fd5b5056fea264697066735822122021517dc0b2b3ea628605bffa85158c3d5e508d7624fbff5a8605deb0f6128d5464736f6c634300060c0033"); + "608060405234801561001057600080fd5b506004361061009e5760003560e01c806378b903371161006657806378b9033714610149578063965a25ef146101675780639738968c14610197578063a69df4b5146101b5578063f83d08ba146101bf5761009e565b80630d8e6e2c146100a35780631f52a8ee146100c15780633659cfe6146100f15780635aa68ac01461010d5780635c60da1b1461012b575b600080fd5b6100ab6101c9565b6040516100b89190610a7d565b60405180910390f35b6100db60048036038101906100d69190610bf2565b610264565b6040516100e89190610c56565b60405180910390f35b61010b60048036038101906101069190610ccf565b610352565b005b610115610667565b6040516101229190610e3d565b60405180910390f35b610133610709565b6040516101409190610e6e565b60405180910390f35b61015161072d565b60405161015e9190610c56565b60405180910390f35b610181600480360381019061017c9190610f6f565b6107c8565b60405161018e9190610c56565b60405180910390f35b61019f610872565b6040516101ac9190610c56565b60405180910390f35b6101bd61090f565b005b6101c7610998565b005b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16630d8e6e2c6040518163ffffffff1660e01b8152600401602060405180830381865afa15801561023a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061025e9190610fe4565b91505090565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905060008173ffffffffffffffffffffffffffffffffffffffff16631f52a8ee856040518263ffffffff1660e01b81526004016102c5919061105b565b6020604051808303816000875af11580156102e4573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061030891906110a9565b90508015610348577f52213552a930e6de0c0d7df74ece31dac1306b2c7e200ceded7a4442853189b58460405161033f919061105b565b60405180910390a15b8092505050919050565b3073ffffffffffffffffffffffffffffffffffffffff166378b903376040518163ffffffff1660e01b8152600401602060405180830381865afa15801561039d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c191906110a9565b610400576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103f790611133565b60405180910390fd5b8073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff160361048e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610485906111eb565b60405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff16639738968c6040518163ffffffff1660e01b81526004016020604051808303816000875af11580156104db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104ff91906110a9565b61053e576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016105359061127d565b60405180910390fd5b60003073ffffffffffffffffffffffffffffffffffffffff16635aa68ac06040518163ffffffff1660e01b8152600401600060405180830381865afa15801561058b573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f820116820180604052508101906105b491906113c2565b90506105bf82610a21565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663965a25ef836040518263ffffffff1660e01b815260040161061e9190610e3d565b6020604051808303816000875af115801561063d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061066191906110a9565b50505050565b606060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16635aa68ac06040518163ffffffff1660e01b8152600401600060405180830381865afa1580156106da573d6000803e3d6000fd5b505050506040513d6000823e3d601f19601f8201168201806040525081019061070391906113c2565b91505090565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff166378b903376040518163ffffffff1660e01b8152600401602060405180830381865afa15801561079e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107c291906110a9565b91505090565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663965a25ef846040518263ffffffff1660e01b81526004016108279190610e3d565b6020604051808303816000875af1158015610846573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061086a91906110a9565b915050919050565b60008060008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff16639738968c6040518163ffffffff1660e01b81526004016020604051808303816000875af11580156108e5573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061090991906110a9565b91505090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663a69df4b56040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561097d57600080fd5b505af1158015610991573d6000803e3d6000fd5b5050505050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508073ffffffffffffffffffffffffffffffffffffffff1663f83d08ba6040518163ffffffff1660e01b8152600401600060405180830381600087803b158015610a0657600080fd5b505af1158015610a1a573d6000803e3d6000fd5b5050505050565b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b6000819050919050565b610a7781610a64565b82525050565b6000602082019050610a926000830184610a6e565b92915050565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610aff82610ab6565b810181811067ffffffffffffffff82111715610b1e57610b1d610ac7565b5b80604052505050565b6000610b31610a98565b9050610b3d8282610af6565b919050565b600067ffffffffffffffff821115610b5d57610b5c610ac7565b5b610b6682610ab6565b9050602081019050919050565b82818337600083830152505050565b6000610b95610b9084610b42565b610b27565b905082815260208101848484011115610bb157610bb0610ab1565b5b610bbc848285610b73565b509392505050565b600082601f830112610bd957610bd8610aac565b5b8135610be9848260208601610b82565b91505092915050565b600060208284031215610c0857610c07610aa2565b5b600082013567ffffffffffffffff811115610c2657610c25610aa7565b5b610c3284828501610bc4565b91505092915050565b60008115159050919050565b610c5081610c3b565b82525050565b6000602082019050610c6b6000830184610c47565b92915050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000610c9c82610c71565b9050919050565b610cac81610c91565b8114610cb757600080fd5b50565b600081359050610cc981610ca3565b92915050565b600060208284031215610ce557610ce4610aa2565b5b6000610cf384828501610cba565b91505092915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610d62578082015181840152602081019050610d47565b60008484015250505050565b6000610d7982610d28565b610d838185610d33565b9350610d93818560208601610d44565b610d9c81610ab6565b840191505092915050565b6000610db38383610d6e565b905092915050565b6000602082019050919050565b6000610dd382610cfc565b610ddd8185610d07565b935083602082028501610def85610d18565b8060005b85811015610e2b5784840389528151610e0c8582610da7565b9450610e1783610dbb565b925060208a01995050600181019050610df3565b50829750879550505050505092915050565b60006020820190508181036000830152610e578184610dc8565b905092915050565b610e6881610c91565b82525050565b6000602082019050610e836000830184610e5f565b92915050565b600067ffffffffffffffff821115610ea457610ea3610ac7565b5b602082029050602081019050919050565b600080fd5b6000610ecd610ec884610e89565b610b27565b90508083825260208201905060208402830185811115610ef057610eef610eb5565b5b835b81811015610f3757803567ffffffffffffffff811115610f1557610f14610aac565b5b808601610f228982610bc4565b85526020850194505050602081019050610ef2565b5050509392505050565b600082601f830112610f5657610f55610aac565b5b8135610f66848260208601610eba565b91505092915050565b600060208284031215610f8557610f84610aa2565b5b600082013567ffffffffffffffff811115610fa357610fa2610aa7565b5b610faf84828501610f41565b91505092915050565b610fc181610a64565b8114610fcc57600080fd5b50565b600081519050610fde81610fb8565b92915050565b600060208284031215610ffa57610ff9610aa2565b5b600061100884828501610fcf565b91505092915050565b600082825260208201905092915050565b600061102d82610d28565b6110378185611011565b9350611047818560208601610d44565b61105081610ab6565b840191505092915050565b600060208201905081810360008301526110758184611022565b905092915050565b61108681610c3b565b811461109157600080fd5b50565b6000815190506110a38161107d565b92915050565b6000602082840312156110bf576110be610aa2565b5b60006110cd84828501611094565b91505092915050565b600082825260208201905092915050565b7f54686520636f6e7472616374206973206c6f636b65642e000000000000000000600082015250565b600061111d6017836110d6565b9150611128826110e7565b602082019050919050565b6000602082019050818103600083015261114c81611110565b9050919050565b7f54686520636f6e747261637420746f207570677261646520746f20686173207460008201527f6f20626520646966666572656e742066726f6d207468652063757272656e742060208201527f6d616e6167656d656e7420636f6e74726163742e000000000000000000000000604082015250565b60006111d56054836110d6565b91506111e082611153565b606082019050919050565b60006020820190508181036000830152611204816111c8565b9050919050565b7f4e6f7420616c6c6f77656420746f207570677261646520746865206d616e616760008201527f656d656e7420636f6e74726163742e0000000000000000000000000000000000602082015250565b6000611267602f836110d6565b91506112728261120b565b604082019050919050565b600060208201905081810360008301526112968161125a565b9050919050565b60006112b06112ab84610b42565b610b27565b9050828152602081018484840111156112cc576112cb610ab1565b5b6112d7848285610d44565b509392505050565b600082601f8301126112f4576112f3610aac565b5b815161130484826020860161129d565b91505092915050565b600061132061131b84610e89565b610b27565b9050808382526020820190506020840283018581111561134357611342610eb5565b5b835b8181101561138a57805167ffffffffffffffff81111561136857611367610aac565b5b80860161137589826112df565b85526020850194505050602081019050611345565b5050509392505050565b600082601f8301126113a9576113a8610aac565b5b81516113b984826020860161130d565b91505092915050565b6000602082840312156113d8576113d7610aa2565b5b600082015167ffffffffffffffff8111156113f6576113f5610aa7565b5b61140284828501611394565b9150509291505056fea26469706673582212209116ce0b5c2421dd9b9fb93c3ae02b36f96802495d5e8fc8e0ac07b9c2a45b8064736f6c63430008100033"); public static final Bytes DEFAULT_GROUP_MANAGEMENT_RUNTIME_BYTECODE = Bytes.fromHexString( - "608060405234801561001057600080fd5b50600436106100885760003560e01c8063965a25ef1161005b578063965a25ef146101175780639738968c14610147578063a69df4b514610165578063f83d08ba1461016f57610088565b80630d8e6e2c1461008d5780631f52a8ee146100ab5780635aa68ac0146100db57806378b90337146100f9575b600080fd5b610095610179565b6040516100a2919061111b565b60405180910390f35b6100c560048036038101906100c09190610cd5565b610183565b6040516100d29190611078565b60405180910390f35b6100e361024a565b6040516100f09190611056565b60405180910390f35b610101610333565b60405161010e9190611078565b60405180910390f35b610131600480360381019061012c9190610c94565b610349565b60405161013e9190611078565b60405180910390f35b61014f6104c2565b60405161015c9190611078565b60405180910390f35b61016d610519565b005b6101776105de565b005b6000600154905090565b60008060149054906101000a900460ff1661019d57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff161461022b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161022290611174565b60405180910390fd5b6000610236836106a1565b905061024061085d565b5080915050919050565b60606002805480602002602001604051908101604052809291908181526020016000905b8282101561032a578382906000526020600020018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156103165780601f106102eb57610100808354040283529160200191610316565b820191906000526020600020905b8154815290600101906020018083116102f957829003601f168201915b50505050508152602001906001019061026e565b50505050905090565b60008060149054906101000a900460ff16905090565b60008060149054906101000a900460ff161561036457600080fd5b600073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614156103fa57326000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614610488576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161047f90611174565b60405180910390fd5b600061049383610898565b90506001600060146101000a81548160ff0219169083151502179055506104b861085d565b5080915050919050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614905090565b600060149054906101000a900460ff161561053357600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff16146105c1576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016105b890611174565b60405180910390fd5b6001600060146101000a81548160ff021916908315150217905550565b600060149054906101000a900460ff166105f757600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614610685576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161067c90611174565b60405180910390fd5b60008060146101000a81548160ff021916908315150217905550565b6000806003836040516106b4919061103f565b90815260200160405180910390205490506000811180156106da57506002805490508111155b156108525760028054905081146107fb57606060026001600280549050038154811061070257fe5b906000526020600020018054600181600116156101000203166002900480601f0160208091040260200160405190810160405280929190818152602001828054600181600116156101000203166002900480156107a05780601f10610775576101008083540402835291602001916107a0565b820191906000526020600020905b81548152906001019060200180831161078357829003601f168201915b5050505050905080600260018403815481106107b857fe5b9060005260206000200190805190602001906107d5929190610ae7565b50816003826040516107e7919061103f565b908152602001604051809103902081905550505b600280548061080657fe5b6001900381819060005260206000200160006108229190610b67565b90556000600384604051610836919061103f565b9081526020016040518091039020819055506001915050610858565b60009150505b919050565b6000600143034041600260405160200161087993929190611136565b6040516020818303038152906040528051906020012060018190555090565b6000806001905060005b8351811015610a13576108c78482815181106108ba57fe5b6020026020010151610a1d565b1561092b577f1673b13ca99fc5f5d54f8ebc163339b3c03f5f661cec3f5dfe506fdbd2602de660008583815181106108fb57fe5b60200260200101516040516109119291906110d8565b60405180910390a1818015610924575060005b9150610a06565b600061094985838151811061093c57fe5b6020026020010151610a48565b905060608161098d576040518060400160405280601b81526020017f4163636f756e7420697320616c72656164792061204d656d62657200000000008152506109a7565b604051806060016040528060218152602001611380602191395b90507f1673b13ca99fc5f5d54f8ebc163339b3c03f5f661cec3f5dfe506fdbd2602de6828785815181106109d757fe5b6020026020010151836040516109ef93929190611093565b60405180910390a1838015610a015750815b935050505b80806001019150506108a2565b5080915050919050565b600080600383604051610a30919061103f565b90815260200160405180910390205414159050919050565b600080600383604051610a5b919061103f565b9081526020016040518091039020541415610add57600282908060018154018082558091505060019003906000526020600020016000909190919091509080519060200190610aab929190610ae7565b50600280549050600383604051610ac2919061103f565b90815260200160405180910390208190555060019050610ae2565b600090505b919050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f10610b2857805160ff1916838001178555610b56565b82800160010185558215610b56579182015b82811115610b55578251825591602001919060010190610b3a565b5b509050610b639190610baf565b5090565b50805460018160011615610100020316600290046000825580601f10610b8d5750610bac565b601f016020900490600052602060002090810190610bab9190610baf565b5b50565b5b80821115610bc8576000816000905550600101610bb0565b5090565b600082601f830112610bdd57600080fd5b8135610bf0610beb826111c1565b611194565b9150818183526020840193506020810190508360005b83811015610c365781358601610c1c8882610c40565b845260208401935060208301925050600181019050610c06565b5050505092915050565b600082601f830112610c5157600080fd5b8135610c64610c5f826111e9565b611194565b91508082526020830160208301858383011115610c8057600080fd5b610c8b83828461132c565b50505092915050565b600060208284031215610ca657600080fd5b600082013567ffffffffffffffff811115610cc057600080fd5b610ccc84828501610bcc565b91505092915050565b600060208284031215610ce757600080fd5b600082013567ffffffffffffffff811115610d0157600080fd5b610d0d84828501610c40565b91505092915050565b6000610d228383610e54565b905092915050565b6000610d368383610ef7565b905092915050565b610d47816112e4565b82525050565b6000610d588261124f565b610d628185611295565b935083602082028501610d7485611215565b8060005b85811015610db05784840389528151610d918582610d16565b9450610d9c8361127b565b925060208a01995050600181019050610d78565b50829750879550505050505092915050565b6000610dcd8261125a565b610dd78185611295565b935083602082028501610de985611225565b8060005b85811015610e2457848403895281610e058582610d2a565b9450610e1083611288565b925060208a01995050600181019050610ded565b50829750879550505050505092915050565b610e3f816112f6565b82525050565b610e4e81611302565b82525050565b6000610e5f82611265565b610e6981856112a6565b9350610e7981856020860161133b565b610e828161136e565b840191505092915050565b6000610e9882611265565b610ea281856112b7565b9350610eb281856020860161133b565b610ebb8161136e565b840191505092915050565b6000610ed182611265565b610edb81856112c8565b9350610eeb81856020860161133b565b80840191505092915050565b600081546001811660008114610f145760018114610f3a57610f7e565b607f6002830416610f2581876112a6565b955060ff198316865260208601935050610f7e565b60028204610f4881876112a6565b9550610f538561123a565b60005b82811015610f7557815481890152600182019150602081019050610f56565b80880195505050505b505092915050565b6000610f9182611270565b610f9b81856112d3565b9350610fab81856020860161133b565b610fb48161136e565b840191505092915050565b6000610fcc6015836112d3565b91507f4f726967696e206e6f7420746865206f776e65722e00000000000000000000006000830152602082019050919050565b600061100c601b836112d3565b91507f4163636f756e7420697320616c72656164792061204d656d62657200000000006000830152602082019050919050565b600061104b8284610ec6565b915081905092915050565b600060208201905081810360008301526110708184610d4d565b905092915050565b600060208201905061108d6000830184610e36565b92915050565b60006060820190506110a86000830186610e36565b81810360208301526110ba8185610e8d565b905081810360408301526110ce8184610f86565b9050949350505050565b60006060820190506110ed6000830185610e36565b81810360208301526110ff8184610e8d565b9050818103604083015261111281610fff565b90509392505050565b60006020820190506111306000830184610e45565b92915050565b600060608201905061114b6000830186610e45565b6111586020830185610d3e565b818103604083015261116a8184610dc2565b9050949350505050565b6000602082019050818103600083015261118d81610fbf565b9050919050565b6000604051905081810181811067ffffffffffffffff821117156111b757600080fd5b8060405250919050565b600067ffffffffffffffff8211156111d857600080fd5b602082029050602081019050919050565b600067ffffffffffffffff82111561120057600080fd5b601f19601f8301169050602081019050919050565b6000819050602082019050919050565b60008190508160005260206000209050919050565b60008190508160005260206000209050919050565b600081519050919050565b600081549050919050565b600081519050919050565b600081519050919050565b6000602082019050919050565b6000600182019050919050565b600082825260208201905092915050565b600082825260208201905092915050565b600082825260208201905092915050565b600081905092915050565b600082825260208201905092915050565b60006112ef8261130c565b9050919050565b60008115159050919050565b6000819050919050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b82818337600083830152505050565b60005b8381101561135957808201518184015260208101905061133e565b83811115611368576000848401525b50505050565b6000601f19601f830116905091905056fe4d656d626572206163636f756e74206164646564207375636365737366756c6c79a2646970667358221220f664872393b10623fe76da94e609f2b7a37344a59340b5a5457c2ffb63ed247864736f6c634300060c0033"); + "608060405234801561001057600080fd5b50600436106100885760003560e01c8063965a25ef1161005b578063965a25ef146101175780639738968c14610147578063a69df4b514610165578063f83d08ba1461016f57610088565b80630d8e6e2c1461008d5780631f52a8ee146100ab5780635aa68ac0146100db57806378b90337146100f9575b600080fd5b610095610179565b6040516100a29190610b7a565b60405180910390f35b6100c560048036038101906100c09190610cef565b610183565b6040516100d29190610d53565b60405180910390f35b6100e3610249565b6040516100f09190610eaf565b60405180910390f35b610101610322565b60405161010e9190610d53565b60405180910390f35b610131600480360381019061012c9190610fb7565b610338565b60405161013e9190610d53565b60405180910390f35b61014f6104af565b60405161015c9190610d53565b60405180910390f35b61016d610506565b005b6101776105cb565b005b6000600154905090565b60008060149054906101000a900460ff1661019d57600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff161461022b576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016102229061105d565b60405180910390fd5b60006102368361068e565b905061024061085a565b80915050919050565b60606002805480602002602001604051908101604052809291908181526020016000905b8282101561031957838290600052602060002001805461028c906110ac565b80601f01602080910402602001604051908101604052809291908181526020018280546102b8906110ac565b80156103055780601f106102da57610100808354040283529160200191610305565b820191906000526020600020905b8154815290600101906020018083116102e857829003601f168201915b50505050508152602001906001019061026d565b50505050905090565b60008060149054906101000a900460ff16905090565b60008060149054906101000a900460ff161561035357600080fd5b600073ffffffffffffffffffffffffffffffffffffffff1660008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16036103e857326000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614610476576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161046d9061105d565b60405180910390fd5b60006104818361089b565b90506001600060146101000a81548160ff0219169083151502179055506104a661085a565b80915050919050565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614905090565b600060149054906101000a900460ff161561052057600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff16146105ae576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016105a59061105d565b60405180910390fd5b6001600060146101000a81548160ff021916908315150217905550565b600060149054906101000a900460ff166105e457600080fd5b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163273ffffffffffffffffffffffffffffffffffffffff1614610672576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106699061105d565b60405180910390fd5b60008060146101000a81548160ff021916908315150217905550565b6000806003836040516106a19190611119565b90815260200160405180910390205490506000811180156106c757506002805490508111155b1561084f5760028054905081146107f1576000600260016002805490506106ee9190611169565b815481106106ff576106fe61119d565b5b906000526020600020018054610714906110ac565b80601f0160208091040260200160405190810160405280929190818152602001828054610740906110ac565b801561078d5780601f106107625761010080835404028352916020019161078d565b820191906000526020600020905b81548152906001019060200180831161077057829003601f168201915b505050505090508060026001846107a49190611169565b815481106107b5576107b461119d565b5b9060005260206000200190816107cb9190611378565b50816003826040516107dd9190611119565b908152602001604051809103902081905550505b60028054806108035761080261144a565b5b60019003818190600052602060002001600061081f9190610b04565b905560006003846040516108339190611119565b9081526020016040518091039020819055506001915050610855565b60009150505b919050565b6001436108679190611169565b4041600260405160200161087d939291906115f3565b60405160208183030381529060405280519060200120600181905550565b6000806001905060005b8351811015610a38576108d18482815181106108c4576108c361119d565b5b6020026020010151610a42565b1561093c577f1673b13ca99fc5f5d54f8ebc163339b3c03f5f661cec3f5dfe506fdbd2602de6600085838151811061090c5761090b61119d565b5b60200260200101516040516109229291906116c7565b60405180910390a1818015610935575060005b9150610a25565b60006109618583815181106109545761095361119d565b5b6020026020010151610a6d565b90506000816109a5576040518060400160405280601b81526020017f4163636f756e7420697320616c72656164792061204d656d62657200000000008152506109bf565b6040518060600160405280602181526020016117dc602191395b90507f1673b13ca99fc5f5d54f8ebc163339b3c03f5f661cec3f5dfe506fdbd2602de6828785815181106109f6576109f561119d565b5b602002602001015183604051610a0e9392919061174e565b60405180910390a1838015610a205750815b935050505b8080610a3090611793565b9150506108a5565b5080915050919050565b600080600383604051610a559190611119565b90815260200160405180910390205414159050919050565b600080600383604051610a809190611119565b90815260200160405180910390205403610afa57600282908060018154018082558091505060019003906000526020600020016000909190919091509081610ac89190611378565b50600280549050600383604051610adf9190611119565b90815260200160405180910390208190555060019050610aff565b600090505b919050565b508054610b10906110ac565b6000825580601f10610b225750610b41565b601f016020900490600052602060002090810190610b409190610b44565b5b50565b5b80821115610b5d576000816000905550600101610b45565b5090565b6000819050919050565b610b7481610b61565b82525050565b6000602082019050610b8f6000830184610b6b565b92915050565b6000604051905090565b600080fd5b600080fd5b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610bfc82610bb3565b810181811067ffffffffffffffff82111715610c1b57610c1a610bc4565b5b80604052505050565b6000610c2e610b95565b9050610c3a8282610bf3565b919050565b600067ffffffffffffffff821115610c5a57610c59610bc4565b5b610c6382610bb3565b9050602081019050919050565b82818337600083830152505050565b6000610c92610c8d84610c3f565b610c24565b905082815260208101848484011115610cae57610cad610bae565b5b610cb9848285610c70565b509392505050565b600082601f830112610cd657610cd5610ba9565b5b8135610ce6848260208601610c7f565b91505092915050565b600060208284031215610d0557610d04610b9f565b5b600082013567ffffffffffffffff811115610d2357610d22610ba4565b5b610d2f84828501610cc1565b91505092915050565b60008115159050919050565b610d4d81610d38565b82525050565b6000602082019050610d686000830184610d44565b92915050565b600081519050919050565b600082825260208201905092915050565b6000819050602082019050919050565b600081519050919050565b600082825260208201905092915050565b60005b83811015610dd4578082015181840152602081019050610db9565b60008484015250505050565b6000610deb82610d9a565b610df58185610da5565b9350610e05818560208601610db6565b610e0e81610bb3565b840191505092915050565b6000610e258383610de0565b905092915050565b6000602082019050919050565b6000610e4582610d6e565b610e4f8185610d79565b935083602082028501610e6185610d8a565b8060005b85811015610e9d5784840389528151610e7e8582610e19565b9450610e8983610e2d565b925060208a01995050600181019050610e65565b50829750879550505050505092915050565b60006020820190508181036000830152610ec98184610e3a565b905092915050565b600067ffffffffffffffff821115610eec57610eeb610bc4565b5b602082029050602081019050919050565b600080fd5b6000610f15610f1084610ed1565b610c24565b90508083825260208201905060208402830185811115610f3857610f37610efd565b5b835b81811015610f7f57803567ffffffffffffffff811115610f5d57610f5c610ba9565b5b808601610f6a8982610cc1565b85526020850194505050602081019050610f3a565b5050509392505050565b600082601f830112610f9e57610f9d610ba9565b5b8135610fae848260208601610f02565b91505092915050565b600060208284031215610fcd57610fcc610b9f565b5b600082013567ffffffffffffffff811115610feb57610fea610ba4565b5b610ff784828501610f89565b91505092915050565b600082825260208201905092915050565b7f4f726967696e206e6f7420746865206f776e65722e0000000000000000000000600082015250565b6000611047601583611000565b915061105282611011565b602082019050919050565b600060208201905081810360008301526110768161103a565b9050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b600060028204905060018216806110c457607f821691505b6020821081036110d7576110d661107d565b5b50919050565b600081905092915050565b60006110f382610d9a565b6110fd81856110dd565b935061110d818560208601610db6565b80840191505092915050565b600061112582846110e8565b915081905092915050565b6000819050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b600061117482611130565b915061117f83611130565b92508282039050818111156111975761119661113a565b5b92915050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b60008190508160005260206000209050919050565b60006020601f8301049050919050565b600082821b905092915050565b60006008830261122e7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff826111f1565b61123886836111f1565b95508019841693508086168417925050509392505050565b6000819050919050565b600061127561127061126b84611130565b611250565b611130565b9050919050565b6000819050919050565b61128f8361125a565b6112a361129b8261127c565b8484546111fe565b825550505050565b600090565b6112b86112ab565b6112c3818484611286565b505050565b5b818110156112e7576112dc6000826112b0565b6001810190506112c9565b5050565b601f82111561132c576112fd816111cc565b611306846111e1565b81016020851015611315578190505b611329611321856111e1565b8301826112c8565b50505b505050565b600082821c905092915050565b600061134f60001984600802611331565b1980831691505092915050565b6000611368838361133e565b9150826002028217905092915050565b61138182610d9a565b67ffffffffffffffff81111561139a57611399610bc4565b5b6113a482546110ac565b6113af8282856112eb565b600060209050601f8311600181146113e257600084156113d0578287015190505b6113da858261135c565b865550611442565b601f1984166113f0866111cc565b60005b82811015611418578489015182556001820191506020850194506020810190506113f3565b868310156114355784890151611431601f89168261133e565b8355505b6001600288020188555050505b505050505050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603160045260246000fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006114a482611479565b9050919050565b6114b481611499565b82525050565b600081549050919050565b60008190508160005260206000209050919050565b600081546114e7816110ac565b6114f18186610da5565b9450600182166000811461150c576001811461152257611555565b60ff198316865281151560200286019350611555565b61152b856111cc565b60005b8381101561154d5781548189015260018201915060208101905061152e565b808801955050505b50505092915050565b600061156a83836114da565b905092915050565b6000600182019050919050565b600061158a826114ba565b6115948185610d79565b9350836020820285016115a6856114c5565b8060005b858110156115e1578484038952816115c2858261155e565b94506115cd83611572565b925060208a019950506001810190506115aa565b50829750879550505050505092915050565b60006060820190506116086000830186610b6b565b61161560208301856114ab565b8181036040830152611627818461157f565b9050949350505050565b600082825260208201905092915050565b600061164d82610d9a565b6116578185611631565b9350611667818560208601610db6565b61167081610bb3565b840191505092915050565b7f4163636f756e7420697320616c72656164792061204d656d6265720000000000600082015250565b60006116b1601b83611000565b91506116bc8261167b565b602082019050919050565b60006060820190506116dc6000830185610d44565b81810360208301526116ee8184611642565b90508181036040830152611701816116a4565b90509392505050565b600081519050919050565b60006117208261170a565b61172a8185611000565b935061173a818560208601610db6565b61174381610bb3565b840191505092915050565b60006060820190506117636000830186610d44565b81810360208301526117758185611642565b905081810360408301526117898184611715565b9050949350505050565b600061179e82611130565b91507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff82036117d0576117cf61113a565b5b60018201905091905056fe4d656d626572206163636f756e74206164646564207375636365737366756c6c79a264697066735822122092d439e782f3774157082bc5793b09cee922528f5b48db5d9cfcf02b806c7aa964736f6c63430008100033"); public static final Bytes ADD_PARTICIPANTS_METHOD_SIGNATURE = Bytes.fromHexString("0x965a25ef"); public static final Bytes CAN_EXECUTE_METHOD_SIGNATURE = Bytes.fromHexString("0x78b90337"); diff --git a/privacy-contracts/src/main/solidity/DefaultFlexiblePrivacyGroupManagementContract.sol b/privacy-contracts/src/main/solidity/DefaultFlexiblePrivacyGroupManagementContract.sol index 9353a5ca5fd..35c0fa40c96 100644 --- a/privacy-contracts/src/main/solidity/DefaultFlexiblePrivacyGroupManagementContract.sol +++ b/privacy-contracts/src/main/solidity/DefaultFlexiblePrivacyGroupManagementContract.sol @@ -69,7 +69,7 @@ contract DefaultFlexiblePrivacyGroupManagementContract is FlexiblePrivacyGroupMa return distributionList; } - function canUpgrade() external override returns (bool) { + function canUpgrade() external view override returns (bool) { return tx.origin == _owner; } @@ -120,7 +120,7 @@ contract DefaultFlexiblePrivacyGroupManagementContract is FlexiblePrivacyGroupMa return false; } - function updateVersion() internal returns (int) { + function updateVersion() internal { _version = keccak256(abi.encode(blockhash(block.number-1), block.coinbase, distributionList)); } diff --git a/privacy-contracts/src/main/solidity/FlexiblePrivacyGroupManagementProxy.sol b/privacy-contracts/src/main/solidity/FlexiblePrivacyGroupManagementProxy.sol index 1f0f33e9c0f..0ff047679f6 100644 --- a/privacy-contracts/src/main/solidity/FlexiblePrivacyGroupManagementProxy.sol +++ b/privacy-contracts/src/main/solidity/FlexiblePrivacyGroupManagementProxy.sol @@ -20,7 +20,7 @@ contract FlexiblePrivacyGroupManagementProxy is FlexiblePrivacyGroupManagementIn address public implementation; - constructor(address _implementation) public { + constructor(address _implementation) { implementation = _implementation; }