Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#!/usr/bin/env sh
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this is not needed anymore ?


npx lint-staged
npm run doc

# Update Solidity documentation only if .sol files were changed.
if git diff --cached --name-only | grep -E '\.sol$' > /dev/null; then
npm run doc
fi
7 changes: 6 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ audit/
cache/
coverage/
coverage.json
deployments/
node_modules/
typechain/

# Autogenerated files
abis/
deployments/
docs/solidity/index.md
docs/solidity/templates/
13 changes: 2 additions & 11 deletions .solcover.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
const BASE_FOLDER = './coverage';

module.exports = {
/**
* See https://github.com/sc-forks/solidity-coverage/issues/715 issue if
Expand All @@ -15,13 +13,6 @@ module.exports = {
mocha: {
timeout: 600000, // double timeout
},
skipFiles: [
'tools/Migrations.sol',
'tools/testing/ERC734Mock.sol',
'tools/testing/ERC1271Mock.sol',
'tools/testing/TestClient.sol',
'tools/testing/TestReceiver.sol',
'facets/SignatureVerifier.sol',
],
istanbulFolder: BASE_FOLDER,
skipFiles: ['facets/SignatureVerifier.sol', 'tools/'],
istanbulFolder: './coverage',
};
2 changes: 1 addition & 1 deletion abis/contracts/Diamond.json
Original file line number Diff line number Diff line change
Expand Up @@ -282,4 +282,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abis/contracts/IexecInterfaceNative.json
Original file line number Diff line number Diff line change
Expand Up @@ -4396,4 +4396,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abis/contracts/IexecInterfaceToken.json
Original file line number Diff line number Diff line change
Expand Up @@ -4407,4 +4407,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abis/contracts/external/interfaces/IERC734.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
"stateMutability": "view",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abis/contracts/external/interfaces/IOracleConsumer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
1 change: 0 additions & 1 deletion abis/contracts/facets/FacetBase.json

This file was deleted.

2 changes: 1 addition & 1 deletion abis/contracts/facets/IexecAccessorsABILegacyFacet.json
Original file line number Diff line number Diff line change
Expand Up @@ -312,4 +312,4 @@
"stateMutability": "view",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abis/contracts/facets/IexecCategoryManagerFacet.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abis/contracts/facets/IexecConfigurationExtraFacet.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abis/contracts/facets/IexecConfigurationFacet.json
Original file line number Diff line number Diff line change
Expand Up @@ -128,4 +128,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
2 changes: 1 addition & 1 deletion abis/contracts/facets/IexecERC20Core.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@
"name": "Transfer",
"type": "event"
}
]
]
2 changes: 1 addition & 1 deletion abis/contracts/facets/IexecERC20Facet.json
Original file line number Diff line number Diff line change
Expand Up @@ -203,4 +203,4 @@
"stateMutability": "nonpayable",
"type": "function"
}
]
]
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,4 @@
"name": "Unlock",
"type": "event"
}
]
]
2 changes: 1 addition & 1 deletion abis/contracts/facets/IexecEscrowNativeFacet.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
2 changes: 1 addition & 1 deletion abis/contracts/facets/IexecEscrowTokenFacet.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,4 @@
"stateMutability": "payable",
"type": "receive"
}
]
]
Loading