@gooddollar/goodprotocol 2.0.3-beta.0 → 2.0.4

package/types/factories/OneTimePayments__factory.ts

@@ -0,0 +1,323 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers";
+import { Provider, TransactionRequest } from "@ethersproject/providers";
+import type {
+  OneTimePayments,
+  OneTimePaymentsInterface,
+} from "../OneTimePayments";
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: "contract INameService",
+        name: "_ns",
+        type: "address",
+      },
+    ],
+    stateMutability: "nonpayable",
+    type: "constructor",
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "address",
+        name: "from",
+        type: "address",
+      },
+      {
+        indexed: false,
+        internalType: "address",
+        name: "paymentId",
+        type: "address",
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256",
+      },
+    ],
+    name: "PaymentCancel",
+    type: "event",
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "address",
+        name: "from",
+        type: "address",
+      },
+      {
+        indexed: false,
+        internalType: "address",
+        name: "paymentId",
+        type: "address",
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256",
+      },
+    ],
+    name: "PaymentDeposit",
+    type: "event",
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: true,
+        internalType: "address",
+        name: "from",
+        type: "address",
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "to",
+        type: "address",
+      },
+      {
+        indexed: true,
+        internalType: "address",
+        name: "paymentId",
+        type: "address",
+      },
+      {
+        indexed: false,
+        internalType: "uint256",
+        name: "amount",
+        type: "uint256",
+      },
+    ],
+    name: "PaymentWithdraw",
+    type: "event",
+  },
+  {
+    inputs: [],
+    name: "avatar",
+    outputs: [
+      {
+        internalType: "address",
+        name: "",
+        type: "address",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "paymentId",
+        type: "address",
+      },
+    ],
+    name: "cancel",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "dao",
+    outputs: [
+      {
+        internalType: "contract Controller",
+        name: "",
+        type: "address",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "paymentId",
+        type: "address",
+      },
+    ],
+    name: "hasPayment",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "nameService",
+    outputs: [
+      {
+        internalType: "contract INameService",
+        name: "",
+        type: "address",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "nativeToken",
+    outputs: [
+      {
+        internalType: "contract IGoodDollar",
+        name: "",
+        type: "address",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "sender",
+        type: "address",
+      },
+      {
+        internalType: "uint256",
+        name: "value",
+        type: "uint256",
+      },
+      {
+        internalType: "bytes",
+        name: "data",
+        type: "bytes",
+      },
+    ],
+    name: "onTokenTransfer",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "",
+        type: "bool",
+      },
+    ],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "",
+        type: "address",
+      },
+    ],
+    name: "payments",
+    outputs: [
+      {
+        internalType: "bool",
+        name: "hasPayment",
+        type: "bool",
+      },
+      {
+        internalType: "uint256",
+        name: "paymentAmount",
+        type: "uint256",
+      },
+      {
+        internalType: "address",
+        name: "paymentSender",
+        type: "address",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+  {
+    inputs: [],
+    name: "updateAvatar",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "paymentId",
+        type: "address",
+      },
+      {
+        internalType: "bytes",
+        name: "signature",
+        type: "bytes",
+      },
+    ],
+    name: "withdraw",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+];
+
+const _bytecode =
+  "0x608060405234801561001057600080fd5b5060405162000f3538038062000f35833981016040819052610031916101a2565b61003a81610040565b506101c6565b600280546001600160a01b0319166001600160a01b038316179055610063610066565b50565b60025460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156100c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100ed91906101a2565b600080546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610147573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061016b91906101a2565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b038116811461006357600080fd5b6000602082840312156101b457600080fd5b81516101bf8161018d565b9392505050565b610d5f80620001d66000396000f3fe608060405234801561001057600080fd5b506004361061008e5760003560e01c80631b3c90a8146100935780633e6326fc1461009d5780634162169f146100cd5780634bb78b14146100e05780634c33fe94146100f35780635aef7de6146101065780639ea7811614610119578063a4c0ed3614610155578063e1758bd814610168578063e2982c2114610170575b600080fd5b61009b6101d2565b005b6002546100b0906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b6000546100b0906001600160a01b031681565b61009b6100ee366004610b4c565b6102f9565b61009b610101366004610c0f565b6103f7565b6001546100b0906001600160a01b031681565b610145610127366004610c0f565b6001600160a01b031660009081526035602052604090205460ff1690565b60405190151581526020016100c4565b610145610163366004610c33565b6104d0565b6100b0610658565b6101ac61017e366004610c0f565b60356020526000908152604090208054600182015460029092015460ff90911691906001600160a01b031683565b60408051931515845260208401929092526001600160a01b0316908201526060016100c4565b60025460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610235573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102599190610cbb565b600080546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156102b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d79190610cbb565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b600061030533836106e5565b9050826001600160a01b0316816001600160a01b0316146103685760405162461bcd60e51b815260206004820152601860248201527714da59db985d1d5c99481a5cc81b9bdd0818dbdc9c9958dd60421b60448201526064015b60405180910390fd5b6001600160a01b03808416600090815260356020526040902060018101546002909101549091166103998583610774565b846001600160a01b0316336001600160a01b0316826001600160a01b03167f39ca68a9f5d8038e871ef25a6622a56579cda4a6eedf63813574d23652e94048856040516103e891815260200190565b60405180910390a45050505050565b6001600160a01b038181166000908152603560205260409020600201541633146104635760405162461bcd60e51b815260206004820152601d60248201527f43616e206f6e6c792062652063616c6c65642062792063726561746f72000000604482015260640161035f565b6001600160a01b0381166000908152603560205260409020600101546104898282610774565b336001600160a01b03167fb1f6a8f6b8fb527cfeec0df589160bc2a92ff715097117cb250e823c7106bc2f83836040516104c4929190610cd8565b60405180910390a25050565b6000806104df83850185610c0f565b6001600160a01b03811660009081526035602052604090205490915060ff16156105465760405162461bcd60e51b81526020600482015260186024820152777061796d656e74496420616c726561647920696e2075736560401b604482015260640161035f565b61054e610658565b6001600160a01b0316336001600160a01b0316146105a65760405162461bcd60e51b81526020600482015260156024820152744f6e6c792063616c6c61626c65206279207468697360581b604482015260640161035f565b60408051606081018252600180825260208083018981526001600160a01b038b811685870181815288831660009081526035909552938790209551865460ff19169015151786559151938501939093559051600290930180546001600160a01b0319169390921692909217905590517f6c9f23ee41b34196a6e871314d55c3a0cce3399afc5d09755d171ea06547e073906106449084908990610cd8565b60405180910390a250600195945050505050565b60025460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156106bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e09190610cbb565b905090565b60408051606084901b6001600160601b031916602080830191909152825160148184030181526034830184528051908201207b0ca2ba3432b932bab69029b4b3b732b21026b2b9b9b0b3b29d05199960211b60548401526070808401919091528351808403909101815260909092019092528051910120600090600061076b82856108b6565b95945050505050565b6001600160a01b03821660009081526035602052604090205460ff166107d35760405162461bcd60e51b81526020600482015260146024820152737061796d656e744964206e6f7420696e2075736560601b604482015260640161035f565b6001600160a01b0382166000908152603560205260409020805460ff191690556107fb610658565b6001600160a01b031663a9059cbb33836040518363ffffffff1660e01b8152600401610828929190610cd8565b6020604051808303816000875af1158015610847573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061086b9190610cf1565b6108b25760405162461bcd60e51b81526020600482015260186024820152771dda5d1a191c985dc81d1c985b9cd9995c8819985a5b195960421b604482015260640161035f565b5050565b60008060006108c585856108da565b915091506108d28161091f565b509392505050565b60008082516041036109105760208301516040840151606085015160001a61090487828585610a67565b94509450505050610918565b506000905060025b9250929050565b600081600481111561093357610933610d13565b0361093b5750565b600181600481111561094f5761094f610d13565b036109975760405162461bcd60e51b815260206004820152601860248201527745434453413a20696e76616c6964207369676e617475726560401b604482015260640161035f565b60028160048111156109ab576109ab610d13565b036109f85760405162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e67746800604482015260640161035f565b6003816004811115610a0c57610a0c610d13565b03610a645760405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c604482015261756560f01b606482015260840161035f565b50565b6000806fa2a8918ca85bafe22016d0b997e4df60600160ff1b03831115610a945750600090506003610b18565b6040805160008082526020820180845289905260ff881692820192909252606081018690526080810185905260019060a0016020604051602081039080840390855afa158015610ae8573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116610b1157600060019250925050610b18565b9150600090505b94509492505050565b6001600160a01b0381168114610a6457600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b5f57600080fd5b8235610b6a81610b21565b915060208301356001600160401b0380821115610b8657600080fd5b818501915085601f830112610b9a57600080fd5b813581811115610bac57610bac610b36565b604051601f8201601f19908116603f01168101908382118183101715610bd457610bd4610b36565b81604052828152886020848701011115610bed57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610c2157600080fd5b8135610c2c81610b21565b9392505050565b60008060008060608587031215610c4957600080fd5b8435610c5481610b21565b93506020850135925060408501356001600160401b0380821115610c7757600080fd5b818701915087601f830112610c8b57600080fd5b813581811115610c9a57600080fd5b886020828501011115610cac57600080fd5b95989497505060200194505050565b600060208284031215610ccd57600080fd5b8151610c2c81610b21565b6001600160a01b03929092168252602082015260400190565b600060208284031215610d0357600080fd5b81518015158114610c2c57600080fd5b634e487b7160e01b600052602160045260246000fdfea26469706673582212203a151427250946dd0e6d3a0ee191879e840e40600d382ab39ed0a83ff588778964736f6c63430008100033";
+
+type OneTimePaymentsConstructorParams =
+  | [signer?: Signer]
+  | ConstructorParameters<typeof ContractFactory>;
+
+const isSuperArgs = (
+  xs: OneTimePaymentsConstructorParams
+): xs is ConstructorParameters<typeof ContractFactory> => xs.length > 1;
+
+export class OneTimePayments__factory extends ContractFactory {
+  constructor(...args: OneTimePaymentsConstructorParams) {
+    if (isSuperArgs(args)) {
+      super(...args);
+    } else {
+      super(_abi, _bytecode, args[0]);
+    }
+  }
+
+  deploy(
+    _ns: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): Promise<OneTimePayments> {
+    return super.deploy(_ns, overrides || {}) as Promise<OneTimePayments>;
+  }
+  getDeployTransaction(
+    _ns: string,
+    overrides?: Overrides & { from?: string | Promise<string> }
+  ): TransactionRequest {
+    return super.getDeployTransaction(_ns, overrides || {});
+  }
+  attach(address: string): OneTimePayments {
+    return super.attach(address) as OneTimePayments;
+  }
+  connect(signer: Signer): OneTimePayments__factory {
+    return super.connect(signer) as OneTimePayments__factory;
+  }
+  static readonly bytecode = _bytecode;
+  static readonly abi = _abi;
+  static createInterface(): OneTimePaymentsInterface {
+    return new utils.Interface(_abi) as OneTimePaymentsInterface;
+  }
+  static connect(
+    address: string,
+    signerOrProvider: Signer | Provider
+  ): OneTimePayments {
+    return new Contract(address, _abi, signerOrProvider) as OneTimePayments;
+  }
+}

package/types/factories/UBIScheme__factory.ts

@@ -985,7 +985,7 @@ const _abi = [
 ];
 
 const _bytecode =
-  "0x60a06040523060805234801561001457600080fd5b50608051612c7661004c60003960008181610d6901528181610da9015281816111dd0152818161121d01526112990152612c766000f3fe60806040526004361061022e5760003560e01c8063013eba921461023357806302329a2914610273578063069786ea146102955780630ce82d67146102bf5780631248b101146102d45780631794bb3c1461030b5780631a787f2e1461032b5780631b3c90a81461034b5780631bbc644c146103605780631d8f5ea91461039057806322b45727146103a65780633659cfe6146103bc57806337658574146103dc5780633d84ceca146103f25780633e6326fc146104125780634162169f1461043f5780634202d2141461045f578063456ac1c21461047f5780634b4c7180146104995780634e71d92d146104b35780634f1ef286146104c85780635231e2f0146104db57806352d1902d1461050b578063560796d1146105205780635aef7de6146105715780635c9302c9146105915780635c975abb146105a757806373b2e80e146105c1578063741470ac146105e15780638081cbbd146105f75780638fd247d21461061757806398d6621b146106375780639dc2c0331461064c578063a21f698a14610662578063b656223d14610682578063ba07541014610698578063c033abf2146106ae578063c1337508146106c4578063c7713870146106e4578063c7a76adf146106f9578063cc054dfc14610719578063cef6360014610746578063d6a9f61814610766578063d7c4cbb814610786578063dddc36161461079c578063de1de3a0146107b1578063e1758bd8146107d1578063eac471a0146107e6578063eda4e6d6146107fc575b600080fd5b34801561023f57600080fd5b5061026061024e366004612651565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561027f57600080fd5b5061029361028e36600461267c565b610812565b005b3480156102a157600080fd5b506102aa61082d565b6040805192835260208301919091520161026a565b3480156102cb57600080fd5b5061026061086b565b3480156102e057600080fd5b506102aa6102ef366004612699565b609a602052600090815260409020600181015460029091015482565b34801561031757600080fd5b506102936103263660046126b2565b61088e565b34801561033757600080fd5b50610260610346366004612651565b610a81565b34801561035757600080fd5b50610293610ba9565b34801561036c57600080fd5b5061038061037b366004612651565b610cd0565b604051901515815260200161026a565b34801561039c57600080fd5b50610260609e5481565b3480156103b257600080fd5b5061026060a05481565b3480156103c857600080fd5b506102936103d7366004612651565b610d5f565b3480156103e857600080fd5b5061026060a95481565b3480156103fe57600080fd5b5061029361040d366004612699565b610e27565b34801561041e57600080fd5b50606754610432906001600160a01b031681565b60405161026a91906126f3565b34801561044b57600080fd5b50606554610432906001600160a01b031681565b34801561046b57600080fd5b5061038061047a366004612651565b610eca565b34801561048b57600080fd5b5060a3546103809060ff1681565b3480156104a557600080fd5b5060a8546103809060ff1681565b3480156104bf57600080fd5b50610380610f2c565b6102936104d6366004612774565b6111d3565b3480156104e757600080fd5b506103806104f6366004612651565b60ac6020526000908152604090205460ff1681565b34801561051757600080fd5b5061026061128c565b34801561052c57600080fd5b5061055a61053b366004612699565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161026a565b34801561057d57600080fd5b50606654610432906001600160a01b031681565b34801561059d57600080fd5b50610260609c5481565b3480156105b357600080fd5b5060ae546103809060ff1681565b3480156105cd57600080fd5b506103806105dc366004612651565b61133a565b3480156105ed57600080fd5b5061026060a75481565b34801561060357600080fd5b5060aa54610432906001600160a01b031681565b34801561062357600080fd5b50610293610632366004612699565b611366565b34801561064357600080fd5b50610260611373565b34801561065857600080fd5b5061026060a55481565b34801561066e57600080fd5b5061038061067d366004612651565b61137e565b34801561068e57600080fd5b5061026060a25481565b3480156106a457600080fd5b5061026060a65481565b3480156106ba57600080fd5b50610260609f5481565b3480156106d057600080fd5b506102606106df366004612806565b6113a4565b3480156106f057600080fd5b506102606114f3565b34801561070557600080fd5b50610260610714366004612699565b6115d6565b34801561072557600080fd5b50610260610734366004612651565b60ad6020526000908152604090205481565b34801561075257600080fd5b50610260610761366004612699565b6115eb565b34801561077257600080fd5b5061029361078136600461267c565b611600565b34801561079257600080fd5b5061026060a15481565b3480156107a857600080fd5b5061029361161b565b3480156107bd57600080fd5b506102936107cc36600461267c565b61167a565b3480156107dd57600080fd5b506104326116c9565b3480156107f257600080fd5b5061026060a45481565b34801561080857600080fd5b50610260609d5481565b61081a611751565b60ae805460ff1916911515919091179055565b600080600062015180609d544261084491906128cd565b61084e91906128e0565b9050610859816115d6565b610862826115eb565b92509250509091565b60006201518060a6544261087f91906128cd565b61088991906128e0565b905090565b600054610100900460ff16158080156108ae5750600054600160ff909116105b806108cf57506108bd30611816565b1580156108cf575060005460ff166001145b6109375760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b6000805460ff19166001179055801561095a576000805461ff0019166101001790555b600082116109aa5760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f604482015260640161092e565b6109b384611825565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055605a60a4556202d2a8609f556109f662015180426128e0565b610a039062015180612902565b610a0f9061a8c0612921565b609d81905560a65560a8805460ff19166001600160a01b03851615151790556103e860a9558015610a7b576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498906020015b60405180910390a15b50505050565b6000609d54421015610a9557506000919050565b60a85460ff168015610acf5750610aab8261137e565b1580610acf57506001600160a01b038216600090815260ac602052604090205460ff165b15610b515760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b27573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b4b9190612934565b92915050565b62015180609d5442610b6391906128cd565b610b6d91906128e0565b609c54148015610b7f57506000609e54115b15610ba157610b8d8261133a565b610b9957609e54610b4b565b600092915050565b610b4b6114f3565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610c0c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c30919061294d565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610c8a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cae919061294d565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60ae5460009060ff16158015610ce857506000609d54115b8015610cf65750609d544210155b610d125760405162461bcd60e51b815260040161092e9061296a565b610d1b82611848565b610d545760405162461bcd60e51b815260206004820152600a6024820152690c6c2dc4ee840ccd2e6d60b31b604482015260640161092e565b610b4b82600161188c565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610da75760405162461bcd60e51b815260040161092e906129a1565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610dd961193a565b6001600160a01b031614610dff5760405162461bcd60e51b815260040161092e906129db565b610e0881611956565b60408051600080825260208201909252610e249183919061195e565b50565b610e2f611751565b60008111610e895760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b606482015260840161092e565b60a4819055600060a7556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610eec8361137e565b15610f2357600062015180610f0183426128cd565b610f0b91906128e0565b905060a254811015610f21575060019392505050565b505b50600092915050565b60ae5460009060ff16158015610f4457506000609d54115b8015610f525750609d544210155b610f6e5760405162461bcd60e51b815260040161092e9061296a565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610fd0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ff4919061294d565b6001600160a01b0316632d0e9b46336040518263ffffffff1660e01b815260040161101f91906126f3565b602060405180830381865afa15801561103c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611060919061294d565b90506001600160a01b0381166110b55760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b604482015260640161092e565b60006110c18233611ace565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac190606401602060405180830381865afa15801561112d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611151919061294d565b905081801561116857506001600160a01b03811615155b156111cc5760405163748abee960e11b81526001600160a01b0382169063e9157dd2906111999086906004016126f3565b600060405180830381600087803b1580156111b357600080fd5b505af11580156111c7573d6000803e3d6000fd5b505050505b5091505090565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361121b5760405162461bcd60e51b815260040161092e906129a1565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661124d61193a565b6001600160a01b0316146112735760405162461bcd60e51b815260040161092e906129db565b61127c82611956565b6112888282600161195e565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146113275760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b606482015260840161092e565b50600080516020612bfa83398151915290565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b61136e611751565b60a055565b600061088933610a81565b6001600160a01b0381166000908152609b602052604081205415610b9957506001919050565b60ae5460009060ff161580156113bc57506000609d54115b80156113ca5750609d544210155b6113e65760405162461bcd60e51b815260040161092e9061296a565b6000805b83518210156114a557609f545a106114a55761141e84838151811061141157611411612a15565b6020026020010151611848565b156114955761144784838151811061143857611438612a15565b6020026020010151600061188c565b6114855760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b604482015260640161092e565b609e546114929082612921565b90505b61149e82612a2b565b91506113ea565b80156114b9576114b9333383600080611c19565b6040518281527f72b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540f9060200160405180910390a15092915050565b6000806114fe6116c9565b6001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161152991906126f3565b602060405180830381865afa158015611546573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061156a9190612934565b9050600060a55460a4548361157f91906128e0565b119050600060a5549050600060a75461159661086b565b1015806115a05750825b156115b55760a4546115b290856128e0565b91505b6115c360a05460a954611eb2565b6115cd90836128e0565b95945050505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b611608611751565b60a8805460ff1916911515919091179055565b600062015180609d544261162f91906128cd565b61163991906128e0565b9050609c54811115610e2457609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610ebf565b611682611751565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610ebf565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561172d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610889919061294d565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa15801561179a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117be919061294d565b6001600160a01b0316146118145760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f64604482015260640161092e565b565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b038316179055610e24610ba9565b60006118538261137e565b8015611865575061186382610eca565b155b8015610b4b5750506001600160a01b0316600090815260ac602052604090205460ff161590565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055806118b8611ecb565b60a054909150156118dc57600160a060008282546118d691906128cd565b90915550505b82156118f0576118f0333383600080611c19565b6040518181526001600160a01b0385169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a35060019392505050565b600080516020612bfa833981519152546001600160a01b031690565b610e24611751565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615611996576119918361215d565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156119f0575060408051601f3d908101601f191682019092526119ed91810190612934565b60015b611a535760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161092e565b600080516020612bfa8339815191528114611ac25760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161092e565b506119918383836121f7565b600080611ad9611ecb565b9050611ae48461137e565b8015611b0957506001600160a01b038416600090815260ac602052604090205460ff16155b8015611b1b5750611b198461133a565b155b15611b3957611b2f84848360016000611c19565b6001915050610b4b565b611b428461137e565b1580611b6657506001600160a01b038416600090815260ac602052604090205460ff165b15611c0f57600160a06000828254611b7e9190612921565b90915550506001600160a01b038416600090815260ac60205260409020805460ff1916905560a85460ff1615611bc257611bbd84846000806001611c19565b611bd1565b611bd184848360016000611c19565b6040516001600160a01b038516907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a26001915050610b4b565b5060009392505050565b8180611c225750805b15611cb0576001609a6000609c5481526020019081526020016000206001016000828254611c509190612921565b9091555050609c546000908152609a602090815260408083206001600160a01b03891684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611caa908490612921565b90915550505b8015611d8b5760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611ce79088906004016126f3565b6020604051808303816000875af1158015611d06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d2a9190612934565b905080609a6000609c5481526020019081526020016000206002016000828254611d549190612921565b90915550506040518181526001600160a01b03871690600080516020612bda8339815191529060200160405180910390a250611eab565b8115611de757609c546000908152609a602052604081206002018054859290611db5908490612921565b90915550506040518381526001600160a01b03861690600080516020612bda8339815191529060200160405180910390a25b6000611df16116c9565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611e229088908890600401612a44565b6020604051808303816000875af1158015611e41573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e659190612a5d565b611ea95760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b604482015260640161092e565b505b5050505050565b600081831015611ec25781611ec4565b825b9392505050565b6000611ed561161b565b60a154609c54141580611ee85750609e54155b15612156576000611ef76116c9565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b8152600401611f2791906126f3565b602060405180830381865afa158015611f44573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611f689190612934565b9050600060a55460a45483611f7d91906128e0565b11905060a754611f8b61086b565b101580611f955750805b1561209e5760a35460ff161561201d57611fad61221c565b6040516370a0823160e01b81526001600160a01b038416906370a0823190611fd99030906004016126f3565b602060405180830381865afa158015611ff6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061201a9190612934565b91505b60a45461202a90836128e0565b60a55560a45460a75561203f610e10426128e0565b61204b90610e10612902565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a05460a9546120de9190611eb2565b60a5546120eb91906128e0565b609e5560a05461210990612101906002906128e0565b60a954611eb2565b60a955609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b61216681611816565b6121c85760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161092e565b600080516020612bfa83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b612200836124da565b60008251118061220d5750805b1561199157610a7b838361251a565b60006122266116c9565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161225691906126f3565b602060405180830381865afa158015612273573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122979190612934565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a08231926122cf92909116906004016126f3565b602060405180830381865afa1580156122ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123109190612934565b6065546040519192506001600160a01b03169063d1b7089a90859061233b9030908690602401612a44565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526123969392916001600160a01b031690600090600401612aca565b6000604051808303816000875af11580156123b5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526123dd9190810190612afe565b50600090506123ec8284612921565b6040516370a0823160e01b81529091506001600160a01b038516906370a082319061241b9030906004016126f3565b602060405180830381865afa158015612438573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061245c9190612934565b81146124a45760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b604482015260640161092e565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba9101610a72565b6124e38161215d565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061252583611816565b6125805760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161092e565b600080846001600160a01b03168460405161259b9190612b8a565b600060405180830381855af49150503d80600081146125d6576040519150601f19603f3d011682016040523d82523d6000602084013e6125db565b606091505b50915091506115cd8282604051806060016040528060278152602001612c1a602791396060831561260d575081611ec4565b611ec483838151156126225781518083602001fd5b8060405162461bcd60e51b815260040161092e9190612ba6565b6001600160a01b0381168114610e2457600080fd5b60006020828403121561266357600080fd5b8135611ec48161263c565b8015158114610e2457600080fd5b60006020828403121561268e57600080fd5b8135611ec48161266e565b6000602082840312156126ab57600080fd5b5035919050565b6000806000606084860312156126c757600080fd5b83356126d28161263c565b925060208401356126e28161263c565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561274557612745612707565b604052919050565b60006001600160401b0382111561276657612766612707565b50601f01601f191660200190565b6000806040838503121561278757600080fd5b82356127928161263c565b915060208301356001600160401b038111156127ad57600080fd5b8301601f810185136127be57600080fd5b80356127d16127cc8261274d565b61271d565b8181528660208385010111156127e657600080fd5b816020840160208301376000602083830101528093505050509250929050565b6000602080838503121561281957600080fd5b82356001600160401b038082111561283057600080fd5b818501915085601f83011261284457600080fd5b81358181111561285657612856612707565b8060051b915061286784830161271d565b818152918301840191848101908884111561288157600080fd5b938501935b838510156128ab578435925061289b8361263c565b8282529385019390850190612886565b98975050505050505050565b634e487b7160e01b600052601160045260246000fd5b81810381811115610b4b57610b4b6128b7565b6000826128fd57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561291c5761291c6128b7565b500290565b80820180821115610b4b57610b4b6128b7565b60006020828403121561294657600080fd5b5051919050565b60006020828403121561295f57600080fd5b8151611ec48161263c565b6020808252601e908201527f6e6f7420696e20706572696f6453746172746564206f72207061757365640000604082015260600190565b6020808252602c90820152600080516020612bba83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612bba83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b600060018201612a3d57612a3d6128b7565b5060010190565b6001600160a01b03929092168252602082015260400190565b600060208284031215612a6f57600080fd5b8151611ec48161266e565b60005b83811015612a95578181015183820152602001612a7d565b50506000910152565b60008151808452612ab6816020860160208601612a7a565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152612aec6080840187612a9e565b94166040830152506060015292915050565b60008060408385031215612b1157600080fd5b8251612b1c8161266e565b60208401519092506001600160401b03811115612b3857600080fd5b8301601f81018513612b4957600080fd5b8051612b576127cc8261274d565b818152866020838501011115612b6c57600080fd5b612b7d826020830160208601612a7a565b8093505050509250929050565b60008251612b9c818460208701612a7a565b9190910192915050565b602081526000611ec46020830184612a9e56fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122094ab3ca5cab74bba9fe3636b3686cf16e3cab1565937d93ec4ff1e2bd8a9a99364736f6c63430008100033";
+  "0x60a06040523060805234801561001457600080fd5b50608051612c7661004c60003960008181610d6901528181610da9015281816111dd0152818161121d01526112990152612c766000f3fe60806040526004361061022e5760003560e01c8063013eba921461023357806302329a2914610273578063069786ea146102955780630ce82d67146102bf5780631248b101146102d45780631794bb3c1461030b5780631a787f2e1461032b5780631b3c90a81461034b5780631bbc644c146103605780631d8f5ea91461039057806322b45727146103a65780633659cfe6146103bc57806337658574146103dc5780633d84ceca146103f25780633e6326fc146104125780634162169f1461043f5780634202d2141461045f578063456ac1c21461047f5780634b4c7180146104995780634e71d92d146104b35780634f1ef286146104c85780635231e2f0146104db57806352d1902d1461050b578063560796d1146105205780635aef7de6146105715780635c9302c9146105915780635c975abb146105a757806373b2e80e146105c1578063741470ac146105e15780638081cbbd146105f75780638fd247d21461061757806398d6621b146106375780639dc2c0331461064c578063a21f698a14610662578063b656223d14610682578063ba07541014610698578063c033abf2146106ae578063c1337508146106c4578063c7713870146106e4578063c7a76adf146106f9578063cc054dfc14610719578063cef6360014610746578063d6a9f61814610766578063d7c4cbb814610786578063dddc36161461079c578063de1de3a0146107b1578063e1758bd8146107d1578063eac471a0146107e6578063eda4e6d6146107fc575b600080fd5b34801561023f57600080fd5b5061026061024e366004612651565b609b6020526000908152604090205481565b6040519081526020015b60405180910390f35b34801561027f57600080fd5b5061029361028e36600461267c565b610812565b005b3480156102a157600080fd5b506102aa61082d565b6040805192835260208301919091520161026a565b3480156102cb57600080fd5b5061026061086b565b3480156102e057600080fd5b506102aa6102ef366004612699565b609a602052600090815260409020600181015460029091015482565b34801561031757600080fd5b506102936103263660046126b2565b61088e565b34801561033757600080fd5b50610260610346366004612651565b610a81565b34801561035757600080fd5b50610293610ba9565b34801561036c57600080fd5b5061038061037b366004612651565b610cd0565b604051901515815260200161026a565b34801561039c57600080fd5b50610260609e5481565b3480156103b257600080fd5b5061026060a05481565b3480156103c857600080fd5b506102936103d7366004612651565b610d5f565b3480156103e857600080fd5b5061026060a95481565b3480156103fe57600080fd5b5061029361040d366004612699565b610e27565b34801561041e57600080fd5b50606754610432906001600160a01b031681565b60405161026a91906126f3565b34801561044b57600080fd5b50606554610432906001600160a01b031681565b34801561046b57600080fd5b5061038061047a366004612651565b610eca565b34801561048b57600080fd5b5060a3546103809060ff1681565b3480156104a557600080fd5b5060a8546103809060ff1681565b3480156104bf57600080fd5b50610380610f2c565b6102936104d6366004612774565b6111d3565b3480156104e757600080fd5b506103806104f6366004612651565b60ac6020526000908152604090205460ff1681565b34801561051757600080fd5b5061026061128c565b34801561052c57600080fd5b5061055a61053b366004612699565b60ab602052600090815260409020805460019091015460ff9091169082565b60408051921515835260208301919091520161026a565b34801561057d57600080fd5b50606654610432906001600160a01b031681565b34801561059d57600080fd5b50610260609c5481565b3480156105b357600080fd5b5060ae546103809060ff1681565b3480156105cd57600080fd5b506103806105dc366004612651565b61133a565b3480156105ed57600080fd5b5061026060a75481565b34801561060357600080fd5b5060aa54610432906001600160a01b031681565b34801561062357600080fd5b50610293610632366004612699565b611366565b34801561064357600080fd5b50610260611373565b34801561065857600080fd5b5061026060a55481565b34801561066e57600080fd5b5061038061067d366004612651565b61137e565b34801561068e57600080fd5b5061026060a25481565b3480156106a457600080fd5b5061026060a65481565b3480156106ba57600080fd5b50610260609f5481565b3480156106d057600080fd5b506102606106df366004612806565b6113a4565b3480156106f057600080fd5b506102606114f3565b34801561070557600080fd5b50610260610714366004612699565b6115d6565b34801561072557600080fd5b50610260610734366004612651565b60ad6020526000908152604090205481565b34801561075257600080fd5b50610260610761366004612699565b6115eb565b34801561077257600080fd5b5061029361078136600461267c565b611600565b34801561079257600080fd5b5061026060a15481565b3480156107a857600080fd5b5061029361161b565b3480156107bd57600080fd5b506102936107cc36600461267c565b61167a565b3480156107dd57600080fd5b506104326116c9565b3480156107f257600080fd5b5061026060a45481565b34801561080857600080fd5b50610260609d5481565b61081a611751565b60ae805460ff1916911515919091179055565b600080600062015180609d544261084491906128cd565b61084e91906128e0565b9050610859816115d6565b610862826115eb565b92509250509091565b60006201518060a6544261087f91906128cd565b61088991906128e0565b905090565b600054610100900460ff16158080156108ae5750600054600160ff909116105b806108cf57506108bd30611816565b1580156108cf575060005460ff166001145b6109375760405162461bcd60e51b815260206004820152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b60648201526084015b60405180910390fd5b6000805460ff19166001179055801561095a576000805461ff0019166101001790555b600082116109aa5760405162461bcd60e51b815260206004820181905260248201527f4d617820696e61637469766520646179732063616e6e6f74206265207a65726f604482015260640161092e565b6109b384611825565b60a282905560aa80546001600160a01b0319166001600160a01b03851617905560a3805460ff19169055601e60a4556202d2a8609f556109f662015180426128e0565b610a039062015180612902565b610a0f9061a8c0612921565b609d81905560a65560a8805460ff19166001600160a01b03851615151790556103e860a9558015610a7b576000805461ff0019169055604051600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498906020015b60405180910390a15b50505050565b6000609d54421015610a9557506000919050565b60a85460ff168015610acf5750610aab8261137e565b1580610acf57506001600160a01b038216600090815260ac602052604090205460ff165b15610b515760aa60009054906101000a90046001600160a01b03166001600160a01b031663830953ab6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b27573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b4b9190612934565b92915050565b62015180609d5442610b6391906128cd565b610b6d91906128e0565b609c54148015610b7f57506000609e54115b15610ba157610b8d8261133a565b610b9957609e54610b4b565b600092915050565b610b4b6114f3565b60675460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610c0c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c30919061294d565b606580546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610c8a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610cae919061294d565b606680546001600160a01b0319166001600160a01b0392909216919091179055565b60ae5460009060ff16158015610ce857506000609d54115b8015610cf65750609d544210155b610d125760405162461bcd60e51b815260040161092e9061296a565b610d1b82611848565b610d545760405162461bcd60e51b815260206004820152600a6024820152690c6c2dc4ee840ccd2e6d60b31b604482015260640161092e565b610b4b82600161188c565b6001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000163003610da75760405162461bcd60e51b815260040161092e906129a1565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316610dd961193a565b6001600160a01b031614610dff5760405162461bcd60e51b815260040161092e906129db565b610e0881611956565b60408051600080825260208201909252610e249183919061195e565b50565b610e2f611751565b60008111610e895760405162461bcd60e51b815260206004820152602160248201527f6379636c65206d757374206265206174206c65617374203120646179206c6f6e6044820152606760f81b606482015260840161092e565b60a4819055600060a7556040518181527fa61e6cca2c12e2a0a493683acfe95b034f0f50d793434f4dfe3ba06ea201f344906020015b60405180910390a150565b6001600160a01b0381166000908152609b6020526040812054610eec8361137e565b15610f2357600062015180610f0183426128cd565b610f0b91906128e0565b905060a254811015610f21575060019392505050565b505b50600092915050565b60ae5460009060ff16158015610f4457506000609d54115b8015610f525750609d544210155b610f6e5760405162461bcd60e51b815260040161092e9061296a565b60675460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa158015610fd0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ff4919061294d565b6001600160a01b0316632d0e9b46336040518263ffffffff1660e01b815260040161101f91906126f3565b602060405180830381865afa15801561103c573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611060919061294d565b90506001600160a01b0381166110b55760405162461bcd60e51b815260206004820152601a60248201527915509254d8da195b594e881b9bdd081dda1a5d195b1a5cdd195960321b604482015260640161092e565b60006110c18233611ace565b60675460405163bf40fac160e01b815260206004820152600d60248201526c4744414f5f434c41494d45525360981b60448201529192506000916001600160a01b039091169063bf40fac190606401602060405180830381865afa15801561112d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611151919061294d565b905081801561116857506001600160a01b03811615155b156111cc5760405163748abee960e11b81526001600160a01b0382169063e9157dd2906111999086906004016126f3565b600060405180830381600087803b1580156111b357600080fd5b505af11580156111c7573d6000803e3d6000fd5b505050505b5091505090565b6001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016300361121b5760405162461bcd60e51b815260040161092e906129a1565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031661124d61193a565b6001600160a01b0316146112735760405162461bcd60e51b815260040161092e906129db565b61127c82611956565b6112888282600161195e565b5050565b6000306001600160a01b037f000000000000000000000000000000000000000000000000000000000000000016146113275760405162461bcd60e51b815260206004820152603860248201527f555550535570677261646561626c653a206d757374206e6f742062652063616c6044820152771b1959081d1a1c9bdd59da0819195b1959d85d1958d85b1b60421b606482015260840161092e565b50600080516020612bfa83398151915290565b609c546000908152609a602090815260408083206001600160a01b039094168352929052205460ff1690565b61136e611751565b60a055565b600061088933610a81565b6001600160a01b0381166000908152609b602052604081205415610b9957506001919050565b60ae5460009060ff161580156113bc57506000609d54115b80156113ca5750609d544210155b6113e65760405162461bcd60e51b815260040161092e9061296a565b6000805b83518210156114a557609f545a106114a55761141e84838151811061141157611411612a15565b6020026020010151611848565b156114955761144784838151811061143857611438612a15565b6020026020010151600061188c565b6114855760405162461bcd60e51b815260206004820152600f60248201526e199a5cda081a185cc819985a5b1959608a1b604482015260640161092e565b609e546114929082612921565b90505b61149e82612a2b565b91506113ea565b80156114b9576114b9333383600080611c19565b6040518281527f72b174db45b7e58932cb0c6bf37a7158f40424a078b07677d823cafdb3db540f9060200160405180910390a15092915050565b6000806114fe6116c9565b6001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161152991906126f3565b602060405180830381865afa158015611546573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061156a9190612934565b9050600060a55460a4548361157f91906128e0565b119050600060a5549050600060a75461159661086b565b1015806115a05750825b156115b55760a4546115b290856128e0565b91505b6115c360a05460a954611eb2565b6115cd90836128e0565b95945050505050565b6000908152609a602052604090206001015490565b6000908152609a602052604090206002015490565b611608611751565b60a8805460ff1916911515919091179055565b600062015180609d544261162f91906128cd565b61163991906128e0565b9050609c54811115610e2457609c8190556040518181527f67eb03bd555181f9dd23f546e4331ddfb8b4a7d0c8d261ba44e037f30ce894ea90602001610ebf565b611682611751565b60a3805460ff191682151590811790915560405160ff909116151581527f6cd9a0fd2e006be39a9918bf56c85cae1d4f4599474483ff18cb93355ebaaf8e90602001610ebf565b60675460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa15801561172d573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610889919061294d565b60655460408051632d77bef360e11b8152905133926001600160a01b031691635aef7de69160048083019260209291908290030181865afa15801561179a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906117be919061294d565b6001600160a01b0316146118145760405162461bcd60e51b815260206004820181905260248201527f6f6e6c79206176617461722063616e2063616c6c2074686973206d6574686f64604482015260640161092e565b565b6001600160a01b03163b151590565b606780546001600160a01b0319166001600160a01b038316179055610e24610ba9565b60006118538261137e565b8015611865575061186382610eca565b155b8015610b4b5750506001600160a01b0316600090815260ac602052604090205460ff161590565b6001600160a01b038216600090815260ac60205260408120805460ff19166001179055806118b8611ecb565b60a054909150156118dc57600160a060008282546118d691906128cd565b90915550505b82156118f0576118f0333383600080611c19565b6040518181526001600160a01b0385169033907f3c91d315d82534112f8ce552cb79133a14191077a2d715fd65cabd026fc27c749060200160405180910390a35060019392505050565b600080516020612bfa833981519152546001600160a01b031690565b610e24611751565b7f4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd91435460ff1615611996576119918361215d565b505050565b826001600160a01b03166352d1902d6040518163ffffffff1660e01b8152600401602060405180830381865afa9250505080156119f0575060408051601f3d908101601f191682019092526119ed91810190612934565b60015b611a535760405162461bcd60e51b815260206004820152602e60248201527f45524331393637557067726164653a206e657720696d706c656d656e7461746960448201526d6f6e206973206e6f74205555505360901b606482015260840161092e565b600080516020612bfa8339815191528114611ac25760405162461bcd60e51b815260206004820152602960248201527f45524331393637557067726164653a20756e737570706f727465642070726f786044820152681a58589b195555525160ba1b606482015260840161092e565b506119918383836121f7565b600080611ad9611ecb565b9050611ae48461137e565b8015611b0957506001600160a01b038416600090815260ac602052604090205460ff16155b8015611b1b5750611b198461133a565b155b15611b3957611b2f84848360016000611c19565b6001915050610b4b565b611b428461137e565b1580611b6657506001600160a01b038416600090815260ac602052604090205460ff165b15611c0f57600160a06000828254611b7e9190612921565b90915550506001600160a01b038416600090815260ac60205260409020805460ff1916905560a85460ff1615611bc257611bbd84846000806001611c19565b611bd1565b611bd184848360016000611c19565b6040516001600160a01b038516907f2f9cfaa2a5c422dfab45f7d0da071f030fc2d3a7a1f0a255c028eff9b6d3d93690600090a26001915050610b4b565b5060009392505050565b8180611c225750805b15611cb0576001609a6000609c5481526020019081526020016000206001016000828254611c509190612921565b9091555050609c546000908152609a602090815260408083206001600160a01b03891684528252808320805460ff19166001908117909155609b835281842042905560ad9092528220805491929091611caa908490612921565b90915550505b8015611d8b5760aa54604051636bf2228d60e11b81526000916001600160a01b03169063d7e4451a90611ce79088906004016126f3565b6020604051808303816000875af1158015611d06573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611d2a9190612934565b905080609a6000609c5481526020019081526020016000206002016000828254611d549190612921565b90915550506040518181526001600160a01b03871690600080516020612bda8339815191529060200160405180910390a250611eab565b8115611de757609c546000908152609a602052604081206002018054859290611db5908490612921565b90915550506040518381526001600160a01b03861690600080516020612bda8339815191529060200160405180910390a25b6000611df16116c9565b60405163a9059cbb60e01b81529091506001600160a01b0382169063a9059cbb90611e229088908890600401612a44565b6020604051808303816000875af1158015611e41573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611e659190612a5d565b611ea95760405162461bcd60e51b815260206004820152601560248201527418db185a5b481d1c985b9cd9995c8819985a5b1959605a1b604482015260640161092e565b505b5050505050565b600081831015611ec25781611ec4565b825b9392505050565b6000611ed561161b565b60a154609c54141580611ee85750609e54155b15612156576000611ef76116c9565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b8152600401611f2791906126f3565b602060405180830381865afa158015611f44573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611f689190612934565b9050600060a55460a45483611f7d91906128e0565b11905060a754611f8b61086b565b101580611f955750805b1561209e5760a35460ff161561201d57611fad61221c565b6040516370a0823160e01b81526001600160a01b038416906370a0823190611fd99030906004016126f3565b602060405180830381865afa158015611ff6573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061201a9190612934565b91505b60a45461202a90836128e0565b60a55560a45460a75561203f610e10426128e0565b61204b90610e10612902565b60a655609c5460a45460a554604080519384526020840186905283019190915260608201527f83e0d535b9e84324e0a25922406398d6ff5f96d0c686204ee490e16d7670566f9060800160405180910390a15b609c5460a1819055600090815260ab6020526040902060a354815460ff191660ff90911615151781556001810183905560a05460a9546120de9190611eb2565b60a5546120eb91906128e0565b609e5560a05461210990612101906002906128e0565b60a954611eb2565b60a955609c54609e546040805192835260208301919091524382820152517f836fa39995340265746dfe9587d9fe5c5de35b7bce778afd9b124ce1cfeafdc49181900360600190a1505050505b50609e5490565b61216681611816565b6121c85760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b606482015260840161092e565b600080516020612bfa83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b612200836124da565b60008251118061220d5750805b1561199157610a7b838361251a565b60006122266116c9565b90506000816001600160a01b03166370a08231306040518263ffffffff1660e01b815260040161225691906126f3565b602060405180830381865afa158015612273573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906122979190612934565b6066546040516370a0823160e01b81529192506000916001600160a01b03858116926370a08231926122cf92909116906004016126f3565b602060405180830381865afa1580156122ec573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906123109190612934565b6065546040519192506001600160a01b03169063d1b7089a90859061233b9030908690602401612a44565b60408051601f198184030181529181526020820180516001600160e01b031663a9059cbb60e01b179052606654905160e085901b6001600160e01b03191681526123969392916001600160a01b031690600090600401612aca565b6000604051808303816000875af11580156123b5573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526123dd9190810190612afe565b50600090506123ec8284612921565b6040516370a0823160e01b81529091506001600160a01b038516906370a082319061241b9030906004016126f3565b602060405180830381865afa158015612438573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061245c9190612934565b81146124a45760405162461bcd60e51b8152602060048201526017602482015276111053c81d1c985b9cd9995c881a185cc819985a5b1959604a1b604482015260640161092e565b60408051848152602081018390527f3107ec7eaa50b775d2486c7a394472235804b6fe1c0d4b7bd1d79b09df60f2ba9101610a72565b6124e38161215d565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061252583611816565b6125805760405162461bcd60e51b815260206004820152602660248201527f416464726573733a2064656c65676174652063616c6c20746f206e6f6e2d636f6044820152651b9d1c9858dd60d21b606482015260840161092e565b600080846001600160a01b03168460405161259b9190612b8a565b600060405180830381855af49150503d80600081146125d6576040519150601f19603f3d011682016040523d82523d6000602084013e6125db565b606091505b50915091506115cd8282604051806060016040528060278152602001612c1a602791396060831561260d575081611ec4565b611ec483838151156126225781518083602001fd5b8060405162461bcd60e51b815260040161092e9190612ba6565b6001600160a01b0381168114610e2457600080fd5b60006020828403121561266357600080fd5b8135611ec48161263c565b8015158114610e2457600080fd5b60006020828403121561268e57600080fd5b8135611ec48161266e565b6000602082840312156126ab57600080fd5b5035919050565b6000806000606084860312156126c757600080fd5b83356126d28161263c565b925060208401356126e28161263c565b929592945050506040919091013590565b6001600160a01b0391909116815260200190565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f191681016001600160401b038111828210171561274557612745612707565b604052919050565b60006001600160401b0382111561276657612766612707565b50601f01601f191660200190565b6000806040838503121561278757600080fd5b82356127928161263c565b915060208301356001600160401b038111156127ad57600080fd5b8301601f810185136127be57600080fd5b80356127d16127cc8261274d565b61271d565b8181528660208385010111156127e657600080fd5b816020840160208301376000602083830101528093505050509250929050565b6000602080838503121561281957600080fd5b82356001600160401b038082111561283057600080fd5b818501915085601f83011261284457600080fd5b81358181111561285657612856612707565b8060051b915061286784830161271d565b818152918301840191848101908884111561288157600080fd5b938501935b838510156128ab578435925061289b8361263c565b8282529385019390850190612886565b98975050505050505050565b634e487b7160e01b600052601160045260246000fd5b81810381811115610b4b57610b4b6128b7565b6000826128fd57634e487b7160e01b600052601260045260246000fd5b500490565b600081600019048311821515161561291c5761291c6128b7565b500290565b80820180821115610b4b57610b4b6128b7565b60006020828403121561294657600080fd5b5051919050565b60006020828403121561295f57600080fd5b8151611ec48161263c565b6020808252601e908201527f6e6f7420696e20706572696f6453746172746564206f72207061757365640000604082015260600190565b6020808252602c90820152600080516020612bba83398151915260408201526b19195b1959d85d1958d85b1b60a21b606082015260800190565b6020808252602c90820152600080516020612bba83398151915260408201526b6163746976652070726f787960a01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b600060018201612a3d57612a3d6128b7565b5060010190565b6001600160a01b03929092168252602082015260400190565b600060208284031215612a6f57600080fd5b8151611ec48161266e565b60005b83811015612a95578181015183820152602001612a7d565b50506000910152565b60008151808452612ab6816020860160208601612a7a565b601f01601f19169290920160200192915050565b600060018060a01b03808716835260806020840152612aec6080840187612a9e565b94166040830152506060015292915050565b60008060408385031215612b1157600080fd5b8251612b1c8161266e565b60208401519092506001600160401b03811115612b3857600080fd5b8301601f81018513612b4957600080fd5b8051612b576127cc8261274d565b818152866020838501011115612b6c57600080fd5b612b7d826020830160208601612a7a565b8093505050509250929050565b60008251612b9c818460208701612a7a565b9190910192915050565b602081526000611ec46020830184612a9e56fe46756e6374696f6e206d7573742062652063616c6c6564207468726f7567682089ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122060e348113a715c388299f6553a21dc518e0e7f813baf2528bd4222eb0243167864736f6c63430008100033";
 
 type UBISchemeConstructorParams =
   | [signer?: Signer]

package/types/hardhat.d.ts

@@ -772,6 +772,10 @@ declare module "hardhat/types/runtime" {
       name: "NameService",
       signerOrOptions?: ethers.Signer | FactoryOptions
     ): Promise<Contracts.NameService__factory>;
+    getContractFactory(
+      name: "OneTimePayments",
+      signerOrOptions?: ethers.Signer | FactoryOptions
+    ): Promise<Contracts.OneTimePayments__factory>;
     getContractFactory(
       name: "OldMarketMaker",
       signerOrOptions?: ethers.Signer | FactoryOptions
@@ -1755,6 +1759,11 @@ declare module "hardhat/types/runtime" {
       address: string,
       signer?: ethers.Signer
     ): Promise<Contracts.NameService>;
+    getContractAt(
+      name: "OneTimePayments",
+      address: string,
+      signer?: ethers.Signer
+    ): Promise<Contracts.OneTimePayments>;
     getContractAt(
       name: "OldMarketMaker",
       address: string,

package/types/index.ts

@@ -188,6 +188,7 @@ export type { PausableControl } from "./PausableControl";
 export type { Multicall } from "./Multicall";
 export type { MultichainBridgeHelper } from "./MultichainBridgeHelper";
 export type { NameService } from "./NameService";
+export type { OneTimePayments } from "./OneTimePayments";
 export type { OldMarketMaker } from "./OldMarketMaker";
 export type { ProtocolUpgrade } from "./ProtocolUpgrade";
 export type { ProtocolUpgradeFuse } from "./ProtocolUpgradeFuse";
@@ -384,6 +385,7 @@ export { PausableControl__factory } from "./factories/PausableControl__factory";
 export { Multicall__factory } from "./factories/Multicall__factory";
 export { MultichainBridgeHelper__factory } from "./factories/MultichainBridgeHelper__factory";
 export { NameService__factory } from "./factories/NameService__factory";
+export { OneTimePayments__factory } from "./factories/OneTimePayments__factory";
 export { OldMarketMaker__factory } from "./factories/OldMarketMaker__factory";
 export { ProtocolUpgrade__factory } from "./factories/ProtocolUpgrade__factory";
 export { ProtocolUpgradeFuse__factory } from "./factories/ProtocolUpgradeFuse__factory";

package/scripts/multichain-deploy/v3-fix.ts

@@ -1,120 +0,0 @@
-/***
- * This script will deploy a fixed goodfundmanager that doenst disable staking contracts if rewards=0
- * It will also then re submit the staking contracts
- */
-
-import { network, ethers } from "hardhat";
-
-import {
-  executeViaGuardian,
-  executeViaSafe
-} from "../multichain-deploy/helpers";
-
-import releaser from "../releaser";
-import dao from "../../releases/deployment.json";
-const { name: networkName } = network;
-
-export const deployMainnet = async () => {
-  let [root, ...signers] = await ethers.getSigners();
-
-  let executionMethod = networkName === "localhost" ? "guardians" : "safe";
-
-  const networkKey =
-    networkName === "localhost" ? "production-mainnet" : networkName;
-  let release: { [key: string]: any } = dao[networkKey];
-
-  let safeOwner = new ethers.Wallet(
-    process.env.SAFEOWNER_PRIVATE_KEY || ethers.constants.HashZero,
-    ethers.provider
-  );
-
-  //test with guardians safe on hardhat mainnet fork
-  if (network.name === "localhost") {
-    root = await ethers.getImpersonatedSigner(
-      "0xE0c5daa7CC6F88d29505f702a53bb5E67600e7Ec"
-    );
-    await signers[0].sendTransaction({
-      to: root.address,
-      value: ethers.constants.WeiPerEther
-    });
-  }
-
-  console.log("got signers:", {
-    networkName,
-    networkKey,
-    root: root.address,
-    safeOwner: safeOwner.address,
-    balance: await ethers.provider
-      .getBalance(root.address)
-      .then(_ => _.toString())
-  });
-
-  console.log("deploying goodfundmanager implementation");
-  const gfmImpl = await (
-    await ethers.getContractFactory("GoodFundManager")
-  ).deploy();
-
-  const proposalContracts = [
-    release.GoodFundManager, //Fundmanager -> upgrade to new version
-    release.GoodFundManager, //Fundmanager -> set staking rewards compound to 0
-    release.GoodFundManager //Fundmanager -> set staking rewards aave to 0
-  ];
-
-  const proposalEthValues = proposalContracts.map(_ => 0);
-
-  const proposalFunctionSignatures = [
-    "upgradeTo(address)",
-    "setStakingReward(uint32,address,uint32,uint32,bool)",
-    "setStakingReward(uint32,address,uint32,uint32,bool)"
-  ];
-
-  const proposalFunctionInputs = [
-    ethers.utils.defaultAbiCoder.encode(["address"], [gfmImpl.address]), //upgradeTo(address)
-    ethers.utils.defaultAbiCoder.encode(
-      ["uint32", "address", "uint32", "uint32", "bool"],
-      [
-        "0",
-        "0x7b7246c78e2f900d17646ff0cb2ec47d6ba10754",
-        "14338692",
-        "4294967295",
-        false
-      ]
-    ), //setstakingrewards to 0
-    ethers.utils.defaultAbiCoder.encode(
-      ["uint32", "address", "uint32", "uint32", "bool"],
-      [
-        "0",
-        "0x3ff2d8eb2573819a9ef7167d2ba6fd6d31b17f4f",
-        "14338692",
-        "4294967295",
-        false
-      ]
-    ) //setstakingrewards to 0
-  ];
-
-  if (executionMethod === "safe") {
-    return executeViaSafe(
-      proposalContracts,
-      proposalEthValues,
-      proposalFunctionSignatures,
-      proposalFunctionInputs,
-      networkName === "localhost"
-        ? "0xE0c5daa7CC6F88d29505f702a53bb5E67600e7Ec"
-        : release.GuardiansSafe,
-      safeOwner
-    );
-  } else {
-    return executeViaGuardian(
-      proposalContracts,
-      proposalEthValues,
-      proposalFunctionSignatures,
-      proposalFunctionInputs,
-      root
-    );
-  }
-};
-
-export const main = async () => {
-  await deployMainnet().catch(console.log);
-};
-if (process.argv[1].includes("v3-fix")) main();