@gooddollar/goodprotocol 1.0.9-beta.0 → 1.0.12

package/artifacts/contracts/staking/aave/AaveStakingFactoryV2.sol/AaveStakingFactoryV2.json

@@ -1,148 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "AaveStakingFactoryV2",
-  "sourceName": "contracts/staking/aave/AaveStakingFactoryV2.sol",
-  "abi": [
-    {
-      "anonymous": false,
-      "inputs": [
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "proxy",
-          "type": "address"
-        },
-        {
-          "indexed": false,
-          "internalType": "address",
-          "name": "token",
-          "type": "address"
-        }
-      ],
-      "name": "Deployed",
-      "type": "event"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "contract ERC20",
-          "name": "token",
-          "type": "address"
-        },
-        {
-          "internalType": "bytes32",
-          "name": "paramsHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "clone",
-      "outputs": [
-        {
-          "internalType": "contract GoodAaveStakingV2",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "contract ERC20",
-          "name": "token",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "_lendingPool",
-          "type": "address"
-        },
-        {
-          "internalType": "contract INameService",
-          "name": "_ns",
-          "type": "address"
-        },
-        {
-          "internalType": "uint64",
-          "name": "_maxRewardThreshold",
-          "type": "uint64"
-        },
-        {
-          "internalType": "address",
-          "name": "_tokenUsdOracle",
-          "type": "address"
-        },
-        {
-          "internalType": "contract IAaveIncentivesController",
-          "name": "_incentiveController",
-          "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "_aaveUSDOracle",
-          "type": "address"
-        },
-        {
-          "internalType": "address[]",
-          "name": "_tokenToDaiSwapPath",
-          "type": "address[]"
-        }
-      ],
-      "name": "cloneAndInit",
-      "outputs": [],
-      "stateMutability": "nonpayable",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "impl",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "contract ERC20",
-          "name": "token",
-          "type": "address"
-        },
-        {
-          "internalType": "bytes32",
-          "name": "paramsHash",
-          "type": "bytes32"
-        }
-      ],
-      "name": "predictAddress",
-      "outputs": [
-        {
-          "internalType": "address",
-          "name": "",
-          "type": "address"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x60806040526040516100109061005f565b604051809103906000f08015801561002c573d6000803e3d6000fd5b50600080546001600160a01b0319166001600160a01b039290921691909117905534801561005957600080fd5b5061006c565b615c9180610bb783390190565b610b3c8061007b6000396000f3fe608060405234801561001057600080fd5b506004361061004c5760003560e01c80638abf607714610051578063cb1939421461007a578063da2030671461008d578063db0669a8146100a0575b600080fd5b600054610064906001600160a01b031681565b6040516100719190610537565b60405180910390f35b610064610088366004610563565b6100b5565b61006461009b366004610563565b610100565b6100b36100ae366004610696565b610190565b005b60006100f783836040516020016100cd929190610761565b60408051601f1981840301815291905280516020909101206000546001600160a01b031690610433565b90505b92915050565b6000806101438484604051602001610119929190610761565b60408051601f1981840301815291905280516020909101206000546001600160a01b031690610499565b604080516001600160a01b038084168252871660208201529192507f09e48df7857bd0c1e0d31bb8a85d42cf1874817895f171c917f6ee2cea73ec20910160405180910390a19392505050565b6040516001600160601b0319606089811b8216602084015288811b821660348401526001600160c01b031960c089901b16604884015286811b8216605084015285811b8216606484015284901b16607882015260009061020a908a90608c0160405160208183030381529060405280519060200120610100565b90506000886001600160a01b03166335ea6a758b6040518263ffffffff1660e01b815260040161023a9190610537565b6101806040518083038186803b15801561025357600080fd5b505afa158015610267573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028b9190610807565b60e001519050816001600160a01b031663995a12298b8b8b856001600160a01b03166306fdde036040518163ffffffff1660e01b815260040160006040518083038186803b1580156102dc57600080fd5b505afa1580156102f0573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526103189190810190610924565b60405160200161032891906109b7565b604051602081830303815290604052866001600160a01b03166395d89b416040518163ffffffff1660e01b815260040160006040518083038186803b15801561037057600080fd5b505afa158015610384573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526103ac9190810190610924565b6040516020016103bc91906109f1565b6040516020818303038152906040528d8d8d8d8d6040518b63ffffffff1660e01b81526004016103f59a99989796959493929190610a46565b600060405180830381600087803b15801561040f57600080fd5b505af1158015610423573d6000803e3d6000fd5b5050505050505050505050505050565b60006100f7838330604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b8152606093841b60148201526f5af43d82803e903d91602b57fd5bf3ff60801b6028820152921b6038830152604c8201526037808220606c830152605591012090565b6000604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528360601b60148201526e5af43d82803e903d91602b57fd5bf360881b6028820152826037826000f59150506001600160a01b0381166100fa5760405162461bcd60e51b8152602060048201526017602482015276115490cc4c4d8dce8818dc99585d194c8819985a5b1959604a1b604482015260640160405180910390fd5b6001600160a01b0391909116815260200190565b6001600160a01b038116811461056057600080fd5b50565b6000806040838503121561057657600080fd5b82356105818161054b565b946020939093013593505050565b803561059a8161054b565b919050565b634e487b7160e01b600052604160045260246000fd5b60405161018081016001600160401b03811182821017156105d8576105d861059f565b60405290565b604051601f8201601f191681016001600160401b03811182821017156106065761060661059f565b604052919050565b600082601f83011261061f57600080fd5b813560206001600160401b0382111561063a5761063a61059f565b8160051b6106498282016105de565b928352848101820192828101908785111561066357600080fd5b83870192505b8483101561068b57823561067c8161054b565b82529183019190830190610669565b979650505050505050565b600080600080600080600080610100898b0312156106b357600080fd5b88356106be8161054b565b975060208901356106ce8161054b565b965060408901356106de8161054b565b955060608901356001600160401b0380821682146106fb57600080fd5b90955060808a01359061070d8261054b565b90945060a08a01359061071f8261054b565b81945061072e60c08c0161058f565b935060e08b013591508082111561074457600080fd5b506107518b828c0161060e565b9150509295985092959890939650565b60609290921b6001600160601b0319168252601482015260340190565b60006020828403121561079057600080fd5b604051602081016001600160401b03811182821017156107b2576107b261059f565b6040529151825250919050565b80516001600160801b038116811461059a57600080fd5b805164ffffffffff8116811461059a57600080fd5b805161059a8161054b565b805160ff8116811461059a57600080fd5b6000610180828403121561081a57600080fd5b6108226105b5565b61082c848461077e565b815261083a602084016107bf565b602082015261084b604084016107bf565b604082015261085c606084016107bf565b606082015261086d608084016107bf565b608082015261087e60a084016107bf565b60a082015261088f60c084016107d6565b60c08201526108a060e084016107eb565b60e08201526101006108b38185016107eb565b908201526101206108c58482016107eb565b908201526101406108d78482016107eb565b908201526101606108e98482016107f6565b908201529392505050565b60005b8381101561090f5781810151838201526020016108f7565b8381111561091e576000848401525b50505050565b60006020828403121561093657600080fd5b81516001600160401b038082111561094d57600080fd5b818401915084601f83011261096157600080fd5b8151818111156109735761097361059f565b610986601f8201601f19166020016105de565b915080825285602082850101111561099d57600080fd5b6109ae8160208401602086016108f4565b50949350505050565b71023b7b7b220b0bb32a9ba30b5b4b733ab19160751b8152600082516109e48160128501602087016108f4565b9190910160120192915050565b606760f81b815260008251610a0d8160018501602087016108f4565b9190910160010192915050565b60008151808452610a328160208601602086016108f4565b601f01601f19169290920160200192915050565b600061014060018060a01b03808e1684526020818e1681860152818d166040860152826060860152610a7a8386018d610a1a565b92508483036080860152610a8e838c610a1a565b6001600160401b038b1660a087015289831660c087015288831660e0870152878316610100870152858103610120870152865180825282880194509082019060005b81811015610aee578551851683529483019491830191600101610ad0565b5050809450505050509b9a505050505050505050505056fea2646970667358221220b10b14ec40c566252f956304029fc271d821d09284068fca444502be17e5e08064736f6c63430008080033608060405260d2805462ffffff60a81b1916604b60aa1b17905534801561002557600080fd5b50615c5b80620000366000396000f3fe608060405234801561001057600080fd5b50600436106102885760003560e01c806302329a291461028d57806306fdde03146102a2578063095ea7b3146102c057806309b04fb4146102e35780630cd865ec1461031e57806318160ddd146103315780631b3c90a8146103435780631ce720f31461034b57806323b872dd1461037157806328e964e9146103845780632ba7cff9146103d35780632bbbdc89146103f3578063313ce56714610406578063374559901461040e578063395093511461043c5780633a6080321461044f5780633e6326fc14610458578063408cfe241461046b5780634162169f1461047e57806343d93ca01461049157806346b30ff5146104a45780634a291b01146104ac578063561b2463146104de578063574c5c93146104f15780635a6d735c146105045780635aef7de6146105155780635b9fe37f1461052857806370a082311461053b5780638824d07d14610564578063899e1b6c1461059057806389eb6426146105c257806395d89b41146105d5578063995a1229146105dd5780639c81ff6b146105f0578063a457c2d714610603578063a59a997314610616578063a82415ae14610629578063a87430ba1461063c578063a9059cbb146106f9578063a9f8d1811461070c578063ad1e5d7514610726578063b0ce7abb14610739578063b0f479a11461074c578063b187bd2614610754578063b76e230e14610768578063bea281151461077f578063c7b8981c14610792578063dd62ed3e1461079a578063e1758bd8146107d3578063e319828c146107db578063e32f1726146107ee578063e660b53f14610801578063ead8dbd414610809578063edb5b8631461081c578063f412a6af1461082f578063fc0c546a14610859575b600080fd5b6102a061029b366004614d73565b61086c565b005b6102aa610892565b6040516102b79190614d90565b60405180910390f35b6102d36102ce366004614e0a565b610924565b60405190151581526020016102b7565b6102f66102f1366004614e36565b61093b565b604080519586526020860194909452928401919091526060830152608082015260a0016102b7565b6102a061032c366004614e6f565b610b6e565b6035545b6040519081526020016102b7565b6102a0610d71565b609a5461035f90600160c01b900460ff1681565b60405160ff90911681526020016102b7565b6102d361037f366004614e8c565b610eb6565b6103be610392366004614e6f565b6001600160a01b03166000908152609e6020526040902054609b546001600160801b0391821692911690565b604080519283526020830191909152016102b7565b60d6546103e6906001600160a01b031681565b6040516102b79190614ecd565b6102a0610401366004614ef3565b610f60565b61035f610fa7565b61042161041c366004614e6f565b611029565b604080519384526020840192909252908201526060016102b7565b6102d361044a366004614e0a565b61112f565b610335609d5481565b6067546103e6906001600160a01b031681565b60d2546103e6906001600160a01b031681565b6065546103e6906001600160a01b031681565b6102a061049f366004614f21565b61116b565b6102a0611197565b609b546104c690600160801b90046001600160801b031681565b6040516001600160801b0390911681526020016102b7565b6102a06104ec366004614f46565b6112d1565b6103356104ff366004614f7f565b61190f565b610335610512366004614fba565b90565b6066546103e6906001600160a01b031681565b60d5546103e6906001600160a01b031681565b610335610549366004614e6f565b6001600160a01b031660009081526033602052604090205490565b60d65461057b90600160c01b900463ffffffff1681565b60405163ffffffff90911681526020016102b7565b609a546105aa90600160801b90046001600160401b031681565b6040516001600160401b0390911681526020016102b7565b60d3546103e6906001600160a01b031681565b6102aa6119fd565b6102a06105eb366004615168565b611a0c565b609c546104c6906001600160801b031681565b6102d3610611366004614e0a565b611c87565b60d4546103e6906001600160a01b031681565b610335610637366004614f7f565b611d20565b6106a561064a366004614e6f565b609e602052600090815260409020805460018201546002909201546001600160801b0380831693600160801b9384900482169381831693918190048316928216916001600160401b03918104821691600160c01b9091041687565b604080516001600160801b039889168152968816602088015294871694860194909452918516606085015290931660808301526001600160401b0392831660a08301529190911660c082015260e0016102b7565b6102d3610707366004614e0a565b611fbd565b609c546104c690600160801b90046001600160801b031681565b610335610734366004615266565b611fca565b6103e6610747366004614fba565b61206e565b6103e6612098565b60d2546102d390600160a01b900460ff1681565b60d65461057b90600160a01b900463ffffffff1681565b609b546104c6906001600160801b031681565b6102a0612117565b6103356107a836600461529b565b6001600160a01b03918216600090815260346020908152604080832093909416825291909152205490565b6103e66122a2565b609a546104c6906001600160801b031681565b6102a06107fc3660046152c9565b6122ee565b61057b61255d565b6102a0610817366004615377565b61267f565b6103be61082a366004614e6f565b612d2a565b60d25461084590600160a81b900462ffffff1681565b60405162ffffff90911681526020016102b7565b60d1546103e6906001600160a01b031681565b610874612ebc565b60d28054911515600160a01b0260ff60a01b19909216919091179055565b6060603680546108a19061539c565b80601f01602080910402602001604051908101604052809291908181526020018280546108cd9061539c565b801561091a5780601f106108ef5761010080835404028352916020019161091a565b820191906000526020600020905b8154815290600101906020018083116108fd57829003601f168201915b5050505050905090565b6000610931338484612f90565b5060015b92915050565b60d2546040516370a0823160e01b815260009182918291829182916001600160a01b03169081906370a0823190610976903090600401614ecd565b60206040518083038186803b15801561098e57600080fd5b505afa1580156109a2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109c691906153d7565b9350876109d4576000610a65565b60d35460d1546040805163313ce56760e01b81529051610a65936001600160a01b0390811693899391169163313ce56791600480820192602092909190829003018186803b158015610a2557600080fd5b505afa158015610a39573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a5d9190615401565b60ff16611fca565b6040805160018082528183019092529194506000919060208083019080368337505060d15482519293506001600160a01b031691839150600090610aab57610aab61541c565b6001600160a01b0390921660209283029190910190910152609b546001600160801b03168511610ae7575060009550859450849150610b649050565b609b54610afd906001600160801b031686615448565b955085965087610b0e576000610b5f565b60d35460d1546040805163313ce56760e01b81529051610b5f936001600160a01b03908116938b9391169163313ce56791600480820192602092909190829003018186803b158015610a2557600080fd5b925050505b9295509295909350565b610b76612ebc565b6040516370a0823160e01b81526000906001600160a01b038316906370a0823190610ba5903090600401614ecd565b60206040518083038186803b158015610bbd57600080fd5b505afa158015610bd1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610bf591906153d7565b60d2549091506001600160a01b0383811691161415610ca157609b546001600160801b0316158015610c30575060d254600160a01b900460ff165b610ca15760405162461bcd60e51b815260206004820152603760248201527f63616e207265636f7665722069546f6b656e206f6e6c79207768656e2073746160448201527635b2b9903430bb32903132b2b7103bb4ba34323930bbb760491b60648201526084015b60405180910390fd5b60665460405163a9059cbb60e01b81526001600160a01b038481169263a9059cbb92610cd59290911690859060040161545f565b602060405180830381600087803b158015610cef57600080fd5b505af1158015610d03573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d279190615478565b610d6d5760405162461bcd60e51b81526020600482015260176024820152761c9958dbdd995c881d1c985b9cd9995c8819985a5b1959604a1b6044820152606401610c98565b5050565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015610dcf57600080fd5b505afa158015610de3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e0791906154a0565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de691600480820192602092909190829003018186803b158015610e5c57600080fd5b505afa158015610e70573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e9491906154a0565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b6000610ec38484846130b4565b6001600160a01b038416600090815260346020908152604080832033845290915290205482811015610f485760405162461bcd60e51b815260206004820152602860248201527f45524332303a207472616e7366657220616d6f756e74206578636565647320616044820152676c6c6f77616e636560c01b6064820152608401610c98565b610f558533858403612f90565b506001949350505050565b610f68612ebc565b60d68054600160a01b600160e01b031916600160a01b63ffffffff9485160263ffffffff60c01b191617600160c01b9290931691909102919091179055565b60d1546040805163313ce56760e01b815290516000926001600160a01b03169163313ce567916004808301926020929190829003018186803b158015610fec57600080fd5b505afa158015611000573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906110249190615401565b905090565b6000806000611036613394565b6001600160a01b0384163014156110a05760405162461bcd60e51b815260206004820152602860248201527f526563697069656e742063616e6e6f7420626520746865207374616b696e672060448201526718dbdb9d1c9858dd60c21b6064820152608401610c98565b6000806110ae60008061093b565b505050915091506110bf8287613480565b604080516001600160a01b038b16815260208101879052908101859052606081018490526080810183905260a0810182905292975090955093507f38c2c21f82a20481909d7aef48247b0743f69728fbb599c274039e2eecf8bb179060c00160405180910390a150509193909250565b3360008181526034602090815260408083206001600160a01b038716845290915281205490916109319185906111669086906154bd565b612f90565b611173612ebc565b60d2805462ffffff909216600160a81b0262ffffff60a81b19909216919091179055565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906111c6906004016154d5565b60206040518083038186803b1580156111de57600080fd5b505afa1580156111f2573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061121691906154a0565b90506001600160a01b038116156112ce5760408051600180825281830190925260009160208083019080368337019050509050308160008151811061125d5761125d61541c565b6001600160a01b03928316602091820292909201015260405163455518ef60e11b815290831690638aaa31de9061129a903390859060040161553f565b600060405180830381600087803b1580156112b457600080fd5b505af11580156112c8573d6000803e3d6000fd5b50505050505b50565b6002609f5414156112f45760405162461bcd60e51b8152600401610c989061556b565b6002609f5560d254600160a01b900460ff16156113475760405162461bcd60e51b815260206004820152601160248201527014dd185ada5b99c81a5cc81c185d5cd959607a1b6044820152606401610c98565b8115806113545750816064145b6113af5760405162461bcd60e51b815260206004820152602660248201527f446f6e6174696f6e2070657263656e746167652073686f756c6420626520302060448201526506f72203130360d41b6064820152608401610c98565b600083116114115760405162461bcd60e51b815260206004820152602960248201527f596f75206e65656420746f207374616b65206120706f73697469766520746f6b604482015268195b88185b5bdd5b9d60ba1b6064820152608401610c98565b806114275760d1546001600160a01b0316611434565b60d2546001600160a01b03165b6001600160a01b03166323b872dd336040516001600160e01b031960e084901b1681526001600160a01b03909116600482015230602482015260448101869052606401602060405180830381600087803b15801561149157600080fd5b505af11580156114a5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906114c99190615478565b6115385760405162461bcd60e51b815260206004820152603a60248201527f7472616e7366657246726f6d206661696c65642c206d616b652073757265207960448201527937ba9030b8383937bb32b2103a37b5b2b7103a3930b739b332b960311b6064820152608401610c98565b806115435782611545565b825b92508061155557611555836137f0565b61155f3384613868565b60675460405163bf40fac160e01b8152600091829182916001600160a01b03169063bf40fac190611592906004016155a2565b60206040518083038186803b1580156115aa57600080fd5b505afa1580156115be573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115e291906154a0565b6001600160a01b031663d0250144306040518263ffffffff1660e01b815260040161160d9190614ecd565b60806040518083038186803b15801561162557600080fd5b505afa158015611639573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061165d91906155c8565b5092509250925061169061166e3390565b878563ffffffff16856001600160401b0316856001600160401b03168a613935565b5060675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906116c0906004016154d5565b60206040518083038186803b1580156116d857600080fd5b505afa1580156116ec573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061171091906154a0565b90506001600160a01b038116156118ba5760d1546040805163313ce56760e01b815290516000926001600160a01b03169163313ce567916004808301926020929190829003018186803b15801561176657600080fd5b505afa15801561177a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061179e9190615401565b60ff166012146118535760d160009054906101000a90046001600160a01b03166001600160a01b031663313ce5676040518163ffffffff1660e01b815260040160206040518083038186803b1580156117f657600080fd5b505afa15801561180a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061182e9190615401565b611839906012615627565b61184490600a61572e565b61184e908961573d565b611855565b875b60405163a39b215360e01b81529091506001600160a01b0383169063a39b215390611886903390859060040161545f565b600060405180830381600087803b1580156118a057600080fd5b505af11580156118b4573d6000803e3d6000fd5b50505050505b60d15460405133917f5dac0c1b1112564a045ba943c9d50270893e8e826c49be8e7073adc713ab7bd7916118f9916001600160a01b0316908b9061545f565b60405180910390a250506001609f555050505050565b6001600160a01b0384166000908152609e6020526040812061192f613394565b61193a8585856139bf565b80546119529087906001600160801b03166001613b5e565b6001810180546001600160801b03808216909255600283018054600160801b90920483169283926000916119889185911661575c565b82546101009290920a6001600160801b03818102199093169183160217909155609a546119b8925083911661575c565b609a80546001600160801b0319166001600160801b03929092169190911790556119e9662386f26fc100008261579d565b6001600160801b0316979650505050505050565b6060603780546108a19061539c565b60d480546001600160a01b0319166001600160a01b038b169081179091556040516335ea6a7560e01b8152600091906335ea6a7590611a4f908e90600401614ecd565b6101806040518083038186803b158015611a6857600080fd5b505afa158015611a7c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611aa09190615830565b9050611ab48b8260e001518b8b8b8b6122ee565b8a6001600160a01b031682600081518110611ad157611ad161541c565b60200260200101516001600160a01b0316148015611bb4575060675460405163bf40fac160e01b815260206004820152600360248201526244414960e81b60448201526001600160a01b039091169063bf40fac19060640160206040518083038186803b158015611b4157600080fd5b505afa158015611b55573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b7991906154a0565b6001600160a01b03168260018451611b919190615448565b81518110611ba157611ba161541c565b60200260200101516001600160a01b0316145b611bfe5760405162461bcd60e51b815260206004820152601b60248201527a0d2dcecc2d8d2c840bee8ded6cadca8de88c2d2a6eec2e0a0c2e8d602b1b6044820152606401610c98565b8151611c119060d7906020850190614c77565b5060d380546001600160a01b03199081166001600160a01b038881169190911790925560d5805490911686831617905560d680549185166001600160c01b031990921691909117613d0960a41b1763ffffffff60c01b1916610c3560c41b179055611c7a613ffb565b5050505050505050505050565b3360009081526034602090815260408083206001600160a01b038616845290915281205482811015611d095760405162461bcd60e51b815260206004820152602560248201527f45524332303a2064656372656173656420616c6c6f77616e63652062656c6f77604482015264207a65726f60d81b6064820152608401610c98565b611d163385858403612f90565b5060019392505050565b6001600160a01b0384166000908152609e60209081526040808320815160e08101835281546001600160801b038082168352600160801b91829004811695830195909552600183015480861694830194909452928390048416606082015260029091015480841660808301526001600160401b03838204811660a0840152600160c01b9091041660c0820152609d54609b54919390928592041615801590611dc85750854310155b8015611dd45750438510155b15611f9857609c54600090611df990600160801b90046001600160801b031643615448565b90506000611e0e89662386f26fc1000061573d565b611e18908361573d565b90506000806000611e288861418c565b609a549295509093509150611e4890600160c01b900460ff16600a61572e565b609b54611e659190600160801b90046001600160801b031661573d565b611e7a85676765c793fa10079d601b1b61573d565b611e84919061591d565b611e8e90886154bd565b9650878315611f915780604001516001600160801b0316676765c793fa10079d601b1b89609a60189054906101000a900460ff16600a611ece919061572e565b84602001516001600160801b0316611ee6919061573d565b611ef0919061573d565b611efa919061591d565b611f049190615448565b96506000611f1a85670de0b6b3a764000061573d565b611f2f89676765c793fa10079d601b1b61573d565b611f39919061591d565b905064174876e80081611f4d85606461573d565b600a611f5a88606461573d565b611f6590600561573d565b611f6f919061591d565b611f7991906154bd565b611f83919061573d565b611f8d919061591d565b9750505b5050505050505b8083606001516001600160801b0316611fb191906154bd565b98975050505050505050565b60006109313384846130b4565b6000808490506000816001600160a01b03166350d25bcd6040518163ffffffff1660e01b815260040160206040518083038186803b15801561200b57600080fd5b505afa15801561201f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061204391906153d7565b905061205084600a615931565b61205a868361573d565b612064919061591d565b9695505050505050565b60d7818154811061207e57600080fd5b6000918252602090912001546001600160a01b0316905081565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906120c79060040161593d565b60206040518083038186803b1580156120df57600080fd5b505afa1580156120f3573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061102491906154a0565b6002609f54141561213a5760405162461bcd60e51b8152600401610c989061556b565b6002609f5560675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac19061216d906004016155a2565b60206040518083038186803b15801561218557600080fd5b505afa158015612199573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906121bd91906154a0565b60675460405163bf40fac160e01b81526001600160a01b039283169263f03b289092169063bf40fac1906121f390600401615965565b60206040518083038186803b15801561220b57600080fd5b505afa15801561221f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061224391906154a0565b336040518363ffffffff1660e01b8152600401612261929190615983565b600060405180830381600087803b15801561227b57600080fd5b505af115801561228f573d6000803e3d6000fd5b5050505061229b611197565b6001609f55565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac1906064016120c7565b600054610100900460ff1680612307575060005460ff16155b6123235760405162461bcd60e51b8152600401610c989061599d565b600054610100900460ff16158015612345576000805461ffff19166101011790555b61234e85614249565b60d180546001600160a01b03808a166001600160a01b03199283161790925560d2805492891692909116919091179055612388848461426c565b60d1546040805163313ce56760e01b815290516012926001600160a01b03169163313ce567916004808301926020929190829003018186803b1580156123cd57600080fd5b505afa1580156123e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124059190615401565b60ff16111561246d5760405162461bcd60e51b815260206004820152602e60248201527f546f6b656e20646563696d616c732073686f756c64206265206c65737320746860448201526d616e20313820646563696d616c7360901b6064820152608401610c98565b60d160009054906101000a90046001600160a01b03166001600160a01b031663313ce5676040518163ffffffff1660e01b815260040160206040518083038186803b1580156124bb57600080fd5b505afa1580156124cf573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906124f39190615401565b6124fe906012615627565b609a8054600160801b600160c81b031916600160c01b60ff9390931692909202600160801b600160c01b03191691909117600160801b6001600160401b038516021790558015612554576000805461ff00191690555b50505050505050565b60408051600180825281830190925260009182919060208083019080368337505060d25482519293506001600160a01b0316918391506000906125a2576125a261541c565b6001600160a01b03928316602091820292909201015260d5546040516345accf9360e11b81526000929190911690638b599f26906125e690859030906004016159eb565b60206040518083038186803b1580156125fe57600080fd5b505afa158015612612573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061263691906153d7565b905080156126685760d6546126619063ffffffff600160c01b8204811691600160a01b900416615a15565b9250505090565b505060d654600160a01b900463ffffffff16919050565b6002609f5414156126a25760405162461bcd60e51b8152600401610c989061556b565b6002609f55600081156127595760d25460405163a9059cbb60e01b815284916001600160a01b03169063a9059cbb906126e1903390859060040161545f565b602060405180830381600087803b1580156126fb57600080fd5b505af115801561270f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906127339190615478565b61274f5760405162461bcd60e51b8152600401610c9890615a34565b9250829050612893565b5081612764816142ec565b60d1546040516370a0823160e01b81526000916001600160a01b0316906370a0823190612795903090600401614ecd565b60206040518083038186803b1580156127ad57600080fd5b505afa1580156127c1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906127e591906153d7565b9050818110156127f3578091505b60d1546001600160a01b031663a9059cbb33846040518363ffffffff1660e01b815260040161282392919061545f565b602060405180830381600087803b15801561283d57600080fd5b505af1158015612851573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906128759190615478565b6128915760405162461bcd60e51b8152600401610c9890615a34565b505b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906128c2906004016155a2565b60206040518083038186803b1580156128da57600080fd5b505afa1580156128ee573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061291291906154a0565b905061291e33856143e0565b6000806000836001600160a01b031663d0250144306040518263ffffffff1660e01b815260040161294f9190614ecd565b60806040518083038186803b15801561296757600080fd5b505afa15801561297b573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061299f91906155c8565b509250925092506129d16129b03390565b888563ffffffff16856001600160401b0316856001600160401b031661451c565b5060675460405163bf40fac160e01b81526001600160a01b038087169263f03b28909291169063bf40fac190612a0990600401615965565b60206040518083038186803b158015612a2157600080fd5b505afa158015612a35573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612a5991906154a0565b336040518363ffffffff1660e01b8152600401612a77929190615983565b600060405180830381600087803b158015612a9157600080fd5b505af1158015612aa5573d6000803e3d6000fd5b505060675460405163bf40fac160e01b8152600093506001600160a01b03909116915063bf40fac190612ada906004016154d5565b60206040518083038186803b158015612af257600080fd5b505afa158015612b06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612b2a91906154a0565b90506001600160a01b03811615612cd45760d1546040805163313ce56760e01b815290516000926001600160a01b03169163313ce567916004808301926020929190829003018186803b158015612b8057600080fd5b505afa158015612b94573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612bb89190615401565b60ff16601214612c6d5760d160009054906101000a90046001600160a01b03166001600160a01b031663313ce5676040518163ffffffff1660e01b815260040160206040518083038186803b158015612c1057600080fd5b505afa158015612c24573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612c489190615401565b612c53906012615627565b612c5e90600a61572e565b612c68908a61573d565b612c6f565b885b604051631f22c54760e11b81529091506001600160a01b03831690633e458a8e90612ca0903390859060040161545f565b600060405180830381600087803b158015612cba57600080fd5b505af1158015612cce573d6000803e3d6000fd5b50505050505b60d15460405133917f89b2bca2609b9ce42215fdd646f9162cdfb9c1620c93db1cc6302479489d3f3291612d13916001600160a01b0316908a9061545f565b60405180910390a250506001609f55505050505050565b60675460405163bf40fac160e01b815260009182918291829182916001600160a01b03169063bf40fac190612d61906004016155a2565b60206040518083038186803b158015612d7957600080fd5b505afa158015612d8d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612db191906154a0565b6001600160a01b031663d0250144306040518263ffffffff1660e01b8152600401612ddc9190614ecd565b60806040518083038186803b158015612df457600080fd5b505afa158015612e08573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612e2c91906155c8565b509250925092506000612e59878563ffffffff16856001600160401b0316856001600160401b0316611d20565b6001600160a01b0388166000908152609e6020526040902060020154909150612e9390662386f26fc10000906001600160801b031661579d565b612ea4662386f26fc100008361591d565b6001600160801b039091169890975095505050505050565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de6916004808301926020929190829003018186803b158015612f0057600080fd5b505afa158015612f14573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190612f3891906154a0565b6001600160a01b031614612f8e5760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f646044820152606401610c98565b565b6001600160a01b038316612ff25760405162461bcd60e51b8152602060048201526024808201527f45524332303a20617070726f76652066726f6d20746865207a65726f206164646044820152637265737360e01b6064820152608401610c98565b6001600160a01b0382166130535760405162461bcd60e51b815260206004820152602260248201527f45524332303a20617070726f766520746f20746865207a65726f206164647265604482015261737360f01b6064820152608401610c98565b6001600160a01b0383811660008181526034602090815260408083209487168084529482529182902085905590518481527f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925910160405180910390a3505050565b6130bf8383836145a6565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac1906130ee906004016154d5565b60206040518083038186803b15801561310657600080fd5b505afa15801561311a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061313e91906154a0565b60675460405163bf40fac160e01b8152919250600091829182916001600160a01b039091169063bf40fac190613176906004016155a2565b60206040518083038186803b15801561318e57600080fd5b505afa1580156131a2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906131c691906154a0565b6001600160a01b031663d0250144306040518263ffffffff1660e01b81526004016131f19190614ecd565b60806040518083038186803b15801561320957600080fd5b505afa15801561321d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061324191906155c8565b5092509250925061326d87868563ffffffff16856001600160401b0316856001600160401b031661451c565b5061329586868563ffffffff16856001600160401b0316856001600160401b03166000613935565b506001600160a01b0384161561255457606030816000815181106132bb576132bb61541c565b6001600160a01b039283166020918202929092010152604051631f22c54760e11b815290861690633e458a8e906132f8908b908a9060040161545f565b600060405180830381600087803b15801561331257600080fd5b505af1158015613326573d6000803e3d6000fd5b505060405163a39b215360e01b81526001600160a01b038816925063a39b21539150613358908a908a9060040161545f565b600060405180830381600087803b15801561337257600080fd5b505af1158015613386573d6000803e3d6000fd5b505050505050505050505050565b60675460405163bf40fac160e01b81526001600160a01b039091169063bf40fac1906133c2906004016155a2565b60206040518083038186803b1580156133da57600080fd5b505afa1580156133ee573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061341291906154a0565b6001600160a01b0316336001600160a01b031614612f8e5760405162461bcd60e51b815260206004820152602560248201527f4f6e6c792046756e644d616e616765722063616e2063616c6c2074686973206d604482015264195d1a1bd960da1b6064820152608401610c98565b6000806000306001600160a01b031673__$a7857c79f7039505337147dc025cce365e$__63f10a60ab909160d160009054906101000a90046001600160a01b031660d76001815481106134d5576134d561541c565b60009182526020909120015460d25460405160e086901b6001600160e01b03191681526001600160a01b03948516600482015292841660248401529216604482015260648101899052600160a81b90910462ffffff16608482015260a40160206040518083038186803b15801561354b57600080fd5b505af415801561355f573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061358391906153d7565b60d45460d154604051631a4ca37b60e21b81529295506001600160a01b03918216926369328dec926135bd92169087903090600401615a66565b602060405180830381600087803b1580156135d757600080fd5b505af11580156135eb573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061360f91906153d7565b5060d1546040516370a0823160e01b81526001600160a01b03909116906370a0823190613640903090600401614ecd565b60206040518083038186803b15801561365857600080fd5b505afa15801561366c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061369091906153d7565b6040805160018082528183019092529194506000919060208083019080368337505060d25482519293506001600160a01b0316918391506000906136d6576136d661541c565b6001600160a01b03928316602091820292909201015260d554606654604051633111e7b360e01b815291831692633111e7b39261371e92869260001992911690600401615a89565b602060405180830381600087803b15801561373857600080fd5b505af115801561374c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061377091906153d7565b925083156137e8576137e560d78054806020026020016040519081016040528092919081815260200182805480156137d157602002820191906000526020600020905b81546001600160a01b031681526001909101906020018083116137b3575b5030949350899250600091508a9050614763565b91505b509250925092565b60d45460d15460405163e8eda9df60e01b81526001600160a01b039182166004820152602481018490523060448201526000606482015291169063e8eda9df90608401600060405180830381600087803b15801561384d57600080fd5b505af1158015613861573d6000803e3d6000fd5b5050505050565b6001600160a01b0382166138be5760405162461bcd60e51b815260206004820152601f60248201527f45524332303a206d696e7420746f20746865207a65726f2061646472657373006044820152606401610c98565b80603560008282546138d091906154bd565b90915550506001600160a01b038216600090815260336020526040812080548392906138fd9084906154bd565b90915550506040518181526001600160a01b03831690600090600080516020615c068339815191529060200160405180910390a35050565b60006139428585856139bf565b6001600160a01b0387166000908152609e602052604090205461397b9088906139759089906001600160801b03166154bd565b84613b5e565b609b546139929087906001600160801b03166154bd565b609b80546001600160801b0319166001600160801b03929092169190911790555060019695505050505050565b609b54600160801b90046001600160801b03166139f5575050609c80546001600160801b03438116600160801b02911617905550565b814310158015613a165750609c54600160801b90046001600160801b031682115b15613a3657609c80546001600160801b03808516600160801b0291161790555b609c54600090600160801b90046001600160801b031683118015613a5a5750824310155b613a7657609c54600160801b90046001600160801b0316613a78565b825b90506000824311613a895743613a8b565b825b905083811080613a9b5750828210155b15613aa7575050505050565b6000613ab38383615448565b90506000613ac887662386f26fc1000061573d565b613ad2908361573d565b609a54909150613aed90600160c01b900460ff16600a61572e565b609b54613b0a9190600160801b90046001600160801b031661573d565b613b1f82676765c793fa10079d601b1b61573d565b613b29919061591d565b609d54613b3691906154bd565b609d555050609c80546001600160801b03928316600160801b02921691909117905550505050565b6001600160a01b0383166000908152609e6020526040902080546001600160801b0380821691600160801b9004168015613d6f576040805160e08101825284546001600160801b038082168352600160801b91829004811660208401526001870154808216948401949094529281900483166060830152600286015492831660808301526001600160401b03908304811660a0830152600160c01b90920490911660c082015260009081908190613c149061418c565b92509250925082600014613d67576001860154609d54609a546000926001600160801b031691676765c793fa10079d601b1b91613c5c90600160c01b900460ff16600a61572e565b613c66908961573d565b613c70919061573d565b613c7a919061591d565b613c849190615448565b9050600084613c9783633b9aca0061573d565b613ca1919061591d565b905064174876e80081613cb585606461573d565b600a613cc288606461573d565b613ccd90600561573d565b613cd7919061591d565b613ce191906154bd565b613ceb919061573d565b613cf5919061591d565b6001890154909250613d18908390600160801b90046001600160801b03166154bd565b6001890180546001600160801b03928316600160801b02908316179055609c54613d44918491166154bd565b609c80546001600160801b0319166001600160801b039290921691909117905550505b505050613d92565b6002830180546001600160c01b0316600160c01b436001600160401b0316021790555b818511613e90576002830180546001600160c01b0316600160c01b436001600160401b0316021790558115613e8b5782546000908390600160801b90046001600160801b0316613de28883615448565b613dec919061573d565b613df6919061591d565b845490915081908590601090613e1d908490600160801b90046001600160801b0316615abc565b92506101000a8154816001600160801b0302191690836001600160801b0316021790555080609b60108282829054906101000a90046001600160801b0316613e659190615abc565b92506101000a8154816001600160801b0302191690836001600160801b03160217905550505b613f38565b83613f3857613e9f8286615448565b83548490601090613ec1908490600160801b90046001600160801b031661575c565b92506101000a8154816001600160801b0302191690836001600160801b031602179055508185613ef19190615448565b609b8054601090613f13908490600160801b90046001600160801b031661575c565b92506101000a8154816001600160801b0302191690836001600160801b031602179055505b600283018054600160801b600160c01b031916600160801b436001600160401b03160217905582546001600160801b0319166001600160801b038616178355609d54609a54676765c793fa10079d601b1b9190613fa090600160c01b900460ff16600a61572e565b8554613fbc9190600160801b90046001600160801b031661573d565b613fc6919061573d565b613fd0919061591d565b60019390930180546001600160801b0319166001600160801b03909416939093179092555050505050565b60675460405163bf40fac160e01b81526000916001600160a01b03169063bf40fac19061402a9060040161593d565b60206040518083038186803b15801561404257600080fd5b505afa158015614056573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061407a91906154a0565b60d15460405163095ea7b360e01b81529192506001600160a01b03169063095ea7b3906140af9084906000199060040161545f565b602060405180830381600087803b1580156140c957600080fd5b505af11580156140dd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906141019190615478565b5060d15460d45460405163095ea7b360e01b81526001600160a01b039283169263095ea7b39261413a929116906000199060040161545f565b602060405180830381600087803b15801561415457600080fd5b505af1158015614168573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d6d9190615478565b6000806000808460c001518560a001516141a69190615ae4565b609a5460c08701516001600160401b0392831693506000926141dc92600160801b90048116916141d7911643615448565b614b5f565b905060008660a001516001600160401b0316436141f99190615448565b609a54909150600090600160801b90046001600160401b0316841015614228576142238484615448565b61422b565b60005b905060006142398284615448565b9299919850919650945050505050565b606780546001600160a01b0319166001600160a01b0383161790556112ce610d71565b600054610100900460ff1680614285575060005460ff16155b6142a15760405162461bcd60e51b8152600401610c989061599d565b600054610100900460ff161580156142c3576000805461ffff19166101011790555b6142cb614b77565b6142d58383614be2565b80156142e7576000805461ff00191690555b505050565b60d45460d154604051631a4ca37b60e21b81526000926001600160a01b03908116926369328dec92614328929091169086903090600401615a66565b602060405180830381600087803b15801561434257600080fd5b505af1158015614356573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061437a91906153d7565b905060008111610d6d5760405162461bcd60e51b815260206004820152602b60248201527f57697468647261776e20616d6f756e742073686f756c6420626520626967676560448201526a72207468616e207a65726f60a81b6064820152608401610c98565b6001600160a01b0382166144405760405162461bcd60e51b815260206004820152602160248201527f45524332303a206275726e2066726f6d20746865207a65726f206164647265736044820152607360f81b6064820152608401610c98565b6001600160a01b038216600090815260336020526040902054818110156144b45760405162461bcd60e51b815260206004820152602260248201527f45524332303a206275726e20616d6f756e7420657863656564732062616c616e604482015261636560f01b6064820152608401610c98565b6001600160a01b03831660009081526033602052604081208383039055603580548492906144e3908490615448565b90915550506040518281526000906001600160a01b03851690600080516020615c068339815191529060200160405180910390a3505050565b60006145298484846139bf565b6001600160a01b0386166000908152609e602052604090205461456390879061455c9088906001600160801b0316615448565b6001613b5e565b609b5461457a9086906001600160801b0316615448565b609b80546001600160801b0319166001600160801b039290921691909117905550600195945050505050565b6001600160a01b03831661460a5760405162461bcd60e51b815260206004820152602560248201527f45524332303a207472616e736665722066726f6d20746865207a65726f206164604482015264647265737360d81b6064820152608401610c98565b6001600160a01b03821661466c5760405162461bcd60e51b815260206004820152602360248201527f45524332303a207472616e7366657220746f20746865207a65726f206164647260448201526265737360e81b6064820152608401610c98565b6001600160a01b038316600090815260336020526040902054818110156146e45760405162461bcd60e51b815260206004820152602660248201527f45524332303a207472616e7366657220616d6f756e7420657863656564732062604482015265616c616e636560d01b6064820152608401610c98565b6001600160a01b0380851660009081526033602052604080822085850390559185168152908120805484929061471b9084906154bd565b92505081905550826001600160a01b0316846001600160a01b0316600080516020615c068339815191528460405161475591815260200190565b60405180910390a350505050565b600080866001600160a01b031663b0f479a16040518163ffffffff1660e01b815260040160206040518083038186803b15801561479f57600080fd5b505afa1580156147b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906147d791906154a0565b9050606060006001600160a01b0316876000815181106147f9576147f961541c565b60200260200101516001600160a01b0316141561493457816001600160a01b031663ad5c46486040518163ffffffff1660e01b815260040160206040518083038186803b15801561484957600080fd5b505afa15801561485d573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061488191906154a0565b876000815181106148945761489461541c565b6001600160a01b039283166020918202929092010152604051637ff36ab560e01b815290831690637ff36ab59088906148d79089908c908a904290600401615b04565b6000604051808303818588803b1580156148f057600080fd5b505af1158015614904573d6000803e3d6000fd5b50505050506040513d6000823e601f3d908101601f1916820160405261492d9190810190615b39565b9050614b2b565b60006001600160a01b0316876001895161494e9190615448565b8151811061495e5761495e61541c565b60200260200101516001600160a01b03161415614a9e57816001600160a01b031663ad5c46486040518163ffffffff1660e01b815260040160206040518083038186803b1580156149ae57600080fd5b505afa1580156149c2573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906149e691906154a0565b87600189516149f59190615448565b81518110614a0557614a0561541c565b6001600160a01b0392831660209182029290920101526040516318cbafe560e01b8152908316906318cbafe590614a4890899089908c908a904290600401615bc9565b600060405180830381600087803b158015614a6257600080fd5b505af1158015614a76573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261492d9190810190615b39565b6040516338ed173960e01b81526001600160a01b038316906338ed173990614ad290899089908c908a904290600401615bc9565b600060405180830381600087803b158015614aec57600080fd5b505af1158015614b00573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052614b289190810190615b39565b90505b8060018251614b3a9190615448565b81518110614b4a57614b4a61541c565b60200260200101519250505095945050505050565b6000818310614b6e5781614b70565b825b9392505050565b600054610100900460ff1680614b90575060005460ff16155b614bac5760405162461bcd60e51b8152600401610c989061599d565b600054610100900460ff16158015614bce576000805461ffff19166101011790555b80156112ce576000805461ff001916905550565b600054610100900460ff1680614bfb575060005460ff16155b614c175760405162461bcd60e51b8152600401610c989061599d565b600054610100900460ff16158015614c39576000805461ffff19166101011790555b8251614c4c906036906020860190614cdc565b508151614c60906037906020850190614cdc565b5080156142e7576000805461ff0019169055505050565b828054828255906000526020600020908101928215614ccc579160200282015b82811115614ccc57825182546001600160a01b0319166001600160a01b03909116178255602090920191600190910190614c97565b50614cd8929150614d50565b5090565b828054614ce89061539c565b90600052602060002090601f016020900481019282614d0a5760008555614ccc565b82601f10614d2357805160ff1916838001178555614ccc565b82800160010185558215614ccc579182015b82811115614ccc578251825591602001919060010190614d35565b5b80821115614cd85760008155600101614d51565b80151581146112ce57600080fd5b600060208284031215614d8557600080fd5b8135614b7081614d65565b600060208083528351808285015260005b81811015614dbd57858101830151858201604001528201614da1565b81811115614dcf576000604083870101525b50601f01601f1916929092016040019392505050565b6001600160a01b03811681146112ce57600080fd5b8035614e0581614de5565b919050565b60008060408385031215614e1d57600080fd5b8235614e2881614de5565b946020939093013593505050565b60008060408385031215614e4957600080fd5b8235614e5481614d65565b91506020830135614e6481614d65565b809150509250929050565b600060208284031215614e8157600080fd5b8135614b7081614de5565b600080600060608486031215614ea157600080fd5b8335614eac81614de5565b92506020840135614ebc81614de5565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b63ffffffff811681146112ce57600080fd5b60008060408385031215614f0657600080fd5b8235614f1181614ee1565b91506020830135614e6481614ee1565b600060208284031215614f3357600080fd5b813562ffffff81168114614b7057600080fd5b600080600060608486031215614f5b57600080fd5b83359250602084013591506040840135614f7481614d65565b809150509250925092565b60008060008060808587031215614f9557600080fd5b8435614fa081614de5565b966020860135965060408601359560600135945092505050565b600060208284031215614fcc57600080fd5b5035919050565b634e487b7160e01b600052604160045260246000fd5b60405161018081016001600160401b038111828210171561500c5761500c614fd3565b60405290565b604051601f8201601f191681016001600160401b038111828210171561503a5761503a614fd3565b604052919050565b600082601f83011261505357600080fd5b81356001600160401b0381111561506c5761506c614fd3565b61507f601f8201601f1916602001615012565b81815284602083860101111561509457600080fd5b816020850160208301376000918101602001919091529392505050565b6001600160401b03811681146112ce57600080fd5b8035614e05816150b1565b60006001600160401b038211156150ea576150ea614fd3565b5060051b60200190565b600082601f83011261510557600080fd5b8135602061511a615115836150d1565b615012565b82815260059290921b8401810191818101908684111561513957600080fd5b8286015b8481101561515d57803561515081614de5565b835291830191830161513d565b509695505050505050565b6000806000806000806000806000806101408b8d03121561518857600080fd5b6151918b614dfa565b995061519f60208c01614dfa565b98506151ad60408c01614dfa565b975060608b01356001600160401b03808211156151c957600080fd5b6151d58e838f01615042565b985060808d01359150808211156151eb57600080fd5b6151f78e838f01615042565b975061520560a08e016150c6565b965061521360c08e01614dfa565b955061522160e08e01614dfa565b94506152306101008e01614dfa565b93506101208d013591508082111561524757600080fd5b506152548d828e016150f4565b9150509295989b9194979a5092959850565b60008060006060848603121561527b57600080fd5b833561528681614de5565b95602085013595506040909401359392505050565b600080604083850312156152ae57600080fd5b82356152b981614de5565b91506020830135614e6481614de5565b60008060008060008060c087890312156152e257600080fd5b86356152ed81614de5565b955060208701356152fd81614de5565b9450604087013561530d81614de5565b935060608701356001600160401b038082111561532957600080fd5b6153358a838b01615042565b9450608089013591508082111561534b57600080fd5b5061535889828a01615042565b92505060a0870135615369816150b1565b809150509295509295509295565b6000806040838503121561538a57600080fd5b823591506020830135614e6481614d65565b600181811c908216806153b057607f821691505b602082108114156153d157634e487b7160e01b600052602260045260246000fd5b50919050565b6000602082840312156153e957600080fd5b5051919050565b805160ff81168114614e0557600080fd5b60006020828403121561541357600080fd5b614b70826153f0565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052601160045260246000fd5b60008282101561545a5761545a615432565b500390565b6001600160a01b03929092168252602082015260400190565b60006020828403121561548a57600080fd5b8151614b7081614d65565b8051614e0581614de5565b6000602082840312156154b257600080fd5b8151614b7081614de5565b600082198211156154d0576154d0615432565b500190565b6020808252600c908201526b4744414f5f5354414b45525360a01b604082015260600190565b600081518084526020808501945080840160005b838110156155345781516001600160a01b03168752958201959082019060010161550f565b509495945050505050565b6001600160a01b0383168152604060208201819052600090615563908301846154fb565b949350505050565b6020808252601f908201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c00604082015260600190565b6020808252600c908201526b232aa7222fa6a0a720a3a2a960a11b604082015260600190565b600080600080608085870312156155de57600080fd5b84516155e981614ee1565b60208601519094506155fa816150b1565b604086015190935061560b816150b1565b606086015190925061561c81614d65565b939692955090935050565b600060ff821660ff84168082101561564157615641615432565b90039392505050565b600181815b8085111561568557816000190482111561566b5761566b615432565b8085161561567857918102915b93841c939080029061564f565b509250929050565b60008261569c57506001610935565b816156a957506000610935565b81600181146156bf57600281146156c9576156e5565b6001915050610935565b60ff8411156156da576156da615432565b50506001821b610935565b5060208310610133831016604e8410600b8410161715615708575081810a610935565b615712838361564a565b806000190482111561572657615726615432565b029392505050565b6000614b7060ff84168361568d565b600081600019048311821515161561575757615757615432565b500290565b60006001600160801b0382811684821680830382111561577e5761577e615432565b01949350505050565b634e487b7160e01b600052601260045260246000fd5b60006001600160801b03838116806157b7576157b7615787565b92169190910492915050565b6000602082840312156157d557600080fd5b604051602081016001600160401b03811182821017156157f7576157f7614fd3565b6040529151825250919050565b80516001600160801b0381168114614e0557600080fd5b805164ffffffffff81168114614e0557600080fd5b6000610180828403121561584357600080fd5b61584b614fe9565b61585584846157c3565b815261586360208401615804565b602082015261587460408401615804565b604082015261588560608401615804565b606082015261589660808401615804565b60808201526158a760a08401615804565b60a08201526158b860c0840161581b565b60c08201526158c960e08401615495565b60e08201526101006158dc818501615495565b908201526101206158ee848201615495565b90820152610140615900848201615495565b908201526101606159128482016153f0565b908201529392505050565b60008261592c5761592c615787565b500490565b6000614b70838361568d565b6020808252600e908201526d2aa724a9aba0a82fa927aaaa22a960911b604082015260600190565b6020808252600490820152634344414960e01b604082015260600190565b6001600160a01b0392831681529116602082015260400190565b6020808252602e908201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160408201526d191e481a5b9a5d1a585b1a5e995960921b606082015260800190565b6040815260006159fe60408301856154fb565b905060018060a01b03831660208301529392505050565b600063ffffffff80831681851680830382111561577e5761577e615432565b6020808252601890820152771dda5d1a191c985dc81d1c985b9cd9995c8819985a5b195960421b604082015260600190565b6001600160a01b0393841681526020810192909252909116604082015260600190565b606081526000615a9c60608301866154fb565b6020830194909452506001600160a01b0391909116604090910152919050565b60006001600160801b0383811690831681811015615adc57615adc615432565b039392505050565b60006001600160401b0383811690831681811015615adc57615adc615432565b848152608060208201526000615b1d60808301866154fb565b6001600160a01b03949094166040830152506060015292915050565b60006020808385031215615b4c57600080fd5b82516001600160401b03811115615b6257600080fd5b8301601f81018513615b7357600080fd5b8051615b81615115826150d1565b81815260059190911b82018301908381019087831115615ba057600080fd5b928401925b82841015615bbe57835182529284019290840190615ba5565b979650505050505050565b85815284602082015260a060408201526000615be860a08301866154fb565b6001600160a01b039490941660608301525060800152939250505056feddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3efa2646970667358221220be1cca504ef3eb57bf2a81f2e6357cb785f83075710612bfda83fe994434a34064736f6c63430008080033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061004c5760003560e01c80638abf607714610051578063cb1939421461007a578063da2030671461008d578063db0669a8146100a0575b600080fd5b600054610064906001600160a01b031681565b6040516100719190610537565b60405180910390f35b610064610088366004610563565b6100b5565b61006461009b366004610563565b610100565b6100b36100ae366004610696565b610190565b005b60006100f783836040516020016100cd929190610761565b60408051601f1981840301815291905280516020909101206000546001600160a01b031690610433565b90505b92915050565b6000806101438484604051602001610119929190610761565b60408051601f1981840301815291905280516020909101206000546001600160a01b031690610499565b604080516001600160a01b038084168252871660208201529192507f09e48df7857bd0c1e0d31bb8a85d42cf1874817895f171c917f6ee2cea73ec20910160405180910390a19392505050565b6040516001600160601b0319606089811b8216602084015288811b821660348401526001600160c01b031960c089901b16604884015286811b8216605084015285811b8216606484015284901b16607882015260009061020a908a90608c0160405160208183030381529060405280519060200120610100565b90506000886001600160a01b03166335ea6a758b6040518263ffffffff1660e01b815260040161023a9190610537565b6101806040518083038186803b15801561025357600080fd5b505afa158015610267573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061028b9190610807565b60e001519050816001600160a01b031663995a12298b8b8b856001600160a01b03166306fdde036040518163ffffffff1660e01b815260040160006040518083038186803b1580156102dc57600080fd5b505afa1580156102f0573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526103189190810190610924565b60405160200161032891906109b7565b604051602081830303815290604052866001600160a01b03166395d89b416040518163ffffffff1660e01b815260040160006040518083038186803b15801561037057600080fd5b505afa158015610384573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526103ac9190810190610924565b6040516020016103bc91906109f1565b6040516020818303038152906040528d8d8d8d8d6040518b63ffffffff1660e01b81526004016103f59a99989796959493929190610a46565b600060405180830381600087803b15801561040f57600080fd5b505af1158015610423573d6000803e3d6000fd5b5050505050505050505050505050565b60006100f7838330604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b8152606093841b60148201526f5af43d82803e903d91602b57fd5bf3ff60801b6028820152921b6038830152604c8201526037808220606c830152605591012090565b6000604051733d602d80600a3d3981f3363d3d373d3d3d363d7360601b81528360601b60148201526e5af43d82803e903d91602b57fd5bf360881b6028820152826037826000f59150506001600160a01b0381166100fa5760405162461bcd60e51b8152602060048201526017602482015276115490cc4c4d8dce8818dc99585d194c8819985a5b1959604a1b604482015260640160405180910390fd5b6001600160a01b0391909116815260200190565b6001600160a01b038116811461056057600080fd5b50565b6000806040838503121561057657600080fd5b82356105818161054b565b946020939093013593505050565b803561059a8161054b565b919050565b634e487b7160e01b600052604160045260246000fd5b60405161018081016001600160401b03811182821017156105d8576105d861059f565b60405290565b604051601f8201601f191681016001600160401b03811182821017156106065761060661059f565b604052919050565b600082601f83011261061f57600080fd5b813560206001600160401b0382111561063a5761063a61059f565b8160051b6106498282016105de565b928352848101820192828101908785111561066357600080fd5b83870192505b8483101561068b57823561067c8161054b565b82529183019190830190610669565b979650505050505050565b600080600080600080600080610100898b0312156106b357600080fd5b88356106be8161054b565b975060208901356106ce8161054b565b965060408901356106de8161054b565b955060608901356001600160401b0380821682146106fb57600080fd5b90955060808a01359061070d8261054b565b90945060a08a01359061071f8261054b565b81945061072e60c08c0161058f565b935060e08b013591508082111561074457600080fd5b506107518b828c0161060e565b9150509295985092959890939650565b60609290921b6001600160601b0319168252601482015260340190565b60006020828403121561079057600080fd5b604051602081016001600160401b03811182821017156107b2576107b261059f565b6040529151825250919050565b80516001600160801b038116811461059a57600080fd5b805164ffffffffff8116811461059a57600080fd5b805161059a8161054b565b805160ff8116811461059a57600080fd5b6000610180828403121561081a57600080fd5b6108226105b5565b61082c848461077e565b815261083a602084016107bf565b602082015261084b604084016107bf565b604082015261085c606084016107bf565b606082015261086d608084016107bf565b608082015261087e60a084016107bf565b60a082015261088f60c084016107d6565b60c08201526108a060e084016107eb565b60e08201526101006108b38185016107eb565b908201526101206108c58482016107eb565b908201526101406108d78482016107eb565b908201526101606108e98482016107f6565b908201529392505050565b60005b8381101561090f5781810151838201526020016108f7565b8381111561091e576000848401525b50505050565b60006020828403121561093657600080fd5b81516001600160401b038082111561094d57600080fd5b818401915084601f83011261096157600080fd5b8151818111156109735761097361059f565b610986601f8201601f19166020016105de565b915080825285602082850101111561099d57600080fd5b6109ae8160208401602086016108f4565b50949350505050565b71023b7b7b220b0bb32a9ba30b5b4b733ab19160751b8152600082516109e48160128501602087016108f4565b9190910160120192915050565b606760f81b815260008251610a0d8160018501602087016108f4565b9190910160010192915050565b60008151808452610a328160208601602086016108f4565b601f01601f19169290920160200192915050565b600061014060018060a01b03808e1684526020818e1681860152818d166040860152826060860152610a7a8386018d610a1a565b92508483036080860152610a8e838c610a1a565b6001600160401b038b1660a087015289831660c087015288831660e0870152878316610100870152858103610120870152865180825282880194509082019060005b81811015610aee578551851683529483019491830191600101610ad0565b5050809450505050509b9a505050505050505050505056fea2646970667358221220b10b14ec40c566252f956304029fc271d821d09284068fca444502be17e5e08064736f6c63430008080033",
-  "linkReferences": {
-    "contracts/staking/UniswapV2SwapHelper.sol": {
-      "UniswapV2SwapHelper": [
-        {
-          "length": 20,
-          "start": 16510
-        }
-      ]
-    }
-  },
-  "deployedLinkReferences": {}
-}

package/contracts/staking/aave/AaveStakingFactoryV2.sol

@@ -1,93 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity >=0.8.0;
-import "@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol";
-import "./GoodAaveStakingV2.sol";
-import "../../Interfaces.sol";
-
-/**
- * @title Staking contract that donates earned interest to the DAO
- * allowing stakers to deposit Token
- * or withdraw their stake in Token
- * the contracts buy cToken and can transfer the daily interest to the  DAO
- */
-contract AaveStakingFactoryV2 {
-	using ClonesUpgradeable for address;
-
-	address public impl = address(new GoodAaveStakingV2());
-
-	event Deployed(address proxy, address token);
-
-	function clone(ERC20 token, bytes32 paramsHash)
-		public
-		returns (GoodAaveStakingV2)
-	{
-		address deployed = address(impl).cloneDeterministic(
-			keccak256(abi.encodePacked(address(token), paramsHash))
-		);
-		emit Deployed(deployed, address(token));
-		return GoodAaveStakingV2(deployed);
-	}
-
-	/**
-	@dev Function to clone Staking contract and initialize new one with new token
-	@param token Staking token to use in staking contract
-	@param _lendingPool address of the lending Pool of AAVE Protocol
-	@param _ns NameService that holds whole necessary addresses
-	@param _maxRewardThreshold Block numbers that need to pass in order to user would get their rewards with 1x multiplier instead of 0.5x
-	@param _tokenUsdOracle address of the TOKEN/USD oracle
-	@param _incentiveController Incentive Controller of AAVE protocol in order to claim rewards from AAVE
-	@param _aaveUSDOracle address of the AAVE/USD oracle
-	 */
-	function cloneAndInit(
-		ERC20 token,
-		address _lendingPool,
-		INameService _ns,
-		uint64 _maxRewardThreshold,
-		address _tokenUsdOracle,
-		IAaveIncentivesController _incentiveController,
-		address _aaveUSDOracle,
-		address[] memory _tokenToDaiSwapPath
-	) public {
-		GoodAaveStakingV2 deployed = clone(
-			token,
-			keccak256(
-				abi.encodePacked(
-					_lendingPool,
-					address(_ns),
-					_maxRewardThreshold,
-					_tokenUsdOracle,
-					address(_incentiveController),
-					_aaveUSDOracle
-				)
-			)
-		);
-
-		ERC20 iToken = ERC20(
-			ILendingPool(_lendingPool).getReserveData(address(token)).aTokenAddress
-		);
-		deployed.init(
-			address(token),
-			address(_lendingPool),
-			_ns,
-			string(abi.encodePacked("GoodAaveStakingV2 ", iToken.name())),
-			string(abi.encodePacked("g", iToken.symbol())),
-			_maxRewardThreshold,
-			_tokenUsdOracle,
-			_incentiveController,
-			_aaveUSDOracle,
-			_tokenToDaiSwapPath
-		);
-	}
-
-	function predictAddress(ERC20 token, bytes32 paramsHash)
-		public
-		view
-		returns (address)
-	{
-		return
-			address(impl).predictDeterministicAddress(
-				keccak256(abi.encodePacked(address(token), paramsHash))
-			);
-	}
-}

package/test/staking/GoodAaveStakingFactoryV2.test.ts

@@ -1,122 +0,0 @@
-import { default as hre, ethers, upgrades } from "hardhat";
-import { deployMockContract, MockContract } from "ethereum-waffle";
-import { expect } from "chai";
-import { CERC20, GoodAaveStaking, AaveStakingFactory } from "../../types";
-import { createDAO, deployUniswap } from "../helpers";
-import { Contract } from "ethers";
-
-const BN = ethers.BigNumber;
-export const NULL_ADDRESS = ethers.constants.AddressZero;
-
-let cdai: CERC20;
-
-describe("AaveStakingFactoryV2", () => {
-  let founder,
-    signers,
-    cdai,
-    usdc,
-    aave,
-    incentiveController,
-    aaveUsdOracle: Contract,
-    dai,
-    dao,
-    stakingFactory: AaveStakingFactory,
-    lendingPool: Contract;
-
-  before(async () => {
-    [founder, ...signers] = await ethers.getSigners();
-    dao = await createDAO();
-    const usdcFactory = await ethers.getContractFactory("USDCMock");
-    const lendingPoolFactory = await ethers.getContractFactory(
-      "LendingPoolMock"
-    );
-    aave = await (await ethers.getContractFactory("AaveMock")).deploy();
-    incentiveController = await (
-      await ethers.getContractFactory("IncentiveControllerMock")
-    ).deploy(aave.address);
-    usdc = await usdcFactory.deploy();
-    lendingPool = await lendingPoolFactory.deploy(usdc.address);
-    aaveUsdOracle = await (
-      await ethers.getContractFactory("AaveUSDMockOracle")
-    ).deploy();
-    dai = dao.daiAddress;
-    cdai = dao.cdaiAddress;
-    const uniswap = await deployUniswap(
-      dao.COMP,
-      await ethers.getContractAt("DAIMock", dai)
-    );
-    const router = uniswap.router;
-    await dao.setDAOAddress("UNISWAP_ROUTER", router.address);
-    await dao.setDAOAddress("AAVE", aave.address);
-    let swapHelper = await ethers
-      .getContractFactory("UniswapV2SwapHelper")
-      .then(_ => _.deploy());
-
-    stakingFactory = (await ethers
-      .getContractFactory("AaveStakingFactoryV2", {
-        libraries: { UniswapV2SwapHelper: swapHelper.address }
-      })
-      .then(_ => _.deploy())) as AaveStakingFactory;
-  });
-
-  it("should create proxy clone", async () => {
-    const res = await (
-      await stakingFactory.clone(usdc.address, ethers.constants.HashZero)
-    ).wait();
-    const log = res.events.find(_ => _.event === "Deployed");
-    const detAddress = await stakingFactory.predictAddress(
-      usdc.address,
-      ethers.constants.HashZero
-    );
-
-    expect(log).to.not.empty;
-    expect(log.args.proxy).to.equal(detAddress);
-    expect(log.args.token).to.equal(usdc.address);
-  });
-
-  it("should create and initialize clone", async () => {
-    const ns = await ethers
-      .getContractFactory("NameService")
-      .then(_ => _.deploy());
-    const res = await (
-      await stakingFactory.cloneAndInit(
-        usdc.address,
-        lendingPool.address,
-        dao.nameService.address,
-        5760,
-        stakingFactory.address,
-        incentiveController.address,
-        aaveUsdOracle.address,
-        [usdc.address, dai]
-      )
-    ).wait();
-    const log = res.events.find(_ => _.event === "Deployed");
-    const detAddress = await stakingFactory.predictAddress(
-      usdc.address,
-      ethers.utils.solidityKeccak256(
-        ["address", "address", "uint64", "address", "address", "address"],
-        [
-          lendingPool.address,
-          dao.nameService.address,
-          5760,
-          stakingFactory.address,
-          incentiveController.address,
-          aaveUsdOracle.address
-        ]
-      )
-    );
-    expect(log).to.not.empty;
-    expect(log.args.proxy).to.equal(detAddress);
-    expect(log.args.token).to.equal(usdc.address);
-
-    //check initialization
-    const staking: GoodAaveStaking = (await ethers.getContractAt(
-      "GoodAaveStaking",
-      detAddress
-    )) as GoodAaveStaking;
-    expect(await staking.iToken()).to.equal(lendingPool.address);
-    expect(await staking.token()).to.equal(usdc.address);
-    expect(await staking.name()).to.equal("GoodAaveStakingV2 aUSDC");
-    expect(await staking.symbol()).to.equal("gaUSDC");
-  });
-});