Skip to content

Commit e1cdc23

Browse files
jjgonecryptojjgonecrypto
committed
Merge branch 'master' into develop
2 parents 1f6dd63 + f41aee7 commit e1cdc23

File tree

12 files changed

+179
-80
lines changed

12 files changed

+179
-80
lines changed

‎package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "synthetix",
3-
"version": "2.54.0",
3+
"version": "2.55.0",
44
"license": "MIT",
55
"author": "Synthetix",
66
"description": "The smart contracts which make up the Synthetix system. (synthetix.io)",

‎publish/deployed/kovan-ovm/deployment.json

Lines changed: 26 additions & 11 deletions
Large diffs are not rendered by default.

‎publish/deployed/kovan-ovm/versions.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -922,8 +922,9 @@
922922
},
923923
"WrapperFactory": {
924924
"address": "0xcc079BCb1dAe79C4494776f096BEff683Cd571CE",
925-
"status": "current",
926-
"keccak256": "0x0a16f80beda8876e3b17af0e6841cac26e959ab3806b581aeea027c2bd9cf8d7"
925+
"status": "replaced",
926+
"keccak256": "0x0a16f80beda8876e3b17af0e6841cac26e959ab3806b581aeea027c2bd9cf8d7",
927+
"replaced_in": "v2.55.0-alpha"
927928
}
928929
}
929930
},
@@ -951,5 +952,20 @@
951952
"keccak256": "0xcbf35931a8a63393fb545169c8cb2be9b1bdee327053ee54e0482f84caa52479"
952953
}
953954
}
955+
},
956+
"v2.55.0-alpha": {
957+
"tag": "v2.55.0-alpha",
958+
"fulltag": "v2.55.0-alpha",
959+
"release": "Atria",
960+
"network": "kovan",
961+
"date": "2021-12-02T22:52:06-05:00",
962+
"commit": "c9c3471dff553de7d4baa700adc1bd71b73b58c0",
963+
"contracts": {
964+
"WrapperFactory": {
965+
"address": "0xb7469A575b7931532F09AEe2882835A0249064a0",
966+
"status": "current",
967+
"keccak256": "0x582cac91f50cfefc154d67097081d0dd0d4877333df51c3cfe19485f80ef7e74"
968+
}
969+
}
954970
}
955971
}

‎publish/deployed/kovan/deployment.json

Lines changed: 11 additions & 11 deletions
Large diffs are not rendered by default.

‎publish/deployed/kovan/versions.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6814,8 +6814,9 @@
68146814
},
68156815
"WrapperFactory": {
68166816
"address": "0xDE390c23De4cb2c9CC2e50c28f22A8b5f947b748",
6817-
"status": "current",
6818-
"keccak256": "0x0b16131f068641f79c66eb17f5504abe5e2df3a7c2acb097c8db05de3113c7af"
6817+
"status": "replaced",
6818+
"keccak256": "0x0b16131f068641f79c66eb17f5504abe5e2df3a7c2acb097c8db05de3113c7af",
6819+
"replaced_in": "v2.55.0-alpha"
68196820
}
68206821
}
68216822
},
@@ -6838,5 +6839,20 @@
68386839
"keccak256": "0xa1449f609b4427b695977ed157cfe46414a16d902590507338c7d5fb00c40206"
68396840
}
68406841
}
6842+
},
6843+
"v2.55.0-alpha": {
6844+
"tag": "v2.55.0-alpha",
6845+
"fulltag": "v2.55.0-alpha",
6846+
"release": "Atria",
6847+
"network": "kovan",
6848+
"date": "2021-12-02T22:52:06-05:00",
6849+
"commit": "c9c3471dff553de7d4baa700adc1bd71b73b58c0",
6850+
"contracts": {
6851+
"WrapperFactory": {
6852+
"address": "0x6B4D3e213e10d9238c1a1A87E493687cc2eb1DD0",
6853+
"status": "current",
6854+
"keccak256": "0x582cac91f50cfefc154d67097081d0dd0d4877333df51c3cfe19485f80ef7e74"
6855+
}
6856+
}
68416857
}
68426858
}

‎publish/deployed/mainnet-ovm/deployment.json

Lines changed: 39 additions & 24 deletions
Large diffs are not rendered by default.

‎publish/deployed/mainnet-ovm/versions.json

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,9 @@
502502
},
503503
"FeePool": {
504504
"address": "0xc08db5823a7c1DC8fe9894F51A05799F1262bAC0",
505-
"status": "current",
506-
"keccak256": "0x8a65c401cfedc5e54b3544097f5873fff54bed8a0facdd2db530c816e53a93e0"
505+
"status": "replaced",
506+
"keccak256": "0x8a65c401cfedc5e54b3544097f5873fff54bed8a0facdd2db530c816e53a93e0",
507+
"replaced_in": "v2.55.0"
507508
},
508509
"DebtCache": {
509510
"address": "0x01f8C5e421172B67cc14B7f5F369cfb10de0acD4",
@@ -538,8 +539,9 @@
538539
},
539540
"WrapperFactory": {
540541
"address": "0x620C8800Ec73aC705151EC8327913c2910cC46B1",
541-
"status": "current",
542-
"keccak256": "0x0a16f80beda8876e3b17af0e6841cac26e959ab3806b581aeea027c2bd9cf8d7"
542+
"status": "replaced",
543+
"keccak256": "0x0a16f80beda8876e3b17af0e6841cac26e959ab3806b581aeea027c2bd9cf8d7",
544+
"replaced_in": "v2.55.0"
543545
}
544546
}
545547
},
@@ -567,5 +569,25 @@
567569
"keccak256": "0xcbf35931a8a63393fb545169c8cb2be9b1bdee327053ee54e0482f84caa52479"
568570
}
569571
}
572+
},
573+
"v2.55.0": {
574+
"tag": "v2.55.0",
575+
"fulltag": "v2.55.0",
576+
"release": "Atria",
577+
"network": "mainnet",
578+
"date": "2021-12-03T00:55:48-05:00",
579+
"commit": "36df74f7de3157ed962cca4a285e7e3c78134b7a",
580+
"contracts": {
581+
"FeePool": {
582+
"address": "0xbc12131c93Da011B2844FA76c373A8cf5b0db4B5",
583+
"status": "current",
584+
"keccak256": "0xb89f33e39e3b4c3f010dd3f4ee922c00778b73845226e3edd97715ead2888cd5"
585+
},
586+
"WrapperFactory": {
587+
"address": "0x27be2EFAd45DeBd732C1EBf5C9F7b49D498D4a93",
588+
"status": "current",
589+
"keccak256": "0x582cac91f50cfefc154d67097081d0dd0d4877333df51c3cfe19485f80ef7e74"
590+
}
591+
}
570592
}
571593
}

‎publish/deployed/mainnet/deployment.json

Lines changed: 11 additions & 11 deletions
Large diffs are not rendered by default.

‎publish/deployed/mainnet/versions.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3850,8 +3850,9 @@
38503850
},
38513851
"WrapperFactory": {
38523852
"address": "0x0a6956d554485a43494D69Eca78C5103511a8fEb",
3853-
"status": "current",
3854-
"keccak256": "0x0b16131f068641f79c66eb17f5504abe5e2df3a7c2acb097c8db05de3113c7af"
3853+
"status": "replaced",
3854+
"keccak256": "0x0b16131f068641f79c66eb17f5504abe5e2df3a7c2acb097c8db05de3113c7af",
3855+
"replaced_in": "v2.55.0"
38553856
}
38563857
}
38573858
},
@@ -3874,5 +3875,20 @@
38743875
"keccak256": "0xa1449f609b4427b695977ed157cfe46414a16d902590507338c7d5fb00c40206"
38753876
}
38763877
}
3878+
},
3879+
"v2.55.0": {
3880+
"tag": "v2.55.0",
3881+
"fulltag": "v2.55.0",
3882+
"release": "Atria",
3883+
"network": "mainnet",
3884+
"date": "2021-12-03T00:55:48-05:00",
3885+
"commit": "36df74f7de3157ed962cca4a285e7e3c78134b7a",
3886+
"contracts": {
3887+
"WrapperFactory": {
3888+
"address": "0x02f9bC46beD33acdB9cb002fe346734CeF8a9480",
3889+
"status": "current",
3890+
"keccak256": "0x582cac91f50cfefc154d67097081d0dd0d4877333df51c3cfe19485f80ef7e74"
3891+
}
3892+
}
38773893
}
38783894
}

‎publish/releases.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,8 @@
411411
{
412412
"sip": 192,
413413
"layer": "both",
414-
"sources": ["WrapperFactory"]
414+
"sources": ["WrapperFactory"],
415+
"released": "both"
415416
}
416417
],
417418
"releases": [
@@ -706,22 +707,22 @@
706707
},
707708
{
708709
"name": "Atria",
709-
"released": false,
710+
"released": true,
710711
"version": {
711712
"major": 2,
712713
"minor": 55
713714
},
714-
"sips": []
715+
"sips": [192]
715716
},
716717
{
717718
"name": "Atria (Optimism)",
718719
"ovm": true,
719-
"released": false,
720+
"released": true,
720721
"version": {
721722
"major": 2,
722723
"minor": 55
723724
},
724-
"sips": []
725+
"sips": [192]
725726
},
726727
{
727728
"name": "Alhena",

‎publish/src/SafeBatchSubmitter.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,10 @@ class SafeBatchSubmitter {
5555

5656
let matchedTxnIsPending = false;
5757

58-
for (const {
59-
nonce,
60-
dataDecoded: {
58+
for (const { nonce, dataDecoded } of pendingTxns.results) {
59+
const {
6160
parameters: [{ valueDecoded }],
62-
},
63-
} of pendingTxns.results) {
61+
} = dataDecoded || { parameters: [{ valueDecoded: [] }] };
6462
// figure out what the next unused nonce position is (including everything else in the queue)
6563
this.unusedNoncePosition = Math.max(this.unusedNoncePosition, nonce + 1);
6664
matchedTxnIsPending =

0 commit comments

Comments
 (0)