Skip to content

Commit 1f97b14

Browse files
eternauta1337eternauta1337
committed
Update to develop
2 parents c2f6e8d + a7ae3f8 commit 1f97b14

14 files changed

+473
-16
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ jobs:
6161
git fetch
6262
git checkout master
6363
git pull origin master
64+
git checkout 86708bb5758cd2b647b3ca2be698beb5aa3af81f
6465
yarn
6566
yarn build
6667
cd ops

‎.circleci/src/jobs/job-integration-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ steps:
1313
git fetch
1414
git checkout master
1515
git pull origin master
16+
git checkout 86708bb5758cd2b647b3ca2be698beb5aa3af81f
1617
yarn
1718
yarn build
1819
cd ops

‎hardhat.config.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,12 @@ module.exports = {
5050
allowUnlimitedContractSize: true,
5151
gasPrice: GAS_PRICE,
5252
initialDate: new Date(inflationStartTimestampInSecs * 1000).toISOString(),
53-
timeout: 600000,
5453
// Note: forking settings are injected at runtime by hardhat/tasks/task-node.js
5554
},
5655
localhost: {
5756
gas: 12e6,
5857
blockGasLimit: 12e6,
5958
url: 'http://localhost:8545',
60-
timeout: 600000,
6159
},
6260
},
6361
gasReporter: {

‎hardhat/tasks/task-test-integration-dual.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ task('test:integration:dual', 'run integrated layer 1 and layer 2 production tes
2828
const buildPathOvm =
2929
taskArguments.buildPathOvm || path.join(__dirname, '..', '..', `${BUILD_FOLDER}-ovm`);
3030

31-
const timeout = 5 * 60 * 1000;
31+
const timeout = 600000; // 10m
3232
hre.config.mocha.timeout = timeout;
3333
hre.config.mocha.bail = true;
3434
hre.config.networks.localhost.timeout = timeout;

‎hardhat/tasks/task-test-integration-l1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ task('test:integration:l1', 'run isolated layer 1 production tests')
2626
const providerPort = (hre.config.providerPort = taskArguments.providerPort);
2727
const buildPath = taskArguments.buildPath || path.join(__dirname, '..', '..', BUILD_FOLDER);
2828

29-
const timeout = 5 * 60 * 1000;
29+
const timeout = 600000; // 10m
3030
hre.config.mocha.timeout = timeout;
3131
hre.config.mocha.bail = true;
3232
hre.config.networks.localhost.timeout = timeout;

‎hardhat/tasks/task-test-integration-l2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ task('test:integration:l2', 'run isolated layer 2 production tests')
2222
const buildPath =
2323
taskArguments.buildPath || path.join(__dirname, '..', '..', `${BUILD_FOLDER}-ovm`);
2424

25-
const timeout = 5 * 60 * 1000;
25+
const timeout = 600000; // 10m
2626
hre.config.mocha.timeout = timeout;
2727
hre.config.mocha.bail = true;
2828
hre.config.networks.localhost.timeout = timeout;

‎test/integration/abis/WETH.json

Lines changed: 279 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,279 @@
1+
[
2+
{
3+
"constant": true,
4+
"inputs": [],
5+
"name": "name",
6+
"outputs": [
7+
{
8+
"name": "",
9+
"type": "string"
10+
}
11+
],
12+
"payable": false,
13+
"stateMutability": "view",
14+
"type": "function"
15+
},
16+
{
17+
"constant": false,
18+
"inputs": [
19+
{
20+
"name": "guy",
21+
"type": "address"
22+
},
23+
{
24+
"name": "wad",
25+
"type": "uint256"
26+
}
27+
],
28+
"name": "approve",
29+
"outputs": [
30+
{
31+
"name": "",
32+
"type": "bool"
33+
}
34+
],
35+
"payable": false,
36+
"stateMutability": "nonpayable",
37+
"type": "function"
38+
},
39+
{
40+
"constant": true,
41+
"inputs": [],
42+
"name": "totalSupply",
43+
"outputs": [
44+
{
45+
"name": "",
46+
"type": "uint256"
47+
}
48+
],
49+
"payable": false,
50+
"stateMutability": "view",
51+
"type": "function"
52+
},
53+
{
54+
"constant": false,
55+
"inputs": [
56+
{
57+
"name": "src",
58+
"type": "address"
59+
},
60+
{
61+
"name": "dst",
62+
"type": "address"
63+
},
64+
{
65+
"name": "wad",
66+
"type": "uint256"
67+
}
68+
],
69+
"name": "transferFrom",
70+
"outputs": [
71+
{
72+
"name": "",
73+
"type": "bool"
74+
}
75+
],
76+
"payable": false,
77+
"stateMutability": "nonpayable",
78+
"type": "function"
79+
},
80+
{
81+
"constant": false,
82+
"inputs": [
83+
{
84+
"name": "wad",
85+
"type": "uint256"
86+
}
87+
],
88+
"name": "withdraw",
89+
"outputs": [],
90+
"payable": false,
91+
"stateMutability": "nonpayable",
92+
"type": "function"
93+
},
94+
{
95+
"constant": true,
96+
"inputs": [],
97+
"name": "decimals",
98+
"outputs": [
99+
{
100+
"name": "",
101+
"type": "uint8"
102+
}
103+
],
104+
"payable": false,
105+
"stateMutability": "view",
106+
"type": "function"
107+
},
108+
{
109+
"constant": true,
110+
"inputs": [
111+
{
112+
"name": "",
113+
"type": "address"
114+
}
115+
],
116+
"name": "balanceOf",
117+
"outputs": [
118+
{
119+
"name": "",
120+
"type": "uint256"
121+
}
122+
],
123+
"payable": false,
124+
"stateMutability": "view",
125+
"type": "function"
126+
},
127+
{
128+
"constant": true,
129+
"inputs": [],
130+
"name": "symbol",
131+
"outputs": [
132+
{
133+
"name": "",
134+
"type": "string"
135+
}
136+
],
137+
"payable": false,
138+
"stateMutability": "view",
139+
"type": "function"
140+
},
141+
{
142+
"constant": false,
143+
"inputs": [
144+
{
145+
"name": "dst",
146+
"type": "address"
147+
},
148+
{
149+
"name": "wad",
150+
"type": "uint256"
151+
}
152+
],
153+
"name": "transfer",
154+
"outputs": [
155+
{
156+
"name": "",
157+
"type": "bool"
158+
}
159+
],
160+
"payable": false,
161+
"stateMutability": "nonpayable",
162+
"type": "function"
163+
},
164+
{
165+
"constant": false,
166+
"inputs": [],
167+
"name": "deposit",
168+
"outputs": [],
169+
"payable": true,
170+
"stateMutability": "payable",
171+
"type": "function"
172+
},
173+
{
174+
"constant": true,
175+
"inputs": [
176+
{
177+
"name": "",
178+
"type": "address"
179+
},
180+
{
181+
"name": "",
182+
"type": "address"
183+
}
184+
],
185+
"name": "allowance",
186+
"outputs": [
187+
{
188+
"name": "",
189+
"type": "uint256"
190+
}
191+
],
192+
"payable": false,
193+
"stateMutability": "view",
194+
"type": "function"
195+
},
196+
{
197+
"payable": true,
198+
"stateMutability": "payable",
199+
"type": "fallback"
200+
},
201+
{
202+
"anonymous": false,
203+
"inputs": [
204+
{
205+
"indexed": true,
206+
"name": "src",
207+
"type": "address"
208+
},
209+
{
210+
"indexed": true,
211+
"name": "guy",
212+
"type": "address"
213+
},
214+
{
215+
"indexed": false,
216+
"name": "wad",
217+
"type": "uint256"
218+
}
219+
],
220+
"name": "Approval",
221+
"type": "event"
222+
},
223+
{
224+
"anonymous": false,
225+
"inputs": [
226+
{
227+
"indexed": true,
228+
"name": "src",
229+
"type": "address"
230+
},
231+
{
232+
"indexed": true,
233+
"name": "dst",
234+
"type": "address"
235+
},
236+
{
237+
"indexed": false,
238+
"name": "wad",
239+
"type": "uint256"
240+
}
241+
],
242+
"name": "Transfer",
243+
"type": "event"
244+
},
245+
{
246+
"anonymous": false,
247+
"inputs": [
248+
{
249+
"indexed": true,
250+
"name": "dst",
251+
"type": "address"
252+
},
253+
{
254+
"indexed": false,
255+
"name": "wad",
256+
"type": "uint256"
257+
}
258+
],
259+
"name": "Deposit",
260+
"type": "event"
261+
},
262+
{
263+
"anonymous": false,
264+
"inputs": [
265+
{
266+
"indexed": true,
267+
"name": "src",
268+
"type": "address"
269+
},
270+
{
271+
"indexed": false,
272+
"name": "wad",
273+
"type": "uint256"
274+
}
275+
],
276+
"name": "Withdrawal",
277+
"type": "event"
278+
}
279+
]

‎test/integration/behaviors/stake.behavior.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ function itCanStake({ ctx }) {
106106
const newDebtsUSD = await Synthetix.debtBalanceOf(user.address, toBytes32('sUSD'));
107107
const debtReduction = debtsUSD.sub(newDebtsUSD);
108108

109-
const tolerance = ethers.utils.parseUnits('40', 'gwei');
109+
const tolerance = ethers.utils.parseUnits('0.01', 'ether');
110110
assert.bnClose(
111111
debtReduction.toString(),
112112
amountToIssueAndBurnsUSD.toString(),

0 commit comments

Comments
 (0)