diff --git a/CHANGELOG.md b/CHANGELOG.md index e24f02ae..6db2c657 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ # Change Log All notable changes to this project will be documented in this file. +## [3.5.1] + +### Update +- updated licenses from 2019 to 2021 + +### Fix +- fix bug on the try/catch of `isVerified` function to return false if the verification of the claim returns an + error on the last claim checked on the ONCHAINID + + ## [3.5.0] ### Update diff --git a/contracts/DVD/DVDTransferManager.sol b/contracts/DVD/DVDTransferManager.sol index 971e6283..956c6de0 100644 --- a/contracts/DVD/DVDTransferManager.sol +++ b/contracts/DVD/DVDTransferManager.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/compliance/DefaultCompliance.sol b/contracts/compliance/DefaultCompliance.sol index 7aac57e9..8b6c03b5 100644 --- a/contracts/compliance/DefaultCompliance.sol +++ b/contracts/compliance/DefaultCompliance.sol @@ -7,7 +7,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/compliance/ICompliance.sol b/contracts/compliance/ICompliance.sol index d358a1c0..ef57d1f3 100644 --- a/contracts/compliance/ICompliance.sol +++ b/contracts/compliance/ICompliance.sol @@ -7,7 +7,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/compliance/LimitHolder.sol b/contracts/compliance/LimitHolder.sol index 9aa51156..2870fa33 100644 --- a/contracts/compliance/LimitHolder.sol +++ b/contracts/compliance/LimitHolder.sol @@ -7,7 +7,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/proxy/ImplementationAuthority.sol b/contracts/proxy/ImplementationAuthority.sol index cdcd5917..4ef9597c 100644 --- a/contracts/proxy/ImplementationAuthority.sol +++ b/contracts/proxy/ImplementationAuthority.sol @@ -1,4 +1,26 @@ // SPDX-License-Identifier: GPL-3.0 +/** + * NOTICE + * + * The T-REX software is licensed under a proprietary license or the GPL v.3. + * If you choose to receive it under the GPL v.3 license, the following applies: + * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain + * + * Copyright (C) 2021, Tokeny sàrl. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ pragma solidity ^0.8.0; diff --git a/contracts/proxy/TokenProxy.sol b/contracts/proxy/TokenProxy.sol index 1b490d6b..eedc7a33 100644 --- a/contracts/proxy/TokenProxy.sol +++ b/contracts/proxy/TokenProxy.sol @@ -1,4 +1,26 @@ // SPDX-License-Identifier: GPL-3.0 +/** + * NOTICE + * + * The T-REX software is licensed under a proprietary license or the GPL v.3. + * If you choose to receive it under the GPL v.3 license, the following applies: + * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain + * + * Copyright (C) 2021, Tokeny sàrl. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ pragma solidity ^0.8.0; diff --git a/contracts/registry/ClaimTopicsRegistry.sol b/contracts/registry/ClaimTopicsRegistry.sol index e8b42f02..58c81bb4 100644 --- a/contracts/registry/ClaimTopicsRegistry.sol +++ b/contracts/registry/ClaimTopicsRegistry.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/registry/IClaimTopicsRegistry.sol b/contracts/registry/IClaimTopicsRegistry.sol index 33350184..4956e4d6 100644 --- a/contracts/registry/IClaimTopicsRegistry.sol +++ b/contracts/registry/IClaimTopicsRegistry.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/registry/IIdentityRegistry.sol b/contracts/registry/IIdentityRegistry.sol index 111aedd4..b150fdf9 100644 --- a/contracts/registry/IIdentityRegistry.sol +++ b/contracts/registry/IIdentityRegistry.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/registry/IIdentityRegistryStorage.sol b/contracts/registry/IIdentityRegistryStorage.sol index 78b8714c..00e1a781 100644 --- a/contracts/registry/IIdentityRegistryStorage.sol +++ b/contracts/registry/IIdentityRegistryStorage.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/registry/ITrustedIssuersRegistry.sol b/contracts/registry/ITrustedIssuersRegistry.sol index 699f01f1..80ac7bd8 100644 --- a/contracts/registry/ITrustedIssuersRegistry.sol +++ b/contracts/registry/ITrustedIssuersRegistry.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/registry/IdentityRegistry.sol b/contracts/registry/IdentityRegistry.sol index f538f807..baa75345 100644 --- a/contracts/registry/IdentityRegistry.sol +++ b/contracts/registry/IdentityRegistry.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -195,7 +195,11 @@ contract IdentityRegistry is IIdentityRegistry, AgentRole { return false; } } - catch {} + catch { + if (j == (claimIds.length - 1)) { + return false; + } + } } } return true; diff --git a/contracts/registry/IdentityRegistryStorage.sol b/contracts/registry/IdentityRegistryStorage.sol index b4a0ff67..59256de8 100644 --- a/contracts/registry/IdentityRegistryStorage.sol +++ b/contracts/registry/IdentityRegistryStorage.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/registry/TrustedIssuersRegistry.sol b/contracts/registry/TrustedIssuersRegistry.sol index d835fc7a..3b2c87df 100644 --- a/contracts/registry/TrustedIssuersRegistry.sol +++ b/contracts/registry/TrustedIssuersRegistry.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/roles/AgentManager.sol b/contracts/roles/AgentManager.sol index f1b94407..0b43913b 100644 --- a/contracts/roles/AgentManager.sol +++ b/contracts/roles/AgentManager.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/roles/AgentRole.sol b/contracts/roles/AgentRole.sol index c4f69315..5351b350 100644 --- a/contracts/roles/AgentRole.sol +++ b/contracts/roles/AgentRole.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/roles/AgentRoleUpgradeable.sol b/contracts/roles/AgentRoleUpgradeable.sol index 1b44955c..f5f357d0 100644 --- a/contracts/roles/AgentRoleUpgradeable.sol +++ b/contracts/roles/AgentRoleUpgradeable.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/roles/AgentRoles.sol b/contracts/roles/AgentRoles.sol index 80f962c5..978f1a6c 100644 --- a/contracts/roles/AgentRoles.sol +++ b/contracts/roles/AgentRoles.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/roles/AgentRolesUpgradeable.sol b/contracts/roles/AgentRolesUpgradeable.sol index 5556f193..779c11ed 100644 --- a/contracts/roles/AgentRolesUpgradeable.sol +++ b/contracts/roles/AgentRolesUpgradeable.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/roles/OwnerManager.sol b/contracts/roles/OwnerManager.sol index eb917425..80af8d38 100644 --- a/contracts/roles/OwnerManager.sol +++ b/contracts/roles/OwnerManager.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/roles/OwnerRoles.sol b/contracts/roles/OwnerRoles.sol index b9a14a46..09cfae27 100644 --- a/contracts/roles/OwnerRoles.sol +++ b/contracts/roles/OwnerRoles.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/roles/OwnerRolesUpgradeable.sol b/contracts/roles/OwnerRolesUpgradeable.sol index f7c90fd2..de2586c9 100644 --- a/contracts/roles/OwnerRolesUpgradeable.sol +++ b/contracts/roles/OwnerRolesUpgradeable.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/token/IToken.sol b/contracts/token/IToken.sol index a277e4c4..d29604b3 100644 --- a/contracts/token/IToken.sol +++ b/contracts/token/IToken.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/contracts/token/Storage.sol b/contracts/token/Storage.sol index b7b9320d..3508e35c 100644 --- a/contracts/token/Storage.sol +++ b/contracts/token/Storage.sol @@ -1,4 +1,26 @@ // SPDX-License-Identifier: GPL-3.0 +/** + * NOTICE + * + * The T-REX software is licensed under a proprietary license or the GPL v.3. + * If you choose to receive it under the GPL v.3 license, the following applies: + * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain + * + * Copyright (C) 2021, Tokeny sàrl. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ pragma solidity ^0.8.0; import '../compliance/ICompliance.sol'; @@ -15,7 +37,7 @@ contract TokenStorage { string internal tokenSymbol; uint8 internal tokenDecimals; address internal tokenOnchainID; - string internal constant TOKEN_VERSION = '3.5.0'; + string internal constant TOKEN_VERSION = '3.5.1'; /// @dev Variables of freeze and pause functions mapping(address => bool) internal frozen; diff --git a/contracts/token/Token.sol b/contracts/token/Token.sol index 57d0a463..ae3b00ee 100755 --- a/contracts/token/Token.sol +++ b/contracts/token/Token.sol @@ -6,7 +6,7 @@ * If you choose to receive it under the GPL v.3 license, the following applies: * T-REX is a suite of smart contracts developed by Tokeny to manage and transfer financial assets on the ethereum blockchain * - * Copyright (C) 2019, Tokeny sàrl. + * Copyright (C) 2021, Tokeny sàrl. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/package.json b/package.json index 2737e940..663a7b61 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@tokenysolutions/t-rex", - "version": "3.5.0", + "version": "3.5.1", "description": "A fully compliant environment for the issuance and use of tokenized securities.", "main": "index.js", "directories": { diff --git a/test/tokenTransfer.test.js b/test/tokenTransfer.test.js index c7a80ee4..18c30348 100644 --- a/test/tokenTransfer.test.js +++ b/test/tokenTransfer.test.js @@ -141,7 +141,7 @@ contract('Token', (accounts) => { it('version returns the version of the token', async () => { const version1 = await token.version().should.be.fulfilled; - version1.toString().should.equal('3.5.0'); + version1.toString().should.equal('3.5.1'); }); it('onchainID returns the onchainID address of the token', async () => {