diff --git a/.github/mergify.yml b/.github/mergify.yml index af26c8d..06d6c35 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -8,7 +8,7 @@ pull_request_rules: conditions: - -draft - author~=^dependabot(|-preview)\[bot\]$ - - check-success='test (1.23.x, ubuntu-latest)' + - check-success='test (1.24.x, ubuntu-latest)' - check-success='Analyze (go)' - title~=^Bump [^\s]+ from ([\d]+)\..+ to \1\. actions: @@ -20,7 +20,7 @@ pull_request_rules: - name: Alert on major version detection conditions: - author~=^dependabot(|-preview)\[bot\]$ - - check-success='test (1.23.x, ubuntu-latest)' + - check-success='test (1.24.x, ubuntu-latest)' - check-success='Analyze (go)' - -title~=^Bump [^\s]+ from ([\d]+)\..+ to \1\. actions: @@ -36,7 +36,7 @@ pull_request_rules: - "#approved-reviews-by>=1" - "#review-requested=0" - "#changes-requested-reviews-by=0" - - check-success='test (1.23.x, ubuntu-latest)' + - check-success='test (1.24.x, ubuntu-latest)' - check-success='Analyze (go)' - -title~=(?i)wip - label!=work-in-progress diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 36739ce..6d4e1a4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: 1.23 + go-version: 1.24 - name: Run GoReleaser uses: goreleaser/goreleaser-action@v6.0.0 with: diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f7eb855..dc08d68 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -15,7 +15,7 @@ jobs: test: strategy: matrix: - go-version: [ 1.23.x ] + go-version: [ 1.24.x ] os: [ ubuntu-latest ] runs-on: ${{ matrix.os }} steps: diff --git a/.golangci.yml b/.golangci.yml index 91c7df0..b4ae9ac 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,405 +1,6 @@ -# This file contains all available configuration options -# with their default values. -# options for analysis running -run: - # default concurrency is a available CPU number - concurrency: 4 - - # timeout for analysis, e.g. 30s, 5m, default is 1m - timeout: 1m - - # exit code when at least one issue was found, default is 1 - issues-exit-code: 1 - - # include test files or not, default is true - tests: false - - # list of build tags, all linters use it. Default is empty list. - build-tags: - - mytag - - # default is true. Enables skipping of directories: - # vendor$, third_party$, testdata$, examples$, Godeps$, builtin$ - # skip-dirs-use-default: true - - # Allow multiple parallel golangci-lint instances running. - # If false (default) - golangci-lint acquires file lock on start. - allow-parallel-runners: false - -# output configuration options -output: - # formats: - # - colored-line-number - - # print lines of code with issue, default is true - print-issued-lines: true - - # print linter name in the end of issue text, default is true - print-linter-name: true - - # make issues output unique by line, default is true - uniq-by-line: true - - # add a prefix to the output file references; default is no prefix - path-prefix: "" - -# all available settings of specific linters -linters-settings: - dogsled: - # checks assignments with too many blank identifiers; default is 2 - max-blank-identifiers: 2 - dupl: - # tokens count to trigger issue, 150 by default - threshold: 100 - errcheck: - # report about not checking of errors in type assertions: `a := b.(MyStruct)`; - # default is false: such cases aren't reported by default. - check-type-assertions: false - - # report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`; - # default is false: such cases aren't reported by default. - check-blank: false - - # use exclude-functions instead of ignore - exclude-functions: - - fmt:.* - - io/ioutil:^Read.* - - exhaustive: - # indicates that switch statements are to be considered exhaustive if a - # 'default' case is present, even if all enum members aren't listed in the - # switch - default-signifies-exhaustive: false - funlen: - lines: 60 - statements: 40 - gci: - sections: - - Standard - - Default - - Prefix(github.com/org/project) - gocognit: - # minimal code complexity to report, 30 by default (but we recommend 10-20) - min-complexity: 10 - gosec: - excludes: - - G115 - nestif: - # minimal complexity of if statements to report, 5 by default - min-complexity: 4 - goconst: - # minimal length of string constant, 3 by default - min-len: 3 - # minimal occurrences count to trigger, 3 by default - min-occurrences: 3 - gocritic: - # Which checks should be enabled; can't be combined with 'disabled-checks'; - # See https://go-critic.github.io/overview#checks-overview - # To check which checks are enabled run `GL_DEBUG=gocritic golangci-lint run` - # By default list of stable checks is used. - #enabled-checks: - # - rangeValCopy - - # Which checks should be disabled; can't be combined with 'enabled-checks'; default is empty - disabled-checks: - - regexpMust - - # Enable multiple checks by tags, run `GL_DEBUG=gocritic golangci-lint run` to see all tags and checks. - # Empty list by default. See https://github.com/go-critic/go-critic#usage -> section "Tags". - enabled-tags: - - performance - disabled-tags: - - experimental - - settings: # settings passed to gocritic - captLocal: # must be valid enabled check name - paramsOnly: true - rangeValCopy: - sizeThreshold: 32 - gocyclo: - # minimal code complexity to report, 30 by default (but we recommend 10-20) - min-complexity: 10 - godot: - # check all top-level comments, not only declarations - check-all: false - godox: - # report any comments starting with keywords, this is useful for TODO or FIXME comments that - # might be left in the code accidentally and should be resolved before merging - keywords: # default keywords are TODO, BUG, and FIXME, these can be overwritten by this setting - - NOTE - - OPTIMIZE # marks code that should be optimized before merging - - HACK # marks hack-arounds that should be removed before merging - gofmt: - # simplify code: gofmt with `-s` option, true by default - simplify: true - # goheader: - # values: - # const: - # # define here const type values in format k:v, for example: - # # YEAR: 2020 - # # COMPANY: MY COMPANY - # regexp: - # # define here regexp type values, for example - # # AUTHOR: .*@mycompany\.com - # template: - # put here copyright header template for source code files, for example: - # {{ AUTHOR }} {{ COMPANY }} {{ YEAR }} - # SPDX-License-Identifier: Apache-2.0 - # - # Licensed under the Apache License, Version 2.0 (the "License"); - # you may not use this file except in compliance with the License. - # You may obtain a copy of the License at: - # - # http://www.apache.org/licenses/LICENSE-2.0 - # - # Unless required by applicable law or agreed to in writing, software - # distributed under the License is distributed on an "AS IS" BASIS, - # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - # See the License for the specific language governing permissions and - # limitations under the License. - # template-path: - # also as alternative of directive 'template' you may put the path to file with the template source - goimports: - # put imports beginning with prefix after 3rd-party packages; - # it's a comma-separated list of prefixes - local-prefixes: github.com/org/project - # gomnd: - # checks: - # - argument - # - case - # - condition - # - operation - # - return - # - assign - # ignored-numbers: [] # Add numbers here if needed - # ignored-files: [] # Add file patterns to ignore if needed - # ignored-functions: [] # Add function patterns to ignore if needed - govet: - # Removed deprecated `check-shadowing` option - - # settings per analyzer - settings: - printf: # analyzer name, run `go tool vet help` to see all analyzers - funcs: # run `go tool vet help printf` to see available settings for `printf` analyzer - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf - - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf - - # enable or disable analyzers by name - enable: - - atomicalign - enable-all: false - # disable: - #- shadow - disable-all: false - # depguard: - # list-type: blacklist - # include-go-root: false - # packages: - # - github.com/sirupsen/logrus - # packages-with-error-message: - # # specify an error message to output when a blacklisted package is used - # - github.com/sirupsen/logrus: "logging is allowed only by logutils.Log" - lll: - # max line length, lines longer will be reported. Default is 120. - # '\t' is counted as 1 character by default, and can be changed with the tab-width option - line-length: 120 - # tab width in spaces. Default to 1. - tab-width: 1 - misspell: - # Correct spellings using locale preferences for US or UK. - # Default is to use a neutral variety of English. - # Setting locale to US will correct the British spelling of 'colour' to 'color'. - locale: US - ignore-words: - - bsv - - bitcoin - nakedret: - # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 - max-func-lines: 30 - prealloc: - # XXX: we don't recommend using this linter before doing performance profiling. - # For most programs usage of prealloc will be a premature optimization. - - # Report preallocation suggestions only on simple loops that have no returns/breaks/continues/gotos in them. - # True by default. - simple: true - range-loops: true # Report preallocation suggestions on range loops, true by default - for-loops: false # Report preallocation suggestions on for loops, false by default - nolintlint: - # Enable to ensure that nolint directives are all used. Default is true. - allow-unused: false - # Disable to ensure that nolint directives don't have a leading space. Default is true. - # allow-leading-space: true - # Exclude following linters from requiring an explanation. Default is []. - allow-no-explanation: [] - # Enable to require an explanation of nonzero length after each nolint directive. Default is false. - require-explanation: true - # Enable to require nolint directives to mention the specific linter being suppressed. Default is false. - require-specific: true - rowserrcheck: - packages: - - github.com/jmoiron/sqlx - testpackage: - # regexp pattern to skip files - skip-regexp: (export|internal)_test\.go - unparam: - # Inspect exported functions, default is false. Set to true if no external program/library imports your code. - # XXX: if you enable this setting, unparam will report a lot of false-positives in text editors: - # if it's called for subdir of a project it can't find external interfaces. All text editor integrations - # with golangci-lint call it on a directory with the changed file. - check-exported: false - # unused: - # treat code as a program (not a library) and report unused exported identifiers; default is false. - # XXX: if you enable this setting, unused will report a lot of false-positives in text editors: - # if it's called for subdir of a project it can't find funcs usages. All text editor integrations - # with golangci-lint call it on a directory with the changed file. - # check-exported: false - whitespace: - multi-if: false # Enforces newlines (or comments) after every multi-line if statement - multi-func: false # Enforces newlines (or comments) after every multi-line function signature - wsl: - # If true append is only allowed to be cuddled if appending value is - # matching variables, fields or types on line above. Default is true. - strict-append: true - # Allow calls and assignments to be cuddled as long as the lines have any - # matching variables, fields or types. Default is true. - allow-assign-and-call: true - # Allow multiline assignments to be cuddled. Default is true. - allow-multiline-assign: true - # Allow declarations (var) to be cuddled. - allow-cuddle-declarations: true - # Allow trailing comments in ending of blocks - allow-trailing-comment: false - # Force newlines in end of case at this limit (0 = never). - force-case-trailing-whitespace: 0 - # Force cuddling of err checks with err var assignment - force-err-cuddling: false - # Allow leading comments to be separated with empty lines - allow-separated-leading-comment: false - gofumpt: - # Choose whether or not to use the extra rules that are disabled - # by default - extra-rules: false - -# linters configuration -linters: - enable: - - gosimple - - staticcheck - - unused - - govet - - gosec - - bodyclose - - revive - - unconvert - - dupl - - misspell - - dogsled - - prealloc - - copyloopvar - - exhaustive - - sqlclosecheck - - nolintlint - - gci - - goconst - - lll - # - shadow # Added as per the deprecation notice - disable: - - gocritic # use this for very opinionated linting - - gochecknoglobals - - whitespace - - wsl - - err113 - - godot - - testpackage - - nestif - - nlreturn - - musttag - disable-all: false - presets: - - bugs - - unused - fast: false - -# issues configuration issues: - exclude-files: - - ".*\\.my\\.go$" - - lib/bad.go - exclude-dirs: - - .github - - .make - - dist - - # List of regexps of issue texts to exclude, empty list by default. - exclude: - - abcdef - - # Excluding configuration per-path, per-linter, per-text and per-source exclude-rules: - # Exclude some linters from running on tests files. - - path: _test\.go - linters: - - gocyclo - - errcheck - - dupl - - gosec - - lll - - # Exclude known linters from partially hard-vendored code, - # which is impossible to exclude via "nolint" comments. - - path: internal/hmac/ - text: "weak cryptographic primitive" - linters: - - gosec - - # Exclude some staticcheck messages - linters: - staticcheck - text: "SA1019:" - - # Exclude lll issues for long lines with go:generate - - linters: - - lll - source: "^//go:generate " - - # Independently from option `exclude` we use default exclude patterns, - # it can be disabled by this option. To list all - # excluded by default patterns execute `golangci-lint run --help`. - # Default value for this option is true. - exclude-use-default: false - - # The default value is false. If set to true exclude and exclude-rules - # regular expressions become case-sensitive. - exclude-case-sensitive: false - - # Maximum issues count per one linter. Set to 0 to disable. Default is 50. - max-issues-per-linter: 0 - - # Maximum count of issues with the same text. Set to 0 to disable. Default is 3. - max-same-issues: 0 - - # Show only new issues: if there are unstaged changes or untracked files, - # only those changes are analyzed, else only changes in HEAD~ are analyzed. - # Default is false. - new: false - - # Show only new issues created after git revision `REV` - new-from-rev: "" - -# severity configuration -severity: - # Default value is empty string. - default-severity: error - - # The default value is false. - case-sensitive: false - - # Default value is empty list. - rules: - - linters: - - dupl - severity: info \ No newline at end of file + text: "SA1019:" \ No newline at end of file diff --git a/.make/go.mk b/.make/go.mk index 5b58827..a080708 100644 --- a/.make/go.mk +++ b/.make/go.mk @@ -67,15 +67,15 @@ install-go: ## Install the application (Using Native Go) lint: ## Run the golangci-lint application (install if not found) @echo "installing golangci-lint..." @#Travis (has sudo) - @if [ "$(shell command -v golangci-lint)" = "" ] && [ $(TRAVIS) ]; then curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.61.0 && sudo cp ./bin/golangci-lint $(go env GOPATH)/bin/; fi; + @if [ "$(shell command -v golangci-lint)" = "" ] && [ $(TRAVIS) ]; then curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.64.8 && sudo cp ./bin/golangci-lint $(go env GOPATH)/bin/; fi; @#AWS CodePipeline - @if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(CODEBUILD_BUILD_ID)" != "" ]; then curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.61.0; fi; + @if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(CODEBUILD_BUILD_ID)" != "" ]; then curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.8; fi; @#GitHub Actions - @if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(GITHUB_WORKFLOW)" != "" ]; then curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b $(go env GOPATH)/bin v1.61.0; fi; + @if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(GITHUB_WORKFLOW)" != "" ]; then curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sudo sh -s -- -b $(go env GOPATH)/bin v1.64.8; fi; @#Brew - MacOS @if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(shell command -v brew)" != "" ]; then brew install golangci-lint; fi; @#MacOS Vanilla - @if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(shell command -v brew)" != "" ]; then curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- v1.61.0; fi; + @if [ "$(shell command -v golangci-lint)" = "" ] && [ "$(shell command -v brew)" != "" ]; then curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- v1.64.8; fi; @echo "running golangci-lint..." @golangci-lint run --verbose diff --git a/README.md b/README.md index 41f6927..a407c3b 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ vet Run the Go vet application ## Examples & Tests All unit tests run via [GitHub Actions](https://github.com/BitcoinSchema/go-bmap/actions) and -uses [Go version 1.23.x](https://golang.org/doc/go1.23). View the [configuration file](.github/workflows/run-tests.yml). +uses [Go version 1.24.x](https://golang.org/doc/go1.24). View the [configuration file](.github/workflows/run-tests.yml). Run all tests (including integration tests) diff --git a/bmap.go b/bmap.go index 9c4c7a0..028668a 100644 --- a/bmap.go +++ b/bmap.go @@ -2,7 +2,6 @@ package bmap import ( - "github.com/bitcoin-sv/go-sdk/transaction" "github.com/bitcoinschema/go-aip" "github.com/bitcoinschema/go-b" "github.com/bitcoinschema/go-bap" @@ -13,6 +12,7 @@ import ( "github.com/bitcoinschema/go-bpu" magic "github.com/bitcoinschema/go-map" "github.com/bitcoinschema/go-sigma" + "github.com/bsv-blockchain/go-sdk/transaction" ) // Tx is a Bmap formatted tx diff --git a/bmap_test.go b/bmap_test.go index 841a2de..2cf20e3 100644 --- a/bmap_test.go +++ b/bmap_test.go @@ -4,7 +4,6 @@ import ( "encoding/base64" "testing" - "github.com/bitcoin-sv/go-sdk/transaction" "github.com/bitcoinschema/go-b" "github.com/bitcoinschema/go-bap" "github.com/bitcoinschema/go-bmap/run" @@ -12,6 +11,7 @@ import ( "github.com/bitcoinschema/go-bob" "github.com/bitcoinschema/go-bpu" magic "github.com/bitcoinschema/go-map" + "github.com/bsv-blockchain/go-sdk/transaction" ) var cryptoFights = "cryptofights" diff --git a/go.mod b/go.mod index 5a4cc45..db477ae 100644 --- a/go.mod +++ b/go.mod @@ -1,20 +1,20 @@ module github.com/bitcoinschema/go-bmap -go 1.23.1 +go 1.24.1 require ( - github.com/bitcoin-sv/go-sdk v1.1.18 - github.com/bitcoinschema/go-aip v0.3.2 - github.com/bitcoinschema/go-b v0.2.2 - github.com/bitcoinschema/go-bap v0.4.1 - github.com/bitcoinschema/go-bob v0.5.1 - github.com/bitcoinschema/go-boost v0.2.1 - github.com/bitcoinschema/go-bpu v0.2.1 - github.com/bitcoinschema/go-map v0.2.1 - github.com/bitcoinschema/go-sigma v0.1.1 + github.com/bitcoinschema/go-aip v0.3.3 + github.com/bitcoinschema/go-b v0.2.3 + github.com/bitcoinschema/go-bap v0.4.2 + github.com/bitcoinschema/go-bob v0.5.2 + github.com/bitcoinschema/go-boost v0.2.2 + github.com/bitcoinschema/go-bpu v0.2.2 + github.com/bitcoinschema/go-map v0.2.2 + github.com/bitcoinschema/go-sigma v0.1.2 + github.com/bsv-blockchain/go-sdk v1.1.22 ) require ( github.com/pkg/errors v0.9.1 // indirect - golang.org/x/crypto v0.32.0 // indirect + golang.org/x/crypto v0.35.0 // indirect ) diff --git a/go.sum b/go.sum index f0799e8..41f2003 100644 --- a/go.sum +++ b/go.sum @@ -1,21 +1,21 @@ -github.com/bitcoin-sv/go-sdk v1.1.18 h1:6lMdQGxlLFWysR2O4m8t0FpdEmdvqHIvYjp8+UV8AjI= -github.com/bitcoin-sv/go-sdk v1.1.18/go.mod h1:E/gP4wd23aa7clO4vYx+xMNwEs/I3shKv5NdwWgNkx8= -github.com/bitcoinschema/go-aip v0.3.2 h1:bdhTTcVphqHzfHsV1Y6GKl73IASCTwceCXgkM0d62Ns= -github.com/bitcoinschema/go-aip v0.3.2/go.mod h1:5Q+P1U1G1WiCPu6VqKinmwpFmmBo9sNwskh4mLGbloU= -github.com/bitcoinschema/go-b v0.2.2 h1:wZ0qtOAmj2cvDqxMOZho+VpKcR9V/UMFMkbCd7WH5OE= -github.com/bitcoinschema/go-b v0.2.2/go.mod h1:qzXa0Q5+62S/ZnLIidlCWwwpZXLWrs0npqiYincUP5I= -github.com/bitcoinschema/go-bap v0.4.1 h1:t5SwpkW1oCvpn4+7nTp3W57hnaQJrgNxZNRNDMgUC98= -github.com/bitcoinschema/go-bap v0.4.1/go.mod h1:M5DJ8L4nT7VY1VwV2qwaScgYboh4Jmw5Wx22osoNGko= -github.com/bitcoinschema/go-bob v0.5.1 h1:pvRX16sAkQRRNBu1UpRnrbd/WX9MKwYEh0LRb7/u9FI= -github.com/bitcoinschema/go-bob v0.5.1/go.mod h1:z/et0FNbSJobzmU6cQYjByGFNcUfRwgSsqKR9uJOg9k= -github.com/bitcoinschema/go-boost v0.2.1 h1:y0asMfmrbSxdabgEpJ6h3LHncsy2k2B+AcVnqI54zec= -github.com/bitcoinschema/go-boost v0.2.1/go.mod h1:YxG4CWf/YC9iVTdHwA3iucnLqdZMKUX2kOI61SSDYCw= -github.com/bitcoinschema/go-bpu v0.2.1 h1:4p4LKa+BtP4Ahv5wFbt/RuQbob3u37CrBSuD1aruSQ0= -github.com/bitcoinschema/go-bpu v0.2.1/go.mod h1:WhXazKw2p4OIKhkd5A9JgDsaq3a7QRPmqzwCb/835uA= -github.com/bitcoinschema/go-map v0.2.1 h1:+MkeiEEWC2DaSacc+1HlrQM4+rkB9Ik1vNkRtvdUg54= -github.com/bitcoinschema/go-map v0.2.1/go.mod h1:p97oxPHOqP8hWmsi1IEed3Ro36628KMep4v4hVmLUGA= -github.com/bitcoinschema/go-sigma v0.1.1 h1:ltBBnMVirM2a4Q0+ajlqetfVLfFf9BQth3UibWKPVKU= -github.com/bitcoinschema/go-sigma v0.1.1/go.mod h1:2aiSN/jR05ksXTfOl107Z+E//0YttjeeN87tB/Oafac= +github.com/bitcoinschema/go-aip v0.3.3 h1:hTe9xbjVA6yGZgVjXdsdSprq9HEoZYMfNOXJBJlbE3E= +github.com/bitcoinschema/go-aip v0.3.3/go.mod h1:Dw/AS97LfD8Jq4efsZAFG6gTZAVl3pp5yMDA5UmhhJY= +github.com/bitcoinschema/go-b v0.2.3 h1:oq78sYf6GyKKZWOMrr7QXCT3xP3VjRUpL0ZFsvWm4wE= +github.com/bitcoinschema/go-b v0.2.3/go.mod h1:4cbJaloxa2+iU0mPijSYPXw6BuIoBZY0r7FUtQAQbpY= +github.com/bitcoinschema/go-bap v0.4.2 h1:DOSWKfSnXYEt/BE4fN/dD8V6sVtXQEPcRU9W8TaeWNo= +github.com/bitcoinschema/go-bap v0.4.2/go.mod h1:QnRX6lYzr6XBKD8za0QybP6RqolOC2Lu0vptajHA9X8= +github.com/bitcoinschema/go-bob v0.5.2 h1:DKABIT6NCScvkeyGVCdpbxHb0EzcbXzKpvbS1SdPuuo= +github.com/bitcoinschema/go-bob v0.5.2/go.mod h1:wiDgN//GF1u9OwA1TrxHZZuE9wDKtkW8T8xGf5RRFY0= +github.com/bitcoinschema/go-boost v0.2.2 h1:uWiQ4qYZIRcIbtNCgVWDK5bzpT8eW9avCEr2h45DiuQ= +github.com/bitcoinschema/go-boost v0.2.2/go.mod h1:4McbqjrkzK8mU3DcfYt05P/HxBk6k3SgWoMK6FtlqJw= +github.com/bitcoinschema/go-bpu v0.2.2 h1:F/eIC8XhzwgptpA1+rgYQo8bzT51nVozdXpASsxPIno= +github.com/bitcoinschema/go-bpu v0.2.2/go.mod h1:zppAI/4uAi+lSKBAc7QtWp98d+iczCB6CnGrGV75fAQ= +github.com/bitcoinschema/go-map v0.2.2 h1:ouAceAmk+fJtW66iRzXdEU5OZSd4mYyLL3LA5SmjiF8= +github.com/bitcoinschema/go-map v0.2.2/go.mod h1:oz0mMLDMSfI8gmwz+MQ1cTcSmYOhnlSdlS/lF0jIdzM= +github.com/bitcoinschema/go-sigma v0.1.2 h1:tFNlZZ8QnSokHlWL/39+NCzC1x2lTO3uOJhcvBkC1TE= +github.com/bitcoinschema/go-sigma v0.1.2/go.mod h1:9mkkvkONfiSCPPTQimJYNp+5darSfSxZbuD225AGq9M= +github.com/bsv-blockchain/go-sdk v1.1.22 h1:R5o9spVEfCAt64We1CdyHkCuYT1sdTSfKXp3R10UMkI= +github.com/bsv-blockchain/go-sdk v1.1.22/go.mod h1:d0HXzhHy21t+7z+LBpDhGyJSBJb8S5HiAmHsBtRKddQ= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -24,7 +24,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= -golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= +golang.org/x/crypto v0.35.0 h1:b15kiHdrGCHrP6LvwaQ3c03kgNhhiMgvlhxHQhmg2Xs= +golang.org/x/crypto v0.35.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/ord/ord.go b/ord/ord.go index d8bed97..abccfdb 100644 --- a/ord/ord.go +++ b/ord/ord.go @@ -5,8 +5,8 @@ import ( "encoding/base64" "log" - "github.com/bitcoin-sv/go-sdk/script" "github.com/bitcoinschema/go-bpu" + "github.com/bsv-blockchain/go-sdk/script" ) // Prefix is the OP_RETURN prefix for the 1Sat Ordinals inscription protocol diff --git a/run/run.go b/run/run.go index 0a1a93d..4146ea6 100644 --- a/run/run.go +++ b/run/run.go @@ -8,9 +8,9 @@ import ( "os" "strings" - "github.com/bitcoin-sv/go-sdk/script" - "github.com/bitcoin-sv/go-sdk/transaction" "github.com/bitcoinschema/go-bpu" + "github.com/bsv-blockchain/go-sdk/script" + "github.com/bsv-blockchain/go-sdk/transaction" ) var debug = os.Getenv("BMAP_DEBUG") == "1"