multiple protocol fixes

ecadlabs · Jan 9, 2025 · 94c7ae3 · 94c7ae3
1 parent cf6bc12
commit 94c7ae3
Show file tree

Hide file tree

Showing 61 changed files with 39,490 additions and 978 deletions.
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ecadlabs/gotez/v2
 
-go 1.20
+go 1.23
 
 require (
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0

diff --git a/protocol/block_test.go b/protocol/block_test.go
@@ -23,26 +23,21 @@ var testData = []protoTestData{
 	{
 		proto: &core.Proto021PsQuebec,
 		blocks: []string{
-			"155262",
-			"155263",
-			"155264",
-			"155265",
-			"155266",
-			"155267",
-			"155268",
-			"155269",
-			"155270",
-			"155271",
-			"155272",
-			"155273",
-			"155274",
-			"155275",
-			"155276",
-			"155277",
-			"155278",
-			"155279",
-			"155280",
-			"155281",
+			"1196001",
+			"1196033",
+			"1196086",
+			"1197064",
+			"1197095",
+			"1197101",
+			"1197107",
+			"1197158",
+			"1197165",
+			"1197167",
+			"1197183",
+			"1233892",
+			"1234288",
+			"1234330",
+			"775785",
 		},
 	},
 	{
@@ -168,7 +163,11 @@ func TestBlock(t *testing.T) {
 					require.NoError(t, err)
 					_, err = encoding.Decode(buf, out, encoding.Dynamic())
 					if !assert.NoError(t, err) {
-						//pretty.Println(out)
+						//c := spew.NewDefaultConfig()
+						//c.DisableMethods = true
+						//c.Dump(out)
+						//j, _ := json.MarshalIndent(out, "", "    ")
+						//fmt.Println(string(j))
 						if err, ok := err.(*encoding.Error); ok {
 							fmt.Println(err.Path)
 						}

diff --git a/protocol/core/json_gen.go b/protocol/core/json_gen.go
diff --git a/protocol/core/tools/proto2hex.go → protocol/core/tools/tz2hex.go b/protocol/core/tools/proto2hex.go → protocol/core/tools/tz2hex.go
@@ -6,17 +6,17 @@ import (
 	"os"
 	"strings"
 
-	"github.com/ecadlabs/gotez/v2/b58"
+	"github.com/ecadlabs/gotez/v2/b58/base58"
 )
 
 func main() {
 	for i := 1; i < len(os.Args); i++ {
-		hash, err := b58.ParseProtocolHash([]byte(os.Args[i]))
+		_, data, err := base58.DecodeTZ([]byte(os.Args[i]))
 		if err != nil {
 			log.Fatal(err)
 		}
-		hex := make([]string, len(hash))
-		for j, x := range hash {
+		hex := make([]string, len(data))
+		for j, x := range data {
 			hex[j] = fmt.Sprintf("0x%02x", x)
 		}
 		fmt.Println(strings.Join(hex, ","))

diff --git a/protocol/latest/alias.go b/protocol/latest/alias.go
@@ -62,7 +62,6 @@ type Endorsement = latest.Attestation
 type EndorsementContentsAndResult = latest.AttestationContentsAndResult
 type InlinedEndorsementContents = latest.InlinedAttestationContents
 type InlinedAttestationContents = latest.InlinedAttestationContents
-type DALAttestation = latest.DALAttestation
 type Reveal = latest.Reveal
 type RevealContentsAndResult = latest.RevealContentsAndResult
 type Transaction = latest.Transaction

diff --git a/protocol/proto_012_Psithaca/json_gen.go b/protocol/proto_012_Psithaca/json_gen.go