@gooddollar/goodprotocol 2.0.7-beta.3 → 2.0.7

package/artifacts/contracts/utils/BuyGDClone.sol/BuyGDCloneFactory.json

@@ -19,6 +19,11 @@
           "internalType": "address",
           "name": "_gd",
           "type": "address"
+        },
+        {
+          "internalType": "contract IStaticOracle",
+          "name": "_oracle",
+          "type": "address"
         }
       ],
       "stateMutability": "nonpayable",
@@ -30,11 +35,6 @@
           "internalType": "address",
           "name": "owner",
           "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "executer",
-          "type": "address"
         }
       ],
       "name": "create",
@@ -54,11 +54,6 @@
           "internalType": "address",
           "name": "owner",
           "type": "address"
-        },
-        {
-          "internalType": "address",
-          "name": "executer",
-          "type": "address"
         }
       ],
       "name": "predict",
@@ -73,8 +68,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x60a060405234801561001057600080fd5b5060405161134638038061134683398101604081905261002f916100b5565b82828260405161003e90610090565b6001600160a01b03938416815291831660208301529091166040820152606001604051809103906000f08015801561007a573d6000803e3d6000fd5b506001600160a01b031660805250610102915050565b610efb8061044b83390190565b6001600160a01b03811681146100b257600080fd5b50565b6000806000606084860312156100ca57600080fd5b83516100d58161009d565b60208501519093506100e68161009d565b60408501519092506100f78161009d565b809150509250925092565b6080516103286101236000396000818160b2015261019201526103286000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80633e68680a1461003b5780635c911b291461006a575b600080fd5b61004e6100493660046102a5565b61007d565b6040516001600160a01b03909116815260200160405180910390f35b61004e6100783660046102a5565b610145565b60008083836040516020016100939291906102d8565b60405160208183030381529060405280519060200120905060006100d77f0000000000000000000000000000000000000000000000000000000000000000836101ee565b60405163485cc95560e01b81529091506001600160a01b0382169063485cc9559061010890889088906004016102d8565b600060405180830381600087803b15801561012257600080fd5b505af1158015610136573d6000803e3d6000fd5b50929450505050505b92915050565b600080838360405160200161015b9291906102d8565b60408051808303601f190181529082905280516020909101203060388301526f5af43d82803e903d91602b57fd5bf3ff60248301527f00000000000000000000000000000000000000000000000000000000000000006014830152733d602d80600a3d3981f3363d3d373d3d3d363d73825260588201526037600c82012060788201526055604390910120949350505050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008360601b60e81c176000526e5af43d82803e903d91602b57fd5bf38360781b1760205281603760096000f590506001600160a01b03811661013f5760405162461bcd60e51b8152602060048201526017602482015276115490cc4c4d8dce8818dc99585d194c8819985a5b1959604a1b604482015260640160405180910390fd5b80356001600160a01b03811681146102a057600080fd5b919050565b600080604083850312156102b857600080fd5b6102c183610289565b91506102cf60208401610289565b90509250929050565b6001600160a01b039283168152911660208201526040019056fea2646970667358221220bb79b4c0132ca24f88937fb278b04c69969e89aaf8b91a22adfda79722c30bff64736f6c6343000810003360e060405234801561001057600080fd5b50604051610efb380380610efb83398101604081905261002f91610064565b6001600160a01b0392831660805290821660a0521660c0526100b1565b6001600160a01b038116811461006157600080fd5b50565b60008060006060848603121561007957600080fd5b83516100848161004c565b60208501519093506100958161004c565b60408501519092506100a68161004c565b809150509250925092565b60805160a05160c051610dcf61012c600039600081816101dd015281816107070152610a4a01526000818160e10152818161058f0152818161061f015281816106cf015281816108290152610a120152600081816102110152818161064c01528181610787015281816109670152610aca0152610dcf6000f3fe6080604052600436106100855760003560e01c8063051ed8ef146100915780630c577bdc146100cf5780630cd865ec14610103578063240ff76714610125578063485cc9551461014557806377e9acd9146101655780638da5cb5b1461018557806394b918de146101ab578063a5e598fc146101cb578063f887ea40146101ff57600080fd5b3661008c57005b600080fd5b34801561009d57600080fd5b506100b973471ece3750da237f93b8e339c536989b8978a43881565b6040516100c69190610bc7565b60405180910390f35b3480156100db57600080fd5b506100b97f000000000000000000000000000000000000000000000000000000000000000081565b34801561010f57600080fd5b5061012361011e366004610bf7565b610233565b005b34801561013157600080fd5b506001546100b9906001600160a01b031681565b34801561015157600080fd5b50610123610160366004610c19565b6103a9565b34801561017157600080fd5b50610123610180366004610c4c565b6104f5565b34801561019157600080fd5b506000546100b9906201000090046001600160a01b031681565b3480156101b757600080fd5b506101236101c6366004610c4c565b6108ab565b3480156101d757600080fd5b506100b97f000000000000000000000000000000000000000000000000000000000000000081565b34801561020b57600080fd5b506100b97f000000000000000000000000000000000000000000000000000000000000000081565b6001600160a01b0381166102c55760008054604051620100009091046001600160a01b03169047908381818185875af1925050503d8060008114610293576040519150601f19603f3d011682016040523d82523d6000602084013e610298565b606091505b50509050806102c15760405163e2a1cc9160e01b81524760048201526024015b60405180910390fd5b5050565b6000546040516370a0823160e01b81526001600160a01b038084169263a9059cbb92620100009091049091169083906370a0823190610308903090600401610bc7565b602060405180830381865afa158015610325573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103499190610c65565b6040518363ffffffff1660e01b8152600401610366929190610c7e565b6020604051808303816000875af1158015610385573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102c19190610c97565b600054610100900460ff16158080156103c95750600054600160ff909116105b806103e35750303b1580156103e3575060005460ff166001145b6104465760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084016102b8565b6000805460ff191660011790558015610469576000805461ff0019166101001790555b6000805462010000600160b01b031916620100006001600160a01b038681169190910291909117909155600180546001600160a01b03191691841691909117905580156104f0576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15b505050565b6001546000906001600160a01b0316331461051157600061051b565b67016345785d8a00005b6000546001600160401b039190911691506201000090046001600160a01b0316331480159061055557506001546001600160a01b03163314155b1561057557336040516335ac4f0560e01b81526004016102b89190610bc7565b6040516370a0823160e01b81526000906001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906370a08231906105c4903090600401610bc7565b602060405180830381865afa1580156105e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106059190610c65565b60405163095ea7b360e01b81529091506001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063095ea7b390610676907f0000000000000000000000000000000000000000000000000000000000000000908590600401610c7e565b6020604051808303816000875af1158015610695573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106b99190610c97565b50604080516080810182526001600160601b03197f0000000000000000000000000000000000000000000000000000000000000000606090811b821660a084015261027160ec1b60b48401527f0000000000000000000000000000000000000000000000000000000000000000901b1660b7820152815180820360ab01815260cb820183528152600080546201000090046001600160a01b031660208301529181016107658585610ccf565b815260200185905260405163b858183f60e01b81529091506001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063b858183f906107bc908490600401610ce8565b6020604051808303816000875af11580156107db573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107ff9190610c65565b506001546001600160a01b031633036108a55760405163a9059cbb60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063a9059cbb906108609033908790600401610c7e565b6020604051808303816000875af115801561087f573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108a39190610c97565b505b50505050565b600080546201000090046001600160a01b031633146108e4576108d248633b9aca00610d67565b6108df9062061a80610d7a565b6108e7565b60005b6000549091506201000090046001600160a01b0316331480159061091657506001546001600160a01b03163314155b1561093657336040516335ac4f0560e01b81526004016102b89190610bc7565b60405163095ea7b360e01b8152479073471ece3750da237f93b8e339c536989b8978a4389063095ea7b390610991907f0000000000000000000000000000000000000000000000000000000000000000908590600401610c7e565b6020604051808303816000875af11580156109b0573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109d49190610c97565b50604080516080810182527308e3d9c6ea1b446ff2771c6738a6d313712f148760631b60a082015261017760eb1b60b48201526001600160601b03197f0000000000000000000000000000000000000000000000000000000000000000606090811b821660b784015261027160ec1b60cb8401527f0000000000000000000000000000000000000000000000000000000000000000901b1660ce820152815180820360c201815260e2820183528152600080546201000090046001600160a01b03166020830152918101610aa88585610ccf565b815260200185905260405163b858183f60e01b81529091506001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063b858183f90610aff908490600401610ce8565b6020604051808303816000875af1158015610b1e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b429190610c65565b506000546201000090046001600160a01b031633146108a557604051600090339085908381818185875af1925050503d8060008114610b9d576040519150601f19603f3d011682016040523d82523d6000602084013e610ba2565b606091505b50509050806108a35760405163e2a1cc9160e01b8152600481018590526024016102b8565b6001600160a01b0391909116815260200190565b80356001600160a01b0381168114610bf257600080fd5b919050565b600060208284031215610c0957600080fd5b610c1282610bdb565b9392505050565b60008060408385031215610c2c57600080fd5b610c3583610bdb565b9150610c4360208401610bdb565b90509250929050565b600060208284031215610c5e57600080fd5b5035919050565b600060208284031215610c7757600080fd5b5051919050565b6001600160a01b03929092168252602082015260400190565b600060208284031215610ca957600080fd5b81518015158114610c1257600080fd5b634e487b7160e01b600052601160045260246000fd5b81810381811115610ce257610ce2610cb9565b92915050565b60006020808352835160808285015280518060a086015260005b81811015610d1e5782810184015186820160c001528301610d02565b50600060c08287010152918501516001600160a01b0381166040860152916040860151606086810191909152909501516080850152505050601f91909101601f19160160c00190565b80820180821115610ce257610ce2610cb9565b6000816000190483118215151615610d9457610d94610cb9565b50029056fea2646970667358221220e0ea2019c5695e439e7780f0ae68aaa57f6a16b884970224f812dc8786b0446764736f6c63430008100033",
-  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c80633e68680a1461003b5780635c911b291461006a575b600080fd5b61004e6100493660046102a5565b61007d565b6040516001600160a01b03909116815260200160405180910390f35b61004e6100783660046102a5565b610145565b60008083836040516020016100939291906102d8565b60405160208183030381529060405280519060200120905060006100d77f0000000000000000000000000000000000000000000000000000000000000000836101ee565b60405163485cc95560e01b81529091506001600160a01b0382169063485cc9559061010890889088906004016102d8565b600060405180830381600087803b15801561012257600080fd5b505af1158015610136573d6000803e3d6000fd5b50929450505050505b92915050565b600080838360405160200161015b9291906102d8565b60408051808303601f190181529082905280516020909101203060388301526f5af43d82803e903d91602b57fd5bf3ff60248301527f00000000000000000000000000000000000000000000000000000000000000006014830152733d602d80600a3d3981f3363d3d373d3d3d363d73825260588201526037600c82012060788201526055604390910120949350505050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008360601b60e81c176000526e5af43d82803e903d91602b57fd5bf38360781b1760205281603760096000f590506001600160a01b03811661013f5760405162461bcd60e51b8152602060048201526017602482015276115490cc4c4d8dce8818dc99585d194c8819985a5b1959604a1b604482015260640160405180910390fd5b80356001600160a01b03811681146102a057600080fd5b919050565b600080604083850312156102b857600080fd5b6102c183610289565b91506102cf60208401610289565b90509250929050565b6001600160a01b039283168152911660208201526040019056fea2646970667358221220bb79b4c0132ca24f88937fb278b04c69969e89aaf8b91a22adfda79722c30bff64736f6c63430008100033",
+  "bytecode": "0x60a060405234801561001057600080fd5b5060405161185a38038061185a83398101604081905261002f916100bf565b8383838360405161003f9061009a565b6001600160a01b039485168152928416602084015290831660408301529091166060820152608001604051809103906000f080158015610083573d6000803e3d6000fd5b506001600160a01b03166080525061011e92505050565b6114208061043a83390190565b6001600160a01b03811681146100bc57600080fd5b50565b600080600080608085870312156100d557600080fd5b84516100e0816100a7565b60208601519094506100f1816100a7565b6040860151909350610102816100a7565b6060860151909250610113816100a7565b939692955090935050565b6080516102fb61013f6000396000818160c2015261015901526102fb6000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c8063901b96e71461003b5780639ed9331814610064575b600080fd5b61004e610049366004610288565b610077565b60405161005b91906102b1565b60405180910390f35b61004e610072366004610288565b610126565b6000808260405160200161008b91906102b1565b60408051601f198184030181529082905280516020909101203060388301526f5af43d82803e903d91602b57fd5bf3ff60248301527f00000000000000000000000000000000000000000000000000000000000000006014830152733d602d80600a3d3981f3363d3d373d3d3d363d738252605882018190526037600c830120607883015260556043909201919091209091505b9392505050565b6000808260405160200161013a91906102b1565b604051602081830303815290604052805190602001209050600061017e7f0000000000000000000000000000000000000000000000000000000000000000836101e7565b60405163189acdbd60e31b81529091506001600160a01b0382169063c4d66de8906101ad9087906004016102b1565b600060405180830381600087803b1580156101c757600080fd5b505af11580156101db573d6000803e3d6000fd5b50929695505050505050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008360601b60e81c176000526e5af43d82803e903d91602b57fd5bf38360781b1760205281603760096000f590506001600160a01b0381166102825760405162461bcd60e51b8152602060048201526017602482015276115490cc4c4d8dce8818dc99585d194c8819985a5b1959604a1b604482015260640160405180910390fd5b92915050565b60006020828403121561029a57600080fd5b81356001600160a01b038116811461011f57600080fd5b6001600160a01b039190911681526020019056fea2646970667358221220cfa844f49b93c62e4584a4a5b444f64804aa59393ebf3ad00dcc897551aa2c7964736f6c634300081000336101206040523480156200001257600080fd5b506040516200142038038062001420833981016040819052620000359162000078565b6001600160a01b0393841660805291831660c052821660e052166101005261012c60a052620000e0565b6001600160a01b03811681146200007557600080fd5b50565b600080600080608085870312156200008f57600080fd5b84516200009c816200005f565b6020860151909450620000af816200005f565b6040860151909350620000c2816200005f565b6060860151909250620000d5816200005f565b939692955090935050565b60805160a05160c05160e0516101005161126f620001b1600039600081816101a60152818161049e015261057c015260008181610213015281816105cd015281816108860152610c7d015260008181610102015281816104cf015281816105ab015281816106ba0152818161074f0152818161079e0152818161084e015281816109ae01528181610a580152610c4501526000818161027a015281816104f101526105ef0152600081816102c3015281816107cb0152818161090601528181610b9a0152610cfd015261126f6000f3fe6080604052600436106100a65760003560e01c8063051ed8ef146100b25780630c577bdc146100f05780630cd865ec14610124578063130acf441461014657806377e9acd9146101745780637dc0d1d0146101945780638da5cb5b146101c857806394b918de146101ee578063a5e598fc14610201578063c3683d0a14610235578063c4d66de814610248578063f620732614610268578063f887ea40146102b157600080fd5b366100ad57005b600080fd5b3480156100be57600080fd5b506100da73471ece3750da237f93b8e339c536989b8978a43881565b6040516100e79190610f25565b60405180910390f35b3480156100fc57600080fd5b506100da7f000000000000000000000000000000000000000000000000000000000000000081565b34801561013057600080fd5b5061014461013f366004610f4e565b6102e5565b005b34801561015257600080fd5b50610166610161366004610f72565b61045e565b6040519081526020016100e7565b34801561018057600080fd5b5061014461018f366004610fa2565b610681565b3480156101a057600080fd5b506100da7f000000000000000000000000000000000000000000000000000000000000000081565b3480156101d457600080fd5b506000546100da906201000090046001600160a01b031681565b6101446101fc366004610fa2565b610a31565b34801561020d57600080fd5b506100da7f000000000000000000000000000000000000000000000000000000000000000081565b610144610243366004610fa2565b610af8565b34801561025457600080fd5b50610144610263366004610f4e565b610dfa565b34801561027457600080fd5b5061029c7f000000000000000000000000000000000000000000000000000000000000000081565b60405163ffffffff90911681526020016100e7565b3480156102bd57600080fd5b506100da7f000000000000000000000000000000000000000000000000000000000000000081565b6001600160a01b0381166103775760008054604051620100009091046001600160a01b03169047908381818185875af1925050503d8060008114610345576040519150601f19603f3d011682016040523d82523d6000602084013e61034a565b606091505b50509050806103735760405163e2a1cc9160e01b81524760048201526024015b60405180910390fd5b5050565b6000546040516370a0823160e01b81526001600160a01b038084169263a9059cbb92620100009091049091169083906370a08231906103ba903090600401610f25565b602060405180830381865afa1580156103d7573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103fb9190610fbb565b6040518363ffffffff1660e01b8152600401610418929190610fd4565b6020604051808303816000875af1158015610437573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103739190610fed565b50565b6000828173471ece3750da237f93b8e339c536989b8978a437196001600160a01b0385160161056557604051630757bc8160e01b81526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690630757bc819061051990859088907f0000000000000000000000000000000000000000000000000000000000000000907f00000000000000000000000000000000000000000000000000000000000000009060040161100f565b600060405180830381865afa158015610536573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261055e919081019061106b565b5091508190505b604051630757bc8160e01b81526001600160a01b037f00000000000000000000000000000000000000000000000000000000000000001690630757bc81906106179085907f0000000000000000000000000000000000000000000000000000000000000000907f0000000000000000000000000000000000000000000000000000000000000000907f00000000000000000000000000000000000000000000000000000000000000009060040161100f565b600060405180830381865afa158015610634573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261065c919081019061106b565b509050606461066c82605f611153565b6106769190611172565b925050505b92915050565b600080546201000090046001600160a01b031633036106a15760006106ab565b67016345785d8a00005b6001600160401b0316905060007f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03166370a08231306040518263ffffffff1660e01b81526004016107049190610f25565b602060405180830381865afa158015610721573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906107459190610fbb565b90506000610773827f000000000000000000000000000000000000000000000000000000000000000061045e565b90508084116107825780610784565b835b60405163095ea7b360e01b81529094506001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063095ea7b3906107f5907f0000000000000000000000000000000000000000000000000000000000000000908690600401610fd4565b6020604051808303816000875af1158015610814573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108389190610fed565b50604080516080810182526001600160601b03197f0000000000000000000000000000000000000000000000000000000000000000606090811b821660a084015261027160ec1b60b48401527f0000000000000000000000000000000000000000000000000000000000000000901b1660b7820152815180820360ab01815260cb820183528152600080546201000090046001600160a01b031660208301529181016108e48686611194565b815260200186905260405163b858183f60e01b81529091506001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063b858183f9061093b9084906004016111a7565b6020604051808303816000875af115801561095a573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061097e9190610fbb565b506000546201000090046001600160a01b03163314610a2a5760405163a9059cbb60e01b81526001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063a9059cbb906109e59033908890600401610fd4565b6020604051808303816000875af1158015610a04573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a289190610fed565b505b5050505050565b478015610a415761037382610af8565b6040516370a0823160e01b81526001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016906370a0823190610a8d903090600401610f25565b602060405180830381865afa158015610aaa573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ace9190610fbb565b90508015610adf5761037382610681565b60405163701b93d160e11b815260040160405180910390fd5b600080546201000090046001600160a01b03163314610b3157610b1f48633b9aca00611226565b610b2c9062061a80611153565b610b34565b60005b9050476000610b578273471ece3750da237f93b8e339c536989b8978a43861045e565b9050808411610b665780610b68565b835b60405163095ea7b360e01b815290945073471ece3750da237f93b8e339c536989b8978a4389063095ea7b390610bc4907f0000000000000000000000000000000000000000000000000000000000000000908690600401610fd4565b6020604051808303816000875af1158015610be3573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c079190610fed565b50604080516080810182527308e3d9c6ea1b446ff2771c6738a6d313712f148760631b60a082015261017760eb1b60b48201526001600160601b03197f0000000000000000000000000000000000000000000000000000000000000000606090811b821660b784015261027160ec1b60cb8401527f0000000000000000000000000000000000000000000000000000000000000000901b1660ce820152815180820360c201815260e2820183528152600080546201000090046001600160a01b03166020830152918101610cdb8686611194565b815260200186905260405163b858183f60e01b81529091506001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000169063b858183f90610d329084906004016111a7565b6020604051808303816000875af1158015610d51573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610d759190610fbb565b506000546201000090046001600160a01b03163314610a2a57604051600090339086908381818185875af1925050503d8060008114610dd0576040519150601f19603f3d011682016040523d82523d6000602084013e610dd5565b606091505b5050905080610a285760405163e2a1cc9160e01b81526004810186905260240161036a565b600054610100900460ff1615808015610e1a5750600054600160ff909116105b80610e345750303b158015610e34575060005460ff166001145b610e975760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b606482015260840161036a565b6000805460ff191660011790558015610eba576000805461ff0019166101001790555b6000805462010000600160b01b031916620100006001600160a01b038516021790558015610373576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb38474024989060200160405180910390a15050565b6001600160a01b0391909116815260200190565b6001600160a01b038116811461045b57600080fd5b600060208284031215610f6057600080fd5b8135610f6b81610f39565b9392505050565b60008060408385031215610f8557600080fd5b823591506020830135610f9781610f39565b809150509250929050565b600060208284031215610fb457600080fd5b5035919050565b600060208284031215610fcd57600080fd5b5051919050565b6001600160a01b03929092168252602082015260400190565b600060208284031215610fff57600080fd5b81518015158114610f6b57600080fd5b6001600160801b039490941684526001600160a01b0392831660208501529116604083015263ffffffff16606082015260800190565b634e487b7160e01b600052604160045260246000fd5b805161106681610f39565b919050565b6000806040838503121561107e57600080fd5b8251602080850151919350906001600160401b038082111561109f57600080fd5b818601915086601f8301126110b357600080fd5b8151818111156110c5576110c5611045565b8060051b604051601f19603f830116810181811085821117156110ea576110ea611045565b60405291825284820192508381018501918983111561110857600080fd5b938501935b8285101561112d5761111e8561105b565b8452938501939285019261110d565b8096505050505050509250929050565b634e487b7160e01b600052601160045260246000fd5b600081600019048311821515161561116d5761116d61113d565b500290565b60008261118f57634e487b7160e01b600052601260045260246000fd5b500490565b8181038181111561067b5761067b61113d565b60006020808352835160808285015280518060a086015260005b818110156111dd5782810184015186820160c0015283016111c1565b50600060c08287010152918501516001600160a01b0381166040860152916040860151606086810191909152909501516080850152505050601f91909101601f19160160c00190565b8082018082111561067b5761067b61113d56fea2646970667358221220ba1dccba0e8d51fbfd40d3cf5d797df82a47de3edf9b7e2205bd7bb17f7eb92864736f6c63430008100033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100365760003560e01c8063901b96e71461003b5780639ed9331814610064575b600080fd5b61004e610049366004610288565b610077565b60405161005b91906102b1565b60405180910390f35b61004e610072366004610288565b610126565b6000808260405160200161008b91906102b1565b60408051601f198184030181529082905280516020909101203060388301526f5af43d82803e903d91602b57fd5bf3ff60248301527f00000000000000000000000000000000000000000000000000000000000000006014830152733d602d80600a3d3981f3363d3d373d3d3d363d738252605882018190526037600c830120607883015260556043909201919091209091505b9392505050565b6000808260405160200161013a91906102b1565b604051602081830303815290604052805190602001209050600061017e7f0000000000000000000000000000000000000000000000000000000000000000836101e7565b60405163189acdbd60e31b81529091506001600160a01b0382169063c4d66de8906101ad9087906004016102b1565b600060405180830381600087803b1580156101c757600080fd5b505af11580156101db573d6000803e3d6000fd5b50929695505050505050565b6000763d602d80600a3d3981f3363d3d373d3d3d363d730000008360601b60e81c176000526e5af43d82803e903d91602b57fd5bf38360781b1760205281603760096000f590506001600160a01b0381166102825760405162461bcd60e51b8152602060048201526017602482015276115490cc4c4d8dce8818dc99585d194c8819985a5b1959604a1b604482015260640160405180910390fd5b92915050565b60006020828403121561029a57600080fd5b81356001600160a01b038116811461011f57600080fd5b6001600160a01b039190911681526020019056fea2646970667358221220cfa844f49b93c62e4584a4a5b444f64804aa59393ebf3ad00dcc897551aa2c7964736f6c63430008100033",
   "linkReferences": {},
   "deployedLinkReferences": {}
 }

package/artifacts/contracts/utils/BuyGDClone.sol/IStaticOracle.dbg.json

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

package/artifacts/contracts/utils/BuyGDClone.sol/IStaticOracle.json

@@ -0,0 +1,79 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "IStaticOracle",
+  "sourceName": "contracts/utils/BuyGDClone.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "tokenA",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "tokenB",
+          "type": "address"
+        },
+        {
+          "internalType": "uint16",
+          "name": "cardinality",
+          "type": "uint16"
+        }
+      ],
+      "name": "prepareAllAvailablePoolsWithCardinality",
+      "outputs": [
+        {
+          "internalType": "address[]",
+          "name": "preparedPools",
+          "type": "address[]"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint128",
+          "name": "baseAmount",
+          "type": "uint128"
+        },
+        {
+          "internalType": "address",
+          "name": "baseToken",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "quoteToken",
+          "type": "address"
+        },
+        {
+          "internalType": "uint32",
+          "name": "period",
+          "type": "uint32"
+        }
+      ],
+      "name": "quoteAllAvailablePoolsWithTimePeriod",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "quoteAmount",
+          "type": "uint256"
+        },
+        {
+          "internalType": "address[]",
+          "name": "queriedPools",
+          "type": "address[]"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x",
+  "deployedBytecode": "0x",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

package/artifacts/contracts/utils/BuyGDClone.sol/ISwapRouter.dbg.json

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

package/artifacts/contracts/utils/DAOContract.sol/DAOContract.dbg.json

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

package/artifacts/contracts/utils/DAOUpgradeableContract.sol/DAOUpgradeableContract.dbg.json

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

package/artifacts/contracts/utils/DSMath.sol/DSMath.dbg.json

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

package/artifacts/contracts/utils/DataTypes.sol/DataTypes.dbg.json

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

package/artifacts/contracts/utils/GDFaucet.sol/GDFaucet.dbg.json

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

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/GoodDollarMintBurnWrapper.dbg.json

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

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/IRouter.dbg.json

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

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/PausableControl.dbg.json

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

package/artifacts/contracts/utils/GoodDollarMintBurnWrapper.sol/TokenOperation.dbg.json

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

package/artifacts/contracts/utils/IdentityFix.sol/IdentityFix.dbg.json

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

package/artifacts/contracts/utils/MultiCall.sol/Multicall.dbg.json

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

package/artifacts/contracts/utils/MultichainBridgeHelper.sol/MultichainBridgeHelper.dbg.json

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

package/artifacts/contracts/utils/NameService.sol/NameService.dbg.json

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

package/artifacts/contracts/utils/OneTimePayments.sol/OneTimePayments.dbg.json

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

package/artifacts/contracts/utils/OneTimePaymentsV2.sol/OneTimePaymentsV2.dbg.json

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

package/artifacts/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker.dbg.json

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

package/artifacts/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade.dbg.json

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

package/artifacts/contracts/utils/ProtocolUpgradeFuse.sol/ProtocolUpgradeFuse.dbg.json

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

package/artifacts/contracts/utils/ProtocolUpgradeFuseRecover.sol/ProtocolUpgradeFuseRecover.dbg.json

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

package/artifacts/contracts/utils/ProtocolUpgradeRecover.sol/ProtocolUpgradeRecover.dbg.json

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

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

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

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

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

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

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

package/contracts/fuseFaucet/Faucet.sol

@@ -93,7 +93,6 @@ contract Faucet is Initializable, UUPSUpgradeable, AccessControlUpgradeable {
 	modifier onlyAuthorized(address toTop) {
 		require(
 			getIdentity().getWhitelistedRoot(toTop) != address(0) ||
-				getIdentity().getWhitelistedRoot(msg.sender) != address(0) ||
 				hasRole(RELAYER_ROLE, msg.sender),
 			"not authorized"
 		);

package/contracts/fuseFaucet/FuseFaucetV2.sol

@@ -119,7 +119,6 @@ contract FuseFaucetV2 is Initializable {
 	modifier onlyAuthorized(address toTop) {
 		require(
 			getIdentity().getWhitelistedRoot(toTop) != address(0) ||
-				getIdentity().getWhitelistedRoot(msg.sender) != address(0) ||
 				msg.sender == relayer,
 			"not authorized"
 		);

package/contracts/utils/BuyGDClone.sol

@@ -5,6 +5,38 @@ import "@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "../Interfaces.sol";
 
+//@mean-finance/uniswap-v3-oracle
+interface IStaticOracle {
+	/// @notice Will increase observations for all existing pools for the given pair, so they start accruing information for twap calculations
+	/// @dev Will revert if there are no pools available for the pair and period combination
+	/// @param tokenA One of the pair's tokens
+	/// @param tokenB The other of the pair's tokens
+	/// @param cardinality The cardinality that will be guaranteed when quoting
+	/// @return preparedPools The pools that were prepared
+	function prepareAllAvailablePoolsWithCardinality(
+		address tokenA,
+		address tokenB,
+		uint16 cardinality
+	) external returns (address[] memory preparedPools);
+
+	/// @notice Returns a quote, based on the given tokens and amount, by querying all of the pair's pools
+	/// @dev If some pools are not configured correctly for the given period, then they will be ignored
+	/// @dev Will revert if there are no pools available/configured for the pair and period combination
+	/// @param baseAmount Amount of token to be converted
+	/// @param baseToken Address of an ERC20 token contract used as the baseAmount denomination
+	/// @param quoteToken Address of an ERC20 token contract used as the quoteAmount denomination
+	/// @param period Number of seconds from which to calculate the TWAP
+	/// @return quoteAmount Amount of quoteToken received for baseAmount of baseToken
+	/// @return queriedPools The pools that were queried to calculate the quote
+	function quoteAllAvailablePoolsWithTimePeriod(
+		uint128 baseAmount,
+		address baseToken,
+		address quoteToken,
+		uint32 period
+	) external view returns (uint256 quoteAmount, address[] memory queriedPools);
+}
+
+// @uniswap/v3-core
 interface ISwapRouter {
 	struct ExactInputSingleParams {
 		address tokenIn;
@@ -75,36 +107,75 @@ interface ISwapRouter {
 	) external payable returns (uint256 amountIn);
 }
 
+/*
+ * @title BuyGDClone
+ * @notice This contract allows users to swap Celo or cUSD for GoodDollar (GD) tokens.
+ * @dev This contract is a clone of the BuyGD contract, which is used to buy GD tokens on the GoodDollar platform.
+ * @dev This contract uses the SwapRouter contract to perform the swaps.
+ */
 contract BuyGDClone is Initializable {
-	error NOT_ALLOWED(address);
 	error REFUND_FAILED(uint256);
+	error NO_BALANCE();
 
 	ISwapRouter public immutable router;
 	address public constant celo = 0x471EcE3750Da237f93B8E339c536989b8978a438;
+	uint32 public immutable twapPeriod;
 	address public immutable cusd;
 	address public immutable gd;
+	IStaticOracle public immutable oracle;
 
 	address public owner;
-	address public executer;
 
 	receive() external payable {}
 
-	constructor(ISwapRouter _router, address _cusd, address _gd) {
+	constructor(
+		ISwapRouter _router,
+		address _cusd,
+		address _gd,
+		IStaticOracle _oracle
+	) {
 		router = _router;
 		cusd = _cusd;
 		gd = _gd;
+		oracle = _oracle;
+		twapPeriod = 300; //5 minutes
 	}
 
-	function initialize(address _owner, address _executer) external initializer {
+	/**
+	 * @notice Initializes the contract with the owner's address.
+	 * @param _owner The address of the owner of the contract.
+	 */
+	function initialize(address _owner) external initializer {
 		owner = _owner;
-		executer = _executer;
 	}
 
-	function swap(uint256 _minAmount) external {
+	/**
+	 * @notice Swaps either Celo or cUSD for GD tokens.
+	 * @dev If the contract has a balance of Celo, it will swap Celo for GD tokens.
+	 * @dev If the contract has a balance of cUSD, it will swap cUSD for GD tokens.
+	 * @param _minAmount The minimum amount of GD tokens to receive from the swap.
+	 */
+	function swap(uint256 _minAmount) external payable {
+		uint256 balance = address(this).balance;
+		if (balance > 0) return swapCelo(_minAmount);
+
+		balance = ERC20(cusd).balanceOf(address(this));
+		if (balance > 0) return swapCusd(_minAmount);
+
+		revert NO_BALANCE();
+	}
+
+	/**
+	 * @notice Swaps Celo for GD tokens.
+	 * @param _minAmount The minimum amount of GD tokens to receive from the swap.
+	 */
+	function swapCelo(uint256 _minAmount) public payable {
 		uint256 gasCosts = msg.sender == owner ? 0 : (block.basefee + 1e9) * 400000;
-		if (msg.sender != owner && msg.sender != executer)
-			revert NOT_ALLOWED(msg.sender);
 		uint256 balance = address(this).balance;
+
+		uint256 minByTwap = minAmountByTWAP(balance, celo);
+		_minAmount = _minAmount > minByTwap ? _minAmount : minByTwap;
+
 		ERC20(celo).approve(address(router), balance);
 		ISwapRouter.ExactInputParams memory params = ISwapRouter.ExactInputParams({
 			path: abi.encodePacked(celo, uint24(3000), cusd, uint24(10000), gd),
@@ -119,11 +190,17 @@ contract BuyGDClone is Initializable {
 		}
 	}
 
-	function swapCusd(uint256 _minAmount) external {
-		uint256 gasCosts = msg.sender == executer ? 1e17 : 0;
-		if (msg.sender != owner && msg.sender != executer)
-			revert NOT_ALLOWED(msg.sender);
+	/**
+	 * @notice Swaps cUSD for GD tokens.
+	 * @param _minAmount The minimum amount of GD tokens to receive from the swap.
+	 */
+	function swapCusd(uint256 _minAmount) public {
+		uint256 gasCosts = msg.sender != owner ? 1e17 : 0; //fixed 0.1$
 		uint balance = ERC20(cusd).balanceOf(address(this));
+
+		uint256 minByTwap = minAmountByTWAP(balance, cusd);
+		_minAmount = _minAmount > minByTwap ? _minAmount : minByTwap;
+
 		ERC20(cusd).approve(address(router), balance);
 		ISwapRouter.ExactInputParams memory params = ISwapRouter.ExactInputParams({
 			path: abi.encodePacked(cusd, uint24(10000), gd),
@@ -132,38 +209,99 @@ contract BuyGDClone is Initializable {
 			amountOutMinimum: _minAmount
 		});
 		router.exactInput(params);
-		if (msg.sender == executer) {
+		if (msg.sender != owner) {
 			ERC20(cusd).transfer(msg.sender, gasCosts);
 		}
 	}
 
+	/**
+	 * @notice Calculates the minimum amount of tokens that can be received for a given amount of base tokens,
+	 * based on the time-weighted average price (TWAP) of the token pair over a specified period of time.
+	 * @param baseAmount The amount of base tokens to swap.
+	 * @param baseToken The address of the base token.
+	 * @return minTwap The minimum amount of G$ expected to receive by twap
+	 */
+	function minAmountByTWAP(
+		uint256 baseAmount,
+		address baseToken
+	) public view returns (uint256 minTwap) {
+		uint128 toConvert = uint128(baseAmount);
+		uint256 quote;
+		if (baseToken == celo) {
+			(quote, ) = oracle.quoteAllAvailablePoolsWithTimePeriod(
+				toConvert,
+				baseToken,
+				cusd,
+				twapPeriod
+			);
+			toConvert = uint128(quote);
+		}
+		(quote, ) = oracle.quoteAllAvailablePoolsWithTimePeriod(
+			toConvert,
+			cusd,
+			gd,
+			twapPeriod
+		);
+		//minAmount should not be 5% under twap (ie we dont expect price movement > 5% in timePeriod)
+		return (quote * 95) / 100;
+	}
+
+	/**
+	 * @notice Recovers tokens accidentally sent to the contract.
+	 * @param token The address of the token to recover. Use address(0) to recover ETH.
+	 */
 	function recover(address token) external {
 		if (token == address(0)) {
 			(bool sent, ) = payable(owner).call{ value: address(this).balance }("");
 			if (!sent) revert REFUND_FAILED(address(this).balance);
-		} else ERC20(token).transfer(owner, ERC20(token).balanceOf(address(this)));
+		} else {
+			ERC20(token).transfer(owner, ERC20(token).balanceOf(address(this)));
+		}
 	}
 }
 
+/**
+ * @title BuyGDCloneFactory
+ * @notice Factory contract for creating clones of BuyGDClone contract
+ */
 contract BuyGDCloneFactory {
 	address immutable impl;
 
-	constructor(ISwapRouter _router, address _cusd, address _gd) {
-		impl = address(new BuyGDClone(_router, _cusd, _gd));
+	/**
+	 * @notice Initializes the BuyGDCloneFactory contract with the provided parameters.
+	 * @param _router The address of the SwapRouter contract.
+	 * @param _cusd The address of the cUSD token contract.
+	 * @param _gd The address of the GD token contract.
+	 * @param _oracle The address of the StaticOracle contract.
+	 */
+	constructor(
+		ISwapRouter _router,
+		address _cusd,
+		address _gd,
+		IStaticOracle _oracle
+	) {
+		impl = address(new BuyGDClone(_router, _cusd, _gd, _oracle));
 	}
 
-	function create(address owner, address executer) external returns (address) {
-		bytes32 salt = keccak256(abi.encode(owner, executer));
+	/**
+	 * @notice Creates a new clone of the BuyGDClone contract with the provided owner address.
+	 * @param owner The address of the owner of the new BuyGDClone contract.
+	 * @return The address of the new BuyGDClone contract.
+	 */
+	function create(address owner) external returns (address) {
+		bytes32 salt = keccak256(abi.encode(owner));
 		address clone = ClonesUpgradeable.cloneDeterministic(impl, salt);
-		BuyGDClone(payable(clone)).initialize(owner, executer);
+		BuyGDClone(payable(clone)).initialize(owner);
 		return clone;
 	}
 
-	function predict(
-		address owner,
-		address executer
-	) external view returns (address) {
-		bytes32 salt = keccak256(abi.encode(owner, executer));
+	/**
+	 * @notice Predicts the address of a new clone of the BuyGDClone contract with the provided owner address.
+	 * @param owner The address of the owner of the new BuyGDClone contract.
+	 * @return The predicted address of the new BuyGDClone contract.
+	 */
+	function predict(address owner) external view returns (address) {
+		bytes32 salt = keccak256(abi.encode(owner));
 
 		return
 			ClonesUpgradeable.predictDeterministicAddress(impl, salt, address(this));

package/hardhat.config.ts

@@ -37,8 +37,9 @@ const MAINNET_URL = "https://mainnet.infura.io/v3/" + infura_api;
 
 const goerli = {
   accounts: { mnemonic },
-  url: "https://rpc.ankr.com/eth_goerli",
+  url: "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
   gas: 3000000,
+  gasPrice: 2e9,
   chainId: 5
 };