From f2c98c83a3435f53d442774f61424e196e15b6da Mon Sep 17 00:00:00 2001 From: Krishang Date: Tue, 8 Nov 2022 21:14:42 +0530 Subject: [PATCH 1/2] pkg release --- contracts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/package.json b/contracts/package.json index 669a522f2..bb321abaf 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,7 +1,7 @@ { "name": "@thirdweb-dev/contracts", "description": "Collection of smart contracts deployable via the thirdweb SDK, dashboard and CLI", - "version": "3.2.1", + "version": "3.2.2", "license": "Apache-2.0", "repository": { "type": "git", From 397ffe97857792ac3fb9a39590eeeed960e91894 Mon Sep 17 00:00:00 2001 From: nkrishang <62195808+nkrishang@users.noreply.github.com> Date: Wed, 9 Nov 2022 14:04:23 -0500 Subject: [PATCH 2/2] Multichain registry: Differentiate between imports and direct deployments (#275) * Differentiate between imports and direct deployments * Return plain metadataURI in Deployment struct --- contracts/TWMultichainRegistry.sol | 6 +++++- contracts/interfaces/ITWMultichainRegistry.sol | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/contracts/TWMultichainRegistry.sol b/contracts/TWMultichainRegistry.sol index 5474f9641..12bca5842 100644 --- a/contracts/TWMultichainRegistry.sol +++ b/contracts/TWMultichainRegistry.sol @@ -80,7 +80,11 @@ contract TWMultichainRegistry is ITWMultichainRegistry, Multicall, ERC2771Contex address[] memory deploymentAddrs = deployments[_deployer][chainId].values(); for (uint256 k = 0; k < len; k += 1) { - allDeployments[idx] = Deployment({ deploymentAddress: deploymentAddrs[k], chainId: chainId }); + allDeployments[idx] = Deployment({ + deploymentAddress: deploymentAddrs[k], + chainId: chainId, + metadataURI: addressToMetadataUri[chainId][deploymentAddrs[k]] + }); idx += 1; } } diff --git a/contracts/interfaces/ITWMultichainRegistry.sol b/contracts/interfaces/ITWMultichainRegistry.sol index 006afb012..be5ba1080 100644 --- a/contracts/interfaces/ITWMultichainRegistry.sol +++ b/contracts/interfaces/ITWMultichainRegistry.sol @@ -5,6 +5,7 @@ interface ITWMultichainRegistry { struct Deployment { address deploymentAddress; uint256 chainId; + string metadataURI; } event Added(address indexed deployer, address indexed deployment, uint256 indexed chainId, string metadataUri);