fix: updating ts deployer to use AlgorandClient; running deploy step in CI (#41)

aorumbayev · web-flow · commit c6ad5fb3b36f · 2024-08-15T09:54:58.000+02:00
* fix: updating ts deployer to use AlgorandClient; running deploy step in CI

* chore: regen artifacts
diff --git a/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/deploy-config.ts.j2 b/examples/generators/production_python_smart_contract_typescript/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/deploy-config.ts.j2
@@ -5,43 +5,26 @@ import { {{ contract_name.split('_')|map('capitalize')|join }}Client } from '../
 export async function deploy() {
   console.log('=== Deploying {{ contract_name.split('_')|map('capitalize')|join }} ===')
 
-  const algod = algokit.getAlgoClient()
-  const indexer = algokit.getAlgoIndexerClient()
-  const deployer = await algokit.mnemonicAccountFromEnvironment({ name: 'DEPLOYER', fundWith: algokit.algos(3) }, algod)
-  await algokit.ensureFunded(
-    {
-      accountToFund: deployer,
-      minSpendingBalance: algokit.algos(2),
-      minFundingIncrement: algokit.algos(2),
-    },
-    algod,
-  )
-  const appClient = new {{ contract_name.split('_')|map('capitalize')|join }}Client(
-    {
-      resolveBy: 'creatorAndName',
-      findExistingUsing: indexer,
-      sender: deployer,
-      creatorAddress: deployer.addr,
-    },
-    algod,
-  )
+  const algorand = algokit.AlgorandClient.fromEnvironment()
+  const deployer = await algorand.account.fromEnvironment('DEPLOYER')
+  
+  const appClient = algorand.client.getTypedAppClientByCreatorAndName({{ contract_name.split('_')|map('capitalize')|join }}Client, {
+    sender: deployer,
+    creatorAddress: deployer.addr,
+  })
 
   const app = await appClient.deploy({
     onSchemaBreak: 'append',
     onUpdate: 'append',
   })
 
-
   // If app was just created fund the app account
   if (['create', 'replace'].includes(app.operationPerformed)) {
-    algokit.transferAlgos(
-      {
-        amount: algokit.algos(1),
-        from: deployer,
-        to: app.appAddress,
-      },
-      algod,
-    )
+    await algorand.send.payment({
+      amount: algokit.algos(1),
+      sender: deployer.addr,
+      receiver: app.appAddress,
+    })
   }
 
   const method = 'hello'
diff --git a/examples/generators/production_python_smart_contract_typescript/smart_contracts/cool_contract/deploy-config.ts b/examples/generators/production_python_smart_contract_typescript/smart_contracts/cool_contract/deploy-config.ts
@@ -5,43 +5,26 @@ import { CoolContractClient } from '../artifacts/cool_contract/CoolContractClien
 export async function deploy() {
   console.log('=== Deploying CoolContract ===')
 
-  const algod = algokit.getAlgoClient()
-  const indexer = algokit.getAlgoIndexerClient()
-  const deployer = await algokit.mnemonicAccountFromEnvironment({ name: 'DEPLOYER', fundWith: algokit.algos(3) }, algod)
-  await algokit.ensureFunded(
-    {
-      accountToFund: deployer,
-      minSpendingBalance: algokit.algos(2),
-      minFundingIncrement: algokit.algos(2),
-    },
-    algod,
-  )
-  const appClient = new CoolContractClient(
-    {
-      resolveBy: 'creatorAndName',
-      findExistingUsing: indexer,
-      sender: deployer,
-      creatorAddress: deployer.addr,
-    },
-    algod,
-  )
+  const algorand = algokit.AlgorandClient.fromEnvironment()
+  const deployer = await algorand.account.fromEnvironment('DEPLOYER')
+  
+  const appClient = algorand.client.getTypedAppClientByCreatorAndName(CoolContractClient, {
+    sender: deployer,
+    creatorAddress: deployer.addr,
+  })
 
   const app = await appClient.deploy({
     onSchemaBreak: 'append',
     onUpdate: 'append',
   })
 
-
   // If app was just created fund the app account
   if (['create', 'replace'].includes(app.operationPerformed)) {
-    algokit.transferAlgos(
-      {
-        amount: algokit.algos(1),
-        from: deployer,
-        to: app.appAddress,
-      },
-      algod,
-    )
+    await algorand.send.payment({
+      amount: algokit.algos(1),
+      sender: deployer.addr,
+      receiver: app.appAddress,
+    })
   }
 
   const method = 'hello'
diff --git a/examples/generators/production_python_smart_contract_typescript/smart_contracts/hello_world/deploy-config.ts b/examples/generators/production_python_smart_contract_typescript/smart_contracts/hello_world/deploy-config.ts
@@ -5,43 +5,26 @@ import { HelloWorldClient } from '../artifacts/hello_world/HelloWorldClient'
 export async function deploy() {
   console.log('=== Deploying HelloWorld ===')
 
-  const algod = algokit.getAlgoClient()
-  const indexer = algokit.getAlgoIndexerClient()
-  const deployer = await algokit.mnemonicAccountFromEnvironment({ name: 'DEPLOYER', fundWith: algokit.algos(3) }, algod)
-  await algokit.ensureFunded(
-    {
-      accountToFund: deployer,
-      minSpendingBalance: algokit.algos(2),
-      minFundingIncrement: algokit.algos(2),
-    },
-    algod,
-  )
-  const appClient = new HelloWorldClient(
-    {
-      resolveBy: 'creatorAndName',
-      findExistingUsing: indexer,
-      sender: deployer,
-      creatorAddress: deployer.addr,
-    },
-    algod,
-  )
+  const algorand = algokit.AlgorandClient.fromEnvironment()
+  const deployer = await algorand.account.fromEnvironment('DEPLOYER')
+
+  const appClient = algorand.client.getTypedAppClientByCreatorAndName(HelloWorldClient, {
+    sender: deployer,
+    creatorAddress: deployer.addr,
+  })
 
   const app = await appClient.deploy({
     onSchemaBreak: 'append',
     onUpdate: 'append',
   })
 
-
   // If app was just created fund the app account
   if (['create', 'replace'].includes(app.operationPerformed)) {
-    algokit.transferAlgos(
-      {
-        amount: algokit.algos(1),
-        from: deployer,
-        to: app.appAddress,
-      },
-      algod,
-    )
+    await algorand.send.payment({
+      amount: algokit.algos(1),
+      sender: deployer.addr,
+      receiver: app.appAddress,
+    })
   }
 
   const method = 'hello'
diff --git a/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/deploy-config.ts.j2 b/examples/generators/starter_python_smart_contract_typescript/.algokit/generators/create_contract/smart_contracts/{{ contract_name }}/deploy-config.ts.j2
@@ -5,43 +5,26 @@ import { {{ contract_name.split('_')|map('capitalize')|join }}Client } from '../
 export async function deploy() {
   console.log('=== Deploying {{ contract_name.split('_')|map('capitalize')|join }} ===')
 
-  const algod = algokit.getAlgoClient()
-  const indexer = algokit.getAlgoIndexerClient()
-  const deployer = await algokit.mnemonicAccountFromEnvironment({ name: 'DEPLOYER', fundWith: algokit.algos(3) }, algod)
-  await algokit.ensureFunded(
-    {
-      accountToFund: deployer,
-      minSpendingBalance: algokit.algos(2),
-      minFundingIncrement: algokit.algos(2),
-    },
-    algod,
-  )
-  const appClient = new {{ contract_name.split('_')|map('capitalize')|join }}Client(
-    {
-      resolveBy: 'creatorAndName',
-      findExistingUsing: indexer,
-      sender: deployer,
-      creatorAddress: deployer.addr,
-    },
-    algod,
-  )
+  const algorand = algokit.AlgorandClient.fromEnvironment()
+  const deployer = await algorand.account.fromEnvironment('DEPLOYER')
+  
+  const appClient = algorand.client.getTypedAppClientByCreatorAndName({{ contract_name.split('_')|map('capitalize')|join }}Client, {
+    sender: deployer,
+    creatorAddress: deployer.addr,
+  })
 
   const app = await appClient.deploy({
     onSchemaBreak: 'append',
     onUpdate: 'append',
   })
 
-
   // If app was just created fund the app account
   if (['create', 'replace'].includes(app.operationPerformed)) {
-    algokit.transferAlgos(
-      {
-        amount: algokit.algos(1),
-        from: deployer,
-        to: app.appAddress,
-      },
-      algod,
-    )
+    await algorand.send.payment({
+      amount: algokit.algos(1),
+      sender: deployer.addr,
+      receiver: app.appAddress,
+    })
   }
 
   const method = 'hello'
diff --git a/examples/generators/starter_python_smart_contract_typescript/smart_contracts/cool_contract/deploy-config.ts b/examples/generators/starter_python_smart_contract_typescript/smart_contracts/cool_contract/deploy-config.ts
@@ -5,43 +5,26 @@ import { CoolContractClient } from '../artifacts/cool_contract/CoolContractClien
 export async function deploy() {
   console.log('=== Deploying CoolContract ===')
 
-  const algod = algokit.getAlgoClient()
-  const indexer = algokit.getAlgoIndexerClient()
-  const deployer = await algokit.mnemonicAccountFromEnvironment({ name: 'DEPLOYER', fundWith: algokit.algos(3) }, algod)
-  await algokit.ensureFunded(
-    {
-      accountToFund: deployer,
-      minSpendingBalance: algokit.algos(2),
-      minFundingIncrement: algokit.algos(2),
-    },
-    algod,
-  )
-  const appClient = new CoolContractClient(
-    {
-      resolveBy: 'creatorAndName',
-      findExistingUsing: indexer,
-      sender: deployer,
-      creatorAddress: deployer.addr,
-    },
-    algod,
-  )
+  const algorand = algokit.AlgorandClient.fromEnvironment()
+  const deployer = await algorand.account.fromEnvironment('DEPLOYER')
+  
+  const appClient = algorand.client.getTypedAppClientByCreatorAndName(CoolContractClient, {
+    sender: deployer,
+    creatorAddress: deployer.addr,
+  })
 
   const app = await appClient.deploy({
     onSchemaBreak: 'append',
     onUpdate: 'append',
   })
 
-
   // If app was just created fund the app account
   if (['create', 'replace'].includes(app.operationPerformed)) {
-    algokit.transferAlgos(
-      {
-        amount: algokit.algos(1),
-        from: deployer,
-        to: app.appAddress,
-      },
-      algod,
-    )
+    await algorand.send.payment({
+      amount: algokit.algos(1),
+      sender: deployer.addr,
+      receiver: app.appAddress,
+    })
   }
 
   const method = 'hello'
diff --git a/examples/generators/starter_python_smart_contract_typescript/smart_contracts/hello_world/deploy-config.ts b/examples/generators/starter_python_smart_contract_typescript/smart_contracts/hello_world/deploy-config.ts
@@ -5,43 +5,26 @@ import { HelloWorldClient } from '../artifacts/hello_world/HelloWorldClient'
 export async function deploy() {
   console.log('=== Deploying HelloWorld ===')
 
-  const algod = algokit.getAlgoClient()
-  const indexer = algokit.getAlgoIndexerClient()
-  const deployer = await algokit.mnemonicAccountFromEnvironment({ name: 'DEPLOYER', fundWith: algokit.algos(3) }, algod)
-  await algokit.ensureFunded(
-    {
-      accountToFund: deployer,
-      minSpendingBalance: algokit.algos(2),
-      minFundingIncrement: algokit.algos(2),
-    },
-    algod,
-  )
-  const appClient = new HelloWorldClient(
-    {
-      resolveBy: 'creatorAndName',
-      findExistingUsing: indexer,
-      sender: deployer,
-      creatorAddress: deployer.addr,
-    },
-    algod,
-  )
+  const algorand = algokit.AlgorandClient.fromEnvironment()
+  const deployer = await algorand.account.fromEnvironment('DEPLOYER')
+
+  const appClient = algorand.client.getTypedAppClientByCreatorAndName(HelloWorldClient, {
+    sender: deployer,
+    creatorAddress: deployer.addr,
+  })
 
   const app = await appClient.deploy({
     onSchemaBreak: 'append',
     onUpdate: 'append',
   })
 
-
   // If app was just created fund the app account
   if (['create', 'replace'].includes(app.operationPerformed)) {
-    algokit.transferAlgos(
-      {
-        amount: algokit.algos(1),
-        from: deployer,
-        to: app.appAddress,
-      },
-      algod,
-    )
+    await algorand.send.payment({
+      amount: algokit.algos(1),
+      sender: deployer.addr,
+      receiver: app.appAddress,
+    })
   }
 
   const method = 'hello'
diff --git a/template_content/.algokit/generators/create_contract/smart_contracts/{% raw %}{{ contract_name }}{% endraw %}/{% if deployment_language == 'typescript' %}deploy-config.ts.j2{% endif %} b/template_content/.algokit/generators/create_contract/smart_contracts/{% raw %}{{ contract_name }}{% endraw %}/{% if deployment_language == 'typescript' %}deploy-config.ts.j2{% endif %}
@@ -5,43 +5,26 @@ import { {{ contract_name.split('_')|map('capitalize')|join }}Client } from '../
 export async function deploy() {
   console.log('=== Deploying {{ contract_name.split('_')|map('capitalize')|join }} ===')
 
-  const algod = algokit.getAlgoClient()
-  const indexer = algokit.getAlgoIndexerClient()
-  const deployer = await algokit.mnemonicAccountFromEnvironment({ name: 'DEPLOYER', fundWith: algokit.algos(3) }, algod)
-  await algokit.ensureFunded(
-    {
-      accountToFund: deployer,
-      minSpendingBalance: algokit.algos(2),
-      minFundingIncrement: algokit.algos(2),
-    },
-    algod,
-  )
-  const appClient = new {{ contract_name.split('_')|map('capitalize')|join }}Client(
-    {
-      resolveBy: 'creatorAndName',
-      findExistingUsing: indexer,
-      sender: deployer,
-      creatorAddress: deployer.addr,
-    },
-    algod,
-  )
+  const algorand = algokit.AlgorandClient.fromEnvironment()
+  const deployer = await algorand.account.fromEnvironment('DEPLOYER')
+  
+  const appClient = algorand.client.getTypedAppClientByCreatorAndName({{ contract_name.split('_')|map('capitalize')|join }}Client, {
+    sender: deployer,
+    creatorAddress: deployer.addr,
+  })
 
   const app = await appClient.deploy({
     onSchemaBreak: 'append',
     onUpdate: 'append',
   })
 
-
   // If app was just created fund the app account
   if (['create', 'replace'].includes(app.operationPerformed)) {
-    algokit.transferAlgos(
-      {
-        amount: algokit.algos(1),
-        from: deployer,
-        to: app.appAddress,
-      },
-      algod,
-    )
+    await algorand.send.payment({
+      amount: algokit.algos(1),
+      sender: deployer.addr,
+      receiver: app.appAddress,
+    })
   }
 
   const method = 'hello'
diff --git a/template_content/smart_contracts/{{ contract_name }}/{% if deployment_language == 'typescript' %}deploy-config.ts{% endif %}.jinja b/template_content/smart_contracts/{{ contract_name }}/{% if deployment_language == 'typescript' %}deploy-config.ts{% endif %}.jinja
diff --git a/tests/test_generators.py b/tests/test_generators.py
