Skip to content

Commit

Permalink
Merge pull request #39 from coinbase/marcin/const-updates
Browse files Browse the repository at this point in the history
Create constants for suported network names
  • Loading branch information
marcin-cb authored Sep 30, 2024
2 parents 25b0cce + d1cf75d commit 9fde58d
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 23 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Coinbase Go SDK Changelog

## Unreleased
- Added constants for supported network names

## [0.0.11] - 2024-09-23

Expand Down
2 changes: 1 addition & 1 deletion examples/ethereum/list-staking-balances/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ func main() {
}

address := coinbase.NewExternalAddress(
"ethereum-mainnet",
coinbase.EthereumMainnet,
os.Args[1],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/ethereum/list-staking-rewards/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ func main() {
}

address := coinbase.NewExternalAddress(
"ethereum-mainnet",
coinbase.EthereumMainnet,
os.Args[1],
)

Expand Down
5 changes: 4 additions & 1 deletion examples/ethereum/shared-eth-stake/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ func main() {
log.Fatalf("error creating coinbase client: %v", err)
}

address := coinbase.NewExternalAddress("ethereum-holesky", os.Args[2])
address := coinbase.NewExternalAddress(
coinbase.EthereumHolesky,
os.Args[2],
)

stakeableBalance, err := client.GetStakeableBalance(ctx, coinbase.Eth, address, coinbase.WithStakingBalanceMode(coinbase.StakingOperationModePartial))
if err != nil {
Expand Down
7 changes: 3 additions & 4 deletions examples/solana/claim-stake/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ import (
"time"

"github.com/btcsuite/btcutil/base58"
"github.com/coinbase/coinbase-sdk-go/gen/client"
"github.com/coinbase/coinbase-sdk-go/pkg/coinbase"
"github.com/gagliardetto/solana-go"
"github.com/gagliardetto/solana-go/rpc"
)

var (
networkID = client.NETWORKIDENTIFIER_SOLANA_DEVNET
networkID = coinbase.SolanaDevnet
amount = big.NewFloat(0.01)
rpcURL = "https://api.devnet.solana.com"
)
Expand Down Expand Up @@ -112,9 +111,9 @@ func decodePrivateKey(privateKeyString string) (*ed25519.PrivateKey, error) {
}

func getTxLink(networkID, signature string) string {
if networkID == "solana-mainnet" {
if networkID == coinbase.SolanaMainnet {
return fmt.Sprintf("https://explorer.solana.com/tx/%s", signature)
} else if networkID == "solana-devnet" {
} else if networkID == coinbase.SolanaDevnet {
return fmt.Sprintf("https://explorer.solana.com/tx/%s?cluster=devnet", signature)
}

Expand Down
2 changes: 1 addition & 1 deletion examples/solana/list-staking-balances/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

var (
networkID = "solana-mainnet"
networkID = coinbase.SolanaMainnet
)

/*
Expand Down
2 changes: 1 addition & 1 deletion examples/solana/list-staking-rewards/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
)

var (
networkID = "solana-mainnet"
networkID = coinbase.SolanaMainnet
)

/*
Expand Down
7 changes: 3 additions & 4 deletions examples/solana/stake/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ import (
"time"

"github.com/btcsuite/btcutil/base58"
"github.com/coinbase/coinbase-sdk-go/gen/client"
"github.com/coinbase/coinbase-sdk-go/pkg/coinbase"
"github.com/gagliardetto/solana-go"
"github.com/gagliardetto/solana-go/rpc"
)

var (
networkID = client.NETWORKIDENTIFIER_SOLANA_DEVNET
networkID = coinbase.SolanaDevnet
amount = big.NewFloat(0.01)
rpcURL = "https://api.devnet.solana.com"
)
Expand Down Expand Up @@ -112,9 +111,9 @@ func decodePrivateKey(privateKeyString string) (*ed25519.PrivateKey, error) {
}

func getTxLink(networkID, signature string) string {
if networkID == "solana-mainnet" {
if networkID == coinbase.SolanaMainnet {
return fmt.Sprintf("https://explorer.solana.com/tx/%s", signature)
} else if networkID == "solana-devnet" {
} else if networkID == coinbase.SolanaDevnet {
return fmt.Sprintf("https://explorer.solana.com/tx/%s?cluster=devnet", signature)
}

Expand Down
7 changes: 3 additions & 4 deletions examples/solana/unstake/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@ import (
"time"

"github.com/btcsuite/btcutil/base58"
"github.com/coinbase/coinbase-sdk-go/gen/client"
"github.com/coinbase/coinbase-sdk-go/pkg/coinbase"
"github.com/gagliardetto/solana-go"
"github.com/gagliardetto/solana-go/rpc"
)

var (
networkID = client.NETWORKIDENTIFIER_SOLANA_DEVNET
networkID = coinbase.SolanaDevnet
amount = big.NewFloat(0.01)
rpcURL = "https://api.devnet.solana.com"
)
Expand Down Expand Up @@ -112,9 +111,9 @@ func decodePrivateKey(privateKeyString string) (*ed25519.PrivateKey, error) {
}

func getTxLink(networkID, signature string) string {
if networkID == "solana-mainnet" {
if networkID == coinbase.SolanaMainnet {
return fmt.Sprintf("https://explorer.solana.com/tx/%s", signature)
} else if networkID == "solana-devnet" {
} else if networkID == coinbase.SolanaDevnet {
return fmt.Sprintf("https://explorer.solana.com/tx/%s?cluster=devnet", signature)
}

Expand Down
8 changes: 4 additions & 4 deletions pkg/coinbase/staking_operation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ func (s *StakingOperationSuite) TestSign_SignTransactionFails() {

func (s *StakingOperationSuite) TestReloadStakingOperation_ExistingTransactionsNotOverwritten() {
var (
networkID = "ethereum-holesky"
networkID = EthereumHolesky
addressID = "0x14a34"
stakingOperationID = "staking-operation-id"
stakingOperationStatus = "pending"
Expand Down Expand Up @@ -410,7 +410,7 @@ func (s *StakingOperationSuite) TestReloadStakingOperation_ExistingTransactionsN

func (s *StakingOperationSuite) TestReloadStakingOperation_ErrorFormatting() {
var (
networkID = "ethereum-holesky"
networkID = EthereumHolesky
addressID = "0x14a34"
stakingOperationID = "staking-operation-id"
stakingOperationStatus = "pending"
Expand Down Expand Up @@ -449,7 +449,7 @@ func (s *StakingOperationSuite) TestReloadStakingOperation_ErrorFormatting() {

func (s *StakingOperationSuite) TestFetchStakingOperation_Success() {
var (
networkID = "ethereum-holesky"
networkID = EthereumHolesky
addressID = "0x14a34"
stakingOperationID = "staking-operation-id"
stakingOperationStatus = "pending"
Expand Down Expand Up @@ -493,7 +493,7 @@ func (s *StakingOperationSuite) TestFetchStakingOperation_Success() {

func (s *StakingOperationSuite) TestFetchStakingOperation_Error() {
var (
networkID = "ethereum-holesky"
networkID = EthereumHolesky
addressID = "0x14a34"
stakingOperationID = "staking-operation-id"
stakingAPIMock = mocks.NewStakeAPI(s.T())
Expand Down
13 changes: 11 additions & 2 deletions pkg/coinbase/utils.go
Original file line number Diff line number Diff line change
@@ -1,18 +1,27 @@
package coinbase

import "strings"
import (
"strings"

"github.com/coinbase/coinbase-sdk-go/gen/client"
)

const (
Eth = "eth"
Wei = "wei"
Gwei = "gwei"
GweiDecimals = 9
Sol = "sol"
Lamport = "lamport"

StakingOperationModePartial = "partial"
StakingOperationModeDefault = "default"
StakingOperationModeNative = "native"

EthereumHolesky = string(client.NETWORKIDENTIFIER_ETHEREUM_HOLESKY)
EthereumMainnet = string(client.NETWORKIDENTIFIER_ETHEREUM_MAINNET)

SolanaDevnet = string(client.NETWORKIDENTIFIER_SOLANA_DEVNET)
SolanaMainnet = string(client.NETWORKIDENTIFIER_SOLANA_MAINNET)
)

func normalizeNetwork(network string) string {
Expand Down

0 comments on commit 9fde58d

Please sign in to comment.