Skip to content
This repository was archived by the owner on Oct 10, 2024. It is now read-only.
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
7fccb21
wallet: support one single daily limit for transfers, top ups and gas…
riccardopersiani Oct 27, 2020
cc7030d
walletCache: switch 'defaultSpendLimit' to 'defaultDailyLimit'
riccardopersiani Oct 27, 2020
43002f2
walletDeployer: remove gasTopUps, spend and load for single daily limit
riccardopersiani Oct 27, 2020
9c2f86d
Remove not used single limit tests
riccardopersiani Oct 27, 2020
9aabf88
Fix gas top up test missing daily limit
riccardopersiani Oct 27, 2020
3c5c4ff
Replace spend limit test with daily limit test
riccardopersiani Oct 28, 2020
26e37a8
Fix wallet-deployer tests due to daily limit change
riccardopersiani Oct 28, 2020
191b2ec
Fix upgradable test due to daily limit change
riccardopersiani Oct 28, 2020
1bbb060
Fix wallet tests due to daily limit change
riccardopersiani Oct 28, 2020
74c959c
Fix wallet constructor test supporting proxy
riccardopersiani Oct 28, 2020
ceb4504
wallet: support stablecoin daily limit
riccardopersiani Nov 5, 2020
4471a42
walletCache: add stablecoin daily limit clarifications
riccardopersiani Nov 5, 2020
0f9e320
wallet: fix daily limit initialization
riccardopersiani Nov 6, 2020
b474f68
wallet: merge set and update daily limit in one function; remove cont…
riccardopersiani Nov 6, 2020
8c3b37c
walletDeployer: use new function for daily limit
riccardopersiani Nov 6, 2020
f0a875a
wallet: add new event InitializedDailyLimit and refactor other events
riccardopersiani Nov 6, 2020
6d61cfb
wallet: refactor UpdatedAvailableDailyLimit and resetTimestamp; chang…
riccardopersiani Nov 6, 2020
dc00acc
wallet: rename _value to _dailyLimit, and _pending to _pendingLimit
riccardopersiani Nov 6, 2020
cce1ae1
wallet: remove symbols from requires, add stablecoin conversion and r…
riccardopersiani Nov 9, 2020
1d7541f
Remove unused tests
riccardopersiani Nov 9, 2020
84fb309
Switch test stablecoin from USDC to DAI (move to 18 decimals)
riccardopersiani Nov 9, 2020
759b78c
Fix upgradeable tests
riccardopersiani Nov 9, 2020
f953ec9
Fix wallet-deployer tests
riccardopersiani Nov 9, 2020
23ea4a4
Fix wallet tests
riccardopersiani Nov 9, 2020
3a8b968
Switch test initial daily limit from 100 ETH to 10000 USD
riccardopersiani Nov 9, 2020
13230c3
Fix load ERC20 test error
riccardopersiani Nov 10, 2020
7d0be53
Fix wallet deployer tests caused by stablecoin switch from USDC to DAI
riccardopersiani Nov 10, 2020
75b8261
Fix upgradeable test given by guard refactor
riccardopersiani Nov 10, 2020
639e54b
Remove useless parts from load non-compliant ERC20 test
riccardopersiani Nov 10, 2020
162ef9c
Update bindings, tools and go packages
riccardopersiani Nov 10, 2020
8bef16e
Update missing bindings
riccardopersiani Nov 10, 2020
110f049
readme: remove oraclize occurrencies
riccardopersiani Nov 20, 2020
331f8f4
This fixes the broken tests by adding in the missing mocks to the build
mischat Nov 24, 2020
75cab55
This makes sure that the gastopup converts the ETH value into the
mischat Nov 24, 2020
0c53f93
This removes from code duplication, and moves the convertStablecoint
mischat Nov 24, 2020
0ea76b7
wallet: add 2FA support
riccardopersiani Nov 25, 2020
aee030f
test: add 2fa dedicated tests
riccardopersiani Nov 25, 2020
dddb8a0
test/controller: update require statements and correct typos
riccardopersiani Nov 25, 2020
28507e4
test/token-whitelist: update require statements
riccardopersiani Nov 25, 2020
9f86d4e
test/uninitialized: add onlyOwnerOr2FA check, remove onlyOwnerOrContr…
riccardopersiani Nov 25, 2020
05e556e
test/transfer: update require statements
riccardopersiani Nov 25, 2020
f69f47c
contracts: update contract require statements
riccardopersiani Nov 25, 2020
24361c1
update pkg/bindings
riccardopersiani Nov 25, 2020
bd091a7
run prettier
riccardopersiani Nov 25, 2020
4b67c01
update pkg/bindings
riccardopersiani Nov 25, 2020
d7fd8af
update slither
riccardopersiani Nov 26, 2020
bda7d19
update slither
riccardopersiani Nov 26, 2020
bf4bd7e
Merge pull request #613 from tokencard/switch-to-daily-limit-mischa
riccardopersiani Nov 26, 2020
1aa2c60
add privileged mode
riccardopersiani Dec 3, 2020
d2c40d3
add relayed transactions testing
riccardopersiani Dec 3, 2020
73a4bbd
update packages
riccardopersiani Dec 3, 2020
53141d3
wallet: complete privileged mode
riccardopersiani Dec 9, 2020
b83c8ff
test: add privileged relayed tests
riccardopersiani Dec 9, 2020
19e2d93
test: add relayed tests
riccardopersiani Dec 9, 2020
95f95fc
fix remaining wallet tests
riccardopersiani Dec 9, 2020
91029c8
test: increase test coverage in wallet
riccardopersiani Dec 9, 2020
6a88a77
fix gas proxy tests
riccardopersiani Dec 9, 2020
c305ca6
test: add missing check on transaction
riccardopersiani Dec 9, 2020
b0ce044
prettier and slighter
riccardopersiani Dec 10, 2020
5a74fad
pkb/bindings: update
riccardopersiani Dec 10, 2020
617e961
tests: add missing tests
riccardopersiani Dec 10, 2020
f4884bd
Merge pull request #612 from tokencard/switch-to-daily-limit
riccardopersiani Dec 11, 2020
72a2891
test: improve descriptions in 2fa tests
riccardopersiani Jan 6, 2021
42ca863
test: fix typos
riccardopersiani Jan 6, 2021
5648ee9
contracts: remove duplicate modifer onlyController
riccardopersiani Jan 6, 2021
25a8af1
contracts: correct typos
riccardopersiani Jan 6, 2021
3e1fa84
pkg: update bindings
riccardopersiani Jan 6, 2021
aa2079c
Merge branch 'wallet-v4' into support-2fa
riccardopersiani Apr 26, 2021
a35a868
fix: run build and tools
riccardopersiani Apr 26, 2021
482c535
Merge pull request #614 from tokencard/support-2fa
riccardopersiani Apr 26, 2021
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
9 changes: 3 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ It should be noted that this codebase makes heavy use of inheritance.
### Solidity code in the `/contracts/internals/` folder
[balanceable.sol](/contracts/internals/balanceable.sol) is an inheritable contract that checks the ETH or ERC20 balance of an address.

[burner.sol](/contracts/internals/burner.sol) defines the Burner interface used for burning TKN for the cash n' burn functionality.
[burner.sol](/contracts/internals/burner.sol) defines the Burner interface used for burning TKN for the cash n' burn functionality.

[bytesUtils.sol](/contracts/internals/bytesUtils.sol) includes a set of utils for parsing bytes to things like ints and addresses.

Expand Down Expand Up @@ -134,9 +134,7 @@ It should be noted that this codebase makes heavy use of inheritance.

[isValidSignatureExporter.sol](/contracts/mocks/isValidSignatureExporter.sol) used to export valid signatures for meta transaction testing.

[nonCompliantToken.sol](/contracts/mocks/nonCompliantToken.sol) a version of a non-compliant ERC20 token, used to test the SafeERC20 stuff.

[oraclize.sol](/contracts/mocks/oraclize.sol) is a mocked out version of the oraclize, this is for testing purposes only.
[nonCompliantToken.sol](/contracts/mocks/nonCompliantToken.sol) a version of a non-compliant ERC20 token, used to test the SafeERC20 stuff.

[parseIntScientific-exporter.sol](/contracts/mocks/parseIntScientificExporter.sol) is a mocked out version of a contract that pulls in the parseIntScientific contract used to parse floating points that include scientific notation out of JSON.

Expand All @@ -161,7 +159,6 @@ All of the third-party code we rely on can be found in this folder. The below ta
| [ENS Pubic Resolver](https://raw.githubusercontent.com/ensdomains/resolvers/797c8b63617d1bfe4d046274b58c05e991fbae76/contracts/PublicResolver.sol) | [BSD2](https://github.com/ensdomains/ens/blob/master/LICENSE) |
| [ENS Registry](https://raw.githubusercontent.com/ensdomains/ens/aa30b7eae4efdb2089893b7a461c76dbbc011783/contracts/ENSRegistry.sol) | [BSD2](https://github.com/ensdomains/ens/blob/master/LICENSE) |
| [strings.sol](https://github.com/Arachnid/solidity-stringutils/pull/37) | [Apache v2](https://github.com/Arachnid/solidity-stringutils/blob/master/LICENSE) |
| [oraclizeAPI](https://raw.githubusercontent.com/provable-things/ethereum-api/d02497b4d84e02a8649af3822950873d305f7659/oraclizeAPI_0.5.sol) | [MIT](https://github.com/oraclize/ethereum-api/blob/master/LICENSE) |
| [gnosis MultiSig](https://github.com/gnosis/MultiSigWallet) | [GPLv3](https://github.com/gnosis/MultiSigWallet/blob/master/LICENSE) |
| [zOS Upgradeability](https://github.com/OpenZeppelin/openzeppelin-sdk/blob/9baca3afb5649b6defc3a75eeb69f4930852180f/packages/lib/contracts/upgradeability/Proxy.sol) | [MIT](https://github.com/OpenZeppelin/openzeppelin-sdk/blob/9baca3afb5649b6defc3a75eeb69f4930852180f/LICENSE) |

Expand Down Expand Up @@ -234,4 +231,4 @@ dot contracts.dot -Tpng -o ./wallet.inheritance.png
## Resources

[🎮 Discord](https://discord.gg/GN6gGEP) | [🗞️Blog](https://medium.com/@Monolith) | [👽 Reddit](https://www.reddit.com/r/Monolith_Web3/) | [🕸️ Website ](https://monolith.xyz/) | [🐦 Twitter](https://twitter.com/monolith_web3) |
|---|---|---|---|---|
|---|---|---|---|---|
4 changes: 3 additions & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ contracts=(
"mocks/token/Token mocks/token.go Token mocks"
"mocks/tokenWhitelistableExporter/TokenWhitelistableExporter mocks/tokenWhitelistableExporter.go TokenWhitelistableExporter mocks"
"mocks/wallet/Wallet mocks/wallet.go Wallet mocks"
"mocks/gasToken/GasToken mocks/gasToken.go GasToken mocks"
"mocks/gasBurner/GasBurner mocks/gasBurner.go GasBurner mocks"
"externals/ens/ENSRegistry/ENSRegistry externals/ens/ENSRegistry.go ENSRegistry ens"
"externals/ens/PublicResolver/PublicResolver externals/ens/PublicResolver.go PublicResolver ens"
"externals/upgradeability/UpgradeabilityProxy/UpgradeabilityProxy externals/upgradeability/UpgradeabilityProxy.go UpgradeabilityProxy upgradeability"
Expand All @@ -94,4 +96,4 @@ do
generate_binding "$c"
done

echo "done"
echo "done"
592 changes: 592 additions & 0 deletions contracts/artifacts/AddressWhitelist.json

Large diffs are not rendered by default.

Loading