diff --git a/README.md b/README.md index 472dc8a2b161d40e7f04e4411fac26b4227729c0..3b226572555f0f597f89c2e0d6bf81a4bc5fc695 100644 --- a/README.md +++ b/README.md @@ -13,4 +13,4 @@ Pour compiler le projet: `make compile` Pour le déployer: `make deploy` -Lien de déploiement du smart contract:`KT18ohWSbRJsE9hKWzFCfPbskDa3ipjJfoih` +Lien de déploiement du smart contract:`KT1T2uYvmNmWv69ZmnVLM749LoYFt1AgqzF1` diff --git a/deploy/deploy.ts b/deploy/deploy.ts index 66d994f3c3bd9241795f5b34c2f69f87da41c303..e9a135d15a780e6983ebe0e790755fdf327520c7 100644 --- a/deploy/deploy.ts +++ b/deploy/deploy.ts @@ -1,11 +1,9 @@ import { InMemorySigner } from "@taquito/signer"; -import { MichelsonMap, TezosToolkit } from "@taquito/taquito"; -import { buf2hex } from "@taquito/utils"; +import { TezosToolkit } from "@taquito/taquito"; import chalk from "chalk"; import { Spinner } from "cli-spinner"; import dotenv from "dotenv"; import multisig from "../compiled/Multisig.json"; -import metadata from "./metadata.json"; dotenv.config(); diff --git a/src/contract.jsligo b/src/contract.jsligo index cd06c12b7cbbc5128fc09f2ffa1c3b2ca36dbfd8..e70bc2c3e7b243ed756e21e57f358fe1c8a2e3db 100644 --- a/src/contract.jsligo +++ b/src/contract.jsligo @@ -27,7 +27,7 @@ namespace Preamble { }; // =============================================================================================== -export type result = [list<operation>, Storage.Utils.storage]; +export type result = Storage.Utils.result; @entry export const create_proposal = ( @@ -42,7 +42,7 @@ export const create_proposal = ( } const transfer: Types.transfer = list([{ from_: Tezos.get_sender(), txs: list([buyer_trans]) }]); - const tokenOperation = FA2.send(transfer, storage.token_address); + const tokenOperation = FA2.send(transfer, storage.token_address); const final_storage = Storage.Utils.register_proposal(proposal, storage); return [list([tokenOperation]), final_storage]; }; diff --git a/src/type.jsligo b/src/type.jsligo index 4cf7e8aa7d2a3aabd35fdb28ee85dbb43e59e64c..2d9fb6ec288565c975d6aa039af03e894840d437 100644 --- a/src/type.jsligo +++ b/src/type.jsligo @@ -22,7 +22,7 @@ export type dao = { export type atomic_trans = @layout("comb") - { amount: nat; token_id: nat, to_: address; } + { to_: address; token_id: nat; amount: nat; } export type transfer_from = { from_: address; txs: list<atomic_trans> };