[V6] Add ERC20 incentive type, improve multiplier (#42)

OriginTrail · Dec 5, 2024 · a4b775f · a4b775f
2 parents 1b622ce + 5cbb2e9
commit a4b775f
Show file tree

Hide file tree

Showing 9 changed files with 162 additions and 57 deletions.
diff --git a/dkg/constants.py b/dkg/constants.py
@@ -21,11 +21,11 @@
 
 BLOCKCHAINS = {
     "development": {
-        "hardhat1:31337":  {
+        "hardhat1:31337": {
             "hub": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
             "rpc": "http://localhost:8545",
         },
-        "hardhat2:31337":  {
+        "hardhat2:31337": {
             "hub": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
             "rpc": "http://localhost:9545",
         },
@@ -43,7 +43,7 @@
         "base:84532": {
             "hub": "0x6C861Cb69300C34DfeF674F7C00E734e840C29C0",
             "rpc": "https://sepolia.base.org",
-        }
+        },
     },
     "testnet": {
         "otp:20430": {
@@ -58,7 +58,7 @@
         "base:84532": {
             "hub": "0x144eDa5cbf8926327cb2cceef168A121F0E4A299",
             "rpc": "https://sepolia.base.org",
-        }
+        },
     },
     "mainnet": {
         "otp:2043": {
@@ -88,11 +88,7 @@
 
 DEFAULT_HASH_FUNCTION_ID = 1
 DEFAULT_PROXIMITY_SCORE_FUNCTIONS_PAIR_IDS = {
-    "development": {
-        "hardhat1:31337": 2,
-        "hardhat2:31337": 2,
-        "otp:2043": 2
-    },
+    "development": {"hardhat1:31337": 2, "hardhat2:31337": 2, "otp:2043": 2},
     "devnet": {
         "otp:2160": 2,
         "gnosis:10200": 2,
@@ -112,3 +108,6 @@
 
 PRIVATE_HISTORICAL_REPOSITORY = "privateHistory"
 PRIVATE_CURRENT_REPOSITORY = "privateCurrent"
+
+NEUROWEB_BLOCKCHAIN_PREFIX = "otp"
+INCENTIVE_POOL_NAME = "ParanetNeurowebIncentivesPool"
diff --git a/dkg/data/interfaces/ParanetIncentivesPoolFactory.json b/dkg/data/interfaces/ParanetIncentivesPoolFactory.json
@@ -75,6 +75,11 @@
   },
   {
     "inputs": [
+      {
+        "internalType": "bool",
+        "name": "isNativeReward",
+        "type": "bool"
+      },
       {
         "internalType": "address",
         "name": "paranetKAStorageContract",

diff --git a/dkg/data/interfaces/ParanetNeurowebIncentivesPool.json b/dkg/data/interfaces/ParanetNeurowebIncentivesPool.json
@@ -6,6 +6,11 @@
         "name": "hubAddress",
         "type": "address"
       },
+      {
+        "internalType": "address",
+        "name": "rewardTokenAddress",
+        "type": "address"
+      },
       {
         "internalType": "address",
         "name": "paranetsRegistryAddress",
@@ -81,19 +86,19 @@
     "anonymous": false,
     "inputs": [
       {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "oldMultiplier",
-        "type": "uint256"
+        "indexed": true,
+        "internalType": "address",
+        "name": "sender",
+        "type": "address"
       },
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "newMultiplier",
+        "name": "amount",
         "type": "uint256"
       }
     ],
-    "name": "NeuroEmissionMultiplierUpdateFinalized",
+    "name": "NativeNeuroRewardDeposit",
     "type": "event"
   },
   {
@@ -110,34 +115,34 @@
         "internalType": "uint256",
         "name": "newMultiplier",
         "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "timestamp",
-        "type": "uint256"
       }
     ],
-    "name": "NeuroEmissionMultiplierUpdateInitiated",
+    "name": "NeuroEmissionMultiplierUpdateFinalized",
     "type": "event"
   },
   {
     "anonymous": false,
     "inputs": [
       {
-        "indexed": true,
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "oldMultiplier",
+        "type": "uint256"
       },
       {
         "indexed": false,
         "internalType": "uint256",
-        "name": "amount",
+        "name": "newMultiplier",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "timestamp",
         "type": "uint256"
       }
     ],
-    "name": "NeuroRewardDeposit",
+    "name": "NeuroEmissionMultiplierUpdateInitiated",
     "type": "event"
   },
   {
@@ -213,7 +218,7 @@
           }
         ],
         "internalType": "struct ParanetStructs.ParanetIncentivizationProposalVoterInput[]",
-        "name": "voters_",
+        "name": "newVoters",
         "type": "tuple[]"
       }
     ],
@@ -715,6 +720,19 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "isNativeNeuro",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [
       {
@@ -924,6 +942,19 @@
     "stateMutability": "nonpayable",
     "type": "function"
   },
+  {
+    "inputs": [],
+    "name": "token",
+    "outputs": [
+      {
+        "internalType": "contract IERC20",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "inputs": [],
     "name": "totalMinersClaimedNeuro",

diff --git a/dkg/dataclasses.py b/dkg/dataclasses.py
@@ -55,8 +55,9 @@ class KnowledgeAssetContentVisibility(AutoStrEnumUpperCase):
     PRIVATE = auto()
 
 
-class ParanetIncentivizationType(AutoStrEnumCapitalize):
-    NEUROWEB = auto()
+class ParanetIncentivizationType(Enum):
+    NEUROWEB = "Neuroweb"
+    NEUROWEB_ERC20 = "NeurowebERC20"
 
 
 @dataclass