Skip to content

Commit fb5939b

Browse files
pmpretepmprete
authored
Merge pull request #109 from rsksmart/side-token-677
Add support for ERC20 tokens with other decimals than 18 and ERC677 support
2 parents 0d246d0 + 6f6b4c4 commit fb5939b

File tree

92 files changed

+20013
-13708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+20013
-13708
lines changed

‎.circleci/config.yml

+8
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,11 @@ jobs:
3838
command: |
3939
cd bridge
4040
npm test
41+
- run:
42+
name: contracts coverage
43+
command: |
44+
cd bridge
45+
npm run coverage
46+
- store_artifacts:
47+
path: bridge/coverage
48+
destination: coverage

‎abis/AdminUpgradeabilityProxy.json

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
[
2+
{
3+
"constant": false,
4+
"inputs": [
5+
{
6+
"name": "newImplementation",
7+
"type": "address"
8+
}
9+
],
10+
"name": "upgradeTo",
11+
"outputs": [],
12+
"payable": false,
13+
"stateMutability": "nonpayable",
14+
"type": "function"
15+
},
16+
{
17+
"constant": false,
18+
"inputs": [
19+
{
20+
"name": "newImplementation",
21+
"type": "address"
22+
},
23+
{
24+
"name": "data",
25+
"type": "bytes"
26+
}
27+
],
28+
"name": "upgradeToAndCall",
29+
"outputs": [],
30+
"payable": true,
31+
"stateMutability": "payable",
32+
"type": "function"
33+
},
34+
{
35+
"constant": false,
36+
"inputs": [],
37+
"name": "implementation",
38+
"outputs": [
39+
{
40+
"name": "",
41+
"type": "address"
42+
}
43+
],
44+
"payable": false,
45+
"stateMutability": "nonpayable",
46+
"type": "function"
47+
},
48+
{
49+
"constant": false,
50+
"inputs": [
51+
{
52+
"name": "newAdmin",
53+
"type": "address"
54+
}
55+
],
56+
"name": "changeAdmin",
57+
"outputs": [],
58+
"payable": false,
59+
"stateMutability": "nonpayable",
60+
"type": "function"
61+
},
62+
{
63+
"constant": false,
64+
"inputs": [],
65+
"name": "admin",
66+
"outputs": [
67+
{
68+
"name": "",
69+
"type": "address"
70+
}
71+
],
72+
"payable": false,
73+
"stateMutability": "nonpayable",
74+
"type": "function"
75+
},
76+
{
77+
"inputs": [
78+
{
79+
"name": "_logic",
80+
"type": "address"
81+
},
82+
{
83+
"name": "_admin",
84+
"type": "address"
85+
},
86+
{
87+
"name": "_data",
88+
"type": "bytes"
89+
}
90+
],
91+
"payable": true,
92+
"stateMutability": "payable",
93+
"type": "constructor"
94+
},
95+
{
96+
"payable": true,
97+
"stateMutability": "payable",
98+
"type": "fallback"
99+
},
100+
{
101+
"anonymous": false,
102+
"inputs": [
103+
{
104+
"indexed": false,
105+
"name": "previousAdmin",
106+
"type": "address"
107+
},
108+
{
109+
"indexed": false,
110+
"name": "newAdmin",
111+
"type": "address"
112+
}
113+
],
114+
"name": "AdminChanged",
115+
"type": "event"
116+
},
117+
{
118+
"anonymous": false,
119+
"inputs": [
120+
{
121+
"indexed": true,
122+
"name": "implementation",
123+
"type": "address"
124+
}
125+
],
126+
"name": "Upgraded",
127+
"type": "event"
128+
}
129+
]

0 commit comments

Comments
 (0)