@gooddollar/goodprotocol 2.0.25-beta.8 → 2.0.25-beta.9

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

@@ -0,0 +1,81 @@
+{
+  "_format": "hh-sol-artifact-1",
+  "contractName": "LastauthReduction",
+  "sourceName": "contracts/utils/LastauthReduction.sol",
+  "abi": [
+    {
+      "inputs": [
+        {
+          "internalType": "contract NameService",
+          "name": "_ns",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "nonpayable",
+      "type": "constructor"
+    },
+    {
+      "inputs": [],
+      "name": "finalPeriod",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "manager",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "reduce",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "reduceByDays",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "startingPeriodDays",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    }
+  ],
+  "bytecode": "0x6080604052605a60015561027660025560b460035534801561002057600080fd5b50604051610b6b380380610b6b83398101604081905261003f9161006d565b600080546001600160a01b039092166001600160a01b0319928316179055600480549091163317905561009d565b60006020828403121561007f57600080fd5b81516001600160a01b038116811461009657600080fd5b9392505050565b610abf806100ac6000396000f3fe608060405234801561001057600080fd5b50600436106100575760003560e01c80630d8606621461005c57806345219b0e14610078578063481c6a7514610082578063ab0962e0146100a2578063c6ee9b9e146100ab575b600080fd5b61006560025481565b6040519081526020015b60405180910390f35b6100806100b4565b005b600454610095906001600160a01b031681565b60405161006f9190610847565b61006560035481565b61006560015481565b6004546001600160a01b031633146101015760405162461bcd60e51b815260206004820152600b60248201526a3737ba1036b0b730b3b2b960a91b60448201526064015b60405180910390fd5b60008060009054906101000a90046001600160a01b03166001600160a01b0316634162169f6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610155573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101799190610873565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa1580156101b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101da9190610873565b6000805460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b604482015292935090916001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610241573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102659190610873565b6000805460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b604482015292935090916001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156102ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102f29190610873565b90506000826001600160a01b03166331b376e26040518163ffffffff1660e01b8152600401602060405180830381865afa158015610334573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103589190610897565b90506000836001600160a01b0316634125f0f26040518163ffffffff1660e01b8152600401602060405180830381865afa15801561039a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103be9190610873565b9050600354821161048257604051636c525b1360e01b81526001600160a01b03841690636c525b13906103f5908890600401610847565b6020604051808303816000875af1158015610414573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061043891906108c5565b61047b5760405162461bcd60e51b81526020600482015260146024820152731d5b9c9959da5cdd195c9a5b99c819985a5b195960621b60448201526064016100f8565b5050505050565b600060025483111561065e57836001600160a01b031663d1b7089a866002546040516024016104b391815260200190565b60408051601f198184030181529181526020820180516001600160e01b031660016201b3cb60e21b0319179052516001600160e01b031960e085901b1681526105059291908b90600090600401610904565b6000604051808303816000875af1158015610524573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261054c919081019061096b565b5090508061056c5760405162461bcd60e51b81526004016100f890610a2b565b6001600160a01b0382161561065957836001600160a01b031663d1b7089a836002546040516024016105a091815260200190565b60408051601f198184030181529181526020820180516001600160e01b031660016201b3cb60e21b0319179052516001600160e01b031960e085901b1681526105f29291908b90600090600401610904565b6000604051808303816000875af1158015610611573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610639919081019061096b565b509050806106595760405162461bcd60e51b81526004016100f890610a2b565b61083f565b836001600160a01b031663d1b7089a866001548661067c9190610a62565b60405160240161068e91815260200190565b60408051601f198184030181529181526020820180516001600160e01b031660016201b3cb60e21b0319179052516001600160e01b031960e085901b1681526106e09291908b90600090600401610904565b6000604051808303816000875af11580156106ff573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610727919081019061096b565b509050806107475760405162461bcd60e51b81526004016100f890610a2b565b6001600160a01b0382161561083f57836001600160a01b031663d1b7089a83600154866107749190610a62565b60405160240161078691815260200190565b60408051601f198184030181529181526020820180516001600160e01b031660016201b3cb60e21b0319179052516001600160e01b031960e085901b1681526107d89291908b90600090600401610904565b6000604051808303816000875af11580156107f7573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261081f919081019061096b565b5090508061083f5760405162461bcd60e51b81526004016100f890610a2b565b505050505050565b6001600160a01b0391909116815260200190565b6001600160a01b038116811461087057600080fd5b50565b60006020828403121561088557600080fd5b81516108908161085b565b9392505050565b6000602082840312156108a957600080fd5b5051919050565b805180151581146108c057600080fd5b919050565b6000602082840312156108d757600080fd5b610890826108b0565b60005b838110156108fb5781810151838201526020016108e3565b50506000910152565b600060018060a01b0380871683526080602084015285518060808501526109328160a0860160208a016108e0565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561097e57600080fd5b610987836108b0565b60208401519092506001600160401b03808211156109a457600080fd5b818501915085601f8301126109b857600080fd5b8151818111156109ca576109ca610955565b604051601f8201601f19908116603f011681019083821181831017156109f2576109f2610955565b81604052828152886020848701011115610a0b57600080fd5b610a1c8360208301602088016108e0565b80955050505050509250929050565b6020808252601e908201527f73657441757468656e7469636174696f6e506572696f64206661696c65640000604082015260600190565b81810381811115610a8357634e487b7160e01b600052601160045260246000fd5b9291505056fea2646970667358221220aa3372503faa13c51fb82573a9fc8257ac61745f4b748ad58773bd4944d4375f64736f6c63430008130033",
+  "deployedBytecode": "0x608060405234801561001057600080fd5b50600436106100575760003560e01c80630d8606621461005c57806345219b0e14610078578063481c6a7514610082578063ab0962e0146100a2578063c6ee9b9e146100ab575b600080fd5b61006560025481565b6040519081526020015b60405180910390f35b6100806100b4565b005b600454610095906001600160a01b031681565b60405161006f9190610847565b61006560035481565b61006560015481565b6004546001600160a01b031633146101015760405162461bcd60e51b815260206004820152600b60248201526a3737ba1036b0b730b3b2b960a91b60448201526064015b60405180910390fd5b60008060009054906101000a90046001600160a01b03166001600160a01b0316634162169f6040518163ffffffff1660e01b8152600401602060405180830381865afa158015610155573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101799190610873565b6001600160a01b0316635aef7de66040518163ffffffff1660e01b8152600401602060405180830381865afa1580156101b6573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906101da9190610873565b6000805460405163bf40fac160e01b81526020600482015260086024820152674944454e5449545960c01b604482015292935090916001600160a01b039091169063bf40fac190606401602060405180830381865afa158015610241573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102659190610873565b6000805460405163bf40fac160e01b815260206004820152600a60248201526921a7a72a2927a62622a960b11b604482015292935090916001600160a01b039091169063bf40fac190606401602060405180830381865afa1580156102ce573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102f29190610873565b90506000826001600160a01b03166331b376e26040518163ffffffff1660e01b8152600401602060405180830381865afa158015610334573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103589190610897565b90506000836001600160a01b0316634125f0f26040518163ffffffff1660e01b8152600401602060405180830381865afa15801561039a573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906103be9190610873565b9050600354821161048257604051636c525b1360e01b81526001600160a01b03841690636c525b13906103f5908890600401610847565b6020604051808303816000875af1158015610414573d6000803e3d6000fd5b505050506040513d601f19601f8201168201806040525081019061043891906108c5565b61047b5760405162461bcd60e51b81526020600482015260146024820152731d5b9c9959da5cdd195c9a5b99c819985a5b195960621b60448201526064016100f8565b5050505050565b600060025483111561065e57836001600160a01b031663d1b7089a866002546040516024016104b391815260200190565b60408051601f198184030181529181526020820180516001600160e01b031660016201b3cb60e21b0319179052516001600160e01b031960e085901b1681526105059291908b90600090600401610904565b6000604051808303816000875af1158015610524573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261054c919081019061096b565b5090508061056c5760405162461bcd60e51b81526004016100f890610a2b565b6001600160a01b0382161561065957836001600160a01b031663d1b7089a836002546040516024016105a091815260200190565b60408051601f198184030181529181526020820180516001600160e01b031660016201b3cb60e21b0319179052516001600160e01b031960e085901b1681526105f29291908b90600090600401610904565b6000604051808303816000875af1158015610611573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610639919081019061096b565b509050806106595760405162461bcd60e51b81526004016100f890610a2b565b61083f565b836001600160a01b031663d1b7089a866001548661067c9190610a62565b60405160240161068e91815260200190565b60408051601f198184030181529181526020820180516001600160e01b031660016201b3cb60e21b0319179052516001600160e01b031960e085901b1681526106e09291908b90600090600401610904565b6000604051808303816000875af11580156106ff573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f19168201604052610727919081019061096b565b509050806107475760405162461bcd60e51b81526004016100f890610a2b565b6001600160a01b0382161561083f57836001600160a01b031663d1b7089a83600154866107749190610a62565b60405160240161078691815260200190565b60408051601f198184030181529181526020820180516001600160e01b031660016201b3cb60e21b0319179052516001600160e01b031960e085901b1681526107d89291908b90600090600401610904565b6000604051808303816000875af11580156107f7573d6000803e3d6000fd5b505050506040513d6000823e601f3d908101601f1916820160405261081f919081019061096b565b5090508061083f5760405162461bcd60e51b81526004016100f890610a2b565b505050505050565b6001600160a01b0391909116815260200190565b6001600160a01b038116811461087057600080fd5b50565b60006020828403121561088557600080fd5b81516108908161085b565b9392505050565b6000602082840312156108a957600080fd5b5051919050565b805180151581146108c057600080fd5b919050565b6000602082840312156108d757600080fd5b610890826108b0565b60005b838110156108fb5781810151838201526020016108e3565b50506000910152565b600060018060a01b0380871683526080602084015285518060808501526109328160a0860160208a016108e0565b9416604083015250606081019190915260a0601f909201601f1916010192915050565b634e487b7160e01b600052604160045260246000fd5b6000806040838503121561097e57600080fd5b610987836108b0565b60208401519092506001600160401b03808211156109a457600080fd5b818501915085601f8301126109b857600080fd5b8151818111156109ca576109ca610955565b604051601f8201601f19908116603f011681019083821181831017156109f2576109f2610955565b81604052828152886020848701011115610a0b57600080fd5b610a1c8360208301602088016108e0565b80955050505050509250929050565b6020808252601e908201527f73657441757468656e7469636174696f6e506572696f64206661696c65640000604082015260600190565b81810381811115610a8357634e487b7160e01b600052601160045260246000fd5b9291505056fea2646970667358221220aa3372503faa13c51fb82573a9fc8257ac61745f4b748ad58773bd4944d4375f64736f6c63430008130033",
+  "linkReferences": {},
+  "deployedLinkReferences": {}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/contracts/utils/LastauthReduction.sol

@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+
+import "../utils/NameService.sol";
+import "../Interfaces.sol";
+import "../reserve/GoodReserveCDai.sol";
+import "../identity/IdentityV2.sol";
+import "hardhat/console.sol";
+
+contract LastauthReduction {
+	NameService ns;
+
+	uint public reduceByDays = 90;
+	uint public startingPeriodDays = 180 + 90 * 5;
+	uint public finalPeriod = 180;
+	address public manager;
+
+	constructor(NameService _ns) {
+		ns = _ns;
+		manager = msg.sender;
+	}
+
+	function reduce() external {
+		require(msg.sender == manager, "not manager");
+
+		address avatar = ns.dao().avatar();
+
+		IdentityV2 id = IdentityV2(ns.getAddress("IDENTITY"));
+
+		Controller ctrl = Controller(ns.getAddress("CONTROLLER"));
+		uint curPeriod = id.authenticationPeriod();
+
+		IIdentity oldId = id.oldIdentity();
+
+		if (curPeriod <= finalPeriod) {
+			// prevent executing again
+			require(ctrl.unregisterSelf(avatar), "unregistering failed");
+			return;
+		}
+
+		bool ok;
+		if (curPeriod > startingPeriodDays) {
+			(ok, ) = ctrl.genericCall(
+				address(id),
+				abi.encodeCall(
+					IdentityV2.setAuthenticationPeriod,
+					(startingPeriodDays)
+				),
+				address(avatar),
+				0
+			);
+			require(ok, "setAuthenticationPeriod failed");
+
+			if (address(oldId) != address(0)) {
+				(ok, ) = ctrl.genericCall(
+					address(oldId),
+					abi.encodeCall(
+						IdentityV2.setAuthenticationPeriod,
+						(startingPeriodDays)
+					),
+					address(avatar),
+					0
+				);
+				require(ok, "setAuthenticationPeriod failed");
+			}
+		} else {
+			(ok, ) = ctrl.genericCall(
+				address(id),
+				abi.encodeCall(
+					IdentityV2.setAuthenticationPeriod,
+					(curPeriod - reduceByDays)
+				),
+				address(avatar),
+				0
+			);
+			require(ok, "setAuthenticationPeriod failed");
+
+			if (address(oldId) != address(0)) {
+				(ok, ) = ctrl.genericCall(
+					address(oldId),
+					abi.encodeCall(
+						IdentityV2.setAuthenticationPeriod,
+						(curPeriod - reduceByDays)
+					),
+					address(avatar),
+					0
+				);
+				require(ok, "setAuthenticationPeriod failed");
+			}
+		}
+	}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.25-beta.8",
+  "version": "2.0.25-beta.9",
   "description": "GoodDollar Protocol",
   "engines": {
     "node": ">=16.x"
@@ -61,22 +61,6 @@
     "url": "https://github.com/GoodDollar/GoodProtocol/issues"
   },
   "homepage": "https://gooddollar.org",
-  "dependencies": {
-    "@gooddollar/goodcontracts": "^2.6.6",
-    "@jsier/retrier": "^1.2.4",
-    "@openzeppelin/contracts": "^4.8.0",
-    "@openzeppelin/contracts-upgradeable": "^4.8.0",
-    "@openzeppelin/hardhat-upgrades": "^1.22.1",
-    "@superfluid-finance/ethereum-contracts": "^1.8.1",
-    "@superfluid-finance/sdk-core": "^0.5.8",
-    "@typechain/hardhat": "^6.1.5",
-    "async-promise-pool": "^1.0.4",
-    "openzeppelin-solidity": "^4.3.2",
-    "patch-package": "latest",
-    "press-any-key": "^0.1.1",
-    "truffle-plugin-verify": "^0.6.1",
-    "truffle-source-verify": "^0.0.6"
-  },
   "devDependencies": {
     "@babel/core": "*",
     "@babel/polyfill": "*",
@@ -88,19 +72,28 @@
     "@gnosis.pm/safe-ethers-lib": "^1.7.0",
     "@gnosis.pm/safe-service-client": "^1.4.0",
     "@gooddollar/bridge-contracts": "1.0.14-beta.7",
+    "@gooddollar/goodcontracts": "^2.6.6",
+    "@jsier/retrier": "^1.2.4",
     "@mean-finance/uniswap-v3-oracle": "^1.0.3",
     "@nomicfoundation/hardhat-chai-matchers": "1",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
     "@nomicfoundation/hardhat-verify": "^2.0.1",
     "@nomiclabs/hardhat-ethers": "^2.2.1",
     "@nomiclabs/hardhat-waffle": "^2.0.6",
+    "@openzeppelin/contracts": "^4.8.0",
+    "@openzeppelin/contracts-upgradeable": "^4.8.0",
+    "@openzeppelin/hardhat-upgrades": "^1.22.1",
+    "@superfluid-finance/ethereum-contracts": "^1.8.1",
+    "@superfluid-finance/sdk-core": "^0.5.8",
     "@swc/core": "1.3.96",
     "@swc/helpers": "^0.3.16",
     "@typechain/ethers-v5": "^11.1.1",
+    "@typechain/hardhat": "^6.1.5",
     "@types/mocha": "*",
     "@types/node": "*",
     "@uniswap/v2-core": "*",
     "@uniswap/v2-periphery": "^1.1.0-beta.0",
+    "async-promise-pool": "^1.0.4",
     "bignumber.js": "*",
     "bindings": "*",
     "chai": "*",
@@ -124,12 +117,17 @@
     "mocha-lcov-reporter": "*",
     "node-fetch": "*",
     "node-jq": "*",
+    "openzeppelin-solidity": "^4.3.2",
+    "patch-package": "latest",
+    "press-any-key": "^0.1.1",
     "prompt": "^1.3.0",
     "regenerator-runtime": "^0.13.9",
     "solhint": "*",
     "solidity-coverage": "^0.8.4",
     "truffle": "^5.11.5",
     "truffle-hdwallet-provider": "*",
+    "truffle-plugin-verify": "^0.6.1",
+    "truffle-source-verify": "^0.0.6",
     "ts-generator": "^0.1.1",
     "ts-node": "^10.9.1",
     "typechain": "^8.3.1",

package/releases/deployment.json

@@ -436,9 +436,7 @@
     "BuyGDFactoryV2": "0x1F60C4C7037C6766924A43666B781ED1479587a2",
     "BulkWhitelist": "0x30Afd0534dAA29135308d048103b40dc1BA4518d"
   },
-  "gnosis": {
-    "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8"
-  },
+  "gnosis": { "GuardiansSafe": "0x84c10b45fe51bfb4f86c19a47fdbc187d4572fb8" },
   "development-celo": {
     "network": "development-celo",
     "networkId": 42220,
@@ -464,7 +462,13 @@
     "OneTimePaymentsV2": "0x2cb1c7d50371e277d7a36B171c0ACe9B157518EE",
     "UniswapV3Router": "0x5615CDAb10dc425a742d643d949a7F474C01abc4",
     "BuyGDFactory": "0x00e533B7d6255D05b7f15034B1c989c21F51b91C",
-    "BuyGDFactoryV2": "0x1F60C4C7037C6766924A43666B781ED1479587a2"
+    "BuyGDFactoryV2": "0x1F60C4C7037C6766924A43666B781ED1479587a2",
+    "MentoExchangeProvider": "0x02C5e6FfeC49Dca92af50A0718d2c4944DAaCb05",
+    "MentoExpansionController": "0xA354fE15A08318912D594E94DC7622C7D23Bb11A",
+    "CUSD": "0x2FFc031e855fE7C36669DC95CE00356D52195999",
+    "MentoReserve": "0x3f13b9FdB9ca8CDDa1c1E125296C8101B170C37C",
+    "MentoBroker": "0x43bC03995090E7B4E74cE70deF6bfA27D62049dC",
+    "CeloDistributionHelper": "0x4FE2400B80376a34e6a9011988d9D0D921EEf059"
   },
   "staging-celo": {
     "network": "staging-celo",
@@ -491,7 +495,13 @@
     "OneTimePaymentsV2": "0x963E7B4c970626Bb103c61fA16b002AFf6E6c2C7",
     "UniswapV3Router": "0x5615CDAb10dc425a742d643d949a7F474C01abc4",
     "BuyGDFactory": "0x00e533B7d6255D05b7f15034B1c989c21F51b91C",
-    "BuyGDFactoryV2": "0x1F60C4C7037C6766924A43666B781ED1479587a2"
+    "BuyGDFactoryV2": "0x1F60C4C7037C6766924A43666B781ED1479587a2",
+    "MentoExchangeProvider": "0x02C5e6FfeC49Dca92af50A0718d2c4944DAaCb05",
+    "MentoExpansionController": "0xA354fE15A08318912D594E94DC7622C7D23Bb11A",
+    "CUSD": "0x2FFc031e855fE7C36669DC95CE00356D52195999",
+    "MentoReserve": "0x3f13b9FdB9ca8CDDa1c1E125296C8101B170C37C",
+    "MentoBroker": "0x43bC03995090E7B4E74cE70deF6bfA27D62049dC",
+    "CeloDistributionHelper": "0x4FE2400B80376a34e6a9011988d9D0D921EEf059"
   },
   "development-goerli": {
     "ProxyFactory": "0x65D8eACBCd9618b8780C4b444081915a5D54D611",
@@ -541,7 +551,62 @@
     "GoodDollarMintBurnWrapper": "0x69d9c8d240E282a4ec0058CF0AC4E9D8ac7a11ac",
     "GoodDollarStaking": "0xC9a3DdadC753e6a7675Aa125991096623d06c437"
   },
-  "development-mainnet": {
-    "networkId": 1
+  "development-mainnet": { "networkId": 1 },
+  "test": {
+    "ProxyFactory": "0xCd7c00Ac6dc51e8dCc773971Ac9221cC582F3b1b",
+    "NameService": "0xB3d91a2650C8dB4456e96e06Bb147799338c5739",
+    "GReputation": "0xD759c30ADea571d35159302515b81473f7F0B5b3",
+    "CompoundVotingMachine": "0x07d17EcCcEE4568DE2b40cD1CB99b9984DF4519c",
+    "ClaimersDistribution": "0xA6D3dC26fC2f258d06B54EB6634077835C3C73Aa",
+    "GovernanceStaking": "0xA9e6Bfa2BF53dE88FEb19761D9b2eE2e821bF1Bf",
+    "UBIScheme": "0x16d5EF010758a483f94F3A001DeFf0ac9efF6352",
+    "ProtocolUpgradeFuse": "0x286B8DecD5ED79c962b2d8F4346CD97FF0E2C352",
+    "network": "test",
+    "networkId": 4447,
+    "HomeBridge": "0xcE0066b1008237625dDDBE4a751827de037E53D2",
+    "OneTimePayments": "0xcC4c41415fc68B2fBf70102742A83cDe435e0Ca7",
+    "AdminWallet": "0xAe120F0df055428E45b264E7794A18c54a2a3fAF",
+    "Identity": "0x87006e75a5B6bE9D1bbF61AC8Cd84f05D9140589",
+    "GoodDollar": "0x609a4341d11C29F8F5cDeF00931AdB96f76EF017",
+    "Controller": "0xd1f8C3b3C9C63a7a7f0dCFd20ae9053A04182db1",
+    "Avatar": "0xcafCfdF4517F504a473469F3723e674413EE9bce",
+    "FirstClaimPool": "0x0aec7c174554AF8aEc3680BB58431F6618311510",
+    "BancorFormula": "0x7B4f352Cd40114f12e82fC675b5BA8C7582FC513",
+    "DAI": "0xD6b040736e948621c5b6E0a494473c47a6113eA8",
+    "cDAI": "0xAdE429ba898c34722e722415D722A70a297cE3a2",
+    "COMP": "0x139e1D41943ee15dDe4DF876f9d0E7F85e26660A"
+  },
+  "test-mainnet": {
+    "ProxyFactory": "0x70E5370b8981Abc6e14C91F4AcE823954EFC8eA3",
+    "NameService": "0x50f2b544FD7af66D8a9dCF9a8d28F60c4955468D",
+    "GReputation": "0x08BC83e7cfe7DfEacAbCdC2432Cc6281ee678B46",
+    "CompoundVotingMachine": "0x6B2A2eA3b4965B2069f7112DFc5e766b10f52Bf4",
+    "GoodMarketMaker": "0x6E16fE6B78F307d78142A65CdFc3fB1c01Ed5416",
+    "GoodReserveCDai": "0xEF4c7EAD8C1aE06E76BD792785c9bed03811173B",
+    "ExchangeHelper": "0x39acC72200A9a847c2B6EFe514Db9eeE429e4B29",
+    "GoodFundManager": "0x68CC3Dc71a215bbbbc5fFeD38bc92F12d56eA835",
+    "StakersDistribution": "0x3957892fB94Ef52aB441e2BA77777F9dC8F7C501",
+    "ProtocolUpgrade": "0xa62835D1A6bf5f521C4e2746E1F51c923b8f3483",
+    "UniswapV2SwapHelper": "0x8E45C0936fa1a65bDaD3222bEFeC6a03C83372cE",
+    "CompoundStakingFactory": "0xBEe6FFc1E8627F51CcDF0b4399a1e1abc5165f15",
+    "AaveStakingFactory": "0xC32609C91d6B6b51D48f2611308FEf121B02041f",
+    "StakingContracts": [
+      ["0x14aA87DEed1d13012F1C9C93ef660D88a594D289", 13888],
+      ["0x47c7D4b2A310E651f846d7E8717F44414F59a7Da", "6944"]
+    ],
+    "DonationsStaking": "0x0Af313Cb7928CC29Db382575b0d96969C00414EC",
+    "network": "test-mainnet",
+    "networkId": 4447,
+    "ForeignBridge": "0x02b0B4EFd909240FCB2Eb5FAe060dC60D112E3a4",
+    "Contribution": "0x40a42Baf86Fc821f972Ad2aC878729063CeEF403",
+    "Identity": "0x6C2d83262fF84cBaDb3e416D527403135D757892",
+    "GoodDollar": "0xDda88b7dF7C04D319c41B53305Cd443B1f975e29",
+    "Controller": "0xF2AdAad89d56D49C697B9907C7D66ef27d96f859",
+    "Avatar": "0xd1891dD9DFF0784baa1dEb361dDFCAa5aE49cc6F",
+    "FirstClaimPool": "0xA56F946D6398Dd7d9D4D9B337Cf9E0F68982ca5B",
+    "BancorFormula": "0x01c1DeF3b91672704716159C9041Aeca392DdFfb",
+    "DAI": "0xfcDB4564c18A9134002b9771816092C9693622e3",
+    "cDAI": "0x32EEce76C2C2e8758584A83Ee2F522D4788feA0f",
+    "COMP": "0x927b167526bAbB9be047421db732C663a0b77B11"
   }
 }

package/scripts/analytics/activeStakers.ts

@@ -0,0 +1,25 @@
+import { uniq } from "lodash";
+import fs from "fs";
+import { network, ethers } from "hardhat";
+import { Contract, Provider, setMulticallAddress } from "ethers-multicall";
+import release from "../../releases/deployment.json"
+import { SimpleStakingV2 } from "../../types";
+
+setMulticallAddress(122, "0x3CE6158b7278Bf6792e014FA7B4f3c6c46fe9410");
+
+setMulticallAddress(42220, "0x188C1bf697B66474dC3eaa119Ae691a8352537e3");
+
+const main = async () => {
+
+    const c1 = await ethers.getContractAt("SimpleStakingV2", release["production-mainnet"].StakingContractsV3[0][0]) as SimpleStakingV2
+    const c2 = await ethers.getContractAt("SimpleStakingV2", release["production-mainnet"].StakingContractsV3[1][0]) as SimpleStakingV2
+    const f = c1.filters.Staked()
+    const events = await c1.queryFilter(f, 14338550)
+    const events2 = await c2.queryFilter(f, 14338550)
+    const stakers = uniq(events.concat(events2).map(_ => _.args[0]))
+    console.log(stakers)
+    const res = (await Promise.all(stakers.map(async s => [s, await c1.balanceOf(s), await c2.balanceOf(s)]))).filter(_ => _[1].gt(0) || _[2].gt(0))
+    console.log(events.length)
+    console.log(res)
+}
+main()

package/scripts/analytics/activeUsersCount.ts

@@ -1,5 +1,7 @@
-import { range, chunk, uniq } from "lodash";
-import { ethers as Ethers } from "hardhat";
+import { range, chunk, uniq, mapValues, groupBy } from "lodash";
+import { ethers, ethers as Ethers } from "hardhat";
+import fs from "fs";
+import { bulkGetLastAuth } from "../utils";
 
 const ONE_DAY = 24 * 60 * 60;
 const ONE_HOUR = 60 * 60;
@@ -19,28 +21,27 @@ const main = async () => {
   for (let day of daysAgo) {
     const query = `
       { 
-        walletStats(first:1000, where: { lastClaimed_lte: ${curDay},lastClaimed_gt: ${
-      curDay - ONE_DAY
-    } isActiveUser: true }) {
+        walletStats(first:1000, where: { lastClaimed_lte: ${curDay},lastClaimed_gt: ${curDay - ONE_DAY
+      } isActiveUser: true }) {
         id        
       }
     }
   `;
 
     console.log("fetching inactive users since:", { curDay, day }, JSON.stringify({ query }));
-    const {
-      data: { walletStats }
-    } = await fetch("https://api.thegraph.com/subgraphs/name/gooddollar/gooddollarfuse", {
+    const result = await fetch("https://api.thegraph.com/subgraphs/name/gooddollar/gooddollarfuse", {
       method: "post",
       body: JSON.stringify({ query }),
       headers: { "Content-Type": "application/json" }
     }).then(_ => _.json());
 
-    console.log("got inactive wallets:", walletStats.length);
-    if (walletStats) {
-      const accounts = walletStats.map(_ => _.id);
-      allActive.push(...accounts);
-    }
+
+    console.log("got inactive wallets:", result);
+    // if (walletStats) {
+    //   const accounts = walletStats.map(_ => _.id);
+    //   allActive.push(...accounts);
+    // }
+
     // for (let tofish of chunk(accounts, 50)) {
     //   const tx = await ubiScheme.fishMulti(tofish, { gasLimit: 2000000 });
     //   console.log("fishing tx:", tx, tofish);
@@ -54,32 +55,83 @@ const main = async () => {
   console.log("active claimers:", unique.length);
 };
 
+const countClaimersUsingExplorer = async () => {
+  let claimers = [] //JSON.parse(fs.readFileSync("claimers.json").toString())
+  const curBlock = await ethers.provider.getBlockNumber()
+  const DAYS = 1
+  let fromBlock = curBlock - 60 * 60 * 24 * DAYS / 5 //roughly DAYS of blocks
+  const querySize = 90// 15 min of blocks
+  const blockRanges = range(fromBlock, curBlock, querySize)
+  const chunks = chunk(blockRanges, 10)
+  for (let idx in chunks) {
+    const toFetch = chunks[idx]
+    const ps = toFetch.map(async fromBlock => {
+      let toBlock = fromBlock + querySize
+      toBlock = toBlock > curBlock ? curBlock : toBlock
+      const result = await fetch(`https://explorer.celo.org/mainnet/api?module=logs&action=getLogs&fromBlock=${fromBlock}&toBlock=${toBlock}&address=0x43d72ff17701b2da814620735c39c620ce0ea4a1&topic0=0x89ed24731df6b066e4c5186901fffdba18cd9a10f07494aff900bdee260d1304`).then(_ => _.json())
+      fromBlock = toBlock
+      const addrs = result.result.map(_ => ethers.utils.defaultAbiCoder.decode(["address"], _.topics[1])[0])
+      claimers.push(...addrs);
+      console.log("claimers:", addrs.length, "block range:", { fromBlock, toBlock }, addrs[0])
+    })
+    await Promise.all(ps)
+    console.log(`${idx} out of ${chunks.length}`)
+  }
+
+  claimers = uniq(claimers)
+  fs.writeFileSync("claimers.json", JSON.stringify(claimers))
+}
+
+const countLastWhitelisted = async () => {
+  const claimers = JSON.parse(fs.readFileSync("claimers.json").toString())
+  const DAY = 60 * 60 * 24
+  let total = 0
+  let howOld = []
+  console.log("unique claimers:", claimers.length)
+  for (let bulk of chunk(claimers, 1000)) {
+    const results = await bulkGetLastAuth(bulk)
+    const older = results.filter(_ => _.toNumber() < Date.now() / 1000 - DAY * 180).length
+    bulk.forEach((_, i) => howOld.push([_, Math.ceil((Date.now() / 1000 - DAY * 180 - results[i].toNumber()) / (30 * DAY)).toFixed(0)]))
+    console.log(older, "out of", results.length)
+    total += older
+  }
+
+  howOld = howOld.filter(_ => Number(_[1]) > 0)
+  console.log({ total })
+  howOld = mapValues(groupBy(howOld, _ => _[1]), _ => _.length)
+  console.log(howOld)
+}
+
 const countActive = async () => {
-  const twoWeeksAgo = parseInt((Date.now() / 1000).toFixed(0)); //
 
-  const hoursAgo: number[] = range(0, 24 * 14, 1);
-  let curDay = twoWeeksAgo;
+  const hoursAgo: number[] = range(0, 24 * 30, 1);
+  let curDay = parseInt((Date.now() / 1000).toFixed(0));
   const allActive = [];
   for (let hour of hoursAgo) {
     const query = `
       { 
-        walletStats(first:1000, where: { lastClaimed_lte: ${curDay},lastClaimed_gt: ${
-      curDay - ONE_HOUR
-    } isActiveUser: true }) {
+        walletStats(first:1000, where: { lastClaimed_lte: ${curDay},lastClaimed_gt: ${curDay - ONE_HOUR
+      } isActiveUser: true }) {
         id        
       }
     }
   `;
 
     console.log("fetching active users since:", { curDay, hour }, JSON.stringify({ query }));
+    const result =
+
+      await fetch("https://gateway-arbitrum.network.thegraph.com/api/3c409250a317ce7b0c6a7a8b9a409ef8/subgraphs/id/F7314rxGdcpKPC1nN5KCoFW84EGRoUyzseY2sAT9PEkw", {
+        // await fetch("https://gateway.thegraph.com/api/3c409250a317ce7b0c6a7a8b9a409ef8/subgraphs/id/5cAhhzm7LSqGiFibV1odbbgZWiRmZsYjYrmaoj87UxFd", {
+        method: "post",
+        body: JSON.stringify({ query }),
+        headers: { "Content-Type": "application/json", "origin": "https://wallet.gooddollar.org" }
+
+      }).then(_ => _.json());
+
+    console.log(result)
     const {
       data: { walletStats }
-    } = await fetch("https://api.thegraph.com/subgraphs/name/gooddollar/gooddollarfuse", {
-      method: "post",
-      body: JSON.stringify({ query }),
-      headers: { "Content-Type": "application/json" }
-    }).then(_ => _.json());
-
+    } = result
     console.log("got active wallets:", walletStats.length);
     if (walletStats) {
       const accounts = walletStats.map(_ => _.id);
@@ -99,4 +151,6 @@ const countActive = async () => {
 };
 
 //main();
-countActive();
+// countActive();
+// countClaimersUsingExplorer()
+countLastWhitelisted()