From 93b2736d6533f983aeb74005004de7f40eb35851 Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Fri, 23 Feb 2018 14:13:35 -0800
Subject: Use the same templates as 0x.js

---
 packages/contract_templates/partials/tx.handlebars | 83 ++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 packages/contract_templates/partials/tx.handlebars

(limited to 'packages/contract_templates/partials/tx.handlebars')

diff --git a/packages/contract_templates/partials/tx.handlebars b/packages/contract_templates/partials/tx.handlebars
new file mode 100644
index 000000000..5026dac20
--- /dev/null
+++ b/packages/contract_templates/partials/tx.handlebars
@@ -0,0 +1,83 @@
+public {{this.name}} = {
+    async sendTransactionAsync(
+    {{> typed_params inputs=inputs}}
+    {{#this.payable}}
+        txData: TxDataPayable = {},
+    {{/this.payable}}
+    {{^this.payable}}
+        txData: TxData = {},
+    {{/this.payable}}
+    ): Promise<string> {
+        const self = this as {{contractName}}Contract;
+        const inputAbi = _.find(this.abi, {name: '{{this.name}}'}).inputs;
+        [{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
+        const encodedData = this._ethersInterface.functions.{{this.name}}(
+            {{> params inputs=inputs}}
+        ).data
+        const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
+            {
+                ...txData,
+                data: encodedData,
+            },
+            self.{{this.name}}.estimateGasAsync.bind(
+                self,
+                {{> params inputs=inputs}}
+            ),
+        );
+        const txHash = await this._web3Wrapper.sendTransactionAsync(txDataWithDefaults);
+        return txHash;
+    },
+    async estimateGasAsync(
+    {{> typed_params inputs=inputs}}
+        txData: TxData = {},
+    ): Promise<number> {
+        const self = this as {{contractName}}Contract;
+        const encodedData = this._ethersInterface.functions.{{this.name}}(
+            {{> params inputs=inputs}}
+        ).data
+        const txDataWithDefaults = await self._applyDefaultsToTxDataAsync(
+            {
+                ...txData,
+                data: encodedData,
+            }
+        );
+        const gas = await this._web3Wrapper.estimateGasAsync(txDataWithDefaults);
+        return gas;
+    },
+    getABIEncodedTransactionData(
+    {{> typed_params inputs=inputs}}
+        txData: TxData = {},
+    ): string {
+        const self = this as {{contractName}}Contract;
+        const abiEncodedTransactionData = this._ethersInterface.functions.{{this.name}}(
+            {{> params inputs=inputs}}
+        ).data
+        return abiEncodedTransactionData;
+    },
+    async callAsync(
+    {{> typed_params inputs=inputs}}
+    {{#this.payable}}
+        txData: TxDataPayable = {},
+    {{/this.payable}}
+    {{^this.payable}}
+        txData: TxData = {},
+    {{/this.payable}}
+    ): Promise<{{> return_type outputs=outputs}}> {
+        const self = this as {{contractName}}Contract;
+        const inputAbi = _.find(this.abi, {name: '{{this.name}}'}).inputs;
+        [{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
+        const callDescription = self._ethersInterface.functions.{{this.name}}(
+            {{> params inputs=inputs}}
+        ) as ethersContracts.CallDescription;
+        const callData = await self._applyDefaultsToTxDataAsync(
+            {
+                data: callDescription.data,
+            }
+        )
+        const rawCallResult = await self._web3Wrapper.callAsync(callData);
+        let resultArray = callDescription.parse(rawCallResult);
+        const outputAbi = _.find(this.abi, {name: '{{this.name}}'}).outputs;
+        resultArray = BaseContract._transformABIData(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
+        return resultArray{{#singleReturnValue}}[0]{{/singleReturnValue}};
+    },
+};
-- 
cgit v1.2.3


From a5ef1db0c56e4166641c19b46641921a3b1e509f Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 26 Feb 2018 16:36:56 -0800
Subject: Rewrite templates to decode call data on transactions

---
 packages/contract_templates/partials/tx.handlebars | 27 +---------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'packages/contract_templates/partials/tx.handlebars')

diff --git a/packages/contract_templates/partials/tx.handlebars b/packages/contract_templates/partials/tx.handlebars
index 5026dac20..347a482d6 100644
--- a/packages/contract_templates/partials/tx.handlebars
+++ b/packages/contract_templates/partials/tx.handlebars
@@ -54,30 +54,5 @@ public {{this.name}} = {
         ).data
         return abiEncodedTransactionData;
     },
-    async callAsync(
-    {{> typed_params inputs=inputs}}
-    {{#this.payable}}
-        txData: TxDataPayable = {},
-    {{/this.payable}}
-    {{^this.payable}}
-        txData: TxData = {},
-    {{/this.payable}}
-    ): Promise<{{> return_type outputs=outputs}}> {
-        const self = this as {{contractName}}Contract;
-        const inputAbi = _.find(this.abi, {name: '{{this.name}}'}).inputs;
-        [{{> params inputs=inputs}}] = BaseContract._transformABIData(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(this));
-        const callDescription = self._ethersInterface.functions.{{this.name}}(
-            {{> params inputs=inputs}}
-        ) as ethersContracts.CallDescription;
-        const callData = await self._applyDefaultsToTxDataAsync(
-            {
-                data: callDescription.data,
-            }
-        )
-        const rawCallResult = await self._web3Wrapper.callAsync(callData);
-        let resultArray = callDescription.parse(rawCallResult);
-        const outputAbi = _.find(this.abi, {name: '{{this.name}}'}).outputs;
-        resultArray = BaseContract._transformABIData(outputAbi, resultArray, BaseContract._lowercaseAddress.bind(this));
-        return resultArray{{#singleReturnValue}}[0]{{/singleReturnValue}};
-    },
+    {{> callAsync}}
 };
-- 
cgit v1.2.3