Skip to content

Commit 3d92a72

Browse files
aalavandhanaalavandhan
committed
deployed new policy implementation
1 parent 5e14374 commit 3d92a72

File tree

2 files changed

+205
-18
lines changed

2 files changed

+205
-18
lines changed

‎.openzeppelin/mainnet.json

Lines changed: 205 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,23 +258,23 @@
258258
"label": "uFrags",
259259
"offset": 0,
260260
"slot": "102",
261-
"type": "t_contract(IUFragments)2591",
261+
"type": "t_contract(IUFragments)20",
262262
"contract": "UFragmentsPolicy",
263263
"src": "contracts/UFragmentsPolicy.sol:48"
264264
},
265265
{
266266
"label": "cpiOracle",
267267
"offset": 0,
268268
"slot": "103",
269-
"type": "t_contract(IOracle)2599",
269+
"type": "t_contract(IOracle)28",
270270
"contract": "UFragmentsPolicy",
271271
"src": "contracts/UFragmentsPolicy.sol:51"
272272
},
273273
{
274274
"label": "marketOracle",
275275
"offset": 0,
276276
"slot": "104",
277-
"type": "t_contract(IOracle)2599",
277+
"type": "t_contract(IOracle)28",
278278
"contract": "UFragmentsPolicy",
279279
"src": "contracts/UFragmentsPolicy.sol:55"
280280
},
@@ -389,11 +389,211 @@
389389
"label": "bool",
390390
"numberOfBytes": "1"
391391
},
392-
"t_contract(IOracle)2599": {
392+
"t_contract(IOracle)28": {
393393
"label": "contract IOracle",
394394
"numberOfBytes": "20"
395395
},
396-
"t_contract(IUFragments)2591": {
396+
"t_contract(IUFragments)20": {
397+
"label": "contract IUFragments",
398+
"numberOfBytes": "20"
399+
},
400+
"t_int256": {
401+
"label": "int256",
402+
"numberOfBytes": "32"
403+
},
404+
"t_uint256": {
405+
"label": "uint256",
406+
"numberOfBytes": "32"
407+
}
408+
}
409+
}
410+
},
411+
"c7369a7d61d189dc4ac496f58ed60273c5ce42a3d8df698d7398067ab9e28815": {
412+
"address": "0x671f768157f6C8A33aDA9b864C8DfaF5b13f1e9F",
413+
"txHash": "0x867d84cd156cf4afee08a44ed6c96cbddbd3c75269e50f8c015edda7628c713f",
414+
"layout": {
415+
"solcVersion": "0.8.4",
416+
"storage": [
417+
{
418+
"label": "initialized",
419+
"offset": 0,
420+
"slot": "0",
421+
"type": "t_bool",
422+
"contract": "Initializable",
423+
"src": "contracts/_external/Initializable.sol:19"
424+
},
425+
{
426+
"label": "initializing",
427+
"offset": 1,
428+
"slot": "0",
429+
"type": "t_bool",
430+
"contract": "Initializable",
431+
"src": "contracts/_external/Initializable.sol:24"
432+
},
433+
{
434+
"label": "______gap",
435+
"offset": 0,
436+
"slot": "1",
437+
"type": "t_array(t_uint256)50_storage",
438+
"contract": "Initializable",
439+
"src": "contracts/_external/Initializable.sol:69"
440+
},
441+
{
442+
"label": "_owner",
443+
"offset": 0,
444+
"slot": "51",
445+
"type": "t_address",
446+
"contract": "Ownable",
447+
"src": "contracts/_external/Ownable.sol:11"
448+
},
449+
{
450+
"label": "______gap",
451+
"offset": 0,
452+
"slot": "52",
453+
"type": "t_array(t_uint256)50_storage",
454+
"contract": "Ownable",
455+
"src": "contracts/_external/Ownable.sol:75"
456+
},
457+
{
458+
"label": "uFrags",
459+
"offset": 0,
460+
"slot": "102",
461+
"type": "t_contract(IUFragments)20",
462+
"contract": "UFragmentsPolicy",
463+
"src": "contracts/UFragmentsPolicy.sol:48"
464+
},
465+
{
466+
"label": "cpiOracle",
467+
"offset": 0,
468+
"slot": "103",
469+
"type": "t_contract(IOracle)28",
470+
"contract": "UFragmentsPolicy",
471+
"src": "contracts/UFragmentsPolicy.sol:51"
472+
},
473+
{
474+
"label": "marketOracle",
475+
"offset": 0,
476+
"slot": "104",
477+
"type": "t_contract(IOracle)28",
478+
"contract": "UFragmentsPolicy",
479+
"src": "contracts/UFragmentsPolicy.sol:55"
480+
},
481+
{
482+
"label": "baseCpi_DEPRECATED",
483+
"offset": 0,
484+
"slot": "105",
485+
"type": "t_uint256",
486+
"contract": "UFragmentsPolicy",
487+
"src": "contracts/UFragmentsPolicy.sol:58",
488+
"renamedFrom": "baseCpi"
489+
},
490+
{
491+
"label": "deviationThreshold",
492+
"offset": 0,
493+
"slot": "106",
494+
"type": "t_uint256",
495+
"contract": "UFragmentsPolicy",
496+
"src": "contracts/UFragmentsPolicy.sol:64"
497+
},
498+
{
499+
"label": "rebaseLagDeprecated",
500+
"offset": 0,
501+
"slot": "107",
502+
"type": "t_uint256",
503+
"contract": "UFragmentsPolicy",
504+
"src": "contracts/UFragmentsPolicy.sol:66"
505+
},
506+
{
507+
"label": "minRebaseTimeIntervalSec",
508+
"offset": 0,
509+
"slot": "108",
510+
"type": "t_uint256",
511+
"contract": "UFragmentsPolicy",
512+
"src": "contracts/UFragmentsPolicy.sol:69"
513+
},
514+
{
515+
"label": "lastRebaseTimestampSec",
516+
"offset": 0,
517+
"slot": "109",
518+
"type": "t_uint256",
519+
"contract": "UFragmentsPolicy",
520+
"src": "contracts/UFragmentsPolicy.sol:72"
521+
},
522+
{
523+
"label": "rebaseWindowOffsetSec",
524+
"offset": 0,
525+
"slot": "110",
526+
"type": "t_uint256",
527+
"contract": "UFragmentsPolicy",
528+
"src": "contracts/UFragmentsPolicy.sol:76"
529+
},
530+
{
531+
"label": "rebaseWindowLengthSec",
532+
"offset": 0,
533+
"slot": "111",
534+
"type": "t_uint256",
535+
"contract": "UFragmentsPolicy",
536+
"src": "contracts/UFragmentsPolicy.sol:79"
537+
},
538+
{
539+
"label": "epoch",
540+
"offset": 0,
541+
"slot": "112",
542+
"type": "t_uint256",
543+
"contract": "UFragmentsPolicy",
544+
"src": "contracts/UFragmentsPolicy.sol:82"
545+
},
546+
{
547+
"label": "orchestrator",
548+
"offset": 0,
549+
"slot": "113",
550+
"type": "t_address",
551+
"contract": "UFragmentsPolicy",
552+
"src": "contracts/UFragmentsPolicy.sol:93"
553+
},
554+
{
555+
"label": "rebaseFunctionLowerPercentage",
556+
"offset": 0,
557+
"slot": "114",
558+
"type": "t_int256",
559+
"contract": "UFragmentsPolicy",
560+
"src": "contracts/UFragmentsPolicy.sol:97"
561+
},
562+
{
563+
"label": "rebaseFunctionUpperPercentage",
564+
"offset": 0,
565+
"slot": "115",
566+
"type": "t_int256",
567+
"contract": "UFragmentsPolicy",
568+
"src": "contracts/UFragmentsPolicy.sol:98"
569+
},
570+
{
571+
"label": "rebaseFunctionGrowth",
572+
"offset": 0,
573+
"slot": "116",
574+
"type": "t_int256",
575+
"contract": "UFragmentsPolicy",
576+
"src": "contracts/UFragmentsPolicy.sol:99"
577+
}
578+
],
579+
"types": {
580+
"t_address": {
581+
"label": "address",
582+
"numberOfBytes": "20"
583+
},
584+
"t_array(t_uint256)50_storage": {
585+
"label": "uint256[50]",
586+
"numberOfBytes": "1600"
587+
},
588+
"t_bool": {
589+
"label": "bool",
590+
"numberOfBytes": "1"
591+
},
592+
"t_contract(IOracle)28": {
593+
"label": "contract IOracle",
594+
"numberOfBytes": "20"
595+
},
596+
"t_contract(IUFragments)20": {
397597
"label": "contract IUFragments",
398598
"numberOfBytes": "20"
399599
},

‎scripts/upgrade.ts

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ task('upgrade:ampl', 'Upgrade ampleforth contracts')
103103

104104
task('prep:upgrade:policy')
105105
.addParam('address', 'which proxy address to upgrade')
106-
.addParam('prevVersion', 'the version tag of the previous implementation')
107106
.setAction(async function (args: TaskArguments, hre) {
108107
console.log(args)
109108
const upgrades = hre.upgrades as any
@@ -112,19 +111,7 @@ task('prep:upgrade:policy')
112111
const signerAddress = await signer.getAddress()
113112
console.log('Signer', signerAddress)
114113

115-
const prevFactory = await ethers.getContractFactoryFromArtifact(
116-
JSON.parse(
117-
readFileSync(
118-
path.join(
119-
__dirname,
120-
`/../external-artifacts/UFragmentsPolicy_${args.prevVersion}.json`,
121-
),
122-
).toString(),
123-
),
124-
)
125114
const newFactory = await hre.ethers.getContractFactory('UFragmentsPolicy')
126-
127-
// const prevImpl = await upgrades.forceImport(args.address, prevFactory)
128115
await upgrades.validateUpgrade(args.address, newFactory)
129116
const newImpl = await upgrades.prepareUpgrade(args.address, newFactory)
130117
console.log('New implementation at:', newImpl)

0 commit comments

Comments
 (0)