Merge pull request #60 from scio-labs/pz/inkv5

feat: upgrade to `ink!` v5
scio-labs · Apr 10, 2024 · 5006281 · 5006281
2 parents e3b2839 + 49d181b
commit 5006281
Show file tree

Hide file tree

Showing 32 changed files with 1,613 additions and 1,574 deletions.
diff --git a/.changeset/nervous-dots-remember.md b/.changeset/nervous-dots-remember.md
@@ -0,0 +1,6 @@
+---
+"@inkathon/contracts": minor
+"@inkathon/frontend": minor
+---
+
+Update to ink! v5
diff --git a/.changeset/rotten-humans-add.md b/.changeset/rotten-humans-add.md
@@ -0,0 +1,6 @@
+---
+"@inkathon/contracts": patch
+"@inkathon/frontend": patch
+---
+
+Disable `typechain-polkadot` typed-contracts until ink! v5 support.
diff --git a/contracts/build-all.sh b/contracts/build-all.sh
@@ -23,10 +23,11 @@ do
   $CP_CMD ./target/ink/$i/$i.wasm $DIR/$i/
   $CP_CMD ./target/ink/$i/$i.json $DIR/$i/
 
+  # NOTE: Currently disabled until `typechain-polkadot` dependencies are upted to support ink! v5
   if [[ "$@" != *"--skip-types"* ]]; then
-    echo "Generate types via typechain into './typed-contracts'…"
-    # Because of an open issue, this used the npx-installed version of `@727-ventures/typechain-polkadot`
-    # See: https://github.com/Brushfam/typechain-polkadot/issues/115
-    npx @727-ventures/typechain-polkadot --in $DIR/$i/ --out typed-contracts --yes
+    echo "IMPORTANT: Type generation is currently disabled as it's not yet working with ink! v5"
+    # echo "Generate types via typechain into './typed-contracts'…"
+    # Because of an open issue, this uses the npx-installed version (https://github.com/Brushfam/typechain-polkadot/issues/115)
+    # npx @727-ventures/typechain-polkadot --in $DIR/$i/ --out typed-contracts --yes
   fi
 done
diff --git a/contracts/deployments/greeter/alephzero-testnet.ts b/contracts/deployments/greeter/alephzero-testnet.ts
@@ -1,2 +1,2 @@
-export const address = '5CrtpVyLB8iaRPJyB39DvfGgHP1BLGpEfmb9XF1qzN5CFQbX'
-export const blockNumber = 41737105
+export const address = '5CDia8Y46K7CbD2vLej2SjrvxpfcbrLVqK2He3pTJod2Eyik'
+export const blockNumber = 59124732
diff --git a/contracts/deployments/greeter/alephzero.ts b/contracts/deployments/greeter/alephzero.ts
@@ -1,2 +1,2 @@
-export const address = '5DhCVg3QmsPXPpYBGGPerVfnopMUSr49L3eMKmetmJkLfpot'
-export const blockNumber = 58304564
+export const address = '5GhwMF7VXKGdAi5CcjaMdkug9jUPczA9MxQDqkPCKTDZAtGU'
+export const blockNumber = 75868519
diff --git a/contracts/deployments/greeter/contracts.ts b/contracts/deployments/greeter/contracts.ts
@@ -0,0 +1,2 @@
+export const address = '5EmRFCkahcjJ8nsrZXGV9JwLHwTBNxMo4aScdjGtwnR8XEGV'
+export const blockNumber = 4801423
diff --git a/contracts/deployments/greeter/greeter.contract b/contracts/deployments/greeter/greeter.contract