@gooddollar/goodprotocol 2.0.3 → 2.0.4

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

@@ -0,0 +1,270 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "OneTimePayments",
+  "sourceName": "contracts/utils/OneTimePayments.sol",
+  "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"
+    }
+  ],
+  "bytecode": "0x608060405234801561001057600080fd5b5060405162000f3538038062000f35833981016040819052610031916101a2565b61003a81610040565b506101c6565b600280546001600160a01b0319166001600160a01b038316179055610063610066565b50565b60025460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156100c9573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100ed91906101a2565b600080546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa158015610147573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061016b91906101a2565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b6001600160a01b038116811461006357600080fd5b6000602082840312156101b457600080fd5b81516101bf8161018d565b9392505050565b610d5f80620001d66000396000f3fe608060405234801561001057600080fd5b506004361061008e5760003560e01c80631b3c90a8146100935780633e6326fc1461009d5780634162169f146100cd5780634bb78b14146100e05780634c33fe94146100f35780635aef7de6146101065780639ea7811614610119578063a4c0ed3614610155578063e1758bd814610168578063e2982c2114610170575b600080fd5b61009b6101d2565b005b6002546100b0906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b6000546100b0906001600160a01b031681565b61009b6100ee366004610b4c565b6102f9565b61009b610101366004610c0f565b6103f7565b6001546100b0906001600160a01b031681565b610145610127366004610c0f565b6001600160a01b031660009081526035602052604090205460ff1690565b60405190151581526020016100c4565b610145610163366004610c33565b6104d0565b6100b0610658565b6101ac61017e366004610c0f565b60356020526000908152604090208054600182015460029092015460ff90911691906001600160a01b031683565b60408051931515845260208401929092526001600160a01b0316908201526060016100c4565b60025460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610235573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102599190610cbb565b600080546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156102b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d79190610cbb565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b600061030533836106e5565b9050826001600160a01b0316816001600160a01b0316146103685760405162461bcd60e51b815260206004820152601860248201527714da59db985d1d5c99481a5cc81b9bdd0818dbdc9c9958dd60421b60448201526064015b60405180910390fd5b6001600160a01b03808416600090815260356020526040902060018101546002909101549091166103998583610774565b846001600160a01b0316336001600160a01b0316826001600160a01b03167f39ca68a9f5d8038e871ef25a6622a56579cda4a6eedf63813574d23652e94048856040516103e891815260200190565b60405180910390a45050505050565b6001600160a01b038181166000908152603560205260409020600201541633146104635760405162461bcd60e51b815260206004820152601d60248201527f43616e206f6e6c792062652063616c6c65642062792063726561746f72000000604482015260640161035f565b6001600160a01b0381166000908152603560205260409020600101546104898282610774565b336001600160a01b03167fb1f6a8f6b8fb527cfeec0df589160bc2a92ff715097117cb250e823c7106bc2f83836040516104c4929190610cd8565b60405180910390a25050565b6000806104df83850185610c0f565b6001600160a01b03811660009081526035602052604090205490915060ff16156105465760405162461bcd60e51b81526020600482015260186024820152777061796d656e74496420616c726561647920696e2075736560401b604482015260640161035f565b61054e610658565b6001600160a01b0316336001600160a01b0316146105a65760405162461bcd60e51b81526020600482015260156024820152744f6e6c792063616c6c61626c65206279207468697360581b604482015260640161035f565b60408051606081018252600180825260208083018981526001600160a01b038b811685870181815288831660009081526035909552938790209551865460ff19169015151786559151938501939093559051600290930180546001600160a01b0319169390921692909217905590517f6c9f23ee41b34196a6e871314d55c3a0cce3399afc5d09755d171ea06547e073906106449084908990610cd8565b60405180910390a250600195945050505050565b60025460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156106bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e09190610cbb565b905090565b60408051606084901b6001600160601b031916602080830191909152825160148184030181526034830184528051908201207b0ca2ba3432b932bab69029b4b3b732b21026b2b9b9b0b3b29d05199960211b60548401526070808401919091528351808403909101815260909092019092528051910120600090600061076b82856108b6565b95945050505050565b6001600160a01b03821660009081526035602052604090205460ff166107d35760405162461bcd60e51b81526020600482015260146024820152737061796d656e744964206e6f7420696e2075736560601b604482015260640161035f565b6001600160a01b0382166000908152603560205260409020805460ff191690556107fb610658565b6001600160a01b031663a9059cbb33836040518363ffffffff1660e01b8152600401610828929190610cd8565b6020604051808303816000875af1158015610847573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061086b9190610cf1565b6108b25760405162461bcd60e51b81526020600482015260186024820152771dda5d1a191c985dc81d1c985b9cd9995c8819985a5b195960421b604482015260640161035f565b5050565b60008060006108c585856108da565b915091506108d28161091f565b509392505050565b60008082516041036109105760208301516040840151606085015160001a61090487828585610a67565b94509450505050610918565b506000905060025b9250929050565b600081600481111561093357610933610d13565b0361093b5750565b600181600481111561094f5761094f610d13565b036109975760405162461bcd60e51b815260206004820152601860248201527745434453413a20696e76616c6964207369676e617475726560401b604482015260640161035f565b60028160048111156109ab576109ab610d13565b036109f85760405162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e67746800604482015260640161035f565b6003816004811115610a0c57610a0c610d13565b03610a645760405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c604482015261756560f01b606482015260840161035f565b50565b6000806fa2a8918ca85bafe22016d0b997e4df60600160ff1b03831115610a945750600090506003610b18565b6040805160008082526020820180845289905260ff881692820192909252606081018690526080810185905260019060a0016020604051602081039080840390855afa158015610ae8573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116610b1157600060019250925050610b18565b9150600090505b94509492505050565b6001600160a01b0381168114610a6457600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b5f57600080fd5b8235610b6a81610b21565b915060208301356001600160401b0380821115610b8657600080fd5b818501915085601f830112610b9a57600080fd5b813581811115610bac57610bac610b36565b604051601f8201601f19908116603f01168101908382118183101715610bd457610bd4610b36565b81604052828152886020848701011115610bed57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610c2157600080fd5b8135610c2c81610b21565b9392505050565b60008060008060608587031215610c4957600080fd5b8435610c5481610b21565b93506020850135925060408501356001600160401b0380821115610c7757600080fd5b818701915087601f830112610c8b57600080fd5b813581811115610c9a57600080fd5b886020828501011115610cac57600080fd5b95989497505060200194505050565b600060208284031215610ccd57600080fd5b8151610c2c81610b21565b6001600160a01b03929092168252602082015260400190565b600060208284031215610d0357600080fd5b81518015158114610c2c57600080fd5b634e487b7160e01b600052602160045260246000fdfea26469706673582212203a151427250946dd0e6d3a0ee191879e840e40600d382ab39ed0a83ff588778964736f6c63430008100033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b506004361061008e5760003560e01c80631b3c90a8146100935780633e6326fc1461009d5780634162169f146100cd5780634bb78b14146100e05780634c33fe94146100f35780635aef7de6146101065780639ea7811614610119578063a4c0ed3614610155578063e1758bd814610168578063e2982c2114610170575b600080fd5b61009b6101d2565b005b6002546100b0906001600160a01b031681565b6040516001600160a01b0390911681526020015b60405180910390f35b6000546100b0906001600160a01b031681565b61009b6100ee366004610b4c565b6102f9565b61009b610101366004610c0f565b6103f7565b6001546100b0906001600160a01b031681565b610145610127366004610c0f565b6001600160a01b031660009081526035602052604090205460ff1690565b60405190151581526020016100c4565b610145610163366004610c33565b6104d0565b6100b0610658565b6101ac61017e366004610c0f565b60356020526000908152604090208054600182015460029092015460ff90911691906001600160a01b031683565b60408051931515845260208401929092526001600160a01b0316908201526060016100c4565b60025460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b60448201526001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610235573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102599190610cbb565b600080546001600160a01b0319166001600160a01b0392909216918217905560408051632d77bef360e11b81529051635aef7de6916004808201926020929091908290030181865afa1580156102b3573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102d79190610cbb565b600180546001600160a01b0319166001600160a01b0392909216919091179055565b600061030533836106e5565b9050826001600160a01b0316816001600160a01b0316146103685760405162461bcd60e51b815260206004820152601860248201527714da59db985d1d5c99481a5cc81b9bdd0818dbdc9c9958dd60421b60448201526064015b60405180910390fd5b6001600160a01b03808416600090815260356020526040902060018101546002909101549091166103998583610774565b846001600160a01b0316336001600160a01b0316826001600160a01b03167f39ca68a9f5d8038e871ef25a6622a56579cda4a6eedf63813574d23652e94048856040516103e891815260200190565b60405180910390a45050505050565b6001600160a01b038181166000908152603560205260409020600201541633146104635760405162461bcd60e51b815260206004820152601d60248201527f43616e206f6e6c792062652063616c6c65642062792063726561746f72000000604482015260640161035f565b6001600160a01b0381166000908152603560205260409020600101546104898282610774565b336001600160a01b03167fb1f6a8f6b8fb527cfeec0df589160bc2a92ff715097117cb250e823c7106bc2f83836040516104c4929190610cd8565b60405180910390a25050565b6000806104df83850185610c0f565b6001600160a01b03811660009081526035602052604090205490915060ff16156105465760405162461bcd60e51b81526020600482015260186024820152777061796d656e74496420616c726561647920696e2075736560401b604482015260640161035f565b61054e610658565b6001600160a01b0316336001600160a01b0316146105a65760405162461bcd60e51b81526020600482015260156024820152744f6e6c792063616c6c61626c65206279207468697360581b604482015260640161035f565b60408051606081018252600180825260208083018981526001600160a01b038b811685870181815288831660009081526035909552938790209551865460ff19169015151786559151938501939093559051600290930180546001600160a01b0319169390921692909217905590517f6c9f23ee41b34196a6e871314d55c3a0cce3399afc5d09755d171ea06547e073906106449084908990610cd8565b60405180910390a250600195945050505050565b60025460405163bf40fac160e01b815260206004820152600a60248201526923a7a7a22227a62620a960b11b60448201526000916001600160a01b03169063bf40fac190606401602060405180830381865afa1580156106bc573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906106e09190610cbb565b905090565b60408051606084901b6001600160601b031916602080830191909152825160148184030181526034830184528051908201207b0ca2ba3432b932bab69029b4b3b732b21026b2b9b9b0b3b29d05199960211b60548401526070808401919091528351808403909101815260909092019092528051910120600090600061076b82856108b6565b95945050505050565b6001600160a01b03821660009081526035602052604090205460ff166107d35760405162461bcd60e51b81526020600482015260146024820152737061796d656e744964206e6f7420696e2075736560601b604482015260640161035f565b6001600160a01b0382166000908152603560205260409020805460ff191690556107fb610658565b6001600160a01b031663a9059cbb33836040518363ffffffff1660e01b8152600401610828929190610cd8565b6020604051808303816000875af1158015610847573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061086b9190610cf1565b6108b25760405162461bcd60e51b81526020600482015260186024820152771dda5d1a191c985dc81d1c985b9cd9995c8819985a5b195960421b604482015260640161035f565b5050565b60008060006108c585856108da565b915091506108d28161091f565b509392505050565b60008082516041036109105760208301516040840151606085015160001a61090487828585610a67565b94509450505050610918565b506000905060025b9250929050565b600081600481111561093357610933610d13565b0361093b5750565b600181600481111561094f5761094f610d13565b036109975760405162461bcd60e51b815260206004820152601860248201527745434453413a20696e76616c6964207369676e617475726560401b604482015260640161035f565b60028160048111156109ab576109ab610d13565b036109f85760405162461bcd60e51b815260206004820152601f60248201527f45434453413a20696e76616c6964207369676e6174757265206c656e67746800604482015260640161035f565b6003816004811115610a0c57610a0c610d13565b03610a645760405162461bcd60e51b815260206004820152602260248201527f45434453413a20696e76616c6964207369676e6174757265202773272076616c604482015261756560f01b606482015260840161035f565b50565b6000806fa2a8918ca85bafe22016d0b997e4df60600160ff1b03831115610a945750600090506003610b18565b6040805160008082526020820180845289905260ff881692820192909252606081018690526080810185905260019060a0016020604051602081039080840390855afa158015610ae8573d6000803e3d6000fd5b5050604051601f1901519150506001600160a01b038116610b1157600060019250925050610b18565b9150600090505b94509492505050565b6001600160a01b0381168114610a6457600080fd5b634e487b7160e01b600052604160045260246000fd5b60008060408385031215610b5f57600080fd5b8235610b6a81610b21565b915060208301356001600160401b0380821115610b8657600080fd5b818501915085601f830112610b9a57600080fd5b813581811115610bac57610bac610b36565b604051601f8201601f19908116603f01168101908382118183101715610bd457610bd4610b36565b81604052828152886020848701011115610bed57600080fd5b8260208601602083013760006020848301015280955050505050509250929050565b600060208284031215610c2157600080fd5b8135610c2c81610b21565b9392505050565b60008060008060608587031215610c4957600080fd5b8435610c5481610b21565b93506020850135925060408501356001600160401b0380821115610c7757600080fd5b818701915087601f830112610c8b57600080fd5b813581811115610c9a57600080fd5b886020828501011115610cac57600080fd5b95989497505060200194505050565b600060208284031215610ccd57600080fd5b8151610c2c81610b21565b6001600160a01b03929092168252602082015260400190565b600060208284031215610d0357600080fd5b81518015158114610c2c57600080fd5b634e487b7160e01b600052602160045260246000fdfea26469706673582212203a151427250946dd0e6d3a0ee191879e840e40600d382ab39ed0a83ff588778964736f6c63430008100033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/contracts/utils/OneTimePayments.sol

@@ -0,0 +1,135 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+
+import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
+
+import "../Interfaces.sol";
+import "./DAOContract.sol";
+import "../utils/NameService.sol";
+
+/* @title One Time payment scheme
+ * Scheme that allows address to deposit tokens for any address to withdraw
+ */
+contract OneTimePayments is DAOContract {
+	struct Payment {
+		bool hasPayment;
+		uint256 paymentAmount;
+		address paymentSender;
+	}
+
+	mapping(address => Payment) public payments;
+
+	event PaymentDeposit(address indexed from, address paymentId, uint256 amount);
+	event PaymentCancel(address indexed from, address paymentId, uint256 amount);
+	event PaymentWithdraw(
+		address indexed from,
+		address indexed to,
+		address indexed paymentId,
+		uint256 amount
+	);
+
+	/* @dev Constructor
+	 * @param _avatar The avatar of the DAO
+	 * @param _identity The identity contract
+	 * @param _gasLimit The gas limit
+	 */
+	constructor(INameService _ns) {
+		setDAO(_ns);
+	}
+
+	/* @dev ERC677 on token transfer function. When transferAndCall is called on this contract,
+	 * this function is called, depositing the payment amount under the hash of the given bytes.
+	 * Reverts if hash is already in use. Can only be called by token contract.
+	 * @param sender the address of the sender
+	 * @param value the amount to deposit
+	 * @param data The given paymentId which should be a fresh address of a wallet
+	 */
+	function onTokenTransfer(
+		address sender,
+		uint256 value,
+		bytes calldata data
+	) external returns (bool) {
+		address paymentId = abi.decode(data, (address));
+
+		require(!payments[paymentId].hasPayment, "paymentId already in use");
+		require(msg.sender == address(nativeToken()), "Only callable by this");
+
+		payments[paymentId] = Payment(true, value, sender);
+
+		emit PaymentDeposit(sender, paymentId, value);
+
+		return true;
+	}
+
+	/* @dev Withdrawal function.
+	 * allows the sender that proves ownership of paymentId to withdraw
+	 * @param paymentId the address of the public key that the
+	 *   rightful receiver of the payment knows the private key to
+	 * @param signature the signature of a the message containing the msg.sender address signed
+	 *   with the private key.
+	 */
+	function withdraw(address paymentId, bytes memory signature) public {
+		address signer = signerOfAddress(msg.sender, signature);
+		require(signer == paymentId, "Signature is not correct");
+
+		uint256 value = payments[paymentId].paymentAmount;
+		address sender = payments[paymentId].paymentSender;
+
+		_withdraw(paymentId, value);
+		emit PaymentWithdraw(sender, msg.sender, paymentId, value);
+	}
+
+	/* @dev Cancel function
+	 * allows only creator of payment to cancel
+	 * @param paymentId The paymentId of the payment to cancelæ
+	 */
+	function cancel(address paymentId) public {
+		require(
+			payments[paymentId].paymentSender == msg.sender,
+			"Can only be called by creator"
+		);
+
+		uint256 value = payments[paymentId].paymentAmount;
+
+		_withdraw(paymentId, value);
+		emit PaymentCancel(msg.sender, paymentId, value);
+	}
+
+	/* @dev Internal withdraw function
+	 * @param paymentId the paymentId of the payment
+	 * @param value the amopunt in the payment
+	 */
+	function _withdraw(address paymentId, uint256 value) internal {
+		require(payments[paymentId].hasPayment, "paymentId not in use");
+
+		payments[paymentId].hasPayment = false;
+
+		require(
+			nativeToken().transfer(msg.sender, value),
+			"withdraw transfer failed"
+		);
+	}
+
+	/* @dev function to check if a payment hash is in use
+	 * @param paymentId the given paymentId
+	 */
+	function hasPayment(address paymentId) public view returns (bool) {
+		return payments[paymentId].hasPayment;
+	}
+
+	/* @dev gives the signer address of the signature and the message
+	 * @param message the plain-text message that is signed by the signature
+	 * @param signature the signature of the plain-text message
+	 */
+	function signerOfAddress(address message, bytes memory signature)
+		internal
+		pure
+		returns (address)
+	{
+		bytes32 signedMessage = ECDSA.toEthSignedMessageHash(
+			keccak256(abi.encodePacked(message))
+		);
+		address signer = ECDSA.recover(signedMessage, signature);
+		return signer;
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "GoodDollar Protocol",
   "scripts": {
     "prepack": "npm run minimize",

package/releases/deployment.json

@@ -474,7 +474,8 @@
         "AdminWallet": "0x7119CD89D4792aF90277d84cDffa3F2Ab22a0022",
         "Faucet": "0x4F93Fa058b03953C851eFaA2e4FC5C34afDFAb84",
         "Invites": "0x36829D1Cda92FFF5782d5d48991620664FC857d3",
-        "UBIScheme": "0x43d72Ff17701B2DA814620735C39C620Ce0ea4A1"
+        "UBIScheme": "0x43d72Ff17701B2DA814620735C39C620Ce0ea4A1",
+        "OneTimePayments": "0xB27D247f5C2a61D2Cb6b6E67FEE51d839447e97d"
     },
     "gnosis": {
         "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"
@@ -499,7 +500,8 @@
         "UBIScheme": "0x6B86F82293552C3B9FE380FC038A89e0328C7C5f",
         "ClaimersDistribution": "0x6e3c0ad79FA7ccDFa27bE14C2630511415A2F635",
         "CompoundVotingMachine": "0xC2C303131939370ed75c95686F691f290b56Be66",
-        "GuardiansSafe": "0x84C10B45fE51bfB4f86c19A47Fdbc187d4572Fb8"
+        "GuardiansSafe": "0x84C10B45fE51bfB4f86c19A47Fdbc187d4572Fb8",
+        "OneTimePayments": "0xB23e54fd8c2f35F9d38884Fc1611F5e9004f10ea"
     },
     "staging-celo": {
         "network": "staging-celo",
@@ -521,6 +523,7 @@
         "UBIScheme": "0x2881d417dA066600372753E73A3570F0781f18cB",
         "ClaimersDistribution": "0x671123F1c7a5B5445467Ff765a5E2Bc86878B245",
         "CompoundVotingMachine": "0xCd25fB84AB22582F1034bcd80c399a3126f2E775",
-        "GuardiansSafe": "0x84C10B45fE51bfB4f86c19A47Fdbc187d4572Fb8"
+        "GuardiansSafe": "0x84C10B45fE51bfB4f86c19A47Fdbc187d4572Fb8",
+        "OneTimePayments": "0x514820Af2DaE5F537dE16E576471528176318113"
     }
 }

package/scripts/multichain-deploy/2b_otp-deploy.ts

@@ -0,0 +1,73 @@
+/***
+ * Deploy helper contracts
+ * AdminWallet, Faucet, Invites
+ */
+import { network, ethers, upgrades, run } from "hardhat";
+import { Contract } from "ethers";
+import { defaultsDeep } from "lodash";
+import { getImplementationAddress } from "@openzeppelin/upgrades-core";
+import { deployDeterministic, verifyProductionSigner, verifyContract } from "./helpers";
+import releaser from "../releaser";
+import ProtocolSettings from "../../releases/deploy-settings.json";
+import dao from "../../releases/deployment.json";
+import { TransactionResponse } from "@ethersproject/providers";
+
+const { name } = network;
+
+const printDeploy = async (c: Contract | TransactionResponse): Promise<Contract | TransactionResponse> => {
+  if (c instanceof Contract) {
+    await c.deployed();
+    console.log("deployed to: ", c.address);
+  }
+  if (c.wait) {
+    await c.wait();
+    console.log("tx done:", c.hash);
+  }
+  return c;
+};
+
+export const deployHelpers = async () => {
+  let protocolSettings = defaultsDeep({}, ProtocolSettings[network.name], ProtocolSettings["default"]);
+
+  let release: { [key: string]: any } = dao[network.name];
+
+  let [root] = await ethers.getSigners();
+  const isProduction = network.name.includes("production");
+
+  if (isProduction) verifyProductionSigner(root);
+
+  //generic call permissions
+  let schemeMock = root;
+
+  console.log("got signers:", {
+    network,
+    root: root.address,
+    schemeMock: schemeMock.address,
+    balance: await ethers.provider.getBalance(root.address).then(_ => _.toString())
+  });
+
+  console.log("deploying onetime payments", { gasprice: protocolSettings.gasPrice });
+  const OTP = (await deployDeterministic(
+    {
+      name: "OneTimePayments",
+      salt: "OneTimePayments",
+      isUpgradeable: false
+    },
+    [release.NameService]
+  ).then(printDeploy)) as Contract;
+
+  // const OTP = await ethers.getContractAt("OneTimePayments", release.OneTimePayments);
+
+  const torelease = {
+    OneTimePayments: OTP.address
+  };
+  await releaser(torelease, network.name, "deployment", false);
+
+  const constructorArgs = ethers.utils.defaultAbiCoder.encode(["address"], [release.NameService]);
+  await verifyContract(OTP.address, "OneTimePayments", network.name, undefined, constructorArgs);
+};
+
+export const main = async () => {
+  await deployHelpers();
+};
+if (process.argv[1].includes("2b_otp-deploy")) main();

package/scripts/upgrades/celo-defi-ubi-deploy.ts

@@ -57,14 +57,20 @@ const step3 = async () => {
 
   const adminimpl = await (await ethers.getContractFactory("AdminWalletFuse")).deploy();
   const curadmin = adminimpl.attach(release.AdminWallet);
-  const upgradetx = await (await curadmin.upgradeTo(adminimpl.address)).wait();
+  console.log("deployed admin impl", adminimpl.address);
+  const encodedAdmin = adminimpl.interface.encodeFunctionData("upgrade", [release.NameService]);
+  const upgradetx = await (await curadmin.upgradeToAndCall(adminimpl.address, encodedAdmin)).wait();
   const impl = adminimpl.address;
   console.log("AdminWallet upgraded", { impl, txhash: upgradetx.transactionHash });
   await verifyContract(impl, "AdminWalletFuse", networkName);
 
   const faucetimpl = await (await ethers.getContractFactory("FuseFaucetV2")).deploy();
   const proxyAdmin = await ethers.getContractAt("ProxyAdmin", release.ProxyAdmin);
-  const encoded = faucetimpl.interface.encodeFunctionData("upgrade", [release.AdminWallet, root.address]);
+  const encoded = faucetimpl.interface.encodeFunctionData("upgrade", [
+    release.AdminWallet,
+    root.address,
+    release.NameService
+  ]);
   const faucettx = await (await proxyAdmin.upgradeAndCall(release.FuseFaucet, faucetimpl.address, encoded)).wait();
   console.log("Faucet upgraded", faucettx.transactionHash);
   await verifyContract(faucetimpl.address, "FuseFaucetV2", networkName);