merge develop-tonlib new tonlib methods

.github/workflows/tonlib-linux.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Fetch TON repo
         run: |
           cd ..
-          git clone --recursive https://github.com/ton-blockchain/ton
+          git clone --recursive https://github.com/newton-blockchain/ton
 
       - name: Build tonlibjson
         run: |
@@ -26,6 +26,7 @@ jobs:
           cd build
           cmake ../ton -DCMAKE_BUILD_TYPE=Release
           cmake --build . --target tonlibjson
+          make tonlibjson_static
 
       - name: Copy built lib
         run: |

.github/workflows/tonlib-macos.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Fetch TON repo
         run: |
           cd ..
-          git clone --recursive https://github.com/ton-blockchain/ton
+          git clone --recursive https://github.com/newton-blockchain/ton
 
       - name: Build tonlibjson
         run: |
@@ -26,6 +26,7 @@ jobs:
           cd build
           cmake ../ton -DOPENSSL_ROOT_DIR=$(brew --prefix)/opt/openssl -DCMAKE_BUILD_TYPE=Release
           cmake --build . --target tonlibjson
+          make tonlibjson_static
 
       - name: Copy built lib
         run: |

.gitignore

@@ -12,5 +12,15 @@
 .idea
 ./vendor
 
+# tonlib-c files
+lib/linux*
+lib/linux
+
+lib/linux/*.so
+lib/linux/*.a
+
+tlgenerator
+
 # auto generated files
-test.keys/*
+test.keys/*
+test.keys.testnet/*

client.go

@@ -166,7 +166,6 @@ func (client *Client) executeSynchronously(data interface{}) (*TONResult, error)
 
 func (client *Client) Destroy() {
 	C.tonlib_client_json_destroy(client.client)
-	C.free(client.client)
 }
 
 //sync node`s blocks to current

cmd/tlgenerator/tlStructGenerator.go

@@ -382,7 +382,7 @@ func generateStructsFromTnEntities(
 				}
 			}
 
-			illStr := `fmt.Errorf("error! code: %d msg: %s", result.Data["code"], result.Data["message"])`
+			illStr := `fmt.Errorf("error! code: %v msg: %s", result.Data["code"], result.Data["message"])`
 			if strings.Contains(paramsStr, returnTypeCamel) {
 				returnTypeCamel = returnTypeCamel + "Dummy"
 			}

example/send_gram.go

@@ -43,7 +43,7 @@ func main() {
 		base64.StdEncoding.EncodeToString(loc),
 		tonlib.TONPrivateKey{
 			pKey.PublicKey,
-			base64.StdEncoding.EncodeToString((*pKey.Secret)[:]),
+			base64.StdEncoding.EncodeToString([]byte(pKey.Secret)),
 		},
 	}
 

go.mod

@@ -4,8 +4,5 @@ go 1.13
 
 require (
 	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a
-	github.com/dvsekhvalnov/jose2go v0.0.0-20180829124132-7f401d37b68a // indirect
-	github.com/joho/godotenv v1.3.0 // indirect
-	github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 // indirect
 	github.com/spf13/cobra v0.0.5
 )

go.sum

@@ -7,22 +7,16 @@ github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8Nz
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dvsekhvalnov/jose2go v0.0.0-20180829124132-7f401d37b68a h1:mq+R6XEM6lJX5VlLyZIrUSP8tSuJp82xTK89hvBwJbU=
-github.com/dvsekhvalnov/jose2go v0.0.0-20180829124132-7f401d37b68a/go.mod h1:7BvyPhdbLxMXIYTFPLsyJRFMsKmOZnQmzh6Gb+uquuM=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
-github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
-github.com/shopspring/decimal v0.0.0-20190905144223-a36b5d85f337 h1:Da9XEUfFxgyDOqUfwgoTDcWzmnlOnCGi6i4iPS+8Fbw=
-github.com/shopspring/decimal v0.0.0-20190905144223-a36b5d85f337/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=

lib/lib.go

@@ -2,5 +2,4 @@ package linux
 
 import (
 	_ "github.com/mercuryoio/tonlib-go/lib/darwin"
-	_ "github.com/mercuryoio/tonlib-go/lib/linux"
 )

tonlib.mainnet.json.example

@@ -0,0 +1,223 @@
+{
+  "config": {
+    "config": {
+      "@type": "config.global",
+      "dht": {
+        "@type": "dht.config.global",
+        "k": 6,
+        "a": 3,
+        "static_nodes": {
+          "@type": "dht.nodes",
+          "nodes": [
+            {
+              "@type": "dht.node",
+              "id": {
+                "@type": "pub.ed25519",
+                "key": "znOAvy1ECxyzeKishi4PdSO2edaVx78wynVyNKLBmQ8="
+              },
+              "addr_list": {
+                "@type": "adnl.addressList",
+                "addrs": [
+                  {
+                    "@type": "adnl.address.udp",
+                    "ip": -1068377703,
+                    "port": 6302
+                  }
+                ],
+                "version": 0,
+                "reinit_date": 0,
+                "priority": 0,
+                "expire_at": 0
+              },
+              "version": -1,
+              "signature": "KLH17nNKmOk3carKwbsUcVBc4JZpdAUdUOMxe8FSyqnkOw/lolnltbylJcC+lvPpIV5ySI/Qx8UZdNRV/4HzCA=="
+            },
+            {
+              "@type": "dht.node",
+              "id": {
+                "@type": "pub.ed25519",
+                "key": "Qjhv9rmeqXm0a+nYYhCJG1AH7C2TM6DAmyIM3FgO0Eo="
+              },
+              "addr_list": {
+                "@type": "adnl.addressList",
+                "addrs": [
+                  {
+                    "@type": "adnl.address.udp",
+                    "ip": -1057912003,
+                    "port": 6302
+                  }
+                ],
+                "version": 0,
+                "reinit_date": 0,
+                "priority": 0,
+                "expire_at": 0
+              },
+              "version": -1,
+              "signature": "2Gw5eIsZR+SdbWCU139DCuBI8Rv8T9iUioxDkgV6/IjcCHf6hNz8WCyUsKd5l5P1NBs/kdaxUBIybINDpYXoCw=="
+            },
+            {
+              "@type": "dht.node",
+              "id": {
+                "@type": "pub.ed25519",
+                "key": "2YsTRIu3aRYzZe8eoR8PK2N2ydHJyKllwKcLPk676d4="
+              },
+              "addr_list": {
+                "@type": "adnl.addressList",
+                "addrs": [
+                  {
+                    "@type": "adnl.address.udp",
+                    "ip": -1057911744,
+                    "port": 6302
+                  }
+                ],
+                "version": 0,
+                "reinit_date": 0,
+                "priority": 0,
+                "expire_at": 0
+              },
+              "version": -1,
+              "signature": "9/TJsaj0wELvRKXVIrBdyZWjgLKhfSvl7v0Oqq/9p9MsU/t9iRuGcpAzHqQF4bQAWrN8j9ARwMumRata7dH8Bg=="
+            },
+            {
+              "@type": "dht.node",
+              "id": {
+                "@type": "pub.ed25519",
+                "key": "SHrXmMEEUBGa51TWZwHSA+2RF4Vyavw51jgtnAz1ypU="
+              },
+              "addr_list": {
+                "@type": "adnl.addressList",
+                "addrs": [
+                  {
+                    "@type": "adnl.address.udp",
+                    "ip": -1057911148,
+                    "port": 6302
+                  }
+                ],
+                "version": 0,
+                "reinit_date": 0,
+                "priority": 0,
+                "expire_at": 0
+              },
+              "version": -1,
+              "signature": "R4ku8+tvjKSLIGe18zWHBHDv1maQHD5tGbAUOgbldGpBvfqH+/b76XkJjJzDsjnCO/bpxwUZfcI1sM1h6vFJCQ=="
+            },
+            {
+              "@type": "dht.node",
+              "id": {
+                "@type": "pub.ed25519",
+                "key": "G+Lr6UtSWUcyYHTUutwbxrIG9GGZan3h96j8qQPLIXQ="
+              },
+              "addr_list": {
+                "@type": "adnl.addressList",
+                "addrs": [
+                  {
+                    "@type": "adnl.address.udp",
+                    "ip": -960017601,
+                    "port": 6302
+                  }
+                ],
+                "version": 0,
+                "reinit_date": 0,
+                "priority": 0,
+                "expire_at": 0
+              },
+              "version": -1,
+              "signature": "fWU9hSNLvmaSCQOBW9M4Lja5pIWcqOzU1g9vtSywdgtASj9oQpwAslvr2sjNh9E2Np1c26NW8Sc5gUKf8YY7BA=="
+            }
+          ]
+        }
+      },
+      "liteservers": [
+        {
+          "ip": 1137658550,
+          "port": "4924",
+          "id": {
+            "@type": "pub.ed25519",
+            "key": "peJTw/arlRfssgTuf9BMypJzqOi7SXEqSPSWiEw2U1M="
+          }
+        },
+        {
+          "ip": 1560268637,
+          "port": "6199",
+          "id": {
+            "@type": "pub.ed25519",
+            "key": "NSyVw0XhPhW4Yg5a3NhS1dkCc6ZY7Hex40tJ6EiBMAI="
+          }
+        },
+        {
+          "ip": 84478511,
+          "port": "19949",
+          "id": {
+            "@type": "pub.ed25519",
+            "key": "n4VDnSCUuSpjnCyUk9e3QOOd6o0ItSWYbTnW3Wnn8wk="
+          }
+        },
+        {
+          "ip": 84478479,
+          "port": "48014",
+          "id": {
+            "@type": "pub.ed25519",
+            "key": "3XO67K/qi+gu3T9v8G2hx1yNmWZhccL3O7SoosFo8G0="
+          }
+        },
+        {
+          "ip": -2018135749,
+          "port": "53312",
+          "id": {
+            "@type": "pub.ed25519",
+            "key": "aF91CuUHuuOv9rm2W5+O/4h38M3sRm40DtSdRxQhmtQ="
+          }
+        },
+        {
+          "ip": -2018145068,
+          "port": "13206",
+          "id": {
+            "@type": "pub.ed25519",
+            "key": "K0t3+IWLOXHYMvMcrGZDPs+pn58a17LFbnXoQkKc2xw="
+          }
+        },
+        {
+          "ip": -2018145059,
+          "port": "46995",
+          "id": {
+            "@type": "pub.ed25519",
+            "key": "wQE0MVhXNWUXpWiW5Bk8cAirIh5NNG3cZM1/fSVKIts="
+          }
+        }
+      ],
+      "validator": {
+        "@type": "validator.config.global",
+        "zero_state": {
+          "workchain": -1,
+          "shard": -9223372036854775808,
+          "seqno": 0,
+          "root_hash": "F6OpKZKqvqeFp6CQmFomXNMfMj2EnaUSOXN+Mh+wVWk=",
+          "file_hash": "XplPz01CXAps5qeSWUtxcyBfdAo5zVb1N979KLSKD24="
+        },
+        "init_block" : {
+          "root_hash": "irEt9whDfgaYwD+8AzBlYzrMZHhrkhSVp3PU1s4DOz4=",
+          "seqno": 10171687,
+          "file_hash": "lay/bUKUUFDJXU9S6gx9GACQFl+uK+zX8SqHWS9oLZc=",
+          "workchain": -1,
+          "shard": -9223372036854775808
+        },
+        "hardforks": [
+          {
+            "file_hash": "t/9VBPODF7Zdh4nsnA49dprO69nQNMqYL+zk5bCjV/8=",
+            "seqno": 8536841,
+            "root_hash": "08Kpc9XxrMKC6BF/FeNHPS3MEL1/Vi/fQU/C9ELUrkc=",
+            "workchain": -1,
+            "shard": -9223372036854775808
+          }
+        ]
+      }
+    },
+    "blockchain_name": "mainnet",
+    "use_callbacks_for_network": false,
+    "ignore_cache": false
+  },
+  "keystore_type": {
+    "@type": "keyStoreTypeDirectory",
+    "directory": "./main.keys"
+  }
+}

utils.go

@@ -18,11 +18,13 @@ type TonlibListenserverConfig struct {
 	ID   map[string]string `json:"id"`
 }
 type ValidatorConfig struct {
-	Type      string    `json:"@type"`
-	ZeroState ZeroState `json:"zero_state"`
+	Type      string      `json:"@type"`
+	ZeroState InitBlock   `json:"zero_state"`
+	InitBlock InitBlock   `json:"init_block,omitempty"`
+	Hardforks []InitBlock `json:"hardforks,omitempty"`
 }
 
-type ZeroState struct {
+type InitBlock struct {
 	Workchain int    `json:"workchain"`
 	Shard     int64  `json:"shard"`
 	Seqno     int    `json:"seqno"`