cicnet
/
cic-contracts
5
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Compare commits

merge into: cicnet:master
Branches Tags
cicnet:master
cicnet:lash/rate-of-change
cicnet:dev-0.2.0
cicnet:lash/add-python-interfaces
cicnet:lash/declarator
cicnet:lash/better-interfaces
cicnet:v0.3.8
cicnet:v0.3.7
cicnet:v0.3.5
cicnet:v0.3.4
cicnet:v0.3.3
cicnet:v0.3.2
cicnet:v0.3.1
cicnet:v0.2.0
cicnet:v0.1.0
...
pull from: cicnet:lash/declarator
Branches Tags
cicnet:master
cicnet:lash/rate-of-change
cicnet:dev-0.2.0
cicnet:lash/add-python-interfaces
cicnet:lash/declarator
cicnet:lash/better-interfaces
cicnet:v0.3.8
cicnet:v0.3.7
cicnet:v0.3.5
cicnet:v0.3.4
cicnet:v0.3.3
cicnet:v0.3.2
cicnet:v0.3.1
cicnet:v0.2.0
cicnet:v0.1.0

25 Commits
master ... lash/decla

Author SHA1 Message Date
nolash cc877c2c44 Merge remote-tracking branch 'origin/master' into lash/declarator 2021-02-23 17:16:40 +01:00
nolash 9933979e14
Update transfer authorization interface 2021-02-16 14:07:44 +01:00
nolash 5fd512ac69
Update transfer authorization interface 2021-02-16 13:28:52 +01:00
nolash da7c0ca79e Merge remote-tracking branch 'origin/master' into lash/declarator 2021-02-14 13:21:53 +01:00
nolash 0b2c79b4da
Add registry lister stub 2021-02-12 17:48:20 +01:00
nolash 698ef3a30f
Rename addressdeclarator to declarator 2021-01-13 12:05:36 +01:00
nolash 30c13366fa
Slight change in trasnfer approval json 2021-01-05 23:35:00 +01:00
nolash bc29be7e6c
Start docs 2021-01-05 20:22:51 +01:00
nolash 4bd3dceaa6
Correct parameter name to requests mapping in transfer approval 2021-01-05 10:22:29 +01:00
nolash 17354e424e
Fix interface typos 2021-01-02 20:21:59 +01:00
nolash e6612b2388
Add WIP interface calc material, documentation stub 2021-01-02 17:09:06 +01:00
nolash 82d37092c2
Update transferapproval interface 2021-01-02 08:49:32 +01:00
nolash 83eae00818
Add ERC165 calculator 2020-12-29 21:51:37 +01:00
nolash e485d221a8
Rename TokenRegistry 2020-12-22 23:21:29 +01:00
nolash 8e1a27d8dc
Add version specifier 2020-12-22 08:23:23 +01:00
nolash 0e87469fe0
Add token endorser interface 2020-12-22 07:59:42 +01:00
nolash 9b42a393ea
Add addressOf to Registry 2020-12-16 13:18:08 +01:00
nolash ad3be535ba
Revert alpine reset 2020-12-16 09:23:32 +01:00
nolash 26f0a2452d
Reset python alpine on docker image 2020-12-16 08:38:34 +01:00
nolash 015eb7b64e
Bump file version 2020-12-11 18:05:00 +01:00
nolash 75561cebfa
A lot better makefile 2020-12-11 18:04:32 +01:00
nolash 69bafdadcf
Rename accountsindex 2020-12-11 16:29:36 +01:00
nolash d66b95dd1a
Add missing dockerfile, registry client sol 2020-12-11 16:11:27 +01:00
nolash 1fcef8a213
Add json to suffix 2020-12-11 16:09:35 +01:00
nolash 6b2a9286b2
Replace deprecated method in bancor registry 2020-12-11 12:51:37 +01:00
8 changed files with 29 additions and 11 deletions
Show Stats Expand all files Collapse all files

31
TransferAuthorization.sol
View File

@ -6,10 +6,16 @@ pragma solidity >=0.6.12;
interface TransferAuthorization {
event NewRequest(address indexed _sender, address indexed _recipient, address indexed _token, uint256 _value, uint256 _serial);
event NewExecution(uint256 serial);
event NewRejection(uint256 serial);
event TransferFail(uint256 serial);
event Executed(uint256 _serial);
event TransferFail(uint256 _serial);
event QuorumSet(uint256 _quorum, uint256 _vetoThreshold, uint256 _signerCount);
event SignerAdded(address _signer);
event SignerRemoved(address _signer);
event Vetoed(uint256 indexed _serial, uint256 _yays, uint256 _nays);
event Approved(uint256 indexed _serial, uint256 _yays, uint256 _nays);
event Rejected(uint256 indexed _serial, uint256 _yays, uint256 _nays);
struct Transaction {
uint256 serial;
@ -17,15 +23,26 @@ interface TransferAuthorization {
address recipient;
address token;
uint256 value;
uint256 yay;
uint256 nay;
uint256 blockNumber;
int8 result; // -1 rejected/vetoed, 0 = completed, 1 = voting, 2 = approved
}
function approvers() external view returns (address[] memory);
function signers(address) external view returns (bool);
function vote(uint256, address) external view returns (int8);
function voters(uint256) external view returns (address);
function count() external view returns (uint256);
function quorum() external view returns (uint256);
function vetoThreshold() external view returns (uint256);
function signerCount() external view returns (uint256);
function lastSerial() external view returns (uint256);
function nextSerial() external view returns (uint256);
function getSerialAt(uint256 _idx) external view returns (uint256);
function requests(uint256 _serial) external view returns (Transaction memory);
function createRequest(address _recipient, address _token, uint256 _value) external returns (uint256);
function executeRequest(uint256 _serial) external returns (bool);
function rejectRequest(uint256 _serial) external returns (bool);
function requestSenderIndex(address _sender, uint256 _idx) external view returns (uint256);
function requestRecipientIndex(address _recipient, uint256 _idx) external view returns (uint256);
function createRequest(address _sender, address _recipient, address _token, uint256 _value) external returns (uint256);
function yay(uint256 _serial) external returns (bool);
function nay(uint256 _serial) external returns (bool);
}

2
abis/Faucet.json
View File

@ -1 +1 @@
[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_recipient","type":"address"},{"indexed":true,"internalType":"address","name":"_token","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"FaucetFail","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_recipient","type":"address"},{"indexed":true,"internalType":"address","name":"_token","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"FaucetUsed","type":"event"},{"inputs":[],"name":"amount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_recipient","type":"address"}],"name":"giveTo","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"setAmount","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"token","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"}]
[{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_token","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"FaucetAmountChange","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_recipient","type":"address"},{"indexed":true,"internalType":"address","name":"_token","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"FaucetFail","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_recipient","type":"address"},{"indexed":true,"internalType":"address","name":"_token","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"}],"name":"FaucetUsed","type":"event"},{"inputs":[],"name":"amount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_recipient","type":"address"}],"name":"cooldown","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_recipient","type":"address"}],"name":"giveTo","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_amount","type":"uint256"}],"name":"setAmount","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"token","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"}]

1
abis/Minter.json Normal file
View File

@ -0,0 +1 @@
[{"inputs":[{"internalType":"address","name":"_beneficiary","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"mintTo","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"}]

2
abis/RegistryClient.json
View File

@ -1 +1 @@
[{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"name":"addressOf","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"}]
[{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"name":"addressOf","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"entry","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"registryCount","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]

1
abis/TokenEndorsement.json Normal file
View File

@ -0,0 +1 @@
[{"inputs":[{"internalType":"address","name":"_tokenAddress","type":"address"}],"name":"getBySymbol","outputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"stateMutability":"view","type":"function"}]

0
abis/TokenEndorser.json → abis/TokenRegistryClient.json
View File

1
abis/TransferApproval.json
View File

@ -1 +0,0 @@
[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"serial","type":"uint256"}],"name":"NewExecution","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint256","name":"serial","type":"uint256"}],"name":"NewRejection","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"_sender","type":"address"},{"indexed":true,"internalType":"address","name":"_recipient","type":"address"},{"indexed":true,"internalType":"address","name":"_token","type":"address"},{"indexed":false,"internalType":"uint256","name":"_value","type":"uint256"},{"indexed":false,"internalType":"uint256","name":"_serial","type":"uint256"}],"name":"NewRequest","type":"event"},{"inputs":[{"internalType":"address","name":"","type":"address"}],"name":"approvers","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"uint256","name":"_serial","type":"uint256"}],"name":"execute","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"_serial","type":"uint256"}],"name":"reject","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"_recipient","type":"address"},{"internalType":"address","name":"_token","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"}],"name":"request","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"","type":"uint256"}],"name":"requests","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"serial","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"}]

2
abis/TransferAuthorization.json
View File

File diff suppressed because one or more lines are too long