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

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

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

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

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

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

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

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/564adfe0be8e4b6f182f3b4f12cfe6bb.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/564adfe0be8e4b6f182f3b4f12cfe6bb.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/564adfe0be8e4b6f182f3b4f12cfe6bb.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/564adfe0be8e4b6f182f3b4f12cfe6bb.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/564adfe0be8e4b6f182f3b4f12cfe6bb.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/564adfe0be8e4b6f182f3b4f12cfe6bb.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/564adfe0be8e4b6f182f3b4f12cfe6bb.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/564adfe0be8e4b6f182f3b4f12cfe6bb.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/564adfe0be8e4b6f182f3b4f12cfe6bb.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/564adfe0be8e4b6f182f3b4f12cfe6bb.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/564adfe0be8e4b6f182f3b4f12cfe6bb.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/564adfe0be8e4b6f182f3b4f12cfe6bb.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/564adfe0be8e4b6f182f3b4f12cfe6bb.json"
+  "buildInfo": "../../../build-info/1ad1a462c8d13ce3d33f295d737fa740.json"
 }

package/contracts/utils/BulkWhitelist.sol

@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity >=0.8.0;
+import "../Interfaces.sol";
+import "../utils/NameService.sol";
+import "./AdminWallet.sol";
+
+/* @title Admin wallet contract allowing whitelisting and topping up of
+ * addresses
+ */
+contract BulkWhitelist {
+	AdminWallet adminWallet;
+
+	constructor(AdminWallet _adminWallet) {
+		adminWallet = _adminWallet;
+	}
+
+	modifier onlyAdmin() {
+		require(adminWallet.isAdmin(msg.sender), "not admin");
+		_;
+	}
+
+	receive() external payable {}
+
+	function whitelist(
+		address[] memory _user,
+		string[] memory _did,
+		uint256[] memory orgChain,
+		uint256[] memory dateAuthenticated
+	) external onlyAdmin {
+		for (uint i = 0; i < _user.length; i++) {
+			adminWallet.whitelist(
+				_user[i],
+				_did[i],
+				orgChain[i],
+				dateAuthenticated[i]
+			);
+		}
+		uint256 toTop = address(this).balance;
+		payable(address(msg.sender)).transfer(toTop);
+	}
+
+	function removeWhitelisted(address[] memory _user) external onlyAdmin {
+		for (uint i = 0; i < _user.length; i++) {
+			adminWallet.removeWhitelist(_user[i]);
+		}
+
+		uint256 toTop = address(this).balance;
+		payable(address(msg.sender)).transfer(toTop);
+	}
+}

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.7",
+  "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",