version 3.5.1 (#109)

- manage situation not handled in try/catch
TokenySolutions · Aug 24, 2021 · 9f2ec99 · 9f2ec99
1 parent 516c5e2
commit 9f2ec99
Show file tree

Hide file tree

Showing 28 changed files with 106 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <https://www.gnu.org/licenses/>.
+ */
 
 pragma solidity ^0.8.0;
 

diff --git 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 <https://www.gnu.org/licenses/>.
+ */
 
 pragma solidity ^0.8.0;
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <https://www.gnu.org/licenses/>.
+ */
 
 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
@@ -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
@@ -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
@@ -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 () => {