Switch from superbased58 to fd58

.gitignore

@@ -153,9 +153,6 @@ dmypy.json
 # Cython debug symbols
 cython_debug/
 
-# Cython generated
-superbased58.c
-
 # PyCharm
 #  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore

install.sh

@@ -6,4 +6,3 @@ source test_suite_env/bin/activate
 make -j -C impl
 pip install .
 protoc --python_out=src/test_suite invoke.proto
-python setup.py build_ext --inplace

pyproject.toml

@@ -4,14 +4,15 @@ description = "Tests client targets against Solana"
 authors = [
   { name = "Manik Jain", email = "mjain@jumptrading.com"}
 ]
-dynamic = ['readme', 'version']
+dynamic = ['version']
+readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
-    "base58~=2.1.0",
-    "loguru~=0.7.0",
-    "protobuf~=3.19.0",
-    "typer~=0.9.0",
-    "Cython>=3.0.9"
+  "fd58~=0.1.0",
+  "loguru~=0.7.0",
+  "protobuf~=3.19.0",
+  "typer~=0.9.0",
+  "Cython>=3.0.9"
 ]
 
 [project.scripts]
@@ -32,10 +33,5 @@ dev = [
 ]
 
 [build-system]
-requires = ['setuptools', "wheel", "Cython", 'setuptools_scm[toml]']
+requires = ['setuptools']
 build-backend = "setuptools.build_meta"
-
-[tool.setuptools.dynamic]
-readme = {file = ["README.md"], content-type = "text/markdown"}
-
-[tool.setuptools_scm]

src/test_suite/codec_utils.py

@@ -1,5 +1,5 @@
 import base64
-import superbased58
+import fd58
 import test_suite.invoke_pb2 as pb
 
 
@@ -12,25 +12,21 @@ def decode_input(instruction_context: pb.InstrContext):
         - instruction_context (pb.InstrContext): Instruction context (will be modified).
     """
     if instruction_context.program_id:
-        instruction_context.program_id = superbased58.decode_32(
-            instruction_context.program_id
-        )
+        instruction_context.program_id = fd58.dec32(instruction_context.program_id)
     if instruction_context.loader_id:
-        instruction_context.loader_id = superbased58.decode_32(
-            instruction_context.loader_id
-        )
+        instruction_context.loader_id = fd58.dec32(instruction_context.loader_id)
 
     for i in range(len(instruction_context.accounts)):
         if instruction_context.accounts[i].address:
-            instruction_context.accounts[i].address = superbased58.decode_32(
+            instruction_context.accounts[i].address = fd58.dec32(
                 instruction_context.accounts[i].address
             )
         if instruction_context.accounts[i].data:
             instruction_context.accounts[i].data = base64.b64decode(
                 instruction_context.accounts[i].data
             )
         if instruction_context.accounts[i].owner:
-            instruction_context.accounts[i].owner = superbased58.decode_32(
+            instruction_context.accounts[i].owner = fd58.dec32(
                 instruction_context.accounts[i].owner
             )
 
@@ -47,25 +43,21 @@ def encode_input(instruction_context: pb.InstrContext):
         - instruction_context (pb.InstrContext): Instruction context (will be modified).
     """
     if instruction_context.program_id:
-        instruction_context.program_id = superbased58.encode_32(
-            instruction_context.program_id
-        )
+        instruction_context.program_id = fd58.enc32(instruction_context.program_id)
     if instruction_context.loader_id:
-        instruction_context.loader_id = superbased58.encode_32(
-            instruction_context.loader_id
-        )
+        instruction_context.loader_id = fd58.enc32(instruction_context.loader_id)
 
     for i in range(len(instruction_context.accounts)):
         if instruction_context.accounts[i].address:
-            instruction_context.accounts[i].address = superbased58.encode_32(
+            instruction_context.accounts[i].address = fd58.enc32(
                 instruction_context.accounts[i].address
             )
         if instruction_context.accounts[i].data:
             instruction_context.accounts[i].data = base64.b64encode(
                 instruction_context.accounts[i].data
             )
         if instruction_context.accounts[i].owner:
-            instruction_context.accounts[i].owner = superbased58.encode_32(
+            instruction_context.accounts[i].owner = fd58.enc32(
                 instruction_context.accounts[i].owner
             )
 
@@ -83,14 +75,14 @@ def encode_output(instruction_effects: pb.InstrEffects):
     """
     for i in range(len(instruction_effects.modified_accounts)):
         if instruction_effects.modified_accounts[i].address:
-            instruction_effects.modified_accounts[i].address = superbased58.encode_32(
+            instruction_effects.modified_accounts[i].address = fd58.enc32(
                 instruction_effects.modified_accounts[i].address
             )
         if instruction_effects.modified_accounts[i].data:
             instruction_effects.modified_accounts[i].data = base64.b64encode(
                 instruction_effects.modified_accounts[i].data
             )
         if instruction_effects.modified_accounts[i].owner:
-            instruction_effects.modified_accounts[i].owner = superbased58.encode_32(
+            instruction_effects.modified_accounts[i].owner = fd58.enc32(
                 instruction_effects.modified_accounts[i].owner
             )