From 6fe6fcd216c7b4664591ba519486a101a5067753 Mon Sep 17 00:00:00 2001 From: Volod <141863857+volod-vana@users.noreply.github.com> Date: Sat, 30 Nov 2024 10:17:43 -0500 Subject: [PATCH] Contract updates (#48) --- pyproject.toml | 2 +- vana/__init__.py | 2 +- vana/contracts/DataRegistry.json | 338 +++++++++++++++++++++++------- vana/contracts/TeePool.json | 345 +++++++++++++++++++++++-------- vana/contracts/__init__.py | 8 +- 5 files changed, 532 insertions(+), 163 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 56fd468..e373396 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "vana" -version = "0.30.0" +version = "0.31.0" description = "" authors = ["Tim Nunamaker ", "Volodymyr Isai ", "Kahtaf Alam "] readme = "README.md" diff --git a/vana/__init__.py b/vana/__init__.py index de46ca4..ded3e3e 100644 --- a/vana/__init__.py +++ b/vana/__init__.py @@ -15,7 +15,7 @@ # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -__version__ = "0.30.0" +__version__ = "0.31.0" import rich diff --git a/vana/contracts/DataRegistry.json b/vana/contracts/DataRegistry.json index 093a00d..99c685e 100644 --- a/vana/contracts/DataRegistry.json +++ b/vana/contracts/DataRegistry.json @@ -4,6 +4,27 @@ "stateMutability": "nonpayable", "type": "constructor" }, + { + "inputs": [], + "name": "AccessControlBadConfirmation", + "type": "error" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "neededRole", + "type": "bytes32" + } + ], + "name": "AccessControlUnauthorizedAccount", + "type": "error" + }, { "inputs": [ { @@ -61,28 +82,6 @@ "name": "NotInitializing", "type": "error" }, - { - "inputs": [ - { - "internalType": "address", - "name": "owner", - "type": "address" - } - ], - "name": "OwnableInvalidOwner", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "OwnableUnauthorizedAccount", - "type": "error" - }, { "inputs": [], "name": "UUPSUnauthorizedCallContext", @@ -141,19 +140,32 @@ "anonymous": false, "inputs": [ { - "indexed": true, + "indexed": false, "internalType": "address", - "name": "previousOwner", + "name": "account", "type": "address" + } + ], + "name": "Paused", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "uint256", + "name": "fileId", + "type": "uint256" }, { "indexed": true, "internalType": "address", - "name": "newOwner", + "name": "account", "type": "address" } ], - "name": "OwnershipTransferStarted", + "name": "PermissionGranted", "type": "event" }, { @@ -161,31 +173,43 @@ "inputs": [ { "indexed": true, - "internalType": "address", - "name": "previousOwner", - "type": "address" + "internalType": "uint256", + "name": "fileId", + "type": "uint256" }, { "indexed": true, - "internalType": "address", - "name": "newOwner", - "type": "address" + "internalType": "uint256", + "name": "proofIndex", + "type": "uint256" } ], - "name": "OwnershipTransferred", + "name": "ProofAdded", "type": "event" }, { "anonymous": false, "inputs": [ { - "indexed": false, - "internalType": "address", - "name": "account", - "type": "address" + "indexed": true, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "bytes32", + "name": "previousAdminRole", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "bytes32", + "name": "newAdminRole", + "type": "bytes32" } ], - "name": "Paused", + "name": "RoleAdminChanged", "type": "event" }, { @@ -193,18 +217,24 @@ "inputs": [ { "indexed": true, - "internalType": "uint256", - "name": "fileId", - "type": "uint256" + "internalType": "bytes32", + "name": "role", + "type": "bytes32" }, { "indexed": true, "internalType": "address", "name": "account", "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "sender", + "type": "address" } ], - "name": "PermissionGranted", + "name": "RoleGranted", "type": "event" }, { @@ -212,18 +242,24 @@ "inputs": [ { "indexed": true, - "internalType": "uint256", - "name": "fileId", - "type": "uint256" + "internalType": "bytes32", + "name": "role", + "type": "bytes32" }, { "indexed": true, - "internalType": "uint256", - "name": "proofIndex", - "type": "uint256" + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "sender", + "type": "address" } ], - "name": "ProofAdded", + "name": "RoleRevoked", "type": "event" }, { @@ -254,12 +290,12 @@ }, { "inputs": [], - "name": "UPGRADE_INTERFACE_VERSION", + "name": "DEFAULT_ADMIN_ROLE", "outputs": [ { - "internalType": "string", + "internalType": "bytes32", "name": "", - "type": "string" + "type": "bytes32" } ], "stateMutability": "view", @@ -267,9 +303,28 @@ }, { "inputs": [], - "name": "acceptOwnership", - "outputs": [], - "stateMutability": "nonpayable", + "name": "MAINTAINER_ROLE", + "outputs": [ + { + "internalType": "bytes32", + "name": "", + "type": "bytes32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "UPGRADE_INTERFACE_VERSION", + "outputs": [ + { + "internalType": "string", + "name": "", + "type": "string" + } + ], + "stateMutability": "view", "type": "function" }, { @@ -555,40 +610,92 @@ }, { "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "getRoleAdmin", + "outputs": [ + { + "internalType": "bytes32", + "name": "", + "type": "bytes32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, { "internalType": "address", - "name": "ownerAddress", + "name": "account", "type": "address" } ], - "name": "initialize", + "name": "grantRole", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { - "inputs": [], - "name": "owner", - "outputs": [ + "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, { "internalType": "address", - "name": "", + "name": "account", "type": "address" } ], + "name": "hasRole", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], "stateMutability": "view", "type": "function" }, { - "inputs": [], - "name": "pause", + "inputs": [ + { + "internalType": "address", + "name": "trustedForwarderAddress", + "type": "address" + }, + { + "internalType": "address", + "name": "ownerAddress", + "type": "address" + } + ], + "name": "initialize", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { - "inputs": [], - "name": "paused", + "inputs": [ + { + "internalType": "address", + "name": "forwarder", + "type": "address" + } + ], + "name": "isTrustedForwarder", "outputs": [ { "internalType": "bool", @@ -599,14 +706,40 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [ + { + "internalType": "bytes[]", + "name": "data", + "type": "bytes[]" + } + ], + "name": "multicall", + "outputs": [ + { + "internalType": "bytes[]", + "name": "results", + "type": "bytes[]" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "pause", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [], - "name": "pendingOwner", + "name": "paused", "outputs": [ { - "internalType": "address", + "internalType": "bool", "name": "", - "type": "address" + "type": "bool" } ], "stateMutability": "view", @@ -626,25 +759,73 @@ "type": "function" }, { - "inputs": [], - "name": "renounceOwnership", + "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "internalType": "address", + "name": "callerConfirmation", + "type": "address" + } + ], + "name": "renounceRole", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, { "internalType": "address", - "name": "newOwner", + "name": "account", "type": "address" } ], - "name": "transferOwnership", + "name": "revokeRole", "outputs": [], "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "bytes4", + "name": "interfaceId", + "type": "bytes4" + } + ], + "name": "supportsInterface", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "trustedForwarder", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], "name": "unpause", @@ -652,6 +833,19 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "address", + "name": "trustedForwarderAddress", + "type": "address" + } + ], + "name": "updateTrustedForwarder", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { diff --git a/vana/contracts/TeePool.json b/vana/contracts/TeePool.json index da0e989..bc0e5f2 100644 --- a/vana/contracts/TeePool.json +++ b/vana/contracts/TeePool.json @@ -4,6 +4,27 @@ "stateMutability": "nonpayable", "type": "constructor" }, + { + "inputs": [], + "name": "AccessControlBadConfirmation", + "type": "error" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "account", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "neededRole", + "type": "bytes32" + } + ], + "name": "AccessControlUnauthorizedAccount", + "type": "error" + }, { "inputs": [ { @@ -96,28 +117,6 @@ "name": "NothingToClaim", "type": "error" }, - { - "inputs": [ - { - "internalType": "address", - "name": "owner", - "type": "address" - } - ], - "name": "OwnableInvalidOwner", - "type": "error" - }, - { - "inputs": [ - { - "internalType": "address", - "name": "account", - "type": "address" - } - ], - "name": "OwnableUnauthorizedAccount", - "type": "error" - }, { "inputs": [], "name": "ReentrancyGuardReentrantCall", @@ -234,19 +233,38 @@ "anonymous": false, "inputs": [ { - "indexed": true, + "indexed": false, "internalType": "address", - "name": "previousOwner", + "name": "account", "type": "address" - }, + } + ], + "name": "Paused", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ { "indexed": true, "internalType": "address", - "name": "newOwner", + "name": "attestator", "type": "address" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "jobId", + "type": "uint256" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "fileId", + "type": "uint256" } ], - "name": "OwnershipTransferStarted", + "name": "ProofAdded", "type": "event" }, { @@ -254,31 +272,49 @@ "inputs": [ { "indexed": true, - "internalType": "address", - "name": "previousOwner", - "type": "address" + "internalType": "bytes32", + "name": "role", + "type": "bytes32" }, { "indexed": true, - "internalType": "address", - "name": "newOwner", - "type": "address" + "internalType": "bytes32", + "name": "previousAdminRole", + "type": "bytes32" + }, + { + "indexed": true, + "internalType": "bytes32", + "name": "newAdminRole", + "type": "bytes32" } ], - "name": "OwnershipTransferred", + "name": "RoleAdminChanged", "type": "event" }, { "anonymous": false, "inputs": [ { - "indexed": false, + "indexed": true, + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "indexed": true, "internalType": "address", "name": "account", "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "sender", + "type": "address" } ], - "name": "Paused", + "name": "RoleGranted", "type": "event" }, { @@ -286,24 +322,24 @@ "inputs": [ { "indexed": true, - "internalType": "address", - "name": "attestator", - "type": "address" + "internalType": "bytes32", + "name": "role", + "type": "bytes32" }, { "indexed": true, - "internalType": "uint256", - "name": "jobId", - "type": "uint256" + "internalType": "address", + "name": "account", + "type": "address" }, { "indexed": true, - "internalType": "uint256", - "name": "fileId", - "type": "uint256" + "internalType": "address", + "name": "sender", + "type": "address" } ], - "name": "ProofAdded", + "name": "RoleRevoked", "type": "event" }, { @@ -360,12 +396,12 @@ }, { "inputs": [], - "name": "UPGRADE_INTERFACE_VERSION", + "name": "DEFAULT_ADMIN_ROLE", "outputs": [ { - "internalType": "string", + "internalType": "bytes32", "name": "", - "type": "string" + "type": "bytes32" } ], "stateMutability": "view", @@ -373,9 +409,28 @@ }, { "inputs": [], - "name": "acceptOwnership", - "outputs": [], - "stateMutability": "nonpayable", + "name": "MAINTAINER_ROLE", + "outputs": [ + { + "internalType": "bytes32", + "name": "", + "type": "bytes32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "UPGRADE_INTERFACE_VERSION", + "outputs": [ + { + "internalType": "string", + "name": "", + "type": "string" + } + ], + "stateMutability": "view", "type": "function" }, { @@ -605,8 +660,74 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + } + ], + "name": "getRoleAdmin", + "outputs": [ + { + "internalType": "bytes32", + "name": "", + "type": "bytes32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "grantRole", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "hasRole", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ + { + "internalType": "address", + "name": "trustedForwarderAddress", + "type": "address" + }, { "internalType": "address", "name": "ownerAddress", @@ -647,6 +768,25 @@ "stateMutability": "view", "type": "function" }, + { + "inputs": [ + { + "internalType": "address", + "name": "forwarder", + "type": "address" + } + ], + "name": "isTrustedForwarder", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [ { @@ -730,19 +870,6 @@ "stateMutability": "nonpayable", "type": "function" }, - { - "inputs": [], - "name": "owner", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [], "name": "pause", @@ -763,19 +890,6 @@ "stateMutability": "view", "type": "function" }, - { - "inputs": [], - "name": "pendingOwner", - "outputs": [ - { - "internalType": "address", - "name": "", - "type": "address" - } - ], - "stateMutability": "view", - "type": "function" - }, { "inputs": [], "name": "proxiableUUID", @@ -803,8 +917,19 @@ "type": "function" }, { - "inputs": [], - "name": "renounceOwnership", + "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "internalType": "address", + "name": "callerConfirmation", + "type": "address" + } + ], + "name": "renounceRole", "outputs": [], "stateMutability": "nonpayable", "type": "function" @@ -822,6 +947,24 @@ "stateMutability": "payable", "type": "function" }, + { + "inputs": [ + { + "internalType": "bytes32", + "name": "role", + "type": "bytes32" + }, + { + "internalType": "address", + "name": "account", + "type": "address" + } + ], + "name": "revokeRole", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { @@ -835,6 +978,25 @@ "stateMutability": "payable", "type": "function" }, + { + "inputs": [ + { + "internalType": "bytes4", + "name": "interfaceId", + "type": "bytes4" + } + ], + "name": "supportsInterface", + "outputs": [ + { + "internalType": "bool", + "name": "", + "type": "bool" + } + ], + "stateMutability": "view", + "type": "function" + }, { "inputs": [], "name": "teeFee", @@ -1016,16 +1178,16 @@ "type": "function" }, { - "inputs": [ + "inputs": [], + "name": "trustedForwarder", + "outputs": [ { "internalType": "address", - "name": "newOwner", + "name": "", "type": "address" } ], - "name": "transferOwnership", - "outputs": [], - "stateMutability": "nonpayable", + "stateMutability": "view", "type": "function" }, { @@ -1074,6 +1236,19 @@ "stateMutability": "nonpayable", "type": "function" }, + { + "inputs": [ + { + "internalType": "address", + "name": "trustedForwarderAddress", + "type": "address" + } + ], + "name": "updateTrustedForwarder", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, { "inputs": [ { diff --git a/vana/contracts/__init__.py b/vana/contracts/__init__.py index 5340ae6..7bb6bfc 100644 --- a/vana/contracts/__init__.py +++ b/vana/contracts/__init__.py @@ -1,12 +1,12 @@ contracts = { "vana": { - "TeePool": "0xF084Ca24B4E29Aa843898e0B12c465fAFD089965", - "DataRegistry": "0xEA882bb75C54DE9A08bC46b46c396727B4BFe9a5", + "TeePool": "0x3c92fD91639b41f13338CE62f19131e7d19eaa0D", + "DataRegistry": "0x8C8788f98385F6ba1adD4234e551ABba0f82Cb7C", "RootNetworkContract": "0xf408A064d640b620219F510963646Ed2bD5606BB", }, "islander": { - "TeePool": "0xF084Ca24B4E29Aa843898e0B12c465fAFD089965", - "DataRegistry": "0xEA882bb75C54DE9A08bC46b46c396727B4BFe9a5", + "TeePool": "0x3c92fD91639b41f13338CE62f19131e7d19eaa0D", + "DataRegistry": "0x8C8788f98385F6ba1adD4234e551ABba0f82Cb7C", "RootNetworkContract": "0xf408A064d640b620219F510963646Ed2bD5606BB", }, "maya": {