Final merge branch 'main' into v2

This commit is contained in:
Cassandra Heart 2024-10-12 11:51:02 -07:00
commit 697983ec75
No known key found for this signature in database
GPG Key ID: 6352152859385958
5 changed files with 51794 additions and 1 deletions

View File

@ -93,6 +93,7 @@ func (n *Node) VerifyProofIntegrity() {
if e != nil { if e != nil {
panic(e) panic(e)
} }
dataProver := crypto.NewKZGInclusionProver(n.logger) dataProver := crypto.NewKZGInclusionProver(n.logger)
wesoProver := crypto.NewWesolowskiFrameProver(n.logger) wesoProver := crypto.NewWesolowskiFrameProver(n.logger)

51764
node/bridged.json Normal file

File diff suppressed because it is too large Load Diff

View File

@ -67,6 +67,13 @@ var BootstrapPeers = []string{
"/ip4/70.36.102.32/udp/8336/quic-v1/p2p/QmYriGRXCUiwFodqSoS4GgEcD7UVyxXPeCgQKmYne3iLSF", "/ip4/70.36.102.32/udp/8336/quic-v1/p2p/QmYriGRXCUiwFodqSoS4GgEcD7UVyxXPeCgQKmYne3iLSF",
"/ip4/204.12.220.2/udp/8336/quic-v1/p2p/QmRw5Tw4p5v2vLPvVSAkQEiRPQGnWk9HM4xiSvgxF82CCw", "/ip4/204.12.220.2/udp/8336/quic-v1/p2p/QmRw5Tw4p5v2vLPvVSAkQEiRPQGnWk9HM4xiSvgxF82CCw",
"/ip4/209.159.149.14/udp/8336/quic-v1/p2p/Qmcq4Lmw45tbodvdRWZ8iGgy3rUcR3dikHTj1fBXP8VJqv", "/ip4/209.159.149.14/udp/8336/quic-v1/p2p/Qmcq4Lmw45tbodvdRWZ8iGgy3rUcR3dikHTj1fBXP8VJqv",
"/ip4/148.251.9.90/udp/8336/quic-v1/p2p/QmRpKmQ1W83s6moBFpG6D6nrttkqdQSbdCJpvfxDVGcs38",
"/ip4/35.232.113.144/udp/8336/quic-v1/p2p/QmWxkBc7a17ZsLHhszLyTvKsoHMKvKae2XwfQXymiU66md",
"/ip4/34.87.85.78/udp/8336/quic-v1/p2p/QmTGguT5XhtvZZwTLnNQTN8Bg9eUm1THWEneXXHGhMDPrz",
"/ip4/34.81.199.27/udp/8336/quic-v1/p2p/QmTMMKpzCKJCwrnUzNu6tNj4P1nL7hVqz251245wsVpGNg",
"/ip4/34.143.255.235/udp/8336/quic-v1/p2p/QmeifsP6Kvq8A3yabQs6CBg7prSpDSqdee8P2BDQm9EpP8",
"/ip4/34.34.125.238/udp/8336/quic-v1/p2p/QmZdSyBJLm9UiDaPZ4XDkgRGXUwPcHJCmKoH6fS9Qjyko4",
"/ip4/34.80.245.52/udp/8336/quic-v1/p2p/QmNmbqobt82Vre5JxUGVNGEWn2HsztQQ1xfeg6mx7X5u3f",
"/dns/bravo-1.qcommander.sh/udp/8336/quic-v1/p2p/QmWFK1gVuhEqZdr8phTo3QbyLwjYmyivx31Zubqt7oR4XB", "/dns/bravo-1.qcommander.sh/udp/8336/quic-v1/p2p/QmWFK1gVuhEqZdr8phTo3QbyLwjYmyivx31Zubqt7oR4XB",
"/ip4/109.199.100.108/udp/8336/quic-v1/p2p/Qma9fgugQc17MDu4YRSvnhfhVre6AYZ3nZdW8dSUYbsWvm", "/ip4/109.199.100.108/udp/8336/quic-v1/p2p/Qma9fgugQc17MDu4YRSvnhfhVre6AYZ3nZdW8dSUYbsWvm",
"/ip4/47.251.49.193/udp/8336/quic-v1/p2p/QmP6ADPmMCsB8y82oFbrKTrwYWXt1CTMJ3jGNDXRHyYJgR", "/ip4/47.251.49.193/udp/8336/quic-v1/p2p/QmP6ADPmMCsB8y82oFbrKTrwYWXt1CTMJ3jGNDXRHyYJgR",

View File

@ -36,5 +36,5 @@ func FormatVersion(version []byte) string {
} }
func GetPatchNumber() byte { func GetPatchNumber() byte {
return 0x00 return 0x01
} }

View File

@ -53,3 +53,24 @@ func TestCalculateChallengeProofDifficulty(t *testing.T) {
difficulty800k := w.CalculateChallengeProofDifficulty(800000) difficulty800k := w.CalculateChallengeProofDifficulty(800000)
assert.Equal(t, 25000, difficulty800k) assert.Equal(t, 25000, difficulty800k)
} }
func TestCalculateChallengeProofDifficulty(t *testing.T) {
l, _ := zap.NewProduction()
w := crypto.NewWesolowskiFrameProver(l)
// At 0 increments, the difficulty should be 200,000
difficulty0 := w.CalculateChallengeProofDifficulty(0)
assert.Equal(t, 200000, difficulty0)
// At 100,000 increments, the difficulty should be 175,000
difficulty100k := w.CalculateChallengeProofDifficulty(100000)
assert.Equal(t, 175000, difficulty100k)
// At 700,000 increments, the difficulty should be 25,000
difficulty700k := w.CalculateChallengeProofDifficulty(700000)
assert.Equal(t, 25000, difficulty700k)
// At 800,000 increments, the difficulty should stay at 25,000
difficulty800k := w.CalculateChallengeProofDifficulty(800000)
assert.Equal(t, 25000, difficulty800k)
}