diff --git a/custodial_registration_proxy/data/CustodialRegistrationProxy.bin b/custodial_registration_proxy/data/CustodialRegistrationProxy.bin index 89c0235..2a1df6e 100644 --- a/custodial_registration_proxy/data/CustodialRegistrationProxy.bin +++ b/custodial_registration_proxy/data/CustodialRegistrationProxy.bin @@ -1 +1 @@ -608060405234801561001057600080fd5b50604051610bc6380380610bc6833981810160405281019061003291906101e2565b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555083600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555081600460006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050505050610249565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b60006101af82610184565b9050919050565b6101bf816101a4565b81146101ca57600080fd5b50565b6000815190506101dc816101b6565b92915050565b600080600080608085870312156101fc576101fb61017f565b5b600061020a878288016101cd565b945050602061021b878288016101cd565b935050604061022c878288016101cd565b925050606061023d878288016101cd565b91505092959194509250565b61096e806102586000396000f3fe608060405234801561001057600080fd5b50600436106100925760003560e01c80638da5cb5b116100665780638da5cb5b1461010d578063b2f5ae4b1461012b578063becf2e3614610149578063e2af398014610165578063f5a1f5b41461018357610092565b80628c03371461009757806317603379146100b557806329db660b146100d35780634420e486146100f1575b600080fd5b61009f61019f565b6040516100ac91906106f0565b60405180910390f35b6100bd6101c5565b6040516100ca919061072c565b60405180910390f35b6100db6101eb565b6040516100e89190610768565b60405180910390f35b61010b600480360381019061010691906107c6565b610211565b005b6101156104e9565b6040516101229190610802565b60405180910390f35b61013361050d565b6040516101409190610836565b60405180910390f35b610163600480360381019061015e91906107c6565b610514565b005b61016d6105b0565b60405161017a9190610802565b60405180910390f35b61019d600480360381019061019891906107c6565b6105d6565b005b600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614806102b85750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b6102c157600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16630a3b0a4f826040518263ffffffff1660e01b815260040161031c9190610802565b6020604051808303816000875af115801561033b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061035f9190610889565b50600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166363e4bff4826040518263ffffffff1660e01b81526004016103bb9190610802565b6020604051808303816000875af11580156103da573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103fe91906108e2565b50600460009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663449a52f882624c4b406040518363ffffffff1660e01b815260040161045f92919061090f565b6020604051808303816000875af115801561047e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906104a29190610889565b508073ffffffffffffffffffffffffffffffffffffffff167f894e56e1dac400b4475c83d8af0f0aa44de17c62764bd82f6e768a504e24246160405160405180910390a250565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b624c4b4081565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461056c57600080fd5b80600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461062e57600080fd5b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b60006106b66106b16106ac84610671565b610691565b610671565b9050919050565b60006106c88261069b565b9050919050565b60006106da826106bd565b9050919050565b6106ea816106cf565b82525050565b600060208201905061070560008301846106e1565b92915050565b6000610716826106bd565b9050919050565b6107268161070b565b82525050565b6000602082019050610741600083018461071d565b92915050565b6000610752826106bd565b9050919050565b61076281610747565b82525050565b600060208201905061077d6000830184610759565b92915050565b600080fd5b600061079382610671565b9050919050565b6107a381610788565b81146107ae57600080fd5b50565b6000813590506107c08161079a565b92915050565b6000602082840312156107dc576107db610783565b5b60006107ea848285016107b1565b91505092915050565b6107fc81610788565b82525050565b600060208201905061081760008301846107f3565b92915050565b6000819050919050565b6108308161081d565b82525050565b600060208201905061084b6000830184610827565b92915050565b60008115159050919050565b61086681610851565b811461087157600080fd5b50565b6000815190506108838161085d565b92915050565b60006020828403121561089f5761089e610783565b5b60006108ad84828501610874565b91505092915050565b6108bf8161081d565b81146108ca57600080fd5b50565b6000815190506108dc816108b6565b92915050565b6000602082840312156108f8576108f7610783565b5b6000610906848285016108cd565b91505092915050565b600060408201905061092460008301856107f3565b6109316020830184610827565b939250505056fea26469706673582212208d47e88f7e43dc1b1c83fcc7b51830923b6ddc341b7d56b35fd1755648f3520764736f6c63430008130033 \ No newline at end of file +608060405234801561001057600080fd5b50604051610a14380380610a14833981810160405281019061003291906101a0565b336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555082600260006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555081600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050506101f3565b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b600061016d82610142565b9050919050565b61017d81610162565b811461018857600080fd5b50565b60008151905061019a81610174565b92915050565b6000806000606084860312156101b9576101b861013d565b5b60006101c78682870161018b565b93505060206101d88682870161018b565b92505060406101e98682870161018b565b9150509250925092565b610812806102026000396000f3fe608060405234801561001057600080fd5b506004361061009a576000357c0100000000000000000000000000000000000000000000000000000000900480638da5cb5b116100785780638da5cb5b146100f7578063becf2e3614610115578063e2af398014610131578063f5a1f5b41461014f5761009a565b8063176033791461009f57806329db660b146100bd5780634420e486146100db575b600080fd5b6100a761016b565b6040516100b49190610623565b60405180910390f35b6100c5610191565b6040516100d2919061065f565b60405180910390f35b6100f560048036038101906100f091906106bd565b6101b7565b005b6100ff610423565b60405161010c91906106f9565b60405180910390f35b61012f600480360381019061012a91906106bd565b610447565b005b6101396104e3565b60405161014691906106f9565b60405180910390f35b610169600480360381019061016491906106bd565b610509565b005b600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16148061025e5750600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16145b61026757600080fd5b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16630a3b0a4f826040518263ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004016102de91906106f9565b6020604051808303816000875af11580156102fd573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610321919061074c565b50600260009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166363e4bff4826040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040161039991906106f9565b6020604051808303816000875af11580156103b8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103dc91906107af565b508073ffffffffffffffffffffffffffffffffffffffff167f894e56e1dac400b4475c83d8af0f0aa44de17c62764bd82f6e768a504e24246160405160405180910390a250565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461049f57600080fd5b80600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461056157600080fd5b806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000819050919050565b60006105e96105e46105df846105a4565b6105c4565b6105a4565b9050919050565b60006105fb826105ce565b9050919050565b600061060d826105f0565b9050919050565b61061d81610602565b82525050565b60006020820190506106386000830184610614565b92915050565b6000610649826105f0565b9050919050565b6106598161063e565b82525050565b60006020820190506106746000830184610650565b92915050565b600080fd5b600061068a826105a4565b9050919050565b61069a8161067f565b81146106a557600080fd5b50565b6000813590506106b781610691565b92915050565b6000602082840312156106d3576106d261067a565b5b60006106e1848285016106a8565b91505092915050565b6106f38161067f565b82525050565b600060208201905061070e60008301846106ea565b92915050565b60008115159050919050565b61072981610714565b811461073457600080fd5b50565b60008151905061074681610720565b92915050565b6000602082840312156107625761076161067a565b5b600061077084828501610737565b91505092915050565b6000819050919050565b61078c81610779565b811461079757600080fd5b50565b6000815190506107a981610783565b92915050565b6000602082840312156107c5576107c461067a565b5b60006107d38482850161079a565b9150509291505056fea26469706673582212207d3e62b6120e25698704b8b9ea1557012544f016873909f6eb764a3c52087e5264736f6c63430008140033 \ No newline at end of file diff --git a/custodial_registration_proxy/data/CustodialRegistrationProxy.json b/custodial_registration_proxy/data/CustodialRegistrationProxy.json index 0de0442..91a4479 100644 --- a/custodial_registration_proxy/data/CustodialRegistrationProxy.json +++ b/custodial_registration_proxy/data/CustodialRegistrationProxy.json @@ -11,11 +11,6 @@ "name": "_custodialAccountIndexAddress", "type": "address" }, - { - "internalType": "address", - "name": "_trainingVoucherAddress", - "type": "address" - }, { "internalType": "address", "name": "_systemAccount", @@ -64,19 +59,6 @@ "stateMutability": "view", "type": "function" }, - { - "inputs": [], - "name": "TrainingVoucher", - "outputs": [ - { - "internalType": "contract IDemurrageTokenSingleNocap", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [], "name": "owner", @@ -141,18 +123,5 @@ ], "stateMutability": "view", "type": "function" - }, - { - "inputs": [], - "name": "trainingVoucerGiftAmount", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" } ] \ No newline at end of file diff --git a/custodial_registration_proxy/data/metadata.json b/custodial_registration_proxy/data/metadata.json index 72eee46..fbe4756 100644 --- a/custodial_registration_proxy/data/metadata.json +++ b/custodial_registration_proxy/data/metadata.json @@ -1,6 +1,6 @@ { "compiler": { - "version": "0.8.19+commit.7dd6d404" + "version": "0.8.20+commit.a1b79de6" }, "language": "Solidity", "output": { @@ -17,11 +17,6 @@ "name": "_custodialAccountIndexAddress", "type": "address" }, - { - "internalType": "address", - "name": "_trainingVoucherAddress", - "type": "address" - }, { "internalType": "address", "name": "_systemAccount", @@ -70,19 +65,6 @@ "stateMutability": "view", "type": "function" }, - { - "inputs": [], - "name": "TrainingVoucher", - "outputs": [ - { - "internalType": "contract IDemurrageTokenSingleNocap", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [], "name": "owner", @@ -147,19 +129,6 @@ ], "stateMutability": "view", "type": "function" - }, - { - "inputs": [], - "name": "trainingVoucerGiftAmount", - "outputs": [ - { - "internalType": "uint256", - "name": "", - "type": "uint256" - } - ], - "stateMutability": "view", - "type": "function" } ], "devdoc": { @@ -175,9 +144,9 @@ }, "settings": { "compilationTarget": { - "CustodialRegistration.sol": "CustodialRegistrationProxy" + "CustodialRegistrationProxy.sol": "CustodialRegistrationProxy" }, - "evmVersion": "paris", + "evmVersion": "byzantium", "libraries": {}, "metadata": { "bytecodeHash": "ipfs" @@ -189,12 +158,12 @@ "remappings": [] }, "sources": { - "CustodialRegistration.sol": { - "keccak256": "0x0a90873cea012091ec3a74ee55767a4fc430cf96e4d2a4a7a7b0b7712c255939", + "CustodialRegistrationProxy.sol": { + "keccak256": "0x727a76b1d6397ab0a2a0d3462b72895f7b150c299f67a354b3bf10a19278c741", "license": "AGPL-3.0-or-later", "urls": [ - "bzz-raw://8dcac825118e12374e22c3515536292cf3c84860bc3918de80fb8a653b4fb0b9", - "dweb:/ipfs/QmYJeJW7hL5RTbuPVpMfVtC4vDYZDCwA5mf1qriwWBXKNd" + "bzz-raw://5695aaf0b70ee20eb358909ca4dd7da25044927b72e7e7e3709464abb9f081df", + "dweb:/ipfs/QmWwdBur7GUejKUU13DxwtuqpUR5KX7RYWtNtSew2VdqnE" ] } }, diff --git a/solidity/CustodialRegistrationProxy.sol b/solidity/CustodialRegistrationProxy.sol index 7d4bfa4..5da2088 100644 --- a/solidity/CustodialRegistrationProxy.sol +++ b/solidity/CustodialRegistrationProxy.sol @@ -9,18 +9,12 @@ interface ICustodialAccountIndex { function add(address _account) external returns (bool); } -interface IDemurrageTokenSingleNocap { - function mintTo(address _beneficiary, uint256 _amount) external returns (bool); -} - contract CustodialRegistrationProxy { address public owner; address public systemAccount; - uint256 public constant trainingVoucerGiftAmount = 5000000; IEthFaucet public EthFaucet; ICustodialAccountIndex public CustodialAccountIndex; - IDemurrageTokenSingleNocap public TrainingVoucher; event NewRegistration(address indexed subject); @@ -34,13 +28,12 @@ contract CustodialRegistrationProxy { _; } - constructor(address _ethFaucetAddress, address _custodialAccountIndexAddress, address _trainingVoucherAddress, address _systemAccount) { + constructor(address _ethFaucetAddress, address _custodialAccountIndexAddress, address _systemAccount) { owner = msg.sender; systemAccount = _systemAccount; EthFaucet = IEthFaucet(_ethFaucetAddress); CustodialAccountIndex = ICustodialAccountIndex(_custodialAccountIndexAddress); - TrainingVoucher = IDemurrageTokenSingleNocap(_trainingVoucherAddress); } function setNewOwner(address _newOwner) @@ -63,7 +56,6 @@ contract CustodialRegistrationProxy { { CustodialAccountIndex.add(_subject); EthFaucet.giveTo(_subject); - TrainingVoucher.mintTo(_subject, trainingVoucerGiftAmount); emit NewRegistration(_subject); } } \ No newline at end of file