Upgrade Pragma Header in order to allow solidity latest solidity comp…

…ilers (#261) * Upgrade Pragma Header in order to allow solidity latest solidity compilers * Upgrade minimum version of contracts to 0.7.0 Pragma header mandatory added Some minor changes on SC according the upgrade of Solidity * Fix Lint Problems * Downgrade Truffle because latest version does not generate the test reports * Downgrade the smartcontract compatibility to 0.6.0 * Restore accidentally deleted files Co-authored-by: Alberto Hernandez <[email protected]>
Consensys · Dec 21, 2021 · 45702dd · 45702dd
1 parent 5f1c076
commit 45702dd
Show file tree

Hide file tree

Showing 22 changed files with 20,221 additions and 13,732 deletions.
diff --git a/.mythx.yml b/.mythx.yml
@@ -6,7 +6,7 @@ analyze:
     mode: quick
     async: false
     create-group: true
-    solc: 0.5.9
+    solc: 0.7.0
     remappings:
         - "@openzeppelin=node_modules/@openzeppelin"
     targets:

diff --git a/contracts/AccountIngress.sol b/contracts/AccountIngress.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 import "./AccountRulesProxy.sol";
 import "./Ingress.sol";

diff --git a/contracts/AccountRules.sol b/contracts/AccountRules.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 import "./AccountRulesProxy.sol";
 import "./AccountRulesList.sol";
@@ -61,7 +75,7 @@ contract AccountRules is AccountRulesProxy, AccountRulesList {
         uint256, // gasPrice
         uint256, // gasLimit
         bytes calldata // payload
-    ) external view returns (bool) {
+    ) external override view returns (bool) {
         if (accountPermitted(sender)) {
             return true;
         }

diff --git a/contracts/AccountRulesList.sol b/contracts/AccountRulesList.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 import "./AccountStorage.sol";
 

diff --git a/contracts/AccountRulesProxy.sol b/contracts/AccountRulesProxy.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 interface AccountRulesProxy {
     function transactionAllowed(

diff --git a/contracts/AccountStorage.sol b/contracts/AccountStorage.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 import "./Admin.sol";
 import "./AccountIngress.sol";
@@ -55,7 +69,8 @@ contract AccountStorage {
 
     function add(address _account) public onlyLatestVersion returns (bool) {
         if (indexOf[_account] == 0) {
-            indexOf[_account] = allowlist.push(_account);
+            allowlist.push(_account);
+            indexOf[_account] = allowlist.length;
             return true;
         }
         return false;
@@ -72,7 +87,7 @@ contract AccountStorage {
             }
 
             //shrink array
-            allowlist.length -= 1; // mythx-disable-line SWC-101
+            allowlist.pop();
             indexOf[_account] = 0;
             return true;
         }
@@ -86,4 +101,4 @@ contract AccountStorage {
     function getAccounts() public view returns (address[] memory){
         return allowlist;
     }
-}
+}
diff --git a/contracts/Admin.sol b/contracts/Admin.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 import "./AdminProxy.sol";
 import "./AdminList.sol";
@@ -19,7 +33,7 @@ contract Admin is AdminProxy, AdminList {
         add(msg.sender);
     }
 
-    function isAuthorized(address _address) public view returns (bool) {
+    function isAuthorized(address _address) public override view returns (bool) {
         return exists(_address);
     }
 

diff --git a/contracts/AdminList.sol b/contracts/AdminList.sol
@@ -1,5 +1,18 @@
-pragma solidity 0.5.9;
-
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 
 contract AdminList {
@@ -27,7 +40,8 @@ contract AdminList {
 
     function add(address _account) internal returns (bool) {
         if (indexOf[_account] == 0) {
-            indexOf[_account] = allowlist.push(_account);
+            allowlist.push(_account);
+            indexOf[_account] = allowlist.length;
             return true;
         }
         return false;
@@ -64,7 +78,7 @@ contract AdminList {
             }
 
             //shrink array
-            allowlist.length -= 1; // mythx-disable-line SWC-101
+            allowlist.pop();
             indexOf[_account] = 0;
             return true;
         }

diff --git a/contracts/AdminProxy.sol b/contracts/AdminProxy.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 interface AdminProxy {
     function isAuthorized(address source) external view returns (bool);

diff --git a/contracts/ExposedAccountRulesList.sol b/contracts/ExposedAccountRulesList.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 import "./AccountRulesList.sol";
 import "./AccountStorage.sol";

diff --git a/contracts/ExposedAdminList.sol b/contracts/ExposedAdminList.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 import "./AdminList.sol";
 

diff --git a/contracts/ExposedNodeRulesList.sol b/contracts/ExposedNodeRulesList.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 import "./NodeRulesList.sol";
 import "./NodeStorage.sol";

diff --git a/contracts/Ingress.sol b/contracts/Ingress.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 import "./AdminProxy.sol";
 
@@ -42,7 +56,8 @@ contract Ingress {
         require(isAuthorized(msg.sender), "Not authorized to update contract registry.");
 
         if (indexOf[name] == 0) {
-            indexOf[name] = contractKeys.push(name);
+            contractKeys.push(name);
+            indexOf[name] = contractKeys.length;
         }
 
         registry[name] = addr;

diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 
 contract Migrations {

diff --git a/contracts/NodeIngress.sol b/contracts/NodeIngress.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 import "./NodeRulesProxy.sol";
 import "./Ingress.sol";

diff --git a/contracts/NodeRules.sol b/contracts/NodeRules.sol
@@ -1,4 +1,18 @@
-pragma solidity 0.5.9;
+/*
+ * Copyright ConsenSys AG.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+pragma solidity >=0.6.0 <0.9.0;
 
 import "./NodeRulesProxy.sol";
 import "./NodeRulesList.sol";
@@ -74,7 +88,7 @@ contract NodeRules is NodeRulesProxy, NodeRulesList {
         string calldata enodeId,
         string calldata enodeHost,
         uint16 enodePort
-    ) external view returns (bool) {
+    ) external override view returns (bool) {
         return
             enodePermitted (
                 enodeId,