diff --git a/pkg/client-sdk/ark_sdk.go b/pkg/client-sdk/ark_sdk.go index 7943483..4c7fdd2 100644 --- a/pkg/client-sdk/ark_sdk.go +++ b/pkg/client-sdk/ark_sdk.go @@ -3,7 +3,7 @@ package arksdk import ( "context" - "github.com/ark-network/ark-sdk/store" + "github.com/ark-network/ark/pkg/client-sdk/store" ) type ArkClient interface { diff --git a/pkg/client-sdk/client.go b/pkg/client-sdk/client.go index 131206e..5eb7297 100644 --- a/pkg/client-sdk/client.go +++ b/pkg/client-sdk/client.go @@ -7,15 +7,15 @@ import ( "strings" "time" - "github.com/ark-network/ark-sdk/client" - "github.com/ark-network/ark-sdk/explorer" - "github.com/ark-network/ark-sdk/internal/utils" - "github.com/ark-network/ark-sdk/store" - "github.com/ark-network/ark-sdk/wallet" - singlekeywallet "github.com/ark-network/ark-sdk/wallet/singlekey" - walletstore "github.com/ark-network/ark-sdk/wallet/singlekey/store" - filestore "github.com/ark-network/ark-sdk/wallet/singlekey/store/file" - inmemorystore "github.com/ark-network/ark-sdk/wallet/singlekey/store/inmemory" + "github.com/ark-network/ark/pkg/client-sdk/client" + "github.com/ark-network/ark/pkg/client-sdk/explorer" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils" + "github.com/ark-network/ark/pkg/client-sdk/store" + "github.com/ark-network/ark/pkg/client-sdk/wallet" + singlekeywallet "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey" + walletstore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store" + filestore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store/file" + inmemorystore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store/inmemory" "github.com/decred/dcrd/dcrec/secp256k1/v4" ) diff --git a/pkg/client-sdk/client/grpc/client.go b/pkg/client-sdk/client/grpc/client.go index 11420f3..157b4dd 100644 --- a/pkg/client-sdk/client/grpc/client.go +++ b/pkg/client-sdk/client/grpc/client.go @@ -6,10 +6,10 @@ import ( "strings" "time" - "github.com/ark-network/ark-sdk/client" - "github.com/ark-network/ark-sdk/internal/utils" arkv1 "github.com/ark-network/ark/api-spec/protobuf/gen/ark/v1" "github.com/ark-network/ark/common/tree" + "github.com/ark-network/ark/pkg/client-sdk/client" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials/insecure" diff --git a/pkg/client-sdk/client/rest/client.go b/pkg/client-sdk/client/rest/client.go index 7651226..ce8a6fb 100644 --- a/pkg/client-sdk/client/rest/client.go +++ b/pkg/client-sdk/client/rest/client.go @@ -8,13 +8,13 @@ import ( "strings" "time" - "github.com/ark-network/ark-sdk/client" - "github.com/ark-network/ark-sdk/client/rest/service/arkservice" - "github.com/ark-network/ark-sdk/client/rest/service/arkservice/ark_service" - "github.com/ark-network/ark-sdk/client/rest/service/models" - "github.com/ark-network/ark-sdk/internal/utils" arkv1 "github.com/ark-network/ark/api-spec/protobuf/gen/ark/v1" "github.com/ark-network/ark/common/tree" + "github.com/ark-network/ark/pkg/client-sdk/client" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/arkservice" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/arkservice/ark_service" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils" "github.com/btcsuite/btcd/btcutil/psbt" httptransport "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_claim_payment_parameters.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_claim_payment_parameters.go index 744eb46..bab6013 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_claim_payment_parameters.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_claim_payment_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // NewArkServiceClaimPaymentParams creates a new ArkServiceClaimPaymentParams object, diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_claim_payment_responses.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_claim_payment_responses.go index 5a73ec6..ab3015e 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_claim_payment_responses.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_claim_payment_responses.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // ArkServiceClaimPaymentReader is a Reader for the ArkServiceClaimPayment structure. diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_finalize_payment_parameters.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_finalize_payment_parameters.go index 01aad51..150380a 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_finalize_payment_parameters.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_finalize_payment_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // NewArkServiceFinalizePaymentParams creates a new ArkServiceFinalizePaymentParams object, diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_finalize_payment_responses.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_finalize_payment_responses.go index 46d7ca8..223c1c6 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_finalize_payment_responses.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_finalize_payment_responses.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // ArkServiceFinalizePaymentReader is a Reader for the ArkServiceFinalizePayment structure. diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_event_stream_responses.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_event_stream_responses.go index f835c48..60f0cb3 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_event_stream_responses.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_event_stream_responses.go @@ -16,7 +16,7 @@ import ( "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // ArkServiceGetEventStreamReader is a Reader for the ArkServiceGetEventStream structure. diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_info_responses.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_info_responses.go index 947de99..e805920 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_info_responses.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_info_responses.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // ArkServiceGetInfoReader is a Reader for the ArkServiceGetInfo structure. diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_round_by_id_responses.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_round_by_id_responses.go index 43c709a..2aca733 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_round_by_id_responses.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_round_by_id_responses.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // ArkServiceGetRoundByIDReader is a Reader for the ArkServiceGetRoundByID structure. diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_round_responses.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_round_responses.go index db4af8f..7b9c2fa 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_round_responses.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_get_round_responses.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // ArkServiceGetRoundReader is a Reader for the ArkServiceGetRound structure. diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_list_vtxos_responses.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_list_vtxos_responses.go index 5ae7712..306c263 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_list_vtxos_responses.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_list_vtxos_responses.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // ArkServiceListVtxosReader is a Reader for the ArkServiceListVtxos structure. diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_onboard_parameters.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_onboard_parameters.go index 60ad8c3..1c76487 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_onboard_parameters.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_onboard_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // NewArkServiceOnboardParams creates a new ArkServiceOnboardParams object, diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_onboard_responses.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_onboard_responses.go index 5732c3d..7ac4c2f 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_onboard_responses.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_onboard_responses.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // ArkServiceOnboardReader is a Reader for the ArkServiceOnboard structure. diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_ping_responses.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_ping_responses.go index bf9e54b..82e3a8c 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_ping_responses.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_ping_responses.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // ArkServicePingReader is a Reader for the ArkServicePing structure. diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_register_payment_parameters.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_register_payment_parameters.go index a8f7c08..220532e 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_register_payment_parameters.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_register_payment_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // NewArkServiceRegisterPaymentParams creates a new ArkServiceRegisterPaymentParams object, diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_register_payment_responses.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_register_payment_responses.go index cd01b3f..4d29872 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_register_payment_responses.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_register_payment_responses.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // ArkServiceRegisterPaymentReader is a Reader for the ArkServiceRegisterPayment structure. diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_trusted_onboarding_parameters.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_trusted_onboarding_parameters.go index a740eb8..0f2069e 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_trusted_onboarding_parameters.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_trusted_onboarding_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // NewArkServiceTrustedOnboardingParams creates a new ArkServiceTrustedOnboardingParams object, diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_trusted_onboarding_responses.go b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_trusted_onboarding_responses.go index 78d28d4..12f9185 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_trusted_onboarding_responses.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_service/ark_service_trusted_onboarding_responses.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/models" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/models" ) // ArkServiceTrustedOnboardingReader is a Reader for the ArkServiceTrustedOnboarding structure. diff --git a/pkg/client-sdk/client/rest/service/arkservice/ark_v1_service_proto_client.go b/pkg/client-sdk/client/rest/service/arkservice/ark_v1_service_proto_client.go index 8b1ed9f..5218f96 100644 --- a/pkg/client-sdk/client/rest/service/arkservice/ark_v1_service_proto_client.go +++ b/pkg/client-sdk/client/rest/service/arkservice/ark_v1_service_proto_client.go @@ -10,7 +10,7 @@ import ( httptransport "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/ark-network/ark-sdk/client/rest/service/arkservice/ark_service" + "github.com/ark-network/ark/pkg/client-sdk/client/rest/service/arkservice/ark_service" ) // Default ark v1 service proto HTTP client. diff --git a/pkg/client-sdk/covenant_client.go b/pkg/client-sdk/covenant_client.go index fd24e22..ae31ed9 100644 --- a/pkg/client-sdk/covenant_client.go +++ b/pkg/client-sdk/covenant_client.go @@ -10,14 +10,14 @@ import ( "sync" "time" - "github.com/ark-network/ark-sdk/client" - "github.com/ark-network/ark-sdk/explorer" - "github.com/ark-network/ark-sdk/internal/utils" - "github.com/ark-network/ark-sdk/internal/utils/redemption" - "github.com/ark-network/ark-sdk/store" - "github.com/ark-network/ark-sdk/wallet" "github.com/ark-network/ark/common" "github.com/ark-network/ark/common/tree" + "github.com/ark-network/ark/pkg/client-sdk/client" + "github.com/ark-network/ark/pkg/client-sdk/explorer" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils/redemption" + "github.com/ark-network/ark/pkg/client-sdk/store" + "github.com/ark-network/ark/pkg/client-sdk/wallet" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/chaincfg/chainhash" "github.com/decred/dcrd/dcrec/secp256k1/v4" diff --git a/pkg/client-sdk/covenantless_client.go b/pkg/client-sdk/covenantless_client.go index 4941400..4b691ab 100644 --- a/pkg/client-sdk/covenantless_client.go +++ b/pkg/client-sdk/covenantless_client.go @@ -10,15 +10,15 @@ import ( "sync" "time" - "github.com/ark-network/ark-sdk/client" - "github.com/ark-network/ark-sdk/explorer" - "github.com/ark-network/ark-sdk/internal/utils" - "github.com/ark-network/ark-sdk/internal/utils/redemption" - "github.com/ark-network/ark-sdk/store" - "github.com/ark-network/ark-sdk/wallet" "github.com/ark-network/ark/common" "github.com/ark-network/ark/common/bitcointree" "github.com/ark-network/ark/common/tree" + "github.com/ark-network/ark/pkg/client-sdk/client" + "github.com/ark-network/ark/pkg/client-sdk/explorer" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils/redemption" + "github.com/ark-network/ark/pkg/client-sdk/store" + "github.com/ark-network/ark/pkg/client-sdk/wallet" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/btcutil/psbt" diff --git a/pkg/client-sdk/example/covenant/alice_to_bob.go b/pkg/client-sdk/example/covenant/alice_to_bob.go index 36eed06..20fa678 100644 --- a/pkg/client-sdk/example/covenant/alice_to_bob.go +++ b/pkg/client-sdk/example/covenant/alice_to_bob.go @@ -9,8 +9,8 @@ import ( "sync" "time" - arksdk "github.com/ark-network/ark-sdk" - inmemorystore "github.com/ark-network/ark-sdk/store/inmemory" + arksdk "github.com/ark-network/ark/pkg/client-sdk" + inmemorystore "github.com/ark-network/ark/pkg/client-sdk/store/inmemory" log "github.com/sirupsen/logrus" ) diff --git a/pkg/client-sdk/example/covenant/wasm/go.mod b/pkg/client-sdk/example/covenant/wasm/go.mod index ac1384a..d07636c 100644 --- a/pkg/client-sdk/example/covenant/wasm/go.mod +++ b/pkg/client-sdk/example/covenant/wasm/go.mod @@ -6,9 +6,9 @@ replace github.com/ark-network/ark => ./../../../../../server replace github.com/ark-network/ark/common => ./../../../../../common -replace github.com/ark-network/ark-sdk => ./../../.. +replace github.com/ark-network/ark/pkg/client-sdk => ./../../.. -require github.com/ark-network/ark-sdk v0.0.0-00010101000000-000000000000 +require github.com/ark-network/ark/pkg/client-sdk v0.0.0-00010101000000-000000000000 require ( github.com/ark-network/ark v0.0.0-00010101000000-000000000000 // indirect diff --git a/pkg/client-sdk/example/covenant/wasm/main.go b/pkg/client-sdk/example/covenant/wasm/main.go index 58b63da..f9c864e 100644 --- a/pkg/client-sdk/example/covenant/wasm/main.go +++ b/pkg/client-sdk/example/covenant/wasm/main.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - inmemorystore "github.com/ark-network/ark-sdk/store/inmemory" - arksdkwasm "github.com/ark-network/ark-sdk/wasm" + inmemorystore "github.com/ark-network/ark/pkg/client-sdk/store/inmemory" + arksdkwasm "github.com/ark-network/ark/pkg/client-sdk/wasm" ) func main() { diff --git a/pkg/client-sdk/example/covenantless/alice_to_bob.go b/pkg/client-sdk/example/covenantless/alice_to_bob.go index dc054f1..312cba4 100644 --- a/pkg/client-sdk/example/covenantless/alice_to_bob.go +++ b/pkg/client-sdk/example/covenantless/alice_to_bob.go @@ -9,8 +9,8 @@ import ( "sync" "time" - arksdk "github.com/ark-network/ark-sdk" - inmemorystore "github.com/ark-network/ark-sdk/store/inmemory" + arksdk "github.com/ark-network/ark/pkg/client-sdk" + inmemorystore "github.com/ark-network/ark/pkg/client-sdk/store/inmemory" log "github.com/sirupsen/logrus" ) diff --git a/pkg/client-sdk/example/covenantless/wasm/go.mod b/pkg/client-sdk/example/covenantless/wasm/go.mod index ac1384a..d07636c 100644 --- a/pkg/client-sdk/example/covenantless/wasm/go.mod +++ b/pkg/client-sdk/example/covenantless/wasm/go.mod @@ -6,9 +6,9 @@ replace github.com/ark-network/ark => ./../../../../../server replace github.com/ark-network/ark/common => ./../../../../../common -replace github.com/ark-network/ark-sdk => ./../../.. +replace github.com/ark-network/ark/pkg/client-sdk => ./../../.. -require github.com/ark-network/ark-sdk v0.0.0-00010101000000-000000000000 +require github.com/ark-network/ark/pkg/client-sdk v0.0.0-00010101000000-000000000000 require ( github.com/ark-network/ark v0.0.0-00010101000000-000000000000 // indirect diff --git a/pkg/client-sdk/example/covenantless/wasm/main.go b/pkg/client-sdk/example/covenantless/wasm/main.go index 52a807a..9199fc6 100644 --- a/pkg/client-sdk/example/covenantless/wasm/main.go +++ b/pkg/client-sdk/example/covenantless/wasm/main.go @@ -7,8 +7,8 @@ import ( "context" "fmt" - inmemorystore "github.com/ark-network/ark-sdk/store/inmemory" - arksdkwasm "github.com/ark-network/ark-sdk/wasm" + inmemorystore "github.com/ark-network/ark/pkg/client-sdk/store/inmemory" + arksdkwasm "github.com/ark-network/ark/pkg/client-sdk/wasm" ) func main() { diff --git a/pkg/client-sdk/explorer/explorer.go b/pkg/client-sdk/explorer/explorer.go index 90b1082..3e94da2 100644 --- a/pkg/client-sdk/explorer/explorer.go +++ b/pkg/client-sdk/explorer/explorer.go @@ -11,8 +11,8 @@ import ( "strings" "time" - "github.com/ark-network/ark-sdk/internal/utils" "github.com/ark-network/ark/common" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils" "github.com/btcsuite/btcd/btcutil/psbt" "github.com/btcsuite/btcd/wire" log "github.com/sirupsen/logrus" diff --git a/pkg/client-sdk/go.mod b/pkg/client-sdk/go.mod index d11b804..08dc58d 100644 --- a/pkg/client-sdk/go.mod +++ b/pkg/client-sdk/go.mod @@ -1,4 +1,4 @@ -module github.com/ark-network/ark-sdk +module github.com/ark-network/ark/pkg/client-sdk go 1.22.2 @@ -11,6 +11,8 @@ require ( github.com/ark-network/ark/common v0.0.0 github.com/btcsuite/btcd v0.24.2 github.com/btcsuite/btcd/btcec/v2 v2.3.4 + github.com/btcsuite/btcd/btcutil v1.1.5 + github.com/btcsuite/btcd/btcutil/psbt v1.1.9 github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 github.com/go-openapi/errors v0.22.0 @@ -27,8 +29,6 @@ require ( require ( github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/btcsuite/btcd/btcutil v1.1.5 // indirect - github.com/btcsuite/btcd/btcutil/psbt v1.1.9 // indirect github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect diff --git a/pkg/client-sdk/internal/utils/redemption/covenant_redeem.go b/pkg/client-sdk/internal/utils/redemption/covenant_redeem.go index 2f54774..1b7278d 100644 --- a/pkg/client-sdk/internal/utils/redemption/covenant_redeem.go +++ b/pkg/client-sdk/internal/utils/redemption/covenant_redeem.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/ark-network/ark-sdk/client" - "github.com/ark-network/ark-sdk/explorer" "github.com/ark-network/ark/common/tree" + "github.com/ark-network/ark/pkg/client-sdk/client" + "github.com/ark-network/ark/pkg/client-sdk/explorer" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/decred/dcrd/dcrec/secp256k1/v4" "github.com/vulpemventures/go-elements/psetv2" diff --git a/pkg/client-sdk/internal/utils/redemption/covenantless_redeem.go b/pkg/client-sdk/internal/utils/redemption/covenantless_redeem.go index f7f7bf6..d1bf096 100644 --- a/pkg/client-sdk/internal/utils/redemption/covenantless_redeem.go +++ b/pkg/client-sdk/internal/utils/redemption/covenantless_redeem.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/ark-network/ark-sdk/client" - "github.com/ark-network/ark-sdk/explorer" "github.com/ark-network/ark/common/bitcointree" "github.com/ark-network/ark/common/tree" + "github.com/ark-network/ark/pkg/client-sdk/client" + "github.com/ark-network/ark/pkg/client-sdk/explorer" "github.com/btcsuite/btcd/btcutil/psbt" "github.com/btcsuite/btcd/txscript" ) diff --git a/pkg/client-sdk/internal/utils/types.go b/pkg/client-sdk/internal/utils/types.go index 571736b..fb3dec0 100644 --- a/pkg/client-sdk/internal/utils/types.go +++ b/pkg/client-sdk/internal/utils/types.go @@ -4,7 +4,7 @@ import ( "strings" "sync" - "github.com/ark-network/ark-sdk/client" + "github.com/ark-network/ark/pkg/client-sdk/client" ) type SupportedType[V any] map[string]V diff --git a/pkg/client-sdk/internal/utils/utils.go b/pkg/client-sdk/internal/utils/utils.go index 60a79bd..e262fd6 100644 --- a/pkg/client-sdk/internal/utils/utils.go +++ b/pkg/client-sdk/internal/utils/utils.go @@ -9,8 +9,8 @@ import ( "runtime/debug" "sort" - "github.com/ark-network/ark-sdk/client" "github.com/ark-network/ark/common" + "github.com/ark-network/ark/pkg/client-sdk/client" "github.com/btcsuite/btcd/btcec/v2" "github.com/btcsuite/btcd/chaincfg" "github.com/decred/dcrd/dcrec/secp256k1/v4" diff --git a/pkg/client-sdk/store/file/store.go b/pkg/client-sdk/store/file/store.go index 705b98a..03e9780 100644 --- a/pkg/client-sdk/store/file/store.go +++ b/pkg/client-sdk/store/file/store.go @@ -11,8 +11,8 @@ import ( "strconv" "strings" - "github.com/ark-network/ark-sdk/internal/utils" - "github.com/ark-network/ark-sdk/store" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils" + "github.com/ark-network/ark/pkg/client-sdk/store" "github.com/decred/dcrd/dcrec/secp256k1/v4" ) diff --git a/pkg/client-sdk/store/inmemory/store.go b/pkg/client-sdk/store/inmemory/store.go index 75913ef..c46d8e3 100644 --- a/pkg/client-sdk/store/inmemory/store.go +++ b/pkg/client-sdk/store/inmemory/store.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/ark-network/ark-sdk/store" + "github.com/ark-network/ark/pkg/client-sdk/store" ) type Store struct { diff --git a/pkg/client-sdk/store/store_test.go b/pkg/client-sdk/store/store_test.go index 3bfb380..28b865a 100644 --- a/pkg/client-sdk/store/store_test.go +++ b/pkg/client-sdk/store/store_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/ark-network/ark-sdk/client" - "github.com/ark-network/ark-sdk/store" - filestore "github.com/ark-network/ark-sdk/store/file" - inmemorystore "github.com/ark-network/ark-sdk/store/inmemory" - "github.com/ark-network/ark-sdk/wallet" "github.com/ark-network/ark/common" + "github.com/ark-network/ark/pkg/client-sdk/client" + "github.com/ark-network/ark/pkg/client-sdk/store" + filestore "github.com/ark-network/ark/pkg/client-sdk/store/file" + inmemorystore "github.com/ark-network/ark/pkg/client-sdk/store/inmemory" + "github.com/ark-network/ark/pkg/client-sdk/wallet" "github.com/btcsuite/btcd/btcec/v2" "github.com/stretchr/testify/require" ) diff --git a/pkg/client-sdk/types.go b/pkg/client-sdk/types.go index 8a0aee9..47bb4aa 100644 --- a/pkg/client-sdk/types.go +++ b/pkg/client-sdk/types.go @@ -3,11 +3,11 @@ package arksdk import ( "fmt" - grpcclient "github.com/ark-network/ark-sdk/client/grpc" - restclient "github.com/ark-network/ark-sdk/client/rest" - "github.com/ark-network/ark-sdk/internal/utils" - "github.com/ark-network/ark-sdk/wallet" "github.com/ark-network/ark/common" + grpcclient "github.com/ark-network/ark/pkg/client-sdk/client/grpc" + restclient "github.com/ark-network/ark/pkg/client-sdk/client/rest" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils" + "github.com/ark-network/ark/pkg/client-sdk/wallet" ) var ( diff --git a/pkg/client-sdk/wallet/singlekey/bitcoin_wallet.go b/pkg/client-sdk/wallet/singlekey/bitcoin_wallet.go index ccc7726..f969b5d 100644 --- a/pkg/client-sdk/wallet/singlekey/bitcoin_wallet.go +++ b/pkg/client-sdk/wallet/singlekey/bitcoin_wallet.go @@ -7,13 +7,13 @@ import ( "fmt" "strings" - "github.com/ark-network/ark-sdk/explorer" - "github.com/ark-network/ark-sdk/internal/utils" - "github.com/ark-network/ark-sdk/store" - "github.com/ark-network/ark-sdk/wallet" - walletstore "github.com/ark-network/ark-sdk/wallet/singlekey/store" "github.com/ark-network/ark/common" "github.com/ark-network/ark/common/bitcointree" + "github.com/ark-network/ark/pkg/client-sdk/explorer" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils" + "github.com/ark-network/ark/pkg/client-sdk/store" + "github.com/ark-network/ark/pkg/client-sdk/wallet" + walletstore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/btcutil" diff --git a/pkg/client-sdk/wallet/singlekey/liquid_wallet.go b/pkg/client-sdk/wallet/singlekey/liquid_wallet.go index ed3f4e1..296cfc6 100644 --- a/pkg/client-sdk/wallet/singlekey/liquid_wallet.go +++ b/pkg/client-sdk/wallet/singlekey/liquid_wallet.go @@ -5,13 +5,13 @@ import ( "context" "fmt" - "github.com/ark-network/ark-sdk/explorer" - "github.com/ark-network/ark-sdk/internal/utils" - "github.com/ark-network/ark-sdk/store" - "github.com/ark-network/ark-sdk/wallet" - walletstore "github.com/ark-network/ark-sdk/wallet/singlekey/store" "github.com/ark-network/ark/common" "github.com/ark-network/ark/common/tree" + "github.com/ark-network/ark/pkg/client-sdk/explorer" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils" + "github.com/ark-network/ark/pkg/client-sdk/store" + "github.com/ark-network/ark/pkg/client-sdk/wallet" + walletstore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store" "github.com/btcsuite/btcd/btcec/v2/ecdsa" "github.com/btcsuite/btcd/btcec/v2/schnorr" "github.com/btcsuite/btcd/chaincfg/chainhash" diff --git a/pkg/client-sdk/wallet/singlekey/store/file/store.go b/pkg/client-sdk/wallet/singlekey/store/file/store.go index 31a2b1a..88e9372 100644 --- a/pkg/client-sdk/wallet/singlekey/store/file/store.go +++ b/pkg/client-sdk/wallet/singlekey/store/file/store.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - walletstore "github.com/ark-network/ark-sdk/wallet/singlekey/store" + walletstore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store" "github.com/decred/dcrd/dcrec/secp256k1/v4" ) diff --git a/pkg/client-sdk/wallet/singlekey/store/inmemory/store.go b/pkg/client-sdk/wallet/singlekey/store/inmemory/store.go index e6cdc53..bf1ad8b 100644 --- a/pkg/client-sdk/wallet/singlekey/store/inmemory/store.go +++ b/pkg/client-sdk/wallet/singlekey/store/inmemory/store.go @@ -3,7 +3,7 @@ package inmemorystore import ( "sync" - walletstore "github.com/ark-network/ark-sdk/wallet/singlekey/store" + walletstore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store" ) type inmemoryStore struct { diff --git a/pkg/client-sdk/wallet/singlekey/store/store_test.go b/pkg/client-sdk/wallet/singlekey/store/store_test.go index 2d39cb6..99eea21 100644 --- a/pkg/client-sdk/wallet/singlekey/store/store_test.go +++ b/pkg/client-sdk/wallet/singlekey/store/store_test.go @@ -3,10 +3,10 @@ package store_test import ( "testing" - "github.com/ark-network/ark-sdk/store" - walletstore "github.com/ark-network/ark-sdk/wallet/singlekey/store" - filestore "github.com/ark-network/ark-sdk/wallet/singlekey/store/file" - inmemorystore "github.com/ark-network/ark-sdk/wallet/singlekey/store/inmemory" + "github.com/ark-network/ark/pkg/client-sdk/store" + walletstore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store" + filestore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store/file" + inmemorystore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store/inmemory" "github.com/btcsuite/btcd/btcec/v2" "github.com/stretchr/testify/require" ) diff --git a/pkg/client-sdk/wallet/singlekey/wallet.go b/pkg/client-sdk/wallet/singlekey/wallet.go index 2ec7983..37c27b6 100644 --- a/pkg/client-sdk/wallet/singlekey/wallet.go +++ b/pkg/client-sdk/wallet/singlekey/wallet.go @@ -6,10 +6,10 @@ import ( "encoding/hex" "fmt" - "github.com/ark-network/ark-sdk/internal/utils" - "github.com/ark-network/ark-sdk/store" - "github.com/ark-network/ark-sdk/wallet" - walletstore "github.com/ark-network/ark-sdk/wallet/singlekey/store" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils" + "github.com/ark-network/ark/pkg/client-sdk/store" + "github.com/ark-network/ark/pkg/client-sdk/wallet" + walletstore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store" "github.com/decred/dcrd/dcrec/secp256k1/v4" ) diff --git a/pkg/client-sdk/wallet/wallet.go b/pkg/client-sdk/wallet/wallet.go index cb7196f..cc60e5c 100644 --- a/pkg/client-sdk/wallet/wallet.go +++ b/pkg/client-sdk/wallet/wallet.go @@ -3,7 +3,7 @@ package wallet import ( "context" - "github.com/ark-network/ark-sdk/explorer" + "github.com/ark-network/ark/pkg/client-sdk/explorer" ) const ( diff --git a/pkg/client-sdk/wallet/wallet_test.go b/pkg/client-sdk/wallet/wallet_test.go index 57af267..afb243e 100644 --- a/pkg/client-sdk/wallet/wallet_test.go +++ b/pkg/client-sdk/wallet/wallet_test.go @@ -5,13 +5,13 @@ import ( "strings" "testing" - "github.com/ark-network/ark-sdk/client" - "github.com/ark-network/ark-sdk/store" - inmemorystore "github.com/ark-network/ark-sdk/store/inmemory" - "github.com/ark-network/ark-sdk/wallet" - singlekeywallet "github.com/ark-network/ark-sdk/wallet/singlekey" - inmemorywalletstore "github.com/ark-network/ark-sdk/wallet/singlekey/store/inmemory" "github.com/ark-network/ark/common" + "github.com/ark-network/ark/pkg/client-sdk/client" + "github.com/ark-network/ark/pkg/client-sdk/store" + inmemorystore "github.com/ark-network/ark/pkg/client-sdk/store/inmemory" + "github.com/ark-network/ark/pkg/client-sdk/wallet" + singlekeywallet "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey" + inmemorywalletstore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store/inmemory" "github.com/btcsuite/btcd/btcec/v2" "github.com/stretchr/testify/require" ) diff --git a/pkg/client-sdk/wasm/ark_sdk_wasm.go b/pkg/client-sdk/wasm/ark_sdk_wasm.go index 59a0765..4eb5488 100644 --- a/pkg/client-sdk/wasm/ark_sdk_wasm.go +++ b/pkg/client-sdk/wasm/ark_sdk_wasm.go @@ -6,11 +6,11 @@ import ( "strings" "syscall/js" - arksdk "github.com/ark-network/ark-sdk" - "github.com/ark-network/ark-sdk/store" - "github.com/ark-network/ark-sdk/wallet" - singlekeywallet "github.com/ark-network/ark-sdk/wallet/singlekey" - walletstore "github.com/ark-network/ark-sdk/wallet/singlekey/store" + arksdk "github.com/ark-network/ark/pkg/client-sdk" + "github.com/ark-network/ark/pkg/client-sdk/store" + "github.com/ark-network/ark/pkg/client-sdk/wallet" + singlekeywallet "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey" + walletstore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store" ) var ( diff --git a/pkg/client-sdk/wasm/localstorage_store_wasm.go b/pkg/client-sdk/wasm/localstorage_store_wasm.go index 937d473..a8622b3 100644 --- a/pkg/client-sdk/wasm/localstorage_store_wasm.go +++ b/pkg/client-sdk/wasm/localstorage_store_wasm.go @@ -8,8 +8,8 @@ import ( "strconv" "syscall/js" - "github.com/ark-network/ark-sdk/internal/utils" - "github.com/ark-network/ark-sdk/store" + "github.com/ark-network/ark/pkg/client-sdk/internal/utils" + "github.com/ark-network/ark/pkg/client-sdk/store" "github.com/decred/dcrd/dcrec/secp256k1/v4" ) diff --git a/pkg/client-sdk/wasm/localstorage_walletstore_wasm.go b/pkg/client-sdk/wasm/localstorage_walletstore_wasm.go index 6931076..adcc7c7 100644 --- a/pkg/client-sdk/wasm/localstorage_walletstore_wasm.go +++ b/pkg/client-sdk/wasm/localstorage_walletstore_wasm.go @@ -6,7 +6,7 @@ import ( "fmt" "syscall/js" - walletstore "github.com/ark-network/ark-sdk/wallet/singlekey/store" + walletstore "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey/store" "github.com/decred/dcrd/dcrec/secp256k1/v4" ) diff --git a/pkg/client-sdk/wasm/wrappers_wasm.go b/pkg/client-sdk/wasm/wrappers_wasm.go index a54e4f9..991c891 100644 --- a/pkg/client-sdk/wasm/wrappers_wasm.go +++ b/pkg/client-sdk/wasm/wrappers_wasm.go @@ -7,9 +7,9 @@ import ( "fmt" "syscall/js" - arksdk "github.com/ark-network/ark-sdk" - "github.com/ark-network/ark-sdk/wallet" - singlekeywallet "github.com/ark-network/ark-sdk/wallet/singlekey" + arksdk "github.com/ark-network/ark/pkg/client-sdk" + "github.com/ark-network/ark/pkg/client-sdk/wallet" + singlekeywallet "github.com/ark-network/ark/pkg/client-sdk/wallet/singlekey" ) func LogWrapper() js.Func {