Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[AVAX] Merge Cortina 16 (v1.10.16) #316

Merged
merged 66 commits into from
Mar 11, 2024
Merged

[AVAX] Merge Cortina 16 (v1.10.16) #316

merged 66 commits into from
Mar 11, 2024

Conversation

evlekht
Copy link
Member

@evlekht evlekht commented Mar 8, 2024 •
edited
Loading

Why this should be merged

This PR contains changes from ava-labs/avalanchego between cortina-15 and cortina-16.
https://github.com/ava-labs/avalanchego/releases/tag/v1.10.16

Conflicts

  • RELEASES.md
  • api/admin/client.go
  • api/admin/service.go
  • go.mod
  • go.sum
  • node/node.go
  • version/compatibility.json
  • version/constants.go
  • vms/platformvm/api/static_service.go
  • vms/platformvm/service.go
  • vms/platformvm/vm.go

Post-merge fixes

PVM network & block-builder

Avalanche moved platformvm/blocks/builder network to its own pkg, so caminoNetwork was moved as well and blocks caminoBuilder is no longer needed, so its removed. Network.IssueTx is now used instead of Builder.AddUnverifiedTx, its also does tx verification.

PVM mempool

Avalanche refactored pvm mempool, so issuer and remover Visitor interface implementations are no longer needed and got removed.

PVM state & config

Avalanche changed state, so it no longer stores config. We were using config to get initial base fee and fee distribution values, so this had to be refactored.

How this was tested

With already existing unit-tests and e2e tests.

StephenButtolph and others added 30 commits November 2, 2023 20:20
@StephenButtolph
Return log levels from admin.SetLoggerLevel (ava-labs#2250)
c174c62
@DoTheBestToGetTheBest @StephenButtolph
feat(api) : Peers function to return the PrimaryAlias of the chainID (a…
11f1b55 
…va-labs#2251)

Signed-off-by: DoTheBestToGetTheBest <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
@marun
Switch to using require.TestingT interface in SenderTest struct (ava-…
437ade8 
…labs#2258)
Cleanup ipcs Socket test (ava-labs#2257)
e4cb2cd
@StephenButtolph
Require poll metrics to be registered (ava-labs#2260)
cec1cd1
@StephenButtolph
Track all subnet validator sets in the validator manager (ava-labs#2253)
aaed8f3
@marun
e2e: Make NewWallet and NewEthclient regular functions (ava-labs#2262)
a8db08e
@vuittont60
Fix typos in docs (ava-labs#2261)
558d8fb 
Signed-off-by: vuittont60 <[email protected]>
@dboehm-avalabs @darioush
Remove Token constants information from keys (ava-labs#2197)
e710899 
Signed-off-by: David Boehm <[email protected]>
Signed-off-by: Dan Laine <[email protected]>
Co-authored-by: Darioush Jalali <[email protected]>
Co-authored-by: Dan Laine <[email protected]>
@dhrubabasu
Remove unused UnsortedEquals function (ava-labs#2264)
10bd428
@joshua-kim @StephenButtolph
Document p2p package (ava-labs#2254)
7490a92 
Signed-off-by: Joshua Kim <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
@felipemadero @StephenButtolph
Use extended public key to derive ledger addresses (ava-labs#2246)
cdcfb5b 
Signed-off-by: felipemadero <[email protected]>
Co-authored-by: Dan Laine <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
merkledb -- rename nit (ava-labs#2267)
1faec38
merkledb -- fix nil check in test (ava-labs#2268)
52f93c8
Add read-only database flag (--db-read-only) (ava-labs#2266)
683fcfa
merkledb -- remove unneeded var declarations (ava-labs#2269)
22f3c89
@abi87
Add fuzz test for NewIteratorWithStartAndPrefix (ava-labs#1992)
1329a59 
Co-authored-by: Alberto Benegiamo <[email protected]>
@dhrubabasu
Return if element was deleted from Hashmap (ava-labs#2271)
93d88c0 
Co-authored-by: Dan Laine <[email protected]>
@dhrubabasu
mempool.NewMempool -> mempool.New (ava-labs#2276)
fc95834
@marun
e2e: Refactor suite setup and helpers to tests/fixture/e2e for reuse …
aba404e 
…by coreth (ava-labs#2265)
@dhrubabasu
Cleanup platformvm mempool errs (ava-labs#2278)
bcd4a94
@dboehm-avalabs
MerkleDB:Naming and comments cleanup (ava-labs#2274)
c94ff4e 
Co-authored-by: Dan Laine <[email protected]>
@dhrubabasu
Move DropExpiredStakerTxs to platformvm mempool (ava-labs#2279)
ebaf9d4
@abi87
Cleanup ids.NodeID usage (ava-labs#2280)
151621f
@abi87
Genesis validators cleanup (ava-labs#2282)
e3f1212
@joshua-kim
Remove Lazy Initialize on Node (ava-labs#1384)
094ce50 
Signed-off-by: Joshua Kim <[email protected]>
Co-authored-by: Dan Laine <[email protected]>
@dboehm-avalabs @StephenButtolph
Remove sentinel node from MerkleDB proofs (ava-labs#2106)
86201ae 
Signed-off-by: David Boehm <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
Co-authored-by: Dan Laine <[email protected]>
@dhrubabasu
Embed noop handler for all unhandled messages (ava-labs#2288)
b8746de
merkledb -- Add Clearer interface (ava-labs#2277)
baf0ef7
@StephenButtolph
Simplify get server creation (ava-labs#2285)
7f70fcf 
Co-authored-by: Dan Laine <[email protected]>
StephenButtolph and others added 16 commits November 17, 2023 05:39
@StephenButtolph
Unexport avalanche constant from common package (ava-labs#2327)
585424e
@StephenButtolph
Remove common.Config functions (ava-labs#2328)
fe72c5b
@StephenButtolph
Move engine startup into helper function (ava-labs#2329)
392b313
@StephenButtolph
Remove bootstrapping retry config (ava-labs#2301)
4768ed4
@StephenButtolph
Export snowman bootstrapper (ava-labs#2331)
dbc209c
@StephenButtolph
Remove common.Config from syncer.Config (ava-labs#2330)
a803f38
platformvm.VM -- replace Config field with validators.Manager (a…
40934bb 
…va-labs#2319)
@StephenButtolph
Improve height monitoring (ava-labs#2347)
b573889
@StephenButtolph
Cleanup snowman consensus metrics (ava-labs#2349)
2b737d5
@StephenButtolph
Expand consensus health check (ava-labs#2354)
f7cc69b
@StephenButtolph
Reduce the size of the OracleBlock interface (ava-labs#2355)
459f8ba
@patrick-ogrady @abi87
[vms/proposervm] Update Build Heuristic (ava-labs#2348)
f2f6d0a 
Co-authored-by: Alberto Benegiamo <[email protected]>
@gyuho @dhrubabasu @StephenButtolph
Use linkedhashmap for P-Chain mempool (ava-labs#1536)
4ce0d67 
Co-authored-by: dhrubabasu <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
@StephenButtolph
Fix P-chain mempool tx count metric (ava-labs#2361)
48c541c
@StephenButtolph
Update versions for v1.10.16 (ava-labs#2353)
62df19c
@evlekht
[AVAX] Intermediate Merge Cortina 16 (v1.10.16)
151c6ee 
# Conflicts:
#	RELEASES.md
#	api/admin/client.go
#	api/admin/service.go
#	go.mod
#	go.sum
#	node/node.go
#	version/compatibility.json
#	version/constants.go
#	vms/platformvm/api/static_service.go
#	vms/platformvm/service.go
#	vms/platformvm/vm.go
@evlekht evlekht force-pushed the evlekht/cortina/16 branch 2 times, most recently from 904c8fb to 300ac8b Compare March 8, 2024 13:26
@evlekht evlekht marked this pull request as ready for review March 8, 2024 13:45
@knikos knikos self-requested a review March 8, 2024 13:52
@evlekht evlekht force-pushed the evlekht/cortina/16 branch from 300ac8b to 4d5c5f1 Compare March 11, 2024 07:56
@evlekht evlekht merged commit 77dc6f9 into dev Mar 11, 2024
17 checks passed
@evlekht evlekht deleted the evlekht/cortina/16 branch March 11, 2024 08:07
@evlekht evlekht mentioned this pull request Jul 24, 2024
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@knikos knikos knikos approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.