From 0d20e247b5a9addfa5bd55a1823d12b22edca679 Mon Sep 17 00:00:00 2001 From: dufucun Date: Thu, 20 Jun 2024 14:07:27 +0900 Subject: [PATCH 1/8] chore: fix some function names (#1257) Signed-off-by: dufucun Co-authored-by: dufucun --- accounts/keystore/account_cache_test.go | 2 +- accounts/keystore/keystore_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index 7481fe9424..f9d45913cb 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -51,7 +51,7 @@ var ( } ) -// waitWatcherStarts waits up to 1s for the keystore watcher to start. +// waitWatcherStart waits up to 1s for the keystore watcher to start. func waitWatcherStart(ks *KeyStore) bool { // On systems where file watch is not supported, just return "ok". if !ks.cache.watcher.enabled() { diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go index 5ac4c8dba1..ad20b9391c 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -372,7 +372,7 @@ func TestWalletNotifications(t *testing.T) { checkEvents(t, wantEvents, events) } -// TestImportExport tests the import functionality of a keystore. +// TestImportECDSA tests the import functionality of a keystore. func TestImportECDSA(t *testing.T) { t.Parallel() _, ks := tmpKeyStore(t, true) @@ -395,7 +395,7 @@ func TestImportECDSA(t *testing.T) { } } -// TestImportECDSA tests the import and export functionality of a keystore. +// TestImportExport tests the import and export functionality of a keystore. func TestImportExport(t *testing.T) { t.Parallel() _, ks := tmpKeyStore(t, true) From 75f1f9ad77e17b799bbdb01e0ed4a466f4a65586 Mon Sep 17 00:00:00 2001 From: 0xsajal <114051808+0xsajal@users.noreply.github.com> Date: Wed, 10 Jul 2024 17:09:27 +0530 Subject: [PATCH 2/8] README: Update discord link (#1288) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index df48157217..46e4965071 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/6874 )](https://pkg.go.dev/github.com/maticnetwork/bor) [![Go Report Card](https://goreportcard.com/badge/github.com/maticnetwork/bor)](https://goreportcard.com/report/github.com/maticnetwork/bor) ![MIT License](https://img.shields.io/github/license/maticnetwork/bor) -[![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=Polygon%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat-square)](https://discord.com/invite/0xPolygonDevs) +[![Discord](https://img.shields.io/discord/714888181740339261?color=1C1CE1&label=Polygon%20%7C%20Discord%20%F0%9F%91%8B%20&style=flat-square)](https://discord.gg/0xpolygon) [![Twitter Follow](https://img.shields.io/twitter/follow/0xPolygon.svg?style=social)](https://twitter.com/0xPolygon) ### Installing bor using packaging From 164933d316516d35eb9a358918ed55fc73e14ee2 Mon Sep 17 00:00:00 2001 From: Denny Ooi Date: Thu, 25 Jul 2024 22:21:47 -0700 Subject: [PATCH 3/8] p2p/discover: unwrap 4-in-6 UDP source addresses (#29944) (#1292) Fixes an issue where discovery responses were not recognized. Co-authored-by: Felix Lange --- p2p/discover/v4_udp.go | 5 +++++ p2p/discover/v5_udp.go | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go index 8ddc4b1c2a..fc6ce0242b 100644 --- a/p2p/discover/v4_udp.go +++ b/p2p/discover/v4_udp.go @@ -600,6 +600,11 @@ func (t *UDPv4) readLoop(unhandled chan<- ReadPacket) { } func (t *UDPv4) handlePacket(from netip.AddrPort, buf []byte) error { + // Unwrap IPv4-in-6 source address. + if from.Addr().Is4In6() { + from = netip.AddrPortFrom(netip.AddrFrom4(from.Addr().As4()), from.Port()) + } + rawpacket, fromKey, hash, err := v4wire.Decode(buf) if err != nil { t.log.Debug("Bad discv4 packet", "addr", from, "err", err) diff --git a/p2p/discover/v5_udp.go b/p2p/discover/v5_udp.go index 240647ed5e..517f47f54b 100644 --- a/p2p/discover/v5_udp.go +++ b/p2p/discover/v5_udp.go @@ -725,6 +725,10 @@ func (t *UDPv5) readLoop() { // dispatchReadPacket sends a packet into the dispatch loop. func (t *UDPv5) dispatchReadPacket(from netip.AddrPort, content []byte) bool { + // Unwrap IPv4-in-6 source address. + if from.Addr().Is4In6() { + from = netip.AddrPortFrom(netip.AddrFrom4(from.Addr().As4()), from.Port()) + } select { case t.packetInCh <- ReadPacket{content, from}: return true From 577a8a037615f5128c1e6f5e04dc366592ee6d52 Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Fri, 26 Jul 2024 13:38:52 +0530 Subject: [PATCH 4/8] p2p/discover: add missing lock when calling tab.handleAddNode (#29960) (#1295) Co-authored-by: Gealber Morales <48373523+Gealber@users.noreply.github.com> --- p2p/discover/table.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/p2p/discover/table.go b/p2p/discover/table.go index 6a64935cce..97275831a2 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -458,7 +458,9 @@ func (tab *Table) loadSeedNodes() { addr, _ := seed.UDPEndpoint() tab.log.Trace("Found seed node in database", "id", seed.ID(), "addr", addr, "age", age) } + tab.mutex.Lock() tab.handleAddNode(addNodeOp{node: seed, isInbound: false}) + tab.mutex.Unlock() } } From d0c74c4cf293a5bdb784362e09afcba00affdf91 Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Mon, 29 Jul 2024 14:44:48 +0530 Subject: [PATCH 5/8] fix: eth/protocol: bunduled transactions are not broadcasted to the peers (#1296) --- core/types/transaction.go | 1 + eth/protocols/eth/broadcast.go | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/types/transaction.go b/core/types/transaction.go index 22d969e4cb..da09dcf5a5 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -56,6 +56,7 @@ type Transaction struct { inner TxData // Consensus contents of a transaction time time.Time // Time first seen locally (spam avoidance) + // BOR specific - DO NOT REMOVE // knownAccounts (EIP-4337) optionsAA4337 *OptionsAA4337 diff --git a/eth/protocols/eth/broadcast.go b/eth/protocols/eth/broadcast.go index 646a3c9163..e53854a6f1 100644 --- a/eth/protocols/eth/broadcast.go +++ b/eth/protocols/eth/broadcast.go @@ -80,7 +80,11 @@ func (p *Peer) broadcastTransactions() { size common.StorageSize ) for i := 0; i < len(queue) && size < maxTxPacketSize; i++ { - if tx := p.txpool.Get(queue[i]); tx != nil { + tx := p.txpool.Get(queue[i]) + + // BOR specific - DO NOT REMOVE + // Skip EIP-4337 bundled transactions + if tx != nil && tx.GetOptions() == nil { txs = append(txs, tx) size += common.StorageSize(tx.Size()) } @@ -151,6 +155,7 @@ func (p *Peer) announceTransactions() { ) for count = 0; count < len(queue) && size < maxTxPacketSize; count++ { tx := p.txpool.Get(queue[count]) + // BOR specific - DO NOT REMOVE // Skip EIP-4337 bundled transactions if tx != nil && tx.GetOptions() == nil { pending = append(pending, queue[count]) From 6939df80daaca6f355c6ff70555db7cf263e7637 Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Tue, 30 Jul 2024 10:00:12 +0530 Subject: [PATCH 6/8] replaced 4337 with PIP-15 --- core/txpool/legacypool/list_test.go | 2 +- core/types/block.go | 8 ++++---- core/types/block_test.go | 12 ++++++------ core/types/transaction.go | 16 ++++++++-------- core/types/transaction_conditional.go | 2 +- eth/protocols/eth/broadcast.go | 4 ++-- internal/ethapi/bor_api.go | 6 +++--- miner/test_backend.go | 4 ++-- miner/worker.go | 4 ++-- 9 files changed, 29 insertions(+), 29 deletions(-) diff --git a/core/txpool/legacypool/list_test.go b/core/txpool/legacypool/list_test.go index 86bd9e1957..15db484699 100644 --- a/core/txpool/legacypool/list_test.go +++ b/core/txpool/legacypool/list_test.go @@ -109,7 +109,7 @@ func TestFilterTxConditional(t *testing.T) { // and add to the list. tx2 := transaction(1, 1000, key) - var options types.OptionsAA4337 + var options types.OptionsPIP15 options.KnownAccounts = types.KnownAccounts{ common.Address{19: 1}: &types.Value{ diff --git a/core/types/block.go b/core/types/block.go index 9ae0e6f453..0f0a60d03d 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -189,8 +189,8 @@ func (h *Header) EmptyReceipts() bool { return h.ReceiptHash == EmptyReceiptsHash } -// ValidateBlockNumberOptions4337 validates the block range passed as in the options parameter in the conditional transaction (EIP-4337) -func (h *Header) ValidateBlockNumberOptions4337(minBlockNumber *big.Int, maxBlockNumber *big.Int) error { +// ValidateBlockNumberOptionsPIP15 validates the block range passed as in the options parameter in the conditional transaction (PIP-15) +func (h *Header) ValidateBlockNumberOptionsPIP15(minBlockNumber *big.Int, maxBlockNumber *big.Int) error { currentBlockNumber := h.Number if minBlockNumber != nil { @@ -208,8 +208,8 @@ func (h *Header) ValidateBlockNumberOptions4337(minBlockNumber *big.Int, maxBloc return nil } -// ValidateBlockNumberOptions4337 validates the timestamp range passed as in the options parameter in the conditional transaction (EIP-4337) -func (h *Header) ValidateTimestampOptions4337(minTimestamp *uint64, maxTimestamp *uint64) error { +// ValidateBlockNumberOptionsPIP15 validates the timestamp range passed as in the options parameter in the conditional transaction (PIP-15) +func (h *Header) ValidateTimestampOptionsPIP15(minTimestamp *uint64, maxTimestamp *uint64) error { currentBlockTime := h.Time if minTimestamp != nil { diff --git a/core/types/block_test.go b/core/types/block_test.go index a42d578f33..5446f18c67 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -435,7 +435,7 @@ func TestRlpDecodeParentHash(t *testing.T) { } } -func TestValidateBlockNumberOptions4337(t *testing.T) { +func TestValidateBlockNumberOptionsPIP15(t *testing.T) { t.Parallel() testsPass := []struct { @@ -503,19 +503,19 @@ func TestValidateBlockNumberOptions4337(t *testing.T) { } for _, test := range testsPass { - if err := test.header.ValidateBlockNumberOptions4337(test.minBlockNumber, test.maxBlockNumber); err != nil { + if err := test.header.ValidateBlockNumberOptionsPIP15(test.minBlockNumber, test.maxBlockNumber); err != nil { t.Fatalf("test number %v should not have failed. err: %v", test.number, err) } } for _, test := range testsFail { - if err := test.header.ValidateBlockNumberOptions4337(test.minBlockNumber, test.maxBlockNumber); err == nil { + if err := test.header.ValidateBlockNumberOptionsPIP15(test.minBlockNumber, test.maxBlockNumber); err == nil { t.Fatalf("test number %v should have failed. err is nil", test.number) } } } -func TestValidateTimestampOptions4337(t *testing.T) { +func TestValidateTimestampOptionsPIP15(t *testing.T) { t.Parallel() u64Ptr := func(n uint64) *uint64 { @@ -587,13 +587,13 @@ func TestValidateTimestampOptions4337(t *testing.T) { } for _, test := range testsPass { - if err := test.header.ValidateTimestampOptions4337(test.minTimestamp, test.maxTimestamp); err != nil { + if err := test.header.ValidateTimestampOptionsPIP15(test.minTimestamp, test.maxTimestamp); err != nil { t.Fatalf("test number %v should not have failed. err: %v", test.number, err) } } for _, test := range testsFail { - if err := test.header.ValidateTimestampOptions4337(test.minTimestamp, test.maxTimestamp); err == nil { + if err := test.header.ValidateTimestampOptionsPIP15(test.minTimestamp, test.maxTimestamp); err == nil { t.Fatalf("test number %v should have failed. err is nil", test.number) } } diff --git a/core/types/transaction.go b/core/types/transaction.go index da09dcf5a5..db032043ad 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -57,8 +57,8 @@ type Transaction struct { time time.Time // Time first seen locally (spam avoidance) // BOR specific - DO NOT REMOVE - // knownAccounts (EIP-4337) - optionsAA4337 *OptionsAA4337 + // knownAccounts (PIP-15) + optionsPIP15 *OptionsPIP15 // caches hash atomic.Value @@ -106,14 +106,14 @@ type TxData interface { decode([]byte) error } -// PutOptions stores the optionsAA4337 field of the conditional transaction (EIP-4337) -func (tx *Transaction) PutOptions(options *OptionsAA4337) { - tx.optionsAA4337 = options +// PutOptions stores the optionsPIP15 field of the conditional transaction (PIP-15) +func (tx *Transaction) PutOptions(options *OptionsPIP15) { + tx.optionsPIP15 = options } -// GetOptions returns the optionsAA4337 field of the conditional transaction (EIP-4337) -func (tx *Transaction) GetOptions() *OptionsAA4337 { - return tx.optionsAA4337 +// GetOptions returns the optionsPIP15 field of the conditional transaction (PIP-15) +func (tx *Transaction) GetOptions() *OptionsPIP15 { + return tx.optionsPIP15 } // EncodeRLP implements rlp.Encoder diff --git a/core/types/transaction_conditional.go b/core/types/transaction_conditional.go index 358303a0b5..94b9b5fef7 100644 --- a/core/types/transaction_conditional.go +++ b/core/types/transaction_conditional.go @@ -112,7 +112,7 @@ func InsertKnownAccounts[T common.Hash | map[common.Hash]common.Hash](accounts K } } -type OptionsAA4337 struct { +type OptionsPIP15 struct { KnownAccounts KnownAccounts `json:"knownAccounts"` BlockNumberMin *big.Int `json:"blockNumberMin"` BlockNumberMax *big.Int `json:"blockNumberMax"` diff --git a/eth/protocols/eth/broadcast.go b/eth/protocols/eth/broadcast.go index e53854a6f1..f3826497e0 100644 --- a/eth/protocols/eth/broadcast.go +++ b/eth/protocols/eth/broadcast.go @@ -83,7 +83,7 @@ func (p *Peer) broadcastTransactions() { tx := p.txpool.Get(queue[i]) // BOR specific - DO NOT REMOVE - // Skip EIP-4337 bundled transactions + // Skip PIP-15 bundled transactions if tx != nil && tx.GetOptions() == nil { txs = append(txs, tx) size += common.StorageSize(tx.Size()) @@ -156,7 +156,7 @@ func (p *Peer) announceTransactions() { for count = 0; count < len(queue) && size < maxTxPacketSize; count++ { tx := p.txpool.Get(queue[count]) // BOR specific - DO NOT REMOVE - // Skip EIP-4337 bundled transactions + // Skip PIP-15 bundled transactions if tx != nil && tx.GetOptions() == nil { pending = append(pending, queue[count]) pendingTypes = append(pendingTypes, tx.Type()) diff --git a/internal/ethapi/bor_api.go b/internal/ethapi/bor_api.go index 80ed986166..7443b1f19b 100644 --- a/internal/ethapi/bor_api.go +++ b/internal/ethapi/bor_api.go @@ -67,7 +67,7 @@ func NewBorAPI(b Backend) *BorAPI { // SendRawTransactionConditional will add the signed transaction to the transaction pool. // The sender/bundler is responsible for signing the transaction -func (api *BorAPI) SendRawTransactionConditional(ctx context.Context, input hexutil.Bytes, options types.OptionsAA4337) (common.Hash, error) { +func (api *BorAPI) SendRawTransactionConditional(ctx context.Context, input hexutil.Bytes, options types.OptionsPIP15) (common.Hash, error) { tx := new(types.Transaction) if err := tx.UnmarshalBinary(input); err != nil { return common.Hash{}, err @@ -81,12 +81,12 @@ func (api *BorAPI) SendRawTransactionConditional(ctx context.Context, input hexu } // check block number range - if err := currentHeader.ValidateBlockNumberOptions4337(options.BlockNumberMin, options.BlockNumberMax); err != nil { + if err := currentHeader.ValidateBlockNumberOptionsPIP15(options.BlockNumberMin, options.BlockNumberMax); err != nil { return common.Hash{}, &rpc.OptionsValidateError{Message: "out of block range. err: " + err.Error()} } // check timestamp range - if err := currentHeader.ValidateTimestampOptions4337(options.TimestampMin, options.TimestampMax); err != nil { + if err := currentHeader.ValidateTimestampOptionsPIP15(options.TimestampMin, options.TimestampMax); err != nil { return common.Hash{}, &rpc.OptionsValidateError{Message: "out of time range. err: " + err.Error()} } diff --git a/miner/test_backend.go b/miner/test_backend.go index 2611a26673..bd1face4eb 100644 --- a/miner/test_backend.go +++ b/miner/test_backend.go @@ -601,14 +601,14 @@ mainloop: // not prioritising conditional transaction, yet. //nolint:nestif if options := tx.GetOptions(); options != nil { - if err := env.header.ValidateBlockNumberOptions4337(options.BlockNumberMin, options.BlockNumberMax); err != nil { + if err := env.header.ValidateBlockNumberOptionsPIP15(options.BlockNumberMin, options.BlockNumberMax); err != nil { log.Trace("Dropping conditional transaction", "from", from, "hash", tx.Hash(), "reason", err) txs.Pop() continue } - if err := env.header.ValidateTimestampOptions4337(options.TimestampMin, options.TimestampMax); err != nil { + if err := env.header.ValidateTimestampOptionsPIP15(options.TimestampMin, options.TimestampMax); err != nil { log.Trace("Dropping conditional transaction", "from", from, "hash", tx.Hash(), "reason", err) txs.Pop() diff --git a/miner/worker.go b/miner/worker.go index 31f41d9a44..8e7adefa5f 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -1023,14 +1023,14 @@ mainloop: // not prioritising conditional transaction, yet. //nolint:nestif if options := tx.GetOptions(); options != nil { - if err := env.header.ValidateBlockNumberOptions4337(options.BlockNumberMin, options.BlockNumberMax); err != nil { + if err := env.header.ValidateBlockNumberOptionsPIP15(options.BlockNumberMin, options.BlockNumberMax); err != nil { log.Trace("Dropping conditional transaction", "from", from, "hash", tx.Hash(), "reason", err) txs.Pop() continue } - if err := env.header.ValidateTimestampOptions4337(options.TimestampMin, options.TimestampMax); err != nil { + if err := env.header.ValidateTimestampOptionsPIP15(options.TimestampMin, options.TimestampMax); err != nil { log.Trace("Dropping conditional transaction", "from", from, "hash", tx.Hash(), "reason", err) txs.Pop() From 369a59e2202d9e8d8ba662d99a5d934988e1a6ff Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Tue, 30 Jul 2024 10:01:08 +0530 Subject: [PATCH 7/8] version bump to 1.3.5-beta --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- .../templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index da6b7bbfad..8654c72544 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 1.3.4 +Version: 1.3.5-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index d818fd23b6..be990bf493 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 1.3.4 +Version: 1.3.5-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index accd2ff65c..e03d656cd9 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.4 +Version: 1.3.5-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index 1974de5ee0..021238a4ce 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.4 +Version: 1.3.5-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index 3b71d548e0..babb6b6dcc 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.4 +Version: 1.3.5-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index 3bb238d801..6d25375986 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.4 +Version: 1.3.5-beta Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index 6dbc3b6cf2..0e9974725f 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 3 // Minor version component of the current release - VersionPatch = 4 // Patch version component of the current release - VersionMeta = "" // Version metadata to append to the version string + VersionMajor = 1 // Major version component of the current release + VersionMinor = 3 // Minor version component of the current release + VersionPatch = 5 // Patch version component of the current release + VersionMeta = "beta" // Version metadata to append to the version string ) var GitCommit string From 7646fb573e7ce0c0bd77c630c50057925fb561ef Mon Sep 17 00:00:00 2001 From: Pratik Patil Date: Mon, 12 Aug 2024 10:06:36 +0530 Subject: [PATCH 8/8] version bump 1.3.7 --- packaging/templates/package_scripts/control | 2 +- packaging/templates/package_scripts/control.arm64 | 2 +- packaging/templates/package_scripts/control.profile.amd64 | 2 +- packaging/templates/package_scripts/control.profile.arm64 | 2 +- packaging/templates/package_scripts/control.validator | 2 +- .../templates/package_scripts/control.validator.arm64 | 2 +- params/version.go | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control index 8654c72544..de2116d4f7 100644 --- a/packaging/templates/package_scripts/control +++ b/packaging/templates/package_scripts/control @@ -1,5 +1,5 @@ Source: bor -Version: 1.3.5-beta +Version: 1.3.7 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64 index be990bf493..dc19273911 100644 --- a/packaging/templates/package_scripts/control.arm64 +++ b/packaging/templates/package_scripts/control.arm64 @@ -1,5 +1,5 @@ Source: bor -Version: 1.3.5-beta +Version: 1.3.7 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64 index e03d656cd9..f5b9b2d8e2 100644 --- a/packaging/templates/package_scripts/control.profile.amd64 +++ b/packaging/templates/package_scripts/control.profile.amd64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.5-beta +Version: 1.3.7 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64 index 021238a4ce..f264453125 100644 --- a/packaging/templates/package_scripts/control.profile.arm64 +++ b/packaging/templates/package_scripts/control.profile.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.5-beta +Version: 1.3.7 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator index babb6b6dcc..cbbdcc9695 100644 --- a/packaging/templates/package_scripts/control.validator +++ b/packaging/templates/package_scripts/control.validator @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.5-beta +Version: 1.3.7 Section: develop Priority: standard Maintainer: Polygon diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64 index 6d25375986..77cb076cd8 100644 --- a/packaging/templates/package_scripts/control.validator.arm64 +++ b/packaging/templates/package_scripts/control.validator.arm64 @@ -1,5 +1,5 @@ Source: bor-profile -Version: 1.3.5-beta +Version: 1.3.7 Section: develop Priority: standard Maintainer: Polygon diff --git a/params/version.go b/params/version.go index 0e9974725f..8f7e9c3c11 100644 --- a/params/version.go +++ b/params/version.go @@ -21,10 +21,10 @@ import ( ) const ( - VersionMajor = 1 // Major version component of the current release - VersionMinor = 3 // Minor version component of the current release - VersionPatch = 5 // Patch version component of the current release - VersionMeta = "beta" // Version metadata to append to the version string + VersionMajor = 1 // Major version component of the current release + VersionMinor = 3 // Minor version component of the current release + VersionPatch = 7 // Patch version component of the current release + VersionMeta = "" // Version metadata to append to the version string ) var GitCommit string