Merge pull request #3893 from TrueBlocks/maintain/cleanups

Updates go.mods
TrueBlocks · Oct 4, 2024 · 0f42b09 · 0f42b09
2 parents 754ea7b + 6c86bef
commit 0f42b09
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 30 deletions.
diff --git a/examples b/examples
diff --git a/node b/node
diff --git a/scripts/go-work-sync.sh b/scripts/go-work-sync.sh
@@ -36,9 +36,10 @@ find . -type f -name 'go.mod' | while read -r modfile; do
     isChifra="[ "$moddir" == "./src/apps/chifra" ]"
     isGoMaker="[ "$moddir" == "./src/dev_tools/goMaker" ]"
     isNode="[ "$moddir" == "./node" ]"
-    isSimple="[ "$moddir" == "./example/simple" ]"
+    isFourbyte="[ "$moddir" == "./examples/four_bytes" ]"
+    isSimple="[ "$moddir" == "./examples/simple" ]"
 
-    if $isGoMaker || $isNode; then
+    if $isGoMaker || $isNode || $isFourbyte; then
         go get github.com/btcsuite/btcd 2> /dev/null
     fi
 

diff --git a/sdk b/sdk
diff --git a/src/apps/chifra/internal/names/validate.go b/src/apps/chifra/internal/names/validate.go
@@ -83,7 +83,7 @@ func (opts *NamesOptions) validateNames() error {
 		}
 		if err := opts.Conn.IsContractAtLatest(opts.AutonameAddr); err != nil {
 			if err == rpc.ErrNotAContract {
-				return validate.Usage("The address provided to the {0} option is not a token contract.", "--autoname")
+				return validate.Usage("The address provided to the {0} option is not a contract.", "--autoname")
 			}
 			// ignore this error... we'll catch it later
 		}

diff --git a/src/apps/chifra/pkg/base/types_wei.go b/src/apps/chifra/pkg/base/types_wei.go
@@ -94,7 +94,7 @@ func (w *Wei) Cmp(y *Wei) int {
 }
 
 func (w *Wei) MarshalText() (text []byte, err error) {
-	if w == nil {
+	if w == nil || len(text) == 0 {
 		return []byte("0"), nil
 	}
 	return (*big.Int)(w).MarshalText()

diff --git a/src/dev_tools/goMaker/go.mod b/src/dev_tools/goMaker/go.mod
@@ -4,7 +4,7 @@ module github.com/TrueBlocks/trueblocks-core/goMaker
 go 1.22
 
 require (
-	github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923010605-e373a04d7cd4
+	github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923025630-c4c09cafc138
 	github.com/gocarina/gocsv v0.0.0-20230123225133-763e25b40669
 	golang.org/x/text v0.16.0
 )

diff --git a/src/dev_tools/goMaker/go.sum b/src/dev_tools/goMaker/go.sum
@@ -1,5 +1,5 @@
-github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923010605-e373a04d7cd4 h1:Gfgni8y5qgzd4dUTglBicRFWsLF/cILzNfqVUXlqJyI=
-github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923010605-e373a04d7cd4/go.mod h1:YKuaek8RSyh681TFMK6Ua8MsHtuY+c1VJWi78Y35+J8=
+github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923025630-c4c09cafc138 h1:v/Wvrp9Ztzvp8g2IEcVc7CvUMWlz3sA+3PIIe0LKuLg=
+github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923025630-c4c09cafc138/go.mod h1:YKuaek8RSyh681TFMK6Ua8MsHtuY+c1VJWi78Y35+J8=
 github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/btcsuite/btcd/btcec/v2 v2.2.0 h1:fzn1qaOt32TuLjFlkzYSsBC35Q3KUjT1SwPxiMSCF5k=

diff --git a/src/dev_tools/indexManager/go.mod b/src/dev_tools/indexManager/go.mod
@@ -5,7 +5,7 @@ go 1.22
 
 replace github.com/TrueBlocks/trueblocks-core/sdk => ../../../sdk
 
-require github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923010605-e373a04d7cd4
+require github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923025630-c4c09cafc138
 
 require (
 	github.com/ethereum/go-ethereum v1.13.15 // indirect

diff --git a/src/dev_tools/indexManager/go.sum b/src/dev_tools/indexManager/go.sum
@@ -1,5 +1,5 @@
-github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923010605-e373a04d7cd4 h1:Gfgni8y5qgzd4dUTglBicRFWsLF/cILzNfqVUXlqJyI=
-github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923010605-e373a04d7cd4/go.mod h1:YKuaek8RSyh681TFMK6Ua8MsHtuY+c1VJWi78Y35+J8=
+github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923025630-c4c09cafc138 h1:v/Wvrp9Ztzvp8g2IEcVc7CvUMWlz3sA+3PIIe0LKuLg=
+github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923025630-c4c09cafc138/go.mod h1:YKuaek8RSyh681TFMK6Ua8MsHtuY+c1VJWi78Y35+J8=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/ethereum/go-ethereum v1.13.15 h1:U7sSGYGo4SPjP6iNIifNoyIAiNjrmQkz6EwQG+/EZWo=
 github.com/ethereum/go-ethereum v1.13.15/go.mod h1:TN8ZiHrdJwSe8Cb6x+p0hs5CxhJZPbqB7hHkaUXcmIU=

diff --git a/src/dev_tools/sdkFuzzer/go.mod b/src/dev_tools/sdkFuzzer/go.mod
@@ -4,7 +4,7 @@ module github.com/TrueBlocks/trueblocks-core/sdkFuzzer
 go 1.22
 
 require (
-	github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923010605-e373a04d7cd4
+	github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923025630-c4c09cafc138
 	github.com/TrueBlocks/trueblocks-sdk/v3 v3.5.0
 )
 

diff --git a/src/dev_tools/sdkFuzzer/go.sum b/src/dev_tools/sdkFuzzer/go.sum
@@ -40,8 +40,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
-github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923010605-e373a04d7cd4 h1:Gfgni8y5qgzd4dUTglBicRFWsLF/cILzNfqVUXlqJyI=
-github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923010605-e373a04d7cd4/go.mod h1:YKuaek8RSyh681TFMK6Ua8MsHtuY+c1VJWi78Y35+J8=
+github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923025630-c4c09cafc138 h1:v/Wvrp9Ztzvp8g2IEcVc7CvUMWlz3sA+3PIIe0LKuLg=
+github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923025630-c4c09cafc138/go.mod h1:YKuaek8RSyh681TFMK6Ua8MsHtuY+c1VJWi78Y35+J8=
 github.com/TrueBlocks/trueblocks-sdk/v3 v3.5.0 h1:bz0zv6lgjda4NHJSzm+tTEPY0oi04izxMTVwrd/ZVp4=
 github.com/TrueBlocks/trueblocks-sdk/v3 v3.5.0/go.mod h1:9uF00GPp50ck8gRnpvBn0wFKB+dlFaAP6ObddLqU6Os=
 github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw=

diff --git a/src/dev_tools/testRunner/go.mod b/src/dev_tools/testRunner/go.mod
@@ -6,7 +6,7 @@ go 1.22
 replace github.com/TrueBlocks/trueblocks-core/sdk => ../../../sdk
 
 require (
-	github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923010605-e373a04d7cd4
+	github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923025630-c4c09cafc138
 	github.com/TrueBlocks/trueblocks-sdk/v3 v3.5.0
 )
 

diff --git a/src/dev_tools/testRunner/go.sum b/src/dev_tools/testRunner/go.sum
@@ -40,8 +40,8 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migc
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
-github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923010605-e373a04d7cd4 h1:Gfgni8y5qgzd4dUTglBicRFWsLF/cILzNfqVUXlqJyI=
-github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923010605-e373a04d7cd4/go.mod h1:YKuaek8RSyh681TFMK6Ua8MsHtuY+c1VJWi78Y35+J8=
+github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923025630-c4c09cafc138 h1:v/Wvrp9Ztzvp8g2IEcVc7CvUMWlz3sA+3PIIe0LKuLg=
+github.com/TrueBlocks/trueblocks-core/src/apps/chifra v0.0.0-20240923025630-c4c09cafc138/go.mod h1:YKuaek8RSyh681TFMK6Ua8MsHtuY+c1VJWi78Y35+J8=
 github.com/TrueBlocks/trueblocks-sdk/v3 v3.5.0 h1:bz0zv6lgjda4NHJSzm+tTEPY0oi04izxMTVwrd/ZVp4=
 github.com/TrueBlocks/trueblocks-sdk/v3 v3.5.0/go.mod h1:9uF00GPp50ck8gRnpvBn0wFKB+dlFaAP6ObddLqU6Os=
 github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw=

diff --git a/src/other/four_bytes.tar.gz b/src/other/four_bytes.tar.gz
diff --git a/src/other/tutorials/delegate_calls.txt b/src/other/tutorials/delegate_calls.txt
diff --git a/src/other/tutorials/simple query to show block ranges.txt b/src/other/tutorials/simple query to show block ranges.txt
diff --git a/src/other/tutorials/total_supply_history.txt b/src/other/tutorials/total_supply_history.txt
+1 −1		balanceChart/go.mod
+2 −2		balanceChart/go.sum
+1 −1		cancelContext/go.mod
+2 −2		cancelContext/go.sum
+1 −1		comparison/go.mod
+2 −2		comparison/go.sum
+1 −1		findFirst/go.mod
+2 −2		findFirst/go.sum
+3 −0		four_bytes/.gitignore
+87 −0		four_bytes/README.md
+38 −0		four_bytes/cmd/root.go
+50 −0		four_bytes/go.mod
+113 −0		four_bytes/go.sum
+10 −0		four_bytes/main.go
+26 −0		four_bytes/makefile
+82 −0		four_bytes/pkg/fourBytes/chunk_file.go
+211 −0		four_bytes/pkg/fourBytes/chunk_file_test.go
+215 −0		four_bytes/pkg/fourBytes/generate.go
+77 −0		four_bytes/pkg/fourBytes/verify.go
+6 −2		nameManager/actions.go
+1 −1		nameManager/go.mod
+2 −2		nameManager/go.sum
+1 −1		simple/go.mod
+2 −2		simple/go.sum
+1 −1		withStreaming/go.mod
+2 −2		withStreaming/go.sum