npm - @gooddollar/goodprotocol - Versions diffs - 1.0.19-beta.2 → 1.0.19-beta.3 - Mend

@gooddollar/goodprotocol 1.0.19-beta.2 → 1.0.19-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (179) hide show

package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.json CHANGED Viewed

@@ -114,8 +114,8 @@
       "type": "receive"
     }
   ],
-  "bytecode": "0x60806040523480156200001157600080fd5b5060405162001ae138038062001ae1833981016040819052620000349162000116565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b1580156200009957600080fd5b505afa158015620000ae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000d4919062000155565b600280546001600160a01b0319166001600160a01b0392909216919091179055506200017c9050565b6001600160a01b03811681146200011357600080fd5b50565b600080604083850312156200012a57600080fd5b82516200013781620000fd565b60208401519092506200014a81620000fd565b809150509250929050565b6000602082840312156200016857600080fd5b81516200017581620000fd565b9392505050565b611955806200018c6000396000f3fe60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a61007536600461138f565b6100fc565b005b34801561008857600080fd5b5061007a6100973660046113b3565b610314565b3480156100a857600080fd5b5061007a6100b736600461142a565b6104e6565b3480156100c857600080fd5b5061007a6100d7366004611580565b6105c6565b3480156100e857600080fd5b5061007a6100f736600461138f565b61086c565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611655565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b15801561019357600080fd5b505af11580156101a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cb919061168e565b6102285760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261025c929116906004016116a9565b602060405180830381600087803b15801561027657600080fd5b505af115801561028a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ae919061168e565b6103065760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461033e5760405162461bcd60e51b815260040161012690611655565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac190610377906004016116bd565b60206040518083038186803b15801561038f57600080fd5b505afa1580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c791906116de565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b031916815261042f9392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561044957600080fd5b505af115801561045d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104859190810190611778565b509050806104e15760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146105105760405162461bcd60e51b815260040161012690611655565b8281146105515760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b6105bf85858580806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250506040805160208089028281018201909352888252909350889250879182918501908490808284376000920191909152506108ab92505050565b5050505050565b6001546001600160a01b031633146105f05760405162461bcd60e51b815260040161012690611655565b805182511461063b5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b8251811015610866576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac19060640160206040518083038186803b1580156106b257600080fd5b505afa1580156106c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ea91906116de565b8585815181106106fc576106fc61181f565b60200260200101518786815181106107165761071661181f565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107ad9392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156107c757600080fd5b505af11580156107db573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108039190810190611778565b509050806108535760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061085e81611835565b91505061063e565b50505050565b6001546001600160a01b031633146108965760405162461bcd60e51b815260040161012690611655565b61089f816109e6565b6108a881610eea565b50565b600080546040516001600160a01b039091169063d1b7089a9086906108d6908790879060240161185e565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526109319392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109879190810190611778565b509050806108665760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610a1f906004016118e2565b60206040518083038186803b158015610a3757600080fd5b505afa158015610a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6f91906116de565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a99906004016116bd565b60206040518083038186803b158015610ab157600080fd5b505afa158015610ac5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae991906116de565b604051602401610af991906116a9565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610b549392916001600160a01b031690600090600401611727565b600060405180830381600087803b158015610b6e57600080fd5b505af1158015610b82573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610baa9190810190611778565b50905080610bf55760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610c2d906004016118e2565b60206040518083038186803b158015610c4557600080fd5b505afa158015610c59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7d91906116de565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610cd494936001600160a01b03169160009101611727565b600060405180830381600087803b158015610cee57600080fd5b505af1158015610d02573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d2a9190810190611778565b50905080610d7a5760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610db2906004016116bd565b60206040518083038186803b158015610dca57600080fd5b505afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906116de565b60025460405160e084901b6001600160e01b03191681526001600160a01b0392831660048201526000602482015291166044820152606401602060405180830381600087803b158015610e5457600080fd5b505af1158015610e68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e8c919061168e565b905080610ee65760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610f30906020808252600490820152634344414960e01b604082015260600190565b60206040518083038186803b158015610f4857600080fd5b505afa158015610f5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8091906116de565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610fb892909116906004016116a9565b60206040518083038186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110089190611906565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190611045906004016116bd565b60206040518083038186803b15801561105d57600080fd5b505afa158015611071573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061109591906116de565b60025460405160e085901b6001600160e01b03191681526001600160a01b039384166004820152918316602483015260448201869052919091166064820152608401602060405180830381600087803b1580156110f157600080fd5b505af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611129919061168e565b9250826111845760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac19060640160206040518083038186803b1580156111ee57600080fd5b505afa158015611202573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061122691906116de565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526112c19392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113179190810190611778565b509250826108665760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b03811681146108a857600080fd5b6000602082840312156113a157600080fd5b81356113ac8161137a565b9392505050565b600080604083850312156113c657600080fd5b82356113d18161137a565b946020939093013593505050565b60008083601f8401126113f157600080fd5b5081356001600160401b0381111561140857600080fd5b6020830191508360208260051b850101111561142357600080fd5b9250929050565b60008060008060006060868803121561144257600080fd5b853561144d8161137a565b945060208601356001600160401b038082111561146957600080fd5b61147589838a016113df565b9096509450604088013591508082111561148e57600080fd5b5061149b888289016113df565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156114ea576114ea6114ac565b604052919050565b60006001600160401b0382111561150b5761150b6114ac565b5060051b60200190565b600082601f83011261152657600080fd5b8135602061153b611536836114f2565b6114c2565b82815260059290921b8401810191818101908684111561155a57600080fd5b8286015b84811015611575578035835291830191830161155e565b509695505050505050565b60008060006060848603121561159557600080fd5b83356115a08161137a565b92506020848101356001600160401b03808211156115bd57600080fd5b818701915087601f8301126115d157600080fd5b81356115df611536826114f2565b81815260059190911b8301840190848101908a8311156115fe57600080fd5b938501935b828510156116255784356116168161137a565b82529385019390850190611603565b96505050604087013592508083111561163d57600080fd5b505061164b86828701611515565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461168957600080fd5b919050565b6000602082840312156116a057600080fd5b6113ac82611679565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156116f057600080fd5b81516113ac8161137a565b60005b838110156117165781810151838201526020016116fe565b838111156108665750506000910152565b600060018060a01b0380871683526080602084015285518060808501526117558160a0860160208a016116fb565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561178b57600080fd5b61179483611679565b60208401519092506001600160401b03808211156117b157600080fd5b818501915085601f8301126117c557600080fd5b8151818111156117d7576117d76114ac565b6117ea601f8201601f19166020016114c2565b915080825286602082850101111561180157600080fd5b6118128160208401602086016116fb565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561185757634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b828110156118975781518452928401929084019060010161187b565b5050508381038285015284518082528583019183019060005b818110156118d55783516001600160a01b0316835292840192918401916001016118b0565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60006020828403121561191857600080fd5b505191905056fea2646970667358221220a21b279b283883dd54445ef1b90ca1c3c566c619ccfbff391ee6831d72a3031b64736f6c63430008080033",
-  "deployedBytecode": "0x60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a61007536600461138f565b6100fc565b005b34801561008857600080fd5b5061007a6100973660046113b3565b610314565b3480156100a857600080fd5b5061007a6100b736600461142a565b6104e6565b3480156100c857600080fd5b5061007a6100d7366004611580565b6105c6565b3480156100e857600080fd5b5061007a6100f736600461138f565b61086c565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611655565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b15801561019357600080fd5b505af11580156101a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cb919061168e565b6102285760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261025c929116906004016116a9565b602060405180830381600087803b15801561027657600080fd5b505af115801561028a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ae919061168e565b6103065760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461033e5760405162461bcd60e51b815260040161012690611655565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac190610377906004016116bd565b60206040518083038186803b15801561038f57600080fd5b505afa1580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c791906116de565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b031916815261042f9392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561044957600080fd5b505af115801561045d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104859190810190611778565b509050806104e15760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146105105760405162461bcd60e51b815260040161012690611655565b8281146105515760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b6105bf85858580806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250506040805160208089028281018201909352888252909350889250879182918501908490808284376000920191909152506108ab92505050565b5050505050565b6001546001600160a01b031633146105f05760405162461bcd60e51b815260040161012690611655565b805182511461063b5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b8251811015610866576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac19060640160206040518083038186803b1580156106b257600080fd5b505afa1580156106c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ea91906116de565b8585815181106106fc576106fc61181f565b60200260200101518786815181106107165761071661181f565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107ad9392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156107c757600080fd5b505af11580156107db573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108039190810190611778565b509050806108535760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061085e81611835565b91505061063e565b50505050565b6001546001600160a01b031633146108965760405162461bcd60e51b815260040161012690611655565b61089f816109e6565b6108a881610eea565b50565b600080546040516001600160a01b039091169063d1b7089a9086906108d6908790879060240161185e565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526109319392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109879190810190611778565b509050806108665760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610a1f906004016118e2565b60206040518083038186803b158015610a3757600080fd5b505afa158015610a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6f91906116de565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a99906004016116bd565b60206040518083038186803b158015610ab157600080fd5b505afa158015610ac5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae991906116de565b604051602401610af991906116a9565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610b549392916001600160a01b031690600090600401611727565b600060405180830381600087803b158015610b6e57600080fd5b505af1158015610b82573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610baa9190810190611778565b50905080610bf55760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610c2d906004016118e2565b60206040518083038186803b158015610c4557600080fd5b505afa158015610c59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7d91906116de565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610cd494936001600160a01b03169160009101611727565b600060405180830381600087803b158015610cee57600080fd5b505af1158015610d02573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d2a9190810190611778565b50905080610d7a5760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610db2906004016116bd565b60206040518083038186803b158015610dca57600080fd5b505afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906116de565b60025460405160e084901b6001600160e01b03191681526001600160a01b0392831660048201526000602482015291166044820152606401602060405180830381600087803b158015610e5457600080fd5b505af1158015610e68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e8c919061168e565b905080610ee65760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610f30906020808252600490820152634344414960e01b604082015260600190565b60206040518083038186803b158015610f4857600080fd5b505afa158015610f5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8091906116de565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610fb892909116906004016116a9565b60206040518083038186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110089190611906565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190611045906004016116bd565b60206040518083038186803b15801561105d57600080fd5b505afa158015611071573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061109591906116de565b60025460405160e085901b6001600160e01b03191681526001600160a01b039384166004820152918316602483015260448201869052919091166064820152608401602060405180830381600087803b1580156110f157600080fd5b505af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611129919061168e565b9250826111845760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac19060640160206040518083038186803b1580156111ee57600080fd5b505afa158015611202573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061122691906116de565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526112c19392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113179190810190611778565b509250826108665760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b03811681146108a857600080fd5b6000602082840312156113a157600080fd5b81356113ac8161137a565b9392505050565b600080604083850312156113c657600080fd5b82356113d18161137a565b946020939093013593505050565b60008083601f8401126113f157600080fd5b5081356001600160401b0381111561140857600080fd5b6020830191508360208260051b850101111561142357600080fd5b9250929050565b60008060008060006060868803121561144257600080fd5b853561144d8161137a565b945060208601356001600160401b038082111561146957600080fd5b61147589838a016113df565b9096509450604088013591508082111561148e57600080fd5b5061149b888289016113df565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156114ea576114ea6114ac565b604052919050565b60006001600160401b0382111561150b5761150b6114ac565b5060051b60200190565b600082601f83011261152657600080fd5b8135602061153b611536836114f2565b6114c2565b82815260059290921b8401810191818101908684111561155a57600080fd5b8286015b84811015611575578035835291830191830161155e565b509695505050505050565b60008060006060848603121561159557600080fd5b83356115a08161137a565b92506020848101356001600160401b03808211156115bd57600080fd5b818701915087601f8301126115d157600080fd5b81356115df611536826114f2565b81815260059190911b8301840190848101908a8311156115fe57600080fd5b938501935b828510156116255784356116168161137a565b82529385019390850190611603565b96505050604087013592508083111561163d57600080fd5b505061164b86828701611515565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461168957600080fd5b919050565b6000602082840312156116a057600080fd5b6113ac82611679565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156116f057600080fd5b81516113ac8161137a565b60005b838110156117165781810151838201526020016116fe565b838111156108665750506000910152565b600060018060a01b0380871683526080602084015285518060808501526117558160a0860160208a016116fb565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561178b57600080fd5b61179483611679565b60208401519092506001600160401b03808211156117b157600080fd5b818501915085601f8301126117c557600080fd5b8151818111156117d7576117d76114ac565b6117ea601f8201601f19166020016114c2565b915080825286602082850101111561180157600080fd5b6118128160208401602086016116fb565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561185757634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b828110156118975781518452928401929084019060010161187b565b5050508381038285015284518082528583019183019060005b818110156118d55783516001600160a01b0316835292840192918401916001016118b0565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60006020828403121561191857600080fd5b505191905056fea2646970667358221220a21b279b283883dd54445ef1b90ca1c3c566c619ccfbff391ee6831d72a3031b64736f6c63430008080033",
+  "bytecode": "0x60806040523480156200001157600080fd5b5060405162001ae138038062001ae1833981016040819052620000349162000116565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b1580156200009957600080fd5b505afa158015620000ae573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000d4919062000155565b600280546001600160a01b0319166001600160a01b0392909216919091179055506200017c9050565b6001600160a01b03811681146200011357600080fd5b50565b600080604083850312156200012a57600080fd5b82516200013781620000fd565b60208401519092506200014a81620000fd565b809150509250929050565b6000602082840312156200016857600080fd5b81516200017581620000fd565b9392505050565b611955806200018c6000396000f3fe60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a61007536600461138f565b6100fc565b005b34801561008857600080fd5b5061007a6100973660046113b3565b610314565b3480156100a857600080fd5b5061007a6100b736600461142a565b6104e6565b3480156100c857600080fd5b5061007a6100d7366004611580565b6105c6565b3480156100e857600080fd5b5061007a6100f736600461138f565b61086c565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611655565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b15801561019357600080fd5b505af11580156101a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cb919061168e565b6102285760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261025c929116906004016116a9565b602060405180830381600087803b15801561027657600080fd5b505af115801561028a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ae919061168e565b6103065760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461033e5760405162461bcd60e51b815260040161012690611655565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac190610377906004016116bd565b60206040518083038186803b15801561038f57600080fd5b505afa1580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c791906116de565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b031916815261042f9392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561044957600080fd5b505af115801561045d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104859190810190611778565b509050806104e15760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146105105760405162461bcd60e51b815260040161012690611655565b8281146105515760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b6105bf85858580806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250506040805160208089028281018201909352888252909350889250879182918501908490808284376000920191909152506108ab92505050565b5050505050565b6001546001600160a01b031633146105f05760405162461bcd60e51b815260040161012690611655565b805182511461063b5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b8251811015610866576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac19060640160206040518083038186803b1580156106b257600080fd5b505afa1580156106c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ea91906116de565b8585815181106106fc576106fc61181f565b60200260200101518786815181106107165761071661181f565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107ad9392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156107c757600080fd5b505af11580156107db573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108039190810190611778565b509050806108535760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061085e81611835565b91505061063e565b50505050565b6001546001600160a01b031633146108965760405162461bcd60e51b815260040161012690611655565b61089f816109e6565b6108a881610eea565b50565b600080546040516001600160a01b039091169063d1b7089a9086906108d6908790879060240161185e565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526109319392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109879190810190611778565b509050806108665760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610a1f906004016118e2565b60206040518083038186803b158015610a3757600080fd5b505afa158015610a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6f91906116de565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a99906004016116bd565b60206040518083038186803b158015610ab157600080fd5b505afa158015610ac5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae991906116de565b604051602401610af991906116a9565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610b549392916001600160a01b031690600090600401611727565b600060405180830381600087803b158015610b6e57600080fd5b505af1158015610b82573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610baa9190810190611778565b50905080610bf55760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610c2d906004016118e2565b60206040518083038186803b158015610c4557600080fd5b505afa158015610c59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7d91906116de565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610cd494936001600160a01b03169160009101611727565b600060405180830381600087803b158015610cee57600080fd5b505af1158015610d02573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d2a9190810190611778565b50905080610d7a5760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610db2906004016116bd565b60206040518083038186803b158015610dca57600080fd5b505afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906116de565b60025460405160e084901b6001600160e01b03191681526001600160a01b0392831660048201526000602482015291166044820152606401602060405180830381600087803b158015610e5457600080fd5b505af1158015610e68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e8c919061168e565b905080610ee65760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610f30906020808252600490820152634344414960e01b604082015260600190565b60206040518083038186803b158015610f4857600080fd5b505afa158015610f5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8091906116de565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610fb892909116906004016116a9565b60206040518083038186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110089190611906565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190611045906004016116bd565b60206040518083038186803b15801561105d57600080fd5b505afa158015611071573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061109591906116de565b60025460405160e085901b6001600160e01b03191681526001600160a01b039384166004820152918316602483015260448201869052919091166064820152608401602060405180830381600087803b1580156110f157600080fd5b505af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611129919061168e565b9250826111845760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac19060640160206040518083038186803b1580156111ee57600080fd5b505afa158015611202573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061122691906116de565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526112c19392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113179190810190611778565b509250826108665760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b03811681146108a857600080fd5b6000602082840312156113a157600080fd5b81356113ac8161137a565b9392505050565b600080604083850312156113c657600080fd5b82356113d18161137a565b946020939093013593505050565b60008083601f8401126113f157600080fd5b5081356001600160401b0381111561140857600080fd5b6020830191508360208260051b850101111561142357600080fd5b9250929050565b60008060008060006060868803121561144257600080fd5b853561144d8161137a565b945060208601356001600160401b038082111561146957600080fd5b61147589838a016113df565b9096509450604088013591508082111561148e57600080fd5b5061149b888289016113df565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156114ea576114ea6114ac565b604052919050565b60006001600160401b0382111561150b5761150b6114ac565b5060051b60200190565b600082601f83011261152657600080fd5b8135602061153b611536836114f2565b6114c2565b82815260059290921b8401810191818101908684111561155a57600080fd5b8286015b84811015611575578035835291830191830161155e565b509695505050505050565b60008060006060848603121561159557600080fd5b83356115a08161137a565b92506020848101356001600160401b03808211156115bd57600080fd5b818701915087601f8301126115d157600080fd5b81356115df611536826114f2565b81815260059190911b8301840190848101908a8311156115fe57600080fd5b938501935b828510156116255784356116168161137a565b82529385019390850190611603565b96505050604087013592508083111561163d57600080fd5b505061164b86828701611515565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461168957600080fd5b919050565b6000602082840312156116a057600080fd5b6113ac82611679565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156116f057600080fd5b81516113ac8161137a565b60005b838110156117165781810151838201526020016116fe565b838111156108665750506000910152565b600060018060a01b0380871683526080602084015285518060808501526117558160a0860160208a016116fb565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561178b57600080fd5b61179483611679565b60208401519092506001600160401b03808211156117b157600080fd5b818501915085601f8301126117c557600080fd5b8151818111156117d7576117d76114ac565b6117ea601f8201601f19166020016114c2565b915080825286602082850101111561180157600080fd5b6118128160208401602086016116fb565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561185757634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b828110156118975781518452928401929084019060010161187b565b5050508381038285015284518082528583019183019060005b818110156118d55783516001600160a01b0316835292840192918401916001016118b0565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60006020828403121561191857600080fd5b505191905056fea2646970667358221220ae686dd4dc14e86bbfdf3210ae5519430163a6f4fface8619bf0e6734522674a64736f6c63430008080033",
+  "deployedBytecode": "0x60806040526004361061004e5760003560e01c80631fedded51461005a5780633f40cf5b1461007c5780638815bdae1461009c57806391ea50ae146100bc578063bdc27b9b146100dc57600080fd5b3661005557005b600080fd5b34801561006657600080fd5b5061007a61007536600461138f565b6100fc565b005b34801561008857600080fd5b5061007a6100973660046113b3565b610314565b3480156100a857600080fd5b5061007a6100b736600461142a565b6104e6565b3480156100c857600080fd5b5061007a6100d7366004611580565b6105c6565b3480156100e857600080fd5b5061007a6100f736600461138f565b61086c565b6001546001600160a01b0316331461012f5760405162461bcd60e51b815260040161012690611655565b60405180910390fd5b6000805460025460405163e869d45f60e01b81526001600160a01b0385811660048301526024820194909452601f60e01b6044820152908316606482015291169063e869d45f90608401602060405180830381600087803b15801561019357600080fd5b505af11580156101a7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101cb919061168e565b6102285760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b6064820152608401610126565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b139261025c929116906004016116a9565b602060405180830381600087803b15801561027657600080fd5b505af115801561028a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102ae919061168e565b6103065760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b6064820152608401610126565b6001546001600160a01b0316ff5b6001546001600160a01b0316331461033e5760405162461bcd60e51b815260040161012690611655565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919086169063bf40fac190610377906004016116bd565b60206040518083038186803b15801561038f57600080fd5b505afa1580156103a3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103c791906116de565b6040516024810186905260440160408051601f198184030181529181526020820180516001600160e01b0316630a7445bf60e41b179052600254905160e085901b6001600160e01b031916815261042f9392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561044957600080fd5b505af115801561045d573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526104859190810190611778565b509050806104e15760405162461bcd60e51b815260206004820152602360248201527f43616c6c696e67207365745265736572766547445841697264726f70206661696044820152621b195960ea1b6064820152608401610126565b505050565b6001546001600160a01b031633146105105760405162461bcd60e51b815260040161012690611655565b8281146105515760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b6044820152606401610126565b6105bf85858580806020026020016040519081016040528093929190818152602001838360200280828437600092019190915250506040805160208089028281018201909352888252909350889250879182918501908490808284376000920191909152506108ab92505050565b5050505050565b6001546001600160a01b031633146105f05760405162461bcd60e51b815260040161012690611655565b805182511461063b5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b6044820152606401610126565b60005b8251811015610866576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac19060640160206040518083038186803b1580156106b257600080fd5b505afa1580156106c6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106ea91906116de565b8585815181106106fc576106fc61181f565b60200260200101518786815181106107165761071661181f565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526107ad9392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156107c757600080fd5b505af11580156107db573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526108039190810190611778565b509050806108535760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c65646044820152606401610126565b508061085e81611835565b91505061063e565b50505050565b6001546001600160a01b031633146108965760405162461bcd60e51b815260040161012690611655565b61089f816109e6565b6108a881610eea565b50565b600080546040516001600160a01b039091169063d1b7089a9086906108d6908790879060240161185e565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b03191681526109319392916001600160a01b031690600090600401611727565b600060405180830381600087803b15801561094b57600080fd5b505af115801561095f573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526109879190810190611778565b509050806108665760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b6064820152608401610126565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610a1f906004016118e2565b60206040518083038186803b158015610a3757600080fd5b505afa158015610a4b573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a6f91906116de565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac190610a99906004016116bd565b60206040518083038186803b158015610ab157600080fd5b505afa158015610ac5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ae991906116de565b604051602401610af991906116a9565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b0319168152610b549392916001600160a01b031690600090600401611727565b600060405180830381600087803b158015610b6e57600080fd5b505af1158015610b82573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610baa9190810190611778565b50905080610bf55760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b6044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190610c2d906004016118e2565b60206040518083038186803b158015610c4557600080fd5b505afa158015610c59573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c7d91906116de565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b0319168152610cd494936001600160a01b03169160009101611727565b600060405180830381600087803b158015610cee57600080fd5b505af1158015610d02573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d2a9190810190611778565b50905080610d7a5760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c65640000006044820152606401610126565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac190610db2906004016116bd565b60206040518083038186803b158015610dca57600080fd5b505afa158015610dde573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0291906116de565b60025460405160e084901b6001600160e01b03191681526001600160a01b0392831660048201526000602482015291166044820152606401602060405180830381600087803b158015610e5457600080fd5b505af1158015610e68573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e8c919061168e565b905080610ee65760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b6064820152608401610126565b5050565b600080826001600160a01b031663bf40fac16040518163ffffffff1660e01b8152600401610f30906020808252600490820152634344414960e01b604082015260600190565b60206040518083038186803b158015610f4857600080fd5b505afa158015610f5c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f8091906116de565b6002546040516370a0823160e01b81529192506000916001600160a01b03808516926370a0823192610fb892909116906004016116a9565b60206040518083038186803b158015610fd057600080fd5b505afa158015610fe4573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110089190611906565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd9185919088169063bf40fac190611045906004016116bd565b60206040518083038186803b15801561105d57600080fd5b505afa158015611071573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061109591906116de565b60025460405160e085901b6001600160e01b03191681526001600160a01b039384166004820152918316602483015260448201869052919091166064820152608401602060405180830381600087803b1580156110f157600080fd5b505af1158015611105573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611129919061168e565b9250826111845760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b6064820152608401610126565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a919087169063bf40fac19060640160206040518083038186803b1580156111ee57600080fd5b505afa158015611202573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061122691906116de565b6040516001600160a01b0386166024820152648cd0c73ebb6044820152660f5e1925bd0bc76064820152620c4b0b6084820152636216391460a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b03191681526112c19392916001600160a01b031690600090600401611727565b600060405180830381600087803b1580156112db57600080fd5b505af11580156112ef573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113179190810190611778565b509250826108665760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b6064820152608401610126565b6001600160a01b03811681146108a857600080fd5b6000602082840312156113a157600080fd5b81356113ac8161137a565b9392505050565b600080604083850312156113c657600080fd5b82356113d18161137a565b946020939093013593505050565b60008083601f8401126113f157600080fd5b5081356001600160401b0381111561140857600080fd5b6020830191508360208260051b850101111561142357600080fd5b9250929050565b60008060008060006060868803121561144257600080fd5b853561144d8161137a565b945060208601356001600160401b038082111561146957600080fd5b61147589838a016113df565b9096509450604088013591508082111561148e57600080fd5b5061149b888289016113df565b969995985093965092949392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b03811182821017156114ea576114ea6114ac565b604052919050565b60006001600160401b0382111561150b5761150b6114ac565b5060051b60200190565b600082601f83011261152657600080fd5b8135602061153b611536836114f2565b6114c2565b82815260059290921b8401810191818101908684111561155a57600080fd5b8286015b84811015611575578035835291830191830161155e565b509695505050505050565b60008060006060848603121561159557600080fd5b83356115a08161137a565b92506020848101356001600160401b03808211156115bd57600080fd5b818701915087601f8301126115d157600080fd5b81356115df611536826114f2565b81815260059190911b8301840190848101908a8311156115fe57600080fd5b938501935b828510156116255784356116168161137a565b82529385019390850190611603565b96505050604087013592508083111561163d57600080fd5b505061164b86828701611515565b9150509250925092565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b8051801515811461168957600080fd5b919050565b6000602082840312156116a057600080fd5b6113ac82611679565b6001600160a01b0391909116815260200190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156116f057600080fd5b81516113ac8161137a565b60005b838110156117165781810151838201526020016116fe565b838111156108665750506000910152565b600060018060a01b0380871683526080602084015285518060808501526117558160a0860160208a016116fb565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b6000806040838503121561178b57600080fd5b61179483611679565b60208401519092506001600160401b03808211156117b157600080fd5b818501915085601f8301126117c557600080fd5b8151818111156117d7576117d76114ac565b6117ea601f8201601f19166020016114c2565b915080825286602082850101111561180157600080fd5b6118128160208401602086016116fb565b5080925050509250929050565b634e487b7160e01b600052603260045260246000fd5b600060001982141561185757634e487b7160e01b600052601160045260246000fd5b5060010190565b604080825283519082018190526000906020906060840190828701845b828110156118975781518452928401929084019060010161187b565b5050508381038285015284518082528583019183019060005b818110156118d55783516001600160a01b0316835292840192918401916001016118b0565b5090979650505050505050565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60006020828403121561191857600080fd5b505191905056fea2646970667358221220ae686dd4dc14e86bbfdf3210ae5519430163a6f4fface8619bf0e6734522674a64736f6c63430008080033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/utils/ProxyFactory1967.sol/ERC1967Proxy.dbg.json CHANGED Viewed

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/4f8206a440cfa6bac16c5683c5407b03.json"
+  "buildInfo": "../../../build-info/e24cb5d66832fe0d27930372c68ab4cd.json"
 }

package/artifacts/contracts/utils/ProxyFactory1967.sol/ProxyFactory1967.dbg.json CHANGED Viewed

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/4f8206a440cfa6bac16c5683c5407b03.json"
+  "buildInfo": "../../../build-info/e24cb5d66832fe0d27930372c68ab4cd.json"
 }

package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.dbg.json CHANGED Viewed

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/4e461a2f16a31f5f1913266e3929a03c.json"
+  "buildInfo": "../../../build-info/e24cb5d66832fe0d27930372c68ab4cd.json"
 }

package/artifacts/contracts/utils/ReputationTestHelper.sol/ReputationTestHelper.json CHANGED Viewed

@@ -74,8 +74,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x608060405234801561001057600080fd5b5060405161035c38038061035c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102c9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220fde96c0140534281b2023b496f1ce00db0a20029d246a9149dab11c8062ac9ff64736f6c63430008080033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220fde96c0140534281b2023b496f1ce00db0a20029d246a9149dab11c8062ac9ff64736f6c63430008080033",
+  "bytecode": "0x608060405234801561001057600080fd5b5060405161035c38038061035c83398101604081905261002f91610054565b600080546001600160a01b0319166001600160a01b0392909216919091179055610084565b60006020828403121561006657600080fd5b81516001600160a01b038116811461007d57600080fd5b9392505050565b6102c9806100936000396000f3fe608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212204e7ecf50608024b30b943ad63c2e064e321d773f386de2f9a7c838fe1a54e40964736f6c63430008080033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100415760003560e01c80635653eeeb1461004657806391d61f3e1461005b578063c52164c61461006e575b600080fd5b6100596100543660046101e7565b61009d565b005b6100596100693660046101e7565b610145565b600054610081906001600160a01b031681565b6040516001600160a01b03909116815260200160405180910390f35b60005b8181101561013f576000546040516340c10f1960e01b81526001600160a01b03909116906340c10f19906100da9087908790600401610228565b602060405180830381600087803b1580156100f457600080fd5b505af1158015610108573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061012c9190610241565b50806101378161026a565b9150506100a0565b50505050565b60005b8181101561013f57600054604051632770a7eb60e21b81526001600160a01b0390911690639dc29fac906101829087908790600401610228565b602060405180830381600087803b15801561019c57600080fd5b505af11580156101b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101d49190610241565b50806101df8161026a565b915050610148565b6000806000606084860312156101fc57600080fd5b83356001600160a01b038116811461021357600080fd5b95602085013595506040909401359392505050565b6001600160a01b03929092168252602082015260400190565b60006020828403121561025357600080fd5b8151801515811461026357600080fd5b9392505050565b600060001982141561028c57634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212204e7ecf50608024b30b943ad63c2e064e321d773f386de2f9a7c838fe1a54e40964736f6c63430008080033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/contracts/Interfaces.sol CHANGED Viewed

@@ -15,6 +15,8 @@ interface ERC20 {
 	function mint(address to, uint256 mintAmount) external returns (uint256);
+	function burn(uint256 amount) external;
 	function totalSupply() external view returns (uint256);
 	function allowance(address owner, address spender)
@@ -447,3 +449,13 @@ interface IAdminWallet {
 	function transferOwnership(address _owner) external;
 }
+interface IMultichainRouter {
+	// Swaps `amount` `token` from this chain to `toChainID` chain with recipient `to`
+	function anySwapOut(
+		address token,
+		address to,
+		uint256 amount,
+		uint256 toChainID
+	) external;
+}

package/contracts/governance/GoodDollarStaking.sol ADDED Viewed

@@ -0,0 +1,260 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+import "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol";
+import "../utils/DAOUpgradeableContract.sol";
+import "../utils/NameService.sol";
+import "../Interfaces.sol";
+import "../DAOStackInterfaces.sol";
+import "./MultiBaseGovernanceShareField.sol";
+import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
+import "../staking/utils/StakingRewardsFixedAPY.sol";
+interface RewardsMinter {
+	function sendOrMint(address to, uint256 amount) external returns (uint256);
+}
+/**
+ * @title Staking contract that allows citizens to stake G$ to get GOOD + G$ rewards
+ * it implements
+ */
+contract GoodDollarStaking is
+	ERC20Upgradeable,
+	MultiBaseGovernanceShareField,
+	DAOUpgradeableContract,
+	ReentrancyGuardUpgradeable,
+	StakingRewardsFixedAPY
+{
+	// Token address
+	ERC20 token;
+	uint128 public numberOfBlocksPerYear;
+	/**
+	 * @dev Emitted when `staker` earns an `amount` of GOOD tokens
+	 */
+	event ReputationEarned(address indexed staker, uint256 amount);
+	/**
+	 * @dev Emitted when `staker` stakes an `amount` of GoodDollars
+	 */
+	event Staked(address indexed staker, uint256 amount);
+	/**
+	 * @dev Emitted when `staker` withdraws an `amount` of staked GoodDollars
+	 */
+	event StakeWithdraw(address indexed staker, uint256 amount);
+	/**
+	 * @dev Constructor
+	 * @param _ns The address of the INameService contract
+	 */
+	constructor(
+		INameService _ns,
+		uint128 _interestRatePerBlock,
+		uint128 _numberOfBlocksPerYear
+	) StakingRewardsFixedAPY(_interestRatePerBlock) {
+		setDAO(_ns);
+		require(
+			nameService.getAddress("MintBurnWrapper") != address(0),
+			"rewards minter not set"
+		);
+		numberOfBlocksPerYear = _numberOfBlocksPerYear;
+		token = ERC20(nameService.getAddress("GOODDOLLAR"));
+		__ERC20_init("G$ Savings", "svG$");
+		rewardsPerBlock[address(this)] = (2 ether * 1e6) / getChainBlocksPerMonth(); // (2M monthly GDAO as specified in specs, divided by blocks in month )
+	}
+	function getChainBlocksPerMonth() public view override returns (uint256) {
+		return numberOfBlocksPerYear / 12;
+	}
+	/**
+	 * @dev Allows a staker to deposit Tokens. Notice that `approve` is
+	 * needed to be executed before the execution of this method.
+	 * Can be executed only when the contract is not paused.
+	 * @param _amount The amount of GD to stake
+	 */
+	function stake(uint256 _amount) external {
+		require(_amount > 0, "You need to stake a positive token amount");
+		require(
+			token.transferFrom(_msgSender(), address(this), _amount),
+			"transferFrom failed, make sure you approved token transfer"
+		);
+		/* GOOD rewards Updates */
+		_increaseProductivity(
+			address(this),
+			_msgSender(),
+			_amount,
+			0,
+			block.number
+		);
+		_mint(_msgSender(), _amount); // mint Staking token for staker
+		_mintRewards(_msgSender());
+		/* end GOOD rewards Updates */
+		/* G$ rewards updates */
+		_stake(_msgSender(), _amount);
+		emit Staked(_msgSender(), _amount);
+	}
+	/**
+	 * @dev Withdraws the sender staked Token.
+	 */
+	function withdrawStake(uint256 _amount) external nonReentrant {
+		(uint256 userProductivity, ) = getProductivity(address(this), _msgSender());
+		if (_amount == 0) _amount = userProductivity;
+		require(_amount > 0, "Should withdraw positive amount");
+		require(userProductivity >= _amount, "Not enough token staked");
+		uint256 tokenWithdraw = _amount;
+		_burn(_msgSender(), _amount); // burn their staking tokens
+		/* Good rewards update */
+		_decreaseProductivity(
+			address(this),
+			_msgSender(),
+			_amount,
+			0,
+			block.number
+		);
+		_mintRewards(_msgSender());
+		/* end Good rewards update */
+		/* G$ rewards update */
+		_withdraw(_msgSender(), tokenWithdraw);
+		if (stakersInfo[_msgSender()].balance == 0) {
+			_mintGDRewards(_msgSender()); //we mint GD rewards only when balance is 0 or upon request
+		}
+		/* end G$ rewards update */
+		require(
+			token.transfer(_msgSender(), tokenWithdraw),
+			"withdraw transfer failed"
+		);
+		emit StakeWithdraw(_msgSender(), _amount);
+	}
+	function _mintGDRewards(address _to) internal returns (uint256 actualSent) {
+		uint256 rewards = _getReward(_to);
+		//make sure RewardsMinter failure doesnt prevent withdrawl of stake
+		try
+			RewardsMinter(nameService.getAddress("MintBurnWrapper")).sendOrMint(
+				_to,
+				rewards
+			)
+		returns (uint256 _res) {
+			actualSent = _res;
+		} catch {
+			actualSent = 0;
+		}
+		//it could be that rewards minter doesnt have enough or passed cap
+		//so we keep track of debt to user
+		if (actualSent < rewards) {
+			_undoReward(_to, rewards - actualSent);
+		}
+	}
+	/**
+	 * @dev Staker can withdraw their rewards without withdraw their stake
+	 */
+	function withdrawRewards()
+		public
+		nonReentrant
+		returns (uint256 goodRewards, uint256 gdRewards)
+	{
+		goodRewards = _mintRewards(_msgSender());
+		gdRewards = _mintGDRewards(_msgSender());
+	}
+	/**
+	 * @dev Mint rewards of the staker
+	 * @param user Receipent address of the rewards
+	 * @return Returns amount of the minted rewards
+	 * emits 'ReputationEarned' event for staker earned GOOD amount
+	 */
+	function _mintRewards(address user) internal returns (uint256) {
+		uint256 amount = _issueEarnedRewards(address(this), user, 0, block.number);
+		if (amount > 0) {
+			ERC20(nameService.getAddress("REPUTATION")).mint(user, amount);
+			emit ReputationEarned(_msgSender(), amount);
+		}
+		return amount;
+	}
+	/**
+	 * @dev Returns the number of decimals used to get its user representation.
+	 */
+	function decimals() public view virtual override returns (uint8) {
+		return 2;
+	}
+	/**
+	 * @dev override _transfer to handle rewards calculations when transfer the stake
+	 */
+	function _transfer(
+		address from,
+		address to,
+		uint256 value
+	) internal override {
+		_decreaseProductivity(address(this), from, value, 0, block.number);
+		_withdraw(from, value); //update G$ rewards
+		_increaseProductivity(address(this), to, value, 0, block.number);
+		_stake(to, value); //update G$ rewards
+		//mint GOOD rewards
+		_mintRewards(from);
+		_mintRewards(to);
+		if (stakersInfo[from].balance == 0) {
+			_mintGDRewards(from); //we mint GD rewards only when balance is 0 or upon request
+		}
+		super._transfer(from, to, value);
+	}
+	/**
+	 * @dev Calculate rewards per block from monthly amount of rewards and set it
+	 * @param _monthlyAmount total rewards which will distribute monthly
+	 */
+	function setMonthlyGOODRewards(uint256 _monthlyAmount) public {
+		_onlyAvatar();
+		_setMonthlyRewards(address(this), _monthlyAmount);
+	}
+	/**
+	 * @dev Calculate rewards per block from monthly amount of rewards and set it
+	 * @param _interestRatePerBlock bps yearly apy
+	 */
+	function setGdApy(uint128 _interestRatePerBlock) public {
+		_onlyAvatar();
+		_setAPY(_interestRatePerBlock);
+	}
+	/// @dev helper function for multibase
+	function getRewardsPerBlock() public view returns (uint256) {
+		return rewardsPerBlock[address(this)];
+	}
+	/// @dev helper function for multibase
+	function getStaked(address _user) public view returns (uint256, uint256) {
+		return getProductivity(address(this), _user);
+	}
+	/// @dev helper function for multibase
+	function getUserPendingReward(address _user) public view returns (uint256) {
+		return getUserPendingReward(address(this), 0, block.number, _user);
+	}
+	/// @dev helper function for multibase
+	function goodStakerInfo(address _user) public view returns (UserInfo memory) {
+		return contractToUsers[address(this)][_user];
+	}
+	function totalRewardsPerShare() public view returns (uint256) {
+		return totalRewardsPerShare(address(this));
+	}
+}

package/contracts/reserve/DistributionHelper.sol ADDED Viewed

@@ -0,0 +1,118 @@
+// SPDX-License-Identifier: MIT
+/**
+ Wrap the G$ token to provide mint permissions to multichain.org router/bridge
+ based on https://github.com/anyswap/multichain-smart-contracts/blob/1459fe6281867319af8ffb1849e5c16d242d6530/contracts/wrapper/MintBurnWrapper.sol
+ Added onTokenTransfer
+ Fixed:
+ https://github.com/anyswap/multichain-smart-contracts/issues/4
+ https://github.com/anyswap/multichain-smart-contracts/issues/3
+ */
+pragma solidity ^0.8;
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import "@openzeppelin/contracts-upgradeable/access/AccessControlEnumerableUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import "@openzeppelin/contracts/utils/math/Math.sol";
+import "../utils/DAOUpgradeableContract.sol";
+contract DistributionHelper is
+	DAOUpgradeableContract,
+	AccessControlEnumerableUpgradeable
+{
+	enum TransferType {
+		FuseBridge,
+		MultichainBridge,
+		Contract
+	}
+	struct DistributionRecipient {
+		uint32 bps;
+		uint32 chainId;
+		address addr;
+		TransferType transferType;
+	}
+	DistributionRecipient[] public distributionRecipients;
+	address public fuseBridge;
+	IMultichainRouter public multiChainBridge;
+	event Distribution(
+		uint256 distributed,
+		uint256 startingBalance,
+		uint256 incomingAmount
+	);
+	function initialize(INameService _ns) external initializer {
+		__AccessControlEnumerable_init();
+		setDAO(_ns);
+		_setupRole(DEFAULT_ADMIN_ROLE, avatar);
+		fuseBridge = nameService.getAddress("BRIDGE_CONTRACT");
+		multiChainBridge = IMultichainRouter(
+			0xf27Ee99622C3C9b264583dACB2cCE056e194494f
+		);
+	}
+	function onDistribution(uint256 _amount) external {
+		//we consider the actuall balance and not _amount
+		uint256 toDistribute = nativeToken().balanceOf(address(this));
+		if (toDistribute == 0) return;
+		uint256 totalDistributed;
+		for (uint256 i = 0; i < distributionRecipients.length; i++) {
+			DistributionRecipient storage r = distributionRecipients[i];
+			if (r.bps > 0) {
+				uint256 toTransfer = (toDistribute * r.bps) / 10000;
+				totalDistributed += toTransfer;
+				distribute(r, toTransfer);
+			}
+		}
+		emit Distribution(totalDistributed, toDistribute, _amount);
+	}
+	function addRecipient(DistributionRecipient memory _recipient)
+		external
+		onlyRole(DEFAULT_ADMIN_ROLE)
+	{
+		distributionRecipients.push(_recipient);
+	}
+	function updateRecipient(DistributionRecipient memory _recipient)
+		external
+		onlyRole(DEFAULT_ADMIN_ROLE)
+	{
+		for (uint256 i = 0; i < distributionRecipients.length; i++) {
+			if (distributionRecipients[i].addr == _recipient.addr) {
+				distributionRecipients[i] = _recipient;
+				return;
+			}
+		}
+	}
+	function distribute(DistributionRecipient storage _recipient, uint256 _amount)
+		internal
+	{
+		if (_recipient.transferType == TransferType.FuseBridge) {
+			nativeToken().transferAndCall(
+				fuseBridge,
+				_amount,
+				abi.encodePacked(_recipient.addr)
+			);
+		} else if (_recipient.transferType == TransferType.MultichainBridge) {
+			nativeToken().approve(address(multiChainBridge), _amount);
+			multiChainBridge.anySwapOut(
+				address(nativeToken()),
+				_recipient.addr,
+				_amount,
+				_recipient.chainId
+			);
+		} else if (_recipient.transferType == TransferType.Contract) {
+			nativeToken().transferAndCall(_recipient.addr, _amount, "");
+		}
+	}
+}

package/contracts/reserve/GoodReserveCDai.sol CHANGED Viewed

@@ -11,6 +11,7 @@ import "../utils/NameService.sol";
 import "../DAOStackInterfaces.sol";
 import "../Interfaces.sol";
 import "./GoodMarketMaker.sol";
+import "./DistributionHelper.sol";
 interface ContributionCalc {
 	function calculateContribution(
@@ -51,6 +52,9 @@ contract GoodReserveCDai is
 	/// @dev mark if user claimed his GDX
 	mapping(address => bool) public isClaimedGDX;
+	uint32 public nonUbiBps; //how much of expansion G$ to allocate for non Ubi causes
+	DistributionHelper public distributionHelper; //in charge of distributing non UBI to different recipients
 	// Emits when new GD tokens minted
 	event UBIMinted(
 		//epoch of UBI
@@ -109,6 +113,8 @@ contract GoodReserveCDai is
 		address indexed receiverAddress
 	);
+	event NonUBIMinted(address distributionHelper, uint256 amountMinted);
 	function initialize(INameService _ns, bytes32 _gdxAirdrop)
 		public
 		virtual
@@ -353,10 +359,22 @@ contract GoodReserveCDai is
 			interestInCdai
 		);
 		uint256 gdExpansionToMint = getMarketMaker().mintExpansion(_interestToken);
+		uint256 nonUBI;
+		lastMinted = block.number;
 		uint256 gdUBI = gdInterestToMint + gdExpansionToMint;
+		if (nonUbiBps > 0) {
+			nonUBI = (gdExpansionToMint * nonUbiBps) / 10000;
+			gdUBI -= nonUBI;
+			_mintGoodDollars(address(distributionHelper), nonUBI, false);
+			emit NonUBIMinted(address(distributionHelper), nonUBI);
+			try distributionHelper.onDistribution(nonUBI) {} catch {}
+		}
 		//this enforces who can call the public mintUBI method. only an address with permissions at reserve of  RESERVE_MINTER_ROLE
 		_mintGoodDollars(nameService.getAddress("FUND_MANAGER"), gdUBI, false);
-		lastMinted = block.number;
 		emit UBIMinted(
 			lastMinted,
 			address(_interestToken),
@@ -365,9 +383,18 @@ contract GoodReserveCDai is
 			gdExpansionToMint,
 			gdUBI
 		);
 		return (gdUBI, interestInCdai);
 	}
+	function setDistributionHelper(DistributionHelper _helper, uint32 _bps)
+		public
+	{
+		_onlyAvatar();
+		distributionHelper = _helper;
+		nonUbiBps = _bps;
+	}
 	/**
 	 * @dev Allows the DAO to change the daily expansion rate
 	 * it is calculated by _nom/_denom with e27 precision. Emits