@gooddollar/goodprotocol 2.0.14 → 2.0.15

package/types/factories/contracts/utils/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 type { Provider, TransactionRequest } from "@ethersproject/providers";
+import type {
+  OneTimePayments,
+  OneTimePaymentsInterface,
+} from "../../../contracts/utils/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",
+  },
+] as const;
+
+const _bytecode =
+  "0x608060405234801561001057600080fd5b5060405162000f3538038062000f35833981016040819052610031916101a2565b61003a81610040565b506101c6565b600280546001600160a01b0319166001600160a01b038316179055610063610066565b50565b60025460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156100c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100ed91906101a2565b600080546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610147573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061016b91906101a2565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b038116811461006357600080fd5b6000602082840312156101b457600080fd5b81516101bf8161018d565b9392505050565b610d5f80620001d66000396000f3fe608060405234801561001057600080fd5b506004361061008e5760003560e01c80631b3c90a8146100935780633e6326fc1461009d5780634162169f146100cd5780634bb78b14146100e05780634c33fe94146100f35780635aef7de6146101065780639ea7811614610119578063a4c0ed3614610155578063e1758bd814610168578063e2982c2114610170575b600080fd5b61009b6101d2565b005b6002546100b0906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b6000546100b0906001600160a01b031681565b61009b6100ee366004610b4c565b6102f9565b61009b610101366004610c0f565b6103f7565b6001546100b0906001600160a01b031681565b610145610127366004610c0f565b6001600160a01b031660009081526035602052604090205460ff1690565b60405190151581526020016100c4565b610145610163366004610c33565b6104d0565b6100b0610658565b6101ac61017e366004610c0f565b60356020526000908152604090208054600182015460029092015460ff90911691906001600160a01b031683565b60408051931515845260208401929092526001600160a01b0316908201526060016100c4565b60025460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610235573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102599190610cbb565b600080546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156102b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d79190610cbb565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b600061030533836106e5565b9050826001600160a01b0316816001600160a01b0316146103685760405162461bcd60e51b815260206004820152601860248201527714da59db985d1d5c99481a5cc81b9bdd0818dbdc9c9958dd60421b60448201526064015b60405180910390fd5b6001600160a01b03808416600090815260356020526040902060018101546002909101549091166103998583610774565b846001600160a01b0316336001600160a01b0316826001600160a01b03167f39ca68a9f5d8038e871ef25a6622a56579cda4a6eedf63813574d23652e94048856040516103e891815260200190565b60405180910390a45050505050565b6001600160a01b038181166000908152603560205260409020600201541633146104635760405162461bcd60e51b815260206004820152601d60248201527f43616e206f6e6c792062652063616c6c65642062792063726561746f72000000604482015260640161035f565b6001600160a01b0381166000908152603560205260409020600101546104898282610774565b336001600160a01b03167fb1f6a8f6b8fb527cfeec0df589160bc2a92ff715097117cb250e823c7106bc2f83836040516104c4929190610cd8565b60405180910390a25050565b6000806104df83850185610c0f565b6001600160a01b03811660009081526035602052604090205490915060ff16156105465760405162461bcd60e51b81526020600482015260186024820152777061796d656e74496420616c726561647920696e2075736560401b604482015260640161035f565b61054e610658565b6001600160a01b0316336001600160a01b0316146105a65760405162461bcd60e51b81526020600482015260156024820152744f6e6c792063616c6c61626c65206279207468697360581b604482015260640161035f565b60408051606081018252600180825260208083018981526001600160a01b038b811685870181815288831660009081526035909552938790209551865460ff19169015151786559151938501939093559051600290930180546001600160a01b0319169390921692909217905590517f6c9f23ee41b34196a6e871314d55c3a0cce3399afc5d09755d171ea06547e073906106449084908990610cd8565b60405180910390a250600195945050505050565b60025460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156106bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e09190610cbb565b905090565b60408051606084901b6001600160601b031916602080830191909152825160148184030181526034830184528051908201207b0ca2ba3432b932bab69029b4b3b732b21026b2b9b9b0b3b29d05199960211b60548401526070808401919091528351808403909101815260909092019092528051910120600090600061076b82856108b6565b95945050505050565b6001600160a01b03821660009081526035602052604090205460ff166107d35760405162461bcd60e51b81526020600482015260146024820152737061796d656e744964206e6f7420696e2075736560601b604482015260640161035f565b6001600160a01b0382166000908152603560205260409020805460ff191690556107fb610658565b6001600160a01b031663a9059cbb33836040518363ffffffff1660e01b8152600401610828929190610cd8565b6020604051808303816000875af1158015610847573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061086b9190610cf1565b6108b25760405162461bcd60e51b81526020600482015260186024820152771dda5d1a191c985dc81d1c985b9cd9995c8819985a5b195960421b604482015260640161035f565b5050565b60008060006108c585856108da565b915091506108d28161091f565b509392505050565b60008082516041036109105760208301516040840151606085015160001a61090487828585610a67565b94509450505050610918565b506000905060025b9250929050565b600081600481111561093357610933610d13565b0361093b5750565b600181600481111561094f5761094f610d13565b036109975760405162461bcd60e51b815260206004820152601860248201527745434453413a20696e76616c6964207369676e617475726560401b604482015260640161035f565b60028160048111156109ab576109ab610d13565b036109f85760405162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e67746800604482015260640161035f565b6003816004811115610a0c57610a0c610d13565b03610a645760405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c604482015261756560f01b606482015260840161035f565b50565b6000806fa2a8918ca85bafe22016d0b997e4df60600160ff1b03831115610a945750600090506003610b18565b6040805160008082526020820180845289905260ff881692820192909252606081018690526080810185905260019060a0016020604051602081039080840390855afa158015610ae8573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116610b1157600060019250925050610b18565b9150600090505b94509492505050565b6001600160a01b0381168114610a6457600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b5f57600080fd5b8235610b6a81610b21565b915060208301356001600160401b0380821115610b8657600080fd5b818501915085601f830112610b9a57600080fd5b813581811115610bac57610bac610b36565b604051601f8201601f19908116603f01168101908382118183101715610bd457610bd4610b36565b81604052828152886020848701011115610bed57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610c2157600080fd5b8135610c2c81610b21565b9392505050565b60008060008060608587031215610c4957600080fd5b8435610c5481610b21565b93506020850135925060408501356001600160401b0380821115610c7757600080fd5b818701915087601f830112610c8b57600080fd5b813581811115610c9a57600080fd5b886020828501011115610cac57600080fd5b95989497505060200194505050565b600060208284031215610ccd57600080fd5b8151610c2c81610b21565b6001600160a01b03929092168252602082015260400190565b600060208284031215610d0357600080fd5b81518015158114610c2c57600080fd5b634e487b7160e01b600052602160045260246000fdfea2646970667358221220c9e47c3b0c35aeee517f58b1fb61ad42f2925aafbaf210bc8f10d5ccfd166c9664736f6c63430008130033";
+
+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]);
+    }
+  }
+
+  override deploy(
+    _ns: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<OneTimePayments> {
+    return super.deploy(_ns, overrides || {}) as Promise<OneTimePayments>;
+  }
+  override getDeployTransaction(
+    _ns: string,
+    overrides?: Overrides & { from?: string }
+  ): TransactionRequest {
+    return super.getDeployTransaction(_ns, overrides || {});
+  }
+  override attach(address: string): OneTimePayments {
+    return super.attach(address) as OneTimePayments;
+  }
+  override 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/contracts/utils/ProtocolUpgrade.sol/OldMarketMaker__factory.ts

@@ -0,0 +1,62 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import { Contract, Signer, utils } from "ethers";
+import type { Provider } from "@ethersproject/providers";
+import type {
+  OldMarketMaker,
+  OldMarketMakerInterface,
+} from "../../../../contracts/utils/ProtocolUpgrade.sol/OldMarketMaker";
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "token",
+        type: "address",
+      },
+    ],
+    name: "reserveTokens",
+    outputs: [
+      {
+        components: [
+          {
+            internalType: "uint256",
+            name: "reserveSupply",
+            type: "uint256",
+          },
+          {
+            internalType: "uint32",
+            name: "reserveRatio",
+            type: "uint32",
+          },
+          {
+            internalType: "uint256",
+            name: "gdSupply",
+            type: "uint256",
+          },
+        ],
+        internalType: "struct OldMarketMaker.ReserveToken",
+        name: "",
+        type: "tuple",
+      },
+    ],
+    stateMutability: "view",
+    type: "function",
+  },
+] as const;
+
+export class OldMarketMaker__factory {
+  static readonly abi = _abi;
+  static createInterface(): OldMarketMakerInterface {
+    return new utils.Interface(_abi) as OldMarketMakerInterface;
+  }
+  static connect(
+    address: string,
+    signerOrProvider: Signer | Provider
+  ): OldMarketMaker {
+    return new Contract(address, _abi, signerOrProvider) as OldMarketMaker;
+  }
+}

package/types/factories/contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade__factory.ts

@@ -0,0 +1,207 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+import { Signer, utils, Contract, ContractFactory, Overrides } from "ethers";
+import type { Provider, TransactionRequest } from "@ethersproject/providers";
+import type {
+  ProtocolUpgrade,
+  ProtocolUpgradeInterface,
+} from "../../../../contracts/utils/ProtocolUpgrade.sol/ProtocolUpgrade";
+
+const _abi = [
+  {
+    inputs: [
+      {
+        internalType: "contract Controller",
+        name: "_controller",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "_owner",
+        type: "address",
+      },
+    ],
+    stateMutability: "nonpayable",
+    type: "constructor",
+  },
+  {
+    inputs: [
+      {
+        internalType: "contract INameService",
+        name: "ns",
+        type: "address",
+      },
+      {
+        internalType: "bytes32[]",
+        name: "nameHash",
+        type: "bytes32[]",
+      },
+      {
+        internalType: "address[]",
+        name: "nameAddress",
+        type: "address[]",
+      },
+      {
+        internalType: "address[]",
+        name: "staking",
+        type: "address[]",
+      },
+      {
+        internalType: "uint256[]",
+        name: "monthlyRewards",
+        type: "uint256[]",
+      },
+    ],
+    name: "upgradeBasic",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "contract INameService",
+        name: "ns",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "oldDonationStaking",
+        type: "address",
+      },
+      {
+        internalType: "address payable",
+        name: "donationStaking",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "oldSimpleDAIStaking",
+        type: "address",
+      },
+    ],
+    name: "upgradeDonationStaking",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "address",
+        name: "schemeRegistrar",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "upgradeScheme",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "compoundVotingMachine",
+        type: "address",
+      },
+    ],
+    name: "upgradeGovernance",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    inputs: [
+      {
+        internalType: "contract INameService",
+        name: "ns",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "oldReserve",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "oldMarketMaker",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "oldFundManager",
+        type: "address",
+      },
+      {
+        internalType: "address",
+        name: "COMP",
+        type: "address",
+      },
+    ],
+    name: "upgradeReserve",
+    outputs: [],
+    stateMutability: "nonpayable",
+    type: "function",
+  },
+  {
+    stateMutability: "payable",
+    type: "receive",
+  },
+] as const;
+
+const _bytecode =
+  "0x60806040523480156200001157600080fd5b5060405162002aa238038062002aa2833981016040819052620000349162000106565b600080546001600160a01b038085166001600160a01b03199283168117909355600180549185169190921617905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156200009e573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190620000c4919062000145565b600280546001600160a01b0319166001600160a01b0392909216919091179055506200016c9050565b6001600160a01b03811681146200010357600080fd5b50565b600080604083850312156200011a57600080fd5b82516200012781620000ed565b60208401519092506200013a81620000ed565b809150509250929050565b6000602082840312156200015857600080fd5b81516200016581620000ed565b9392505050565b612926806200017c6000396000f3fe6080604052600436106100435760003560e01c80634cbcfaf41461004f5780635c0d087b146100715780635ee6d77c146100915780637d14c7c7146100b157600080fd5b3661004a57005b600080fd5b34801561005b57600080fd5b5061006f61006a3660046122b7565b6100d1565b005b34801561007d57600080fd5b5061006f61008c366004612328565b610201565b34801561009d57600080fd5b5061006f6100ac3660046123be565b610689565b3480156100bd57600080fd5b5061006f6100cc366004612496565b610c5c565b6001546001600160a01b031633146101045760405162461bcd60e51b81526004016100fb906124f2565b60405180910390fd5b61010d85611227565b6001600160a01b038416156101fa57610128858585846116c2565b60005460025460405163039de01d60e01b81526001600160a01b039283169263039de01d9261015f92879290911690600401612516565b6020604051808303816000875af115801561017e573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101a29190612545565b6101fa5760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e67206f6c642046756e644d616e616765722066616044820152631a5b195960e21b60648201526084016100fb565b5050505050565b6001546001600160a01b0316331461022b5760405162461bcd60e51b81526004016100fb906124f2565b6001600160a01b0383161561030c5760005460025460405163039de01d60e01b81526001600160a01b039283169263039de01d9261027192889290911690600401612516565b6020604051808303816000875af1158015610290573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102b49190612545565b61030c5760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e6720736368656d655265676973747261722066616044820152631a5b195960e21b60648201526084016100fb565b6001600160a01b038216156103ec5760005460025460405163039de01d60e01b81526001600160a01b039283169263039de01d9261035292879290911690600401612516565b6020604051808303816000875af1158015610371573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103959190612545565b6103ec5760405162461bcd60e51b815260206004820152602260248201527f756e7265676973746572696e672075706772616465536368656d65206661696c604482015261195960f21b60648201526084016100fb565b6000805460025460405163e869d45f60e01b81526001600160a01b039283169363e869d45f9361042a938793601f60e01b9290911690600401612567565b6020604051808303816000875af1158015610449573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061046d9190612545565b6104ca5760405162461bcd60e51b815260206004820152602860248201527f7265676973746572696e6720636f6d706f756e64566f74696e674d616368696e604482015267194819985a5b195960c21b60648201526084016100fb565b6000805460015460025460405163e869d45f60e01b81526001600160a01b039384169463e869d45f9461050e948116939192601f60e01b9290911690600401612567565b6020604051808303816000875af115801561052d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906105519190612545565b6105ac5760405162461bcd60e51b815260206004820152602660248201527f7265676973746572696e6720676f7665726e616e6365206661696c736166652060448201526519985a5b195960d21b60648201526084016100fb565b600054600254604051636c525b1360e01b81526001600160a01b0392831692636c525b13926105e09291169060040161259c565b6020604051808303816000875af11580156105ff573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106239190612545565b61067b5760405162461bcd60e51b8152602060048201526024808201527f756e7265676973746572696e672070726f746f636f6c757067726164652066616044820152631a5b195960e21b60648201526084016100fb565b6001546001600160a01b0316ff5b6001546001600160a01b031633146106b35760405162461bcd60e51b81526004016100fb906124f2565b8685146106f45760405162461bcd60e51b815260206004820152600f60248201526e0d8cadccee8d040dad2e6dac2e8c6d608b1b60448201526064016100fb565b82811461073d5760405162461bcd60e51b81526020600482015260176024820152760e6e8c2d6d2dcce40d8cadccee8d040dad2e6dac2e8c6d604b1b60448201526064016100fb565b6107ab8989898080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525050604080516020808d0282810182019093528c82529093508c92508b918291850190849080828437600092019190915250611e4592505050565b6108198985858080602002602001604051908101604052809392919081815260200183836020028082843760009201919091525050604080516020808902828101820190935288825290935088925087918291850190849080828437600092019190915250611f7792505050565b60005460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b60448201526001600160a01b039182169163e869d45f91908c169063bf40fac190606401602060405180830381865afa158015610884573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906108a891906125b0565b6002546040516001600160e01b031960e085901b1681526108df9291600091600160e01b916001600160a01b031690600401612567565b6020604051808303816000875af11580156108fe573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109229190612545565b61096c5760405162461bcd60e51b815260206004820152601b60248201527a1c9959da5cdd195c9a5b99c81259195b9d1a5d1e4819985a5b1959602a1b60448201526064016100fb565b60405163bf40fac160e01b81526000906001600160a01b038b169063bf40fac190610999906004016125cd565b602060405180830381865afa1580156109b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906109da91906125b0565b6001600160a01b0316634b75f54f6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610a17573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610a3b91906125b0565b600054600254604051639be2faed60e01b81529293506001600160a01b0391821692639be2faed92610a74928692911690600401612516565b602060405180830381865afa158015610a91573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610ab59190612545565b15610c505760005460405163bf40fac160e01b81526001600160a01b039182169163039de01d91908d169063bf40fac190610af2906004016125cd565b602060405180830381865afa158015610b0f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b3391906125b0565b6001600160a01b0316634b75f54f6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610b70573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610b9491906125b0565b6002546040516001600160e01b031960e085901b168152610bc292916001600160a01b031690600401612516565b6020604051808303816000875af1158015610be1573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610c059190612545565b610c505760405162461bcd60e51b815260206004820152601c60248201527b1d5b9c9959da5cdd195c9a5b99c8199bdc9b5d5b184819985a5b195960221b60448201526064016100fb565b50505050505050505050565b6001546001600160a01b03163314610c865760405162461bcd60e51b81526004016100fb906124f2565b600080546040805160048082526024820183526020820180516001600160e01b0316633bef870760e21b17905260025492516368db844d60e11b81526060946001600160a01b039081169463d1b7089a94610cec948c9491939290921691899101612615565b6000604051808303816000875af1158015610d0b573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610d33919081019061267c565b909250905081610d935760405162461bcd60e51b815260206004820152602560248201527f43616c6c696e67206f6c64446f6e6174696f6e5374616b696e6720656e642066604482015264185a5b195960da1b60648201526084016100fb565b60008082806020019051810190610daa919061273c565b60005460405163bf40fac160e01b815260206004820152600360248201526244414960e81b60448201529294509092506001600160a01b039081169163b9a04cdd918b169063bf40fac190606401602060405180830381865afa158015610e15573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610e3991906125b0565b6002546040516001600160e01b031960e085901b168152610e6b92918b9188916001600160a01b031690600401612760565b6020604051808303816000875af1158015610e8a573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610eae9190612545565b935083610f0e5760405162461bcd60e51b815260206004820152602860248201527f43616c6c696e67204441492065787465726e616c546f6b656e5472616e7366656044820152671c8819985a5b195960c21b60648201526084016100fb565b8015610fe8576000546002546040516331a4b2ed60e11b8152600481018490523060248201526001600160a01b03918216604482015291169063634965da906064016020604051808303816000875af1158015610f6f573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190610f939190612545565b935083610fde5760405162461bcd60e51b815260206004820152601960248201527810d85b1b1a5b99c8081cd95b99115d1a195c8819985a5b1959603a1b60448201526064016100fb565b610fe88682612184565b856001600160a01b031663b678ce7b6040518163ffffffff1660e01b8152600401600060405180830381600087803b15801561102357600080fd5b505af1158015611037573d6000803e3d6000fd5b5050600080546040805160048082526024820183526020820180516001600160e01b0316633bef870760e21b17905260025492516368db844d60e11b81526001600160a01b03948516975063d1b7089a965061109c958d959394909316929101612615565b6000604051808303816000875af11580156110bb573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526110e3919081019061267c565b9094509250836111455760405162461bcd60e51b815260206004820152602760248201527f43616c6c696e67206f6c642053696d706c654441495374616b696e6720656e646044820152660819985a5b195960ca1b60648201526084016100fb565b60005460025460405163039de01d60e01b81526001600160a01b039283169263039de01d9261117c928a9290911690600401612516565b6020604051808303816000875af115801561119b573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906111bf9190612545565b61121d5760405162461bcd60e51b815260206004820152602960248201527f756e7265676973746572696e67206f6c642053696d706c654441495374616b696044820152681b99c819985a5b195960ba1b60648201526084016100fb565b5050505050505050565b6000805460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190611260906004016125cd565b602060405180830381865afa15801561127d573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906112a191906125b0565b60405163bf40fac160e01b81526001600160a01b0386169063bf40fac1906112cb9060040161278b565b602060405180830381865afa1580156112e8573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061130c91906125b0565b60405160240161131c919061259c565b60408051601f198184030181529181526020820180516001600160e01b0316634c1d96ab60e11b179052600254905160e085901b6001600160e01b03191681526113779392916001600160a01b031690600090600401612615565b6000604051808303816000875af1158015611396573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f191682016040526113be919081019061267c565b509050806114095760405162461bcd60e51b815260206004820152601860248201527710d85b1b1a5b99c8185919135a5b9d195c8819985a5b195960421b60448201526064016100fb565b60005460405163bf40fac160e01b81526001600160a01b039182169163d1b7089a919085169063bf40fac190611441906004016125cd565b602060405180830381865afa15801561145e573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061148291906125b0565b6040805160048082526024820183526020820180516001600160e01b0316639865027560e01b179052600254925160e086901b6001600160e01b03191681526114d994936001600160a01b03169160009101612615565b6000604051808303816000875af11580156114f8573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611520919081019061267c565b509050806115705760405162461bcd60e51b815260206004820152601d60248201527f43616c6c696e672072656e6f756e63654d696e746572206661696c656400000060448201526064016100fb565b60005460405163bf40fac160e01b81526001600160a01b039182169163e4537a74919085169063bf40fac1906115a89060040161278b565b602060405180830381865afa1580156115c5573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906115e991906125b0565b60025460405160e084901b6001600160e01b03191681526001600160a01b03928316600482015260006024820152911660448201526064016020604051808303816000875af1158015611640573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906116649190612545565b9050806116be5760405162461bcd60e51b815260206004820152602260248201527f43616c6c696e6720616464476c6f62616c436f6e73747261696e74206661696c604482015261195960f21b60648201526084016100fb565b5050565b60006001600160a01b038216156117f9576000546040516001600160a01b039091169063d1b7089a9086906116fb90869060240161259c565b60408051601f198184030181529181526020820180516001600160e01b0316630336197b60e21b179052600254905160e085901b6001600160e01b03191681526117569392916001600160a01b031690600090600401612615565b6000604051808303816000875af1158015611775573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261179d919081019061267c565b509050806117f95760405162461bcd60e51b815260206004820152602360248201527f63616c6c696e67205265736572766520636f6d70207265636f766572206661696044820152621b195960ea1b60648201526084016100fb565b60405163bf40fac160e01b81526000906001600160a01b0387169063bf40fac19061183f906004016020808252600490820152634344414960e01b604082015260600190565b602060405180830381865afa15801561185c573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061188091906125b0565b90506000816001600160a01b03166370a08231876040518263ffffffff1660e01b81526004016118b0919061259c565b602060405180830381865afa1580156118cd573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906118f191906127ac565b600080546040805160048082526024820183526020820180516001600160e01b0316633bef870760e21b17905260025492516368db844d60e11b81529596506001600160a01b039384169563d1b7089a95611952958e951692909101612615565b6000604051808303816000875af1158015611971573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611999919081019061267c565b509250826119e65760405162461bcd60e51b815260206004820152601a60248201527918d85b1b1a5b99c814995cd95c9d9948195b990819985a5b195960321b60448201526064016100fb565b60405163835bbd5560e01b81526000906001600160a01b0387169063835bbd5590611a1590869060040161259c565b606060405180830381865afa158015611a32573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611a5691906127c5565b60005460405163bf40fac160e01b81529192506001600160a01b039081169163b9a04cdd918691908c169063bf40fac190611a939060040161278b565b602060405180830381865afa158015611ab0573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611ad491906125b0565b6002546040516001600160e01b031960e086901b168152611b0793929188916001600160a01b0390911690600401612760565b6020604051808303816000875af1158015611b26573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611b4a9190612545565b935083611ba55760405162461bcd60e51b815260206004820152602360248201527f7472616e73666572206364616920746f206e65772072657365727665206661696044820152621b195960ea1b60648201526084016100fb565b60005460405163bf40fac160e01b815260206004820152600c60248201526b26a0a925a2aa2fa6a0a5a2a960a11b60448201526001600160a01b039182169163d1b7089a91908b169063bf40fac190606401602060405180830381865afa158015611c14573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611c3891906125b0565b6040848101518551602087015192516001600160a01b038a1660248201526044810192909252606482015263ffffffff9091166084820152600060a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316638ee090fb60e01b179052600254905160e085901b6001600160e01b0319168152611cd59392916001600160a01b031690600090600401612615565b6000604051808303816000875af1158015611cf4573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611d1c919081019061267c565b50935083611d7f5760405162461bcd60e51b815260206004820152602a60248201527f63616c6c696e67206d61726b65744d616b657220696e697469616c697a65546f6044820152691ad95b8819985a5b195960b21b60648201526084016100fb565b60005460025460405163039de01d60e01b81526001600160a01b039283169263039de01d92611db6928c9290911690600401612516565b6020604051808303816000875af1158015611dd5573d6000803e3d6000fd5b505050506040513d601f19601f82011682018060405250810190611df99190612545565b61121d5760405162461bcd60e51b815260206004820181905260248201527f756e7265676973746572696e67206f6c642072657365727665206661696c656460448201526064016100fb565b600080546040516001600160a01b039091169063d1b7089a908690611e70908790879060240161282f565b60408051601f198184030181529181526020820180516001600160e01b0316634ab01f5b60e01b179052600254905160e085901b6001600160e01b0319168152611ecb9392916001600160a01b031690600090600401612615565b6000604051808303816000875af1158015611eea573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052611f12919081019061267c565b50905080611f715760405162461bcd60e51b815260206004820152602660248201527f43616c6c696e67207365744e616d6553657276696365436f6e7472616374732060448201526519985a5b195960d21b60648201526084016100fb565b50505050565b60005b8251811015611f71576000805460405163bf40fac160e01b815260206004820152600c60248201526b232aa7222fa6a0a720a3a2a960a11b60448201526001600160a01b039182169163d1b7089a919088169063bf40fac190606401602060405180830381865afa158015611ff3573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061201791906125b0565b858581518110612029576120296128b3565b6020026020010151878681518110612043576120436128b3565b602090810291909101015160405160248101929092526001600160a01b031660448201526000606482018190526084820181905260a482015260c40160408051601f198184030181529181526020820180516001600160e01b0316631f1ad8ed60e21b179052600254905160e085901b6001600160e01b03191681526120da9392916001600160a01b031690600090600401612615565b6000604051808303816000875af11580156120f9573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052612121919081019061267c565b509050806121715760405162461bcd60e51b815260206004820181905260248201527f43616c6c696e67207365745374616b696e6752657761726473206661696c656460448201526064016100fb565b508061217c816128c9565b915050611f7a565b804710156121d45760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a20696e73756666696369656e742062616c616e636500000060448201526064016100fb565b6000826001600160a01b03168260405160006040518083038185875af1925050503d8060008114612221576040519150601f19603f3d011682016040523d82523d6000602084013e612226565b606091505b505090508061229a5760405162461bcd60e51b815260206004820152603a60248201527f416464726573733a20756e61626c6520746f2073656e642076616c75652c20726044820152791958da5c1a595b9d081b585e481a185d99481c995d995c9d195960321b60648201526084016100fb565b505050565b6001600160a01b03811681146122b457600080fd5b50565b600080600080600060a086880312156122cf57600080fd5b85356122da8161229f565b945060208601356122ea8161229f565b935060408601356122fa8161229f565b9250606086013561230a8161229f565b9150608086013561231a8161229f565b809150509295509295909350565b60008060006060848603121561233d57600080fd5b83356123488161229f565b925060208401356123588161229f565b915060408401356123688161229f565b809150509250925092565b60008083601f84011261238557600080fd5b5081356001600160401b0381111561239c57600080fd5b6020830191508360208260051b85010111156123b757600080fd5b9250929050565b600080600080600080600080600060a08a8c0312156123dc57600080fd5b89356123e78161229f565b985060208a01356001600160401b038082111561240357600080fd5b61240f8d838e01612373565b909a50985060408c013591508082111561242857600080fd5b6124348d838e01612373565b909850965060608c013591508082111561244d57600080fd5b6124598d838e01612373565b909650945060808c013591508082111561247257600080fd5b5061247f8c828d01612373565b915080935050809150509295985092959850929598565b600080600080608085870312156124ac57600080fd5b84356124b78161229f565b935060208501356124c78161229f565b925060408501356124d78161229f565b915060608501356124e78161229f565b939692955090935050565b6020808252600a908201526937b7363c9037bbb732b960b11b604082015260600190565b6001600160a01b0392831681529116602082015260400190565b8051801515811461254057600080fd5b919050565b60006020828403121561255757600080fd5b61256082612530565b9392505050565b6001600160a01b03948516815260208101939093526001600160e01b0319919091166040830152909116606082015260800190565b6001600160a01b0391909116815260200190565b6000602082840312156125c257600080fd5b81516125608161229f565b6020808252600a908201526923a7a7a22227a62620a960b11b604082015260600190565b60005b8381101561260c5781810151838201526020016125f4565b50506000910152565b600060018060a01b0380871683526080602084015285518060808501526126438160a0860160208a016125f1565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561268f57600080fd5b61269883612530565b60208401519092506001600160401b03808211156126b557600080fd5b818501915085601f8301126126c957600080fd5b8151818111156126db576126db612666565b604051601f8201601f19908116603f0116810190838211818310171561270357612703612666565b8160405282815288602084870101111561271c57600080fd5b61272d8360208301602088016125f1565b80955050505050509250929050565b6000806040838503121561274f57600080fd5b505080516020909101519092909150565b6001600160a01b03948516815292841660208401526040830191909152909116606082015260800190565b6020808252600790820152665245534552564560c81b604082015260600190565b6000602082840312156127be57600080fd5b5051919050565b6000606082840312156127d757600080fd5b604051606081016001600160401b03811182821017156127f9576127f9612666565b60405282518152602083015163ffffffff8116811461281757600080fd5b60208201526040928301519281019290925250919050565b604080825283519082018190526000906020906060840190828701845b828110156128685781518452928401929084019060010161284c565b5050508381038285015284518082528583019183019060005b818110156128a65783516001600160a01b031683529284019291840191600101612881565b5090979650505050505050565b634e487b7160e01b600052603260045260246000fd5b6000600182016128e957634e487b7160e01b600052601160045260246000fd5b506001019056fea2646970667358221220d1618d2d731f47fea5196734d5694b2967c4ecedb44fa7f9f90c5816179cff5764736f6c63430008130033";
+
+type ProtocolUpgradeConstructorParams =
+  | [signer?: Signer]
+  | ConstructorParameters<typeof ContractFactory>;
+
+const isSuperArgs = (
+  xs: ProtocolUpgradeConstructorParams
+): xs is ConstructorParameters<typeof ContractFactory> => xs.length > 1;
+
+export class ProtocolUpgrade__factory extends ContractFactory {
+  constructor(...args: ProtocolUpgradeConstructorParams) {
+    if (isSuperArgs(args)) {
+      super(...args);
+    } else {
+      super(_abi, _bytecode, args[0]);
+    }
+  }
+
+  override deploy(
+    _controller: string,
+    _owner: string,
+    overrides?: Overrides & { from?: string }
+  ): Promise<ProtocolUpgrade> {
+    return super.deploy(
+      _controller,
+      _owner,
+      overrides || {}
+    ) as Promise<ProtocolUpgrade>;
+  }
+  override getDeployTransaction(
+    _controller: string,
+    _owner: string,
+    overrides?: Overrides & { from?: string }
+  ): TransactionRequest {
+    return super.getDeployTransaction(_controller, _owner, overrides || {});
+  }
+  override attach(address: string): ProtocolUpgrade {
+    return super.attach(address) as ProtocolUpgrade;
+  }
+  override connect(signer: Signer): ProtocolUpgrade__factory {
+    return super.connect(signer) as ProtocolUpgrade__factory;
+  }
+
+  static readonly bytecode = _bytecode;
+  static readonly abi = _abi;
+  static createInterface(): ProtocolUpgradeInterface {
+    return new utils.Interface(_abi) as ProtocolUpgradeInterface;
+  }
+  static connect(
+    address: string,
+    signerOrProvider: Signer | Provider
+  ): ProtocolUpgrade {
+    return new Contract(address, _abi, signerOrProvider) as ProtocolUpgrade;
+  }
+}

package/types/factories/contracts/utils/ProtocolUpgrade.sol/index.ts

@@ -0,0 +1,5 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export { OldMarketMaker__factory } from "./OldMarketMaker__factory";
+export { ProtocolUpgrade__factory } from "./ProtocolUpgrade__factory";