Skip to content

Commit 305a052

Browse files
authored
Merge pull request #24 from cloudstruct/initial-libada-go
feat: use libada-go for protocol magic
2 parents a29852a + a5dcc9f commit 305a052

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module github.com/cloudstruct/go-cardano-submit-api
33
go 1.17
44

55
require (
6+
github.com/Bitrue-exchange/libada-go v0.0.1-rc
67
github.com/cloudstruct/go-ouroboros-network v0.13.4
78
github.com/fxamacker/cbor/v2 v2.4.0
89
github.com/gin-contrib/zap v0.0.2
@@ -31,6 +32,7 @@ require (
3132
github.com/go-playground/universal-translator v0.17.0 // indirect
3233
github.com/go-playground/validator/v10 v10.4.1 // indirect
3334
github.com/golang/protobuf v1.5.2 // indirect
35+
github.com/islishude/base58 v1.0.1 // indirect
3436
github.com/josharian/intern v1.0.0 // indirect
3537
github.com/json-iterator/go v1.1.12 // indirect
3638
github.com/leodido/go-urn v1.2.0 // indirect

go.sum

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
3131
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
3232
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
3333
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
34+
github.com/Bitrue-exchange/libada-go v0.0.1-rc h1:duA44UKnJvDDit+6/EKWbPYMV6bzfpA/ldwb3eqd+0Q=
35+
github.com/Bitrue-exchange/libada-go v0.0.1-rc/go.mod h1:dDA2Sx73XOqa1z7DZ32sgcJY5oAJGtFHwV++9HLpkNM=
3436
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
3537
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
3638
github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
@@ -72,6 +74,7 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
7274
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
7375
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
7476
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
77+
github.com/fxamacker/cbor/v2 v2.3.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
7578
github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
7679
github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
7780
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -173,6 +176,10 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR
173176
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
174177
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
175178
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
179+
github.com/islishude/base58 v1.0.1 h1:oY9rmolPWkTfNA31gFHA1D7f5zoueyajgv3qWlhFDEQ=
180+
github.com/islishude/base58 v1.0.1/go.mod h1:YaFmRvjG56e35g5kjLwvU0pmHPdB2eoeoE9xBILnaRo=
181+
github.com/islishude/bip32 v1.0.2 h1:pZ/OnlCePDeMsVZtGEXimCLc8ZVHrIRkZHx7Sp7ZdAc=
182+
github.com/islishude/bip32 v1.0.2/go.mod h1:QVwq9Zrte7nf6N3kiWXSMj1xJnPfQe/Z26AI5WBh/bo=
176183
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
177184
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
178185
github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
@@ -312,6 +319,7 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U
312319
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
313320
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
314321
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
322+
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
315323
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
316324
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838 h1:71vQrMauZZhcTVK6KdYM+rklehEEwb3E+ZhaE5jrPrE=
317325
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=

internal/config/config.go

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,13 @@ package config
22

33
import (
44
"fmt"
5+
"github.com/Bitrue-exchange/libada-go"
56
"github.com/kelseyhightower/envconfig"
67
"gopkg.in/yaml.v2"
78
"io/ioutil"
89
"os"
910
)
1011

11-
const (
12-
TESTNET_MAGIC = 1097911063
13-
MAINNET_MAGIC = 764824073
14-
)
15-
1612
type Config struct {
1713
Logging LoggingConfig `yaml:"logging"`
1814
Api ApiConfig `yaml:"api"`
@@ -108,9 +104,9 @@ func (c *Config) populateNetworkMagic() error {
108104
if c.Node.Network != "" {
109105
switch c.Node.Network {
110106
case "testnet":
111-
c.Node.NetworkMagic = TESTNET_MAGIC
107+
c.Node.NetworkMagic = libada.Testnet.ProtocolMagic()
112108
case "mainnet":
113-
c.Node.NetworkMagic = MAINNET_MAGIC
109+
c.Node.NetworkMagic = libada.Mainnet.ProtocolMagic()
114110
default:
115111
return fmt.Errorf("unknown network: %s", c.Node.Network)
116112
}

0 commit comments

Comments
 (0)