move solana to spl to prevent name conflicts

Author: rickyrombo

…s/reward_manager/ChangeManagerAccount.go …s/reward_manager/ChangeManagerAccount.goapi/solana/programs/reward_manager/ChangeManagerAccount.go renamed to api/spl/programs/reward_manager/ChangeManagerAccount.go api/solana/programs/reward_manager/ChangeManagerAccount.go renamed to api/spl/programs/reward_manager/ChangeManagerAccount.go

@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 	"testing"
 
-	"bridgerton.audius.co/api/solana/programs/reward_manager"
+	"bridgerton.audius.co/api/spl/programs/reward_manager"
 	"github.com/gagliardetto/solana-go"
 	"github.com/stretchr/testify/require"
 )

…/programs/reward_manager/CreateSender.go …/programs/reward_manager/CreateSender.goapi/solana/programs/reward_manager/CreateSender.go renamed to api/spl/programs/reward_manager/CreateSender.go api/solana/programs/reward_manager/CreateSender.go renamed to api/spl/programs/reward_manager/CreateSender.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/hex"
 	"fmt"
+	"strings"
 
 	bin "github.com/gagliardetto/binary"
 	"github.com/gagliardetto/solana-go"
@@ -136,7 +137,7 @@ func deriveAuthority(programId solana.PublicKey, state solana.PublicKey) (solana
 func deriveSender(programId solana.PublicKey, authority solana.PublicKey, ethAddress string) (solana.PublicKey, uint8, error) {
 	senderSeedPrefix := []byte(SenderSeedPrefix)
 	// Remove 0x and decode hex
-	decodedEthAddress, err := hex.DecodeString(ethAddress[2:])
+	decodedEthAddress, err := hex.DecodeString(strings.TrimPrefix(ethAddress, "0x"))
 	if err != nil {
 		return solana.PublicKey{}, 0, err
 	}