@gooddollar/goodprotocol 2.0.13 → 2.0.14-beta.0

package/dist/artifacts/contracts/token/superfluid/UUPSProxy.sol/UUPSProxy.json

@@ -25,8 +25,8 @@
             "type": "receive"
         }
     ],
-    "bytecode": "0x608060405234801561001057600080fd5b50610205806100206000396000f3fe6080604052600436106100225760003560e01c80634a0687ef1461003957610031565b366100315761002f610059565b005b61002f610059565b34801561004557600080fd5b5061002f61005436600461017f565b61006b565b610069610064610139565b610148565b565b6001600160a01b0381166100c05760405162461bcd60e51b81526020600482015260176024820152765555505350726f78793a207a65726f206164647265737360481b60448201526064015b60405180910390fd5b60006100ca61016c565b6001600160a01b0316146101205760405162461bcd60e51b815260206004820152601e60248201527f5555505350726f78793a20616c726561647920696e697469616c697a6564000060448201526064016100b7565b610136816000805160206101b083398151915255565b50565b600061014361016c565b905090565b3660008037600080366000845af43d6000803e808015610167573d6000f35b3d6000fd5b6000805160206101b08339815191525490565b60006020828403121561019157600080fd5b81356001600160a01b03811681146101a857600080fd5b939250505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca264697066735822122054303c95e3083467af14f8e45d0e4948671519cda9ee34d9041f82134179ec4464736f6c63430008100033",
-    "deployedBytecode": "0x6080604052600436106100225760003560e01c80634a0687ef1461003957610031565b366100315761002f610059565b005b61002f610059565b34801561004557600080fd5b5061002f61005436600461017f565b61006b565b610069610064610139565b610148565b565b6001600160a01b0381166100c05760405162461bcd60e51b81526020600482015260176024820152765555505350726f78793a207a65726f206164647265737360481b60448201526064015b60405180910390fd5b60006100ca61016c565b6001600160a01b0316146101205760405162461bcd60e51b815260206004820152601e60248201527f5555505350726f78793a20616c726561647920696e697469616c697a6564000060448201526064016100b7565b610136816000805160206101b083398151915255565b50565b600061014361016c565b905090565b3660008037600080366000845af43d6000803e808015610167573d6000f35b3d6000fd5b6000805160206101b08339815191525490565b60006020828403121561019157600080fd5b81356001600160a01b03811681146101a857600080fd5b939250505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca264697066735822122054303c95e3083467af14f8e45d0e4948671519cda9ee34d9041f82134179ec4464736f6c63430008100033",
+    "bytecode": "0x608060405234801561001057600080fd5b50610205806100206000396000f3fe6080604052600436106100225760003560e01c80634a0687ef1461003957610031565b366100315761002f610059565b005b61002f610059565b34801561004557600080fd5b5061002f61005436600461017f565b61006b565b610069610064610139565b610148565b565b6001600160a01b0381166100c05760405162461bcd60e51b81526020600482015260176024820152765555505350726f78793a207a65726f206164647265737360481b60448201526064015b60405180910390fd5b60006100ca61016c565b6001600160a01b0316146101205760405162461bcd60e51b815260206004820152601e60248201527f5555505350726f78793a20616c726561647920696e697469616c697a6564000060448201526064016100b7565b610136816000805160206101b083398151915255565b50565b600061014361016c565b905090565b3660008037600080366000845af43d6000803e808015610167573d6000f35b3d6000fd5b6000805160206101b08339815191525490565b60006020828403121561019157600080fd5b81356001600160a01b03811681146101a857600080fd5b939250505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca2646970667358221220b48e02e4256692ddd57978567346294d57005610331d3e09527ffe184951249d64736f6c63430008130033",
+    "deployedBytecode": "0x6080604052600436106100225760003560e01c80634a0687ef1461003957610031565b366100315761002f610059565b005b61002f610059565b34801561004557600080fd5b5061002f61005436600461017f565b61006b565b610069610064610139565b610148565b565b6001600160a01b0381166100c05760405162461bcd60e51b81526020600482015260176024820152765555505350726f78793a207a65726f206164647265737360481b60448201526064015b60405180910390fd5b60006100ca61016c565b6001600160a01b0316146101205760405162461bcd60e51b815260206004820152601e60248201527f5555505350726f78793a20616c726561647920696e697469616c697a6564000060448201526064016100b7565b610136816000805160206101b083398151915255565b50565b600061014361016c565b905090565b3660008037600080366000845af43d6000803e808015610167573d6000f35b3d6000fd5b6000805160206101b08339815191525490565b60006020828403121561019157600080fd5b81356001600160a01b03811681146101a857600080fd5b939250505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbca2646970667358221220b48e02e4256692ddd57978567346294d57005610331d3e09527ffe184951249d64736f6c63430008130033",
     "linkReferences": {},
     "deployedLinkReferences": {}
 }

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

@@ -75,8 +75,8 @@
             "type": "receive"
         }
     ],
-    "bytecode": "0x608060405234801561001057600080fd5b506105a6806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e61bf4b283e7c7127b63eb541e464310619a8e941077fd50b9791d417ed8557b64736f6c63430008100033",
-    "deployedBytecode": "0x6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e61bf4b283e7c7127b63eb541e464310619a8e941077fd50b9791d417ed8557b64736f6c63430008100033",
+    "bytecode": "0x608060405234801561001057600080fd5b506105a6806100206000396000f3fe6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122018fac2684b810c24d0dea31441e713f82c78108031e90f41790df0827a4bb36264736f6c63430008130033",
+    "deployedBytecode": "0x6080604052600436106100225760003560e01c8063d1f578941461003957610031565b366100315761002f61004c565b005b61002f61004c565b61002f6100473660046103ef565b61005e565b61005c61005761013d565b61014c565b565b6000610068610170565b6001600160a01b0316146100b15760405162461bcd60e51b815260206004820152600b60248201526a1a5b9a5d1a585b1a5e995960aa1b60448201526064015b60405180910390fd5b6100dc60017f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbd61047f565b60008051602061052a833981519152146100f8576100f86104a0565b6101388383838080601f0160208091040260200160405190810160405280939291908181526020018383808284376000920182905250925061018c915050565b505050565b6000610147610170565b905090565b3660008037600080366000845af43d6000803e80801561016b573d6000f35b3d6000fd5b60008051602061052a833981519152546001600160a01b031690565b610195836101b7565b6000825111806101a25750805b15610138576101b183836101f7565b50505050565b6101c081610225565b6040516001600160a01b038216907fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b90600090a250565b606061021c838360405180606001604052806027815260200161054a602791396102bf565b90505b92915050565b61022e81610337565b6102905760405162461bcd60e51b815260206004820152602d60248201527f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60448201526c1bdd08184818dbdb9d1c9858dd609a1b60648201526084016100a8565b60008051602061052a83398151915280546001600160a01b0319166001600160a01b0392909216919091179055565b6060600080856001600160a01b0316856040516102dc91906104da565b600060405180830381855af49150503d8060008114610317576040519150601f19603f3d011682016040523d82523d6000602084013e61031c565b606091505b509150915061032d86838387610346565b9695505050505050565b6001600160a01b03163b151590565b606083156103b35782516000036103ac5761036085610337565b6103ac5760405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e747261637400000060448201526064016100a8565b50816103bd565b6103bd83836103c5565b949350505050565b8151156103d55781518083602001fd5b8060405162461bcd60e51b81526004016100a891906104f6565b60008060006040848603121561040457600080fd5b83356001600160a01b038116811461041b57600080fd5b925060208401356001600160401b038082111561043757600080fd5b818601915086601f83011261044b57600080fd5b81358181111561045a57600080fd5b87602082850101111561046c57600080fd5b6020830194508093505050509250925092565b8181038181111561021f57634e487b7160e01b600052601160045260246000fd5b634e487b7160e01b600052600160045260246000fd5b60005b838110156104d15781810151838201526020016104b9565b50506000910152565b600082516104ec8184602087016104b6565b9190910192915050565b60208152600082518060208401526105158160408501602087016104b6565b601f01601f1916919091016040019291505056fe360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a264697066735822122018fac2684b810c24d0dea31441e713f82c78108031e90f41790df0827a4bb36264736f6c63430008130033",
     "linkReferences": {},
     "deployedLinkReferences": {}
 }

package/hardhat.config.ts

@@ -17,15 +17,21 @@ import { airdrop } from "./scripts/governance/airdropCalculationSorted";
 import { airdrop as repAirdropRecover } from "./scripts/governance/airdropCalculationRecover";
 import { airdrop as goodCheckpoint } from "./scripts/governance/goodCheckpointSorted";
 
-import { airdrop as gdxAirdrop, airdropRecover as gdxAirdropRecover } from "./scripts/gdx/gdxAirdropCalculation";
+import {
+  airdrop as gdxAirdrop,
+  airdropRecover as gdxAirdropRecover
+} from "./scripts/gdx/gdxAirdropCalculation";
 import { sumStakersGdRewards } from "./scripts/staking/stakersGdRewardsCalculation";
 import { verify } from "./scripts/verify";
 import { ethers } from "ethers";
 import { fstat, readFileSync, writeFileSync } from "fs";
 config();
 
-const mnemonic = process.env.MNEMONIC || "test test test test test test test test test test test junk";
-const deployerPrivateKey = process.env.PRIVATE_KEY || ethers.utils.hexZeroPad("0x11", 32);
+const mnemonic =
+  process.env.MNEMONIC ||
+  "test test test test test test test test test test test junk";
+const deployerPrivateKey =
+  process.env.PRIVATE_KEY || ethers.utils.hexZeroPad("0x11", 32);
 const infura_api = process.env.INFURA_API;
 const alchemy_key = process.env.ALCHEMY_KEY;
 const etherscan_key = process.env.ETHERSCAN_KEY;
@@ -46,7 +52,7 @@ const goerli = {
 // console.log({ mnemonic: sha3(mnemonic) });
 const hhconfig: HardhatUserConfig = {
   solidity: {
-    version: "0.8.16",
+    version: "0.8.19",
     settings: {
       optimizer: {
         enabled: true,
@@ -90,7 +96,9 @@ const hhconfig: HardhatUserConfig = {
 
   networks: {
     hardhat: {
-      chainId: process.env.FORK_CHAIN_ID ? Number(process.env.FORK_CHAIN_ID) : 4447,
+      chainId: process.env.FORK_CHAIN_ID
+        ? Number(process.env.FORK_CHAIN_ID)
+        : 4447,
       allowUnlimitedContractSize: true,
       accounts: {
         accountsBalance: "10000000000000000000000000"
@@ -102,7 +110,7 @@ const hhconfig: HardhatUserConfig = {
     },
     fork: {
       chainId: 1,
-      url: "https://rpc.vnet.tenderly.co/devnet/reserve-ujpgrade/9f79f839-996c-495a-b470-c0237eede293"
+      url: "https://rpc.vnet.tenderly.co/devnet/reserve-ujpgrade/b4c1e3d8-c03e-49a5-b3ef-eac8499c9f0d"
     },
     test: {
       allowUnlimitedContractSize: true,
@@ -199,7 +207,7 @@ const hhconfig: HardhatUserConfig = {
     "production-mainnet": {
       accounts: [deployerPrivateKey],
       url: MAINNET_URL,
-      gas: 3000000,
+      // gas: 3000000,
       gasPrice: 15000000000,
       chainId: 1
     },
@@ -223,6 +231,12 @@ const hhconfig: HardhatUserConfig = {
       url: `https://alfajores-forno.celo-testnet.org`,
       gasPrice: 5000000000
     },
+    "alfajores-fork": {
+      accounts: { mnemonic },
+      chainId: 44787,
+      url: `http://127.0.0.1:8545`,
+      gasPrice: 5000000000
+    },
     "staging-celo": {
       accounts: { mnemonic },
       url: "https://forno.celo.org",
@@ -262,7 +276,10 @@ task("repAirdrop", "Calculates airdrop data and merkle tree")
     const actions = airdrop(hre.ethers, ethplorer_key, etherscan_key);
     switch (taskArgs.action) {
       case "calculate":
-        return actions.collectAirdropData(taskArgs.fusesnapshotblock, taskArgs.ethsnapshotblock);
+        return actions.collectAirdropData(
+          taskArgs.fusesnapshotblock,
+          taskArgs.ethsnapshotblock
+        );
       case "tree":
         return actions.buildMerkleTree();
       case "proof":
@@ -272,7 +289,10 @@ task("repAirdrop", "Calculates airdrop data and merkle tree")
     }
   });
 
-task("repAirdropRecover", "Calculates airdrop data and merkle tree after critical bug")
+task(
+  "repAirdropRecover",
+  "Calculates airdrop data and merkle tree after critical bug"
+)
   .addParam("action", "calculate/tree/proof")
   .addOptionalPositionalParam("address", "proof for address")
   .setAction(async (taskArgs, hre) => {
@@ -321,7 +341,10 @@ task("gdxAirdropRecover", "Calculates new airdrop data for recovery")
     }
   });
 
-task("goodCheckpoint", "Calculates good checkpoint data and merkle tree for GOOD sync")
+task(
+  "goodCheckpoint",
+  "Calculates good checkpoint data and merkle tree for GOOD sync"
+)
   .addParam("action", "calculate/tree/proof")
   .addOptionalPositionalParam("address", "proof for address")
   .setAction(async (taskArgs, hre) => {
@@ -338,12 +361,17 @@ task("goodCheckpoint", "Calculates good checkpoint data and merkle tree for GOOD
     }
   });
 
-task("verifyjson", "verify contracts on etherscan").setAction(async (taskArgs, hre) => {
-  return verify(hre);
-});
+task("verifyjson", "verify contracts on etherscan").setAction(
+  async (taskArgs, hre) => {
+    return verify(hre);
+  }
+);
 export default hhconfig;
 
-task("sumStakersGdRewards", "Sums the GoodDollar reward for each staker").setAction(async (taskArgs, hre) => {
+task(
+  "sumStakersGdRewards",
+  "Sums the GoodDollar reward for each staker"
+).setAction(async (taskArgs, hre) => {
   const actions = sumStakersGdRewards(hre.ethers);
   return actions.getStakersGdRewards();
 });
@@ -356,7 +384,10 @@ task("cleanflat", "Cleans multiple SPDX and Pragma from flattened file")
     });
 
     // Remove every line started with "// SPDX-License-Identifier:"
-    flattened = flattened.replace(/SPDX-License-Identifier:/gm, "License-Identifier:");
+    flattened = flattened.replace(
+      /SPDX-License-Identifier:/gm,
+      "License-Identifier:"
+    );
 
     flattened = `// SPDX-License-Identifier: MIXED\n\n${flattened}`;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gooddollar/goodprotocol",
-  "version": "2.0.13",
+  "version": "2.0.14-beta.0",
   "description": "GoodDollar Protocol",
   "engines": {
     "node": "18.x"
@@ -66,8 +66,8 @@
     "@jsier/retrier": "^1.2.4",
     "@openzeppelin/contracts": "^4.8.0",
     "@openzeppelin/contracts-upgradeable": "^4.8.0",
-    "@openzeppelin/upgrades-core": "1.18.0",
-    "@superfluid-finance/ethereum-contracts": "^1.4.3",
+    "@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",
@@ -87,12 +87,12 @@
     "@gnosis.pm/safe-core-sdk-types": "^1.7.0",
     "@gnosis.pm/safe-ethers-lib": "^1.7.0",
     "@gnosis.pm/safe-service-client": "^1.4.0",
+    "@gooddollar/bridge-contracts": "1.0.14-beta.7",
     "@mean-finance/uniswap-v3-oracle": "^1.0.3",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.8",
     "@nomiclabs/hardhat-ethers": "^2.2.1",
     "@nomiclabs/hardhat-etherscan": "^3.1.0",
     "@nomiclabs/hardhat-waffle": "^2.0.3",
-    "@openzeppelin/hardhat-upgrades": "^1.20.0",
     "@swc/core": "^1.2.196",
     "@swc/helpers": "^0.3.16",
     "@typechain/ethers-v5": "^8.0.2",
@@ -112,7 +112,7 @@
     "fs-extra": "9.0.0",
     "graphql": "^15.5.0",
     "graphql-request": "^3.4.0",
-    "hardhat": "^2.13.0",
+    "hardhat": "^2.17.3",
     "hardhat-contract-sizer": "^2.6.1",
     "hardhat-gas-reporter": "^1.0.8",
     "hardhat-storage-layout": "^0.1.7",
@@ -125,8 +125,8 @@
     "prompt": "^1.3.0",
     "regenerator-runtime": "^0.13.9",
     "solhint": "*",
-    "solidity-coverage": "^0.8.2",
-    "truffle": "^5.9.3",
+    "solidity-coverage": "^0.8.4",
+    "truffle": "^5.11.5",
     "truffle-hdwallet-provider": "*",
     "ts-generator": "^0.1.1",
     "ts-node": "^10.8.0",

package/releases/deploy-settings.json

@@ -295,6 +295,8 @@
     },
     "gasPrice": 5e9,
     "guardiansSafe": "0xC9D09BA972B4EB6Bb7347F2229FB6d50434fFCa6",
-    "superfluidHost": "0xA4Ff07cF81C02CFD356184879D953970cA957585"
+    "superfluidHost": "0xA4Ff07cF81C02CFD356184879D953970cA957585",
+    "superfluidInflowNFTLogic": "",
+    "superfluidOutflowNNFTLogic": ""
   }
 }

package/releases/deployment.json

@@ -408,7 +408,8 @@
         "MultichainRouter": "0x765277eebeca2e31912c9946eae1021199b39c61",
         "AnyGoodDollar": "0xd17652350cfd2a37ba2f947c910987a3b1a1c60d",
         "GuardiansSafe": "0xE0c5daa7CC6F88d29505f702a53bb5E67600e7Ec",
-        "DistributionHelper": "0xAcadA0C9795fdBb6921AE96c4D7Db2F8B8c52Fd0"
+        "DistributionHelper": "0xAcadA0C9795fdBb6921AE96c4D7Db2F8B8c52Fd0",
+        "MpbBridge": "0xa3247276DbCC76Dd7705273f766eB3E8a5ecF4a5"
     },
     "production": {
         "ProxyFactory": "0xDa85fceD9Bd193526b7667F2AD1fD4A0F900d3A7",
@@ -440,7 +441,8 @@
         "IdentityOld": "0xFa8d865A962ca8456dF331D78806152d3aC5B84F",
         "MultichainRouter": "0x735aBE48e8782948a37C7765ECb76b98CdE97B0F",
         "GoodDollarMintBurnWrapper": "0x031b2B7C7854dd8EE9C4A644D7e54aD17F56e3cB",
-        "CommunitySafe": "0x5Eb5f5fE13d1D5e6440DbD5913412299Bc5B5564"
+        "CommunitySafe": "0x5Eb5f5fE13d1D5e6440DbD5913412299Bc5B5564",
+        "MpbBridge": "0xa3247276DbCC76Dd7705273f766eB3E8a5ecF4a5"
     },
     "pre-production-celo": {
         "ProxyFactory": "0x99C22e78A579e2176311c736C4c9F0b0D5A47806",
@@ -481,6 +483,8 @@
         "OneTimePayments": "0xB27D247f5C2a61D2Cb6b6E67FEE51d839447e97d",
         "SwapHelper": "0xE45CaB86609a16dFaDec112FDd61E4EA80EdaA8D",
         "UniswapV3Router": "0x5615CDAb10dc425a742d643d949a7F474C01abc4",
+        "CommunitySafe": "0x437C699887779D0A95aD6349CFDE7DFA716C005D",
+        "MpbBridge": "0xa3247276DbCC76Dd7705273f766eB3E8a5ecF4a5",
         "StaticOracle": "0x00851A91a3c4E9a4c1B48df827Bacc1f884bdE28",
         "BuyGDFactory": "0x00e533B7d6255D05b7f15034B1c989c21F51b91C"
     },

package/scripts/analytics/faucetStats.ts

@@ -1,4 +1,4 @@
-import { range, sortBy, toPairs } from "lodash";
+import { get, range, sortBy, toPairs } from "lodash";
 import PromisePool from "async-promise-pool";
 import fs from "fs";
 import { ethers } from "hardhat";
@@ -38,38 +38,38 @@ const main = async (isCelo = true) => {
     faucetAddr
   );
   const endBlock = Number(await archive.getBlockNumber());
-  const daysBack = 90;
+  const daysBack = 5;
   const dayBlocks = 12 * 60 * 24;
   const startBlock = endBlock - dayBlocks * daysBack;
   const days = range(startBlock, endBlock, dayBlocks);
+  days.push(endBlock);
   console.log({ startBlock, endBlock });
   const dailyBalance = [];
   const dailyAdminBalance = [];
   for (let day of days) {
-    dailyBalance.push([
-      (await archive.getBalance("0x4F93Fa058b03953C851eFaA2e4FC5C34afDFAb84", day)).div(1e10).toNumber() / 1e8,
-      (await archive.getBalance("0x7119CD89D4792aF90277d84cDffa3F2Ab22a0022", day)).div(1e10).toNumber() / 1e8
-    ]);
+    dailyBalance.push(
+      await Promise.all([
+        archive.getBalance(faucetAddr, day).then(_ => _.div(1e10).toNumber() / 1e8),
+        archive.getBalance("0x7119CD89D4792aF90277d84cDffa3F2Ab22a0022", day).then(_ => _.div(1e10).toNumber() / 1e8)
+      ])
+    );
     console.log({ day });
   }
 
-  for (let day of days) {
-    dailyAdminBalance.push((await archive.getBalance(adminAddr, day)).div(1e10).toNumber() / 1e8);
-  }
   let curBlock = startBlock;
   const toppingsByAddress = {};
   const toppingsByAmount = {};
   const toppingsByRelayer = {};
+  const toppingsPerDay = {};
   let totalToppings = 0;
   let totalAmount = 0;
-  const dailyUsage = dailyBalance.map((v, i) => (i < dailyBalance.length - 1 ? v - dailyBalance[i + 1] : 0));
-  const dailyAdminUsage = dailyAdminBalance.map((v, i) =>
-    i < dailyAdminBalance.length - 1 ? v - dailyAdminBalance[i + 1] : 0
-  );
+  const dailyUsage = dailyBalance.map((v, i) => (i < dailyBalance.length - 1 ? v[0] - dailyBalance[i + 1][0] : 0));
+  const dailyAdminUsage = dailyBalance.map((v, i) => (i < dailyBalance.length - 1 ? v[1] - dailyBalance[i + 1][1] : 0));
+
   console.log({ dailyUsage, dailyAdminUsage });
   fs.writeFileSync("celospend.csv", arrayToCsv(dailyBalance));
   console.log(arrayToCsv(dailyBalance));
-  return;
+
   console.log({ startBlock, endBlock });
   while (curBlock <= endBlock) {
     const fromBlock = curBlock;
@@ -81,6 +81,8 @@ const main = async (isCelo = true) => {
         return [];
       });
       events.forEach(e => {
+        const day = (e.blockNumber / dayBlocks).toFixed(0);
+        toppingsPerDay[day] = get(toppingsPerDay, day, 0) + 1;
         totalToppings += 1;
         totalAmount += Number(e.args.amount);
         toppingsByAddress[e.args.whitelistedRoot] = (toppingsByAddress[e.args.whitelistedRoot] || 0) + 1;
@@ -108,6 +110,8 @@ const main = async (isCelo = true) => {
   const avgToppingAmount = totalAmount / totalToppings;
 
   console.log(topRelayers.slice(0, 50));
+
+  console.log(toppingsPerDay);
   fs.writeFileSync("topToppers.csv", arrayToCsv(topToppers));
   fs.writeFileSync("topAmounts.csv", arrayToCsv(topAmounts));
   fs.writeFileSync("topRelayers.csv", arrayToCsv(topRelayers));
@@ -119,4 +123,4 @@ const main = async (isCelo = true) => {
     avgToppingAmount
   });
 };
-main().catch(e => console.log(e));
+main(true).catch(e => console.log(e));