Skip to content

Commit 7af251e

Browse files
pk910pk910
committed
Merge remote-tracking branch 'origin/master'
2 parents c0d33a1 + 133c485 commit 7af251e

File tree

9 files changed

+28
-24
lines changed

9 files changed

+28
-24
lines changed

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ require (
1717
github.com/juliangruber/go-intersect v1.1.0
1818
github.com/lib/pq v1.10.9
1919
github.com/mashingan/smapping v0.1.19
20-
github.com/pressly/goose/v3 v3.23.0
20+
github.com/pressly/goose/v3 v3.23.1
2121
github.com/prometheus/client_golang v1.20.5
2222
github.com/protolambda/zrnt v0.32.3
2323
github.com/protolambda/ztyp v0.2.2
@@ -103,11 +103,11 @@ require (
103103
go.opentelemetry.io/otel/metric v1.27.0 // indirect
104104
go.opentelemetry.io/otel/trace v1.27.0 // indirect
105105
go.uber.org/multierr v1.11.0 // indirect
106-
golang.org/x/crypto v0.28.0 // indirect
106+
golang.org/x/crypto v0.31.0 // indirect
107107
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
108108
golang.org/x/net v0.30.0 // indirect
109-
golang.org/x/sync v0.9.0 // indirect
110-
golang.org/x/sys v0.26.0 // indirect
109+
golang.org/x/sync v0.10.0 // indirect
110+
golang.org/x/sys v0.28.0 // indirect
111111
golang.org/x/time v0.6.0 // indirect
112112
golang.org/x/tools v0.22.0 // indirect
113113
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect

‎go.sum‎

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ github.com/ferranbt/fastssz v0.1.3 h1:ZI+z3JH05h4kgmFXdHuR1aWYsgrg7o+Fw7/NCzM16M
6868
github.com/ferranbt/fastssz v0.1.3/go.mod h1:0Y9TEd/9XuFlh7mskMPfXiI2Dkw4Ddg9EyXt1W7MRvE=
6969
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
7070
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
71+
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
72+
github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
7173
github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps=
7274
github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
7375
github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=
@@ -217,8 +219,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
217219
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
218220
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
219221
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
220-
github.com/pressly/goose/v3 v3.23.0 h1:57hqKos8izGek4v6D5+OXBa+Y4Rq8MU//+MmnevdpVA=
221-
github.com/pressly/goose/v3 v3.23.0/go.mod h1:rpx+D9GX/+stXmzKa+uh1DkjPnNVMdiOCV9iLdle4N8=
222+
github.com/pressly/goose/v3 v3.23.1 h1:bwjOXvep4HtuiiIqtrXmCkQu0IW9O9JAqA6UQNY9ntk=
223+
github.com/pressly/goose/v3 v3.23.1/go.mod h1:0oK0zcK7cmNqJSVwMIOiUUW0ox2nDIz+UfPMSOaw2zY=
222224
github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
223225
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
224226
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
@@ -260,6 +262,8 @@ github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
260262
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
261263
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
262264
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
265+
github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
266+
github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg=
263267
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
264268
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
265269
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -315,8 +319,8 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8
315319
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
316320
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
317321
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
318-
golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw=
319-
golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U=
322+
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
323+
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
320324
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY=
321325
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI=
322326
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
@@ -332,8 +336,8 @@ golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
332336
golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
333337
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
334338
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
335-
golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
336-
golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
339+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
340+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
337341
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
338342
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
339343
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -348,17 +352,17 @@ golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
348352
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
349353
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
350354
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
351-
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
352-
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
355+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
356+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
353357
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
354358
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
355359
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
356360
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
357361
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
358362
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
359363
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
360-
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
361-
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
364+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
365+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
362366
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
363367
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
364368
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

‎pkg/coordinator/tasks/generate_consolidations/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Default settings for the `generate_consolidations` task:
8888
targetPublicKey: ""
8989
consolidationEpoch: null
9090
walletPrivkey: ""
91-
consolidationContract: 0x01aBEa29659e5e97C95107F20bb753cD3e09bBBb
91+
consolidationContract: 0x00431F263cE400f4455c2dCf564e53007Ca4bbBb
9292
txAmount: "500000000000000000"
9393
txFeeCap: "100000000000"
9494
txTipCap: "1000000000"

‎pkg/coordinator/tasks/generate_consolidations/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ type Config struct {
3030

3131
func DefaultConfig() Config {
3232
return Config{
33-
ConsolidationContract: "0x01aBEa29659e5e97C95107F20bb753cD3e09bBBb",
33+
ConsolidationContract: "0x00431F263cE400f4455c2dCf564e53007Ca4bbBb",
3434
TxAmount: big.NewInt(500000000000000000), // 0.5 ETH
3535
TxFeeCap: big.NewInt(100000000000), // 100 Gwei
3636
TxTipCap: big.NewInt(1000000000), // 1 Gwei

‎pkg/coordinator/tasks/generate_withdrawal_requests/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Default settings for the `generate_withdrawal_requests` task:
8080
sourceIndexCount: 0
8181
withdrawAmount: 0
8282
walletPrivkey: ""
83-
withdrawalContract: 0x09Fc772D0857550724b07B850a4323f39112aAaA
83+
withdrawalContract: 0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA
8484
txAmount: "500000000000000000"
8585
txFeeCap: "100000000000"
8686
txTipCap: "1000000000"

‎pkg/coordinator/tasks/generate_withdrawal_requests/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type Config struct {
2929

3030
func DefaultConfig() Config {
3131
return Config{
32-
WithdrawalContract: "0x09Fc772D0857550724b07B850a4323f39112aAaA",
32+
WithdrawalContract: "0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA",
3333
TxAmount: big.NewInt(500000000000000000), // 0.5 ETH
3434
TxFeeCap: big.NewInt(100000000000), // 100 Gwei
3535
TxTipCap: big.NewInt(1000000000), // 1 Gwei

‎playbooks/pectra-dev/kurtosis/el-triggered-exit.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ tasks:
2525
- name: generate_transaction
2626
title: "Exit Validator ${validatorIndex} via EL"
2727
config:
28-
targetAddress: "0x09Fc772D0857550724b07B850a4323f39112aAaA"
28+
targetAddress: "0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA"
2929
feeCap: 50000000000 # 50 gwei
3030
gasLimit: 1000000
3131
amount: "500000000000000000" # 0.5 ETH

‎playbooks/pectra-dev/kurtosis/el-triggered-withdrawal.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ tasks:
4444
- name: generate_transaction
4545
title: "Exit Validator ${validatorIndex} via EL"
4646
config:
47-
targetAddress: "0x09Fc772D0857550724b07B850a4323f39112aAaA"
47+
targetAddress: "0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA"
4848
feeCap: 50000000000 # 50 gwei
4949
gasLimit: 1000000
5050
amount: "500000000000000000" # 0.5 ETH

‎playbooks/pectra-dev/validator-lifecycle-test-v3.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -822,7 +822,7 @@ tasks:
822822
- name: generate_transaction
823823
title: "Send partial withdrawal transaction for key 8"
824824
config:
825-
targetAddress: "0x09Fc772D0857550724b07B850a4323f39112aAaA"
825+
targetAddress: "0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA"
826826
feeCap: 50000000000 # 50 gwei
827827
gasLimit: 1000000
828828
amount: "500000000000000000" # 0.5 ETH
@@ -884,7 +884,7 @@ tasks:
884884
- name: generate_transaction
885885
title: "Send exit transaction for key 0"
886886
config:
887-
targetAddress: "0x09Fc772D0857550724b07B850a4323f39112aAaA"
887+
targetAddress: "0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA"
888888
feeCap: 50000000000 # 50 gwei
889889
gasLimit: 1000000
890890
amount: "500000000000000000" # 0.5 ETH
@@ -911,7 +911,7 @@ tasks:
911911
- name: generate_transaction
912912
title: "Send exit transaction for key 2"
913913
config:
914-
targetAddress: "0x09Fc772D0857550724b07B850a4323f39112aAaA"
914+
targetAddress: "0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA"
915915
feeCap: 50000000000 # 50 gwei
916916
gasLimit: 1000000
917917
amount: "500000000000000000" # 0.5 ETH
@@ -938,7 +938,7 @@ tasks:
938938
- name: generate_transaction
939939
title: "Send exit transaction for key 9"
940940
config:
941-
targetAddress: "0x09Fc772D0857550724b07B850a4323f39112aAaA"
941+
targetAddress: "0x0c15F14308530b7CDB8460094BbB9cC28b9AaaAA"
942942
feeCap: 50000000000 # 50 gwei
943943
gasLimit: 1000000
944944
amount: "500000000000000000" # 0.5 ETH

0 commit comments

Comments
 (0)