Skip to content

Commit

Permalink
ci: fix ci after org move to bitboxswiss
Browse files Browse the repository at this point in the history
The GitHub org changed to github.com/BitBoxSwiss

- update ghcr url to use bitboxswiss, using lowercase bitboxswiss for ghcr
- backend: change all imports to bitboxswiss
- update appveyor yaml to use new org bitboxswiss

vendor: bitbox02-api-go

    go get github.com/BitBoxSwiss/bitbox02-api-go@b22740e514bcce2d01c92588d5890e9af8e4fbcb
    go mod tidy
    go mod vendor

vendor: block-client-go

    go get github.com/BitBoxSwiss/block-client-go@0d604acd65198ec3d3768d4691f95243aff71eab
    go mod tidy
    go mod vendor
  • Loading branch information
thisconnect committed May 16, 2024
1 parent 8cc1cd5 commit 0dd9660
Show file tree
Hide file tree
Showing 231 changed files with 857 additions and 808 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ env:
# "docker login ghcr.io -u <github-username>" using the
# newly generated token as password.
# Once logged in, tag an new image:
# docker tag shiftcrypto/bitbox-wallet-app:VERSION \
# ghcr.io/digitalbitbox/bitbox-wallet-app-ci:VERSION
# docker tag bitboxswiss/bitbox-wallet-app:VERSION \
# ghcr.io/bitboxswiss/bitbox-wallet-app-ci:VERSION
# and push as usual:
# docker push ghcr.io/digitalbitbox/bitbox-wallet-app-ci:VERSION
# docker push ghcr.io/bitboxswiss/bitbox-wallet-app-ci:VERSION
# Lastly, update the next line to use the newly pushed image version.
# See docs for more details:
# https://docs.github.com/en/packages/guides/pushing-and-pulling-docker-images
#
# Keep this in sync with default in scripts/github-ci.sh.
CI_IMAGE: ghcr.io/digitalbitbox/bitbox-wallet-app-ci:22
CI_IMAGE: ghcr.io/bitboxswiss/bitbox-wallet-app-ci:22
GITHUB_BUILD_DIR: ${{github.workspace}}

jobs:
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
OS_NAME: osx
- name: Archive app
run: >
pushd ~/go/src/github.com/digitalbitbox/bitbox-wallet-app/frontends/qt/build/osx;
pushd ~/go/src/github.com/BitBoxSwiss/bitbox-wallet-app/frontends/qt/build/osx;
ditto -c -k --keepParent BitBox.app ${{github.workspace}}/BitBoxApp-macos.zip;
popd;
- name: Upload app
Expand Down
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "frontends/qt/external/singleapplication"]
path = frontends/qt/external/singleapplication
url = https://github.com/digitalbitbox/SingleApplication
url = https://github.com/BitBoxSwiss/SingleApplication
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ a reviewer will do it for you.
> correcting typos and code formatting.
>
> If you don't know where to start, look for issues labeled
> with [good-first-issue](https://github.com/digitalbitbox/bitbox-wallet-app/issues?q=is%3Aissue+is%3Aopen+label%3Agood-first-issue).
> with [good-first-issue](https://github.com/BitBoxSwiss/bitbox-wallet-app/issues?q=is%3Aissue+is%3Aopen+label%3Agood-first-issue).
## Git commits

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ envinit:
GO111MODULE=off go get -u golang.org/x/mobile/cmd/gomobile
gomobile init
# Initializiation on MacOS
# - run make from $GOPATH/src/github.com/digitalbitbox/bitbox-wallet-app
# - run make from $GOPATH/src/github.com/BitBoxSwiss/bitbox-wallet-app
# - additional dependencies: Qt 5.15 & Xcode command line tools
# - add to $PATH: /usr/local/opt/go@1.21/bin
osx-init:
Expand Down
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ build_script:
- echo on
- choco install make
- choco install nsis -pre
- mkdir %GOPATH%\src\github.com\digitalbitbox
- mkdir %GOPATH%\src\github.com\BitBoxSwiss
- cd ..
- mv bitbox-wallet-app %GOPATH%\src\github.com\digitalbitbox\
- cd %GOPATH%\src\github.com\digitalbitbox\bitbox-wallet-app\
- mv bitbox-wallet-app %GOPATH%\src\github.com\BitBoxSwiss\
- cd %GOPATH%\src\github.com\BitBoxSwiss\bitbox-wallet-app\
- make qt-windows
- cd frontends/qt
- makensis setup.nsi
Expand All @@ -43,5 +43,5 @@ after_build:
- mkdir %APPVEYOR_BUILD_FOLDER%
# Copy build artifacts back to the git clone dir because they can only be
# relative to that folder.
- cp %GOPATH%\src\github.com\digitalbitbox\bitbox-wallet-app\frontends\qt\BitBox-installer.exe %APPVEYOR_BUILD_FOLDER%\BitBox-installer.exe
- cp %GOPATH%\src\github.com\BitBoxSwiss\bitbox-wallet-app\frontends\qt\BitBox-installer.exe %APPVEYOR_BUILD_FOLDER%\BitBox-installer.exe
- appveyor PushArtifact %APPVEYOR_BUILD_FOLDER%\BitBox-installer.exe
6 changes: 3 additions & 3 deletions backend/accountcodes.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package backend
import (
"fmt"

accountsTypes "github.com/digitalbitbox/bitbox-wallet-app/backend/accounts/types"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
"github.com/digitalbitbox/bitbox-wallet-app/backend/signing"
accountsTypes "github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/types"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/signing"
)

// The functions here must all produce globally unique account codes. They are used as names in
Expand Down
32 changes: 16 additions & 16 deletions backend/accounts.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ import (
"strings"
"time"

"github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/types"
accountsTypes "github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/types"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/bitsurance"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/util"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
coinpkg "github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/eth"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/config"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/keystore"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/rates"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/signing"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/errp"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/observable"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/observable/action"
"github.com/btcsuite/btcd/btcutil/hdkeychain"
"github.com/digitalbitbox/bitbox-wallet-app/backend/accounts"
"github.com/digitalbitbox/bitbox-wallet-app/backend/accounts/types"
accountsTypes "github.com/digitalbitbox/bitbox-wallet-app/backend/accounts/types"
"github.com/digitalbitbox/bitbox-wallet-app/backend/bitsurance"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc/util"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
coinpkg "github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/eth"
"github.com/digitalbitbox/bitbox-wallet-app/backend/config"
"github.com/digitalbitbox/bitbox-wallet-app/backend/keystore"
"github.com/digitalbitbox/bitbox-wallet-app/backend/rates"
"github.com/digitalbitbox/bitbox-wallet-app/backend/signing"
"github.com/digitalbitbox/bitbox-wallet-app/util/errp"
"github.com/digitalbitbox/bitbox-wallet-app/util/observable"
"github.com/digitalbitbox/bitbox-wallet-app/util/observable/action"
"github.com/ethereum/go-ethereum/params"
)

Expand Down
6 changes: 3 additions & 3 deletions backend/accounts/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ package accounts
import (
"io"

"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/signing"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/observable"
"github.com/btcsuite/btcd/wire"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
"github.com/digitalbitbox/bitbox-wallet-app/backend/signing"
"github.com/digitalbitbox/bitbox-wallet-app/util/observable"
)

// AddressList is a list of addresses.
Expand Down
2 changes: 1 addition & 1 deletion backend/accounts/address.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package accounts

import "github.com/digitalbitbox/bitbox-wallet-app/backend/signing"
import "github.com/BitBoxSwiss/bitbox-wallet-app/backend/signing"

// Address models a blockchain address to which coins can be sent.
type Address interface {
Expand Down
2 changes: 1 addition & 1 deletion backend/accounts/balance.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package accounts

import "github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
import "github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"

// Balance contains the available and incoming balance of an account.
type Balance struct {
Expand Down
20 changes: 10 additions & 10 deletions backend/accounts/baseaccount.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ import (
"sync/atomic"
"time"

"github.com/digitalbitbox/bitbox-wallet-app/backend/accounts/notes"
"github.com/digitalbitbox/bitbox-wallet-app/backend/accounts/types"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc/synchronizer"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
"github.com/digitalbitbox/bitbox-wallet-app/backend/config"
"github.com/digitalbitbox/bitbox-wallet-app/backend/keystore"
"github.com/digitalbitbox/bitbox-wallet-app/backend/rates"
"github.com/digitalbitbox/bitbox-wallet-app/backend/signing"
"github.com/digitalbitbox/bitbox-wallet-app/util/errp"
"github.com/digitalbitbox/bitbox-wallet-app/util/observable"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/notes"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/types"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/synchronizer"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/config"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/keystore"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/rates"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/signing"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/errp"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/observable"
"github.com/sirupsen/logrus"
)

Expand Down
14 changes: 7 additions & 7 deletions backend/accounts/baseaccount_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"testing"
"time"

"github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/types"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin/mocks"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/config"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/signing"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/logging"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/test"
"github.com/btcsuite/btcd/btcutil/hdkeychain"
"github.com/digitalbitbox/bitbox-wallet-app/backend/accounts/types"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin/mocks"
"github.com/digitalbitbox/bitbox-wallet-app/backend/config"
"github.com/digitalbitbox/bitbox-wallet-app/backend/signing"
"github.com/digitalbitbox/bitbox-wallet-app/util/logging"
"github.com/digitalbitbox/bitbox-wallet-app/util/test"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion backend/accounts/feetarget.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package accounts

import (
"github.com/digitalbitbox/bitbox-wallet-app/util/errp"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/errp"
)

// FeeTarget interface has priority codes.
Expand Down
6 changes: 3 additions & 3 deletions backend/accounts/mocks/account.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion backend/accounts/notes/notes.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"os"
"sync"

"github.com/digitalbitbox/bitbox-wallet-app/util/errp"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/errp"
)

// maxNoteLen is the maximum length per note.
Expand Down
2 changes: 1 addition & 1 deletion backend/accounts/notes/notes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"
"testing"

"github.com/digitalbitbox/bitbox-wallet-app/util/test"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/test"
"github.com/stretchr/testify/require"
)

Expand Down
6 changes: 3 additions & 3 deletions backend/accounts/transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"sort"
"time"

"github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/errors"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/errp"
"github.com/btcsuite/btcd/btcutil"
"github.com/digitalbitbox/bitbox-wallet-app/backend/accounts/errors"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
"github.com/digitalbitbox/bitbox-wallet-app/util/errp"
)

// TxType is a type of transaction. See the TxType* constants.
Expand Down
2 changes: 1 addition & 1 deletion backend/accounts/transaction_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"testing"
"time"

"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
"github.com/stretchr/testify/require"
)

Expand Down
24 changes: 12 additions & 12 deletions backend/accounts_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@ import (
"testing"
"time"

"github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts"
accountsTypes "github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/types"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/types"
coinpkg "github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/eth"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/config"
keystoremock "github.com/BitBoxSwiss/bitbox-wallet-app/backend/keystore/mocks"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/keystore/software"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/rates"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/signing"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/errp"
"github.com/btcsuite/btcd/btcutil/hdkeychain"
"github.com/btcsuite/btcd/chaincfg"
"github.com/digitalbitbox/bitbox-wallet-app/backend/accounts"
accountsTypes "github.com/digitalbitbox/bitbox-wallet-app/backend/accounts/types"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc/types"
coinpkg "github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/eth"
"github.com/digitalbitbox/bitbox-wallet-app/backend/config"
keystoremock "github.com/digitalbitbox/bitbox-wallet-app/backend/keystore/mocks"
"github.com/digitalbitbox/bitbox-wallet-app/backend/keystore/software"
"github.com/digitalbitbox/bitbox-wallet-app/backend/rates"
"github.com/digitalbitbox/bitbox-wallet-app/backend/signing"
"github.com/digitalbitbox/bitbox-wallet-app/util/errp"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
18 changes: 9 additions & 9 deletions backend/aopp.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ import (
"net/url"
"strings"

"github.com/digitalbitbox/bitbox-wallet-app/backend/accounts"
accountsTypes "github.com/digitalbitbox/bitbox-wallet-app/backend/accounts/types"
coinpkg "github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
"github.com/digitalbitbox/bitbox-wallet-app/backend/keystore"
"github.com/digitalbitbox/bitbox-wallet-app/backend/signing"
"github.com/digitalbitbox/bitbox-wallet-app/util/errp"
"github.com/digitalbitbox/bitbox-wallet-app/util/observable"
"github.com/digitalbitbox/bitbox-wallet-app/util/observable/action"
"github.com/digitalbitbox/bitbox02-api-go/api/firmware"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts"
accountsTypes "github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/types"
coinpkg "github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/keystore"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/signing"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/errp"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/observable"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/observable/action"
"github.com/BitBoxSwiss/bitbox02-api-go/api/firmware"
)

const (
Expand Down
14 changes: 7 additions & 7 deletions backend/aopp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"net/url"
"testing"

accountsTypes "github.com/BitBoxSwiss/bitbox-wallet-app/backend/accounts/types"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc"
coinpkg "github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/coin"
keystoremock "github.com/BitBoxSwiss/bitbox-wallet-app/backend/keystore/mocks"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/keystore/software"
"github.com/BitBoxSwiss/bitbox-wallet-app/backend/signing"
"github.com/BitBoxSwiss/bitbox02-api-go/api/firmware"
"github.com/btcsuite/btcd/btcutil/hdkeychain"
accountsTypes "github.com/digitalbitbox/bitbox-wallet-app/backend/accounts/types"
"github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc"
coinpkg "github.com/digitalbitbox/bitbox-wallet-app/backend/coins/coin"
keystoremock "github.com/digitalbitbox/bitbox-wallet-app/backend/keystore/mocks"
"github.com/digitalbitbox/bitbox-wallet-app/backend/keystore/software"
"github.com/digitalbitbox/bitbox-wallet-app/backend/signing"
"github.com/digitalbitbox/bitbox02-api-go/api/firmware"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions backend/arguments/arguments.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"os"
"path"

btctypes "github.com/digitalbitbox/bitbox-wallet-app/backend/coins/btc/types"
"github.com/digitalbitbox/bitbox-wallet-app/util/logging"
btctypes "github.com/BitBoxSwiss/bitbox-wallet-app/backend/coins/btc/types"
"github.com/BitBoxSwiss/bitbox-wallet-app/util/logging"
"github.com/sirupsen/logrus"
)

Expand Down

0 comments on commit 0dd9660

Please sign in to comment.