Skip to content

Commit a71450a

Browse files
kaichaosunkaichaosun
committed
chore: merge branch 'develop' into feat/sds-integration-v2
2 parents fcf2e1d + 2433eeb commit a71450a

File tree

220 files changed

+5832
-6040
lines changed

Some content is hidden

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

220 files changed

+5832
-6040
lines changed

‎api/defaults.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ func defaultSettings(keyUID string, address string, derivedAddresses map[string]
7474
s.UseMailservers = true
7575

7676
s.PreviewPrivacy = true
77-
s.PeerSyncingEnabled = false
7877
s.Currency = "usd"
7978
s.LinkPreviewRequestEnabled = true
8079

‎appdatabase/database.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (a DbInitializer) Initialize(path, password string, kdfIterationsNumber int
4444
}
4545

4646
func doMigration(db *sql.DB) error {
47-
lastMigration, migrationTableExists, err := sqlite.GetLastMigrationVersion(db)
47+
lastMigration, migrationTableExists, err := sqlite.GetLastMigrationVersion(db, sqlite.StatusMigrationTableName())
4848
if err != nil {
4949
return err
5050
}

‎appdatabase/migrations/sql/1761218568_drop_peer_syncing.up.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE settings DROP COLUMN peer_syncing_enabled;

‎appdatabase/migrations/sql/1761335412_default_log_namespaces.up.sql‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
UPDATE log_config
2+
SET
3+
log_namespaces = 'wakunode:info'
4+
WHERE
5+
log_namespaces IS NULL
6+
OR log_namespaces = '';

‎cmd/push-notification-server/main.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,8 @@ func main() {
122122

123123
messaging, err := messaging.NewCore(
124124
messaging.CoreParams{
125-
Identity: privateKey,
126-
DB: db,
127-
Persistence: protocol.NewMessagingPersistence(db),
128-
NodeKey: nil,
125+
Identity: privateKey,
126+
NodeKey: nil,
129127
WakuConfig: params.WakuV2Config{
130128
Enabled: true,
131129
Host: "0.0.0.0",
@@ -144,6 +142,7 @@ func main() {
144142
TimeSource: timesource.DefaultService(),
145143
},
146144
messaging.WithLogger(logger.Named("messaging")),
145+
messaging.WithSQLitePersistence(db),
147146
)
148147
if err != nil {
149148
os.Exit(exitCodeCreateMessengerFailed)

‎contracts/directory/address.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ import (
44
"errors"
55

66
"github.com/ethereum/go-ethereum/common"
7+
wallet_common "github.com/status-im/status-go/services/wallet/common"
78
)
89

910
var errorNotAvailableOnChainID = errors.New("not available for chainID")
1011

1112
var contractAddressByChainID = map[uint64]common.Address{
12-
10: common.HexToAddress("0xA8d270048a086F5807A8dc0a9ae0e96280C41e3A"), // optimism mainnet
13+
wallet_common.OptimismMainnet: common.HexToAddress("0xA8d270048a086F5807A8dc0a9ae0e96280C41e3A"),
14+
wallet_common.OptimismSepolia: common.HexToAddress("0x6B94e21FAB8Af38E8d89dd4A0480C04e9a5c53Ab"),
1315
}
1416

1517
func ContractAddress(chainID uint64) (common.Address, error) {

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ require (
5252
github.com/status-im/doubleratchet v3.0.0+incompatible
5353
github.com/status-im/markdown v0.0.0-20250825083641-55c1df9bc05d
5454
github.com/status-im/migrate/v4 v4.6.2-status.3
55-
github.com/status-im/mvds v0.0.27-0.20241031073756-b192c603a75d
55+
github.com/status-im/mvds v0.0.27-0.20251022120125-7bdc695d49c4
5656
github.com/status-im/zxcvbn-go v0.0.0-20220311183720-5e8676676857
5757
github.com/stretchr/testify v1.10.0
5858
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
@@ -82,7 +82,9 @@ require (
8282
github.com/brianvoe/gofakeit/v7 v7.3.0
8383
github.com/btcsuite/btcd/btcutil v1.1.6
8484
github.com/cenkalti/backoff/v4 v4.2.1
85+
github.com/cockroachdb/errors v1.11.3
8586
github.com/getsentry/sentry-go v0.29.1
87+
github.com/golang-migrate/migrate/v4 v4.15.2
8688
github.com/gorilla/sessions v1.2.1
8789
github.com/gorilla/websocket v1.5.3
8890
github.com/ipfs/go-log/v2 v2.5.1
@@ -96,7 +98,7 @@ require (
9698
github.com/prometheus/client_model v0.6.1
9799
github.com/schollz/peerdiscovery v1.7.0
98100
github.com/status-im/extkeys v1.4.0
99-
github.com/status-im/go-wallet-sdk v0.0.0-20250924175027-d5faf23a5ef7
101+
github.com/status-im/go-wallet-sdk v0.0.0-20251027141302-43edbd6abc92
100102
github.com/waku-org/go-waku v0.10.1-0.20251003225121-06c9af60f35b
101103
github.com/waku-org/sds-go-bindings v0.0.0-20251024203151-4399ce6ad90b
102104
github.com/waku-org/waku-go-bindings v0.0.0-20250714110306-6feba5b0df4d
@@ -148,7 +150,6 @@ require (
148150
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
149151
github.com/buger/jsonparser v1.1.1 // indirect
150152
github.com/cespare/xxhash/v2 v2.3.0 // indirect
151-
github.com/cockroachdb/errors v1.11.3 // indirect
152153
github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
153154
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
154155
github.com/cockroachdb/pebble v1.1.5 // indirect
@@ -183,7 +184,6 @@ require (
183184
github.com/gofrs/flock v0.12.1 // indirect
184185
github.com/gogo/protobuf v1.3.2 // indirect
185186
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
186-
github.com/golang-migrate/migrate/v4 v4.15.2 // indirect
187187
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
188188
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
189189
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,8 +2094,8 @@ github.com/status-im/extkeys v1.4.0 h1:HiB/vQXZrGveZbGy3W6hI4T0CfCt0uP4xvGwjXL4c
20942094
github.com/status-im/extkeys v1.4.0/go.mod h1:AZGS9vJKbME5tovNqYH/LrfHu8t9ad9nxl76fbLG5PY=
20952095
github.com/status-im/go-sqlcipher/v4 v4.5.4-status.3 h1:/73h1w1hUfb3wVyTlNrUIwahZxatgesCHa6lwO57C2M=
20962096
github.com/status-im/go-sqlcipher/v4 v4.5.4-status.3/go.mod h1:mF2UmIpBnzFeBdu/ypTDb/LdbS0nk0dfSN1WUsWTjMA=
2097-
github.com/status-im/go-wallet-sdk v0.0.0-20250924175027-d5faf23a5ef7 h1:/v5gYWYI3qHClTNkgGwAyd9bvrujdHAw7d0ax1a3zOU=
2098-
github.com/status-im/go-wallet-sdk v0.0.0-20250924175027-d5faf23a5ef7/go.mod h1:mFt4aWzn/gR/IOWL75oEowJNQaBvpe3DxYQo0woAdCE=
2097+
github.com/status-im/go-wallet-sdk v0.0.0-20251027141302-43edbd6abc92 h1:9f9FO1caoP65lwI/6txGPS7YSKjzroFS3bnURkqCMf4=
2098+
github.com/status-im/go-wallet-sdk v0.0.0-20251027141302-43edbd6abc92/go.mod h1:IzWMgrX6WmAAYqDSoF1sZZ8e9EdeIK5FRyDqXc/hs30=
20992099
github.com/status-im/gomoji v1.1.3-0.20220213022530-e5ac4a8732d4 h1:CtobZoiNdHpx+xurFxnuJ1xsGm3oKMfcZkB3vmomJmA=
21002100
github.com/status-im/gomoji v1.1.3-0.20220213022530-e5ac4a8732d4/go.mod h1:hmpnZzkzSZJbFYWAUkrPV8I36x7mdYiPhPqnALP4fKA=
21012101
github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
@@ -2104,8 +2104,8 @@ github.com/status-im/markdown v0.0.0-20250825083641-55c1df9bc05d h1:0jQiaymp0t7X
21042104
github.com/status-im/markdown v0.0.0-20250825083641-55c1df9bc05d/go.mod h1:i31M0FhtYMUeAzWqJafla0Q4+LCGJyorLRCH3EorAWQ=
21052105
github.com/status-im/migrate/v4 v4.6.2-status.3 h1:Khwjb59NzniloUr5i9s9AtkEyqBbQFt1lkoAu66sAu0=
21062106
github.com/status-im/migrate/v4 v4.6.2-status.3/go.mod h1:c/kc90n47GZu/58nnz1OMLTf7uE4Da4gZP5qmU+A/v8=
2107-
github.com/status-im/mvds v0.0.27-0.20241031073756-b192c603a75d h1:+eBm+aBGFgXsJi6wDdEo6ASLd78kPN3vcKtnXQXn240=
2108-
github.com/status-im/mvds v0.0.27-0.20241031073756-b192c603a75d/go.mod h1:2fiAx0q9XYIPKYRq2B1oiO9zZESy/n4D32gWw6lMDsE=
2107+
github.com/status-im/mvds v0.0.27-0.20251022120125-7bdc695d49c4 h1:NrTkZgbgEu7hOJ2Ku4P1yj9boRzdpMs7OlZREBy6MyE=
2108+
github.com/status-im/mvds v0.0.27-0.20251022120125-7bdc695d49c4/go.mod h1:2fiAx0q9XYIPKYRq2B1oiO9zZESy/n4D32gWw6lMDsE=
21092109
github.com/status-im/notify v1.0.2-status/go.mod h1:gF3zSOrafR9DQEWSE8TjfI9NkooDxbyT4UgRGKZA0lc=
21102110
github.com/status-im/zxcvbn-go v0.0.0-20220311183720-5e8676676857 h1:sPkzT7Z7uLmejOsBRlZ0kwDWpqjpHJsp834o5nbhqho=
21112111
github.com/status-im/zxcvbn-go v0.0.0-20220311183720-5e8676676857/go.mod h1:lq9I5ROto5tcua65GmCE6SIW7VE0ucdEBs1fn4z7uWU=

‎messaging/adapters/encryption_subscriptions.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ func FromEncryptionSubscriptions(s *encryption.Subscriptions) *types.EncryptionS
1111
return nil
1212
}
1313
return &types.EncryptionSubscriptions{
14-
SharedSecrets: FromEncryptionSharedSecrets(s.SharedSecrets),
1514
SendContactCode: s.SendContactCode,
1615
NewHashRatchetKeys: utils.BridgeChannelsSlice(s.NewHashRatchetKeys, FromEncryptionHashRatchet),
1716
Quit: s.Quit,

‎messaging/adapters/persistence.go‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)