Skip to content
This repository has been archived by the owner on Oct 10, 2024. It is now read-only.

Commit

Permalink
Simple change to readme, so that we can bump the version number (#606)
Browse files Browse the repository at this point in the history
  • Loading branch information
mischat authored Aug 17, 2020
1 parent 11e3788 commit a2cde0b
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 7 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# The Consumer Contract Wallet - Version 3.3.1
# The Consumer Contract Wallet - Version 3.4.1

This repository contains the Smart Contracts needed to power the Monolith App, written in Solidity, for execution in the EVM.

Expand Down Expand Up @@ -89,6 +89,8 @@ It should be noted that this codebase makes heavy use of inheritance.

[controller.sol](/contracts/controller.sol) the *Controller* is used to perform tasks on behalf of Token Group Ltd. These tasks range from operational tasks, such as updating the token exchange rates via the *Oracle*, adding/removing tokens from the *TokenWhitelist* to signing 2FA functions on behalf of our users. The *Controller* contract implements a key hierarchy of: `controllers` used for operational tasks, `admin` used for administrative tasks, and the `owner` which is used to change out the `admins`; see([controller inheritance diagram](/docs/controllers.inheritance.png)).

[gasProxy.sol](/contracts/gasProxy.sol) the *GasProxy* can be used as a *Controller* to redeem gasTokens (e.g. GST2 or CHI) when executing *Controller* transactions. The depoloyed *GasProxy* contract should be added to the list of controllers in the *Controller* contract.

[holder.sol](/contracts/holder.sol) is the *TKN Holder* contract, this is the `Asset Contract` as defined in the TokenCard whitepaper. This contract is used to hold 1% of all loads made onto TokenCards. The *TokenWhitelist* is used to define the set of tokens that are cash 'n' burnable (aka redeemable) by TKN holders who wish to burn their TKN. Users may burn their TKN on the TKN ERC20 contract which will call out to the `burn` method on the *TKN Holder* contract; see([holder inheritance diagram](/docs/holder.inheritance.png)).

[licence.sol](/contracts/licence.sol) is the *TKN Licence* contract, and it is used to take a 1% fee of all loads of the user's TokenCard so that it can be sent to the *TKN Holder* contract. This contract is aware of the CryptoFloat where the remaining tokens are to be kept for Token Group Ltd for the loading of the TokenCards. It is also aware of the address of the *TKN Holder* contract that is used to back TKN. The *TKN Licence* contract has been created in a way to allow for a DAO to change some of its configured features, this is there to future proof the implementation; see ([licence inheritance diagram](/docs/licence.inheritance.png)).
Expand Down
2 changes: 1 addition & 1 deletion contracts/wallet.sol
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ contract Wallet is ENSResolvable, AddressWhitelist, SpendLimit, GasTopUpLimit, L
event Transferred(address _to, address _asset, uint256 _amount);
event UpdatedAvailableLimit(); // This is here because our tests don't inherit events from a library

string public constant WALLET_VERSION = "3.3.1";
string public constant WALLET_VERSION = "3.4.1";

// keccak256("isValidSignature(bytes,bytes)") = 20c13b0bc670c284a9f19cdf7a533ca249404190f8dc132aac33e733b965269e
bytes4 private constant _EIP_1271 = 0x20c13b0b;
Expand Down
2 changes: 1 addition & 1 deletion pkg/bindings/mocks/isValidSignatureExporter.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/bindings/wallet.go

Large diffs are not rendered by default.

Loading

0 comments on commit a2cde0b

Please sign in to comment.