gnoswap-labs · notJoon · Apr 16, 2026 · Apr 23, 2026 · Apr 23, 2026 · Apr 23, 2026
diff --git a/contract/p/gnoswap/store/doc.gno b/contract/p/gnoswap/store/doc.gno
@@ -148,7 +148,7 @@
 //   - CastToBool: Casts to bool with error handling
 //   - CastToString: Casts to string with error handling
 //   - CastToAddress: Casts to address with error handling
-//   - CastToTree: Casts to *avl.Tree with error handling
+//   - CastToTree: Casts to *bptree.BPTree with error handling
 //
 // These utilities are used internally by typed getters but can also be used directly.
 //

diff --git a/contract/p/gnoswap/store/kv_store.gno b/contract/p/gnoswap/store/kv_store.gno
@@ -3,7 +3,7 @@ package store
 import (
 	"chain/runtime"
 
-	avl "gno.land/p/nt/avl/v0"
+	bptree "gno.land/p/nt/bptree/v0"
 )
 
 // kvStore represents a domain-specific key-value storage
@@ -116,9 +116,9 @@ func (k *kvStore) GetAddress(key string) (address, error) {
 	return castToAddress(result)
 }
 
-// GetTree retrieves a value by key and casts it to *avl.Tree
-// Returns ErrFailedCast if the value is not of type *avl.Tree
-func (k *kvStore) GetTree(key string) (*avl.Tree, error) {
+// GetTree retrieves a value by key and casts it to *bptree.BPTree
+// Returns ErrFailedCast if the value is not of type *bptree.BPTree
+func (k *kvStore) GetTree(key string) (*bptree.BPTree, error) {
 	result, err := k.Get(key)
 	if err != nil {
 		return nil, err

diff --git a/contract/p/gnoswap/store/kv_store_test.gno b/contract/p/gnoswap/store/kv_store_test.gno
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	avl "gno.land/p/nt/avl/v0"
+	bptree "gno.land/p/nt/bptree/v0"
 	testutils "gno.land/p/nt/testutils/v0"
 	uassert "gno.land/p/nt/uassert/v0"
 )
@@ -681,7 +681,7 @@ func TestAllTypedGetters_Success(t *testing.T) {
 	uassert.NoError(t, err)
 	err = store.Set("address_key", domainAddr)
 	uassert.NoError(t, err)
-	tree := avl.NewTree()
+	tree := bptree.NewBPTree32()
 	err = store.Set("tree_key", tree)
 	uassert.NoError(t, err)
 

diff --git a/contract/p/gnoswap/store/types.gno b/contract/p/gnoswap/store/types.gno
@@ -1,6 +1,6 @@
 package store
 
-import avl "gno.land/p/nt/avl/v0"
+import bptree "gno.land/p/nt/bptree/v0"
 
 type Permission uint8
 
@@ -40,7 +40,7 @@ type KVStore interface {
 	GetAddress(key string) (address, error)
 
 	// GetTree retrieves a tree value by key
-	GetTree(key string) (*avl.Tree, error)
+	GetTree(key string) (*bptree.BPTree, error)
 
 	// Set stores a value with the given key
 	Set(key string, value any) error

diff --git a/contract/p/gnoswap/store/utils.gno b/contract/p/gnoswap/store/utils.gno
@@ -1,7 +1,7 @@
 package store
 
 import (
-	avl "gno.land/p/nt/avl/v0"
+	bptree "gno.land/p/nt/bptree/v0"
 	ufmt "gno.land/p/nt/ufmt/v0"
 )
 
@@ -49,12 +49,12 @@ func castToString(result any) (string, error) {
 	return v, nil
 }
 
-// castToTree safely casts an any value to *avl.Tree
-// Returns ErrFailedCast if the value is not of type *avl.Tree
-func castToTree(result any) (*avl.Tree, error) {
-	tree, ok := result.(*avl.Tree)
+// castToTree safely casts an any value to *bptree.BPTree
+// Returns ErrFailedCast if the value is not of type *bptree.BPTree
+func castToTree(result any) (*bptree.BPTree, error) {
+	tree, ok := result.(*bptree.BPTree)
 	if !ok {
-		return nil, ufmt.Errorf("%s: %s", ErrFailedCast.Error(), ufmt.Sprintf("cast %T to *avl.Tree", result))
+		return nil, ufmt.Errorf("%s: %s", ErrFailedCast.Error(), ufmt.Sprintf("cast %T to *bptree.BPTree", result))
 	}
 
 	return tree, nil

diff --git a/contract/p/gnoswap/store/utils_test.gno b/contract/p/gnoswap/store/utils_test.gno
@@ -3,7 +3,7 @@ package store
 import (
 	"testing"
 
-	avl "gno.land/p/nt/avl/v0"
+	bptree "gno.land/p/nt/bptree/v0"
 	testutils "gno.land/p/nt/testutils/v0"
 	uassert "gno.land/p/nt/uassert/v0"
 )
@@ -262,7 +262,7 @@ func TestcastToTree(t *testing.T) {
 		{
 			name: "Success",
 			verifyFn: func(t *testing.T) {
-				tree := avl.NewTree()
+				tree := bptree.NewBPTree32()
 				var value any = tree
 				result, err := castToTree(value)
 				uassert.NoError(t, err)

diff --git a/contract/p/gnoswap/version_manager/doc.gno b/contract/p/gnoswap/version_manager/doc.gno
@@ -326,8 +326,8 @@
 // ## Related Packages
 //
 //   - gno.land/p/gnoswap/store: Provides KVStore with permission-based access control
-//   - gno.land/p/nt/avl: AVL tree used for efficient initializer storage and lookup
-//   - gno.land/p/nt/avl/rotree: Read-only tree wrapper for safe external access
+//   - gno.land/p/nt/bptree: B+ tree used for efficient initializer storage and lookup
+//   - gno.land/p/nt/bptree/rotree: Read-only tree wrapper for safe external access
 //
 // Package version_manager is intended for use in Gno smart contracts requiring
 // dynamic, upgradeable implementations with zero-downtime version switching.

diff --git a/contract/p/gnoswap/version_manager/types.gno b/contract/p/gnoswap/version_manager/types.gno
@@ -1,6 +1,6 @@
 package version_manager
 
-import "gno.land/p/nt/avl/v0/rotree"
+import "gno.land/p/nt/bptree/v0/rotree"
 
 // VersionManager defines the interface for managing multiple versioned implementations of a domain.
 // It enables the Strategy Pattern at the package level, allowing runtime switching between

diff --git a/contract/p/gnoswap/version_manager/version_manager.gno b/contract/p/gnoswap/version_manager/version_manager.gno
@@ -17,8 +17,8 @@ import (
 	"strings"
 
 	"gno.land/p/gnoswap/store"
-	avl "gno.land/p/nt/avl/v0"
-	rotree "gno.land/p/nt/avl/v0/rotree"
+	bptree "gno.land/p/nt/bptree/v0"
+	rotree "gno.land/p/nt/bptree/v0/rotree"
 	ufmt "gno.land/p/nt/ufmt/v0"
 )
 
@@ -33,7 +33,7 @@ import (
 type versionManager struct {
 	// initializers stores registered initializer functions keyed by package path
 	// Each initializer bootstraps a specific version's implementation
-	initializers *avl.Tree
+	initializers *bptree.BPTree
 
 	// domainKVStore is the shared storage layer accessible by all versions
 	// The domain (proxy) realm is the owner and has write permission
@@ -165,7 +165,7 @@ func (vm *versionManager) GetDomainPath() string {
 	return vm.domainPath
 }
 
-// GetInitializers returns the AVL tree containing all registered initializer functions.
+// GetInitializers returns the B+Tree containing all registered initializer functions.
 // Keys are package paths, values are initializer functions.
 // Useful for inspecting which versions are available.
 func (vm *versionManager) GetInitializers() *rotree.ReadOnlyTree {
@@ -234,14 +234,14 @@ func NewVersionManager(
 		domainPath:              domainPath,
 		domainKVStore:           kvStore,
 		initializeDomainStoreFn: initializeDomainStoreFn,
-		initializers:            avl.NewTree(),
+		initializers:            bptree.NewBPTree32(),
 		currentPackagePath:      "",
 		currentImplementation:   nil,
 	}
 }
 
 // makeInitializerSafe creates a safe copy of an initializer function for read-only tree access.
-// This is used by GetInitializers to wrap the internal AVL tree in a read-only view,
+// This is used by GetInitializers to wrap the internal B+Tree in a read-only view,
 // preventing external modification of registered initializers.
 func makeInitializerSafe(data any) any {
 	fn, ok := data.(func(store any) any)

diff --git a/contract/p/gnoswap/version_manager/version_manager_test.gno b/contract/p/gnoswap/version_manager/version_manager_test.gno
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"gno.land/p/gnoswap/store"
-	avl "gno.land/p/nt/avl/v0"
+	bptree "gno.land/p/nt/bptree/v0"
 	uassert "gno.land/p/nt/uassert/v0"
 	ufmt "gno.land/p/nt/ufmt/v0"
 )
@@ -189,7 +189,7 @@ func TestChangeImplementation_Errors(t *testing.T) {
 					domainPath:              "gno.land/r/gnoswap/protocol_fee",
 					domainKVStore:           kvStore,
 					initializeDomainStoreFn: mockInitializeDomainStoreFn,
-					initializers:            avl.NewTree(),
+					initializers:            bptree.NewBPTree32(),
 				}
 				return vm, "gno.land/r/gnoswap/protocol_fee/v999"
 			},
@@ -203,7 +203,7 @@ func TestChangeImplementation_Errors(t *testing.T) {
 					domainPath:              "gno.land/r/gnoswap/pool",
 					domainKVStore:           kvStore,
 					initializeDomainStoreFn: mockInitializeDomainStoreFn,
-					initializers:            avl.NewTree(),
+					initializers:            bptree.NewBPTree32(),
 				}
 				return vm, ""
 			},
@@ -218,7 +218,7 @@ func TestChangeImplementation_Errors(t *testing.T) {
 					domainPath:              "gno.land/r/gnoswap/protocol_fee",
 					domainKVStore:           kvStore,
 					initializeDomainStoreFn: mockInitializeDomainStoreFn,
-					initializers:            avl.NewTree(),
+					initializers:            bptree.NewBPTree32(),
 				}
 				vm.initializers.Set("gno.land/r/gnoswap/protocol_fee/v1", "not a function")
 				return vm, "gno.land/r/gnoswap/protocol_fee/v1"
@@ -233,7 +233,7 @@ func TestChangeImplementation_Errors(t *testing.T) {
 					domainPath:              "gno.land/r/gnoswap/pool",
 					domainKVStore:           kvStore,
 					initializeDomainStoreFn: mockInitializeDomainStoreFn,
-					initializers:            avl.NewTree(),
+					initializers:            bptree.NewBPTree32(),
 				}
 				vm.initializers.Set("gno.land/r/gnoswap/pool/v1", 42)
 				return vm, "gno.land/r/gnoswap/pool/v1"
@@ -248,7 +248,7 @@ func TestChangeImplementation_Errors(t *testing.T) {
 					domainPath:              "gno.land/r/gnoswap/position",
 					domainKVStore:           kvStore,
 					initializeDomainStoreFn: mockInitializeDomainStoreFn,
-					initializers:            avl.NewTree(),
+					initializers:            bptree.NewBPTree32(),
 				}
 				vm.initializers.Set("gno.land/r/gnoswap/position/v1", nil)
 				return vm, "gno.land/r/gnoswap/position/v1"
@@ -425,7 +425,7 @@ func TestChangeImplementation_Success(t *testing.T) {
 				domainPath:              tt.domainPath,
 				domainKVStore:           kvStore,
 				initializeDomainStoreFn: mockInitializeDomainStoreFn,
-				initializers:            avl.NewTree(),
+				initializers:            bptree.NewBPTree32(),
 				currentPackagePath:      "",
 				currentImplementation:   nil,
 			}
@@ -459,7 +459,7 @@ func TestGetInitializers(t *testing.T) {
 			domainPath:              "gno.land/r/gnoswap/protocol_fee",
 			domainKVStore:           kvStore,
 			initializeDomainStoreFn: mockInitializeDomainStoreFn,
-			initializers:            avl.NewTree(),
+			initializers:            bptree.NewBPTree32(),
 		}
 
 		vm.initializers.Set("gno.land/r/gnoswap/protocol_fee/v1", mockInitializer("v1"))
@@ -483,7 +483,7 @@ func TestGetInitializers(t *testing.T) {
 			domainPath:              "gno.land/r/gnoswap/pool",
 			domainKVStore:           kvStore,
 			initializeDomainStoreFn: mockInitializeDomainStoreFn,
-			initializers:            avl.NewTree(),
+			initializers:            bptree.NewBPTree32(),
 		}
 
 		versions := []string{"v1", "v2", "v3"}
@@ -512,7 +512,7 @@ func TestGetInitializers(t *testing.T) {
 			domainPath:              "gno.land/r/gnoswap/position",
 			domainKVStore:           kvStore,
 			initializeDomainStoreFn: mockInitializeDomainStoreFn,
-			initializers:            avl.NewTree(),
+			initializers:            bptree.NewBPTree32(),
 		}
 
 		initializers := vm.GetInitializers()
@@ -665,7 +665,7 @@ func TestIsContainDomainPath(t *testing.T) {
 				domainPath:              tt.domainPath,
 				domainKVStore:           kvStore,
 				initializeDomainStoreFn: mockInitializeDomainStoreFn,
-				initializers:            avl.NewTree(),
+				initializers:            bptree.NewBPTree32(),
 			}
 
 			result := vm.isContainDomainPath(tt.testPath)
@@ -728,7 +728,7 @@ func TestChangeImplementation_StateConsistency(t *testing.T) {
 				domainPath:              tt.domainPath,
 				domainKVStore:           kvStore,
 				initializeDomainStoreFn: mockInitializeDomainStoreFn,
-				initializers:            avl.NewTree(),
+				initializers:            bptree.NewBPTree32(),
 				currentPackagePath:      "",
 				currentImplementation:   nil,
 			}